From 2715222f0cca9327f896a2ec1ed2de0b7934ad17 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sat, 5 Nov 2016 20:09:29 +0800
Subject: [PATCH 001/727] netdata service: init

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/monitoring/netdata.nix | 78 +++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/netdata.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 356cb5a92ed..7cf836d62a1 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -300,6 +300,7 @@
   ./services/monitoring/monit.nix
   ./services/monitoring/munin.nix
   ./services/monitoring/nagios.nix
+  ./services/monitoring/netdata.nix
   ./services/monitoring/prometheus/default.nix
   ./services/monitoring/prometheus/node-exporter.nix
   ./services/monitoring/prometheus/alertmanager.nix
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
new file mode 100644
index 00000000000..e1fde4fc950
--- /dev/null
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -0,0 +1,78 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.netdata;
+
+  configFile = pkgs.writeText "netdata.conf" cfg.configText;
+
+  defaultUser = "netdata";
+
+in {
+  options = {
+    services.netdata = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Whether to enable netdata monitoring.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "netdata";
+        description = "User account under which netdata runs.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "netdata";
+        description = "Group under which netdata runs.";
+      };
+
+      configText = mkOption {
+        type = types.lines;
+        default = "";
+        description = "netdata.conf configuration.";
+        example = ''
+          [global]
+          debug log = syslog
+          access log = syslog
+          error log = syslog
+        '';
+      };
+
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.netdata = {
+      description = "Real time performance monitoring";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = concatStringsSep "\n" (map (dir: ''
+        mkdir -vp ${dir}
+        chmod 750 ${dir}
+        chown -R ${cfg.user}:${cfg.group} ${dir}
+        '') [ "/var/cache/netdata"
+              "/var/log/netdata"
+              "/var/lib/netdata" ]);
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        PermissionsStartOnly = true;
+        ExecStart = "${pkgs.netdata}/bin/netdata -D -c ${configFile}";
+        TimeoutStopSec = 60;
+      };
+    };
+
+    users.extraUsers = optional (cfg.user == defaultUser) {
+      name = defaultUser;
+    };
+
+    users.extraGroups = optional (cfg.group == defaultUser) {
+      name = defaultUser;
+    };
+
+  };
+}

From f4bed1e06ebfeaa9bb20ae00d707d1eafb67e219 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 10 Nov 2016 22:38:41 +0100
Subject: [PATCH 002/727] vndr: init at 20161110-cf8678f

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/vndr/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/tools/vndr/default.nix

diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix
new file mode 100644
index 00000000000..7cc77bd1bb3
--- /dev/null
+++ b/pkgs/development/tools/vndr/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "vndr-${version}";
+  version = "20161110-${lib.strings.substring 0 7 rev}";
+  rev = "cf8678fba5591fbacc4dafab1a22d64f6c603c20";
+
+  goPackagePath = "github.com/LK4D4/vndr";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "LK4D4";
+    repo = "vndr";
+    sha256 = "1fbrpdpfir05hqj1dr8rxw8hnjkhl0xbzncxkva56508vyyzbxcs";
+  };
+
+  meta = {
+    description = "Stupid golang vendoring tool, inspired by docker vendor script";
+    homepage = "https://github.com/LK4D4/vndr";
+    maintainers = with lib.maintainers; [ vdemeester ];
+    licence = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e6a3f16f56..e3c0b160329 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11498,6 +11498,8 @@ in
     qt5 = null;
   };
 
+  vndr = callPackage ../development/tools/vndr { };
+
   windows = rec {
     cygwinSetup = callPackage ../os-specific/windows/cygwin-setup { };
 

From 688e6e099ab5a94ea0594d05ef574f098275f806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= <val@codejam.info>
Date: Sun, 28 Feb 2016 23:00:45 -0500
Subject: [PATCH 003/727] Gogs: init at 20160227-d320915

---
 .../version-management/gogs/default.nix       | 445 ++++++++++++++++++
 .../version-management/gogs/default.nix.patch |  22 +
 .../gogs/gogs-definition.nix                  |  74 +++
 .../version-management/gogs/sqlite.awk        |  21 +
 .../gogs/update-gogs-definition               |   9 +
 pkgs/top-level/all-packages.nix               |   2 +
 6 files changed, 573 insertions(+)
 create mode 100644 pkgs/applications/version-management/gogs/default.nix
 create mode 100644 pkgs/applications/version-management/gogs/default.nix.patch
 create mode 100644 pkgs/applications/version-management/gogs/gogs-definition.nix
 create mode 100644 pkgs/applications/version-management/gogs/sqlite.awk
 create mode 100755 pkgs/applications/version-management/gogs/update-gogs-definition

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
new file mode 100644
index 00000000000..a8ba4928872
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -0,0 +1,445 @@
+# This file was generated by go2nix.
+{ stdenv, lib, makeWrapper, go, goPackages, git, fetchgit, sqliteSupport ? true }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "gogs-${version}";
+  version = "20160227-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "d320915ad2a7b4bbab075b98890aa50f91f0ced5";
+
+  buildInputs = [ makeWrapper go ];
+  buildFlags = lib.optional (sqliteSupport) "-tags sqlite";
+  goPackagePath = "github.com/gogits/gogs";
+
+  postInstall = ''
+    wrapProgram $bin/bin/gogs \
+      --prefix PATH : ${git}/bin \
+      --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
+      --run 'cd "$GOGS_WORK_DIR"' \
+      --run "ln -fs $out/share/go/src/${goPackagePath}/{public,templates} ."
+  '';
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/gogits/gogs.git";
+    sha256 = "0wpyn3linpb9jgqrpzbmmgn2s54rdhnqv286x2vj4lrngjc8xbc7";
+  };
+
+  extraSrcs = [
+    {
+      goPackagePath = "github.com/Unknwon/cae";
+
+      src = fetchgit {
+        url = "https://github.com/Unknwon/cae";
+        rev = "7f5e046bc8a6c3cde743c233b96ee4fd84ee6ecd";
+          sha256 = "1sp9mlm42r50ydsk1dyyhshrryy364pjdj8m275b5av8yg374dq2";
+      };
+    }
+    {
+      goPackagePath = "github.com/Unknwon/com";
+
+      src = fetchgit {
+        url = "https://github.com/Unknwon/com";
+        rev = "28b053d5a2923b87ce8c5a08f3af779894a72758";
+          sha256 = "1nq7pdjczgllm0yb2dlgr6zclwpwabl9a86dyw4bz0zd6qginfxy";
+      };
+    }
+    {
+      goPackagePath = "github.com/Unknwon/i18n";
+
+      src = fetchgit {
+        url = "https://github.com/Unknwon/i18n";
+        rev = "3b48b6662051bed72d36efa3c1e897bdf96b2e37";
+          sha256 = "1h18024641z473gx1ghwxd741c5sbhww4zsc0f3wwig6dghsfy0f";
+      };
+    }
+    {
+      goPackagePath = "github.com/Unknwon/paginater";
+
+      src = fetchgit {
+        url = "https://github.com/Unknwon/paginater";
+        rev = "7748a72e01415173a27d79866b984328e7b0c12b";
+          sha256 = "11lf3grqdr7ynhm39xp7siihf7b7v5p7r1vf9f3lbnyy99092v9p";
+      };
+    }
+    {
+      goPackagePath = "github.com/bradfitz/gomemcache";
+
+      src = fetchgit {
+        url = "https://github.com/bradfitz/gomemcache";
+        rev = "fb1f79c6b65acda83063cbc69f6bba1522558bfc";
+          sha256 = "0s4azbz3q681psi31r6z1697rkhqpaap8lif9yg85v6fc0zm7wvc";
+      };
+    }
+    {
+      goPackagePath = "github.com/codegangsta/cli";
+
+      src = fetchgit {
+        url = "https://github.com/codegangsta/cli";
+        rev = "a2943485b110df8842045ae0600047f88a3a56a1";
+          sha256 = "1hdbr6riv7j4all09w2a5zdc27fq11rf005v7v3wdccq07zmsmaa";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/binding";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/binding";
+        rev = "a68f34212fe257219981e43adfe4c96ab48f42cd";
+          sha256 = "00ny0khwbcv9n7kbnc2mfl07sp6dyp4xc5y4wiqvsgj66gb90yf7";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/cache";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/cache";
+        rev = "56173531277692bc2925924d51fda1cd0a6b8178";
+          sha256 = "05b2bbndkdr5z63f2xz4z1k8ls3zz7xi17vkhqnz0g0dvsx34l38";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/captcha";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/captcha";
+        rev = "8aa5919789ab301e865595eb4b1114d6b9847deb";
+          sha256 = "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/csrf";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/csrf";
+        rev = "715bca06a911dbd91c4f1d9ec65fd329664b5211";
+          sha256 = "1jljqv96ib5iih0jx7smsykbsfc0wy33salf19djad5xb64clpmi";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/gzip";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/gzip";
+        rev = "cad1c6580a07c56f5f6bc52d66002a05985c5854";
+          sha256 = "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/i18n";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/i18n";
+        rev = "d2d3329f13b52314f3292c4cecb601fad13f02c8";
+          sha256 = "18f59fkw3wy5b80x8jcqnywqscs7qvj7cnfi85d23m9kq353pifs";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/inject";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/inject";
+        rev = "c5ab7bf3a307593cd44cb272d1a5beea473dd072";
+          sha256 = "0v7plrgwx9qn9iknm7p5fr5c53zzx5aaqvdcgyh6hnfwjjf5zny4";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/session";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/session";
+        rev = "66031fcb37a0fff002a1f028eb0b3a815c78306b";
+          sha256 = "0h6l1af93cipcmy3p6asw79cbmhkl34rmf0nyzywpm2pmn7pqznc";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-macaron/toolbox";
+
+      src = fetchgit {
+        url = "https://github.com/go-macaron/toolbox";
+        rev = "82b511550b0aefc36b3a28062ad3a52e812bee38";
+          sha256 = "1s2psf7sw3asag3hnw0n3ah6ywwghf2p4yn4m0pf5d9883sf4pgm";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-sql-driver/mysql";
+
+      src = fetchgit {
+        url = "https://github.com/go-sql-driver/mysql";
+        rev = "71f003c6e927d2550713e7637affb769977ece78";
+          sha256 = "197x3hlmgaw736hyvyxla1m2c6bcwif68zjvk3qd7mxxbfi5ic6s";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-xorm/core";
+
+      src = fetchgit {
+        url = "https://github.com/go-xorm/core";
+        rev = "9ddf4ee12e7a370dacf0092d9896979ae6e3fb16";
+          sha256 = "1qn7kgfyc7yv78ggwc8w2f75jklbm68a4wirglysf8kf70l3m773";
+      };
+    }
+    {
+      goPackagePath = "github.com/go-xorm/xorm";
+
+      src = fetchgit {
+        url = "https://github.com/go-xorm/xorm";
+        rev = "67d038a63f23ce98f7fbc5ef3a87075d82d50f93";
+          sha256 = "0qk1h3ihdl0mqmi28gljxx46lnngjh4l80zrxvlsqlwrlj95yw7k";
+      };
+    }
+    {
+      goPackagePath = "github.com/gogits/chardet";
+
+      src = fetchgit {
+        url = "https://github.com/gogits/chardet";
+        rev = "2404f777256163ea3eadb273dada5dcb037993c0";
+          sha256 = "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd";
+      };
+    }
+    {
+      goPackagePath = "github.com/gogits/cron";
+
+      src = fetchgit {
+        url = "https://github.com/gogits/cron";
+        rev = "3abc0f88f2062336bcc41b43a4febbd847a390ce";
+          sha256 = "0y3z048wym595w8rgngz2mpd1bg8gc282li1l0bmg5q8a4hyb0x5";
+      };
+    }
+    {
+      goPackagePath = "github.com/gogits/git-module";
+
+      src = fetchgit {
+        url = "https://github.com/gogits/git-module";
+        rev = "a1c50966a193fa4cfc9a9142c59189348c97387c";
+          sha256 = "1xaffyzgbif84n73s79g8yynpp89d61lajn0y0vf4pnkh1j500v0";
+      };
+    }
+    {
+      goPackagePath = "github.com/gogits/go-gogs-client";
+
+      src = fetchgit {
+        url = "https://github.com/gogits/go-gogs-client";
+        rev = "d584b1e0fb4d8ad0e8cf2fae2368838f2526b408";
+          sha256 = "1g9kb0bj50dnwh261r3sq00jy1d8pyywh3ybav83lnmn95sbzsns";
+      };
+    }
+    {
+      goPackagePath = "github.com/gogits/gogs";
+
+      src = fetchgit {
+        url = "https://github.com/gogits/gogs.git";
+        rev = "d320915ad2a7b4bbab075b98890aa50f91f0ced5";
+          sha256 = "0wpyn3linpb9jgqrpzbmmgn2s54rdhnqv286x2vj4lrngjc8xbc7";
+      };
+    }
+    {
+      goPackagePath = "github.com/issue9/identicon";
+
+      src = fetchgit {
+        url = "https://github.com/issue9/identicon";
+        rev = "f8c0d2ce04db79c663b1da33d3a9f62be753ee88";
+          sha256 = "0zilbp4dqmbslhs9p10gb04xggf3z0xlr0vw2g7c5gyc2w02q27f";
+      };
+    }
+    {
+      goPackagePath = "github.com/klauspost/compress";
+
+      src = fetchgit {
+        url = "https://github.com/klauspost/compress";
+        rev = "f9625351863b5e94c1da72862187b8fe9a91af90";
+          sha256 = "0yjl58zk2dlb1jvgc3frnhgbsrc680ajkpb8bbyd9m5d21hmkq56";
+      };
+    }
+    {
+      goPackagePath = "github.com/klauspost/cpuid";
+
+      src = fetchgit {
+        url = "https://github.com/klauspost/cpuid";
+        rev = "2c698c6aef5976c7860074cc7040e8af7866aa21";
+          sha256 = "1gyxikc62ivs0yf6d4kpbj2038pwyziz47v1vn4qxg4phr2rd5h7";
+      };
+    }
+    {
+      goPackagePath = "github.com/klauspost/crc32";
+
+      src = fetchgit {
+        url = "https://github.com/klauspost/crc32";
+        rev = "19b0b332c9e4516a6370a0456e6182c3b5036720";
+          sha256 = "0r11v6vaqg49sa8zvxh2y6md4pp0sfh4ia43gsw1arwwlsah39vz";
+      };
+    }
+    {
+      goPackagePath = "github.com/lib/pq";
+
+      src = fetchgit {
+        url = "https://github.com/lib/pq";
+        rev = "69552e54d2a9d4c6a2438926a774930f7bc398ec";
+          sha256 = "1y9923j9yl1qqizsy80mzaylg4ysyqp6gyrf85x91x17p2adq2ll";
+      };
+    }
+    ] ++ (lib.optional (sqliteSupport) {
+      goPackagePath = "github.com/mattn/go-sqlite3";
+
+      src = fetchgit {
+        url = "https://github.com/mattn/go-sqlite3";
+        rev = "09d5c451710ef887470709463f4f04ff83e1e039";
+          sha256 = "16c8vl9j693gb0q2cqv5ijnxdvfgnpm1sgaicbpd25lbqningcfc";
+      };
+    }) ++ [
+    {
+      goPackagePath = "github.com/mcuadros/go-version";
+
+      src = fetchgit {
+        url = "https://github.com/mcuadros/go-version";
+        rev = "d52711f8d6bea8dc01efafdb68ad95a4e2606630";
+          sha256 = "1b4h6557y5aar74bi1xqmpm4zr1kla95x9q49k48w99n3sis3h7m";
+      };
+    }
+    {
+      goPackagePath = "github.com/microcosm-cc/bluemonday";
+
+      src = fetchgit {
+        url = "https://github.com/microcosm-cc/bluemonday";
+        rev = "4ac6f27528d0a3f2a59e0b0a6f6b3ff0bb89fe20";
+          sha256 = "0xacnj369mhpff6zykm9rykh7r2i4c6mjfmg5cd1ra4irpskx5sb";
+      };
+    }
+    {
+      goPackagePath = "github.com/nfnt/resize";
+
+      src = fetchgit {
+        url = "https://github.com/nfnt/resize";
+        rev = "4d93a29130b1b6aba503e2aa8b50f516213ea80e";
+          sha256 = "1s6z241726nd1xd5rwlnj6l4p0na4v20ibfg5sh9cp7pl98mn5gv";
+      };
+    }
+    {
+      goPackagePath = "github.com/russross/blackfriday";
+
+      src = fetchgit {
+        url = "https://github.com/russross/blackfriday";
+        rev = "006144af03eeeff1037240a71865a9fd61f1c25f";
+          sha256 = "1z9zdkxgyk10xngyk55f0433ix6q9kwfrcyljj6xaqjb19wldz7j";
+      };
+    }
+    {
+      goPackagePath = "github.com/satori/go.uuid";
+
+      src = fetchgit {
+        url = "https://github.com/satori/go.uuid";
+        rev = "e673fdd4dea8a7334adbbe7f57b7e4b00bdc5502";
+          sha256 = "0nm2dqj87vvv1bmcfl3x9k6kal655yfamxnb7xkfzqkvldigy0qf";
+      };
+    }
+    {
+      goPackagePath = "github.com/sergi/go-diff";
+
+      src = fetchgit {
+        url = "https://github.com/sergi/go-diff";
+        rev = "ec7fdbb58eb3e300c8595ad5ac74a5aa50019cc7";
+          sha256 = "049xnl182h5q8fs5z70wb9yh9jvi98h4v3z13xps2rys9xl9rh5x";
+      };
+    }
+    {
+      goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+
+      src = fetchgit {
+        url = "https://github.com/shurcooL/sanitized_anchor_name";
+        rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77";
+          sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01";
+      };
+    }
+    {
+      goPackagePath = "golang.org/x/crypto";
+
+      src = fetchgit {
+        url = "https://go.googlesource.com/crypto";
+        rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3";
+          sha256 = "0b2s9gidpy2r85z0n9w2knh3dkfhjg89z3lyi620vcf1li6qhdl3";
+      };
+    }
+    {
+      goPackagePath = "golang.org/x/net";
+
+      src = fetchgit {
+        url = "https://go.googlesource.com/net";
+        rev = "6acef71eb69611914f7a30939ea9f6e194c78172";
+          sha256 = "0vy75lfl2viiikp3k9626g3ncxq6vpnwmhkgyaxdnq14hb4xgw2k";
+      };
+    }
+    {
+      goPackagePath = "golang.org/x/text";
+
+      src = fetchgit {
+        url = "https://go.googlesource.com/text";
+        rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34";
+          sha256 = "1wm63llpn1ix85f47ac3c9jx92i9cfbdw2ih7p8gdq964k7px53c";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/asn1-ber.v1";
+
+      src = fetchgit {
+        url = "https://gopkg.in/asn1-ber.v1";
+        rev = "4e86f4367175e39f69d9358a5f17b4dda270378d";
+          sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/bufio.v1";
+
+      src = fetchgit {
+        url = "https://gopkg.in/bufio.v1";
+        rev = "567b2bfa514e796916c4747494d6ff5132a1dfce";
+          sha256 = "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/gomail.v2";
+
+      src = fetchgit {
+        url = "https://gopkg.in/gomail.v2";
+        rev = "fbb71ddc63acd07dd0ed49ababdf02c551e2539a";
+          sha256 = "1q8xa51bxcmbwsww8s2x42152w1xn553xmmpyq5jz66a2vf1wlvl";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/ini.v1";
+
+      src = fetchgit {
+        url = "https://gopkg.in/ini.v1";
+        rev = "776aa739ce9373377cd16f526cdf06cb4c89b40f";
+          sha256 = "04pmr4mdvpzawpxinwqpas4ksjzq54q5a0qapw0kkb651p06vqhn";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/ldap.v2";
+
+      src = fetchgit {
+        url = "https://gopkg.in/ldap.v2";
+        rev = "07a7330929b9ee80495c88a4439657d89c7dbd87";
+          sha256 = "0qsy0ldvkd0rhh6wfdrm51145ps9sd8nc8qx3fw1f90irb3a71sh";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/macaron.v1";
+
+      src = fetchgit {
+        url = "https://gopkg.in/macaron.v1";
+        rev = "b9eee382bef2f2f678fadbcf368fc1e52306bed1";
+          sha256 = "1rbj1l8742vgar4zchf4r203qvids9vv0iz9a20l5585xz21cmsj";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/redis.v2";
+
+      src = fetchgit {
+        url = "https://gopkg.in/redis.v2";
+        rev = "e6179049628164864e6e84e973cfb56335748dea";
+          sha256 = "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h";
+      };
+    }
+  ];
+}
diff --git a/pkgs/applications/version-management/gogs/default.nix.patch b/pkgs/applications/version-management/gogs/default.nix.patch
new file mode 100644
index 00000000000..f9b6b3aafbc
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/default.nix.patch
@@ -0,0 +1,22 @@
+2,3c2
+< #with import <nixpkgs> {};
+< { stdenv, lib, go, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+---
+> { stdenv, lib, makeWrapper, go, goPackages, git, fetchgit, sqliteSupport ? true }:
+12,15c11,12
+<   buildInputs = [ go ];
+<   
+<   buildFlags = "--tags sqlite";
+<   
+---
+>   buildInputs = [ makeWrapper go ];
+>   buildFlags = lib.optional (sqliteSupport) "-tags sqlite";
+17a15,22
+>   postInstall = ''
+>     wrapProgram $bin/bin/gogs \
+>       --prefix PATH : ${git}/bin \
+>       --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
+>       --run 'cd "$GOGS_WORK_DIR"' \
+>       --run "ln -fs $out/share/go/src/${goPackagePath}/{public,templates} ."
+>   '';
+> 
diff --git a/pkgs/applications/version-management/gogs/gogs-definition.nix b/pkgs/applications/version-management/gogs/gogs-definition.nix
new file mode 100644
index 00000000000..62698608197
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/gogs-definition.nix
@@ -0,0 +1,74 @@
+with import <nixpkgs> {};
+
+let
+  # My go2nix fork to be able to build in a pure environment,
+  # with build tags support, fixed bugs that affected Gogs
+  # and with latest nix-prefetch-git output style.
+  my-go2nix = lib.overrideDerivation go2nix (oldAttrs: {
+    src = fetchFromGitHub {
+      rev = "336ac3d93272860c9d8f518f43ce6f70c3b11bf4";
+      owner = "valeriangalliat";
+      repo = "go2nix";
+      sha256 = "0m9srjcl9lrphl4gsrscibf2c7yz2kmmja9qylbli4lwjw53g7p7";
+    };
+
+    buildInputs = [ makeWrapper ] ++ oldAttrs.buildInputs;
+
+    preFixup = "";
+
+    postInstall = ''
+      wrapProgram $bin/bin/go2nix \
+        --prefix PATH : ${nix-prefetch-git}/bin  \
+        --prefix PATH : ${git}/bin  \
+    '';
+
+    disallowedReferences = [];
+  });
+
+  # Fetch a Go tree from a Go package repository and build tags.
+  # All dependencies are fetched according to `go get` rules, so the
+  # output of this derivation is not deterministic (but that's the
+  # point since we use it to automatically update the package and its
+  # dependencies).
+  fetchgo =
+    { goPackagePath, url, rev ? "HEAD", tags ? [] }:
+    stdenv.mkDerivation {
+      name = builtins.replaceStrings ["/"] ["_"] goPackagePath;
+      buildInputs = [ go git ];
+      phases = [ "installPhase" ];
+
+      installPhase = ''
+        export GOPATH=$out
+        repo=$out/src/${goPackagePath}
+        mkdir -p $repo
+        git clone ${url} $repo
+        cd $repo
+        git reset --hard ${rev}
+        go get -v -d -tags ${builtins.concatStringsSep "," tags}
+      '';
+    };
+
+  goPackagePath = "github.com/gogits/gogs";
+  url = "https://${goPackagePath}.git";
+  rev = "d320915ad2a7b4bbab075b98890aa50f91f0ced5";
+  tags = [ "sqlite" ];
+
+in
+
+stdenv.mkDerivation {
+  name = "gogs-definition";
+
+  src = fetchgo {
+    inherit goPackagePath url rev tags;
+   };
+
+  buildInputs = [ nix my-go2nix.bin ];
+
+  installPhase = ''
+    export GOPATH=$PWD
+    cd src/${goPackagePath}
+    go2nix save --tags ${builtins.concatStringsSep "," tags}
+    patch default.nix < ${./default.nix.patch}
+    cat default.nix | awk -f ${./sqlite.awk} | sed '/# can be improved/d' > $out
+  '';
+}
diff --git a/pkgs/applications/version-management/gogs/sqlite.awk b/pkgs/applications/version-management/gogs/sqlite.awk
new file mode 100644
index 00000000000..40c73261cef
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/sqlite.awk
@@ -0,0 +1,21 @@
+/goPackagePath/ && /sqlite/ {
+  sqlite=1
+  prev="    ] ++ (lib.optional (sqliteSupport) {"
+}
+
+sqlite && /}$/ {
+  sqlite=0
+  $0="    }) ++ ["
+}
+
+NR > 1 {
+  print prev
+}
+
+{
+  prev=$0
+}
+
+END {
+  print prev
+}
diff --git a/pkgs/applications/version-management/gogs/update-gogs-definition b/pkgs/applications/version-management/gogs/update-gogs-definition
new file mode 100755
index 00000000000..b467af463f1
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/update-gogs-definition
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+#
+# Regenerates `default.nix` using `gogs-definition.nix`.
+#
+# The latter should be updated to a new revision of Gogs in order
+# to update.
+#
+
+cat "$(nix-build --no-out-link gogs-definition.nix)" > default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8b7341cd39..5250906c66f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1865,6 +1865,8 @@ in
 
   gitstats = callPackage ../applications/version-management/gitstats { };
 
+  gogs = callPackage ../applications/version-management/gogs { };
+
   git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };
 
   glusterfs = callPackage ../tools/filesystems/glusterfs { };

From 5a7d267ec3211b21c8f56cdd9dd8e031bcc2745e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= <val@codejam.info>
Date: Thu, 28 Jul 2016 11:22:53 -0400
Subject: [PATCH 004/727] Gogs: use new go2nix and `goPackages` format

Introduced with #16017.
---
 .../version-management/gogs/default.nix       | 434 +-----------------
 .../version-management/gogs/default.nix.patch |  22 -
 .../version-management/gogs/deps.json         | 425 +++++++++++++++++
 .../gogs/gogs-definition.nix                  |  74 ---
 .../version-management/gogs/sqlite.awk        |  21 -
 .../gogs/update-gogs-definition               |   9 -
 6 files changed, 433 insertions(+), 552 deletions(-)
 delete mode 100644 pkgs/applications/version-management/gogs/default.nix.patch
 create mode 100644 pkgs/applications/version-management/gogs/deps.json
 delete mode 100644 pkgs/applications/version-management/gogs/gogs-definition.nix
 delete mode 100644 pkgs/applications/version-management/gogs/sqlite.awk
 delete mode 100755 pkgs/applications/version-management/gogs/update-gogs-definition

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index a8ba4928872..1e237b70615 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -1,15 +1,12 @@
-# This file was generated by go2nix.
-{ stdenv, lib, makeWrapper, go, goPackages, git, fetchgit, sqliteSupport ? true }:
-
-with goPackages;
+{ stdenv, buildGoPackage, fetchgit, makeWrapper, git, sqliteSupport ? true  }:
 
 buildGoPackage rec {
   name = "gogs-${version}";
-  version = "20160227-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "d320915ad2a7b4bbab075b98890aa50f91f0ced5";
+  version = "20160728-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "ad7ea88923e371df7558835d8f3e0236cfdf69ba";
 
-  buildInputs = [ makeWrapper go ];
-  buildFlags = lib.optional (sqliteSupport) "-tags sqlite";
+  buildInputs = [ makeWrapper ];
+  buildFlags = stdenv.lib.optional (sqliteSupport) "-tags sqlite";
   goPackagePath = "github.com/gogits/gogs";
 
   postInstall = ''
@@ -22,424 +19,9 @@ buildGoPackage rec {
 
   src = fetchgit {
     inherit rev;
-    url = "https://github.com/gogits/gogs.git";
-    sha256 = "0wpyn3linpb9jgqrpzbmmgn2s54rdhnqv286x2vj4lrngjc8xbc7";
+    url = "https://github.com/gogits/gogs";
+    sha256 = "0vgkhpwvj79shpi3bq2sr1nza53fidmnbmh814ic09jnb2dilnrm";
   };
 
-  extraSrcs = [
-    {
-      goPackagePath = "github.com/Unknwon/cae";
-
-      src = fetchgit {
-        url = "https://github.com/Unknwon/cae";
-        rev = "7f5e046bc8a6c3cde743c233b96ee4fd84ee6ecd";
-          sha256 = "1sp9mlm42r50ydsk1dyyhshrryy364pjdj8m275b5av8yg374dq2";
-      };
-    }
-    {
-      goPackagePath = "github.com/Unknwon/com";
-
-      src = fetchgit {
-        url = "https://github.com/Unknwon/com";
-        rev = "28b053d5a2923b87ce8c5a08f3af779894a72758";
-          sha256 = "1nq7pdjczgllm0yb2dlgr6zclwpwabl9a86dyw4bz0zd6qginfxy";
-      };
-    }
-    {
-      goPackagePath = "github.com/Unknwon/i18n";
-
-      src = fetchgit {
-        url = "https://github.com/Unknwon/i18n";
-        rev = "3b48b6662051bed72d36efa3c1e897bdf96b2e37";
-          sha256 = "1h18024641z473gx1ghwxd741c5sbhww4zsc0f3wwig6dghsfy0f";
-      };
-    }
-    {
-      goPackagePath = "github.com/Unknwon/paginater";
-
-      src = fetchgit {
-        url = "https://github.com/Unknwon/paginater";
-        rev = "7748a72e01415173a27d79866b984328e7b0c12b";
-          sha256 = "11lf3grqdr7ynhm39xp7siihf7b7v5p7r1vf9f3lbnyy99092v9p";
-      };
-    }
-    {
-      goPackagePath = "github.com/bradfitz/gomemcache";
-
-      src = fetchgit {
-        url = "https://github.com/bradfitz/gomemcache";
-        rev = "fb1f79c6b65acda83063cbc69f6bba1522558bfc";
-          sha256 = "0s4azbz3q681psi31r6z1697rkhqpaap8lif9yg85v6fc0zm7wvc";
-      };
-    }
-    {
-      goPackagePath = "github.com/codegangsta/cli";
-
-      src = fetchgit {
-        url = "https://github.com/codegangsta/cli";
-        rev = "a2943485b110df8842045ae0600047f88a3a56a1";
-          sha256 = "1hdbr6riv7j4all09w2a5zdc27fq11rf005v7v3wdccq07zmsmaa";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/binding";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/binding";
-        rev = "a68f34212fe257219981e43adfe4c96ab48f42cd";
-          sha256 = "00ny0khwbcv9n7kbnc2mfl07sp6dyp4xc5y4wiqvsgj66gb90yf7";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/cache";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/cache";
-        rev = "56173531277692bc2925924d51fda1cd0a6b8178";
-          sha256 = "05b2bbndkdr5z63f2xz4z1k8ls3zz7xi17vkhqnz0g0dvsx34l38";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/captcha";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/captcha";
-        rev = "8aa5919789ab301e865595eb4b1114d6b9847deb";
-          sha256 = "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/csrf";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/csrf";
-        rev = "715bca06a911dbd91c4f1d9ec65fd329664b5211";
-          sha256 = "1jljqv96ib5iih0jx7smsykbsfc0wy33salf19djad5xb64clpmi";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/gzip";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/gzip";
-        rev = "cad1c6580a07c56f5f6bc52d66002a05985c5854";
-          sha256 = "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/i18n";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/i18n";
-        rev = "d2d3329f13b52314f3292c4cecb601fad13f02c8";
-          sha256 = "18f59fkw3wy5b80x8jcqnywqscs7qvj7cnfi85d23m9kq353pifs";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/inject";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/inject";
-        rev = "c5ab7bf3a307593cd44cb272d1a5beea473dd072";
-          sha256 = "0v7plrgwx9qn9iknm7p5fr5c53zzx5aaqvdcgyh6hnfwjjf5zny4";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/session";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/session";
-        rev = "66031fcb37a0fff002a1f028eb0b3a815c78306b";
-          sha256 = "0h6l1af93cipcmy3p6asw79cbmhkl34rmf0nyzywpm2pmn7pqznc";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-macaron/toolbox";
-
-      src = fetchgit {
-        url = "https://github.com/go-macaron/toolbox";
-        rev = "82b511550b0aefc36b3a28062ad3a52e812bee38";
-          sha256 = "1s2psf7sw3asag3hnw0n3ah6ywwghf2p4yn4m0pf5d9883sf4pgm";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-sql-driver/mysql";
-
-      src = fetchgit {
-        url = "https://github.com/go-sql-driver/mysql";
-        rev = "71f003c6e927d2550713e7637affb769977ece78";
-          sha256 = "197x3hlmgaw736hyvyxla1m2c6bcwif68zjvk3qd7mxxbfi5ic6s";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-xorm/core";
-
-      src = fetchgit {
-        url = "https://github.com/go-xorm/core";
-        rev = "9ddf4ee12e7a370dacf0092d9896979ae6e3fb16";
-          sha256 = "1qn7kgfyc7yv78ggwc8w2f75jklbm68a4wirglysf8kf70l3m773";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-xorm/xorm";
-
-      src = fetchgit {
-        url = "https://github.com/go-xorm/xorm";
-        rev = "67d038a63f23ce98f7fbc5ef3a87075d82d50f93";
-          sha256 = "0qk1h3ihdl0mqmi28gljxx46lnngjh4l80zrxvlsqlwrlj95yw7k";
-      };
-    }
-    {
-      goPackagePath = "github.com/gogits/chardet";
-
-      src = fetchgit {
-        url = "https://github.com/gogits/chardet";
-        rev = "2404f777256163ea3eadb273dada5dcb037993c0";
-          sha256 = "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd";
-      };
-    }
-    {
-      goPackagePath = "github.com/gogits/cron";
-
-      src = fetchgit {
-        url = "https://github.com/gogits/cron";
-        rev = "3abc0f88f2062336bcc41b43a4febbd847a390ce";
-          sha256 = "0y3z048wym595w8rgngz2mpd1bg8gc282li1l0bmg5q8a4hyb0x5";
-      };
-    }
-    {
-      goPackagePath = "github.com/gogits/git-module";
-
-      src = fetchgit {
-        url = "https://github.com/gogits/git-module";
-        rev = "a1c50966a193fa4cfc9a9142c59189348c97387c";
-          sha256 = "1xaffyzgbif84n73s79g8yynpp89d61lajn0y0vf4pnkh1j500v0";
-      };
-    }
-    {
-      goPackagePath = "github.com/gogits/go-gogs-client";
-
-      src = fetchgit {
-        url = "https://github.com/gogits/go-gogs-client";
-        rev = "d584b1e0fb4d8ad0e8cf2fae2368838f2526b408";
-          sha256 = "1g9kb0bj50dnwh261r3sq00jy1d8pyywh3ybav83lnmn95sbzsns";
-      };
-    }
-    {
-      goPackagePath = "github.com/gogits/gogs";
-
-      src = fetchgit {
-        url = "https://github.com/gogits/gogs.git";
-        rev = "d320915ad2a7b4bbab075b98890aa50f91f0ced5";
-          sha256 = "0wpyn3linpb9jgqrpzbmmgn2s54rdhnqv286x2vj4lrngjc8xbc7";
-      };
-    }
-    {
-      goPackagePath = "github.com/issue9/identicon";
-
-      src = fetchgit {
-        url = "https://github.com/issue9/identicon";
-        rev = "f8c0d2ce04db79c663b1da33d3a9f62be753ee88";
-          sha256 = "0zilbp4dqmbslhs9p10gb04xggf3z0xlr0vw2g7c5gyc2w02q27f";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/compress";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/compress";
-        rev = "f9625351863b5e94c1da72862187b8fe9a91af90";
-          sha256 = "0yjl58zk2dlb1jvgc3frnhgbsrc680ajkpb8bbyd9m5d21hmkq56";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/cpuid";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/cpuid";
-        rev = "2c698c6aef5976c7860074cc7040e8af7866aa21";
-          sha256 = "1gyxikc62ivs0yf6d4kpbj2038pwyziz47v1vn4qxg4phr2rd5h7";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/crc32";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/crc32";
-        rev = "19b0b332c9e4516a6370a0456e6182c3b5036720";
-          sha256 = "0r11v6vaqg49sa8zvxh2y6md4pp0sfh4ia43gsw1arwwlsah39vz";
-      };
-    }
-    {
-      goPackagePath = "github.com/lib/pq";
-
-      src = fetchgit {
-        url = "https://github.com/lib/pq";
-        rev = "69552e54d2a9d4c6a2438926a774930f7bc398ec";
-          sha256 = "1y9923j9yl1qqizsy80mzaylg4ysyqp6gyrf85x91x17p2adq2ll";
-      };
-    }
-    ] ++ (lib.optional (sqliteSupport) {
-      goPackagePath = "github.com/mattn/go-sqlite3";
-
-      src = fetchgit {
-        url = "https://github.com/mattn/go-sqlite3";
-        rev = "09d5c451710ef887470709463f4f04ff83e1e039";
-          sha256 = "16c8vl9j693gb0q2cqv5ijnxdvfgnpm1sgaicbpd25lbqningcfc";
-      };
-    }) ++ [
-    {
-      goPackagePath = "github.com/mcuadros/go-version";
-
-      src = fetchgit {
-        url = "https://github.com/mcuadros/go-version";
-        rev = "d52711f8d6bea8dc01efafdb68ad95a4e2606630";
-          sha256 = "1b4h6557y5aar74bi1xqmpm4zr1kla95x9q49k48w99n3sis3h7m";
-      };
-    }
-    {
-      goPackagePath = "github.com/microcosm-cc/bluemonday";
-
-      src = fetchgit {
-        url = "https://github.com/microcosm-cc/bluemonday";
-        rev = "4ac6f27528d0a3f2a59e0b0a6f6b3ff0bb89fe20";
-          sha256 = "0xacnj369mhpff6zykm9rykh7r2i4c6mjfmg5cd1ra4irpskx5sb";
-      };
-    }
-    {
-      goPackagePath = "github.com/nfnt/resize";
-
-      src = fetchgit {
-        url = "https://github.com/nfnt/resize";
-        rev = "4d93a29130b1b6aba503e2aa8b50f516213ea80e";
-          sha256 = "1s6z241726nd1xd5rwlnj6l4p0na4v20ibfg5sh9cp7pl98mn5gv";
-      };
-    }
-    {
-      goPackagePath = "github.com/russross/blackfriday";
-
-      src = fetchgit {
-        url = "https://github.com/russross/blackfriday";
-        rev = "006144af03eeeff1037240a71865a9fd61f1c25f";
-          sha256 = "1z9zdkxgyk10xngyk55f0433ix6q9kwfrcyljj6xaqjb19wldz7j";
-      };
-    }
-    {
-      goPackagePath = "github.com/satori/go.uuid";
-
-      src = fetchgit {
-        url = "https://github.com/satori/go.uuid";
-        rev = "e673fdd4dea8a7334adbbe7f57b7e4b00bdc5502";
-          sha256 = "0nm2dqj87vvv1bmcfl3x9k6kal655yfamxnb7xkfzqkvldigy0qf";
-      };
-    }
-    {
-      goPackagePath = "github.com/sergi/go-diff";
-
-      src = fetchgit {
-        url = "https://github.com/sergi/go-diff";
-        rev = "ec7fdbb58eb3e300c8595ad5ac74a5aa50019cc7";
-          sha256 = "049xnl182h5q8fs5z70wb9yh9jvi98h4v3z13xps2rys9xl9rh5x";
-      };
-    }
-    {
-      goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
-
-      src = fetchgit {
-        url = "https://github.com/shurcooL/sanitized_anchor_name";
-        rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77";
-          sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/crypto";
-
-      src = fetchgit {
-        url = "https://go.googlesource.com/crypto";
-        rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3";
-          sha256 = "0b2s9gidpy2r85z0n9w2knh3dkfhjg89z3lyi620vcf1li6qhdl3";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/net";
-
-      src = fetchgit {
-        url = "https://go.googlesource.com/net";
-        rev = "6acef71eb69611914f7a30939ea9f6e194c78172";
-          sha256 = "0vy75lfl2viiikp3k9626g3ncxq6vpnwmhkgyaxdnq14hb4xgw2k";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/text";
-
-      src = fetchgit {
-        url = "https://go.googlesource.com/text";
-        rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34";
-          sha256 = "1wm63llpn1ix85f47ac3c9jx92i9cfbdw2ih7p8gdq964k7px53c";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/asn1-ber.v1";
-
-      src = fetchgit {
-        url = "https://gopkg.in/asn1-ber.v1";
-        rev = "4e86f4367175e39f69d9358a5f17b4dda270378d";
-          sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/bufio.v1";
-
-      src = fetchgit {
-        url = "https://gopkg.in/bufio.v1";
-        rev = "567b2bfa514e796916c4747494d6ff5132a1dfce";
-          sha256 = "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/gomail.v2";
-
-      src = fetchgit {
-        url = "https://gopkg.in/gomail.v2";
-        rev = "fbb71ddc63acd07dd0ed49ababdf02c551e2539a";
-          sha256 = "1q8xa51bxcmbwsww8s2x42152w1xn553xmmpyq5jz66a2vf1wlvl";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/ini.v1";
-
-      src = fetchgit {
-        url = "https://gopkg.in/ini.v1";
-        rev = "776aa739ce9373377cd16f526cdf06cb4c89b40f";
-          sha256 = "04pmr4mdvpzawpxinwqpas4ksjzq54q5a0qapw0kkb651p06vqhn";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/ldap.v2";
-
-      src = fetchgit {
-        url = "https://gopkg.in/ldap.v2";
-        rev = "07a7330929b9ee80495c88a4439657d89c7dbd87";
-          sha256 = "0qsy0ldvkd0rhh6wfdrm51145ps9sd8nc8qx3fw1f90irb3a71sh";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/macaron.v1";
-
-      src = fetchgit {
-        url = "https://gopkg.in/macaron.v1";
-        rev = "b9eee382bef2f2f678fadbcf368fc1e52306bed1";
-          sha256 = "1rbj1l8742vgar4zchf4r203qvids9vv0iz9a20l5585xz21cmsj";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/redis.v2";
-
-      src = fetchgit {
-        url = "https://gopkg.in/redis.v2";
-        rev = "e6179049628164864e6e84e973cfb56335748dea";
-          sha256 = "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h";
-      };
-    }
-  ];
+  goDeps = ./deps.json;
 }
diff --git a/pkgs/applications/version-management/gogs/default.nix.patch b/pkgs/applications/version-management/gogs/default.nix.patch
deleted file mode 100644
index f9b6b3aafbc..00000000000
--- a/pkgs/applications/version-management/gogs/default.nix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-2,3c2
-< #with import <nixpkgs> {};
-< { stdenv, lib, go, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
----
-> { stdenv, lib, makeWrapper, go, goPackages, git, fetchgit, sqliteSupport ? true }:
-12,15c11,12
-<   buildInputs = [ go ];
-<   
-<   buildFlags = "--tags sqlite";
-<   
----
->   buildInputs = [ makeWrapper go ];
->   buildFlags = lib.optional (sqliteSupport) "-tags sqlite";
-17a15,22
->   postInstall = ''
->     wrapProgram $bin/bin/gogs \
->       --prefix PATH : ${git}/bin \
->       --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
->       --run 'cd "$GOGS_WORK_DIR"' \
->       --run "ln -fs $out/share/go/src/${goPackagePath}/{public,templates} ."
->   '';
-> 
diff --git a/pkgs/applications/version-management/gogs/deps.json b/pkgs/applications/version-management/gogs/deps.json
new file mode 100644
index 00000000000..f93c53e8b34
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/deps.json
@@ -0,0 +1,425 @@
+[
+  {
+    "goPackagePath": "github.com/Unknwon/cae",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/Unknwon/cae",
+      "rev": "c6aac99ea2cae2ebaf23f26f76b04fe3fcfc9f8c",
+      "sha256": "0j6l1fcs6gp4qw6b9w3pg9fgah18lh1hanfz5y64r6ks244v3l7s"
+    }
+  },
+  {
+    "goPackagePath": "github.com/Unknwon/com",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/Unknwon/com",
+      "rev": "28b053d5a2923b87ce8c5a08f3af779894a72758",
+      "sha256": "09i9slj4zbsqmwkkx9bqi7cgpv6hqby6r98l6qx1wag89qijybz2"
+    }
+  },
+  {
+    "goPackagePath": "github.com/Unknwon/i18n",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/Unknwon/i18n",
+      "rev": "39d6f2727e0698b1021ceb6a77c1801aa92e7d5d",
+      "sha256": "1f4s9srdaqw2yqgc3d76vww3glbwka2f5q4zrwn8bb66kcazbfb7"
+    }
+  },
+  {
+    "goPackagePath": "github.com/Unknwon/paginater",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/Unknwon/paginater",
+      "rev": "7748a72e01415173a27d79866b984328e7b0c12b",
+      "sha256": "0ighsa75ixgx6c4hc397c06lapf0pz50cj3cgkdvssp9an38kw2c"
+    }
+  },
+  {
+    "goPackagePath": "github.com/bradfitz/gomemcache",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/bradfitz/gomemcache",
+      "rev": "fb1f79c6b65acda83063cbc69f6bba1522558bfc",
+      "sha256": "0mq5rn07bbpy2yla7hassrmj966p6r7ffbf9w41l31yy0fc07i68"
+    }
+  },
+  {
+    "goPackagePath": "github.com/codegangsta/cli",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/codegangsta/cli",
+      "rev": "d9021faab69f92295ef7061bd39e4a76dcbdef32",
+      "sha256": "0rwxc84rq6w2adymvffydyvd2va4zxqb6kv9dk7j5iikcs021yn0"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/binding",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/binding",
+      "rev": "9440f336b443056c90d7d448a0a55ad8c7599880",
+      "sha256": "0g3ya3h8vjaykgp1npdxbizcf8kzv4m47vymcsq06vpihrfhbvg7"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/cache",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/cache",
+      "rev": "56173531277692bc2925924d51fda1cd0a6b8178",
+      "sha256": "1116a22wm43q2l54nnycgli90kix787j20mpgya9qb6xnglcck59"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/captcha",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/captcha",
+      "rev": "8aa5919789ab301e865595eb4b1114d6b9847deb",
+      "sha256": "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/csrf",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/csrf",
+      "rev": "6a9a7df172cc1fcd81e4585f44b09200b6087cc0",
+      "sha256": "173da2hl9fcfgkn0nv1ws3pr0gyyp88amhj2bfk4414k5a3r0nsa"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/gzip",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/gzip",
+      "rev": "cad1c6580a07c56f5f6bc52d66002a05985c5854",
+      "sha256": "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/i18n",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/i18n",
+      "rev": "ef57533c3b0fc2d8581deda14937e52f11a203ab",
+      "sha256": "1nkrcnpjl3x6fhjss2vp29mnvam20vpvxvxpfg1zspi1rjmpyhqy"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/inject",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/inject",
+      "rev": "d8a0b8677191f4380287cfebd08e462217bac7ad",
+      "sha256": "0p47pz699xhmi8yxhahvrpai9r49rqap5ckwmz1dlkrnh3zwhrhh"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/session",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/session",
+      "rev": "66031fcb37a0fff002a1f028eb0b3a815c78306b",
+      "sha256": "1prrfv8xdlyxrdbagbqzjkx69x74hjzif5ki4lzl2y6fk3nb0cd5"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-macaron/toolbox",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-macaron/toolbox",
+      "rev": "99a42f20e9e88daec5c0d7beb4e7eac134680ab0",
+      "sha256": "0r6ksiqzrii7b9vv8daz68044pyifsxmpz48m6h8m6l3h9ygz8cx"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-sql-driver/mysql",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-sql-driver/mysql",
+      "rev": "3654d25ec346ee8ce71a68431025458d52a38ac0",
+      "sha256": "0yr44mbx8632ynhmy8hg5ybwsqsc7byy3n7aqawq7jgih83ivdvq"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-xorm/core",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-xorm/core",
+      "rev": "bc1b7f81f0e369289078424064634a5ee7d21051",
+      "sha256": "01y3bk0yxw0chbi834ykda0bfxr4xaarkbb237k4x5sj3wcv30v1"
+    }
+  },
+  {
+    "goPackagePath": "github.com/go-xorm/xorm",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-xorm/xorm",
+      "rev": "dddc985b860d64f7b6370afd65a8316425e13181",
+      "sha256": "0wmcvrw50d0hk35wrxjky8hmhmqpjf49zq9vfj36ai7qrn7vhvlr"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gogits/chardet",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gogits/chardet",
+      "rev": "2404f777256163ea3eadb273dada5dcb037993c0",
+      "sha256": "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gogits/cron",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gogits/cron",
+      "rev": "96040e4fab17baa0391ce571694e4ccb5fce5dac",
+      "sha256": "1a1f38mzjhdz7n5fclxq2ninqngcqjqx1jy1p4533an3jyjhyh10"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gogits/git-module",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gogits/git-module",
+      "rev": "53bcb7352ff838610c537c9b589ca79bca92c661",
+      "sha256": "1xk63sccq0gapgrz5a0y2fi4vifqalgrypcv1yhiq53ha3r4fkya"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gogits/go-gogs-client",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gogits/go-gogs-client",
+      "rev": "442b4e5ddc8029932c91872f8322fb7a2c2de858",
+      "sha256": "0nllqias2kv2fs2dlp2vxxi9nkw3mgm84j6s3n9ccixk7bkxc6a6"
+    }
+  },
+  {
+    "goPackagePath": "github.com/gogits/gogs",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/gogits/gogs",
+      "rev": "ad7ea88923e371df7558835d8f3e0236cfdf69ba",
+      "sha256": "0vgkhpwvj79shpi3bq2sr1nza53fidmnbmh814ic09jnb2dilnrm"
+    }
+  },
+  {
+    "goPackagePath": "github.com/issue9/identicon",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/issue9/identicon",
+      "rev": "d36b54562f4cf70c83653e13dc95c220c79ef521",
+      "sha256": "0y82b3gq8rpqglvf3lsqhgp5djfdammwd1w24k3i97iqls0rch7l"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jaytaylor/html2text",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jaytaylor/html2text",
+      "rev": "52d9b785554a1918cb09909b89a1509a98b853fd",
+      "sha256": "1hhvabh01ghbpxml245w1786vcxhaaqvcrjssfw0aph1idc9rwix"
+    }
+  },
+  {
+    "goPackagePath": "github.com/klauspost/compress",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/klauspost/compress",
+      "rev": "14eb9c4951195779ecfbec34431a976de7335b0a",
+      "sha256": "0lzkifj6jb365wvk340zywpiah7g16zkd5f7pcbi0gjym0a9ljvc"
+    }
+  },
+  {
+    "goPackagePath": "github.com/klauspost/cpuid",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/klauspost/cpuid",
+      "rev": "09cded8978dc9e80714c4d85b0322337b0a1e5e0",
+      "sha256": "05l8pfch0gvxh0khapwxhsk4xajn40vbjr360n49vh2z5531v2xq"
+    }
+  },
+  {
+    "goPackagePath": "github.com/klauspost/crc32",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/klauspost/crc32",
+      "rev": "19b0b332c9e4516a6370a0456e6182c3b5036720",
+      "sha256": "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r"
+    }
+  },
+  {
+    "goPackagePath": "github.com/lib/pq",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/lib/pq",
+      "rev": "4dd446efc17690bc53e154025146f73203b18309",
+      "sha256": "14idja467kcz2zlbqv07q3wp939khq620163fr5hhl7x362l5di6"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mattn/go-sqlite3",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mattn/go-sqlite3",
+      "rev": "e118d4451349065b8e7ce0f0af32e033995363f8",
+      "sha256": "1bf5mazb6h7mpvf0g8bxbpzb6kzsbm1qx1scs57x52zsb1la317k"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mcuadros/go-version",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mcuadros/go-version",
+      "rev": "d52711f8d6bea8dc01efafdb68ad95a4e2606630",
+      "sha256": "08ps27vvn77jhrnks8p8mx5cwgb1ikhaddcnrpgpz7aq905a5kzn"
+    }
+  },
+  {
+    "goPackagePath": "github.com/microcosm-cc/bluemonday",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/microcosm-cc/bluemonday",
+      "rev": "9dc199233bf72cc1aad9b61f73daf2f0075b9ee4",
+      "sha256": "067v28gj25niabi29h958af494b6kwfs60mdsvwa4bl99613i8ja"
+    }
+  },
+  {
+    "goPackagePath": "github.com/nfnt/resize",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/nfnt/resize",
+      "rev": "891127d8d1b52734debe1b3c3d7e747502b6c366",
+      "sha256": "08lg2v4s1iyzqja7xb69d57gpz1y43yqfwv7i4fa7a06m595r9iw"
+    }
+  },
+  {
+    "goPackagePath": "github.com/russross/blackfriday",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/russross/blackfriday",
+      "rev": "93622da34e54fb6529bfb7c57e710f37a8d9cbd8",
+      "sha256": "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2"
+    }
+  },
+  {
+    "goPackagePath": "github.com/satori/go.uuid",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/satori/go.uuid",
+      "rev": "0aa62d5ddceb50dbcb909d790b5345affd3669b6",
+      "sha256": "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w"
+    }
+  },
+  {
+    "goPackagePath": "github.com/sergi/go-diff",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/sergi/go-diff",
+      "rev": "ec7fdbb58eb3e300c8595ad5ac74a5aa50019cc7",
+      "sha256": "1lpxhwqbypssj2vhlkj11fircllvxx4n985w6f76id5jany05h2w"
+    }
+  },
+  {
+    "goPackagePath": "github.com/shurcooL/sanitized_anchor_name",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/shurcooL/sanitized_anchor_name",
+      "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77",
+      "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/crypto",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/crypto",
+      "rev": "bc89c496413265e715159bdc8478ee9a92fdc265",
+      "sha256": "0a4s0hxq3gq7ylg6cq4s8m8gx9bjsqsj49p9n7k9pij5daydabcf"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/net",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/net",
+      "rev": "6a513affb38dc9788b449d59ffed099b8de18fa0",
+      "sha256": "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/text",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/text",
+      "rev": "2910a502d2bf9e43193af9d68ca516529614eed3",
+      "sha256": "1h2bxzsnqksnvrk2lplpqzzpp9m9zmd6f2aajyahc56bxb1804jq"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/asn1-ber.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/asn1-ber.v1",
+      "rev": "4e86f4367175e39f69d9358a5f17b4dda270378d",
+      "sha256": "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/bufio.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/bufio.v1",
+      "rev": "567b2bfa514e796916c4747494d6ff5132a1dfce",
+      "sha256": "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/gomail.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/gomail.v2",
+      "rev": "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1",
+      "sha256": "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/ini.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/ini.v1",
+      "rev": "cf53f9204df4fbdd7ec4164b57fa6184ba168292",
+      "sha256": "045nl3hc4mwngr9j1ahrfv2x6izf8y57ij8k6kdgh9xahyhb6rwb"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/ldap.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/ldap.v2",
+      "rev": "537128fee7cca108d8ce74e4309fdfcdd9c7f496",
+      "sha256": "09zvf3q0p3p4czcisv4x0bn5x0carpw35cisnygkxh6s1sp4im9q"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/macaron.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/macaron.v1",
+      "rev": "2133042f8d1022b8253e4e23f7940467941409ce",
+      "sha256": "1z11hkxcmv40qvhqzqn97kymm294kh219fjybvm7p3hz3xgkgcjq"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/redis.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/redis.v2",
+      "rev": "e6179049628164864e6e84e973cfb56335748dea",
+      "sha256": "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h"
+    }
+  }
+]
diff --git a/pkgs/applications/version-management/gogs/gogs-definition.nix b/pkgs/applications/version-management/gogs/gogs-definition.nix
deleted file mode 100644
index 62698608197..00000000000
--- a/pkgs/applications/version-management/gogs/gogs-definition.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-with import <nixpkgs> {};
-
-let
-  # My go2nix fork to be able to build in a pure environment,
-  # with build tags support, fixed bugs that affected Gogs
-  # and with latest nix-prefetch-git output style.
-  my-go2nix = lib.overrideDerivation go2nix (oldAttrs: {
-    src = fetchFromGitHub {
-      rev = "336ac3d93272860c9d8f518f43ce6f70c3b11bf4";
-      owner = "valeriangalliat";
-      repo = "go2nix";
-      sha256 = "0m9srjcl9lrphl4gsrscibf2c7yz2kmmja9qylbli4lwjw53g7p7";
-    };
-
-    buildInputs = [ makeWrapper ] ++ oldAttrs.buildInputs;
-
-    preFixup = "";
-
-    postInstall = ''
-      wrapProgram $bin/bin/go2nix \
-        --prefix PATH : ${nix-prefetch-git}/bin  \
-        --prefix PATH : ${git}/bin  \
-    '';
-
-    disallowedReferences = [];
-  });
-
-  # Fetch a Go tree from a Go package repository and build tags.
-  # All dependencies are fetched according to `go get` rules, so the
-  # output of this derivation is not deterministic (but that's the
-  # point since we use it to automatically update the package and its
-  # dependencies).
-  fetchgo =
-    { goPackagePath, url, rev ? "HEAD", tags ? [] }:
-    stdenv.mkDerivation {
-      name = builtins.replaceStrings ["/"] ["_"] goPackagePath;
-      buildInputs = [ go git ];
-      phases = [ "installPhase" ];
-
-      installPhase = ''
-        export GOPATH=$out
-        repo=$out/src/${goPackagePath}
-        mkdir -p $repo
-        git clone ${url} $repo
-        cd $repo
-        git reset --hard ${rev}
-        go get -v -d -tags ${builtins.concatStringsSep "," tags}
-      '';
-    };
-
-  goPackagePath = "github.com/gogits/gogs";
-  url = "https://${goPackagePath}.git";
-  rev = "d320915ad2a7b4bbab075b98890aa50f91f0ced5";
-  tags = [ "sqlite" ];
-
-in
-
-stdenv.mkDerivation {
-  name = "gogs-definition";
-
-  src = fetchgo {
-    inherit goPackagePath url rev tags;
-   };
-
-  buildInputs = [ nix my-go2nix.bin ];
-
-  installPhase = ''
-    export GOPATH=$PWD
-    cd src/${goPackagePath}
-    go2nix save --tags ${builtins.concatStringsSep "," tags}
-    patch default.nix < ${./default.nix.patch}
-    cat default.nix | awk -f ${./sqlite.awk} | sed '/# can be improved/d' > $out
-  '';
-}
diff --git a/pkgs/applications/version-management/gogs/sqlite.awk b/pkgs/applications/version-management/gogs/sqlite.awk
deleted file mode 100644
index 40c73261cef..00000000000
--- a/pkgs/applications/version-management/gogs/sqlite.awk
+++ /dev/null
@@ -1,21 +0,0 @@
-/goPackagePath/ && /sqlite/ {
-  sqlite=1
-  prev="    ] ++ (lib.optional (sqliteSupport) {"
-}
-
-sqlite && /}$/ {
-  sqlite=0
-  $0="    }) ++ ["
-}
-
-NR > 1 {
-  print prev
-}
-
-{
-  prev=$0
-}
-
-END {
-  print prev
-}
diff --git a/pkgs/applications/version-management/gogs/update-gogs-definition b/pkgs/applications/version-management/gogs/update-gogs-definition
deleted file mode 100755
index b467af463f1..00000000000
--- a/pkgs/applications/version-management/gogs/update-gogs-definition
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-#
-# Regenerates `default.nix` using `gogs-definition.nix`.
-#
-# The latter should be updated to a new revision of Gogs in order
-# to update.
-#
-
-cat "$(nix-build --no-out-link gogs-definition.nix)" > default.nix

From 6101eb2454155baf042a64caed7868421f065127 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 29 Jul 2016 18:32:13 +0200
Subject: [PATCH 005/727] gogs: FIX `public` and `templates` use from `bin`

---
 pkgs/applications/version-management/gogs/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 1e237b70615..9ba36c4311d 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -8,13 +8,17 @@ buildGoPackage rec {
   buildInputs = [ makeWrapper ];
   buildFlags = stdenv.lib.optional (sqliteSupport) "-tags sqlite";
   goPackagePath = "github.com/gogits/gogs";
+  outputs = [ "out" "bin" "data" ];
 
   postInstall = ''
+    mkdir $data
+    cp -R $src/{public,templates} $data
+
     wrapProgram $bin/bin/gogs \
       --prefix PATH : ${git}/bin \
       --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
       --run 'cd "$GOGS_WORK_DIR"' \
-      --run "ln -fs $out/share/go/src/${goPackagePath}/{public,templates} ."
+      --run "ln -fs $data/{public,templates} ."
   '';
 
   src = fetchgit {

From e6ab60dee8201c8168442638344a04d853937907 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Mon, 10 Oct 2016 17:11:58 +0200
Subject: [PATCH 006/727] gogs: 20160304-d57a2b9 -> 0.9.97

---
 .../version-management/gogs/default.nix       |  45 +-
 .../version-management/gogs/deps.json         | 425 ----------------
 .../version-management/gogs/deps.nix          | 452 ++++++++++++++++++
 3 files changed, 483 insertions(+), 439 deletions(-)
 delete mode 100644 pkgs/applications/version-management/gogs/deps.json
 create mode 100644 pkgs/applications/version-management/gogs/deps.nix

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 9ba36c4311d..6a2e0d90a3e 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -1,31 +1,48 @@
-{ stdenv, buildGoPackage, fetchgit, makeWrapper, git, sqliteSupport ? true  }:
+{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper
+, git, coreutils, bash, gzip, openssh
+, sqliteSupport ? true
+}:
 
 buildGoPackage rec {
   name = "gogs-${version}";
-  version = "20160728-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "ad7ea88923e371df7558835d8f3e0236cfdf69ba";
+  version = "0.9.97";
+
+  src = fetchFromGitHub {
+    owner = "gogits";
+    repo = "gogs";
+    rev = "v${version}";
+    sha256 = "151mmd8h5zd4bvafd42nsky0m9gblf5fcpd6jacqcrry1796hxk9";
+  };
+
+  patchPhase = ''
+    substituteInPlace models/repo.go \
+      --replace '#!/usr/bin/env' '#!${coreutils}/bin/env'
+  '';
 
   buildInputs = [ makeWrapper ];
-  buildFlags = stdenv.lib.optional (sqliteSupport) "-tags sqlite";
-  goPackagePath = "github.com/gogits/gogs";
-  outputs = [ "out" "bin" "data" ];
+
+  buildFlags = stdenv.lib.optionalString sqliteSupport "-tags sqlite";
+
+  outputs = [ "bin" "out" "data" ];
 
   postInstall = ''
     mkdir $data
     cp -R $src/{public,templates} $data
 
     wrapProgram $bin/bin/gogs \
-      --prefix PATH : ${git}/bin \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ bash git gzip openssh ]} \
       --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
-      --run 'cd "$GOGS_WORK_DIR"' \
+      --run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \
       --run "ln -fs $data/{public,templates} ."
   '';
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/gogits/gogs";
-    sha256 = "0vgkhpwvj79shpi3bq2sr1nza53fidmnbmh814ic09jnb2dilnrm";
-  };
+  goPackagePath = "github.com/gogits/gogs";
+  goDeps = ./deps.nix;
 
-  goDeps = ./deps.json;
+  meta = {
+    description = "A painless self-hosted Git service";
+    homepage = "https://gogs.io";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ schneefux ];
+  };
 }
diff --git a/pkgs/applications/version-management/gogs/deps.json b/pkgs/applications/version-management/gogs/deps.json
deleted file mode 100644
index f93c53e8b34..00000000000
--- a/pkgs/applications/version-management/gogs/deps.json
+++ /dev/null
@@ -1,425 +0,0 @@
-[
-  {
-    "goPackagePath": "github.com/Unknwon/cae",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/Unknwon/cae",
-      "rev": "c6aac99ea2cae2ebaf23f26f76b04fe3fcfc9f8c",
-      "sha256": "0j6l1fcs6gp4qw6b9w3pg9fgah18lh1hanfz5y64r6ks244v3l7s"
-    }
-  },
-  {
-    "goPackagePath": "github.com/Unknwon/com",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/Unknwon/com",
-      "rev": "28b053d5a2923b87ce8c5a08f3af779894a72758",
-      "sha256": "09i9slj4zbsqmwkkx9bqi7cgpv6hqby6r98l6qx1wag89qijybz2"
-    }
-  },
-  {
-    "goPackagePath": "github.com/Unknwon/i18n",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/Unknwon/i18n",
-      "rev": "39d6f2727e0698b1021ceb6a77c1801aa92e7d5d",
-      "sha256": "1f4s9srdaqw2yqgc3d76vww3glbwka2f5q4zrwn8bb66kcazbfb7"
-    }
-  },
-  {
-    "goPackagePath": "github.com/Unknwon/paginater",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/Unknwon/paginater",
-      "rev": "7748a72e01415173a27d79866b984328e7b0c12b",
-      "sha256": "0ighsa75ixgx6c4hc397c06lapf0pz50cj3cgkdvssp9an38kw2c"
-    }
-  },
-  {
-    "goPackagePath": "github.com/bradfitz/gomemcache",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/bradfitz/gomemcache",
-      "rev": "fb1f79c6b65acda83063cbc69f6bba1522558bfc",
-      "sha256": "0mq5rn07bbpy2yla7hassrmj966p6r7ffbf9w41l31yy0fc07i68"
-    }
-  },
-  {
-    "goPackagePath": "github.com/codegangsta/cli",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/codegangsta/cli",
-      "rev": "d9021faab69f92295ef7061bd39e4a76dcbdef32",
-      "sha256": "0rwxc84rq6w2adymvffydyvd2va4zxqb6kv9dk7j5iikcs021yn0"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/binding",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/binding",
-      "rev": "9440f336b443056c90d7d448a0a55ad8c7599880",
-      "sha256": "0g3ya3h8vjaykgp1npdxbizcf8kzv4m47vymcsq06vpihrfhbvg7"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/cache",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/cache",
-      "rev": "56173531277692bc2925924d51fda1cd0a6b8178",
-      "sha256": "1116a22wm43q2l54nnycgli90kix787j20mpgya9qb6xnglcck59"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/captcha",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/captcha",
-      "rev": "8aa5919789ab301e865595eb4b1114d6b9847deb",
-      "sha256": "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/csrf",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/csrf",
-      "rev": "6a9a7df172cc1fcd81e4585f44b09200b6087cc0",
-      "sha256": "173da2hl9fcfgkn0nv1ws3pr0gyyp88amhj2bfk4414k5a3r0nsa"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/gzip",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/gzip",
-      "rev": "cad1c6580a07c56f5f6bc52d66002a05985c5854",
-      "sha256": "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/i18n",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/i18n",
-      "rev": "ef57533c3b0fc2d8581deda14937e52f11a203ab",
-      "sha256": "1nkrcnpjl3x6fhjss2vp29mnvam20vpvxvxpfg1zspi1rjmpyhqy"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/inject",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/inject",
-      "rev": "d8a0b8677191f4380287cfebd08e462217bac7ad",
-      "sha256": "0p47pz699xhmi8yxhahvrpai9r49rqap5ckwmz1dlkrnh3zwhrhh"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/session",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/session",
-      "rev": "66031fcb37a0fff002a1f028eb0b3a815c78306b",
-      "sha256": "1prrfv8xdlyxrdbagbqzjkx69x74hjzif5ki4lzl2y6fk3nb0cd5"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-macaron/toolbox",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-macaron/toolbox",
-      "rev": "99a42f20e9e88daec5c0d7beb4e7eac134680ab0",
-      "sha256": "0r6ksiqzrii7b9vv8daz68044pyifsxmpz48m6h8m6l3h9ygz8cx"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-sql-driver/mysql",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-sql-driver/mysql",
-      "rev": "3654d25ec346ee8ce71a68431025458d52a38ac0",
-      "sha256": "0yr44mbx8632ynhmy8hg5ybwsqsc7byy3n7aqawq7jgih83ivdvq"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-xorm/core",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-xorm/core",
-      "rev": "bc1b7f81f0e369289078424064634a5ee7d21051",
-      "sha256": "01y3bk0yxw0chbi834ykda0bfxr4xaarkbb237k4x5sj3wcv30v1"
-    }
-  },
-  {
-    "goPackagePath": "github.com/go-xorm/xorm",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/go-xorm/xorm",
-      "rev": "dddc985b860d64f7b6370afd65a8316425e13181",
-      "sha256": "0wmcvrw50d0hk35wrxjky8hmhmqpjf49zq9vfj36ai7qrn7vhvlr"
-    }
-  },
-  {
-    "goPackagePath": "github.com/gogits/chardet",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/gogits/chardet",
-      "rev": "2404f777256163ea3eadb273dada5dcb037993c0",
-      "sha256": "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd"
-    }
-  },
-  {
-    "goPackagePath": "github.com/gogits/cron",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/gogits/cron",
-      "rev": "96040e4fab17baa0391ce571694e4ccb5fce5dac",
-      "sha256": "1a1f38mzjhdz7n5fclxq2ninqngcqjqx1jy1p4533an3jyjhyh10"
-    }
-  },
-  {
-    "goPackagePath": "github.com/gogits/git-module",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/gogits/git-module",
-      "rev": "53bcb7352ff838610c537c9b589ca79bca92c661",
-      "sha256": "1xk63sccq0gapgrz5a0y2fi4vifqalgrypcv1yhiq53ha3r4fkya"
-    }
-  },
-  {
-    "goPackagePath": "github.com/gogits/go-gogs-client",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/gogits/go-gogs-client",
-      "rev": "442b4e5ddc8029932c91872f8322fb7a2c2de858",
-      "sha256": "0nllqias2kv2fs2dlp2vxxi9nkw3mgm84j6s3n9ccixk7bkxc6a6"
-    }
-  },
-  {
-    "goPackagePath": "github.com/gogits/gogs",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/gogits/gogs",
-      "rev": "ad7ea88923e371df7558835d8f3e0236cfdf69ba",
-      "sha256": "0vgkhpwvj79shpi3bq2sr1nza53fidmnbmh814ic09jnb2dilnrm"
-    }
-  },
-  {
-    "goPackagePath": "github.com/issue9/identicon",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/issue9/identicon",
-      "rev": "d36b54562f4cf70c83653e13dc95c220c79ef521",
-      "sha256": "0y82b3gq8rpqglvf3lsqhgp5djfdammwd1w24k3i97iqls0rch7l"
-    }
-  },
-  {
-    "goPackagePath": "github.com/jaytaylor/html2text",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/jaytaylor/html2text",
-      "rev": "52d9b785554a1918cb09909b89a1509a98b853fd",
-      "sha256": "1hhvabh01ghbpxml245w1786vcxhaaqvcrjssfw0aph1idc9rwix"
-    }
-  },
-  {
-    "goPackagePath": "github.com/klauspost/compress",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/klauspost/compress",
-      "rev": "14eb9c4951195779ecfbec34431a976de7335b0a",
-      "sha256": "0lzkifj6jb365wvk340zywpiah7g16zkd5f7pcbi0gjym0a9ljvc"
-    }
-  },
-  {
-    "goPackagePath": "github.com/klauspost/cpuid",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/klauspost/cpuid",
-      "rev": "09cded8978dc9e80714c4d85b0322337b0a1e5e0",
-      "sha256": "05l8pfch0gvxh0khapwxhsk4xajn40vbjr360n49vh2z5531v2xq"
-    }
-  },
-  {
-    "goPackagePath": "github.com/klauspost/crc32",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/klauspost/crc32",
-      "rev": "19b0b332c9e4516a6370a0456e6182c3b5036720",
-      "sha256": "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r"
-    }
-  },
-  {
-    "goPackagePath": "github.com/lib/pq",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/lib/pq",
-      "rev": "4dd446efc17690bc53e154025146f73203b18309",
-      "sha256": "14idja467kcz2zlbqv07q3wp939khq620163fr5hhl7x362l5di6"
-    }
-  },
-  {
-    "goPackagePath": "github.com/mattn/go-sqlite3",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/mattn/go-sqlite3",
-      "rev": "e118d4451349065b8e7ce0f0af32e033995363f8",
-      "sha256": "1bf5mazb6h7mpvf0g8bxbpzb6kzsbm1qx1scs57x52zsb1la317k"
-    }
-  },
-  {
-    "goPackagePath": "github.com/mcuadros/go-version",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/mcuadros/go-version",
-      "rev": "d52711f8d6bea8dc01efafdb68ad95a4e2606630",
-      "sha256": "08ps27vvn77jhrnks8p8mx5cwgb1ikhaddcnrpgpz7aq905a5kzn"
-    }
-  },
-  {
-    "goPackagePath": "github.com/microcosm-cc/bluemonday",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/microcosm-cc/bluemonday",
-      "rev": "9dc199233bf72cc1aad9b61f73daf2f0075b9ee4",
-      "sha256": "067v28gj25niabi29h958af494b6kwfs60mdsvwa4bl99613i8ja"
-    }
-  },
-  {
-    "goPackagePath": "github.com/nfnt/resize",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/nfnt/resize",
-      "rev": "891127d8d1b52734debe1b3c3d7e747502b6c366",
-      "sha256": "08lg2v4s1iyzqja7xb69d57gpz1y43yqfwv7i4fa7a06m595r9iw"
-    }
-  },
-  {
-    "goPackagePath": "github.com/russross/blackfriday",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/russross/blackfriday",
-      "rev": "93622da34e54fb6529bfb7c57e710f37a8d9cbd8",
-      "sha256": "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2"
-    }
-  },
-  {
-    "goPackagePath": "github.com/satori/go.uuid",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/satori/go.uuid",
-      "rev": "0aa62d5ddceb50dbcb909d790b5345affd3669b6",
-      "sha256": "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w"
-    }
-  },
-  {
-    "goPackagePath": "github.com/sergi/go-diff",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/sergi/go-diff",
-      "rev": "ec7fdbb58eb3e300c8595ad5ac74a5aa50019cc7",
-      "sha256": "1lpxhwqbypssj2vhlkj11fircllvxx4n985w6f76id5jany05h2w"
-    }
-  },
-  {
-    "goPackagePath": "github.com/shurcooL/sanitized_anchor_name",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/shurcooL/sanitized_anchor_name",
-      "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77",
-      "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"
-    }
-  },
-  {
-    "goPackagePath": "golang.org/x/crypto",
-    "fetch": {
-      "type": "git",
-      "url": "https://go.googlesource.com/crypto",
-      "rev": "bc89c496413265e715159bdc8478ee9a92fdc265",
-      "sha256": "0a4s0hxq3gq7ylg6cq4s8m8gx9bjsqsj49p9n7k9pij5daydabcf"
-    }
-  },
-  {
-    "goPackagePath": "golang.org/x/net",
-    "fetch": {
-      "type": "git",
-      "url": "https://go.googlesource.com/net",
-      "rev": "6a513affb38dc9788b449d59ffed099b8de18fa0",
-      "sha256": "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval"
-    }
-  },
-  {
-    "goPackagePath": "golang.org/x/text",
-    "fetch": {
-      "type": "git",
-      "url": "https://go.googlesource.com/text",
-      "rev": "2910a502d2bf9e43193af9d68ca516529614eed3",
-      "sha256": "1h2bxzsnqksnvrk2lplpqzzpp9m9zmd6f2aajyahc56bxb1804jq"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/asn1-ber.v1",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/asn1-ber.v1",
-      "rev": "4e86f4367175e39f69d9358a5f17b4dda270378d",
-      "sha256": "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/bufio.v1",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/bufio.v1",
-      "rev": "567b2bfa514e796916c4747494d6ff5132a1dfce",
-      "sha256": "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/gomail.v2",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/gomail.v2",
-      "rev": "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1",
-      "sha256": "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/ini.v1",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/ini.v1",
-      "rev": "cf53f9204df4fbdd7ec4164b57fa6184ba168292",
-      "sha256": "045nl3hc4mwngr9j1ahrfv2x6izf8y57ij8k6kdgh9xahyhb6rwb"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/ldap.v2",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/ldap.v2",
-      "rev": "537128fee7cca108d8ce74e4309fdfcdd9c7f496",
-      "sha256": "09zvf3q0p3p4czcisv4x0bn5x0carpw35cisnygkxh6s1sp4im9q"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/macaron.v1",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/macaron.v1",
-      "rev": "2133042f8d1022b8253e4e23f7940467941409ce",
-      "sha256": "1z11hkxcmv40qvhqzqn97kymm294kh219fjybvm7p3hz3xgkgcjq"
-    }
-  },
-  {
-    "goPackagePath": "gopkg.in/redis.v2",
-    "fetch": {
-      "type": "git",
-      "url": "https://gopkg.in/redis.v2",
-      "rev": "e6179049628164864e6e84e973cfb56335748dea",
-      "sha256": "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h"
-    }
-  }
-]
diff --git a/pkgs/applications/version-management/gogs/deps.nix b/pkgs/applications/version-management/gogs/deps.nix
new file mode 100644
index 00000000000..e6de8e34313
--- /dev/null
+++ b/pkgs/applications/version-management/gogs/deps.nix
@@ -0,0 +1,452 @@
+[
+  {
+    goPackagePath = "github.com/Unknwon/cae";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Unknwon/cae";
+      rev = "c6aac99ea2cae2ebaf23f26f76b04fe3fcfc9f8c";
+      sha256 = "0j6l1fcs6gp4qw6b9w3pg9fgah18lh1hanfz5y64r6ks244v3l7s";
+    };
+  }
+  {
+    goPackagePath = "github.com/Unknwon/com";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Unknwon/com";
+      rev = "28b053d5a2923b87ce8c5a08f3af779894a72758";
+      sha256 = "09i9slj4zbsqmwkkx9bqi7cgpv6hqby6r98l6qx1wag89qijybz2";
+    };
+  }
+  {
+    goPackagePath = "github.com/Unknwon/i18n";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Unknwon/i18n";
+      rev = "39d6f2727e0698b1021ceb6a77c1801aa92e7d5d";
+      sha256 = "1f4s9srdaqw2yqgc3d76vww3glbwka2f5q4zrwn8bb66kcazbfb7";
+    };
+  }
+  {
+    goPackagePath = "github.com/Unknwon/paginater";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Unknwon/paginater";
+      rev = "7748a72e01415173a27d79866b984328e7b0c12b";
+      sha256 = "0ighsa75ixgx6c4hc397c06lapf0pz50cj3cgkdvssp9an38kw2c";
+    };
+  }
+  {
+    goPackagePath = "github.com/bradfitz/gomemcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bradfitz/gomemcache";
+      rev = "fb1f79c6b65acda83063cbc69f6bba1522558bfc";
+      sha256 = "0mq5rn07bbpy2yla7hassrmj966p6r7ffbf9w41l31yy0fc07i68";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/binding";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/binding";
+      rev = "9440f336b443056c90d7d448a0a55ad8c7599880";
+      sha256 = "0g3ya3h8vjaykgp1npdxbizcf8kzv4m47vymcsq06vpihrfhbvg7";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/cache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/cache";
+      rev = "56173531277692bc2925924d51fda1cd0a6b8178";
+      sha256 = "1116a22wm43q2l54nnycgli90kix787j20mpgya9qb6xnglcck59";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/captcha";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/captcha";
+      rev = "8aa5919789ab301e865595eb4b1114d6b9847deb";
+      sha256 = "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/csrf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/csrf";
+      rev = "6a9a7df172cc1fcd81e4585f44b09200b6087cc0";
+      sha256 = "173da2hl9fcfgkn0nv1ws3pr0gyyp88amhj2bfk4414k5a3r0nsa";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/gzip";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/gzip";
+      rev = "cad1c6580a07c56f5f6bc52d66002a05985c5854";
+      sha256 = "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/i18n";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/i18n";
+      rev = "ef57533c3b0fc2d8581deda14937e52f11a203ab";
+      sha256 = "1nkrcnpjl3x6fhjss2vp29mnvam20vpvxvxpfg1zspi1rjmpyhqy";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/inject";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/inject";
+      rev = "d8a0b8677191f4380287cfebd08e462217bac7ad";
+      sha256 = "0p47pz699xhmi8yxhahvrpai9r49rqap5ckwmz1dlkrnh3zwhrhh";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/session";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/session";
+      rev = "66031fcb37a0fff002a1f028eb0b3a815c78306b";
+      sha256 = "1prrfv8xdlyxrdbagbqzjkx69x74hjzif5ki4lzl2y6fk3nb0cd5";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-macaron/toolbox";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-macaron/toolbox";
+      rev = "99a42f20e9e88daec5c0d7beb4e7eac134680ab0";
+      sha256 = "0r6ksiqzrii7b9vv8daz68044pyifsxmpz48m6h8m6l3h9ygz8cx";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-sql-driver/mysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sql-driver/mysql";
+      rev = "0b58b37b664c21f3010e836f1b931e1d0b0b0685";
+      sha256 = "1dvizip0xzir3gd1ghamfyngwvq5kv7m10d8460fm58g6sy0j512";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-xorm/builder";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-xorm/builder";
+      rev = "f502bd375c1feb5febb467d7e1b840b74adddf0f";
+      sha256 = "144m9mb01lhjz05d6h0jkq14dj52844vycn21kay5vjj9yxipzls";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-xorm/core";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-xorm/core";
+      rev = "5bf745d7d163f4380e6c2bba8c4afa60534dd087";
+      sha256 = "0nx12akm0bb6nxg7x6j40vhhbh0k1lsxk0x8lndnwqsbhznpg7dz";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-xorm/xorm";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-xorm/xorm";
+      rev = "838b2268ae0847e6cfab5c0359c496983223e9dd";
+      sha256 = "0f979lil952gy7gr61xwdj0nid2wkxjd7gzzr9iki4rrq67h23vy";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogits/chardet";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogits/chardet";
+      rev = "2404f777256163ea3eadb273dada5dcb037993c0";
+      sha256 = "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogits/cron";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogits/cron";
+      rev = "7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c";
+      sha256 = "0y7z62g727pygnm5y1jp4i8izz4kzrnih8ihapxhin0isbfd3b6y";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogits/git-module";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogits/git-module";
+      rev = "b3009dc4f5842cf9e2e80fef1e125e79c38e4949";
+      sha256 = "1f5mms15hknnj17nvb5dwwk8fcm8a9msy9qdjvkplihxgaqm0amz";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogits/go-gogs-client";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogits/go-gogs-client";
+      rev = "d8aff570fa22d4e38954c753ec8b21862239b31d";
+      sha256 = "07gmvvljd48jwpkgsqlcp19rphn7ybcd4hzf7zahhl4dd4b8p4p3";
+    };
+  }
+  {
+    goPackagePath = "github.com/issue9/identicon";
+    fetch = {
+      type = "git";
+      url = "https://github.com/issue9/identicon";
+      rev = "d36b54562f4cf70c83653e13dc95c220c79ef521";
+      sha256 = "0y82b3gq8rpqglvf3lsqhgp5djfdammwd1w24k3i97iqls0rch7l";
+    };
+  }
+  {
+    goPackagePath = "github.com/jaytaylor/html2text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jaytaylor/html2text";
+      rev = "8fb95d837f7d6db1913fecfd7bcc5333e6499596";
+      sha256 = "0pzyidlp5jmzl5smhr9f8a81qpfls80j5m7156b032fvyvjwanlr";
+    };
+  }
+  {
+    goPackagePath = "github.com/klauspost/compress";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/compress";
+      rev = "d0763f13d86e630f5d3ea9fa848a6ecc68255297";
+      sha256 = "18nf5iqsrz2xq899zy9gvi1s0gaxn4zwjgkxxvlqmjzs7waq946y";
+    };
+  }
+  {
+    goPackagePath = "github.com/klauspost/cpuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/cpuid";
+      rev = "09cded8978dc9e80714c4d85b0322337b0a1e5e0";
+      sha256 = "05l8pfch0gvxh0khapwxhsk4xajn40vbjr360n49vh2z5531v2xq";
+    };
+  }
+  {
+    goPackagePath = "github.com/klauspost/crc32";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/crc32";
+      rev = "19b0b332c9e4516a6370a0456e6182c3b5036720";
+      sha256 = "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r";
+    };
+  }
+  {
+    goPackagePath = "github.com/lib/pq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lib/pq";
+      rev = "50761b0867bd1d9d069276790bcd4a3bccf2324a";
+      sha256 = "1bz46slzri958wdnvlvyx12bp3pmy8iny5m0m16i3n8h1q84dhp5";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-sqlite3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
+      sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
+    };
+  }
+  {
+    goPackagePath = "github.com/mcuadros/go-version";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mcuadros/go-version";
+      rev = "d52711f8d6bea8dc01efafdb68ad95a4e2606630";
+      sha256 = "08ps27vvn77jhrnks8p8mx5cwgb1ikhaddcnrpgpz7aq905a5kzn";
+    };
+  }
+  {
+    goPackagePath = "github.com/microcosm-cc/bluemonday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/microcosm-cc/bluemonday";
+      rev = "7d0cad0ac7ef5e3afd74816444b44b56327422a4";
+      sha256 = "0cnszfgmajg6r3icy4n5fx9sxw4igmi7vpqmms4884ypg1va4kq5";
+    };
+  }
+  {
+    goPackagePath = "github.com/msteinert/pam";
+    fetch = {
+      type = "git";
+      url = "https://github.com/msteinert/pam";
+      rev = "02ccfbfaf0cc627aa3aec8ef7ed5cfeec5b43f63";
+      sha256 = "0vx7w1ybwi049wizlamm8hqw0vz4rnpiipn7rkvfapa2xmdyd71h";
+    };
+  }
+  {
+    goPackagePath = "github.com/nfnt/resize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nfnt/resize";
+      rev = "891127d8d1b52734debe1b3c3d7e747502b6c366";
+      sha256 = "08lg2v4s1iyzqja7xb69d57gpz1y43yqfwv7i4fa7a06m595r9iw";
+    };
+  }
+  {
+    goPackagePath = "github.com/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70";
+      sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k";
+    };
+  }
+  {
+    goPackagePath = "github.com/satori/go.uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/satori/go.uuid";
+      rev = "b061729afc07e77a8aa4fad0a2fd840958f1942a";
+      sha256 = "0q87n5an7ha2d8kl6gn9wi41rq0whsxq68w5x3nxz7w9vgkfnq1k";
+    };
+  }
+  {
+    goPackagePath = "github.com/sergi/go-diff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sergi/go-diff";
+      rev = "ce4a6e0e61d6908298eed511fc0683062d4c7f3b";
+      sha256 = "193fhvj6nf7az4lmlcr05brn52ydl0pky79fb1s83bllf8mrhqg7";
+    };
+  }
+  {
+    goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/sanitized_anchor_name";
+      rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2";
+      sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg";
+    };
+  }
+  {
+    goPackagePath = "github.com/strk/go-libravatar";
+    fetch = {
+      type = "git";
+      url = "https://github.com/strk/go-libravatar";
+      rev = "5eed7bff870ae19ef51c5773dbc8f3e9fcbd0982";
+      sha256 = "1pjb7a4v42dg7y3j880qv20il77fq0cqwfsl9pz7ywi5rmgfnq6v";
+    };
+  }
+  {
+    goPackagePath = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev = "d53eb991652b1d438abdd34ce4bfa3ef1539108e";
+      sha256 = "0d02mmx79hrwd42wn0bchf28jqi47aj17pkfczq22gdxp6jd3r9w";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "7682e7e3945130cf3cde089834664f68afdd1523";
+      sha256 = "1yg53yycnzn569jssij0w1jxhjs9wmscw29hasqqkvhkzdwyjzhf";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "ffe101cce3477a6c6d8f0754d103bb0a84ec1266";
+      sha256 = "013jzyxix30izpi4485fvh43r5wf8icj85acslizrg6pd1m6mhmm";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "098f51fb687dbaba1f6efabeafbb6461203f9e21";
+      sha256 = "17h1qkgh436gn6sgv81d7xhbdxhscdhbhjfhh9z7r2s6vm05g1ai";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/asn1-ber.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/asn1-ber.v1";
+      rev = "4e86f4367175e39f69d9358a5f17b4dda270378d";
+      sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/bufio.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/bufio.v1";
+      rev = "567b2bfa514e796916c4747494d6ff5132a1dfce";
+      sha256 = "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/editorconfig/editorconfig-core-go.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/editorconfig/editorconfig-core-go.v1";
+      rev = "a872f05c2e34b37b567401384d202aff11ba06d4";
+      sha256 = "17mc7rm0fl5vi7ky95c2bd7c8ck0ms5bghzmgx9qk7x1zrw91335";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/gomail.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/gomail.v2";
+      rev = "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1";
+      sha256 = "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/ini.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/ini.v1";
+      rev = "6e4869b434bd001f6983749881c7ead3545887d8";
+      sha256 = "1w7qcl0k7bsp6871vr8mbli09imd67qqq1vbvpll33d2vw12wmva";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/ldap.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/ldap.v2";
+      rev = "d0a5ced67b4dc310b9158d63a2c6f9c5ec13f105";
+      sha256 = "02pgng2m8bfdh7471mjd6g19h53448hlsnl8l7jv9hm8mh1gp7jm";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/macaron.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/macaron.v1";
+      rev = "4974334b10dbb6f5c0e17f4c10555ff050a16329";
+      sha256 = "0jryd9xah6571xpn03i59wiziiz0w6v2dwda202y8y2yrjdxnzlp";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/redis.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/redis.v2";
+      rev = "e6179049628164864e6e84e973cfb56335748dea";
+      sha256 = "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h";
+    };
+  }
+]

From a0339069698f29fca267d03607ba3e5ac421c46f Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 10 Dec 2016 20:34:54 +0100
Subject: [PATCH 007/727] chromium module: add support for chromium policies as
 nixos module

---
 nixos/modules/module-list.nix       |  1 +
 nixos/modules/programs/chromium.nix | 85 +++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 nixos/modules/programs/chromium.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 155d7a5ef92..264799756b8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -66,6 +66,7 @@
   ./programs/bash/bash.nix
   ./programs/blcr.nix
   ./programs/cdemu.nix
+  ./programs/chromium.nix
   ./programs/command-not-found/command-not-found.nix
   ./programs/dconf.nix
   ./programs/environment.nix
diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix
new file mode 100644
index 00000000000..54739feab97
--- /dev/null
+++ b/nixos/modules/programs/chromium.nix
@@ -0,0 +1,85 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.chromium;
+
+  defaultProfile = filterAttrs (k: v: v != null) {
+    HomepageLocation = cfg.homepageLocation;
+    DefaultSearchProviderSearchURL = cfg.defaultSearchProviderSearchURL;
+    DefaultSearchProviderSuggestURL = cfg.defaultSearchProviderSuggestURL;
+    ExtensionInstallForcelist = map (extension:
+      "${extension};https://clients2.google.com/service/update2/crx"
+    ) cfg.extensions;
+  };
+in
+
+{
+  ###### interface
+
+  options = {
+    programs.chromium = {
+      enable = mkEnableOption "<command>chromium</command> policies";
+
+      extensions = mkOption {
+        type = types.listOf types.str;
+        description = ''
+          List of chromium extensions to install.
+          For list of plugins ids see id in url of extensions on
+          <link xlink:href="https://chrome.google.com/webstore/category/extensions">chrome web store</link>
+          page.
+        '';
+        default = [];
+        example = literalExample ''
+          [
+            "chlffgpmiacpedhhbkiomidkjlcfhogd" # pushbullet
+            "mbniclmhobmnbdlbpiphghaielnnpgdp" # lightshot
+            "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere
+          ]
+        '';
+      };
+
+      homepageLocation = mkOption {
+        type = types.nullOr types.str;
+        description = "Chromium default homepage";
+        default = null;
+        example = "https://nixos.org";
+      };
+
+      defaultSearchProviderSearchURL = mkOption {
+        type = types.nullOr types.str;
+        description = "Chromium default search provider url.";
+        default = null;
+        example =
+          "https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:
+        ↪searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}";
+      };
+
+      defaultSearchProviderSuggestURL = mkOption {
+        type = types.nullOr types.str;
+        description = "Chromium default search provider url for suggestions.";
+        default = null;
+        example =
+          "https://encrypted.google.com/complete/search?output=chrome&q={searchTerms}";
+      };
+
+      extraOpts = mkOption {
+        type = types.attrs;
+        description = ''
+          Extra chromium policy options, see
+          <link xlink:href="https://www.chromium.org/administrators/policy-list-3">https://www.chromium.org/administrators/policy-list-3</link>
+          for a list of avalible options
+        '';
+        default = {};
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = lib.mkIf cfg.enable {
+    environment.etc."chromium/policies/managed/default.json".text = builtins.toJSON defaultProfile;
+    environment.etc."chromium/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts;
+  };
+}

From 8be93a55bfcb11b220fad519b75b38a8a3054756 Mon Sep 17 00:00:00 2001
From: Matthew Daiter <mdaiter8121@gmail.com>
Date: Wed, 21 Dec 2016 17:14:18 -0500
Subject: [PATCH 008/727] gwrap: remove unnecessary checks

---
 pkgs/development/tools/guile/g-wrap/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix
index a1564859e84..030693714f0 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/pkgs/development/tools/guile/g-wrap/default.nix
@@ -9,12 +9,11 @@ stdenv.mkDerivation rec {
 
   # Note: Glib support is optional, but it's quite useful (e.g., it's
   # used by Guile-GNOME).
-  buildInputs = [ guile pkgconfig glib ]
-    ++ stdenv.lib.optional doCheck guile_lib;
+  buildInputs = [ guile pkgconfig glib guile_lib ];
 
   propagatedBuildInputs = [ libffi ];
 
-  doCheck = !stdenv.isFreeBSD; # XXX: 00-socket.test hangs
+  doCheck = true;
 
   meta = {
     description = "G-Wrap, a wrapper generator for Guile";

From 7ebcada02028e5ce8199cc123fda6aa1aba72e64 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Wed, 28 Dec 2016 00:19:51 -0500
Subject: [PATCH 009/727] mesos: 1.0.1 -> 1.1.0

---
 nixos/modules/services/misc/mesos-master.nix  |  21 +
 nixos/modules/services/misc/mesos-slave.nix   |  98 +++-
 nixos/tests/mesos.nix                         |  99 +++-
 nixos/tests/mesos_test.py                     |  72 +++
 .../networking/cluster/mesos/default.nix      |  94 +++-
 .../networking/cluster/mesos/maven_repo.patch |  13 -
 .../networking/cluster/mesos/nixos.patch      | 444 ++++++++++++++----
 .../networking/cluster/mesos/rb36610.patch    |   7 +-
 .../networking/cluster/mesos/rb51324.patch    |  71 ---
 .../networking/cluster/mesos/rb51325.patch    | 157 -------
 .../build-python-package-setuptools.nix       |   2 +-
 .../libraries/protobuf/generic.nix            |  22 +-
 pkgs/top-level/python-packages.nix            |  23 +-
 13 files changed, 750 insertions(+), 373 deletions(-)
 create mode 100644 nixos/tests/mesos_test.py
 delete mode 100644 pkgs/applications/networking/cluster/mesos/maven_repo.patch
 delete mode 100644 pkgs/applications/networking/cluster/mesos/rb51324.patch
 delete mode 100644 pkgs/applications/networking/cluster/mesos/rb51325.patch

diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix
index 99583ebeebd..0523c6549ed 100644
--- a/nixos/modules/services/misc/mesos-master.nix
+++ b/nixos/modules/services/misc/mesos-master.nix
@@ -16,12 +16,30 @@ in {
         type = types.bool;
       };
 
+      ip = mkOption {
+        description = "IP address to listen on.";
+        default = "0.0.0.0";
+        type = types.str;
+      };
+
       port = mkOption {
         description = "Mesos Master port";
         default = 5050;
         type = types.int;
       };
 
+      advertiseIp = mkOption {
+        description = "IP address advertised to reach this master.";
+        default = null;
+        type = types.nullOr types.str;
+      };
+
+      advertisePort = mkOption {
+        description = "Port advertised to reach this Mesos master.";
+        default = null;
+        type = types.nullOr types.int;
+      };
+
       zk = mkOption {
         description = ''
           ZooKeeper URL (used for leader election amongst masters).
@@ -84,7 +102,10 @@ in {
       serviceConfig = {
         ExecStart = ''
           ${pkgs.mesos}/bin/mesos-master \
+            --ip=${cfg.ip} \
             --port=${toString cfg.port} \
+            ${optionalString (cfg.advertiseIp != null) "--advertise_ip=${cfg.advertiseIp}"} \
+            ${optionalString (cfg.advertisePort  != null) "--advertise_port=${toString cfg.advertisePort}"} \
             ${if cfg.quorum == 0
               then "--registry=in_memory"
               else "--zk=${cfg.zk} --registry=replicated_log --quorum=${toString cfg.quorum}"} \
diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix
index 9ddecb6fe30..47be10274d3 100644
--- a/nixos/modules/services/misc/mesos-slave.nix
+++ b/nixos/modules/services/misc/mesos-slave.nix
@@ -12,7 +12,23 @@ let
   attribsArg = optionalString (cfg.attributes != {})
                               "--attributes=${mkAttributes cfg.attributes}";
 
-  containerizers = [ "mesos" ] ++ (optional cfg.withDocker "docker");
+  containerizersArg = concatStringsSep "," (
+    lib.unique (
+      cfg.containerizers ++ (optional cfg.withDocker "docker")
+    )
+  );
+
+  imageProvidersArg = concatStringsSep "," (
+    lib.unique (
+      cfg.imageProviders ++ (optional cfg.withDocker "docker")
+    )
+  );
+
+  isolationArg = concatStringsSep "," (
+    lib.unique (
+      cfg.isolation ++ (optionals cfg.withDocker [ "filesystem/linux" "docker/runtime"])
+    )
+  );
 
 in {
 
@@ -27,7 +43,7 @@ in {
       ip = mkOption {
         description = "IP address to listen on.";
         default = "0.0.0.0";
-        type = types.string;
+        type = types.str;
       };
 
       port = mkOption {
@@ -36,6 +52,53 @@ in {
         type = types.int;
       };
 
+      advertiseIp = mkOption {
+        description = "IP address advertised to reach this agent.";
+        default = null;
+        type = types.nullOr types.str;
+      };
+
+      advertisePort = mkOption {
+        description = "Port advertised to reach this agent.";
+        default = null;
+        type = types.nullOr types.int;
+      };
+
+      containerizers = mkOption {
+        description = ''
+          List of containerizer implementations to compose in order to provide
+          containerization. Available options are mesos and docker.
+          The order the containerizers are specified is the order they are tried.
+        '';
+        default = [ "mesos" ];
+        type = types.listOf types.str;
+      };
+
+      imageProviders = mkOption {
+        description = "List of supported image providers, e.g., APPC,DOCKER.";
+        default = [ ];
+        type = types.listOf types.str;
+      };
+
+      imageProvisionerBackend = mkOption {
+        description = ''
+          Strategy for provisioning container rootfs from images,
+          e.g., aufs, bind, copy, overlay.
+        '';
+        default = "copy";
+        type = types.str;
+      };
+
+      isolation = mkOption {
+        description = ''
+          Isolation mechanisms to use, e.g., posix/cpu,posix/mem, or
+          cgroups/cpu,cgroups/mem, or network/port_mapping, or `gpu/nvidia` for nvidia
+          specific gpu isolation.
+        '';
+        default = [ "posix/cpu" "posix/mem" ];
+        type = types.listOf types.str;
+      };
+
       master = mkOption {
         description = ''
           May be one of:
@@ -57,6 +120,16 @@ in {
         type = types.bool;
       };
 
+      dockerRegistry = mkOption {
+        description = ''
+          The default url for pulling Docker images.
+          It could either be a Docker registry server url,
+          or a local path in which Docker image archives are stored.
+        '';
+        default = null;
+        type = types.nullOr (types.either types.str types.path);
+      };
+
       workDir = mkOption {
         description = "The Mesos work directory.";
         default = "/var/lib/mesos/slave";
@@ -96,28 +169,45 @@ in {
                     host = "aabc123";
                     os = "nixos"; };
       };
+
+      executorEnvironmentVariables = mkOption {
+        description = ''
+          The environment variables that should be passed to the executor, and thus subsequently task(s).
+        '';
+        default = {
+          PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
+        };
+        type = types.attrsOf types.str;
+      };
     };
 
   };
 
-
   config = mkIf cfg.enable {
     systemd.services.mesos-slave = {
       description = "Mesos Slave";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      environment.MESOS_CONTAINERIZERS = concatStringsSep "," containerizers;
+      path = [ pkgs.stdenv.shellPackage ];
       serviceConfig = {
         ExecStart = ''
           ${pkgs.mesos}/bin/mesos-slave \
+            --containerizers=${containerizersArg} \
+            --image_providers=${imageProvidersArg} \
+            --image_provisioner_backend=${cfg.imageProvisionerBackend} \
+            --isolation=${isolationArg} \
             --ip=${cfg.ip} \
             --port=${toString cfg.port} \
+            ${optionalString (cfg.advertiseIp != null) "--advertise_ip=${cfg.advertiseIp}"} \
+            ${optionalString (cfg.advertisePort  != null) "--advertise_port=${toString cfg.advertisePort}"} \
             --master=${cfg.master} \
             --work_dir=${cfg.workDir} \
             --logging_level=${cfg.logLevel} \
             ${attribsArg} \
             ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \
             ${optionalString cfg.withDocker "--docker=${pkgs.docker}/libexec/docker/docker"} \
+            ${optionalString (cfg.dockerRegistry != null) "--docker_registry=${cfg.dockerRegistry}"} \
+            --executor_environment_variables=${lib.escapeShellArg (builtins.toJSON cfg.executorEnvironmentVariables)} \
             ${toString cfg.extraCmdLineOptions}
         '';
         PermissionsStartOnly = true;
diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix
index 3610603aeba..6e9af126f03 100644
--- a/nixos/tests/mesos.nix
+++ b/nixos/tests/mesos.nix
@@ -1,32 +1,91 @@
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "simple";
+import ./make-test.nix ({ pkgs, ...} : rec {
+  name = "mesos";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ offline ];
+    maintainers = [ offline kamilchm cstrahan ];
   };
 
-  machine = { config, pkgs, ... }: {
-    services.zookeeper.enable = true;
-    virtualisation.docker.enable = true;
-    services.mesos = {
-      slave = {
-        enable = true;
-        master = "zk://localhost:2181/mesos";
-        attributes = {
-          tag1 = "foo";
-          tag2 = "bar";
-        };
-      };
-      master = {
-        enable = true;
-        zk = "zk://localhost:2181/mesos";
+  nodes = {
+    master = { config, pkgs, ... }: {
+      networking.firewall.enable = false;
+      services.zookeeper.enable = true;
+      services.mesos.master = {
+          enable = true;
+          zk = "zk://master:2181/mesos";
       };
     };
+
+    slave = { config, pkgs, ... }: {
+      networking.firewall.enable = false;
+      networking.nat.enable = true;
+      virtualisation.docker.enable = true;
+      services.mesos = {
+        slave = {
+          enable = true;
+          master = "master:5050";
+          dockerRegistry = registry;
+          executorEnvironmentVariables = {
+            PATH = "/run/current-system/sw/bin";
+          };
+        };
+      };
+    };
+  };
+
+  simpleDocker = pkgs.dockerTools.buildImage {
+    name = "echo";
+    contents = [ pkgs.stdenv.shellPackage pkgs.coreutils ];
+    config = {
+      Env = [
+        # When shell=true, mesos invokes "sh -c '<cmd>'", so make sure "sh" is
+        # on the PATH.
+        "PATH=${pkgs.stdenv.shellPackage}/bin:${pkgs.coreutils}/bin"
+      ];
+      Entrypoint = [ "echo" ];
+    };
+  };
+
+  registry = pkgs.runCommand "registry" { } ''
+    mkdir -p $out
+    cp ${simpleDocker} $out/echo:latest.tar
+  '';
+
+  testFramework = pkgs.pythonPackages.buildPythonPackage {
+    name = "mesos-tests";
+    propagatedBuildInputs = [ pkgs.mesos ];
+    catchConflicts = false;
+    src = ./mesos_test.py;
+    phases = [ "installPhase" "fixupPhase" ];
+    installPhase = ''
+      mkdir $out
+      cp $src $out/mesos_test.py
+      chmod +x $out/mesos_test.py
+
+      echo "done" > test.result
+      tar czf $out/test.tar.gz test.result
+    '';
   };
 
   testScript =
     ''
       startAll;
-      $machine->waitForUnit("mesos-master.service");
-      $machine->waitForUnit("mesos-slave.service");
+      $master->waitForUnit("mesos-master.service");
+      $slave->waitForUnit("mesos-slave.service");
+
+      $master->waitForOpenPort(5050);
+      $slave->waitForOpenPort(5051);
+
+      # is slave registred? 
+      $master->waitUntilSucceeds("curl -s --fail http://master:5050/master/slaves".
+                                 " | grep -q \"\\\"hostname\\\":\\\"slave\\\"\"");
+
+      # try to run docker image 
+      $master->succeed("${pkgs.mesos}/bin/mesos-execute --master=master:5050".
+                       " --resources=\"cpus:0.1;mem:32\" --name=simple-docker".
+                       " --containerizer=mesos --docker_image=echo:latest".
+                       " --shell=true --command=\"echo done\" | grep -q TASK_FINISHED");
+
+      # simple command with .tar.gz uri
+      $master->succeed("${testFramework}/mesos_test.py master ".
+                       "${testFramework}/test.tar.gz");
     '';
 })
diff --git a/nixos/tests/mesos_test.py b/nixos/tests/mesos_test.py
new file mode 100644
index 00000000000..be8bb32e49a
--- /dev/null
+++ b/nixos/tests/mesos_test.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env python
+import uuid
+import time
+import subprocess
+import os
+
+import sys
+
+from mesos.interface import Scheduler
+from mesos.native import MesosSchedulerDriver
+from mesos.interface import mesos_pb2
+
+def log(msg):
+    process = subprocess.Popen("systemd-cat", stdin=subprocess.PIPE)
+    (out,err) = process.communicate(msg)
+
+class NixosTestScheduler(Scheduler):
+    def __init__(self):
+        self.master_ip = sys.argv[1]
+        self.download_uri = sys.argv[2]
+
+    def resourceOffers(self, driver, offers):
+        log("XXX got resource offer")
+
+        offer = offers[0]
+        task = self.new_task(offer)
+        uri = task.command.uris.add()
+        uri.value = self.download_uri
+        task.command.value = "cat test.result"
+        driver.launchTasks(offer.id, [task])
+
+    def statusUpdate(self, driver, update):
+        log("XXX status update")
+        if update.state == mesos_pb2.TASK_FAILED:
+            log("XXX test task failed with message: " + update.message)
+            driver.stop()
+            sys.exit(1)
+        elif update.state == mesos_pb2.TASK_FINISHED:
+            driver.stop()
+            sys.exit(0)
+
+    def new_task(self, offer):
+        task = mesos_pb2.TaskInfo()
+        id = uuid.uuid4()
+        task.task_id.value = str(id)
+        task.slave_id.value = offer.slave_id.value
+        task.name = "task {}".format(str(id))
+
+        cpus = task.resources.add()
+        cpus.name = "cpus"
+        cpus.type = mesos_pb2.Value.SCALAR
+        cpus.scalar.value = 0.1
+
+        mem = task.resources.add()
+        mem.name = "mem"
+        mem.type = mesos_pb2.Value.SCALAR
+        mem.scalar.value = 32
+
+        return task
+
+if __name__ == '__main__':
+    log("XXX framework started")
+
+    framework = mesos_pb2.FrameworkInfo()
+    framework.user = "root"
+    framework.name = "nixos-test-framework"
+    driver = MesosSchedulerDriver(
+        NixosTestScheduler(),
+        framework,
+        sys.argv[1] + ":5050"
+    )
+    driver.run()
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 8857e6ba4e3..818848f6a7f 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -2,16 +2,27 @@
 , automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython
 , setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd
 , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
-, ethtool, coreutils
+, ethtool, coreutils, which, iptables
 , bash
 }:
 
 let
   mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; };
   soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so";
+  # `tar -z` requires gzip on $PATH, so wrap tar.
+  # At some point, we should try to patch mesos so we add gzip to the PATH when
+  # tar is invoked. I think that only needs to be done here:
+  #   src/common/command_utils.cpp
+  # https://github.com/NixOS/nixpkgs/issues/13783
+  tarWithGzip = lib.overrideDerivation gnutar (oldAttrs: {
+    buildInputs = (oldAttrs.buildInputs or []) ++ [ makeWrapper ];
+    postInstall = (oldAttrs.postInstall or "") + ''
+      wrapProgram $out/bin/tar --prefix PATH ":" "${gzip}/bin"
+    '';
+  });
 
 in stdenv.mkDerivation rec {
-  version = "1.0.1";
+  version = "1.1.0";
   name = "mesos-${version}";
 
   enableParallelBuilding = true;
@@ -19,17 +30,14 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://apache/mesos/${version}/${name}.tar.gz";
-    sha256 = "1hdh2wh11ck98ycfrxfzgivgk2pjl3638vkyw14xj7faj9qxjlz0";
+    sha256 = "1hdjd4syyp88l0bnh88bhzvn9466ad2ysfp9pq3kwj3qzwg5jv8g";
   };
 
   patches = [
     # https://reviews.apache.org/r/36610/
+    # TODO: is this still needed?
     ./rb36610.patch
 
-    # https://issues.apache.org/jira/browse/MESOS-6013
-    ./rb51324.patch
-    ./rb51325.patch
-
     # see https://github.com/cstrahan/mesos/tree/nixos-${version}
     ./nixos.patch
   ];
@@ -46,33 +54,55 @@ in stdenv.mkDerivation rec {
     pythonProtobuf
   ];
 
+  # note that we *must* statically link libprotobuf.
+  # if we dynamically link the lib, we get these errors:
+  # https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684
   preConfigure = ''
+    substituteInPlace 3rdparty/stout/include/stout/os/posix/chown.hpp \
+      --subst-var-by chown ${coreutils}/bin/chown
+
+    substituteInPlace 3rdparty/stout/Makefile.am \
+      --replace "-lprotobuf" \
+                "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a"
+
     substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \
       --subst-var-by sh ${bash}/bin/bash
 
-    substituteInPlace 3rdparty/stout/include/stout/os/posix/shell.hpp \
-      --subst-var-by sh ${bash}/bin/bash
-
-    substituteInPlace src/Makefile.am \
-      --subst-var-by mavenRepo ${mavenRepo}
+    substituteInPlace 3rdparty/stout/include/stout/posix/os.hpp \
+      --subst-var-by tar ${tarWithGzip}/bin/tar
 
     substituteInPlace src/cli/mesos-scp \
       --subst-var-by scp ${openssh}/bin/scp
 
+    substituteInPlace src/common/command_utils.cpp \
+      --subst-var-by curl      ${curl}/bin/curl \
+      --subst-var-by gzip      ${gzip}/bin/gzip \
+      --subst-var-by sha512sum ${coreutils}/bin/sha512sum \
+      --subst-var-by tar       ${tarWithGzip}/bin/tar
+
     substituteInPlace src/launcher/fetcher.cpp \
+      --subst-var-by cp    ${coreutils}/bin/cp \
       --subst-var-by gzip  ${gzip}/bin/gzip \
-      --subst-var-by tar   ${gnutar}/bin/tar \
+      --subst-var-by tar   ${tarWithGzip}/bin/tar \
       --subst-var-by unzip ${unzip}/bin/unzip
 
     substituteInPlace src/python/cli/src/mesos/cli.py \
       --subst-var-by mesos-resolve $out/bin/mesos-resolve
 
+    substituteInPlace src/python/native_common/ext_modules.py.in \
+      --replace "-lprotobuf" \
+                "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a"
+
+    substituteInPlace src/slave/containerizer/mesos/isolators/gpu/volume.cpp \
+      --subst-var-by cp    ${coreutils}/bin/cp \
+      --subst-var-by which ${which}/bin/which
+
     substituteInPlace src/slave/containerizer/mesos/isolators/posix/disk.cpp \
-      --subst-var-by du ${coreutils}/bin/du \
-      --subst-var-by cp ${coreutils}/bin/cp
+      --subst-var-by du ${coreutils}/bin/du
 
     substituteInPlace src/slave/containerizer/mesos/provisioner/backends/copy.cpp \
-      --subst-var-by cp ${coreutils}/bin/cp
+      --subst-var-by cp ${coreutils}/bin/cp \
+      --subst-var-by rm ${coreutils}/bin/rm
 
     substituteInPlace src/uri/fetchers/copy.cpp \
       --subst-var-by cp ${coreutils}/bin/cp
@@ -83,23 +113,48 @@ in stdenv.mkDerivation rec {
     substituteInPlace src/uri/fetchers/docker.cpp \
       --subst-var-by curl ${curl}/bin/curl
 
+    substituteInPlace src/Makefile.am \
+      --subst-var-by mavenRepo ${mavenRepo} \
+      --replace "-lprotobuf" \
+                "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a"
+
   '' + lib.optionalString stdenv.isLinux ''
 
     substituteInPlace src/linux/perf.cpp \
       --subst-var-by perf ${perf}/bin/perf
 
+    substituteInPlace src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp \
+      --subst-var-by mount ${utillinux}/bin/mount
+
+    substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/linux.cpp \
+      --subst-var-by mount ${utillinux}/bin/mount
+
     substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/shared.cpp \
       --subst-var-by mount ${utillinux}/bin/mount
 
+    substituteInPlace src/slave/containerizer/mesos/isolators/gpu/isolator.cpp \
+      --subst-var-by mount ${utillinux}/bin/mount
+
     substituteInPlace src/slave/containerizer/mesos/isolators/namespaces/pid.cpp \
       --subst-var-by mount ${utillinux}/bin/mount
 
+    substituteInPlace src/slave/containerizer/mesos/isolators/network/cni/cni.cpp \
+      --subst-var-by mount ${utillinux}/bin/mount
+
+    substituteInPlace src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp \
+      --subst-var-by iptables ${iptables}/bin/iptables
+
     substituteInPlace src/slave/containerizer/mesos/isolators/network/port_mapping.cpp \
-      --subst-var-by tc      ${iproute}/bin/tc \
+      --subst-var-by ethtool ${ethtool}/sbin/ethtool \
       --subst-var-by ip      ${iproute}/bin/ip \
       --subst-var-by mount   ${utillinux}/bin/mount \
-      --subst-var-by sh      ${stdenv.shell} \
-      --subst-var-by ethtool ${ethtool}/sbin/ethtool
+      --subst-var-by tc      ${iproute}/bin/tc
+
+    substituteInPlace src/slave/containerizer/mesos/isolators/volume/image.cpp \
+      --subst-var-by mount   ${utillinux}/bin/mount
+
+    substituteInPlace src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp \
+      --subst-var-by mount   ${utillinux}/bin/mount
   '';
 
   configureFlags = [
@@ -108,7 +163,6 @@ in stdenv.mkDerivation rec {
     "--with-svn=${subversion.dev}"
     "--with-leveldb=${leveldb}"
     "--with-glog=${glog}"
-    "--with-glog=${glog}"
     "--enable-optimize"
     "--disable-python-dependency-install"
     "--enable-ssl"
diff --git a/pkgs/applications/networking/cluster/mesos/maven_repo.patch b/pkgs/applications/networking/cluster/mesos/maven_repo.patch
deleted file mode 100644
index 9ee12976fde..00000000000
--- a/pkgs/applications/networking/cluster/mesos/maven_repo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index ae2740a..1df91a7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1310,7 +1310,7 @@ if HAS_JAVA
- 
- $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom
- 	@echo "Building mesos-$(PACKAGE_VERSION).jar ..."
--	@cd $(abs_top_builddir)/src/java && $(MVN) -f mesos.pom clean package
-+	@cd $(abs_top_builddir)/src/java && $(MVN) -f mesos.pom -Dmaven.repo.local=@mavenRepo@ clean package
- 
- # Convenience library for JNI bindings.
- # TODO(Charles Reiss): We really should be building the Java library
diff --git a/pkgs/applications/networking/cluster/mesos/nixos.patch b/pkgs/applications/networking/cluster/mesos/nixos.patch
index 032357e452d..78e374b8d6b 100644
--- a/pkgs/applications/networking/cluster/mesos/nixos.patch
+++ b/pkgs/applications/networking/cluster/mesos/nixos.patch
@@ -1,5 +1,18 @@
+diff --git a/3rdparty/stout/include/stout/os/posix/chown.hpp b/3rdparty/stout/include/stout/os/posix/chown.hpp
+index c82e2e574..15d332107 100644
+--- a/3rdparty/stout/include/stout/os/posix/chown.hpp
++++ b/3rdparty/stout/include/stout/os/posix/chown.hpp
+@@ -34,7 +34,7 @@ inline Try<Nothing> chown(
+     // TODO(bmahler): Consider walking the file tree instead. We would need
+     // to be careful to not miss dotfiles.
+     std::string command =
+-      "chown -R " + stringify(uid) + ':' + stringify(gid) + " '" + path + "'";
++      "@chown@ -R " + stringify(uid) + ':' + stringify(gid) + " '" + path + "'";
+ 
+     int status = os::system(command);
+     if (status != 0) {
 diff --git a/3rdparty/stout/include/stout/os/posix/fork.hpp b/3rdparty/stout/include/stout/os/posix/fork.hpp
-index a29967d..290b98b 100644
+index a29967dcb..290b98b50 100644
 --- a/3rdparty/stout/include/stout/os/posix/fork.hpp
 +++ b/3rdparty/stout/include/stout/os/posix/fork.hpp
 @@ -369,7 +369,7 @@ private:
@@ -11,48 +24,97 @@ index a29967d..290b98b 100644
        EXIT(EXIT_FAILURE)
          << "Failed to execute '" << command << "': " << os::strerror(errno);
      } else if (wait.isSome()) {
-diff --git a/3rdparty/stout/include/stout/os/posix/shell.hpp b/3rdparty/stout/include/stout/os/posix/shell.hpp
-index 1d73ae5..9bf89b5 100644
---- a/3rdparty/stout/include/stout/os/posix/shell.hpp
-+++ b/3rdparty/stout/include/stout/os/posix/shell.hpp
-@@ -37,7 +37,7 @@ namespace Shell {
- // received by the callee, usually the command name and `arg1` is the
- // second command argument received by the callee.
- 
--constexpr const char* name = "sh";
-+constexpr const char* name = "@sh@";
- constexpr const char* arg0 = "sh";
- constexpr const char* arg1 = "-c";
+diff --git a/3rdparty/stout/include/stout/posix/os.hpp b/3rdparty/stout/include/stout/posix/os.hpp
+index c37e64db6..d3d87b7f0 100644
+--- a/3rdparty/stout/include/stout/posix/os.hpp
++++ b/3rdparty/stout/include/stout/posix/os.hpp
+@@ -375,7 +375,7 @@ inline Option<std::string> getenv(const std::string& key)
+ inline Try<Nothing> tar(const std::string& path, const std::string& archive)
+ {
+   Try<std::string> tarOut =
+-    os::shell("tar %s %s %s", "-czf", archive.c_str(), path.c_str());
++    os::shell("@tar@ %s %s %s", "-czf", archive.c_str(), path.c_str());
  
+   if (tarOut.isError()) {
+     return Error("Failed to archive " + path + ": " + tarOut.error());
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 28dd151..36fc6ec 100644
+index 3bcc0f2df..e5cbc57e8 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1528,7 +1528,8 @@ if HAS_JAVA
+@@ -1545,7 +1545,7 @@ if HAS_JAVA
  
  $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom
  	@echo "Building mesos-$(PACKAGE_VERSION).jar ..."
 -	@cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom clean package
 +	@cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom -Dmaven.repo.local=@mavenRepo@ clean package
-+
  
  # Convenience library for JNI bindings.
  # TODO(Charles Reiss): We really should be building the Java library
 diff --git a/src/cli/mesos-scp b/src/cli/mesos-scp
-index a71ab07..feed8c4 100755
+index a71ab0708..1043d1b3c 100755
 --- a/src/cli/mesos-scp
 +++ b/src/cli/mesos-scp
-@@ -19,7 +19,7 @@ if sys.version_info < (2,6,0):
+@@ -19,7 +19,8 @@ if sys.version_info < (2,6,0):
  
  
  def scp(host, src, dst):
 -    cmd = 'scp -pr %s %s' % (src, host + ':' + dst)
 +    cmd = '@scp@ -pr %s %s' % (src, host + ':' + dst)
++
      try:
          process = subprocess.Popen(
              cmd,
+diff --git a/src/common/command_utils.cpp b/src/common/command_utils.cpp
+index 09e805140..90bf65896 100644
+--- a/src/common/command_utils.cpp
++++ b/src/common/command_utils.cpp
+@@ -140,7 +140,7 @@ Future<Nothing> tar(
+ 
+   argv.emplace_back(input);
+ 
+-  return launch("tar", argv)
++  return launch("@tar@", argv)
+     .then([]() { return Nothing(); });
+ }
+ 
+@@ -162,7 +162,7 @@ Future<Nothing> untar(
+     argv.emplace_back(directory.get());
+   }
+ 
+-  return launch("tar", argv)
++  return launch("@tar@", argv)
+     .then([]() { return Nothing(); });
+ }
+ 
+@@ -170,7 +170,7 @@ Future<Nothing> untar(
+ Future<string> sha512(const Path& input)
+ {
+ #ifdef __linux__
+-  const string cmd = "sha512sum";
++  const string cmd = "@sha512sum@";
+   vector<string> argv = {
+     cmd,
+     input             // Input file to compute shasum.
+@@ -206,7 +206,7 @@ Future<Nothing> gzip(const Path& input)
+     input
+   };
+ 
+-  return launch("gzip", argv)
++  return launch("@gzip@", argv)
+     .then([]() { return Nothing(); });
+ }
+ 
+@@ -219,7 +219,7 @@ Future<Nothing> decompress(const Path& input)
+     input
+   };
+ 
+-  return launch("gzip", argv)
++  return launch("@gzip@", argv)
+     .then([]() { return Nothing(); });
+ }
+ 
 diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp
-index 4456c28..e22c8fc 100644
+index 4456c2813..e22c8fc03 100644
 --- a/src/launcher/fetcher.cpp
 +++ b/src/launcher/fetcher.cpp
 @@ -68,13 +68,13 @@ static Try<bool> extract(
@@ -82,11 +144,11 @@ index 4456c28..e22c8fc 100644
    LOG(INFO) << "Copying resource with command:" << command;
  
 diff --git a/src/linux/perf.cpp b/src/linux/perf.cpp
-index ea823b3..170f54d 100644
+index aa31982eb..8b5331b17 100644
 --- a/src/linux/perf.cpp
 +++ b/src/linux/perf.cpp
-@@ -125,7 +125,7 @@ private:
-     // NOTE: The watchdog process places perf in its own process group
+@@ -127,7 +127,7 @@ private:
+     // NOTE: The supervisor childhook places perf in its own process group
      // and will kill the perf process when the parent dies.
      Try<Subprocess> _perf = subprocess(
 -        "perf",
@@ -104,37 +166,51 @@ index ea823b3..170f54d 100644
      command << " --event " << event;
    }
 diff --git a/src/linux/systemd.cpp b/src/linux/systemd.cpp
-index 619aa27..c1cbfe4 100644
+index 6318f48fc..394d88d47 100644
 --- a/src/linux/systemd.cpp
 +++ b/src/linux/systemd.cpp
-@@ -196,12 +196,19 @@ bool exists()
+@@ -196,13 +196,21 @@ bool exists()
    // This is static as the init system should not change while we are running.
    static const bool exists = []() -> bool {
      // (1) Test whether `/sbin/init` links to systemd.
 -    const Result<string> realpath = os::realpath("/sbin/init");
 -    if (realpath.isError() || realpath.isNone()) {
 -      LOG(WARNING) << "Failed to test /sbin/init for systemd environment: "
--                   << realpath.error();
+-                   << (realpath.isError() ? realpath.error()
+-                                          : "does not exist");
 -
 -      return false;
-+    // cstrahan: first assume we're on NixOS, then try non-NixOS
++    // cstrahan(nixos): first assume we're on NixOS, then try non-NixOS
 +    Result<string> realpath = os::realpath("/run/current-system/systemd/lib/systemd/systemd");
 +    Result<string> realpathNixOS = realpath;
 +    if (realpathNixOS.isError() || realpathNixOS.isNone()) {
 +      Result<string> realpathNonNixOS = realpath = os::realpath("/sbin/init");
 +      if (realpathNonNixOS.isError() || realpathNonNixOS.isNone()) {
 +        LOG(WARNING) << "Failed to test /run/current-system/systemd/lib/systemd/systemd for systemd environment: "
-+                     << realpathNixOS.error();
++                     << (realpathNixOS.isError() ? realpathNixOS.error()
++                                                 : "does not exist");
 +        LOG(WARNING) << "Failed to test /sbin/init for systemd environment: "
-+                     << realpathNonNixOS.error();
++                     << (realpathNonNixOS.isError() ? realpathNonNixOS.error()
++                                                    : "does not exist");
 +
 +        return false;
 +      }
      }
  
      CHECK_SOME(realpath);
+@@ -278,6 +286,10 @@ Path hierarchy()
+ 
+ Try<Nothing> daemonReload()
+ {
++  // cstrahan(nixos): should we patch these `systemctl`s?
++  // probably don't want to hard-code a particular systemd store path here,
++  // but if we use /run/current-system/sw/bin/systemctl,
++  // we won't be able to support non-NixOS distros.
+   Try<string> daemonReload = os::shell("systemctl daemon-reload");
+   if (daemonReload.isError()) {
+     return Error("Failed to reload systemd daemon: " + daemonReload.error());
 diff --git a/src/python/cli/src/mesos/cli.py b/src/python/cli/src/mesos/cli.py
-index f342992..354abf4 100644
+index f342992e0..354abf443 100644
 --- a/src/python/cli/src/mesos/cli.py
 +++ b/src/python/cli/src/mesos/cli.py
 @@ -40,7 +40,7 @@ def resolve(master):
@@ -146,11 +222,70 @@ index f342992..354abf4 100644
          stdin=None,
          stdout=subprocess.PIPE,
          stderr=subprocess.PIPE,
+diff --git a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
+index af9f3736b..f8554d414 100644
+--- a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
++++ b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
+@@ -499,7 +499,7 @@ Future<Option<ContainerLaunchInfo>> DockerVolumeIsolatorProcess::_prepare(
+     // unsafe arbitrary commands).
+     CommandInfo* command = launchInfo.add_pre_exec_commands();
+     command->set_shell(false);
+-    command->set_value("mount");
++    command->set_value("@mount@");
+     command->add_arguments("mount");
+     command->add_arguments("-n");
+     command->add_arguments("--rbind");
+diff --git a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
+index df16b8fee..4a17475bd 100644
+--- a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
++++ b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
+@@ -159,9 +159,9 @@ Try<Isolator*> LinuxFilesystemIsolatorProcess::create(const Flags& flags)
+       // here because 'create' will only be invoked during
+       // initialization.
+       Try<string> mount = os::shell(
+-          "mount --bind %s %s && "
+-          "mount --make-private %s && "
+-          "mount --make-shared %s",
++          "@mount@ --bind %s %s && "
++          "@mount@ --make-private %s && "
++          "@mount@ --make-shared %s",
+           workDir->c_str(),
+           workDir->c_str(),
+           workDir->c_str(),
+@@ -180,8 +180,8 @@ Try<Isolator*> LinuxFilesystemIsolatorProcess::create(const Flags& flags)
+       LOG(INFO) << "Making '" << workDir.get() << "' a shared mount";
+ 
+       Try<string> mount = os::shell(
+-          "mount --make-private %s && "
+-          "mount --make-shared %s",
++          "@mount@ --make-private %s && "
++          "@mount@ --make-shared %s",
+           workDir->c_str(),
+           workDir->c_str());
+ 
+@@ -404,7 +404,7 @@ Try<vector<CommandInfo>> LinuxFilesystemIsolatorProcess::getPreExecCommands(
+ 
+     CommandInfo command;
+     command.set_shell(false);
+-    command.set_value("mount");
++    command.set_value("@mount@");
+     command.add_arguments("mount");
+     command.add_arguments("-n");
+     command.add_arguments("--rbind");
+@@ -569,7 +569,7 @@ Try<vector<CommandInfo>> LinuxFilesystemIsolatorProcess::getPreExecCommands(
+     // TODO(jieyu): Consider the mode in the volume.
+     CommandInfo command;
+     command.set_shell(false);
+-    command.set_value("mount");
++    command.set_value("@mount@");
+     command.add_arguments("mount");
+     command.add_arguments("-n");
+     command.add_arguments("--rbind");
 diff --git a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
-index 51d1518..783adb5 100644
+index a1283e5ee..a918427bf 100644
 --- a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
 +++ b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
-@@ -204,7 +204,7 @@ Future<Option<ContainerLaunchInfo>> SharedFilesystemIsolatorProcess::prepare(
+@@ -207,7 +207,7 @@ Future<Option<ContainerLaunchInfo>> SharedFilesystemIsolatorProcess::prepare(
      }
  
      launchInfo.add_pre_exec_commands()->set_value(
@@ -159,36 +294,148 @@ index 51d1518..783adb5 100644
    }
  
    return launchInfo;
+diff --git a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
+index e3756c920..cfe458b59 100644
+--- a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
++++ b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
+@@ -355,7 +355,7 @@ Future<Option<ContainerLaunchInfo>> NvidiaGpuIsolatorProcess::_prepare(
+     }
+ 
+     launchInfo.add_pre_exec_commands()->set_value(
+-      "mount --no-mtab --rbind --read-only " +
++      "@mount@ --no-mtab --rbind --read-only " +
+       volume.HOST_PATH() + " " + target);
+   }
+ 
+diff --git a/src/slave/containerizer/mesos/isolators/gpu/volume.cpp b/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
+index 478752f37..ab527f0cd 100644
+--- a/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
++++ b/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
+@@ -281,7 +281,7 @@ Try<NvidiaVolume> NvidiaVolume::create()
+     string path = path::join(hostPath, "bin", binary);
+ 
+     if (!os::exists(path)) {
+-      string command = "which " + binary;
++      string command = "@which@ " + binary;
+       Try<string> which = os::shell(command);
+ 
+       if (which.isSome()) {
+@@ -295,7 +295,7 @@ Try<NvidiaVolume> NvidiaVolume::create()
+                               : "No such file or directory"));
+         }
+ 
+-        command = "cp " + realpath.get() + " " + path;
++        command = "@cp@ " + realpath.get() + " " + path;
+         Try<string> cp = os::shell(command);
+         if (cp.isError()) {
+           return Error("Failed to os::shell '" + command + "': " + cp.error());
+@@ -367,7 +367,7 @@ Try<NvidiaVolume> NvidiaVolume::create()
+             Path(realpath.get()).basename());
+ 
+         if (!os::exists(libraryPath)) {
+-          string command = "cp " + realpath.get() + " " + libraryPath;
++          string command = "@cp@ " + realpath.get() + " " + libraryPath;
+           Try<string> cp = os::shell(command);
+           if (cp.isError()) {
+             return Error("Failed to os::shell '" + command + "':"
 diff --git a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
-index b41e266..e07c163 100644
+index 0d9ec57d9..a177e4476 100644
 --- a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
 +++ b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
-@@ -163,7 +163,7 @@ Future<Option<ContainerLaunchInfo>> NamespacesPidIsolatorProcess::prepare(
-   // containers cannot see the namespace bind mount of other
-   // containers.
-   launchInfo.add_pre_exec_commands()->set_value(
--      "mount -n --bind " + string(PID_NS_BIND_MOUNT_MASK_DIR) +
-+      "@mount@ -n --bind " + string(PID_NS_BIND_MOUNT_MASK_DIR) +
-       " " + string(PID_NS_BIND_MOUNT_ROOT));
- 
-   // Mount /proc for the container's pid namespace to show the
-@@ -176,9 +176,9 @@ Future<Option<ContainerLaunchInfo>> NamespacesPidIsolatorProcess::prepare(
-   // -n flag so the mount is not added to the mtab where it will not
-   // be correctly removed with the namespace terminates.
-   launchInfo.add_pre_exec_commands()->set_value(
--      "mount none /proc --make-private -o rec");
-+      "@mount@ none /proc --make-private -o rec");
+@@ -94,7 +94,7 @@ Future<Option<ContainerLaunchInfo>> NamespacesPidIsolatorProcess::prepare(
+   //
+   // TOOD(jieyu): Consider unmount the existing /proc.
    launchInfo.add_pre_exec_commands()->set_value(
 -      "mount -n -t proc proc /proc -o nosuid,noexec,nodev");
 +      "@mount@ -n -t proc proc /proc -o nosuid,noexec,nodev");
  
    return launchInfo;
  }
+diff --git a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
+index c87e6715a..6601cd1b3 100644
+--- a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
++++ b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
+@@ -262,9 +262,9 @@ Try<Isolator*> NetworkCniIsolatorProcess::create(const Flags& flags)
+       // here because 'create' will only be invoked during
+       // initialization.
+       Try<string> mount = os::shell(
+-          "mount --bind %s %s && "
+-          "mount --make-private %s && "
+-          "mount --make-shared %s",
++          "@mount@ --bind %s %s && "
++          "@mount@ --make-private %s && "
++          "@mount@ --make-shared %s",
+           rootDir->c_str(),
+           rootDir->c_str(),
+           rootDir->c_str(),
+@@ -284,8 +284,8 @@ Try<Isolator*> NetworkCniIsolatorProcess::create(const Flags& flags)
+       LOG(INFO) << "Making '" << rootDir.get() << "' a shared mount";
+ 
+       Try<string> mount = os::shell(
+-          "mount --make-private %s && "
+-          "mount --make-shared %s",
++          "@mount@ --make-private %s && "
++          "@mount@ --make-shared %s",
+           rootDir->c_str(),
+           rootDir->c_str());
+ 
+diff --git a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
+index b470f0c82..6110a43ee 100644
+--- a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
++++ b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
+@@ -303,7 +303,7 @@ Try<Nothing> PortMapper::addPortMapping(
+       # Check if the `chain` exists in the iptable. If it does not
+       # exist go ahead and install the chain in the iptables NAT
+       # table.
+-      iptables -w -t nat --list %s
++      @iptables@ -w -t nat --list %s
+       if [ $? -ne 0 ]; then
+         # NOTE: When we create the chain, there is a possibility of a
+         # race due to which a container launch can fail. This can
+@@ -317,25 +317,25 @@ Try<Nothing> PortMapper::addPortMapping(
+         # since it can happen only when the chain is created the first
+         # time and two commands for creation of the chain are executed
+         # simultaneously.
+-        (iptables -w -t nat -N %s || exit 1)
++        (@iptables@ -w -t nat -N %s || exit 1)
+ 
+         # Once the chain has been installed add a rule in the PREROUTING
+         # chain to jump to this chain for any packets that are
+         # destined to a local address.
+-        (iptables -w -t nat -A PREROUTING \
++        (@iptables@ -w -t nat -A PREROUTING \
+         -m addrtype --dst-type LOCAL -j %s || exit 1)
+ 
+         # For locally generated packets we need a rule in the OUTPUT
+         # chain as well, since locally generated packets directly hit
+         # the output CHAIN, bypassing PREROUTING.
+-        (iptables -w -t nat -A OUTPUT \
++        (@iptables@ -w -t nat -A OUTPUT \
+         ! -d 127.0.0.0/8 -m addrtype \
+         --dst-type LOCAL -j %s || exit 1)
+       fi
+ 
+       # Within the `chain` go ahead and install the DNAT rule, if it
+       # does not exist.
+-      (iptables -w -t nat -C %s || iptables -t nat -A %s))~",
++      (@iptables@ -w -t nat -C %s || @iptables@ -t nat -A %s))~",
+       chain,
+       chain,
+       chain,
+@@ -362,7 +362,7 @@ Try<Nothing> PortMapper::delPortMapping()
+       # The iptables command searches for the DNAT rules with tag
+       # "container_id: <CNI_CONTAINERID>", and if it exists goes ahead
+       # and deletes it.
+-      iptables -w -t nat -S %s | sed "/%s/ s/-A/iptables -w -t nat -D/e")~",
++      @iptables@ -w -t nat -S %s | sed "/%s/ s/-A/@iptables@ -w -t nat -D/e")~",
+       chain,
+       getIptablesRuleTag()).get();
+ 
 diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
-index 79ee960..d55a353 100644
+index 20fb6ab35..46c160977 100644
 --- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
 +++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
-@@ -1392,19 +1392,19 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)
+@@ -1393,19 +1393,19 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)
    // Check the availability of a few Linux commands that we will use.
    // We use the blocking os::shell here because 'create' will only be
    // invoked during initialization.
@@ -211,7 +458,7 @@ index 79ee960..d55a353 100644
    if (checkCommandIp.isError()) {
      return Error("Check command 'ip' failed: " + checkCommandIp.error());
    }
-@@ -1924,9 +1924,9 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)
+@@ -1925,9 +1925,9 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)
      // visible. It's OK to use the blocking os::shell here because
      // 'create' will only be invoked during initialization.
      Try<string> mount = os::shell(
@@ -224,7 +471,7 @@ index 79ee960..d55a353 100644
          bindMountRoot->c_str(),
          bindMountRoot->c_str(),
          bindMountRoot->c_str(),
-@@ -1943,8 +1943,8 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)
+@@ -1944,8 +1944,8 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)
        // shared mount yet (possibly due to slave crash while preparing
        // the work directory mount). It's safe to re-do the following.
        Try<string> mount = os::shell(
@@ -235,7 +482,7 @@ index 79ee960..d55a353 100644
            bindMountRoot->c_str(),
            bindMountRoot->c_str());
  
-@@ -1963,8 +1963,8 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)
+@@ -1964,8 +1964,8 @@ Try<Isolator*> PortMappingIsolatorProcess::create(const Flags& flags)
            // so that they are in different peer groups.
            if (entry.shared() == bindMountEntry->shared()) {
              Try<string> mount = os::shell(
@@ -246,14 +493,16 @@ index 79ee960..d55a353 100644
                  bindMountRoot->c_str(),
                  bindMountRoot->c_str());
  
-@@ -3916,13 +3916,13 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -3911,6 +3911,8 @@ Try<Nothing> PortMappingIsolatorProcess::removeHostIPFilters(
+ // TODO(jieyu): Use the Subcommand abstraction to remove most of the
+ // logic here. Completely remove this function once we can assume a
+ // newer kernel where 'setns' works for mount namespaces.
++// cstrahan(nixos): this is executed in the container,
++// so we don't want to substitute paths here.
+ string PortMappingIsolatorProcess::scripts(Info* info)
  {
    ostringstream script;
- 
--  script << "#!/bin/sh\n";
-+  script << "#!@sh@\n";
-   script << "set -xe\n";
- 
+@@ -3921,7 +3923,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
    // Mark the mount point PORT_MAPPING_BIND_MOUNT_ROOT() as slave
    // mount so that changes in the container will not be propagated to
    // the host.
@@ -262,7 +511,7 @@ index 79ee960..d55a353 100644
  
    // Disable IPv6 when IPv6 module is loaded as IPv6 packets won't be
    // forwarded anyway.
-@@ -3930,7 +3930,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -3929,7 +3931,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
           << " echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6\n";
  
    // Configure lo and eth0.
@@ -271,7 +520,7 @@ index 79ee960..d55a353 100644
           << " mtu " << hostEth0MTU << " up\n";
  
    // NOTE: This is mostly a kernel issue: in veth_xmit() the kernel
-@@ -3939,12 +3939,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -3938,12 +3940,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
    // when we receive a packet with a bad checksum. Disabling rx
    // checksum offloading ensures the TCP layer will checksum and drop
    // it.
@@ -288,7 +537,7 @@ index 79ee960..d55a353 100644
  
    // Restrict the ephemeral ports that can be used by the container.
    script << "echo " << info->ephemeralPorts.lower() << " "
-@@ -3973,19 +3973,19 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -3972,19 +3974,19 @@ string PortMappingIsolatorProcess::scripts(Info* info)
    }
  
    // Set up filters on lo and eth0.
@@ -312,7 +561,7 @@ index 79ee960..d55a353 100644
           << " protocol ip"
           << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"
           << " flowid ffff:0"
-@@ -3996,7 +3996,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -3995,7 +3997,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
    foreach (const PortRange& range,
             getPortRanges(info->nonEphemeralPorts + info->ephemeralPorts)) {
      // Local traffic inside a container will not be redirected to eth0.
@@ -321,7 +570,7 @@ index 79ee960..d55a353 100644
             << " protocol ip"
             << " prio " << Priority(IP_FILTER_PRIORITY, HIGH).get() << " u32"
             << " flowid ffff:0"
-@@ -4005,7 +4005,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4004,7 +4006,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
  
      // Traffic going to host loopback IP and ports assigned to this
      // container will be redirected to lo.
@@ -330,7 +579,7 @@ index 79ee960..d55a353 100644
             << " protocol ip"
             << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"
             << " flowid ffff:0"
-@@ -4017,14 +4017,14 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4016,14 +4018,14 @@ string PortMappingIsolatorProcess::scripts(Info* info)
    }
  
    // Do not forward the ICMP packet if the destination IP is self.
@@ -347,7 +596,7 @@ index 79ee960..d55a353 100644
           << " protocol ip"
           << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32"
           << " flowid ffff:0"
-@@ -4033,9 +4033,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4032,9 +4034,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
           << net::IPNetwork::LOOPBACK_V4().address() << "\n";
  
    // Display the filters created on eth0 and lo.
@@ -359,7 +608,7 @@ index 79ee960..d55a353 100644
           << " parent " << ingress::HANDLE << "\n";
  
    // If throughput limit for container egress traffic exists, use HTB
-@@ -4047,9 +4047,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4046,9 +4048,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
    // throughput. TBF requires other parameters such as 'burst' that
    // HTB already has default values for.
    if (egressRateLimitPerContainer.isSome()) {
@@ -371,12 +620,12 @@ index 79ee960..d55a353 100644
             << CONTAINER_TX_HTB_HANDLE << " classid "
             << CONTAINER_TX_HTB_CLASS_ID << " htb rate "
             << egressRateLimitPerContainer.get().bytes() * 8 << "bit\n";
-@@ -4060,12 +4060,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4059,12 +4061,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
      // fq_codel, which has a larger buffer and better control on
      // buffer bloat.
      // TODO(cwang): Verity that fq_codel qdisc is available.
 -    script << "tc qdisc add dev " << eth0
-+    script << "@tC@ qdisc add dev " << eth0
++    script << "@tc@ qdisc add dev " << eth0
             << " parent " << CONTAINER_TX_HTB_CLASS_ID << " fq_codel\n";
  
      // Display the htb qdisc and class created on eth0.
@@ -388,11 +637,11 @@ index 79ee960..d55a353 100644
  
    return script.str();
 diff --git a/src/slave/containerizer/mesos/isolators/posix/disk.cpp b/src/slave/containerizer/mesos/isolators/posix/disk.cpp
-index 3dfe7ad..4288666 100644
+index db0583386..542586370 100644
 --- a/src/slave/containerizer/mesos/isolators/posix/disk.cpp
 +++ b/src/slave/containerizer/mesos/isolators/posix/disk.cpp
-@@ -492,7 +492,7 @@ private:
-     // NOTE: The monitor watchdog will watch the parent process and kill
+@@ -540,7 +540,7 @@ private:
+     // NOTE: The supervisor childhook will watch the parent process and kill
      // the 'du' process in case that the parent die.
      Try<Subprocess> s = subprocess(
 -        "du",
@@ -400,11 +649,37 @@ index 3dfe7ad..4288666 100644
          command,
          Subprocess::PATH("/dev/null"),
          Subprocess::PIPE(),
+diff --git a/src/slave/containerizer/mesos/isolators/volume/image.cpp b/src/slave/containerizer/mesos/isolators/volume/image.cpp
+index 210e67ad0..60b3a15e4 100644
+--- a/src/slave/containerizer/mesos/isolators/volume/image.cpp
++++ b/src/slave/containerizer/mesos/isolators/volume/image.cpp
+@@ -214,7 +214,7 @@ Future<Option<ContainerLaunchInfo>> VolumeImageIsolatorProcess::_prepare(
+ 
+     CommandInfo* command = launchInfo.add_pre_exec_commands();
+     command->set_shell(false);
+-    command->set_value("mount");
++    command->set_value("@mount@");
+     command->add_arguments("mount");
+     command->add_arguments("-n");
+     command->add_arguments("--rbind");
+diff --git a/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp b/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
+index 7b976d292..474dcd486 100644
+--- a/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
++++ b/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
+@@ -240,7 +240,7 @@ Future<Option<ContainerLaunchInfo>> VolumeSandboxPathIsolatorProcess::prepare(
+ 
+       CommandInfo* command = launchInfo.add_pre_exec_commands();
+       command->set_shell(false);
+-      command->set_value("mount");
++      command->set_value("@mount@");
+       command->add_arguments("mount");
+       command->add_arguments("-n");
+       command->add_arguments("--rbind");
 diff --git a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
-index b9f6d7a..0fcf455 100644
+index 9c5354e5f..a73a9692e 100644
 --- a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
 +++ b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
-@@ -141,7 +141,7 @@ Future<Nothing> CopyBackendProcess::_provision(
+@@ -147,7 +147,7 @@ Future<Nothing> CopyBackendProcess::_provision(
  #endif // __APPLE__ || __FreeBSD__
  
    Try<Subprocess> s = subprocess(
@@ -413,11 +688,20 @@ index b9f6d7a..0fcf455 100644
        args,
        Subprocess::PATH("/dev/null"),
        Subprocess::PATH("/dev/null"),
+@@ -180,7 +180,7 @@ Future<bool> CopyBackendProcess::destroy(const string& rootfs)
+   vector<string> argv{"rm", "-rf", rootfs};
+ 
+   Try<Subprocess> s = subprocess(
+-      "rm",
++      "@rm@",
+       argv,
+       Subprocess::PATH("/dev/null"),
+       Subprocess::FD(STDOUT_FILENO),
 diff --git a/src/uri/fetchers/copy.cpp b/src/uri/fetchers/copy.cpp
-index f095ad6..ee0c2a7 100644
+index 2cfef5ab0..8a62f7699 100644
 --- a/src/uri/fetchers/copy.cpp
 +++ b/src/uri/fetchers/copy.cpp
-@@ -88,7 +88,7 @@ Future<Nothing> CopyFetcherPlugin::fetch(
+@@ -97,7 +97,7 @@ Future<Nothing> CopyFetcherPlugin::fetch(
    const vector<string> argv = {"cp", "-a", uri.path(), directory};
  
    Try<Subprocess> s = subprocess(
@@ -427,10 +711,10 @@ index f095ad6..ee0c2a7 100644
        Subprocess::PATH("/dev/null"),
        Subprocess::PIPE(),
 diff --git a/src/uri/fetchers/curl.cpp b/src/uri/fetchers/curl.cpp
-index cc3f9ee..691d2d9 100644
+index 7b746d619..12bbb04df 100644
 --- a/src/uri/fetchers/curl.cpp
 +++ b/src/uri/fetchers/curl.cpp
-@@ -98,7 +98,7 @@ Future<Nothing> CurlFetcherPlugin::fetch(
+@@ -107,7 +107,7 @@ Future<Nothing> CurlFetcherPlugin::fetch(
    };
  
    Try<Subprocess> s = subprocess(
@@ -440,10 +724,10 @@ index cc3f9ee..691d2d9 100644
        Subprocess::PATH("/dev/null"),
        Subprocess::PIPE(),
 diff --git a/src/uri/fetchers/docker.cpp b/src/uri/fetchers/docker.cpp
-index 211be6f..d7e3771 100644
+index 3f38dddfb..fd991ee74 100644
 --- a/src/uri/fetchers/docker.cpp
 +++ b/src/uri/fetchers/docker.cpp
-@@ -113,7 +113,7 @@ static Future<http::Response> curl(
+@@ -114,7 +114,7 @@ static Future<http::Response> curl(
  
    // TODO(jieyu): Kill the process if discard is called.
    Try<Subprocess> s = subprocess(
@@ -452,7 +736,7 @@ index 211be6f..d7e3771 100644
        argv,
        Subprocess::PATH("/dev/null"),
        Subprocess::PIPE(),
-@@ -212,7 +212,7 @@ static Future<int> download(
+@@ -213,7 +213,7 @@ static Future<int> download(
  
    // TODO(jieyu): Kill the process if discard is called.
    Try<Subprocess> s = subprocess(
diff --git a/pkgs/applications/networking/cluster/mesos/rb36610.patch b/pkgs/applications/networking/cluster/mesos/rb36610.patch
index c3b1b290422..bee578cc3e9 100644
--- a/pkgs/applications/networking/cluster/mesos/rb36610.patch
+++ b/pkgs/applications/networking/cluster/mesos/rb36610.patch
@@ -1,11 +1,12 @@
 diff --git a/src/linux/fs.cpp b/src/linux/fs.cpp
-index ea0891e320154b85a21ed2d138c192821efae9cd..7b24c377c9a28cad91738305c273fb53a4dc7365 100644
+index 913e233..c2917a6 100644
 --- a/src/linux/fs.cpp
 +++ b/src/linux/fs.cpp
-@@ -19,6 +19,7 @@
+@@ -17,6 +17,7 @@
  #include <errno.h>
  #include <stdio.h>
  #include <string.h>
 +#include <syscall.h>
-
+ 
  #include <linux/limits.h>
+ #include <linux/unistd.h>
diff --git a/pkgs/applications/networking/cluster/mesos/rb51324.patch b/pkgs/applications/networking/cluster/mesos/rb51324.patch
deleted file mode 100644
index 68ef866161f..00000000000
--- a/pkgs/applications/networking/cluster/mesos/rb51324.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/3rdparty/stout/include/stout/os/ls.hpp b/3rdparty/stout/include/stout/os/ls.hpp
-index f8da9ef..6d549d3 100644
---- a/3rdparty/stout/include/stout/os/ls.hpp
-+++ b/3rdparty/stout/include/stout/os/ls.hpp
-@@ -18,6 +18,7 @@
- #else
- #include <dirent.h>
- #endif // __WINDOWS__
-+
- #include <stdlib.h>
- 
- #include <list>
-@@ -26,8 +27,6 @@
- #include <stout/error.hpp>
- #include <stout/try.hpp>
- 
--#include <stout/os/direntsize.hpp>
--
- 
- namespace os {
- 
-@@ -36,36 +35,32 @@ inline Try<std::list<std::string>> ls(const std::string& directory)
-   DIR* dir = opendir(directory.c_str());
- 
-   if (dir == nullptr) {
--    // Preserve `opendir` error.
-     return ErrnoError("Failed to opendir '" + directory + "'");
-   }
- 
--  dirent* temp = (dirent*) malloc(os::dirent_size(dir));
--
--  if (temp == nullptr) {
--    // Preserve `malloc` error.
--    ErrnoError error("Failed to allocate directory entries");
--    closedir(dir);
--    return error;
--  }
--
-   std::list<std::string> result;
-   struct dirent* entry;
--  int error;
- 
--  while ((error = readdir_r(dir, temp, &entry)) == 0 && entry != nullptr) {
-+  // Zero `errno` before starting to call `readdir`. This is necessary
-+  // to allow us to determine when `readdir` returns an error.
-+  errno = 0;
-+
-+  while ((entry = readdir(dir)) != NULL) {
-     if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
-       continue;
-     }
-     result.push_back(entry->d_name);
-   }
- 
--  free(temp);
--  closedir(dir);
-+  if (errno != 0) {
-+    // Preserve `readdir` error.
-+    Error error = ErrnoError("Failed to read directory");
-+    closedir(dir);
-+    return error;
-+  }
- 
--  if (error != 0) {
--    // Preserve `readdir_r` error.
--    return ErrnoError("Failed to read directories");
-+  if (closedir(dir) == -1) {
-+    return ErrnoError("Failed to close directory");
-   }
- 
-   return result;
diff --git a/pkgs/applications/networking/cluster/mesos/rb51325.patch b/pkgs/applications/networking/cluster/mesos/rb51325.patch
deleted file mode 100644
index 5c5ce00730b..00000000000
--- a/pkgs/applications/networking/cluster/mesos/rb51325.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff --git a/3rdparty/stout/include/Makefile.am b/3rdparty/stout/include/Makefile.am
-index 1f2ee85..b0b08d8 100644
---- a/3rdparty/stout/include/Makefile.am
-+++ b/3rdparty/stout/include/Makefile.am
-@@ -64,7 +64,6 @@ nobase_include_HEADERS =			\
-   stout/os/chroot.hpp				\
-   stout/os/close.hpp				\
-   stout/os/constants.hpp			\
--  stout/os/direntsize.hpp			\
-   stout/os/environment.hpp			\
-   stout/os/exists.hpp				\
-   stout/os/fcntl.hpp				\
-@@ -108,7 +107,6 @@ nobase_include_HEADERS =			\
-   stout/os/posix/chown.hpp			\
-   stout/os/posix/chroot.hpp			\
-   stout/os/posix/close.hpp			\
--  stout/os/posix/direntsize.hpp			\
-   stout/os/posix/exists.hpp			\
-   stout/os/posix/fcntl.hpp			\
-   stout/os/posix/fork.hpp			\
-@@ -134,7 +132,6 @@ nobase_include_HEADERS =			\
-   stout/os/windows/bootid.hpp			\
-   stout/os/windows/chroot.hpp			\
-   stout/os/windows/close.hpp			\
--  stout/os/windows/direntsize.hpp		\
-   stout/os/windows/exists.hpp			\
-   stout/os/windows/fcntl.hpp			\
-   stout/os/windows/fork.hpp			\
-diff --git a/3rdparty/stout/include/stout/os/direntsize.hpp b/3rdparty/stout/include/stout/os/direntsize.hpp
-deleted file mode 100644
-index 819f99a..0000000
---- a/3rdparty/stout/include/stout/os/direntsize.hpp
-+++ /dev/null
-@@ -1,26 +0,0 @@
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--//  http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
--
--#ifndef __STOUT_OS_DIRENTSIZE_HPP__
--#define __STOUT_OS_DIRENTSIZE_HPP__
--
--
--// For readability, we minimize the number of #ifdef blocks in the code by
--// splitting platform specifc system calls into separate directories.
--#ifdef __WINDOWS__
--#include <stout/os/windows/direntsize.hpp>
--#else
--#include <stout/os/posix/direntsize.hpp>
--#endif // __WINDOWS__
--
--
--#endif // __STOUT_OS_DIRENTSIZE_HPP__
-diff --git a/3rdparty/stout/include/stout/os/posix/direntsize.hpp b/3rdparty/stout/include/stout/os/posix/direntsize.hpp
-deleted file mode 100644
-index 9d8f72e..0000000
---- a/3rdparty/stout/include/stout/os/posix/direntsize.hpp
-+++ /dev/null
-@@ -1,42 +0,0 @@
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--//  http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
--
--#ifndef __STOUT_OS_POSIX_DIRENTSIZE_HPP__
--#define __STOUT_OS_POSIX_DIRENTSIZE_HPP__
--
--#include <dirent.h>
--#include <unistd.h>
--
--
--namespace os {
--
--inline size_t dirent_size(DIR* dir)
--{
--  // Calculate the size for a "directory entry".
--  long name_max = fpathconf(dirfd(dir), _PC_NAME_MAX);
--
--  // If we don't get a valid size, check NAME_MAX, but fall back on
--  // 255 in the worst case ... Danger, Will Robinson!
--  if (name_max == -1) {
--    name_max = (NAME_MAX > 255) ? NAME_MAX : 255;
--  }
--
--  size_t name_end = (size_t) offsetof(dirent, d_name) + name_max + 1;
--
--  size_t size = (name_end > sizeof(dirent) ? name_end : sizeof(dirent));
--
--  return size;
--}
--
--} // namespace os {
--
--#endif // __STOUT_OS_POSIX_DIRENTSIZE_HPP__
-diff --git a/3rdparty/stout/include/stout/os/windows/direntsize.hpp b/3rdparty/stout/include/stout/os/windows/direntsize.hpp
-deleted file mode 100644
-index 7c8c7a0..0000000
---- a/3rdparty/stout/include/stout/os/windows/direntsize.hpp
-+++ /dev/null
-@@ -1,43 +0,0 @@
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--//  http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
--
--#ifndef __STOUT_OS_WINDOWS_DIRENTSIZE_HPP__
--#define __STOUT_OS_WINDOWS_DIRENTSIZE_HPP__
--
--#include <stout/internal/windows/dirent.hpp>
--
--#include <stout/windows.hpp>
--
--
--namespace os {
--
--inline size_t dirent_size(DIR* dir)
--{
--  // NOTE: Size calculation logic here is much simpler than on POSIX because
--  // our implementation of `dirent` is constant-sized. In particular, on POSIX,
--  // we usually have to calculate the maximum name size for a path before we
--  // can alloc a correctly-size `dirent`, but on Windows, `dirent.d_name` is
--  // always `MAX_PATH` bytes in size.
--  //
--  // This follows closely from the Windows standard API data structures for
--  // manipulating and querying directories. For example, the structures
--  // `WIN32_FIND_DATA`[1] (which in many ways is the Windows equivalent of
--  // `dirent`) has a field `cFileName` (which is much like `d_name`) that is
--  // also `MAX_PATH` in size.
--  //
--  // [1] https://msdn.microsoft.com/en-us/library/windows/desktop/aa365740(v=vs.85).aspx
--  return sizeof(dirent);
--}
--
--} // namespace os {
--
--#endif // __STOUT_OS_WINDOWS_DIRENTSIZE_HPP__
diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix
index f077533ecfe..eab10372674 100644
--- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix
+++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix
@@ -53,4 +53,4 @@ in attrs // {
     fi
     ${postShellHook}
   '';
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 47f66c83ff5..2e962298550 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, src
+{ stdenv, lib, version, src
 , autoreconfHook, zlib, gtest
 , ...
 }:
@@ -21,6 +21,26 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ autoreconfHook zlib ];
 
+  # The generated C++ code uses static initializers which mutate a global data
+  # structure. This causes problems for an executable when:
+  #
+  # 1) it dynamically links to two libs, both of which contain generated C++ for
+  #    the same proto file, and
+  # 2) the two aforementioned libs both dynamically link to libprotobuf.
+  #
+  # One solution is to statically link libprotobuf, that way the global
+  # variables are not shared; in fact, this is necessary for the python Mesos
+  # binding to not crash, as the python lib contains two C extensions which
+  # both refer to the same proto schema.
+  #
+  # See: https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684
+  #      https://github.com/google/protobuf/issues/1489
+  dontDisableStatic = true;
+  configureFlags = [
+    "CFLAGS=-fPIC"
+    "CXXFLAGS=-fPIC"
+  ];
+
   doCheck = true;
 
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ca61ccbf4d..66af0cd36e7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19146,18 +19146,35 @@ in {
     '';
 
     preConfigure = optionalString (versionAtLeast protobuf.version "2.6.0") ''
-      PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
-      PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
+      export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
+      export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
     '';
 
-    checkPhase = if versionAtLeast protobuf.version "2.6.0" then ''
+    preBuild = optionalString (versionAtLeast protobuf.version "2.6.0") ''
+      ${python}/bin/${python.executable} setup.py build_ext --cpp_implementation
+    '';
+
+    checkPhase = ''
+      runHook preCheck
+    '' + (if versionAtLeast protobuf.version "2.6.0" then ''
       ${python.executable} setup.py google_test --cpp_implementation
+      echo "sanity checking the C extension . . ."
+      echo "import google.protobuf.descriptor" | ${python.executable}
     '' else ''
       ${python.executable} setup.py test
+    '') + ''
+      runHook postCheck
     '';
 
     installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--install-option='--cpp_implementation'";
 
+    # the _message.so isn't installed, so we'll do that manually.
+    # if someone can figure out a less hacky way to get the _message.so to
+    # install, please do replace this.
+    postInstall = optionalString (versionAtLeast protobuf.version "2.6.0") ''
+      cp -v $(find build -name "_message*") $out/${python.sitePackages}/google/protobuf/pyext
+    '';
+
     doCheck = true;
 
     meta = {

From 10e2d88f6c528e2945306d22b5fc5a53e60ba228 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <michaelpj@gmail.com>
Date: Sun, 1 Jan 2017 16:45:26 +0000
Subject: [PATCH 010/727] arbtt service: init

---
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/services/monitoring/arbtt.nix | 63 +++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/arbtt.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index be09fb80e0a..54a70d6fcea 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -293,6 +293,7 @@
   ./services/misc/uhub.nix
   ./services/misc/zookeeper.nix
   ./services/monitoring/apcupsd.nix
+  ./services/monitoring/arbtt.nix
   ./services/monitoring/bosun.nix
   ./services/monitoring/cadvisor.nix
   ./services/monitoring/collectd.nix
diff --git a/nixos/modules/services/monitoring/arbtt.nix b/nixos/modules/services/monitoring/arbtt.nix
new file mode 100644
index 00000000000..27d59e367d5
--- /dev/null
+++ b/nixos/modules/services/monitoring/arbtt.nix
@@ -0,0 +1,63 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.arbtt;
+in {
+  options = {
+    services.arbtt = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = ''
+          Enable the arbtt statistics capture service.
+        '';
+      };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.haskellPackages.arbtt;
+        defaultText = "pkgs.haskellPackages.arbtt";
+        example = literalExample "pkgs.haskellPackages.arbtt";
+        description = ''
+          The package to use for the arbtt binaries.
+        '';
+      };
+
+      logFile = mkOption {
+        type = types.str;
+        default = "%h/.arbtt/capture.log";
+        example = "/home/username/.arbtt-capture.log";
+        description = ''
+          The log file for captured samples.
+        '';
+      };
+
+      sampleRate = mkOption {
+        type = types.int;
+        default = 60;
+        example = 120;
+        description = ''
+          The sampling interval in seconds.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.arbtt = {
+      description = "arbtt statistics capture service";
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${cfg.package}/bin/arbtt-capture --logfile=${cfg.logFile} --sample-rate=${toString cfg.sampleRate}";
+        Restart = "always";
+      };
+    };
+  };
+
+  meta.maintainers = [ maintainers.michaelpj ];
+}

From 3a1da126a172e9f331921bdb945bf3294f6f758c Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 7 Jan 2017 14:35:20 +0100
Subject: [PATCH 011/727] gogs: 0.9.7 -> 0.9.113

---
 .../version-management/gogs/default.nix       |   4 +-
 .../version-management/gogs/deps.nix          | 145 ++++++++----------
 2 files changed, 70 insertions(+), 79 deletions(-)

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 6a2e0d90a3e..b9a1f2e7a84 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -5,13 +5,13 @@
 
 buildGoPackage rec {
   name = "gogs-${version}";
-  version = "0.9.97";
+  version = "0.9.113";
 
   src = fetchFromGitHub {
     owner = "gogits";
     repo = "gogs";
     rev = "v${version}";
-    sha256 = "151mmd8h5zd4bvafd42nsky0m9gblf5fcpd6jacqcrry1796hxk9";
+    sha256 = "1zk83c9jiazfw3221yi2sidp7917q3dxb2xb7wrjg4an18gj46j7";
   };
 
   patchPhase = ''
diff --git a/pkgs/applications/version-management/gogs/deps.nix b/pkgs/applications/version-management/gogs/deps.nix
index e6de8e34313..4596eb1d243 100644
--- a/pkgs/applications/version-management/gogs/deps.nix
+++ b/pkgs/applications/version-management/gogs/deps.nix
@@ -31,8 +31,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/Unknwon/paginater";
-      rev = "7748a72e01415173a27d79866b984328e7b0c12b";
-      sha256 = "0ighsa75ixgx6c4hc397c06lapf0pz50cj3cgkdvssp9an38kw2c";
+      rev = "701c23f468663c34d1b1768c3ae1bcc57e11c5b3";
+      sha256 = "09h3gyd9wyzgbkny5g5ihd4ckmv0bams8g5y2xfkd55gizlmx07p";
     };
   }
   {
@@ -40,8 +40,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/bradfitz/gomemcache";
-      rev = "fb1f79c6b65acda83063cbc69f6bba1522558bfc";
-      sha256 = "0mq5rn07bbpy2yla7hassrmj966p6r7ffbf9w41l31yy0fc07i68";
+      rev = "2fafb84a66c4911e11a8f50955b01e74fe3ab9c5";
+      sha256 = "1k3vqmq008gad1cq1gaqa35k5ldn0z8fcx07c15x9v8p9xjbhkc9";
     };
   }
   {
@@ -49,8 +49,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-macaron/binding";
-      rev = "9440f336b443056c90d7d448a0a55ad8c7599880";
-      sha256 = "0g3ya3h8vjaykgp1npdxbizcf8kzv4m47vymcsq06vpihrfhbvg7";
+      rev = "48920167fa152d02f228cfbece7e0f1e452d200a";
+      sha256 = "00h4mdyhqkh75vgafyyyn54kdpwj82ifg9l6lxv9gnkw6frxhkan";
     };
   }
   {
@@ -112,8 +112,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-macaron/session";
-      rev = "66031fcb37a0fff002a1f028eb0b3a815c78306b";
-      sha256 = "1prrfv8xdlyxrdbagbqzjkx69x74hjzif5ki4lzl2y6fk3nb0cd5";
+      rev = "b8a2b5ef7fb4c91c1c8ca23e2a52e29a4bcbb22f";
+      sha256 = "1nz823fn23wp87pzzhpxlbr6j7q4khywa9n0h1kpdikiy87z5k5m";
     };
   }
   {
@@ -130,8 +130,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-sql-driver/mysql";
-      rev = "0b58b37b664c21f3010e836f1b931e1d0b0b0685";
-      sha256 = "1dvizip0xzir3gd1ghamfyngwvq5kv7m10d8460fm58g6sy0j512";
+      rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034";
+      sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5";
     };
   }
   {
@@ -139,8 +139,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-xorm/builder";
-      rev = "f502bd375c1feb5febb467d7e1b840b74adddf0f";
-      sha256 = "144m9mb01lhjz05d6h0jkq14dj52844vycn21kay5vjj9yxipzls";
+      rev = "db75972580de4a7c6c20fff5b16a924c3de3fa12";
+      sha256 = "0qgrvjfghkgfhbrm989yhrwgs36d6wxcap012glpmd2ddp5klw46";
     };
   }
   {
@@ -148,8 +148,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-xorm/core";
-      rev = "5bf745d7d163f4380e6c2bba8c4afa60534dd087";
-      sha256 = "0nx12akm0bb6nxg7x6j40vhhbh0k1lsxk0x8lndnwqsbhznpg7dz";
+      rev = "2fbe2c76c6781d9e1c0398fc25386426e611f975";
+      sha256 = "1rfry5md6g8b6d6vyqpqys3wl2mxf6v55d2aapxlx3hqn6lz0lax";
     };
   }
   {
@@ -157,8 +157,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-xorm/xorm";
-      rev = "838b2268ae0847e6cfab5c0359c496983223e9dd";
-      sha256 = "0f979lil952gy7gr61xwdj0nid2wkxjd7gzzr9iki4rrq67h23vy";
+      rev = "2189b36884a485d1d609fc5690bfc71a8a7de8c3";
+      sha256 = "02z140xbwqins6ql8hwdr6ar3d67jqrkm22bamqbj2rmfl7z0846";
     };
   }
   {
@@ -175,8 +175,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gogits/cron";
-      rev = "7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c";
-      sha256 = "0y7z62g727pygnm5y1jp4i8izz4kzrnih8ihapxhin0isbfd3b6y";
+      rev = "2fc07a4c4f1e3c4d2301c5ed578d5e2c31c70421";
+      sha256 = "0a153pspisnhjpxjsryqdb29y6b8ics0203icbq5lps2g5jyaiw0";
     };
   }
   {
@@ -184,8 +184,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gogits/git-module";
-      rev = "b3009dc4f5842cf9e2e80fef1e125e79c38e4949";
-      sha256 = "1f5mms15hknnj17nvb5dwwk8fcm8a9msy9qdjvkplihxgaqm0amz";
+      rev = "df1013f8eb4dc70de90bc5597bf560a4b7da802e";
+      sha256 = "1vnfiwdwp210hn7z7fgi5i80mggk76blbhykqg8wvx8bi0wxlrs8";
     };
   }
   {
@@ -193,8 +193,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/gogits/go-gogs-client";
-      rev = "d8aff570fa22d4e38954c753ec8b21862239b31d";
-      sha256 = "07gmvvljd48jwpkgsqlcp19rphn7ybcd4hzf7zahhl4dd4b8p4p3";
+      rev = "98046bb98061fc6baa5bb86359af0b7c300d384a";
+      sha256 = "1wsg70irk4lwyak4kn2ml64j1fglqkyzs2lgc2mk4n4j5kn9hs1k";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogits/go-libravatar";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogits/go-libravatar";
+      rev = "cd1abbd55d09b793672732a7a1dfdaa12a40dfd0";
+      sha256 = "00xvnddfh1m5g17mrnvp505i4sgwpk1r0wqz6a15bp6lvadwwlnj";
     };
   }
   {
@@ -211,8 +220,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/jaytaylor/html2text";
-      rev = "8fb95d837f7d6db1913fecfd7bcc5333e6499596";
-      sha256 = "0pzyidlp5jmzl5smhr9f8a81qpfls80j5m7156b032fvyvjwanlr";
+      rev = "4b9124c9b0a2279e2092c4a9aaf1c83bbd2dcffc";
+      sha256 = "1yp0rawzziia9diffxs6k5g85acq3a62yb5ajbvy04r2p04dv85h";
     };
   }
   {
@@ -220,8 +229,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/klauspost/compress";
-      rev = "d0763f13d86e630f5d3ea9fa848a6ecc68255297";
-      sha256 = "18nf5iqsrz2xq899zy9gvi1s0gaxn4zwjgkxxvlqmjzs7waq946y";
+      rev = "e3b7981a12dd3cab49afa1d3a50e715846f23732";
+      sha256 = "0hxciiaqrbf7rr112r7rwk7jcwhvjpbhnp8ikszp56zwqd64k9vn";
     };
   }
   {
@@ -238,8 +247,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/klauspost/crc32";
-      rev = "19b0b332c9e4516a6370a0456e6182c3b5036720";
-      sha256 = "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r";
+      rev = "cb6bfca970f6908083f26f39a79009d608efd5cd";
+      sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n";
     };
   }
   {
@@ -247,17 +256,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/lib/pq";
-      rev = "50761b0867bd1d9d069276790bcd4a3bccf2324a";
-      sha256 = "1bz46slzri958wdnvlvyx12bp3pmy8iny5m0m16i3n8h1q84dhp5";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-sqlite3";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-sqlite3";
-      rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
-      sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
+      rev = "8df6253d1317616f36b0c3740eb30c239a7372cb";
+      sha256 = "0djs6k6rdh06v8bz0msn0lv532hk2vrljj1pz4kgmbqcmd17y31k";
     };
   }
   {
@@ -265,8 +265,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mcuadros/go-version";
-      rev = "d52711f8d6bea8dc01efafdb68ad95a4e2606630";
-      sha256 = "08ps27vvn77jhrnks8p8mx5cwgb1ikhaddcnrpgpz7aq905a5kzn";
+      rev = "257f7b9a7d87427c8d7f89469a5958d57f8abd7c";
+      sha256 = "0mpbcc698503hbrlc74l3nqd6hdr0n6vybfzw10pg7qx3cpmn512";
     };
   }
   {
@@ -274,17 +274,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/microcosm-cc/bluemonday";
-      rev = "7d0cad0ac7ef5e3afd74816444b44b56327422a4";
-      sha256 = "0cnszfgmajg6r3icy4n5fx9sxw4igmi7vpqmms4884ypg1va4kq5";
-    };
-  }
-  {
-    goPackagePath = "github.com/msteinert/pam";
-    fetch = {
-      type = "git";
-      url = "https://github.com/msteinert/pam";
-      rev = "02ccfbfaf0cc627aa3aec8ef7ed5cfeec5b43f63";
-      sha256 = "0vx7w1ybwi049wizlamm8hqw0vz4rnpiipn7rkvfapa2xmdyd71h";
+      rev = "e79763773ab6222ca1d5a7cbd9d62d83c1f77081";
+      sha256 = "04rd8jzy8kzzm0j0k7wy90pykl8ws43yhhwl2gkyz6rak10jhqpz";
     };
   }
   {
@@ -319,8 +310,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/sergi/go-diff";
-      rev = "ce4a6e0e61d6908298eed511fc0683062d4c7f3b";
-      sha256 = "193fhvj6nf7az4lmlcr05brn52ydl0pky79fb1s83bllf8mrhqg7";
+      rev = "83532ca1c1caa393179c677b6facf48e61f4ca5d";
+      sha256 = "08niiivkn9a1hdl738w2sq4vq6csqhw91an8wq83dk40q62f4sq8";
     };
   }
   {
@@ -332,22 +323,13 @@
       sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg";
     };
   }
-  {
-    goPackagePath = "github.com/strk/go-libravatar";
-    fetch = {
-      type = "git";
-      url = "https://github.com/strk/go-libravatar";
-      rev = "5eed7bff870ae19ef51c5773dbc8f3e9fcbd0982";
-      sha256 = "1pjb7a4v42dg7y3j880qv20il77fq0cqwfsl9pz7ywi5rmgfnq6v";
-    };
-  }
   {
     goPackagePath = "github.com/urfave/cli";
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev = "d53eb991652b1d438abdd34ce4bfa3ef1539108e";
-      sha256 = "0d02mmx79hrwd42wn0bchf28jqi47aj17pkfczq22gdxp6jd3r9w";
+      rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6";
+      sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
     };
   }
   {
@@ -355,8 +337,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "7682e7e3945130cf3cde089834664f68afdd1523";
-      sha256 = "1yg53yycnzn569jssij0w1jxhjs9wmscw29hasqqkvhkzdwyjzhf";
+      rev = "cb497ae8f18e3c55f81bc9f3876c8f4c3d8a2813";
+      sha256 = "0zah08y0a9rqk1ggp0ylkpycr3amrc22ncsppyrymry44g56xyfj";
     };
   }
   {
@@ -364,8 +346,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "ffe101cce3477a6c6d8f0754d103bb0a84ec1266";
-      sha256 = "013jzyxix30izpi4485fvh43r5wf8icj85acslizrg6pd1m6mhmm";
+      rev = "ae05321a78c1401cec22ba7bc203b597ea372496";
+      sha256 = "1fzbijklrmhwj4mlwrnrxbbrhlzpgrsbv05zldbkvhic14g0ii2c";
     };
   }
   {
@@ -373,8 +355,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "098f51fb687dbaba1f6efabeafbb6461203f9e21";
-      sha256 = "17h1qkgh436gn6sgv81d7xhbdxhscdhbhjfhh9z7r2s6vm05g1ai";
+      rev = "44f4f658a783b0cee41fe0a23b8fc91d9c120558";
+      sha256 = "1hgwc2p5azfyzvl7i47my3wnbp2g7814a2sshqw63dvggs9mszcx";
     };
   }
   {
@@ -418,8 +400,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/ini.v1";
-      rev = "6e4869b434bd001f6983749881c7ead3545887d8";
-      sha256 = "1w7qcl0k7bsp6871vr8mbli09imd67qqq1vbvpll33d2vw12wmva";
+      rev = "6f66b0e091edb3c7b380f7c4f0f884274d550b67";
+      sha256 = "1n09b7ypbayhk6x7qi3g3hrqjlmj5yszwl5d8jykjd5azp6h8sb8";
     };
   }
   {
@@ -427,8 +409,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/ldap.v2";
-      rev = "d0a5ced67b4dc310b9158d63a2c6f9c5ec13f105";
-      sha256 = "02pgng2m8bfdh7471mjd6g19h53448hlsnl8l7jv9hm8mh1gp7jm";
+      rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f";
+      sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895";
     };
   }
   {
@@ -436,8 +418,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/macaron.v1";
-      rev = "4974334b10dbb6f5c0e17f4c10555ff050a16329";
-      sha256 = "0jryd9xah6571xpn03i59wiziiz0w6v2dwda202y8y2yrjdxnzlp";
+      rev = "ddb19a9f3e8cedd44696b9dd5854dc8a43f3dd6c";
+      sha256 = "0riggdq8zxy5x6zhks66slvsg22b9i4399f7ns2l6daj79myqyvy";
     };
   }
   {
@@ -449,4 +431,13 @@
       sha256 = "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h";
     };
   }
+  {
+    goPackagePath = "github.com/mattn/go-sqlite3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
+      sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
+    };
+  }
 ]

From 6f72be9962be6c152036955a183c8f9b147757a3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 8 Jan 2017 02:25:46 -0600
Subject: [PATCH 012/727] DarwinTools: init at 1

---
 .../darwin/DarwinTools/default.nix            | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/DarwinTools/default.nix

diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix
new file mode 100644
index 00000000000..174f9478633
--- /dev/null
+++ b/pkgs/os-specific/darwin/DarwinTools/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "DarwinTools-1";
+
+  src = fetchurl {
+    url = "https://opensource.apple.com/tarballs/DarwinTools/${name}.tar.gz";
+    sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp";
+  };
+
+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace gcc cc
+  '';
+
+  configurePhase = ''
+    export SRCROOT=.
+    export SYMROOT=.
+    export DSTROOT=$out
+  '';
+
+  postInstall = ''
+    mv $out/usr/* $out
+    rmdir $out/usr
+  '';
+
+  meta = {
+    maintainers = [ stdenv.lib.maintainers.matthewbauer ];
+    platforms = stdenv.lib.platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cad0b6c8031..af59f6146ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10724,6 +10724,8 @@ in
     stubs = callPackages ../os-specific/darwin/stubs {};
 
     usr-include = callPackage ../os-specific/darwin/usr-include {};
+
+    DarwinTools = callPackage ../os-specific/darwin/DarwinTools {};
   };
 
   devicemapper = lvm2;

From 8497ef1ed270674d6126039ffdc834aa61b82083 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 22 Nov 2016 02:14:00 -0600
Subject: [PATCH 013/727] gimp: add darwin support

---
 pkgs/applications/graphics/gimp/2.8.nix | 8 +++++---
 pkgs/top-level/all-packages.nix         | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index b123dcade1d..4cb67cde751 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf
 , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
 , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
-, python2Packages, libart_lgpl, libexif, gettext, xorg }:
+, python2Packages, libart_lgpl, libexif, gettext, xorg
+, AppKit, Cocoa, gtk-mac-integration }:
 
 let
   inherit (python2Packages) pygtk wrapPython python;
@@ -26,7 +27,8 @@ in stdenv.mkDerivation rec {
       libmng librsvg libwmf zlib libzip ghostscript aalib jasper
       python pygtk libart_lgpl libexif gettext xorg.libXpm
       wrapPython
-    ];
+    ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ];
 
   pythonPath = [ pygtk ];
 
@@ -51,6 +53,6 @@ in stdenv.mkDerivation rec {
     description = "The GNU Image Manipulation Program";
     homepage = http://www.gimp.org/;
     license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69192cd6d3a..3610b965d18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13352,6 +13352,7 @@ in
     inherit (gnome2) libart_lgpl;
     webkit = null;
     lcms = lcms2;
+    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
   };
 
   gimp = gimp_2_8;

From 21143cc000c701259e4cb531d6a6feee578a883f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 22 Nov 2016 23:09:45 -0600
Subject: [PATCH 014/727] gtk-mac-bundler: init at 0.7.4

---
 .../tools/gtk-mac-bundler/default.nix         | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/tools/gtk-mac-bundler/default.nix

diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix
new file mode 100644
index 00000000000..6a16a0372c1
--- /dev/null
+++ b/pkgs/development/tools/gtk-mac-bundler/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "gtk-mac-bundler-${version}";
+  version = "0.7.4";
+
+  src = fetchFromGitHub {
+    owner = "GNOME";
+    repo = "gtk-mac-bundler";
+    rev = "bundler-${version}";
+    sha256 = "1kyyq2hc217i5vhbfff0ldgv0r3aziwryd1xlck5cw3s6hgskbza";
+  };
+
+  installPhase = ''
+  	mkdir -p $out/bin
+    substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \
+      --subst-var-by PATH $out/share
+    chmod a+x $out/bin/gtk-mac-bundler
+
+    mkdir -p $out/share
+    cp -r bundler $out/share
+  '';
+
+  meta = with lib; {
+    description = "a helper script that creates application bundles form GTK+ executables for Mac OS X";
+    maintainers = [ maintainers.matthewbauer ];
+    platforms = platforms.darwin;
+    homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Bundling;
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3610b965d18..ec191af0fb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7539,6 +7539,8 @@ in
     gtk = gtk2;
   };
 
+  gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {};
+
   gtkspell2 = callPackage ../development/libraries/gtkspell { };
 
   gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };

From ad3e589c6dea250e9913909b56602fd51edddf30 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Tue, 10 Jan 2017 01:09:53 -0600
Subject: [PATCH 015/727] erlangR19: 19.1.6 -> 19.2

Include sw_vers patch as discussed on #21775.
---
 pkgs/development/interpreters/erlang/R19.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index 824c6868880..d08c4e517cb 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -21,7 +21,7 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
   + "${optionalString javacSupport "-javac"}";
-  version = "19.1.6";
+  version = "19.2";
 
   # Minor OTP releases are not always released as tarbals at
   # http://erlang.org/download/ So we have to download from
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "erlang";
     repo = "otp";
     rev = "OTP-${version}";
-    sha256 = "120dqi8h2fwqfmh9g2nmkf153zlglzw9kkddz57xqvqq5arcs72y";
+    sha256 = "06pr4ydrqpp1skx85zjb1an4kvzv6vacb771vy71k54j7w6lh9hk";
   };
 
   buildInputs =
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
 
   debugInfo = enableDebugInfo;
 
+  prePatch = ''
+    substituteInPlace configure.in \
+      --replace '`sw_vers -productVersion`' '10.10'
+  '';
+
   preConfigure = ''
     ./otp_build autoconf
   '';

From 167795cd159336f64ce2e8fbde6a3819b0b81fd5 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Wed, 11 Jan 2017 12:48:21 +0100
Subject: [PATCH 016/727] rust: make rust beta and nightly be build by hydra

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa92470cf76..dec43ecdfac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5329,16 +5329,16 @@ in
 
   rust = rustStable;
   rustStable = callPackage ../development/compilers/rust {};
-  rustBeta = callPackage ../development/compilers/rust/beta.nix {};
-  rustNightly = callPackage ../development/compilers/rust/nightly.nix {
+  rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {}));
+  rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix {
     rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta);
-  };
-  rustNightlyBin = callPackage ../development/compilers/rust/nightlyBin.nix {
+  }));
+  rustNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix {
      buildRustPackage = callPackage ../build-support/rust {
        rust = rustNightlyBin;
        rustRegistry = callPackage ./rust-packages.nix { };
      };
-  };
+  });
 
   cargo = rust.cargo;
   rustc = rust.rustc;

From ba92ef0b321d3f0ea3bc20482dc7fee2ad56c580 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 09:28:47 +0100
Subject: [PATCH 017/727] gpodder: use python2

---
 pkgs/applications/audio/gpodder/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index eb9ddf164d4..569326ec375 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pythonPackages, mygpoclient, intltool
+{ stdenv, fetchurl, python2Packages, mygpoclient, intltool
 , ipodSupport ? true, libgpod
 , gnome3
 }:
 
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
   name = "gpodder-${version}";
 
   version = "3.9.1";
@@ -24,12 +24,12 @@ pythonPackages.buildPythonApplication rec {
   '';
 
   buildInputs = [
-    intltool pythonPackages.coverage pythonPackages.minimock
+    intltool python2Packages.coverage python2Packages.minimock
     gnome3.gnome_themes_standard gnome3.defaultIconTheme
     gnome3.gsettings_desktop_schemas
   ];
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python2Packages; [
     feedparser dbus-python mygpoclient pygtk eyeD3
   ] ++ stdenv.lib.optional ipodSupport libgpod;
 

From 66d3b9a02d78cddc7ac0623fda44ac5895cd5951 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 09:30:45 +0100
Subject: [PATCH 018/727] wicd: use python2

---
 pkgs/tools/networking/wicd/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 2613fe7ab09..fe315666a2e 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, pythonPackages
+{ stdenv, fetchurl, python2Packages
 , wpa_supplicant, dhcp, dhcpcd, wirelesstools
 , nettools, openresolv, iproute, iputils
 , locale ? "C" }:
 
 let
-  inherit (pythonPackages) python pygobject2 dbus-python pyGtkGlade pycairo;
+  inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo;
 in stdenv.mkDerivation rec {
   name = "wicd-${version}";
   version = "1.7.2.4";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";
   };
 
-  buildInputs = with pythonPackages; [
+  buildInputs = with python2Packages; [
     python Babel urwid notify
   ];
 
@@ -42,11 +42,11 @@ in stdenv.mkDerivation rec {
     sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in
     sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in
     sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in
-    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in
+    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${python2Packages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in
     sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in
     sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in
     sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in
-    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.urwid})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in
+    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${python2Packages.urwid})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in
     rm po/ast.po
   '';
 

From e1cd8f0f96b2dddcb18ef52c2be3509de3dd2c03 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 09:33:32 +0100
Subject: [PATCH 019/727] zim: use python2

---
 pkgs/applications/office/zim/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 313239581a1..227b982689e 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pythonPackages }:
+{ stdenv, lib, fetchurl, python2Packages }:
 
 #
 # TODO: Declare configuration options for the following optional dependencies:
@@ -7,17 +7,16 @@
 #  -  pyxdg: Need to make it work first (see setupPyInstallFlags).
 #
 
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
   name = "zim-${version}";
   version = "0.65";
-  namePrefix = "";
 
   src = fetchurl {
     url = "http://zim-wiki.org/downloads/${name}.tar.gz";
     sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ pyGtkGlade pyxdg pygobject2 ];
+  propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ];
 
   preBuild = ''
     export HOME=$TMP

From 2445119d5a0ac3b7dd2dd52e6b9d485bbb4ee536 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 09:35:51 +0100
Subject: [PATCH 020/727] bootchart: use python2

---
 pkgs/tools/system/bootchart/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix
index b5f1af6dfed..34da8d40081 100644
--- a/pkgs/tools/system/bootchart/default.nix
+++ b/pkgs/tools/system/bootchart/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, pythonPackages }:
+{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, python2Packages }:
 
 stdenv.mkDerivation rec {
   version = "0.14.7";
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb";
   };
 
-  buildInputs = [ pkgconfig glib gtk2 python27 pythonPackages.wrapPython pythonPackages.pygtk ];
-  pythonPath = with pythonPackages; [ pygtk pycairo ];
+  buildInputs = [ pkgconfig glib gtk2 python2Packages.python python2Packages.wrapPython python2Packages.pygtk ];
+  pythonPath = with python2Packages; [ pygtk pycairo ];
 
   installPhase = ''
-    make install DESTDIR=$out BINDIR=/bin PY_LIBDIR=/lib/python2.7
+    make install DESTDIR=$out BINDIR=/bin PY_LIBDIR=/lib/${python2Packages.python.libPrefix}
     wrapProgram $out/bin/pybootchartgui \
       --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
   '';

From e94d9cdfaaaace2432de9a8b77b0d10db53fc73d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 09:39:34 +0100
Subject: [PATCH 021/727] virtmanager: use python2

---
 pkgs/applications/virtualization/virt-manager/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 0964e1b4814..c779cf43967 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl
-, wrapGAppsHook, virtinst, gnome_python, gtkvnc, vte
+{ stdenv, fetchurl, python2Packages, intltool, curl
+, wrapGAppsHook, virtinst, gtkvnc, vte
 , gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
 , avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt
 }:
 
 with stdenv.lib;
-with pythonPackages;
+with python2Packages;
 
 buildPythonApplication rec {
   name = "virt-manager-${version}";
@@ -22,7 +22,7 @@ buildPythonApplication rec {
       PasteDeploy m2crypto ipy twisted
       distutils_extra simplejson glanceclient cheetah lockfile httplib2
       urlgrabber virtinst pyGtkGlade dbus-python gnome_python pygobject3
-      libvirt libxml2Python ipaddr vte libosinfo gobjectIntrospection gtk3 mox
+      libvirt libxml2 ipaddr vte libosinfo gobjectIntrospection gtk3 mox
       gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme
       wrapGAppsHook
     ] ++ optional spiceSupport spice_gtk;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3a321c9065..03d469387eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15340,7 +15340,6 @@ in
   };
 
   virtmanager = callPackage ../applications/virtualization/virt-manager {
-    inherit (gnome2) gnome_python;
     vte = gnome3.vte;
     dconf = gnome3.dconf;
     spice_gtk = spice_gtk;

From 7a109e63108de4ab59010041f0a8a7f19a14a318 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 10:01:48 +0100
Subject: [PATCH 022/727] pythonPackages.docker: support python3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b93cc43d75..0c6d540bfea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6214,9 +6214,9 @@ in {
       sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc";
     };
 
-    buildInputs = [
-      pkgs.glibcLocales
-    ];
+    buildInputs = [ pkgs.glibcLocales ];
+
+    LC_ALL="en_US.UTF-8";
 
     propagatedBuildInputs = with self; [
       six
@@ -6227,11 +6227,9 @@ in {
       docker_pycreds
     ];
 
-    # Version conflict
+    # Flake8 version conflict
     doCheck = false;
 
-    LC_ALL="en_US.UTF-8";
-
     meta = {
       description = "An API client for docker written in Python";
       homepage = https://github.com/docker/docker-py;

From 472c25cfa2882ec3279555ef709e638b3f5edce5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 10:02:57 +0100
Subject: [PATCH 023/727] zbar: use python2

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

diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 66f61d9a459..87bb4923b8a 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, imagemagickBig, pkgconfig, pythonPackages, perl
+{ stdenv, fetchurl, imagemagickBig, pkgconfig, python2Packages, perl
 , libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook
 }:
 
 let
-  inherit (pythonPackages) pygtk python;
+  inherit (python2Packages) pygtk python;
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "zbar";

From 85e170c2c1f7a4bf45fa447b4bfbdb50cd3991aa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 10:03:53 +0100
Subject: [PATCH 024/727] linuxband: use python2

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

diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix
index 5c127a289c0..ba1d88373ff 100644
--- a/pkgs/applications/audio/linuxband/default.nix
+++ b/pkgs/applications/audio/linuxband/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, pythonPackages }:
+{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python2Packages }:
 
 let
-  inherit (pythonPackages) pyGtkGlade pygtksourceview python;
+  inherit (python2Packages) pyGtkGlade pygtksourceview python;
 in stdenv.mkDerivation rec {
   version = "12.02.1";
   name = "linuxband-${version}";

From 70b0af9f831c1396672bbcfbf5b119343402476f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 8 Dec 2016 12:23:25 +0100
Subject: [PATCH 025/727] omniorb: use python2

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

diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
index 8488d47dea5..821401d578c 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchurl, python2 }:
 stdenv.mkDerivation rec {
 
   name = "omniorb-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl";
   };
 
-  buildInputs = [ python ];
+  buildInputs = [ python2 ];
 
   hardeningDisable = [ "format" ];
 

From a3778f6e872cfeb95289829e0214b83313d9f22a Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 11 Jan 2017 17:50:19 +0000
Subject: [PATCH 026/727] flashplayer: 24.0.0.186 -> 24.0.0.194

---
 pkgs/applications/networking/browsers/chromium/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index c1c18828fb4..cb0309bac89 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -94,12 +94,12 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "24.0.0.186";
+    version = "24.0.0.194";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "1pwayhnfjvb6gal5msw0k8rv4h6jvl0mpfsi0jqlka00cnyfjqpd";
+      sha256 = "1l9gz81mwb4p1yj9n8s7hrkxdyw0amcpcc3295dq7zhsr35dm76z";
       stripRoot = false;
     };
 

From 4687b6142c7c7440ece90e86b01bdb5e495d6e65 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 11 Jan 2017 13:25:50 -0500
Subject: [PATCH 027/727] haskellPackages.mkDerivation: Use native
 jailbreak-cabal when cross-compiling

---
 pkgs/development/haskell-modules/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 673099e0dc4..ef73e47f537 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -14,7 +14,10 @@ let
       mkDerivation = pkgs.callPackage ./generic-builder.nix {
         inherit stdenv;
         inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused;
-        inherit (self) ghc jailbreak-cabal;
+        jailbreak-cabal = if (self.ghc.cross or null) != null
+          then self.ghc.bootPkgs.jailbreak-cabal
+          else self.jailbreak-cabal;
+        inherit (self) ghc;
         hscolour = overrideCabal self.hscolour (drv: {
           isLibrary = false;
           doHaddock = false;

From 60918113af61085a87ca7344df985bc635e9c8fa Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 11 Jan 2017 13:26:08 -0500
Subject: [PATCH 028/727] haskellPackages.mkDerivation: Use native hsc2hs when
 cross-compiling

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

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 092d4ae4524..a7696dfc2e3 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -94,6 +94,7 @@ let
     "--with-gcc=${ghc.cc}"
     "--with-ld=${ghc.ld}"
     "--hsc2hs-options=--cross-compile"
+    "--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
   ];
 
   crossCabalFlagsString =

From 289782b94bad45240256fbce7a3b8fee47079c24 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 11 Jan 2017 19:53:38 +0100
Subject: [PATCH 029/727] xorg.xrandr: remove unnecessary xkeystone binary

Fixes #21714 (see this for more information)
---
 pkgs/servers/x11/xorg/overrides.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8d681744131..8070e1fd0d9 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -592,4 +592,9 @@ in
     preBuild = "sed -i 's|gcc -E|gcc -E -P|' man/Makefile";
   };
 
+  xrandr = attrs: attrs // {
+    postInstall = ''
+      rm $out/bin/xkeystone
+    '';
+  };
 }

From 373e40736a19437d0bc93ccd67dbf01b44c2cea6 Mon Sep 17 00:00:00 2001
From: gpyh <yacine.hmito@gmail.com>
Date: Wed, 11 Jan 2017 21:05:27 +0100
Subject: [PATCH 030/727] Fix zshrc ordering

The content of programs.zsh.interactiveShellInit was
inserted too soon in the generated zshrc
This caused some settings related to autocompletion to be ignored
---
 nixos/modules/programs/zsh/zsh.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index b4d941a7770..990e6648e82 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -123,11 +123,6 @@ in
 
         setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK
 
-        ${cfge.interactiveShellInit}
-
-        ${cfg.promptInit}
-        ${zshAliases}
-
         # Tell zsh how to find installed completions
         for p in ''${(z)NIX_PROFILES}; do
           fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions)
@@ -143,6 +138,12 @@ in
           "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
         }
 
+        ${zshAliases}
+        ${cfg.promptInit}
+
+        ${cfge.interactiveShellInit}
+
+
         HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
       '';
 

From d483a871d1bc9a7c2c719dad976ba343cd1a21dc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Jan 2017 16:59:29 -0500
Subject: [PATCH 031/727] linux: Remove 4.8

---
 pkgs/os-specific/linux/kernel/linux-4.8.nix | 19 -------------------
 pkgs/top-level/all-packages.nix             | 18 ------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.8.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix
deleted file mode 100644
index a5ce23ee3e4..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.8.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "4.8.17";
-  extraMeta.branch = "4.8";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1zk0q6bvqgz2pk1axd5z0cx71vqk96314f1zn8apwa4raylf9fpa";
-  };
-
-  kernelPatches = args.kernelPatches;
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
-  features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f0085c2bca..5e5729fe04f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11183,23 +11183,6 @@ in
       ];
   };
 
-  linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
-        # when adding a new linux version
-        # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking
-        # kernelPatches.cpu-cgroup-v2."4.7"
-        kernelPatches.modinst_arg_list_too_long
-        kernelPatches.panic_on_icmp6_frag_CVE_2016_9919
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
@@ -11394,7 +11377,6 @@ in
   linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18);
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1);
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
-  linuxPackages_4_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_8);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   # Don't forget to update linuxPackages_latest!
 

From f124cb76115b1152b85a10709699701003209434 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Jan 2017 17:18:24 -0500
Subject: [PATCH 032/727] atom: 1.12.9 -> 1.13.0

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 51d2f26eb0d..8a0a5d0e0b2 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.12.9";
+  version = "1.13.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1yp4wwv0vxsad7jqkn2rj4n7k2ccgqscs89p3j6z8vpm6as0i6sg";
+    sha256 = "17k4v5hibaq4zi86y1sjx09hqng4sm3lr024v2mjnhj65m2nhjb8";
     name = "${name}.deb";
   };
 

From 490c1099282e75c64179b57e494b14907b5215a3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Jan 2017 17:27:19 -0500
Subject: [PATCH 033/727] rkt: 1.21.0 -> 1.22.0

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

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index f3f5a88c0af..c0bd9d8ed13 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -12,7 +12,7 @@ let
   stage1Dir = "lib/rkt/stage1-images";
 
 in stdenv.mkDerivation rec {
-  version = "1.21.0";
+  version = "1.22.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
       owner = "coreos";
       repo = "rkt";
       rev = "v${version}";
-      sha256 = "0zd7f3yrnzik96a634m2qyrz25f5mi28caadghqdl9q2apxfb896";
+      sha256 = "14rp3652awvx2iw1l6mia5flfib9jfkiaic16afchrlp17sdq2ji";
   };
 
   stage1BaseImage = fetchurl {

From 3d301e384efc96be25c1191ebc4eee2ab3cc12e2 Mon Sep 17 00:00:00 2001
From: Etienne Laurin <etienne@atnnn.com>
Date: Wed, 11 Jan 2017 17:24:23 -0500
Subject: [PATCH 034/727] isabelle: 2016 -> 2016-1

---
 .../science/logic/isabelle/default.nix        | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index 7f128340bf3..2409936ab69 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -1,26 +1,25 @@
-{ stdenv, fetchurl, perl, nettools, java, polyml }:
+{ stdenv, fetchurl, perl, nettools, java, polyml, z3 }:
 # nettools needed for hostname
 
 let
-  dirname = "Isabelle2016";
-  theories = ["HOL" "FOL" "ZF"];
+  dirname = "Isabelle2016-1";
 in
 
 stdenv.mkDerivation {
-  name = "isabelle-2016";
-  inherit dirname theories;
+  name = "isabelle-2016-1";
+  inherit dirname;
 
   src = if stdenv.isDarwin
     then fetchurl {
       url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg";
-      sha256 = "0wawf0cjc52h8hif1867p33qhlh6qz0fy5i2kr1gbf7psickd6iw";
+      sha256 = "0553l7m2z32ajmiv6sgg11rh16n490w8i4q9hr7vx4zzggr9nrlr";
     }
     else fetchurl {
       url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
-      sha256 = "0jh1qrsyib13fycymwvw7dq7xfy4iyplwq0s65ash842cdzkbxb4";
+      sha256 = "1w1cgfmmi1sr43z6hczyc29lxlnlz7dd8fa88ai44wkc13y05b5r";
     };
 
-  buildInputs = [ perl polyml ]
+  buildInputs = [ perl polyml z3 ]
              ++ stdenv.lib.optionals (!stdenv.isDarwin) [ nettools java ];
 
   sourceRoot = dirname;
@@ -42,7 +41,14 @@ stdenv.mkDerivation {
       --replace '$POLYML_HOME/$PLATFORM/polyml' ${polyml}/bin/poly
     substituteInPlace lib/scripts/run-polyml* lib/scripts/polyml-version \
       --replace '$ML_HOME/poly' ${polyml}/bin/poly
-  '';
+    substituteInPlace contrib/z3*/etc/settings \
+      --replace '$Z3_HOME/z3' '${z3}/bin/z3'
+    '' + (if ! stdenv.isLinux then "" else ''
+    arch=${if stdenv.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"}
+    for f in contrib/*/$arch/{bash_process,epclextract,eprover,nunchaku,SPASS}; do
+      patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"
+    done
+    '');
 
   installPhase = ''
     mkdir -p $out/bin

From b8b18925460d0697bcd6623b2029309786180b34 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 11 Jan 2017 23:47:54 +0100
Subject: [PATCH 035/727] libtasn1: fix darwin build

---
 .../libraries/libtasn1/default.nix            | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 5ecbcc63a95..66a4dd96735 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -11,23 +11,24 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
+  # Warning causes build to fail on darwin since 4.9,
+  # check if this can be removed in the next release.
+  CFLAGS = "-Wno-sign-compare";
+
   buildInputs = [ perl texinfo ];
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/libtasn1/;
     description = "An ASN.1 library";
-
-    longDescription =
-      '' Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some
-         other packages.  The goal of this implementation is to be highly
-         portable, and only require an ANSI C89 platform.
-      '';
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ wkennington ];
-    platforms = stdenv.lib.platforms.all;
+    longDescription = ''
+      Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some
+      other packages.  The goal of this implementation is to be highly
+      portable, and only require an ANSI C89 platform.
+    '';
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ wkennington ];
+    platforms = platforms.all;
   };
 }

From 2dab7782f3e46932bb5ca2d3e994428bfe03b134 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 11 Jan 2017 07:25:38 -0500
Subject: [PATCH 036/727] unrtf: patch against CVE-2016-10091

---
 pkgs/tools/text/unrtf/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix
index 34eea38eb73..c1b4aa1cf2c 100644
--- a/pkgs/tools/text/unrtf/default.nix
+++ b/pkgs/tools/text/unrtf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libiconv }:
+{ stdenv, fetchurl, fetchpatch, autoconf, automake, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "unrtf-${version}";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2016-10091-0001-convert.c-Use-safe-buffer-size-and-snprintf.patch";
+      url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=849705;filename=0001-convert.c-Use-safe-buffer-size-and-snprintf.patch;msg=20";
+      sha256 = "0s0fjvm3zdm9967sijlipfrwjs0h23n2n8fa6f40xxp8y5qq5a0b";
+    })
+  ];
+
   nativeBuildInputs = [ autoconf automake ];
 
   buildInputs = [ ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;

From 847647af6a4e209754033853a25c16eb0e9f7369 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 11 Jan 2017 07:31:06 -0500
Subject: [PATCH 037/727] pcsclite: 1.8.17 -> 1.8.20 for CVE-2016-10109

---
 pkgs/tools/security/pcsclite/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 8116d0dfe9f..5a40837f1d9 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -3,11 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "pcsclite-${version}";
-  version = "1.8.17";
+  version = "1.8.20";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/4173/pcsc-lite-${version}.tar.bz2";
-    sha256 = "0vq2291kvnbg8czlakqahxrdhsvp74fqy3z75lfjlkq2aj36yayp";
+    # This URL changes in unpredictable ways, so it is not sensicle
+    # to put a version variable in there.
+    url = "https://alioth.debian.org/frs/download.php/file/4203/pcsc-lite-1.8.20.tar.bz2";
+    sha256 = "1ckb0jf4n585a4j26va3jm2nrv3c1y38974514f8qy3c04a02zgc";
   };
 
   patches = [ ./no-dropdir-literals.patch ];

From 9837dce6d2743fb7c28719563db9da48651c8fa3 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 11 Jan 2017 07:59:44 -0500
Subject: [PATCH 038/727] nvidia_x11_legacy304: 304.131 -> 304.134 for
 CVE-2016-7382, CVE-2016-7389, CVE-2016-8826

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
index 63da39e0c23..a6728f40cda 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 
-let versionNumber = "304.131"; in
+let versionNumber = "304.134"; in
 
 stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@@ -19,12 +19,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "1a1d0fsahgijcvs2p59vwhs0dpp7pp2wmvgcs1i7fzl6yyv4nmfj";
+        sha256 = "178wx0a2pmdnaypa9pq6jh0ii0i8ykz1sh1liad9zfriy4d8kxw4";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "0gpqzb5gvhrcgrp3kph1p0yjkndx9wfzgh5j88ysrlflkv3q4vig";
+        sha256 = "0hy4q1v4y7q2jq2j963mwpjhjksqhaiing3xcla861r8rmjkf8a2";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From d20d38e68de3eed6c8dfaa91169848b909376c22 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 11 Jan 2017 08:01:41 -0500
Subject: [PATCH 039/727] nvidia_x11_legacy340: 340.96 -> 340.101 for
 CVE-2016-7382, CVE-2016-7389, CVE-2016-8826

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
index e34aaf3c908..5707fc4a1eb 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
 
 let
 
-  versionNumber = "340.96";
+  versionNumber = "340.101";
   /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them.
     Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs,
     will be included in 340.* legacy releases through the end of 2019.
@@ -29,12 +29,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "13j739gg1igll88xpfsx46m7pan4fwpzx5hqdskkdc0srmw2f3n4";
+        sha256 = "0qmhkvxj6h63sayys9gldpafw5skpv8nsm2gxxb3pxcv7nfdlpjz";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "1i0lri76ghhr4c6fdlv5gwzd99n70hv3kw21w51anb55msr9s3r8";
+        sha256 = "0ln7fxm78zrzrjk3j5ychi5xxlgkzg2m7anw8nklr3d17c3jxxjy";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From 18e263992457c941dae9cd4f3cb1a8289f794872 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 11 Jan 2017 07:13:22 -0500
Subject: [PATCH 040/727] jasper: 2.0.6 -> 2.0.10 for null pointer dereference

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

diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index cf5c264fc8d..36b2c469eaf 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, fetchpatch, libjpeg, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "jasper-2.0.6";
+  name = "jasper-2.0.10";
 
   src = fetchurl {
     # You can find this code on Github at https://github.com/mdadams/jasper
     # however note at https://www.ece.uvic.ca/~frodo/jasper/#download
     # not all tagged releases are for distribution.
     url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz";
-    sha256 = "0g6fl8rrbspa9vpswixmpxrg71l19kqgc2b5cak7vmwxphj01wbk";
+    sha256 = "1s022mfxyw8jw60fgyj60lbm9h6bc4nk2751b0in8qsjwcl59n2l";
   };
 
   # newer reconf to recognize a multiout flag

From ef318d01e999390337a9b6b8883382550b929cf0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 12 Jan 2017 09:13:36 +0800
Subject: [PATCH 041/727] dropbox: 16.4.30 -> 17.4.33

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index e78230a74b4..2ea1de96109 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 = "16.4.30";
+  version = "17.4.33";
   sha256 =
     {
-      "x86_64-linux" = "0inwc12d14i6gyfllxbhizb434a7vy0l5nvc07kz0bca7c4665wb";
-      "i686-linux"   = "0pdn8558ll317k3jrrjir90pn6abwbm99y9wzdq39wxj4dmrlh6w";
+      "x86_64-linux" = "0q3afwzd48mdv4mj4zbm6bvafj4hv18ianzhwjxz5dj6njv7s47y";
+      "i686-linux"   = "0wgq94if8wx08kqzsj6n20aia29h1qfn448ww63yn8dvkp6nlpya";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From 4fce3aa44246c92e5720954efe34328be2502185 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 11 Jan 2017 20:18:38 -0500
Subject: [PATCH 042/727] minecraft-server: 1.11.1 -> 1.11.2

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

diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 781dc5e31d8..fd944bb7611 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "minecraft-server-${version}";
-  version = "1.11.1";
+  version = "1.11.2";
 
   src  = fetchurl {
     url    = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
-    sha256 = "161cwwcv73zisac1biz9arrby8y8n0j4bn9hz9rvy8dszlrbq0l0";
+    sha256 = "12nqcj6skwjfcywm3ah4jb1qn4r558ng9cchdc3hbz99nhv7vi6y";
   };
 
   preferLocalBuild = true;

From adbc201147a1c2852c5cb1601e62bfb9c734fc5c Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 6 Jan 2017 11:54:30 -0500
Subject: [PATCH 043/727] elpa-packages: 2017-01-11

---
 .../editors/emacs-modes/elpa-generated.nix     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 7c56b1ab6e5..e2ae9e1df0d 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -175,10 +175,10 @@
       }) {};
     auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "auctex";
-        version = "11.89.8";
+        version = "11.90.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-11.89.8.tar";
-          sha256 = "0rilldzb7sm7k22vfifdsnxz1an94jnn1bn8gfmqkac4g9cskl46";
+          url = "https://elpa.gnu.org/packages/auctex-11.90.0.tar";
+          sha256 = "04nsndwcf0dimgc2p1yzzrymc36amzdnjg0158nxplmjkzdp28gy";
         };
         packageRequires = [];
         meta = {
@@ -295,10 +295,10 @@
       }) {};
     cl-lib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "cl-lib";
-        version = "0.5";
+        version = "0.6.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/cl-lib-0.5.el";
-          sha256 = "1z4ffcx7b95bxz52586lhvdrdm5vp473g3afky9h5my3jp5cd994";
+          url = "https://elpa.gnu.org/packages/cl-lib-0.6.1.el";
+          sha256 = "00w7bw6wkig13pngijh7ns45s1jn5kkbbjaqznsdh6jk5x089j9y";
         };
         packageRequires = [];
         meta = {
@@ -2103,10 +2103,10 @@
     ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "ztree";
-        version = "1.0.4";
+        version = "1.0.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ztree-1.0.4.tar";
-          sha256 = "0xiiaa660s8z7901siwvmqkqz30agfzsy3zcyry2r017m3ghqjph";
+          url = "https://elpa.gnu.org/packages/ztree-1.0.5.tar";
+          sha256 = "14pbbsyav1dzz8m8waqdcmcx9bhw5g8m2kh1ahpxc3i2lfhdan1x";
         };
         packageRequires = [ cl-lib ];
         meta = {

From 2c4ee516d55b1b99b2a4ac53511ddcbf0d01fd92 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 6 Jan 2017 11:54:49 -0500
Subject: [PATCH 044/727] melpa-stable-package: 2017-01-11

removals:
 - ctags: repository no longer available
 - ctags-update: version tags lost when moved to new repository
 - slamhound: removed from melpa
---
 .../emacs-modes/melpa-stable-generated.nix    | 419 ++++++++++++------
 1 file changed, 284 insertions(+), 135 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index dc15c9e056a..66123749c58 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1292,12 +1292,12 @@
     ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ansible-vault";
-        version = "0.3.3";
+        version = "0.3.4";
         src = fetchFromGitHub {
           owner = "zellio";
           repo = "ansible-vault-mode";
-          rev = "f4d9b3a77490071b8c59caa473bb54df86e90362";
-          sha256 = "0f6dmj3b57sy6xl6d50982lnsin0lzyjwk0q1blpz0h2imadr8qm";
+          rev = "57cf7e6da30250587c28ebf592d7bca9a3bae1df";
+          sha256 = "1m9r3vicmljypq6mhgr86lzgi26dnnlp7g0jbl9bjdk48xfg79wb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault";
@@ -2830,12 +2830,12 @@
     bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bui";
-        version = "1.0.1";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "bui.el";
-          rev = "70ea295ec04cb34e383dc7d62927452410876999";
-          sha256 = "1whpln3zibqxnszvrm9chsaaxxxfb0kg3vvfy6j4drrjy5ah2vky";
+          rev = "3bf8af2f339d2483203eda2c97a61b8771c3269d";
+          sha256 = "1qx7cdm7jd15rf1silwj1yh0mg5fhldfi001k1msi50nyni90c82";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
@@ -4476,6 +4476,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-erlang = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, ivy-erlang-complete, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-erlang";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "s-kostyaev";
+          repo = "company-erlang";
+          rev = "3296baf45e354171acfddf33071b0f5af64371b5";
+          sha256 = "00r0rr2c11b8mpis7a64dj6bzpm2jm17lpqmrhjjnc66zpq1vq8y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219/recipes/company-erlang";
+          sha256 = "0qlc89c05523kjzsb7j3yfi022la47kgixl74ggkafhn60scwdm7";
+          name = "company-erlang";
+        };
+        packageRequires = [ company emacs ivy-erlang-complete ];
+        meta = {
+          homepage = "https://melpa.org/#/company-erlang";
+          license = lib.licenses.free;
+        };
+      }) {};
     company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }:
     melpaBuild {
         pname = "company-ghc";
@@ -5199,12 +5220,12 @@
     creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "creamsody-theme";
-        version = "0.3.4";
+        version = "0.3.6";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-creamsody";
-          rev = "c1b2de723d1047ffa199a2cfb14131218962a07d";
-          sha256 = "0kncywrxpb8yn8i0wqspx9igljzlv57zc9r32s1mwgqfz0p2z823";
+          rev = "409ea24a0dace764ce22cec4a7ef4616ce94533f";
+          sha256 = "1gfx26gsyxv9bywbl85z9bdn8fyv0w2g9dzz5lf5jwc9wx0d3wdi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
@@ -5385,46 +5406,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    ctags = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
-        pname = "ctags";
-        version = "1.1.1";
-        src = fetchhg {
-          url = "https://bitbucket.com/semente/ctags.el";
-          rev = "afb16c5b2530";
-          sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ctags";
-          sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
-          name = "ctags";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/ctags";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "ctags-update";
-        version = "0.2.0";
-        src = fetchFromGitHub {
-          owner = "jixiuf";
-          repo = "helm-etags-plus";
-          rev = "d3f3162d5a3291d84b15fd325859c87e1a374923";
-          sha256 = "05vhryqcydvcfm18fwby344931kzzh47x4l5ixy95xkcjkzrj8c7";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/23f6ae3d3c8e414031bf524ff75d9d6f8d8c3fe9/recipes/ctags-update";
-          sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
-          name = "ctags-update";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/ctags-update";
-          license = lib.licenses.free;
-        };
-      }) {};
     ctxmenu = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }:
     melpaBuild {
         pname = "ctxmenu";
@@ -6496,12 +6477,12 @@
     dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dix";
-        version = "0.3.3";
+        version = "0.3.4";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "c7a699fdab0c8f3de32000c804b1504b39c936ad";
-          sha256 = "0xbzw4wvhaz7h4zq2pnfcps7wfm99vyhsk25hhsr632jnz790xdf";
+          rev = "f9dd686922cf89dc7859c793be84969a2529a14b";
+          sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix";
@@ -6517,12 +6498,12 @@
     dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dix-evil";
-        version = "0.3.3";
+        version = "0.3.4";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "c7a699fdab0c8f3de32000c804b1504b39c936ad";
-          sha256 = "0xbzw4wvhaz7h4zq2pnfcps7wfm99vyhsk25hhsr632jnz790xdf";
+          rev = "f9dd686922cf89dc7859c793be84969a2529a14b";
+          sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil";
@@ -6627,22 +6608,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "1.1.2";
+        version = "1.1.5";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "dbe6ed4b4cf27ab676843505cb7c5edba50b455b";
-          sha256 = "0npzshc9mv1zy8dmghz34nwdjlpgxxd4iiv2zp3l6qa0m78j52ri";
+          rev = "f07088c1a6c177cdb5e2ff674489c17a8a7a8426";
+          sha256 = "1c6id6d42p38viwd0x6cic0v08g117gj7im1m15k9j52rkvgvvn8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
           sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik";
           name = "doom-themes";
         };
-        packageRequires = [ all-the-icons dash emacs ];
+        packageRequires = [ all-the-icons dash emacs font-lock-plus ];
         meta = {
           homepage = "https://melpa.org/#/doom-themes";
           license = lib.licenses.free;
@@ -7130,22 +7111,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
+    ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "2.8.1";
+        version = "2.9";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "219665ba1c9aad885cee6e9914448139be7f7299";
-          sha256 = "0s9hyyhjzf7ldr67znhmhl5k1q6qacnlnqw20cdc0iihidj2fg2j";
+          rev = "a34f046c1981e881811d54f43ea3ad3ce9a99c84";
+          sha256 = "05l4gd1179gfxpc1jlmpwjb1w221clkg3nyb3z7l30hghnbhjvj4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
           sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
           name = "ebib";
         };
-        packageRequires = [ dash emacs parsebib ];
+        packageRequires = [ dash emacs parsebib seq ];
         meta = {
           homepage = "https://melpa.org/#/ebib";
           license = lib.licenses.free;
@@ -9167,12 +9148,12 @@
     eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eshell-z";
-        version = "0.3.1";
+        version = "0.3.2";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "eshell-z";
-          rev = "033924f138f19f22a30c1845e728691e5615fa38";
-          sha256 = "0kp9yw56l8bl4zqganclnpf6x5g2rmcf23265n8cp24j6d7c7r4h";
+          rev = "96ec3f5f8a801c893d2c6a6b140e333ef2bfd8b5";
+          sha256 = "1aac4m814jgxwpz7lbyx5r4z5dmawp4sk7pwbx0zqpnbcsaq5wwc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z";
@@ -11861,12 +11842,12 @@
     forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forecast";
-        version = "0.5.0";
+        version = "0.6.1";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "forecast.el";
-          rev = "8fdd0d4532b81e4bfe114fad548aeb049cd512cf";
-          sha256 = "0ia4k7jxx35g0kdm9z75i3sr1h91nh8fkhbllxpd9za29dw5fs7c";
+          rev = "1bae400e5154d7494fd989b1be47450565810e23";
+          sha256 = "0kcyn2m122wbbsp7mwji5acsrdfdkfpf427zj6dn88rfx90q82w2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast";
@@ -12602,12 +12583,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "2.9.0";
+        version = "2.10.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88";
-          sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay";
+          rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59";
+          sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -14078,6 +14059,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
+    melpaBuild {
+        pname = "guix";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "guix.el";
+          rev = "b832ff6c417b83652b7aa6d9ecfa75803fabe23c";
+          sha256 = "153fr29lvhfkfmfhpinaffc2dpll2r3dlsk1hpxkw4j2cac5visl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
+          sha256 = "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9";
+          name = "guix";
+        };
+        packageRequires = [ bui dash emacs geiser magit-popup ];
+        meta = {
+          homepage = "https://melpa.org/#/guix";
+          license = lib.licenses.free;
+        };
+      }) {};
     guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "guru-mode";
@@ -14812,6 +14814,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-etags-plus";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "jixiuf";
+          repo = "helm-etags-plus";
+          rev = "99512856918e485862ceb21460476adb0349f525";
+          sha256 = "08ddxp1hm0ckx6gq9yl6dhh0jrfb6f747snchykl3z5p0ayknvlm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/helm-etags-plus";
+          sha256 = "0lw21yp1q6iggzlb1dks3p6qdfppnqf50f3rijjs18lisp4izp99";
+          name = "helm-etags-plus";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-etags-plus";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-firefox";
@@ -15970,12 +15993,12 @@
     hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hindent";
-        version = "5.2.1";
+        version = "5.2.2";
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "5de979e1e001608c9fe73d552c4e29110957bbb8";
-          sha256 = "1qaklfhf92zibj2wrpiyjqrzba7j00iqzb46nd7p64wyqqhh7ncp";
+          rev = "d67cee32231aee30984b9c5d0250d21b5377b620";
+          sha256 = "126q56673w7yz1p58550k6aya47nhbzn29g4zvq6wjbnicn0vwd1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -17059,22 +17082,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
     melpaBuild {
         pname = "import-js";
-        version = "0.7.0";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "galooshi";
           repo = "emacs-import-js";
-          rev = "231d3d5924adea2d0127aa50acbd2b6a4bab5d25";
-          sha256 = "1zsjaz69gbfmsy0zr6byag31m9jv3nglhxhz56xzhaabsk218f74";
+          rev = "15d395126f57408d770a72db2e5f43271f90fa52";
+          sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js";
           sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha";
           name = "import-js";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs grizzl ];
         meta = {
           homepage = "https://melpa.org/#/import-js";
           license = lib.licenses.free;
@@ -17541,6 +17564,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ivy-erlang-complete";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "s-kostyaev";
+          repo = "ivy-erlang-complete";
+          rev = "7bb7dd161889dc74f4a1ec34cd9cd8469843eab9";
+          sha256 = "03gvavrprim1n1av7dam1kgw4m82nrcb8lffp5nk64yz0lcrca6g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
+          sha256 = "00fqjgrhvcn3ibpgiy4b0sr4x9p6ym5r1rvi4rdzsw2i3nxmgf3a";
+          name = "ivy-erlang-complete";
+        };
+        packageRequires = [ async counsel emacs erlang ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-erlang-complete";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ivy-gitlab";
@@ -17625,6 +17669,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "ivy-youtube";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "squiter";
+          repo = "ivy-youtube";
+          rev = "f8bc1eadaa46b4c9585c03dc8cbb325193df016e";
+          sha256 = "1b973qq2dawdal2220lixg52bg8qlwn2mkdw7ca3yjm6gy9fv07b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube";
+          sha256 = "1llrlxbvpqahivd3wfjfwijzbngijfl786p7ligsb458s69jv1if";
+          name = "ivy-youtube";
+        };
+        packageRequires = [ cl-lib ivy request ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-youtube";
+          license = lib.licenses.free;
+        };
+      }) {};
     ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }:
     melpaBuild {
         pname = "ix";
@@ -19460,12 +19525,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "2.9.0";
+        version = "2.10.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88";
-          sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay";
+          rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59";
+          sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -19614,12 +19679,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "2.9.0";
+        version = "2.10.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88";
-          sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay";
+          rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59";
+          sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -20265,12 +20330,12 @@
     mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }:
     melpaBuild {
         pname = "mentor";
-        version = "0.3";
+        version = "0.3.1";
         src = fetchFromGitHub {
           owner = "skangas";
           repo = "mentor";
-          rev = "074bd57a1e19d7807d682552fee63f326d1ad05c";
-          sha256 = "1p2wlwl8771w8m0i8f6qx11n1f13kkf681v0v4zcd161jgmklp5q";
+          rev = "2b6aea26fd998d6e6fdac5e6b768f9a1751e268a";
+          sha256 = "1j6wf2z4816qj17bm45frhmxk1snsad3jvkjpasyg8pscf4kqi07";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
@@ -21227,6 +21292,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "mysql-to-org";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "mallt";
+          repo = "mysql-to-org-mode";
+          rev = "0f51b174a0ee6c9820baf9d79783923b270f3ffc";
+          sha256 = "1gxp1a26sna0p3xq6by8bk4yphhh32bvll0sdm2p3wkpdaci7hyz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca23f61be1dc8b0ae2ec0ae38d4614cf9c855023/recipes/mysql-to-org";
+          sha256 = "13ysgvqp7bafiaz0f9kg4pq2idndj4r804q6ih64bac8gqhnmcv9";
+          name = "mysql-to-org";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/mysql-to-org";
+          license = lib.licenses.free;
+        };
+      }) {};
     name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "name-this-color";
@@ -21671,12 +21757,12 @@
     nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nodejs-repl";
-        version = "0.1.0";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "abicky";
           repo = "nodejs-repl.el";
-          rev = "a7fd82b2fafe086da442f0f2f62b4dd7c8107ab9";
-          sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
+          rev = "d821ef49a8eae0e405fd2a000246f0475542a575";
+          sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
@@ -21710,11 +21796,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "0.23.4";
+        version = "0.23.5";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "4dde1e677473faa6588909396820f9948e28923f";
-          sha256 = "14675mrlqbp2s5wdj8rs96kz7vdzv3j80d259cybp1ijvncgh1ds";
+          rev = "cff1e0673a7ca91d9b9907072c501a8bdcf0e3f8";
+          sha256 = "1vxxksq4w6gl3wnh77jcpmjyph0x9r3ibqp9dvgmzxlwig495vfk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -22684,12 +22770,12 @@
     org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "2.5.0";
+        version = "2.5.1";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "6330511011b7fe8ee04300e82f090ce3efd3b100";
-          sha256 = "18kwiwmq95pf8w07xl3vh2xhlkwnv53b4n6h0xq2fqprkh8n6f0l";
+          rev = "f441421a5182e356f55bda317a7b3e2d981fdd68";
+          sha256 = "0kzia2l11lj6ddp1rsc71d3nb8cim7i3b5g8yfyfc2zms4mqyzkn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -24292,12 +24378,12 @@
     pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pcache";
-        version = "0.4.1";
+        version = "0.4.2";
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "pcache";
-          rev = "7f441f69bd5ed6cb6c2a86f59f48f4960174c71f";
-          sha256 = "0j1p2jr475jkkxcsqm1xpjxq5qrnl1xj1kdxyzhjkwr2dy3bqvas";
+          rev = "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740";
+          sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/pcache";
@@ -24438,12 +24524,12 @@
     persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persistent-scratch";
-        version = "0.2.5";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "Fanael";
           repo = "persistent-scratch";
-          rev = "107cf4022bed13692e6ac6a544c06227f30e3535";
-          sha256 = "0j72rqd96dz9pp9zwc88q3358m4b891dg0szmbyvs4myp3yandz2";
+          rev = "551c655fa349e6f48e4e29f427fff7594f76ac1d";
+          sha256 = "1iqfr8s4cvnnmqw5yxyr6b6nghbsc95mgjlc61qxa8wa1mpv31rz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch";
@@ -24540,6 +24626,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    perspeen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "perspeen";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "seudut";
+          repo = "perspeen";
+          rev = "30ee14339cf8fe2e59e5384085afee3f8eb58dda";
+          sha256 = "0mi7ipx0zg0vrm9da24i4j0300xj0dm3jjg35f466pm3a7xafrsg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen";
+          sha256 = "1g8qp7d5h9nfki6868gcbdf9bm696zgd49nsghi67wd2x7hq66x1";
+          name = "perspeen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/perspeen";
+          license = lib.licenses.free;
+        };
+      }) {};
     ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ph";
@@ -26595,6 +26702,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "redprl";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "RedPRL";
+          repo = "sml-redprl";
+          rev = "d06d39486348a74981b2c4c4c2ed3af95b01d5ca";
+          sha256 = "0k3f7pa332d0fs1js8hi7zszcirir1943bhkgwfxzsqx17m26x3n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
+          sha256 = "1zinzs3vzf2alsnxf5k71i7lp90fm26wv4y20ci52n0hnh5nz861";
+          name = "redprl";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/redprl";
+          license = lib.licenses.free;
+        };
+      }) {};
     redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "redtick";
@@ -27372,6 +27500,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    russian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "russian-holidays";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "grafov";
+          repo = "russian-holidays";
+          rev = "b285a30f29d85c48e3ea4eb93972d34a090c167b";
+          sha256 = "1mz842gvrscklg2w2r2q2wbj92qr31h895k700j3axqx6k30ni0h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d4830900e371e7036225ea434c52204f4d2481a7/recipes/russian-holidays";
+          sha256 = "0lawjwz296grbvb4a1mm1j754q7mpcanyfln1gqxr339kqx2aqd8";
+          name = "russian-holidays";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/russian-holidays";
+          license = lib.licenses.free;
+        };
+      }) {};
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
@@ -28378,27 +28527,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    slamhound = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "slamhound";
-        version = "1.5.5";
-        src = fetchFromGitHub {
-          owner = "technomancy";
-          repo = "slamhound";
-          rev = "7e38841ecdda7b3b569cca0b96c155ae2d3d433d";
-          sha256 = "1kiczjqa1jhs24lgvizcs355rivx59psxw0fixc9yj8fgld7r4xs";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/54c191408ceb09ca21ef52df171f02d700aee5ba/recipes/slamhound";
-          sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
-          name = "slamhound";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/slamhound";
-          license = lib.licenses.free;
-        };
-      }) {};
     slideview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slideview";
@@ -30708,12 +30836,12 @@
     thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "thrift";
-        version = "0.9.3";
+        version = "0.10.0";
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "53dd39833a08ce33582e5ff31fa18bb4735d6731";
-          sha256 = "1srylw9wwkyq92f9v6ds9zp9z8sl800wbxjbir80g1lwv4hghaii";
+          rev = "b2a4d4ae21c789b689dd162deb819665567f481c";
+          sha256 = "1b1fnzhy5qagbzhphgjxysad64kcq9ggcvp0wb7c7plrps72xfjh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -32516,6 +32644,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "winum";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "deb0ch";
+          repo = "emacs-winum";
+          rev = "e89791b90e45f588f9e8c11884ea1daf3dc98518";
+          sha256 = "1gd0byijl5cyn6gkf5pkadzqvczshgizfrr3ddg6czvgblf1vgl9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
+          sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw";
+          name = "winum";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/winum";
+          license = lib.licenses.free;
+        };
+      }) {};
     wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wisp-mode";
@@ -32728,12 +32877,12 @@
     ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ws-butler";
-        version = "0.5";
+        version = "0.6";
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "ws-butler";
-          rev = "b59e36b2451193bf96176f5a006bf506770a40f3";
-          sha256 = "0ij88qr7gk07dchhjsn3nlk8fqgbkp4qhvn14dqxndn3zr64ix7v";
+          rev = "323b651dd70ee40a25accc940b8f80c3a3185205";
+          sha256 = "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler";
@@ -33150,8 +33299,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "5428250c886a";
-          sha256 = "0q1b0wpdfdghp6hchc59jgkyra5qqqdam47q7g2ni4ym8nlhwd3c";
+          rev = "59459111e042";
+          sha256 = "072aminyiw7pwm74sq3xqqyd1f2l2ilcwg98r094xjvw4fz3yjq5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";

From ac393d299c8e95649362721c268c4d4690216033 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 6 Jan 2017 11:56:36 -0500
Subject: [PATCH 045/727] melpa-packages: 2017-01-11

removals:
 - ctags: repository no longer available
 - latest-clojure-libraries: removed from melpa
 - slamhound: removed from melpa
---
 .../editors/emacs-modes/melpa-generated.nix   | 1491 +++++++++--------
 1 file changed, 820 insertions(+), 671 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index eebc140d2eb..14d6131f44f 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -376,12 +376,12 @@
     ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ac-emacs-eclim";
-        version = "20160813.1754";
+        version = "20170104.743";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "03d9cb7b6c3ac60fd796a2ba8fdfe13552720d3b";
-          sha256 = "1dzy463jpfjz7qhr1zwx8n3xrba6zj87j6naf7xx4j704i03f9h8";
+          rev = "7dc87324f4d8c935ad70508707755d89522007ac";
+          sha256 = "0lyhyi50dg165bpm6apq417b5mbyg0wk24d29cw10zzm0y8rxdzh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -733,12 +733,12 @@
     ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "20161229.1930";
+        version = "20170110.2036";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
-          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
+          rev = "c3e3a64e8b4ab48a35c2bcaddac6ebb0e1c693f7";
+          sha256 = "1i2x0bl4w9zj7hd1ij2dbmnrbj62yni0na2y0wlb3154inj7ygq8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -754,12 +754,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "20161213.2320";
+        version = "20170110.2036";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
-          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
+          rev = "c3e3a64e8b4ab48a35c2bcaddac6ebb0e1c693f7";
+          sha256 = "1i2x0bl4w9zj7hd1ij2dbmnrbj62yni0na2y0wlb3154inj7ygq8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -1303,8 +1303,8 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "dfdf3b23d147a3b4d5e8ed80ee9ea098f65ca48c";
-          sha256 = "01rb57qamwyaip3ar81vdxyri0s4vpbvpyphhcijin0a8ny33qwa";
+          rev = "8324b88d54970059b0f8dd4695e38db6223d39f7";
+          sha256 = "18jw8y2d9xjcacgv9k32579khjlg9mha23sia7m12paamjpjbm9p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1423,12 +1423,12 @@
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "alchemist";
-        version = "20161220.2300";
+        version = "20170104.2226";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "d90689ad51188711640e6660f449c21232b6815c";
-          sha256 = "0rsds06r53hrk1drq9sj5a2xkw3p2w986ziiqj143qrcp1yaig9z";
+          rev = "b23c0c3578869b3b242a948e8a0d453fd6c437bf";
+          sha256 = "02hakng87j9bcrvd310byrr8y01pa5yq5dgxjrwa9mlyb32l5rag";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1448,8 +1448,8 @@
         src = fetchFromGitHub {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "d8fcdc769d6b6b0729943b7dee2c85cf8ca3551b";
-          sha256 = "0660kfhaf7q82a5zp48938z7ddl47mhdwa3rfk1xzbh84xbd9hc2";
+          rev = "86729cd7cac5f86766ebdc76a43e35f261a9e078";
+          sha256 = "0cyvq7asv08bp8kjr641m50dwi326kwb6p67vd4h302liac64br6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1486,12 +1486,12 @@
     alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
     melpaBuild {
         pname = "alert";
-        version = "20160824.821";
+        version = "20170106.1020";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "alert";
-          rev = "2a81fc6642d23a4d825dae96aa2e23e865b0d56a";
-          sha256 = "0blyj7m169imfifvhkwsim20163qwcqhv1f7rq9ms1awi5b33pq3";
+          rev = "2c21ee4ebe3e0b60e5df5c8e54a7c2b10f110b85";
+          sha256 = "119canyh19ck8fzashnwj9yfk0rm9qsg1yibyfjccd9inp8h7k6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
@@ -1528,12 +1528,12 @@
     all-ext = callPackage ({ all, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "all-ext";
-        version = "20161216.415";
+        version = "20170109.2113";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "all-ext";
-          rev = "456bcf277158fc71f66ec11bff4c826c9b0db778";
-          sha256 = "091sf4m06s7c6wbckzcqfdz5g2lvh2q84hfny202kwq9j7fr7nlm";
+          rev = "6068946d67dd084c912e75eb64b499d15c41aba1";
+          sha256 = "12d2lxxqs2xr8anx5jhrhzbx9gjwhlswbg4hh4724i4v8bl5d9yb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/all-ext";
@@ -1688,8 +1688,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "4f84759cab7746cf705f75719e701551d47de1e3";
-          sha256 = "1sra3blrdkw4yd3ivsyg64vgd8207clfpqhjchja0x2n3z8792v5";
+          rev = "fe7a4ece906c5aec242b94e95befa50080414d3c";
+          sha256 = "0lisa1j4x13yk5cgdakdk2xly3ds3hw2s2vq0am375a57p65vpq0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1955,12 +1955,12 @@
     ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ansible-vault";
-        version = "20161115.1128";
+        version = "20170111.1318";
         src = fetchFromGitHub {
           owner = "zellio";
           repo = "ansible-vault-mode";
-          rev = "f4d9b3a77490071b8c59caa473bb54df86e90362";
-          sha256 = "0f6dmj3b57sy6xl6d50982lnsin0lzyjwk0q1blpz0h2imadr8qm";
+          rev = "57cf7e6da30250587c28ebf592d7bca9a3bae1df";
+          sha256 = "1m9r3vicmljypq6mhgr86lzgi26dnnlp7g0jbl9bjdk48xfg79wb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault";
@@ -2452,10 +2452,10 @@
     apropos-fn-plus-var = callPackage ({ fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropos-fn-plus-var";
-        version = "20151231.1205";
+        version = "20170102.902";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/apropos-fn+var.el";
-          sha256 = "0wc9zg30a48cj2ssfj9wc7ga0ip9igcxcdbn1wr0qmndzxxa7x5k";
+          sha256 = "0a9cfycj4y9z7sm7501bcyn6d66fq1jlna3zmr85m9fbkk42zlyj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd66a7c1a54ede8a279effeee5326be392058d1c/recipes/apropos-fn+var";
@@ -2471,12 +2471,12 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20161207.1248";
+        version = "20170106.1329";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "5a5bbbb1f6a82efb19b0a75deea4c6b1d52347a1";
-          sha256 = "0nfpvb20jy9h8g1i7agz153cdvw45sxifsryngfxnnmxd6s6pdmn";
+          rev = "c1088e51a0e678930bf147c46faa9c9ec59a6035";
+          sha256 = "0l2wdvipwf4m1834zbsnlldjlign9m93hh9lkkkbg99jfkppnzkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2906,12 +2906,12 @@
     aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aurel";
-        version = "20161214.825";
+        version = "20170106.1028";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "aurel";
-          rev = "122c10cf6359b6d353d7ac4e1cb9776f285853ee";
-          sha256 = "0i9ganx0n0dmy9p8xgd6mk0qxzw99y893f3nl61dah4yrcmlhcg7";
+          rev = "e264f9d6fa5209d377b9cfd851a166d3d7147814";
+          sha256 = "19fx0x4fnpcfngdkmj8s36vk07f4yjky02p5nc3c5dwm50k17zs5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel";
@@ -3614,10 +3614,10 @@
     autofit-frame = callPackage ({ fetchurl, fit-frame, lib, melpaBuild }:
     melpaBuild {
         pname = "autofit-frame";
-        version = "20151231.1209";
+        version = "20170102.903";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/autofit-frame.el";
-          sha256 = "1af45z1w69dkdk4mzjphwn420m9rrkc3djv5kpp6lzbxxnmswbqw";
+          sha256 = "05pww6hqfknrkhn8iq53r8lzikggw6is6syrypxybkmxhfbx4d9h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/autofit-frame";
@@ -3780,12 +3780,12 @@
     avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avk-emacs-themes";
-        version = "20161228.1236";
+        version = "20170110.1046";
         src = fetchFromGitHub {
           owner = "avkoval";
           repo = "avk-emacs-themes";
-          rev = "a0ea17a380bebe28e00bb6855168a72aa28e8afc";
-          sha256 = "1n8ms7mxc4gr3mb1x6rd1k8wzfk0y6ix9q11p01ahaa9zizbkyfp";
+          rev = "c75079ec9a84116c84c884c3bf258c95afcce7a7";
+          sha256 = "1s9hn4y918h1ly1s8gfkidlwqijdzpbkfx1px8xfkia3b35qinvv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes";
@@ -5173,22 +5173,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    blog-admin = callPackage ({ ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }:
+    blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }:
     melpaBuild {
         pname = "blog-admin";
-        version = "20161227.1810";
+        version = "20170110.751";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "blog-admin";
-          rev = "4a16df2a1e44f5486931af9c79f6ac55ce74b76f";
-          sha256 = "0xn2njbd3jsv7na0z87rhyg115cp2cppkgslldzi6405xkmfc76y";
+          rev = "f01c9ed030a85800b4ebdce8ec71b195db446ee9";
+          sha256 = "1jlbxa9qw56rhqm72sqmz5isjmaidmh7p08vlbr8qsxi0kjaipv9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin";
           sha256 = "03wnci5903c6jikkvlzc2vfma9h9qk673cc3wm756rx94jxinmyk";
           name = "blog-admin";
         };
-        packageRequires = [ ctable f names s ];
+        packageRequires = [ cl-lib ctable f names s ];
         meta = {
           homepage = "https://melpa.org/#/blog-admin";
           license = lib.licenses.free;
@@ -5197,12 +5197,12 @@
     bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bm";
-        version = "20161024.1006";
+        version = "20170103.1424";
         src = fetchFromGitHub {
           owner = "joodland";
           repo = "bm";
-          rev = "d1beef99733062ffc6f925a6b3a0d389e1f3ee45";
-          sha256 = "19hjv6f43y2dm4b3854mssjqgzphkdj911f1y2sipc43icdwb4b4";
+          rev = "dd5dc454c62ceae6432cef6639e08db6ea6a865f";
+          sha256 = "0pjgiqhbch0kzlyqq0ij86nc8gjv5g9ammgx92z2k2pyj2zglh7h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm";
@@ -5322,10 +5322,10 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20170102.909";
+        version = "20170110.1606";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
-          sha256 = "05jf7rbaxfxrlmk2vq09p10mj80p529raqfy3ajsk8adgqsxw1lr";
+          sha256 = "02akakw7zfjx8bjb3sjlf8rhbh1xzx00h3dz7cp84f7jy9xak5v1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+";
@@ -5362,12 +5362,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20161125.448";
+        version = "20170109.1223";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "981d5becae30a31b6ef4f87680386148d0535455";
-          sha256 = "0755qhf0h7m18hwv6lkpgi0jcrcm58w4l3815m3kl86q1yz2mpda";
+          rev = "c0a5a8763ea617de58e595ee30f8e20533e663c0";
+          sha256 = "1mfxcdh6m1s0v43hbiprysflm3yb0b3j9b22vzxclf4sfz2yywz2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5858,12 +5858,12 @@
     bufshow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bufshow";
-        version = "20130711.1039";
+        version = "20130726.1138";
         src = fetchFromGitHub {
           owner = "pjones";
           repo = "bufshow";
-          rev = "afabb87e07da7f035ca0ca85ed95e3936ea64547";
-          sha256 = "1plh77xzpbhgmjdagm5rhqx6nkhc0g39ir0b6s5yh003wmx6r1hh";
+          rev = "d60a554e7239e6f7520d9c3436d5ecdbc9cf6957";
+          sha256 = "1rh848adjqdl42rw8yf1fqbr143m0pnbrlznx0d97v4vszvbby2s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/543a734795eed11aa47a8e1348d14e362b341af0/recipes/bufshow";
@@ -5900,12 +5900,12 @@
     bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bui";
-        version = "20161213.735";
+        version = "20170106.956";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "bui.el";
-          rev = "b8f2fcfcdf4eff7fb502e75f25a2e6d974c3ca01";
-          sha256 = "1s7iigrdbdgavigssi2j82dky6cjahnrsnq9m9i5nvczj5xjdnpq";
+          rev = "3bf8af2f339d2483203eda2c97a61b8771c3269d";
+          sha256 = "1qx7cdm7jd15rf1silwj1yh0mg5fhldfi001k1msi50nyni90c82";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
@@ -6465,12 +6465,12 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "20161227.1417";
+        version = "20170107.651";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "156574632e47e49aeb7d17c1d2344e10c06c3acb";
-          sha256 = "00cfddcy60ps7ljw5zx7j14ig62kgf4m9kc7997vdyrsw466r5rz";
+          rev = "670b34d9bf4207680b0783c2a0ea8b1c8f914e58";
+          sha256 = "1slj9gkxknm56k16x827021b1q6384px8pja5xia524b0809hyqg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -6866,8 +6866,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "df262b76a025d2a837ed0331c4affe1998959249";
-          sha256 = "1lc6pfgn30fj4bcwzkxbpzvx17jdh99z2cp6yy53gmmgiimdm7bd";
+          rev = "d31c2ffc3171030c04eddbf50bcac7be27db9c77";
+          sha256 = "1skhqpyx3qgrlby92qb1p2qarzagj6hc91ph818wb8id2z26k71i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -6906,7 +6906,7 @@
         version = "20160801.615";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11929";
+          rev = "11937";
           sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl";
         };
         recipeFile = fetchurl {
@@ -7093,8 +7093,8 @@
         src = fetchFromGitHub {
           owner = "eikek";
           repo = "chee";
-          rev = "48b1770e069a99eef10215f1ed268f852982fdd2";
-          sha256 = "0r9wg77vag8m4k23whcss9p65v2jq9ypmjm74y6r2qpb9l68pnlg";
+          rev = "aba1317a57cb673f61038d217aab88709aa254d5";
+          sha256 = "04cpvwkbmcjf69m8xp6p4ldn0qc48saq87k6cpa9pgxhf8z84lxa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee";
@@ -7257,12 +7257,12 @@
     chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20161123.1614";
+        version = "20170111.1209";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "68d73adfe17a51c3e2ce8e5e3a0efd5ae800d32f";
-          sha256 = "02j722h445ibdy1g6fxpsk8hb3d1f41cncibygqppp4nr0rqkfc3";
+          rev = "577a3438d14e1a1f08baf0399ec8138c9d1dcba4";
+          sha256 = "0i9nqhqbj12ilr5fsa4cwai9kf2ydv84m606zqca2xyvvdzw22as";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
@@ -7506,12 +7506,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20161227.21";
+        version = "20170111.138";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "0fcc4c98c91802417cadea90972a641a91baaf70";
-          sha256 = "0np2hv3x620lvdm1lznc9mjhi0jh06agkb475cbqvj9jw922zrqf";
+          rev = "3a1bc62b94b233fa42d318e2a5f033a4badd8bd9";
+          sha256 = "1sszr92rlrxj73vwy0kihzvr0s75zc85r6b209bc5d249vd6ilhq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7695,12 +7695,12 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20161118.414";
+        version = "20170107.632";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "e549f0a7f8c6a39cc3129581b85682e3977d2bdd";
-          sha256 = "16c45hb216b3r214p8v7zzlpz26s39lc9fmjl6ll3jwvqpq19kb1";
+          rev = "5444a8dd90691de941509f7cc9ac8329c442dbdd";
+          sha256 = "00dcdszskzqggg4gjp5f2k2v1a03jad52q2pqf04jqjycapkx227";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -7782,7 +7782,7 @@
         version = "20161004.253";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "290889";
+          rev = "291717";
           sha256 = "1vbngm8xf7i8f3140y0dk704vagcws6is9waj9qsy6yg0vxmqp0y";
         };
         recipeFile = fetchurl {
@@ -7883,12 +7883,12 @@
     click-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "click-mode";
-        version = "20160331.1448";
+        version = "20170105.20";
         src = fetchFromGitHub {
           owner = "bmalehorn";
           repo = "click-mode";
-          rev = "10b129740907155fd8290f24efe0f374358a02f3";
-          sha256 = "0hbdk1xdh753g59dgyqjj6wgjkf3crsd6pzaq7p5ifbfhrph0qjl";
+          rev = "3c31e65b0b8476a15a3e2394fa05477ce42ea790";
+          sha256 = "0117qn81gbjnx48wl53riqz65yxr8h691fa8j7bgrz32xnjpxz77";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1859bb26e3efd66394d7d9f4d2296cbeeaf5ba4d/recipes/click-mode";
@@ -8424,8 +8424,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "bd9b53ab33bb2185d526e8897cbd8f95c680b2c7";
-          sha256 = "0r6dqiaz8mj5xzhgwzlbn8lqxkg9kv65qwd8x1c8rqnjs3r86c9x";
+          rev = "e0cc40ed58a16f63a26cf25c56f6e8471401fbfe";
+          sha256 = "0vz1lxw7kp76glfz2kdkbbb6xnp1pnxgj30m2z2nzpf22kz4nac9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8918,12 +8918,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20160916.1758";
+        version = "20170106.1620";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "81d8990085960824f700520d08027e6aca58feaa";
-          sha256 = "1x3aq6hadp158vh8mf9hmj5rikq0qz7a1frv7vbl39xr3wcnjj23";
+          rev = "ed7bcd2dd40989c99fe0ff13802432de8e0e8edd";
+          sha256 = "0z65y0wda3rwymmjy7q8g4h1ar1a9crqgf3i8y9cyq5n8bmc5z7c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -8981,12 +8981,12 @@
     column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "column-enforce-mode";
-        version = "20161020.434";
+        version = "20170103.1231";
         src = fetchFromGitHub {
           owner = "jordonbiondo";
           repo = "column-enforce-mode";
-          rev = "858a49daca67188cbcc151a7b531556552d48d00";
-          sha256 = "1hb2lwnq7f81qnp3kymhld0y05kqd249nnpnbiby4pdfwwfc92fl";
+          rev = "379366fe0a5bcb333db2d55cddcf18d6e76ab3fc";
+          sha256 = "1vqydf174rydclwmcq6j8xpr16k9w049x9rilg1lvyjc67p7pyaf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91bebef8e97665a5d076c557d559367911a25ea2/recipes/column-enforce-mode";
@@ -9167,12 +9167,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20161231.837";
+        version = "20170109.333";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "906deabef91c217658635e55f726a7de379e9560";
-          sha256 = "148q9wazdjzvd8lm810zknp12wfbqn3c4lbaf0v83kx0b4bkglyf";
+          rev = "7bd93b8e3180eea8e8b1c8e1174e7eb73628e847";
+          sha256 = "0yznjz9wvjl6axswqykddnmcp9q6i868qxdwdg4pjnnw5qavpc5g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9396,8 +9396,8 @@
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-company-dict";
-          rev = "d51b801fe319e7984cbc202c4745214d84039942";
-          sha256 = "16ai8ljp0i75kby1knj7ldysd8s6kd6drmlh9ygyddxbi2i35x61";
+          rev = "0589c2c3980a8f0df1705e3c0e5e075557eaac75";
+          sha256 = "1bfl7b1lj4rgifqcpz4p8nhamxyyh29lbgl1g35rizw4nzv9sizq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/212c077def5b4933c6001056132181e1a5850a7c/recipes/company-dict";
@@ -9455,12 +9455,12 @@
     company-emacs-eclim = callPackage ({ cl-lib ? null, company, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-emacs-eclim";
-        version = "20170101.1312";
+        version = "20170104.743";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "03d9cb7b6c3ac60fd796a2ba8fdfe13552720d3b";
-          sha256 = "1dzy463jpfjz7qhr1zwx8n3xrba6zj87j6naf7xx4j704i03f9h8";
+          rev = "7dc87324f4d8c935ad70508707755d89522007ac";
+          sha256 = "0lyhyi50dg165bpm6apq417b5mbyg0wk24d29cw10zzm0y8rxdzh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9497,12 +9497,12 @@
     company-erlang = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, ivy-erlang-complete, lib, melpaBuild }:
     melpaBuild {
         pname = "company-erlang";
-        version = "20161226.206";
+        version = "20170107.115";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "company-erlang";
-          rev = "a5e8fad1c21d0ee72f1e6287a95eb88953a356c7";
-          sha256 = "0kdir2m2rdzwwiwpbgagiva4zsicnn5l55aaxdg5his0vc0fzxcl";
+          rev = "70f65acb5912b27284ae2ff55d72e4687b862432";
+          sha256 = "0dpkm6fh1qw8nz75n3na4hbvw9ggxn9dq9p9qmb7pdbcc78nsi44";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219/recipes/company-erlang";
@@ -9564,8 +9564,8 @@
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "company-ghc";
-          rev = "976f10fca813e851d395b8c52ae6edf23d35ae63";
-          sha256 = "1gmnll0m9lh4p9i44ddnxlnbg5lf20410imyfbk88jwhidx1pg7s";
+          rev = "ff2205c0b309467eea763521d30220e7849c75b0";
+          sha256 = "1a93q5q91xjyvfxbf5q57ndjarqdm9av11bb3dmc72v9bmwgpi7s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28f6a983444f796c81df7e5ee94d74c480b21298/recipes/company-ghc";
@@ -9812,12 +9812,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "20160910.1747";
+        version = "20170110.2036";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
-          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
+          rev = "c3e3a64e8b4ab48a35c2bcaddac6ebb0e1c693f7";
+          sha256 = "1i2x0bl4w9zj7hd1ij2dbmnrbj62yni0na2y0wlb3154inj7ygq8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -9965,12 +9965,12 @@
     company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
     melpaBuild {
         pname = "company-sourcekit";
-        version = "20160604.2331";
+        version = "20170106.1437";
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "0c3ccf910e108b4a69d10b56853959a6cc352018";
-          sha256 = "0b0qs398kqy6jsq22hahmfrlb6v8v3bcdgi3z2kamczb0a5k0zhf";
+          rev = "71d9e7002a9892308d64af62d21ac73f8d9d4ad5";
+          sha256 = "0fz7pf95zsh597g6az29khjmj3jz4ml3285p98zbkl75vh6h5p0f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit";
@@ -10447,12 +10447,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20161219.731";
+        version = "20170104.737";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dc693c37dae89e9a4302a5cce42f5321f83946c8";
-          sha256 = "0bg4ki0zzqr0pir4b3p0bpv747bfb5a8if0pydjcwrwb05b37rmp";
+          rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5";
+          sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10552,12 +10552,12 @@
     counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "counsel-projectile";
-        version = "20161212.146";
+        version = "20170111.456";
         src = fetchFromGitHub {
           owner = "ericdanan";
           repo = "counsel-projectile";
-          rev = "5728486a2852cda5b6b12890de917326ce3bd75c";
-          sha256 = "1kbzsk2c2lhz78fynrghwd94j3da92jz59ypcysgyrpqv9cvhzb5";
+          rev = "6d126d599b36aeaf840ca5fc3cd595e8fad4697e";
+          sha256 = "1lmmgwgggwh9h2rkfrwdy6bdi1j3z3498kbmzmlj72i3b1lx9w8n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -10741,12 +10741,12 @@
     creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "creamsody-theme";
-        version = "20161231.2153";
+        version = "20170105.2029";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-creamsody";
-          rev = "c1b2de723d1047ffa199a2cfb14131218962a07d";
-          sha256 = "0kncywrxpb8yn8i0wqspx9igljzlv57zc9r32s1mwgqfz0p2z823";
+          rev = "409ea24a0dace764ce22cec4a7ef4616ce94533f";
+          sha256 = "1gfx26gsyxv9bywbl85z9bdn8fyv0w2g9dzz5lf5jwc9wx0d3wdi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
@@ -10991,12 +10991,12 @@
     csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "csharp-mode";
-        version = "20161105.512";
+        version = "20170111.1133";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "csharp-mode";
-          rev = "4516a18c0dd1797a2d1eb2ae3069c0e16efa14a7";
-          sha256 = "0v5kd8n9hd3aqd4p1z30rnbqiwxxd1mv30d4bkwrba6k5814qy4z";
+          rev = "bc6a4190194f27cba46aa019d62d5e602b6d891e";
+          sha256 = "1xx9nls695gf6fd4dxqxgvcwvwvkwzw3gm5vnc74h3hcfk05msij";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode";
@@ -11132,38 +11132,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    ctags = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
-        pname = "ctags";
-        version = "20110911.304";
-        src = fetchhg {
-          url = "https://bitbucket.com/semente/ctags.el";
-          rev = "afb16c5b2530";
-          sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ctags";
-          sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
-          name = "ctags";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/ctags";
-          license = lib.licenses.free;
-        };
-      }) {};
     ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ctags-update";
-        version = "20150427.2014";
+        version = "20170110.2142";
         src = fetchFromGitHub {
           owner = "jixiuf";
-          repo = "helm-etags-plus";
-          rev = "eeed834b25a1c084b2c672bf15e4f96ee3df6a4e";
-          sha256 = "1va394nls4yi77rgm0kz5r00xiidj6lwcabhqxisz08m3h8gfkh2";
+          repo = "ctags-update";
+          rev = "fba14ab3f8077683f63c143f13b37c8a41129a2a";
+          sha256 = "17d301mdrynazyn81klbdck0c0xs47hqsr6v0r9cp1d3k2yfzi21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/23f6ae3d3c8e414031bf524ff75d9d6f8d8c3fe9/recipes/ctags-update";
-          sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update";
+          sha256 = "07548jjpx4var2817y47i6br8iicjlj66n1b33h0av6r1h514nci";
           name = "ctags-update";
         };
         packageRequires = [];
@@ -11221,8 +11202,8 @@
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "60779eea3601f62b0d59b0fcf28fd0cfb99383f6";
-          sha256 = "0zwgs1hndx6mbay8mfarwkr524kbjfirkgjwxh9db600xrpiszqr";
+          rev = "87c067150e955e3f2b0864e2ec9929fa3289ff28";
+          sha256 = "13xrln4fqdq3siz8p2vilwwma1p0fnk7rxxd89v0pc7zw1nl8yrr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11485,8 +11466,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "2031c5340eb9ce0e304b59f8dd89bc9049900d4e";
-          sha256 = "19bvvk3nd6hhy4rzczs1jfiy3jvrsl28xsw84wn2sslm247svd7g";
+          rev = "3d4f7a1978f4c03a941a2dcff8136b10638476cd";
+          sha256 = "0vnn3gk19f6qff1xvldi4zprz0wzspdrxy7hw09a0ncvkmf1qysp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12424,12 +12405,12 @@
     desktop-plus = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "desktop-plus";
-        version = "20161216.19";
+        version = "20170107.1332";
         src = fetchFromGitHub {
           owner = "ffevotte";
           repo = "desktop-plus";
-          rev = "3bdce03d0499c5176fa9dd353f618727652a7130";
-          sha256 = "0hgsfcp4b3prrjmz6997zh8bayk7kv6h95ll4qq0bnrd8p99i6f8";
+          rev = "88055cee526a000056201898499cebbd35e3ea76";
+          sha256 = "1nkljslx8cwmm4z18mhnwrc1lmd6lxdyhk8bwhzms7g1p6yi99d8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b009b42c73490d56d4613dcf5a57447fb4ccab4/recipes/desktop+";
@@ -13744,12 +13725,12 @@
     dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dix";
-        version = "20161114.142";
+        version = "20170109.331";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "5df503b66d8b726e19812ff0fa82bcbcc6bf5cd6";
-          sha256 = "164w42rqjyn8xrbb6w6z9wi1r8fs5sv6fdvfk5arv4g8ab2wnish";
+          rev = "f9dd686922cf89dc7859c793be84969a2529a14b";
+          sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix";
@@ -13765,12 +13746,12 @@
     dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dix-evil";
-        version = "20160603.1517";
+        version = "20170105.623";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "5df503b66d8b726e19812ff0fa82bcbcc6bf5cd6";
-          sha256 = "164w42rqjyn8xrbb6w6z9wi1r8fs5sv6fdvfk5arv4g8ab2wnish";
+          rev = "f9dd686922cf89dc7859c793be84969a2529a14b";
+          sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil";
@@ -14211,22 +14192,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
+    doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20161223.1807";
+        version = "20170111.203";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "e4694fa64e6b27fef489eec2e60a78507ee0b3f2";
-          sha256 = "0dlh6q9m7h9h4vaf82qw5pdkf64m1pp1kfk8jkilprc273qr4m2j";
+          rev = "3ec0853af7745554e88f587512e1d95d9ed638d5";
+          sha256 = "0r43k3dlijws4z6dkkw3wbsmnmjh5776qgayhxrlmvav5a6hkwvg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
           sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik";
           name = "doom-themes";
         };
-        packageRequires = [ all-the-icons dash emacs font-lock-plus ];
+        packageRequires = [ all-the-icons cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/doom-themes";
           license = lib.licenses.free;
@@ -14662,7 +14643,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1777121";
+          rev = "1778356";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15266,12 +15247,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "20161209.1546";
+        version = "20170109.1442";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "87abf50dcb8cc1a68620691dbf78ccae4707ec7c";
-          sha256 = "07ndy86ld8cz627iwh76spj296z7f8ivcimcv3dhna788q6v46xd";
+          rev = "a34f046c1981e881811d54f43ea3ad3ce9a99c84";
+          sha256 = "05l4gd1179gfxpc1jlmpwjb1w221clkg3nyb3z7l30hghnbhjvj4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -15347,12 +15328,12 @@
     eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
     melpaBuild {
         pname = "eclim";
-        version = "20170101.1436";
+        version = "20170107.2050";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "03d9cb7b6c3ac60fd796a2ba8fdfe13552720d3b";
-          sha256 = "1dzy463jpfjz7qhr1zwx8n3xrba6zj87j6naf7xx4j704i03f9h8";
+          rev = "7dc87324f4d8c935ad70508707755d89522007ac";
+          sha256 = "0lyhyi50dg165bpm6apq417b5mbyg0wk24d29cw10zzm0y8rxdzh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -15389,12 +15370,12 @@
     ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ecukes";
-        version = "20160913.5";
+        version = "20170104.1041";
         src = fetchFromGitHub {
           owner = "ecukes";
           repo = "ecukes";
-          rev = "dbaac412c465dcee0a637fbaf64d6fc954f6ae6c";
-          sha256 = "14cv67nbn10j43h9s60a4h8wjg67m2xw4s19lrdhj3fbyp0g0zby";
+          rev = "36db74ef44edfc654618d681f3452b9904740f9a";
+          sha256 = "1hc1hb0lnkjanjddcwax783n2fcv5lvi1xl1kszbdzlck4sz1i1r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
@@ -15725,12 +15706,12 @@
     editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20161212.1946";
+        version = "20170103.2124";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "95594ff4a88d94f79b092b2eced1e87fa9ad5ee8";
-          sha256 = "11d9d9qgfdid47pk9vi1ca3wjp02b3bylzbz23hpcrl7zjypr4ar";
+          rev = "a4d10d12d40e8611383e67619ed2d2a5f39cb934";
+          sha256 = "17i5gnx3vb2n0ni5lws8d0g4gj9gldrvrrqjnc2i2k9995d48r1r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -15963,12 +15944,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20161228.741";
+        version = "20170111.542";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "481d8a879f821e8cbbf074175672295356f43ba5";
-          sha256 = "0ip60d4k466y3gd16na58398ilzrzrk84dbl5lsh330khi65136a";
+          rev = "e226b30139e283bf5c3bbf7419b9383c72237c88";
+          sha256 = "04szmzri65qagy7af4rrq43idmy5qpl9lqvwq708rzsv8mkqpkqr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16023,22 +16004,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
+    ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20161216.118";
+        version = "20170103.1427";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "6beb80f2f094cd4b4d8a5fdf56b61d9d04d73b39";
-          sha256 = "1jk9vphm30523l8i1qf4iyaf6bds2m9mpz5ivrd62dxldzrs7q8z";
+          rev = "dffc4f16a0bbaf2a767961297df4570423479117";
+          sha256 = "198cii3nk0cmqciyhs0gjlhn6gnsslbry36hm9zp7r3kzk8hsc6g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
           sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx";
           name = "ejc-sql";
         };
-        packageRequires = [ auto-complete clomacs dash emacs spinner ];
+        packageRequires = [ auto-complete cider clomacs dash emacs spinner ];
         meta = {
           homepage = "https://melpa.org/#/ejc-sql";
           license = lib.licenses.free;
@@ -16072,8 +16053,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "bcb05bc970e1dd19e8542b562bafb0ad68cef8cb";
-          sha256 = "0d4sg57fn8xi2s9959lwkdv3k2naqnz2wkzr76ap1g5zllpykw8i";
+          rev = "4a76c7e99edf7b3660fb8360261db1eba953958b";
+          sha256 = "0s5gklk1my6awc9rlqfpjgxqgp3y4i34rahza4gw1y2wb4n81240";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16465,8 +16446,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "03040c762901ff3f77942b9cf2a78aa127ded1d4";
-          sha256 = "1vik0vs85dny7kkaf6cwqahly8l5llkgzs6f2jcfrc90xdg6j3dz";
+          rev = "c6c24403193caa907dbab0d00d6f4ccd9e02d82e";
+          sha256 = "046kz2v650ln39l57cabmk17r8vqp8kic86hp91bxxrlmq6znc60";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16535,8 +16516,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "03040c762901ff3f77942b9cf2a78aa127ded1d4";
-          sha256 = "1vik0vs85dny7kkaf6cwqahly8l5llkgzs6f2jcfrc90xdg6j3dz";
+          rev = "c6c24403193caa907dbab0d00d6f4ccd9e02d82e";
+          sha256 = "046kz2v650ln39l57cabmk17r8vqp8kic86hp91bxxrlmq6znc60";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17273,12 +17254,12 @@
     emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsql";
-        version = "20161102.1605";
+        version = "20170110.1853";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
-          sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
+          rev = "327b09b4b99ccb6b5605b804027a42fd73589929";
+          sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql";
@@ -17298,8 +17279,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
-          sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
+          rev = "327b09b4b99ccb6b5605b804027a42fd73589929";
+          sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql";
@@ -17319,8 +17300,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
-          sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
+          rev = "327b09b4b99ccb6b5605b804027a42fd73589929";
+          sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql";
@@ -17340,8 +17321,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
-          sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
+          rev = "327b09b4b99ccb6b5605b804027a42fd73589929";
+          sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite";
@@ -17859,12 +17840,12 @@
     emr = callPackage ({ cl-lib ? null, clang-format, dash, emacs, fetchFromGitHub, fetchurl, iedit, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }:
     melpaBuild {
         pname = "emr";
-        version = "20161207.1229";
+        version = "20170109.1526";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "emacs-refactor";
-          rev = "483877f912944ff0e4a51362548c3528c4df068c";
-          sha256 = "0i426ri2fk2wijk4k95yiqbky4as9w4gpw264rrh14y43fx0ncyj";
+          rev = "c671b08facf37be6fc6783260cee686866cfed14";
+          sha256 = "05v90g6ybdp2fmnnklnbdxygnw8xw0whmxbdw45qdww8idf2swfs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr";
@@ -18278,12 +18259,12 @@
     erc-colorize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-colorize";
-        version = "20160108.220";
+        version = "20170107.539";
         src = fetchFromGitHub {
           owner = "thisirs";
           repo = "erc-colorize";
-          rev = "391391582b3c34750d56a3b3e819e03ad7c3bd42";
-          sha256 = "18r66yl52xm1gjbn0dm8z80gv4p3794pi91qa8i2sri4grbsyi5r";
+          rev = "d026a016dcb9d63d9ac66d30627a92a8f1681bbd";
+          sha256 = "1zzmsrlknrpw26kizd4dm1g604y9nkgh85xal9la70k94qcgv138";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e69214e89ec0e00b36609fce3efe22b5c1add1f9/recipes/erc-colorize";
@@ -18680,8 +18661,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "9cb4770469218f65dbaec6c71d12b4aa722ac791";
-          sha256 = "1jnaabp5zrvm6qymy4fg3rxbd78xy44x1qnxcdvmqk0dliaqlzn3";
+          rev = "ad8229b57c8dcd8ff129398b53e3b81849daecc7";
+          sha256 = "1rxxx83r5jim8ll54f80yhjnq53gabm42za828s5gygpxsz35359";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19005,6 +18986,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    eshell-fixed-prompt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "eshell-fixed-prompt";
+        version = "20170108.1301";
+        src = fetchFromGitHub {
+          owner = "mallt";
+          repo = "eshell-fixed-prompt-mode";
+          rev = "0b1d7cc05a7f59e8c06c321401cea86c6cb068af";
+          sha256 = "0kr9nv9dd2i4ar6mx4bjhid4sxsvvgx713bajia4jsby34jbgfi2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b0bc9259d7ee9eaf015f6583f82f1313d69e6f29/recipes/eshell-fixed-prompt";
+          sha256 = "0r0dbqmxzlh1sqadivwq762qw7p6hbrqprykd6b1m9m9gbb2qnkg";
+          name = "eshell-fixed-prompt";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/eshell-fixed-prompt";
+          license = lib.licenses.free;
+        };
+      }) {};
     eshell-fringe-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eshell-fringe-status";
@@ -19071,12 +19073,12 @@
     eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eshell-up";
-        version = "20161120.1117";
+        version = "20170108.749";
         src = fetchFromGitHub {
           owner = "peterwvj";
           repo = "eshell-up";
-          rev = "e763b4c0bcd70252396d7825cb53bf00e60a547e";
-          sha256 = "00ckk2x9k8ksjlw54sajcg13m6c9hp3m6n71awqbm9z17prnkzl1";
+          rev = "e30081fdfb20e380bdcd00b04fcca41aa2bc57af";
+          sha256 = "1xq1y6ddq9hxcc13wzj55snc7dg75y1z78f5bhnm9ps3ww7nmc9s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up";
@@ -19092,12 +19094,12 @@
     eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eshell-z";
-        version = "20161206.2249";
+        version = "20170110.2301";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "eshell-z";
-          rev = "033924f138f19f22a30c1845e728691e5615fa38";
-          sha256 = "0kp9yw56l8bl4zqganclnpf6x5g2rmcf23265n8cp24j6d7c7r4h";
+          rev = "96ec3f5f8a801c893d2c6a6b140e333ef2bfd8b5";
+          sha256 = "1aac4m814jgxwpz7lbyx5r4z5dmawp4sk7pwbx0zqpnbcsaq5wwc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z";
@@ -19218,12 +19220,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20161223.108";
+        version = "20170110.58";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "ce8b83a6ddd930c74d84b564d55bfcc22b455007";
-          sha256 = "0fbd1l2vnrlx8zkyqwy2hkdp3h31qnxrc8djl2b3w11n6xkhgar9";
+          rev = "d673c53bd6718e39153bba6a8ed6a7b44e5853a5";
+          sha256 = "0s8qif73lab9kls320rp3c7pklclggwsi69ifc4aizh3qbgrl8bv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -19778,12 +19780,12 @@
     evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-easymotion";
-        version = "20161231.1310";
+        version = "20170110.2004";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "evil-easymotion";
-          rev = "88c0bf01b9e7199c98a6054a425a226790ad96df";
-          sha256 = "1akbg5qhq64nbb3iqhpi0ffyc8sffqszjgglvhclbdwkxcbq3f12";
+          rev = "f9b5aa52f238ea14c2b16982e56c3b2c8f739101";
+          sha256 = "098x03vlz3gvkaa3wahi1557l9x39n1v8jclj5aqxvjdzapi6myi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e67955ead0b9d69acab40d66d4e0b821229d635c/recipes/evil-easymotion";
@@ -20202,8 +20204,8 @@
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-multiedit";
-          rev = "5f263a9388dd3593b5acefe9f523c819bd3b338f";
-          sha256 = "0bsdyy5jw8adj26p85831n4f34d0sv4rrv9xlhjqkzx9gsr4h7d1";
+          rev = "e2df8629971df7c905256c504ff5f90b94eebdb8";
+          sha256 = "127x55msyy54n6lkml615akhafnbn62cxnmwj1brjwzzi5cbk6bn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -20450,12 +20452,12 @@
     evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-snipe";
-        version = "20161103.1020";
+        version = "20170104.1209";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "c3b9db1628192299cc3901ff21aec316bdbdb1b8";
-          sha256 = "19s0d2c9d942zqi5pyav4srn0cn4yrdhd2dlds4pn7qxmvdkvyvb";
+          rev = "b1bcddda1e2fe7f239223fe0fe0994c1745657d1";
+          sha256 = "0vpa0hbi1m3f2yxy56wyhm9fja35frnq6xs7bb93gmigbpa96f47";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -21751,12 +21753,12 @@
     find-temp-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "find-temp-file";
-        version = "20160108.213";
+        version = "20170107.539";
         src = fetchFromGitHub {
           owner = "thisirs";
           repo = "find-temp-file";
-          rev = "c6c44c69b3edf2a56cc56b1fc166dc8ce4144228";
-          sha256 = "1d6zn3qsg4lpk13cvn5r1w88dnhfydnhwf59x6cb4sy5q1ihk0g3";
+          rev = "513005d19d72d71f34481ee00158dd57bd93206f";
+          sha256 = "129jnn16vxmp6r9gx8k4rvv6spag5q0if52b5fhsybicnsl35mrz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c01efd0cb3e3bab4661a358c084b645dc7e31736/recipes/find-temp-file";
@@ -22417,12 +22419,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170101.1502";
+        version = "20170110.304";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "09c1e98fd020f9edee7c0c90e59b4da636f4af70";
-          sha256 = "0w9ma5nzahjirhg3scb9j9kbgzr2fznp9sdjvrfgcaqak28hm40h";
+          rev = "820cdf6e8ee93c467896b03e217f8cfd48db768b";
+          sha256 = "078fh3an9c1b21ggk344bdify7nfsypk8c013gq1cm1557ns0ijs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -22834,6 +22836,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-flawfinder = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-flawfinder";
+        version = "20161222.1516";
+        src = fetchFromGitHub {
+          owner = "alexmurray";
+          repo = "flycheck-flawfinder";
+          rev = "1cd5303c206732faaaab5abbda08bb9a9eb269b9";
+          sha256 = "1577xjqlcyi46jcy0xfb04vbil0cczc0b7z0xwxl5sc5ydrhbgx6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e67a84d1a8c890ea56bd842549d70d9841d1e7a7/recipes/flycheck-flawfinder";
+          sha256 = "1nabj00f5p1klzh6509ywnazxx2m017isdjdzzixg94g5mp0kv5i";
+          name = "flycheck-flawfinder";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-flawfinder";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-flow";
@@ -24328,12 +24351,12 @@
     fm-bookmarks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fm-bookmarks";
-        version = "20151203.603";
+        version = "20170104.916";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "fm-bookmarks.el";
-          rev = "e1440334a4fe161bd8872996b6862d079d8eb24e";
-          sha256 = "0984fhf1nlpdh9mh3gd2xak3v2rlv76qxppqvr6a4kl1dxwg37r3";
+          rev = "11dacfd16a926bfecba96a94c6b13e162c7717f7";
+          sha256 = "0is4617ivga8qrw19y7fy883fgczzdxvrl15ja1dydzj2cbn5d97";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ca020aff7f19cc150cd6968ae7c441372e240c2/recipes/fm-bookmarks";
@@ -24577,12 +24600,12 @@
     forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forecast";
-        version = "20161219.141";
+        version = "20170109.859";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "forecast.el";
-          rev = "8fdd0d4532b81e4bfe114fad548aeb049cd512cf";
-          sha256 = "0ia4k7jxx35g0kdm9z75i3sr1h91nh8fkhbllxpd9za29dw5fs7c";
+          rev = "1bae400e5154d7494fd989b1be47450565810e23";
+          sha256 = "0kcyn2m122wbbsp7mwji5acsrdfdkfpf427zj6dn88rfx90q82w2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast";
@@ -24845,12 +24868,12 @@
     frame-tag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "frame-tag";
-        version = "20151120.2318";
+        version = "20170110.1606";
         src = fetchFromGitHub {
           owner = "liangzan";
           repo = "frame-tag.el";
-          rev = "7018490dbc3c39f2c959e38c448001d1864bfa17";
-          sha256 = "1vvkdgj8warl40kqmd0408q46dxy9qp2sclq4q92b6falry9qy30";
+          rev = "73d6163568c7d32952175e663318b872f995a4e5";
+          sha256 = "1ks8qw1vq30mjp7bpgrk3f11jhm9viibiap6zjk8r5rykjzl1ifv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e69899b53c158903b9b147754021acf1a6136eda/recipes/frame-tag";
@@ -25018,12 +25041,12 @@
     fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20161211.2200";
+        version = "20170111.1014";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "b633674651d324a2aa09a53134e5a617d7ee5f87";
-          sha256 = "0vhd8wpshgcgpq836d7048vxrr7wzy0z473kz6xn7ql10sxiz4i2";
+          rev = "39c373e2aa07f8b6e7d71843086d9a1b6275bbf2";
+          sha256 = "0fdsxmlrxlaj0pzibmm6ln6ff6waq3hxfj0k7jsxbihkxbn465yr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
@@ -25039,11 +25062,11 @@
     fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fuel";
-        version = "20161123.2000";
+        version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "350de8f1718144bd42f445e7fd460854f851470a";
-          sha256 = "144nb62ha4m171k2vh061d24q05p435947zqnrx59xp3agj5ymvv";
+          rev = "5743ed204c255191df3dcf42089116e0cbf4f49a";
+          sha256 = "1wc0amz87ai2m837jgypq081l32fxbmdgah182qkqsplzcbwwp1k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25305,12 +25328,12 @@
     gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gams-mode";
-        version = "20161203.231";
+        version = "20170108.35";
         src = fetchFromGitHub {
           owner = "ShiroTakeda";
           repo = "gams-mode";
-          rev = "a803f9e4509b8f8fed17ef25737d941bbe846c96";
-          sha256 = "1avbdfw3hvwqnrlg3hv8p64m9gqgvwl9ggqzn6rhxh1zlr7i5cwy";
+          rev = "ce7014cb298f01ff96f52cba38fc7714daa7d5a6";
+          sha256 = "1cz4sn325fy87xs6zs5xg6l9vsq06hsf4aksn87vg4mdnkj53xym";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode";
@@ -25643,8 +25666,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "b859ca7f40c1a6b0a4250497dca1f1c524e08f14";
-          sha256 = "0lzighzxyz4m8zanhbiz4cis0r4v9j5f2s7h709kpmzzmxr8qd6r";
+          rev = "85d38f5bc175cb33586522b094f55288c9f5706a";
+          sha256 = "073qbqzdxbsblcwffkmdmni0rmm43nnh3hawrhpbbcsb47pk5lzs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -25933,12 +25956,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20161227.1257";
+        version = "20170109.1253";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "d75529458b09998a68779d348527aa5a19045bed";
-          sha256 = "1si1xxn3pqd4p7vanyhq2zs4cbdkgwb908afl1dx3mih3wf1v1fr";
+          rev = "c6624d143aa3c3e210a04d15e56f42c156226198";
+          sha256 = "0lv4rxs23njyry8akkjrpim1x0w8a172ww599as1ckcgrsnb420k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -25954,12 +25977,12 @@
     git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }:
     melpaBuild {
         pname = "git-commit-insert-issue";
-        version = "20161206.1051";
+        version = "20170109.734";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "git-commit-insert-issue";
-          rev = "fcfbb9cea98426c65edeb989f7470fbd5ce4b608";
-          sha256 = "12rzzysjq7c8jnhwlyppgcn8h9am95iw3la1h1y3bxpfisxkshy8";
+          rev = "7b8cf1f5ce9b2c19e9b7efe1ef03f3e37098eea7";
+          sha256 = "13vd83k6sc3wy4552gvx7zmnmjpa7zs9nk1dlp5v8fc8p3j7afgb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2356f63464e06c37514447c315c23735da22383a/recipes/git-commit-insert-issue";
@@ -26392,6 +26415,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "github-theme";
+        version = "20170111.1029";
+        src = fetchFromGitHub {
+          owner = "philiparvidsson";
+          repo = "emacs-github-theme";
+          rev = "d0461f84c0bd9eb68a1a90ca9543d66bec37f2e4";
+          sha256 = "1achc9ppvsjbw89mf9nbxjmcpjr1916r6jhkjhh93cw3ambz360q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme";
+          sha256 = "1c22p17a1d0s30cj40zrszyznch6nji2risq3b47jhh9i6m32jif";
+          name = "github-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/github-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gitignore-mode";
@@ -26647,12 +26691,12 @@
     gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gnu-apl-mode";
-        version = "20170102.1952";
+        version = "20170111.804";
         src = fetchFromGitHub {
           owner = "lokedhs";
           repo = "gnu-apl-mode";
-          rev = "c2ceb4c59c9ed5f17a9ed274007185ad62037134";
-          sha256 = "0gn7wjq93fq824rs2r82mygy0b3ncn3wfki1xh12b5crvdibg3q7";
+          rev = "40c591698f04a9f1563a6ff969d3ea3acea43abb";
+          sha256 = "0ns8vp4vi225q9vd2alvw9yihdvbnmcm5rr5w31hi9d0b6figqfs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode";
@@ -26731,12 +26775,12 @@
     gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "gnus-desktop-notify";
-        version = "20160210.247";
+        version = "20170104.1240";
         src = fetchFromGitHub {
           owner = "wavexx";
           repo = "gnus-desktop-notify.el";
-          rev = "c363af85f341cc878d6c0be53fd32efa8ca9423b";
-          sha256 = "1zizmxjf55bkm9agmrym80h2mnyvpc9bamkjy2azs42fqgi9pqjn";
+          rev = "6eea368514eb38bc36aee0bc5d948a214784a90c";
+          sha256 = "1bakg8maf626r9q8b8j022s63gip90qpz97iz4x7h3s9055i1dxr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify";
@@ -27106,12 +27150,12 @@
     go-projectile = callPackage ({ fetchFromGitHub, fetchurl, go-eldoc, go-guru, go-mode, go-rename, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "go-projectile";
-        version = "20160825.1644";
+        version = "20170104.1730";
         src = fetchFromGitHub {
           owner = "dougm";
           repo = "go-projectile";
-          rev = "6b721aba171fd4aaef890369b11972eee1dfc8ce";
-          sha256 = "0hkkl70ihmnc93wli2ryxr4il1fis85mjkvs520ac8w3g84g19rv";
+          rev = "46e937a88cbfd9715706fbc319672bb3297cc579";
+          sha256 = "17q23d29q0kw2vqcf8psjvhiqnk4ynpbbflcy35kihilwvrsx2l5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3559a179be2a5cda71ee0a5a18bead4b3a1a8138/recipes/go-projectile";
@@ -27404,8 +27448,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "159b4c81bbca97a9ca00f1195a37174388398a67";
-          sha256 = "15vcdzkfnx36m3dw0744rsdqnridvzdiyly7n3hjck1l87gwvvia";
+          rev = "b282a74fea1455f4648d7f3098c954cce46e3a8d";
+          sha256 = "0q2vkzr2vvkvnb3zw3mzcggpa897adv1hq4sk1mcfav2s4zri9jk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -27649,12 +27693,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "20161213.1524";
+        version = "20170107.2101";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "5d78646f635f83ea5f77eee236fbbe4885aca063";
-          sha256 = "105s3jn0yf0q0sv9w8ggqji6wdmkzz20psa89q7mf4gjlynas6q2";
+          rev = "733acc9e4cb9ce9e867734f298fdfc89ab05f771";
+          sha256 = "0jna5a3w8nr819q3rwcagbin75dk9drgyy04z5b3m8k2rpxyikwm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28303,6 +28347,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
+    melpaBuild {
+        pname = "guix";
+        version = "20170109.1205";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "guix.el";
+          rev = "b832ff6c417b83652b7aa6d9ecfa75803fabe23c";
+          sha256 = "153fr29lvhfkfmfhpinaffc2dpll2r3dlsk1hpxkw4j2cac5visl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
+          sha256 = "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9";
+          name = "guix";
+        };
+        packageRequires = [ bui dash emacs geiser magit-popup ];
+        meta = {
+          homepage = "https://melpa.org/#/guix";
+          license = lib.licenses.free;
+        };
+      }) {};
     gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gulp-task-runner";
@@ -28394,8 +28459,8 @@
         src = fetchFromGitHub {
           owner = "abrochard";
           repo = "emacs-habitica";
-          rev = "868893474ebe8bd58d799dd1d065230cf1ac1e8c";
-          sha256 = "0msp9h8xzgpbdydihsgsbijxcw8gliqrlpnkvb3bd3ra9xp57wrm";
+          rev = "e0fba32899da6bd0484b1b820578184d5764ec5b";
+          sha256 = "1vch1m605m5nxga08i49fga6ik2xxf3n6pibhr6q9wj59zv515hi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica";
@@ -28516,12 +28581,12 @@
     haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "haml-mode";
-        version = "20150508.2011";
+        version = "20170104.2224";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "haml-mode";
-          rev = "7717db6fa4a90d618b4a5e3fef2ac1d24ce39be3";
-          sha256 = "0fmcm4pcivigz9xhf7z9wsxz9pg1yfx9qv8na2dxj426bibk0a6w";
+          rev = "813530d171b233a42f52b97958f1245e1a09c16a";
+          sha256 = "0ylpw01g0mwk61rjlv8wc8bqh5y2xh2s7s8avfvcc689hafp7c2j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode";
@@ -28747,12 +28812,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170101.1257";
+        version = "20170105.1516";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "e5340a565fa379814472de10a330a85b08350e37";
-          sha256 = "03wcglphbnm7brrx46xliq3h6jkz6kq29z2a2vl5223hz1gwlq1n";
+          rev = "695c4d73fc1e21291659b56c6b9a0583b6fc90fd";
+          sha256 = "1dsxf33ppbr29jghq364gj86895sh5li3jxmy71ydapa5fivcicp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -28809,12 +28874,12 @@
     hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hasky-extensions";
-        version = "20170101.347";
+        version = "20170110.631";
         src = fetchFromGitHub {
           owner = "hasky-mode";
           repo = "hasky-extensions";
-          rev = "cd655d0d25a5ed7e9da4ebb824fff04993ab8306";
-          sha256 = "16rc5fmz4pgkd6phvzqji5lgwxzidhxkl1aa76w32lk7m8qm3yxh";
+          rev = "c94662f0efdc9f350d8554e62955f0a7405ab545";
+          sha256 = "0hlwv3m0mmwwvqa0nla9b8n7mi43zxmpg6fmmqi311ii75sqb2pa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
@@ -28955,12 +29020,12 @@
     hcl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hcl-mode";
-        version = "20170101.305";
+        version = "20170107.27";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-hcl-mode";
-          rev = "6a6daf37522188a2f2fcdebc60949fc3bdabbc06";
-          sha256 = "0jqrgq15jz6pvx38pnwkizzfiih0d3nxqphyrc92nqpcyimg8b6g";
+          rev = "0f2c5ec7e7bcf77c8548e8cac8721ea935ca1b5e";
+          sha256 = "0qggby20h8sir4cs5af9y6b2cibix3r067sadygsrvx9ml17indw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode";
@@ -29015,12 +29080,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170103.444";
+        version = "20170111.105";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624";
-          sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8";
+          rev = "c1e9cc8b14ef3d9693438311120ba5b881cd1cf1";
+          sha256 = "1l074vh1xdljymjl4n0kr2qwh664bmqhcxwbd7k54bbd7qakx115";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -29225,12 +29290,12 @@
     helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20161213.2242";
+        version = "20170103.1125";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "1e11998cc45a12a1b1bd19b8fe9ed8a9f0c50774";
-          sha256 = "1q7vqi1g2rbkh6lxlma7rb8vpsx5vxl2iadxzbzy21d4knjpnj96";
+          rev = "8735714d6be62187538ffd9187e8aee87b49b969";
+          sha256 = "19sqp3789a9w0nm48rb2yjj5bhllpilrvbljp8h8nsv3nlf5dz84";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -29502,8 +29567,8 @@
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-cmd-t";
-          rev = "8749f0b2b8527423cd146fa2d5c0e7a9e159eefb";
-          sha256 = "10cp21v8vwgp8hv2rkdn9x8v2n8wqbphgslb561rlwc2rfpvzqvs";
+          rev = "684dfb764e0e3660c053cb465f115e21c5ee4f80";
+          sha256 = "18d2fgxyij31rffh9qbgbaf42par9nami4pi1yfvbw9a5z5w2yxi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/helm-cmd-t";
@@ -29582,12 +29647,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170103.444";
+        version = "20170110.252";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624";
-          sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8";
+          rev = "c1e9cc8b14ef3d9693438311120ba5b881cd1cf1";
+          sha256 = "1l074vh1xdljymjl4n0kr2qwh664bmqhcxwbd7k54bbd7qakx115";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -29754,8 +29819,8 @@
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "helm-dired-history";
-          rev = "75416fa6ca9c5e113cca409ef63518266b4d8d56";
-          sha256 = "17z84dx3z48mx2ssdhlhgzaqrxlzdy9mx3d14qlm0rcrmc0sck8i";
+          rev = "8149f5cbb1b2915afcdcfa3cb44e2c5663b872e6";
+          sha256 = "1h7700lf5bmbwaryf0jswd9q8hgfkpazak5ypidwvqwacd1wvx15";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history";
@@ -29852,6 +29917,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-etags-plus";
+        version = "20170108.848";
+        src = fetchFromGitHub {
+          owner = "jixiuf";
+          repo = "helm-etags-plus";
+          rev = "0c9f6d704de71e3a7136b23d5b2876194c88d534";
+          sha256 = "17hdwgjyx2akgcx9rpsk1jfl1irn2sk2nw6sivl56cm5gw08qwl6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/helm-etags-plus";
+          sha256 = "0lw21yp1q6iggzlb1dks3p6qdfppnqf50f3rijjs18lisp4izp99";
+          name = "helm-etags-plus";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-etags-plus";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-filesets = callPackage ({ fetchFromGitHub, fetchurl, filesets-plus, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-filesets";
@@ -29897,12 +29983,12 @@
     helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-flx";
-        version = "20161229.1056";
+        version = "20170110.957";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "helm-flx";
-          rev = "7754ed3e0f7536487624dda2d4001f7eeb92d86d";
-          sha256 = "1z0rbx5iix0mq2ai94ip8wnwgxh6sd6qsynaayrgj2hmzsbvv12d";
+          rev = "4ba59e1db2d3c33c8ebd40207456f31ab05c5d75";
+          sha256 = "1bh0nbw2ylgfba0k2bvhasxr6nlcvs5g62ls0xy8207dayjrbjxk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx";
@@ -32150,12 +32236,12 @@
     highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-indent-guides";
-        version = "20161230.1538";
+        version = "20170106.1025";
         src = fetchFromGitHub {
           owner = "DarthFennec";
           repo = "highlight-indent-guides";
-          rev = "6fa450df12393fa659dfd5ec71fdda37fb7ee821";
-          sha256 = "0m4h71fb95mcfpbf78r5ird6pabs0sikrkh8w0hy1rimiz9g2mm1";
+          rev = "087f719fda7d60c837146c81b1d9d0aab22ba88e";
+          sha256 = "0q8ch945h9slfp636clf0f60ws78zcbnc1grld8n59chhq22nfyb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides";
@@ -32423,8 +32509,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "967c8a0017694c8057c90a3b22f9d2ef4f060617";
-          sha256 = "15d5as40s073f5611xm08w5cy6h4bzcj31pbnr384acla0i81lh1";
+          rev = "19e73ed76974f7c6a75c277e7e99e09f26d3ad66";
+          sha256 = "0q22iay0n4asqm378s4fcb7vdsyfhddls1ij6v1m4mhsjq7a6inw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -33350,12 +33436,12 @@
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "20161204.505";
+        version = "20170108.148";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "2751f00c2c3daa8cc00f0fee7d01c803ddde7bb2";
-          sha256 = "146w0mqgcaz80la42i6i9si8kii6dn8al7iaj0ay292sq9f9dbfl";
+          rev = "36fb5e0149795404d0271419fd4354ba58f81dbc";
+          sha256 = "1yycpyr1pc7jzb7fdkiyrbyz7wfgs2g0r27c034pmykcmj02sb1q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -33936,8 +34022,8 @@
         src = fetchFromGitHub {
           owner = "pjones";
           repo = "ido-select-window";
-          rev = "946db3db7a3fec582cc1a0097877f1250303b53a";
-          sha256 = "0qvf3h2ljlbf3z36dhywzza62mfi6mqbrfc0sqfsbyia9bn1df4f";
+          rev = "a64707d8d154664d50d12e26417d586e4c3dd78b";
+          sha256 = "1iifpgdpa98si0g2ykr0xbxcbqrvzqfl6r1dv9zihmxhdr7hs9c8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/775c8361322c2ba9026130dd60083e0255170b8f/recipes/ido-select-window";
@@ -33995,12 +34081,12 @@
     ido-springboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-springboard";
-        version = "20150505.1011";
+        version = "20170105.2355";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "springboard";
-          rev = "ffcfaade6f69328084a0613d43d323f790d23048";
-          sha256 = "0p13q8xax2h3m6rddvmh1p9biw3d1shvwwmqfhg0c93xajlwdfqi";
+          rev = "263a8cd4582c81bfc29d7db37d5267e2488b148c";
+          sha256 = "14mbmkqnw2kkzcb8f9z1g3c8f8f9lca3zb6f3q8jk9dsyp9vh81z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/409d847fb464a320e626fae56521a81a8e862a3e/recipes/ido-springboard";
@@ -34788,8 +34874,8 @@
         src = fetchFromGitHub {
           owner = "hiddenlotus";
           repo = "inferior-spim";
-          rev = "93f67ee49f1c6899a7efd52ea4e80e9f9da3371c";
-          sha256 = "1ffa29clfsr3wb00irzqlazk9d0qmjxn9wy8zfca61lh0ax5khbg";
+          rev = "fb9aa091f6058bf320793f1a608c1ed7322c1f47";
+          sha256 = "0855w29rsgy04bc6m6bjggpzmlkv5z9zxx1p0qlhqr3msj1dqgfn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2ce70b5dc05096a6de46069e8d26323d3df78b6/recipes/inferior-spim";
@@ -34823,12 +34909,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    info-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "info-buffer";
+        version = "20161230.1442";
+        src = fetchFromGitHub {
+          owner = "llvilanova";
+          repo = "info-buffer";
+          rev = "24b22e181d41dcec6b280d88fa2882310c3dad9a";
+          sha256 = "0ml5jxb7xs72mivg7p37kwnxvn0a0k9p32hhrasghn8d0ymxflih";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3c44a1d69725b687444329d8af43c9799112b407/recipes/info-buffer";
+          sha256 = "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4";
+          name = "info-buffer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/info-buffer";
+          license = lib.licenses.free;
+        };
+      }) {};
     info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "info-plus";
-        version = "20170101.1030";
+        version = "20170109.1240";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/info+.el";
-          sha256 = "05s8wjv0nvdbdmc30kjbvipk2yvnvivhvjr0jrpkhq4s043135xq";
+          sha256 = "087svwy5s8pkvfmg5s1qk4vfg315fsvhqkdjq0pa3zavly3vm1kq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+";
@@ -35037,8 +35144,8 @@
         src = fetchFromGitHub {
           owner = "psachin";
           repo = "insert-shebang";
-          rev = "52928a0259cd5081e2b92cc2826cf1a79f231296";
-          sha256 = "043kn7iwr1489rszicsg9c1lbr1my4r0aycnr3aspvsh8jv0280s";
+          rev = "d5a827ce9ee1bdabb7561203a3e774ca599514c1";
+          sha256 = "11dxkgn9d6slcwq1zpi13g2cy80ns97gprxakqjvy9gi2l5wl634";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang";
@@ -35137,12 +35244,12 @@
     interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "interleave";
-        version = "20161225.327";
+        version = "20170110.234";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
           repo = "interleave";
-          rev = "0e23fad70451607243e6b8ece4df8bb268d42061";
-          sha256 = "1pkxnip07kh21y99czcnvhbf4yihjipwq2qq5hfsqmniwws0bbqn";
+          rev = "0993383bf4a36f8e4480e5ea50226e1f8fa549c8";
+          sha256 = "1f4syyfga5f49nvlcw4ajxabxki9hglf89mslxkh15zib3mpakf9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave";
@@ -35158,12 +35265,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170103.425";
+        version = "20170110.430";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "cb18c88db105f0be39f201010833e248d073d76c";
-          sha256 = "0y0598phgz4plwb72j5yic4kww4jjw1giv8pf4m3i6angvnv3zhz";
+          rev = "5b727f41e70aaf1d9d4dad7d4e7c4bafe122bec1";
+          sha256 = "1z712b1kgmkhwcchagb8sdlcxv3ji7f8jfkig09z49af7hvg4g7v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -35716,12 +35823,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20161228.1838";
+        version = "20170109.626";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dc693c37dae89e9a4302a5cce42f5321f83946c8";
-          sha256 = "0bg4ki0zzqr0pir4b3p0bpv747bfb5a8if0pydjcwrwb05b37rmp";
+          rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5";
+          sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -35737,12 +35844,12 @@
     ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
     melpaBuild {
         pname = "ivy-bibtex";
-        version = "20170103.227";
+        version = "20170103.1125";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "1e11998cc45a12a1b1bd19b8fe9ed8a9f0c50774";
-          sha256 = "1q7vqi1g2rbkh6lxlma7rb8vpsx5vxl2iadxzbzy21d4knjpnj96";
+          rev = "8735714d6be62187538ffd9187e8aee87b49b969";
+          sha256 = "19sqp3789a9w0nm48rb2yjj5bhllpilrvbljp8h8nsv3nlf5dz84";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -35758,12 +35865,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20161018.1145";
+        version = "20170107.133";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "ec8588b1be34b9508a5eaf893c9854e2938d02a2";
-          sha256 = "1f03fyc3x34nzm1hk5snvbkqfcp829whjvs8i7y4byap7m0npaf9";
+          rev = "d2596eb8d6317767a642dee9f0a450eff4930a6f";
+          sha256 = "18i1xwaqh0py2rfc8dq7jagsynh170p8smwmwb02p9xcij15fq1q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -35804,8 +35911,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dc693c37dae89e9a4302a5cce42f5321f83946c8";
-          sha256 = "0bg4ki0zzqr0pir4b3p0bpv747bfb5a8if0pydjcwrwb05b37rmp";
+          rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5";
+          sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -35902,6 +36009,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "ivy-youtube";
+        version = "20170109.338";
+        src = fetchFromGitHub {
+          owner = "squiter";
+          repo = "ivy-youtube";
+          rev = "f8bc1eadaa46b4c9585c03dc8cbb325193df016e";
+          sha256 = "1b973qq2dawdal2220lixg52bg8qlwn2mkdw7ca3yjm6gy9fv07b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube";
+          sha256 = "1llrlxbvpqahivd3wfjfwijzbngijfl786p7ligsb458s69jv1if";
+          name = "ivy-youtube";
+        };
+        packageRequires = [ cl-lib ivy request ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-youtube";
+          license = lib.licenses.free;
+        };
+      }) {};
     ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }:
     melpaBuild {
         pname = "ix";
@@ -35968,11 +36096,11 @@
     jabber = callPackage ({ fetchgit, fetchurl, fsm, lib, melpaBuild }:
     melpaBuild {
         pname = "jabber";
-        version = "20160124.552";
+        version = "20170106.1603";
         src = fetchgit {
           url = "git://git.code.sf.net/p/emacs-jabber/git";
-          rev = "98dc8e429ba6f79065f1c9fc3878d92314d4b510";
-          sha256 = "0v1w7hk0s0a971248chi4nzsppjwrhxsfjbvi4yklnylm2hm2y3s";
+          rev = "2ef76cff4a5a932cf17dc6107a0c5adee806081e";
+          sha256 = "0jvgp121544vc0yd31cncz06dkgw4za605nkk914vmql321zjzr2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cff77a688d51ff2e2f03389593465990089ce83d/recipes/jabber";
@@ -36344,12 +36472,12 @@
     jazz-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jazz-theme";
-        version = "20160715.829";
+        version = "20170109.353";
         src = fetchFromGitHub {
           owner = "donderom";
           repo = "jazz-theme";
-          rev = "17f6dd1625e32567ccde4848aa660501032963d6";
-          sha256 = "1wpq3aclamk2rk8dh2l4yhafcghqrl5dwmz7gc83ag7zyb77np32";
+          rev = "03adcb7a161d84d19b9e1ef700c999cf996e23e9";
+          sha256 = "0kq3l96mmdsgxi1d5q971lc95ag441shlh9wvh9y24d736mr6nha";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da25345df9d8d567541ed6b0ec832310cde67115/recipes/jazz-theme";
@@ -36386,12 +36514,12 @@
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20170102.757";
+        version = "20170109.1138";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "5e41bd8ad9b172cc980ae5a9c7b50bcfc18ebacb";
-          sha256 = "1xp515kjc18ryd5imb3r64nkinzqx1wxkzalgw672i6p7ydw529s";
+          rev = "5ac4f497f8226acc23dd9c266c958fb82f6816b4";
+          sha256 = "17l07r0wf5gj77lln6bmi1c4fg4igf2qnrla2s9piyrqffa4jgrv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -37934,8 +38062,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "082c4544415ab6bd976d9dda9c342bae109e7cbb";
-          sha256 = "0b3dikix9mr5zch1m6dyf51y2fp48iqvpjwflqfn3x4j7k6pscgb";
+          rev = "67b9bebd3016000f3773d63b1736ac4e47751a2f";
+          sha256 = "1c7dcxvg1yfp16n46ssc53g51qr2gk3ilcz378aqdjix9mrsm11q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -38245,12 +38373,12 @@
     labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "labburn-theme";
-        version = "20161212.313";
+        version = "20170104.211";
         src = fetchFromGitHub {
           owner = "ksjogo";
           repo = "labburn-theme";
-          rev = "ed5481c4fe2cc7ffab8ff066e3cae5118c582484";
-          sha256 = "0wza7rn34y0p7drgrl9w10ij9w4z03vvy775zkp4qifryv78rzk2";
+          rev = "c77596042d4f96e1cfdc2e8a542dd30cd55227a6";
+          sha256 = "0wrwx1lgy38hvp7axwkgm3a760nw8gwl1b61ll33vc4qajgp525g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme";
@@ -38365,27 +38493,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    latest-clojure-libraries = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "latest-clojure-libraries";
-        version = "20140314.617";
-        src = fetchFromGitHub {
-          owner = "AdamClements";
-          repo = "latest-clojure-libraries";
-          rev = "6db8709a746194800a3ffea3f906e3c9f5d4ca22";
-          sha256 = "1cqbdgk3sd0xbw76qrhlild9dvgds3vgldq0rcl200kh7y8l6g4k";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/35c24ed9ea2793ae3469a3927dc66716603cfa6b/recipes/latest-clojure-libraries";
-          sha256 = "1vnm9piq71nx7q1843izm4vydfjq1564ax4ffwmqmlpisqzd6wq5";
-          name = "latest-clojure-libraries";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/latest-clojure-libraries";
-          license = lib.licenses.free;
-        };
-      }) {};
     latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "latex-extra";
@@ -38511,6 +38618,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    launch-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "launch-mode";
+        version = "20170105.2112";
+        src = fetchFromGitHub {
+          owner = "iory";
+          repo = "launch-mode";
+          rev = "25ebd4ba77afcbe729901eb74923dbe9ae81c313";
+          sha256 = "1pjb4gwzkk6djzyfqqxf6y5xvrsh4bi5ijg60zrdlnhivggnfbvn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/876755fff14914b10a26d15f0c7ff32be7c51aa3/recipes/launch-mode";
+          sha256 = "1za0h16z84ls7da17qzqady0simzy5pk1mlw3mb0nhlg2cfmn060";
+          name = "launch-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/launch-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     launchctl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "launchctl";
@@ -38808,12 +38936,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20161211.1055";
+        version = "20170108.1242";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "10585a4333b409ee8b6e1a329de912464b69351d";
-          sha256 = "18id5zhf4kk8ws22zp3cfzxcrpc3cj5k9a1m51xrfqg3ykqbg8g1";
+          rev = "7e6ac87406c8c2d361bb55b3dff6342e61c09d87";
+          sha256 = "18sylih1a3qf07fs66a4crzfbxpw46jr29rkj4xbvgd4cn1fhy4w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -38868,12 +38996,12 @@
     lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lfe-mode";
-        version = "20161204.908";
+        version = "20170111.1330";
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "aef45adb5178998e6e406c89bb058a92fd0f6863";
-          sha256 = "16qs6wc0vh4k6hnr0jkjdgi3rq4a0v5w9yynpccw3c8ws24i7n6j";
+          rev = "46c683df95331a267073d34a0c4f37e9cc66044c";
+          sha256 = "1zshzklwcjpw8b9d5zbb0xy6hyhxmbdb1g43v5hwi5a4mi8xwj23";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -39166,10 +39294,10 @@
       }) {};
     lispxmp = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "lispxmp";
-        version = "20130824.507";
+        version = "20170110.1508";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/lispxmp.el";
-          sha256 = "1m07gb3v1a7al0h4nj3914y8lqrwzi8fwb1ih66nxzn6kb0qj3mf";
+          sha256 = "120wgxvckrgryfg2lvyx60rkcayii0g4ny2cdk3aiwsrpqcyhlyr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6fc8f86533402e4be8bac87ad66bc8d51c8d40f8/recipes/lispxmp";
@@ -39185,12 +39313,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170102.254";
+        version = "20170109.535";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "74e9f0c2e4f3b64e2553449cb7346996ffef96f0";
-          sha256 = "1zhaqvzb78f775n3ba4a0qsjgszmayidsgkahqy2bv392ckq6mzl";
+          rev = "23b5719e92f4f95ea17499bb97143199c2acaff3";
+          sha256 = "1ffmgfavg37hcgfp2kh7s46bnck680bp7j6nwnf142djnzcgw6ka";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -39498,12 +39626,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20161229.1546";
+        version = "20170105.1854";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "e33dedc107e6a1d15fc40e78ebbebe3bc83571d0";
-          sha256 = "1s53l83059skv15dc0bn1d9s572jnb26a2af5057p364l4qz5cng";
+          rev = "d602ed6a3009d27dfb9732e313ff02e2d7f78af8";
+          sha256 = "1xf5bp45az2nr24ilzkcc4yd0g7mh1kx4c2q2bqfshk9vcf9k8kj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -39585,8 +39713,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "a3bfbbd5a2c5b7d9b2f4203369d05f4bda7df1a6";
-          sha256 = "1dyr09dxz7sg9cb0hpa81nyviz7wyv16xs7wmipqqznl5f59kzzd";
+          rev = "7371eca308fdb139271e75a0e82180a479f6f4c3";
+          sha256 = "0qfpcbap9la15kcarmiyya7d4bvniv5g68kii2fmfam0s6dsdm60";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -39917,8 +40045,8 @@
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "emacs-lorem-ipsum";
-          rev = "893a27505734a1497b79bc26e0736a78221b35d9";
-          sha256 = "0grzl4kqpc1x6569yfh9xdzzbgmhcskxwk6f7scjpl32acr88cmx";
+          rev = "4b39f6fed455d67f635b3837cf5668bf74d0f6cd";
+          sha256 = "0a3b18p3vdjci89prsgdzjnfxsl8p67vjhf8ai4qdng7zvh50lir";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c09f9b82430992d119d9148314c758f067832cd/recipes/lorem-ipsum";
@@ -39952,22 +40080,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20161231.108";
+        version = "20170106.1709";
         src = fetchFromGitHub {
           owner = "vibhavp";
           repo = "emacs-lsp";
-          rev = "ed97c84fb3e730eecc90451257a09b085dccab33";
-          sha256 = "1h6d3l8id2zwikry4k9m2ybg6jxc9ww5wnn9rc9v16jbw08yi17l";
+          rev = "d117f2d8d5b23688e0d32372a2c2d03e7bcd44c5";
+          sha256 = "0g13hslwl9303k69mg4l5yrga4fsjbm0phvqr0kjycsq2zfipa2r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode";
           sha256 = "0acgfzm9irk8s5lv3chwh9kp7nrwqwlidwaqzf2f4jk3yr3ww9p1";
           name = "lsp-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/lsp-mode";
           license = lib.licenses.free;
@@ -40225,12 +40353,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20161231.757";
+        version = "20170106.1903";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "d75529458b09998a68779d348527aa5a19045bed";
-          sha256 = "1si1xxn3pqd4p7vanyhq2zs4cbdkgwb908afl1dx3mih3wf1v1fr";
+          rev = "c6624d143aa3c3e210a04d15e56f42c156226198";
+          sha256 = "0lv4rxs23njyry8akkjrpim1x0w8a172ww599as1ckcgrsnb420k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -40400,12 +40528,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20161227.1257";
+        version = "20170104.924";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "d75529458b09998a68779d348527aa5a19045bed";
-          sha256 = "1si1xxn3pqd4p7vanyhq2zs4cbdkgwb908afl1dx3mih3wf1v1fr";
+          rev = "c6624d143aa3c3e210a04d15e56f42c156226198";
+          sha256 = "0lv4rxs23njyry8akkjrpim1x0w8a172ww599as1ckcgrsnb420k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -40845,8 +40973,8 @@
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "3880559c38060232e90a29adc11af41373ca7989";
-          sha256 = "1m8m8ajcqyxb0rj4ink0vdxq23sl8q578hz4kj4ynsgiq70zwcab";
+          rev = "d225283f221d718ef858784d6db30fd31191ba78";
+          sha256 = "1pqx65jrbg1ki2widnxm8s7vp1q69j1zr6ph28q70jhy5nkmzcmz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -41536,12 +41664,12 @@
     meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20161018.259";
+        version = "20170104.2224";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "ce923c93124c60c2eda1e3ffa2e03d2adc43bff0";
-          sha256 = "043d6d1ajr19l78prg8c8gbg661p6c9d9l2xghj4zybwr0byv53f";
+          rev = "8eab3fc08bbf9929b6d169bf6fa45e5701b1f8f8";
+          sha256 = "1s6fiwvj3w7q01qnl3ww8jzczy93apl6pxw30k87j1dl2bsclqzm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -41683,12 +41811,12 @@
     mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }:
     melpaBuild {
         pname = "mentor";
-        version = "20170102.28";
+        version = "20170105.221";
         src = fetchFromGitHub {
           owner = "skangas";
           repo = "mentor";
-          rev = "074bd57a1e19d7807d682552fee63f326d1ad05c";
-          sha256 = "1p2wlwl8771w8m0i8f6qx11n1f13kkf681v0v4zcd161jgmklp5q";
+          rev = "9a160d718b02a95b1bb24072cca87b4348e1e261";
+          sha256 = "16n5dd00ajr2qqwm51v1whf2kmyr27mx30n3xlydf9np3f34hlax";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
@@ -42307,8 +42435,8 @@
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-mips-mode";
-          rev = "00b9c0d92cca89a1313e203c33ec420a833c929b";
-          sha256 = "1bza70z7kfbv0yi4f3zvr1qid9wypqypngw3kcx9majx7mim54gq";
+          rev = "8857384be127b55bd7a20437e4592d8a0175ebc7";
+          sha256 = "0z9zlij7w51iz1ds7njvg8g2mqp80vi65fmxr67rhbfsb7i568cl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode";
@@ -42527,12 +42655,12 @@
     mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "mocha-snippets";
-        version = "20160912.514";
+        version = "20170103.2127";
         src = fetchFromGitHub {
           owner = "cowboyd";
           repo = "mocha-snippets.el";
-          rev = "6f09ba894a3f5fbaecd5c91597c6f0d1918e9d71";
-          sha256 = "1jd5ji48myirqqhwrkm254zdrxgrdkfny9bvxc29vwgm8gjcpspw";
+          rev = "e054137bd78f0d236e983874da1f345d30a71816";
+          sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets";
@@ -42590,12 +42718,12 @@
     mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mode-icons";
-        version = "20161125.2230";
+        version = "20170110.720";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "mode-icons";
-          rev = "1b3ab62793b0e5f31e1ee2d8053a219ec34287f8";
-          sha256 = "0jz2mb3xinjkxw4dzgpfpxzzi27j9wdzbnn7rnfwkpj66v4fcl20";
+          rev = "7d864662b9e866543fdee5a6cf02888502b5c9b7";
+          sha256 = "10q9cy508p6a3664vrwrx31zikh0s0xvyn2qxvk9agv9fhafjgwa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons";
@@ -42649,10 +42777,10 @@
       }) {};
     modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "modeline-posn";
-        version = "20170101.1055";
+        version = "20170108.717";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/modeline-posn.el";
-          sha256 = "0bzrcfhyp9gr850yr1db80zqqdxi688alhpix45xb6xg0kjndmck";
+          sha256 = "198x9h6ma8ds95akf1f4wdqzaw41zplam01adxaqwxsfixb01398";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn";
@@ -42857,12 +42985,12 @@
     monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monroe";
-        version = "20161025.621";
+        version = "20170103.1555";
         src = fetchFromGitHub {
           owner = "sanel";
           repo = "monroe";
-          rev = "fd742eee779c16f608d2369913ff067e1c47261f";
-          sha256 = "0abs920fs4gk7rf2ch2h4mk956aimx0plp1xnawv08iippj185li";
+          rev = "7a72255d1b271ff11ad8e66c26a476aa4542c8f7";
+          sha256 = "16laq4q8mc85kc658ni6kflcfinyxl446fdih2llmg7dji0xarpl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
@@ -43376,12 +43504,12 @@
     mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mu4e-maildirs-extension";
-        version = "20161209.635";
+        version = "20170110.519";
         src = fetchFromGitHub {
           owner = "agpchil";
           repo = "mu4e-maildirs-extension";
-          rev = "19ff86e117f33a5e3319f19c6d84cf46854ba874";
-          sha256 = "02pmnvq3crrivrv5l1x40y2ab0x2mmg7zkxl7q08bpglxzc8i4k0";
+          rev = "c8c22773d13450ed1a49ca05d02a285d479a9e45";
+          sha256 = "1jc16dvvgg9x17gckljd013d8rjjbr5992mrrhcnpdn5qvj145i8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension";
@@ -44476,8 +44604,8 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "f3a11808a888e35d101fdd67b2474289bec4eeec";
-          sha256 = "04k20s7pldngsr63azb0abgdm8qr7a4pm81c8v23n3hiwikx0zfg";
+          rev = "e6662886178abd17078d714e128f090108dfe7ad";
+          sha256 = "0k3b5sxwgr4fg2zibh4mr3my84rqamhlkb20bx1qi4b86gsvkqad";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
@@ -44514,12 +44642,12 @@
     neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20161228.1739";
+        version = "20170110.321";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "f4c13c3a8805d12f13f68ae4e651ff24f1ae9957";
-          sha256 = "19gaddm5xh6mbl2zfmd5v9xgnyfg9pzxpah7x921r251pzlrwiip";
+          rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81";
+          sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -44770,8 +44898,8 @@
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "7d705a3dfcd09a31c67c440ca2120d3994357e57";
-          sha256 = "0x2bkdbv0p5rj4nwybnajdwbyhnbyk4vxjlpmf5zljs5kc49h3zs";
+          rev = "95ddaa14eac8b241a33c6665e55e0de13fb94cc9";
+          sha256 = "1s08mfndgqfg5pkvqysvcs7zy53svnhm6rd5qc748zl4nz7gclr4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -44812,8 +44940,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "5d377ace2d74475ef696bce4ac0e61946d5b3769";
-          sha256 = "1b0mzkiw66qz8c2mx8sify9gnq0hycl3qy0v640xbva0gkvxj1fz";
+          rev = "451c223deea17918454ae083dcfc0ea2b6103cab";
+          sha256 = "003cq5lzp8l2qqa7jx7xx2nxhakk4if18cxf1cngx9jjx2mk5awi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -45018,12 +45146,12 @@
     nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nodejs-repl";
-        version = "20151229.603";
+        version = "20170110.940";
         src = fetchFromGitHub {
           owner = "abicky";
           repo = "nodejs-repl.el";
-          rev = "868339fffedc38f0fd0a3c21d167d8d48830ef84";
-          sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
+          rev = "53b7f09a9be6700934321297758e29180e7850d7";
+          sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
@@ -45081,8 +45209,8 @@
         version = "20161215.457";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "11064124732961f6fcfd78226ebaba0abed2c8fe";
-          sha256 = "0gs26jlg32mb84k6y9hm420jlw73ibrq791jq9faa6n42ws9ifdd";
+          rev = "32065e79090ce27c609db6a2fc07e134f1d3d4df";
+          sha256 = "0dd5m1ifmcxmba0pfq6hijcbinpg4bg3d7bgx6f5pcz8kvzbpmdk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -45535,12 +45663,12 @@
     ob-dart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-dart";
-        version = "20160707.2040";
+        version = "20170106.824";
         src = fetchFromGitHub {
           owner = "mzimmerm";
           repo = "ob-dart";
-          rev = "ded30450a1550af30edb422cfa8cb7b43995b684";
-          sha256 = "0896mpjbl5j1b4d0h25k03xbi8dzb99gz1gvmwj5x1i7fcflhv6r";
+          rev = "2e463d83a3fe1c9c86f2040e0d22c06dfa49ecbf";
+          sha256 = "0qkyyrrgs0yyqzq6ks1xcb8iwm1qfxwan1n8ichmrsbhwsc05jd3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3219b9623587365f56e9eeb4bd97f3dc449a11/recipes/ob-dart";
@@ -45850,12 +45978,12 @@
     ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }:
     melpaBuild {
         pname = "ob-sagemath";
-        version = "20160922.1638";
+        version = "20170105.516";
         src = fetchFromGitHub {
           owner = "stakemori";
           repo = "ob-sagemath";
-          rev = "5715748b3448b1b1e4856387c5486c7b56c0699b";
-          sha256 = "1jhzrlvwf02g0v4wybyry6n9dqcihv47n11m1rpmaxpg2z8551rb";
+          rev = "dfa6cf72a0e38d7d4f0f130c6f2f0f367f05a8ea";
+          sha256 = "1scyjca5niiv1ccr18ninpb0fmgyqklbn6z9pja84a2wb1w9r6mm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath";
@@ -46165,12 +46293,12 @@
     ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ocp-indent";
-        version = "20160428.2334";
+        version = "20170105.122";
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "c0d5d453e192a5301e20042c6984823ec46b64d3";
-          sha256 = "1wv24c6lybjkx63gl6lm2gvc2faw6nibdhi5w9yqgkaq6x6d7jvh";
+          rev = "4bd1a2a4df1757dfc13e19b29b74e21a9b074f99";
+          sha256 = "07ng57g25nik345p9cnjrxf7mpcfi3wqqbmk2i4yxyd4cai8hp1f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -47156,12 +47284,12 @@
     org-context = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-context";
-        version = "20160108.214";
+        version = "20170107.537";
         src = fetchFromGitHub {
           owner = "thisirs";
           repo = "org-context";
-          rev = "d09878d247cd4fc9702d6da1f79eca1b07942120";
-          sha256 = "0q4v216ihhwv8rlb9xc8xy7nj1p058xabfflglhgcd7mfjrsyayx";
+          rev = "a3b4a4ce6d15e3c2d45eb5dcb78bea81913f3e21";
+          sha256 = "18swz38q8z1nga6l8f1l27b7ba3y5y3ikk0baplmich3hxav58xj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f33b6157eb172719a56c3e86233708b1e545e451/recipes/org-context";
@@ -47261,12 +47389,12 @@
     org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-download";
-        version = "20161228.633";
+        version = "20170105.1740";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "org-download";
-          rev = "f99f884c47586ac8689b11c20eb95b2976c74d7c";
-          sha256 = "0w43bf9q6fhrakzlvncr8nwj6sar4cp022mfcim24jjhxk383vl3";
+          rev = "bbfca2fe4149f21105c70d3df76bb789b3868643";
+          sha256 = "19729mfbvsi2gpikv7c6c5a3ah7vrxkjc3s863783kginq28n8yl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -47453,8 +47581,8 @@
         src = fetchFromGitHub {
           owner = "myuhe";
           repo = "org-gcal.el";
-          rev = "5d3cfb2cfe3a9cd8b504d4712a60840d4df17fe6";
-          sha256 = "0hjiza2p7br5wkz1xas2chlzb2d15c3fvv30232z0q5ax9w428m0";
+          rev = "d32031f7c488be0d9845c47cc1452d6d6489e561";
+          sha256 = "0b3jwrfr55hqar5kyhv4wg05x21gzxab0n93xm1371vimhahgmbl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal";
@@ -47575,12 +47703,12 @@
     org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "20161220.2046";
+        version = "20170106.2046";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "6330511011b7fe8ee04300e82f090ce3efd3b100";
-          sha256 = "18kwiwmq95pf8w07xl3vh2xhlkwnv53b4n6h0xq2fqprkh8n6f0l";
+          rev = "878af483c8ecb9e40808ca201460d2738b4f4494";
+          sha256 = "15q1h66y4p3zzhcfjcdnfvsw9rxh9lzmbjbdn4ainmkq0bp18nxi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -47596,12 +47724,12 @@
     org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-journal";
-        version = "20161024.46";
+        version = "20170104.648";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "c5c8724ca987da77446161c0400d444ebd5bd983";
-          sha256 = "17pjhs6x2qnqrag56f7rgnraydl6nbz6y21hj981zsjy3mv899hs";
+          rev = "008ef4549135a5daa2382e57a4d04a439d22cdc6";
+          sha256 = "1m0fmyj4rzc8hdxjmfzianzna6929p5xfrwj0azybv9cmcwfyw8w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -47662,8 +47790,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "d0d05e5df122b27148545f2d7c92e2c8345b9c83";
-          sha256 = "0x34f34myhgldp0cn6grp54jx91lw4cd574blfqiv609c14lw5qq";
+          rev = "a51c6ffa532a3f40a1d5c9a77788926397fedf78";
+          sha256 = "17w060dww4fyz9gaxnyxhwk124ppnzfzsfbqgpdmwvbwqwfyphas";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -47679,11 +47807,11 @@
     org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mac-link";
-        version = "20161126.239";
+        version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "d0d05e5df122b27148545f2d7c92e2c8345b9c83";
-          sha256 = "0x34f34myhgldp0cn6grp54jx91lw4cd574blfqiv609c14lw5qq";
+          rev = "a51c6ffa532a3f40a1d5c9a77788926397fedf78";
+          sha256 = "17w060dww4fyz9gaxnyxhwk124ppnzfzsfbqgpdmwvbwqwfyphas";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -47816,8 +47944,8 @@
         version = "20161226.1624";
         src = fetchgit {
           url = "https://git.leafac.com/org-password-manager";
-          rev = "a187227f1c6760073a8a62328249d13c2c04f9e8";
-          sha256 = "1n732cqxfddm1mx386920q14fl2y4801zy2a87mhq07qlrmshszc";
+          rev = "b4c8de24950d9c13e90277359d078d2dc2b01063";
+          sha256 = "0azk28ib6ch3anav7xlw41lqx5lfcqwg85sai4jk6gb9qgnibv5v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager";
@@ -48028,12 +48156,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170101.904";
+        version = "20170107.1308";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "7e69316cb029d46ffb505d78e8b7a5c0ee48d918";
-          sha256 = "03n5c5921b142g9an0bfjlymq878mh2ahs0ygaslpsm4n450s4gs";
+          rev = "31e2e9cd247a4613bcdf45703473a6345b281ee5";
+          sha256 = "15lr7v5p1n46m3lfh84fwydkbxj9x11vd81x6i5adgj68msh0pcg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -49137,12 +49265,12 @@
     ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-clip";
-        version = "20161106.823";
+        version = "20170108.1348";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "9dcaf341ef574ecc09585a6eb1bf3846e6fb318b";
-          sha256 = "0lznc82nrmx1s7k5xacd6vpx3zv6y11975mspi1adg995ww7b74s";
+          rev = "0e9fa4ba5fc454e2312f8b3a6eb86cb63d3ff7ec";
+          sha256 = "12qp9s9h56230882dfqz5006f5mjkxxvsp87y8n1jyx4vs10rk4i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -49158,12 +49286,12 @@
     ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-gfm";
-        version = "20160906.1035";
+        version = "20170104.249";
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "ox-gfm";
-          rev = "cc4f3cdb0075d988d4ba3e4c638d97fd0155ab73";
-          sha256 = "1wx58j4ffy9sy63nrywjz23yyy4948bjlly0s9sk2yw0lmzvwpa3";
+          rev = "0741216c637946a243b6c3b97fe6906486c17068";
+          sha256 = "1d1341k9kd44wm8wg2h20mgsn7n0bbsivamakn7daxsazym2h89f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm";
@@ -49242,12 +49370,12 @@
     ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-jira";
-        version = "20161026.429";
+        version = "20170110.1024";
         src = fetchFromGitHub {
           owner = "stig";
           repo = "ox-jira.el";
-          rev = "1a73ccb857fa5ded871808f0283bd7d727c54f61";
-          sha256 = "0zab9dfzjb9qkxisx7a0wrqspf2di5xrap6gb13qxnaknmpavp28";
+          rev = "8b28523c2c78a772443c3723514b688dfc880cad";
+          sha256 = "12f1npslidbaq3a5lg9l0p67jny5h3qzrr7jb7qh0i8qsclr9kmi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira";
@@ -50516,12 +50644,12 @@
     pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pcache";
-        version = "20160724.1929";
+        version = "20170105.1414";
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "pcache";
-          rev = "7f441f69bd5ed6cb6c2a86f59f48f4960174c71f";
-          sha256 = "0j1p2jr475jkkxcsqm1xpjxq5qrnl1xj1kdxyzhjkwr2dy3bqvas";
+          rev = "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740";
+          sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/pcache";
@@ -50600,12 +50728,12 @@
     pcmpl-homebrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pcmpl-homebrew";
-        version = "20161122.1843";
+        version = "20170110.1609";
         src = fetchFromGitHub {
           owner = "hiddenlotus";
           repo = "pcmpl-homebrew";
-          rev = "eaa725fd86a6ea641f78893021d23a426d62e715";
-          sha256 = "0yhy6k71sd00kxadladnkpmragpn1l7j3xl6p6385x1whh58vqph";
+          rev = "d001520fec4715c9a4c73f02fd948bac371cc50a";
+          sha256 = "0mw8w2jd9qgyhxdbnvjays5q6c83i0sb3diizrkq23axprfg6d70";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-homebrew";
@@ -50935,12 +51063,12 @@
     persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persistent-scratch";
-        version = "20160404.915";
+        version = "20170110.546";
         src = fetchFromGitHub {
           owner = "Fanael";
           repo = "persistent-scratch";
-          rev = "107cf4022bed13692e6ac6a544c06227f30e3535";
-          sha256 = "0j72rqd96dz9pp9zwc88q3358m4b891dg0szmbyvs4myp3yandz2";
+          rev = "551c655fa349e6f48e4e29f427fff7594f76ac1d";
+          sha256 = "1iqfr8s4cvnnmqw5yxyr6b6nghbsc95mgjlc61qxa8wa1mpv31rz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch";
@@ -51058,24 +51186,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    pg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
-        pname = "pg";
-        version = "20130731.1442";
+        pname = "perspeen";
+        version = "20170110.2022";
         src = fetchFromGitHub {
-          owner = "cbbrowne";
-          repo = "pg.el";
-          rev = "4f6516ec3946d95dcef49abb6703cc89ecb5183d";
-          sha256 = "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0";
+          owner = "seudut";
+          repo = "perspeen";
+          rev = "be0fa7a5d7a9d972b0957a79ff36b34bc0b9cac3";
+          sha256 = "0hri5lrxg0f9rlvh4ca49n25ixxi4f1ngrdnbwl6wg90bzaszyq2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4d1bb21948da2b283a3a9d89d9e3aed11afa13/recipes/pg";
-          sha256 = "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji";
-          name = "pg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen";
+          sha256 = "1g8qp7d5h9nfki6868gcbdf9bm696zgd49nsghi67wd2x7hq66x1";
+          name = "perspeen";
         };
-        packageRequires = [];
+        packageRequires = [ emacs powerline ];
         meta = {
-          homepage = "https://melpa.org/#/pg";
+          homepage = "https://melpa.org/#/perspeen";
           license = lib.licenses.free;
         };
       }) {};
@@ -52129,8 +52257,8 @@
         version = "20160827.857";
         src = fetchgit {
           url = "git://git.savannah.gnu.org/gettext.git";
-          rev = "1afbcb06fded2a427b761dd1615b1e48e1e853cc";
-          sha256 = "14f150w0zyzfpi7cidrf251q6c5fp3kwxv0hd54bvpmh99f829zc";
+          rev = "b631191323cd789137c14a3e00ea2d355c2fbbdc";
+          sha256 = "1qgsdawr0b05h8xdc8mw2rkzs6y66rl2cqmva9k82f7776d3x02w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
@@ -53181,12 +53309,12 @@
     projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20161229.44";
+        version = "20170106.606";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "72a8be50b9e6d4c23a178f777043e67794fc9728";
-          sha256 = "06rbl0vjsk98xqknrckh695qq1yrdi13ms8gwbk1l34j6qhcnwl1";
+          rev = "cdf9c228ccdcb57b73184f10ea3f1e2e4e03d320";
+          sha256 = "02md2hmf21w03xc8imqmcbhildnkj9s69pig1zd9nbs1svgqbycp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -53563,8 +53691,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "4cb113a91b180559f0eedbca0244ef1181a7204c";
-          sha256 = "1xhlc285ydjs1l4ans485ij09f3v54i2mllcik8l255gmm65aqh6";
+          rev = "228d242c583fb4e0dde17f0a52899f995d85c200";
+          sha256 = "04r9vdpfbd7hq6rb8br5lcv5i3j7ljfx69vsqlig2v2av05rvipa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -53622,12 +53750,12 @@
     psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "psession";
-        version = "20161119.2248";
+        version = "20170110.228";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "psession";
-          rev = "33f9020e87732e14473c5fc4d986e572fd95c5f3";
-          sha256 = "0ag57g4w44w90gh09w774jmwplpqn7h1lni1kwldwi7b7n3mhli7";
+          rev = "3488f7777486aa6c85ebc04d011860163d3cf0fc";
+          sha256 = "0v9pg9ywwdqmahmmhg4gwzmibznlbmiyz4hf90brb59ns013jb53";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession";
@@ -54251,12 +54379,12 @@
     pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "pyimport";
-        version = "20161219.302";
+        version = "20170104.342";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "pyimport";
-          rev = "2e8657e8ca2c049cef331e8fdc13c43541044f5c";
-          sha256 = "09ly4gi4yd7nl7x4lzgjacfvjbc4mfsw2yfmmxiymj70xa7ffik3";
+          rev = "adcdb8a20b020d26b69da916e16402e62a3cc0a0";
+          sha256 = "1di07lr5i9qi22p11rlrpav7qfdgqd4ms2qa7sigh9g40c9d3xqi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
@@ -54297,8 +54425,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "4bb474dfad2d2dd8ea357f6b8e6a1c708246ac4a";
-          sha256 = "0xhgq2ylkkrj0pf9gj7niahwy243s9714x720w88mbz6v04bcj3p";
+          rev = "da1da56853380a5a387ad287f4398402b14ef123";
+          sha256 = "1rvflbiz6ick1v2v6fw3f227rgs5fvhxaxyhvri0lv5n6ixljk8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -54440,12 +54568,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170102.523";
+        version = "20170108.2329";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "695fe533a9a59e43f75d69cf005b69526bafc99d";
-          sha256 = "1bh907dmnrcc31n7zjb3lnr98mck1vjzsyr6vzy5lqygymgxjdri";
+          rev = "470843aa11910edb46efbfa250ff4c899afc6b7c";
+          sha256 = "1dca1s1frf3ghgsfdrg8y4ljsxk9n6xsy5ydkyldm5mgrjxp4p6b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -54818,12 +54946,12 @@
     racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
     melpaBuild {
         pname = "racer";
-        version = "20161230.1422";
+        version = "20170106.1524";
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "a3c106e12c538cb6900e0940848557400bfa8313";
-          sha256 = "13b0dpmc2ckp158rvnbc7alf4kswvl5wvddmr1vm76ahr0i5xwv1";
+          rev = "dc6c62e45a6e565b56e76162e7130ff102678bf7";
+          sha256 = "0afa5kppq3m8mln2f5ypi7dym1cdlx8ldbj87xfdcs258zhbjbiy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
@@ -54839,12 +54967,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20161101.1859";
+        version = "20170104.754";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "ab625571837c96446e3704febea48b453787c5ce";
-          sha256 = "0wnas67q1njg6czx86zywgq6a142rkh8qv4vbdjvqnyxd4y8jrsq";
+          rev = "351aa58d75491c789280a3703786f35c8be28bec";
+          sha256 = "1dfmjfw0sz0mfqry65nq7811fv4lydqvl8v47k9jw7prw4g29hhr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -55851,8 +55979,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "466794c0128cd1aaaf60d441f02e9f33afdd4542";
-          sha256 = "1a2aaqgzscyb6y793gc6699g73vw64szn9d6k0qkb4q5j6k1r6mr";
+          rev = "d06d39486348a74981b2c4c4c2ed3af95b01d5ca";
+          sha256 = "0k3f7pa332d0fs1js8hi7zszcirir1943bhkgwfxzsqx17m26x3n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -55972,12 +56100,12 @@
     regex-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "regex-tool";
-        version = "20160907.2129";
+        version = "20170104.1118";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "regex-tool";
-          rev = "0de0716dc26b1182f7f986d8442345aad135019e";
-          sha256 = "1xjm3pqj1cf7cizbc6arqmk608w6cg49j284zrij0bvmyc5pbrj9";
+          rev = "0b4a0111143c88ef94bec56624cb2e00c1a054e6";
+          sha256 = "03qm8s7nqsj0pjnnb0p84gk7hvad4bywn3rhr3ibzj6hxqvppbqj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9585fc1f0576e82a6a199828fa9773a0694da63/recipes/regex-tool";
@@ -56350,8 +56478,8 @@
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "8c90b24905a66a915790a9b723f28808a40eecf4";
-          sha256 = "0w6x7hiaiyabpkyysv76pz27951nxlpaf6z9wvcrzafz37msv5ir";
+          rev = "5b6fde7af45b589c167b79971ecab07c42e51465";
+          sha256 = "0r2rpv63ns2sv555w61lkdlif92zk64ngqmfscg0mqww041462g5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request";
@@ -56371,8 +56499,8 @@
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "8c90b24905a66a915790a9b723f28808a40eecf4";
-          sha256 = "0w6x7hiaiyabpkyysv76pz27951nxlpaf6z9wvcrzafz37msv5ir";
+          rev = "5b6fde7af45b589c167b79971ecab07c42e51465";
+          sha256 = "0r2rpv63ns2sv555w61lkdlif92zk64ngqmfscg0mqww041462g5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred";
@@ -56616,12 +56744,12 @@
     review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "review-mode";
-        version = "20160825.1846";
+        version = "20170105.2156";
         src = fetchFromGitHub {
           owner = "kmuto";
           repo = "review-el";
-          rev = "d84a1a017b4c2871a9a39734be08fb8285f0b6a3";
-          sha256 = "0b6vhl9cy9p51pa6gk6p3x2bmwsd03c7abkbw8j5gd8r3iyam4ng";
+          rev = "fc7a2f152be63874da4211ec0b49ff1fadb6465e";
+          sha256 = "1fg18kb5y8rsxnh166r0yj5wb0927rsdhpwmfwq3i9kgycgpznix";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode";
@@ -57075,12 +57203,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20161227.1124";
+        version = "20170109.1657";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "9234dc6c884d208bf878825dcfc49397df175b1f";
-          sha256 = "1451rf6i5wafyrnax0ql4z450ax6i9r03hwzhh5xkxiijxwlw7rx";
+          rev = "7b5424ec38518aa2bed1ff9f3853adfd6c67a988";
+          sha256 = "012amc3sn0bncb5wxbvaq7j3hwrs7l8ddn3zi9psbzcgknb9vcmh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -57141,7 +57269,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57259";
+          rev = "57310";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -57221,7 +57349,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57259";
+          rev = "57310";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -57445,15 +57573,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    russian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "russian-holidays";
+        version = "20170109.1340";
+        src = fetchFromGitHub {
+          owner = "grafov";
+          repo = "russian-holidays";
+          rev = "b285a30f29d85c48e3ea4eb93972d34a090c167b";
+          sha256 = "1mz842gvrscklg2w2r2q2wbj92qr31h895k700j3axqx6k30ni0h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d4830900e371e7036225ea434c52204f4d2481a7/recipes/russian-holidays";
+          sha256 = "0lawjwz296grbvb4a1mm1j754q7mpcanyfln1gqxr339kqx2aqd8";
+          name = "russian-holidays";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/russian-holidays";
+          license = lib.licenses.free;
+        };
+      }) {};
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20161031.2109";
+        version = "20170107.451";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "e32765893ce2efb2db6662f507fb9d33d5c1b61b";
-          sha256 = "03i79iqhr8fzri018hx65rix1fsdxk38pkvbw5z6n5flbfr4m0k4";
+          rev = "c091852fbda25c62095513753b44d3fcaf8eb340";
+          sha256 = "09m20csdn5f33cixq1wzi0682d85ld9rvi408s64h4bzkrgfn6h8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -57469,12 +57618,12 @@
     rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "rust-playground";
-        version = "20161227.1107";
+        version = "20170106.1734";
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "rust-playground";
-          rev = "122db4a5a85565bc5939c90e19ae232eae729d3a";
-          sha256 = "0ki1iwzmm9ir7f6l591dn1a8byyr9xg7gapa7d3fagsm3mnx0ak1";
+          rev = "29075a3753cc0b48b4fcc0a99340306a856a8bc1";
+          sha256 = "1g0b0jg45pf7xivk8xjsm77vd8fvpp2vwdwvgzr810hj8npnqhs7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground";
@@ -57616,12 +57765,12 @@
     sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "20161228.2248";
+        version = "20170107.1708";
         src = fetchFromGitHub {
           owner = "sagemath";
           repo = "sage-shell-mode";
-          rev = "5c1651b3b754e645d64ac5cc6831b0f12cab52e9";
-          sha256 = "00ygigs78md650yap4gz5y5n0v2n08771df4kqnpklycc3csrlbh";
+          rev = "1586bfff1aeff04ae80fc6a8cac078ca9c961b2a";
+          sha256 = "07r151x6abjmn3ryg3h4b0siq9mizpp69pn6fgyn124wx4hjs0ln";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
@@ -57830,8 +57979,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "1fd9f05b441e85d5f827ce96154ce79ca334ce32";
-          sha256 = "1rs5j08nbk90rsvrjk074avz1jp3zqqfgbi57ark8bb5hlvzl2rm";
+          rev = "acb5331a94091b13ee9f9caec926d57386eded65";
+          sha256 = "1jbcxd5ws9prlzglpxdfv3f22ncmb2b596l3zxym5z645521bcar";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -58119,12 +58268,12 @@
     scratch-message = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scratch-message";
-        version = "20160825.644";
+        version = "20170107.536";
         src = fetchFromGitHub {
           owner = "thisirs";
           repo = "scratch-message";
-          rev = "8f9957a83788f391bf513e35bc877366b399dcae";
-          sha256 = "0x2961bqby1ciqaz2r55bmyhddxjr2slffgkqb8fd788d5l5m927";
+          rev = "3ecc7f5e3b8a597ebd1492fd426d3720a7f34302";
+          sha256 = "1kb664r3gbhv2ja8jyyzfw22db99ini8qbgzcy9xsl56lha4x4xi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/24c5ff6b643de9fb79334eff57b702281b20bc10/recipes/scratch-message";
@@ -59732,12 +59881,12 @@
     simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
     melpaBuild {
         pname = "simplenote2";
-        version = "20161212.642";
+        version = "20170106.2358";
         src = fetchFromGitHub {
           owner = "alpha22jp";
           repo = "simplenote2.el";
-          rev = "d005d6567cc484b61f2d233f4bf828a2365223c2";
-          sha256 = "1fp1pz6qsb3yg7wdp680i12909bv00m64102cq4pwl29cz9cgpv1";
+          rev = "9a97863bc8e089b2a751d8659a7fa2d19876d9bc";
+          sha256 = "0vd1n2wsgzhwz6ir5cr90cl844r1yph28iav0kwa6bmk6zkfd3c6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2";
@@ -59900,12 +60049,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20161212.300";
+        version = "20170111.732";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "6eb6b336dd65ecac2b07553fdab8b190b1fcdaf0";
-          sha256 = "1xcvhhcl58g3prl7dxhg69dm005fwnn0bp9knp281xi73fpfrqly";
+          rev = "1b5c7e82e3ee9c1cd4b23498d7516503cdb7d18a";
+          sha256 = "0x7lc5l2mmr3c8jj37hb9gyyd0r682fx8rmyqi73yaq01bpqswnk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -59918,27 +60067,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    slamhound = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "slamhound";
-        version = "20140506.1618";
-        src = fetchFromGitHub {
-          owner = "technomancy";
-          repo = "slamhound";
-          rev = "0c9de69557cea66e056c7c3e0ffd5a4e82c82145";
-          sha256 = "04vrhv2dp1rq475ka43bhdh7c5gb5cyflf4w0ykxb9rbkahwm8fj";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/54c191408ceb09ca21ef52df171f02d700aee5ba/recipes/slamhound";
-          sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
-          name = "slamhound";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/slamhound";
-          license = lib.licenses.free;
-        };
-      }) {};
     slideview = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slideview";
@@ -60173,12 +60301,12 @@
     sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sly";
-        version = "20161217.1623";
+        version = "20170110.629";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "87de8e96da7bce0120b4afb037af902c353269e0";
-          sha256 = "1dm1q7sx6hcary1g729231z0g9m1mybidiibzp5zk2pkrdfx6wl5";
+          rev = "98962b4eacf1621699a2f6183fdc3ff9d7e0a07d";
+          sha256 = "0x5lwi0lcy2hnhnygcff2zrchjj5307086pqkiaisl940yhi0g5k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -60652,12 +60780,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170101.605";
+        version = "20170104.410";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "f661b7ffe5addfbf80355230d1c9a837d3a19ecb";
-          sha256 = "11yfp91pi1gpphgbcy6h5xkyapy7j6p11xab4rjc9gbckl3al9kf";
+          rev = "199006a0a8ae23ee6a8ee9948bf2512f2bcf1151";
+          sha256 = "0m4n5nhr8dqa14syy5907fyjsc3lnrpchdg2ai26jz4cw97v67ig";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -61397,8 +61525,8 @@
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "0c3ccf910e108b4a69d10b56853959a6cc352018";
-          sha256 = "0b0qs398kqy6jsq22hahmfrlb6v8v3bcdgi3z2kamczb0a5k0zhf";
+          rev = "71d9e7002a9892308d64af62d21ac73f8d9d4ad5";
+          sha256 = "0fz7pf95zsh597g6az29khjmj3jz4ml3285p98zbkl75vh6h5p0f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit";
@@ -61519,12 +61647,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20161217.515";
+        version = "20170106.539";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "3818119a87edb8bb458295a45dc65b41414a77a2";
-          sha256 = "17p3l1qxgz2plr3z99mvbda0bx8qs564r1jhj3arqmz5zc447zvw";
+          rev = "4342800a4a12d7d67f2a58792ab6a18542e7fc3e";
+          sha256 = "0bzdc8d3q5gxwfkgk31368vpw06i4y2qji0wi4c2d3vwg02b4ihl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -61914,12 +62042,12 @@
     springboard = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "springboard";
-        version = "20160329.1109";
+        version = "20170105.2355";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "springboard";
-          rev = "ffcfaade6f69328084a0613d43d323f790d23048";
-          sha256 = "0p13q8xax2h3m6rddvmh1p9biw3d1shvwwmqfhg0c93xajlwdfqi";
+          rev = "263a8cd4582c81bfc29d7db37d5267e2488b148c";
+          sha256 = "14mbmkqnw2kkzcb8f9z1g3c8f8f9lca3zb6f3q8jk9dsyp9vh81z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/138b8a589725ead2fc1de9ea76c55e3eb2473872/recipes/springboard";
@@ -62223,12 +62351,12 @@
     ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-config-mode";
-        version = "20160326.552";
+        version = "20170110.1756";
         src = fetchFromGitHub {
           owner = "jhgorrell";
           repo = "ssh-config-mode-el";
-          rev = "da93f32cfe7d8a43b093b7a2c0b4845afb7a96a7";
-          sha256 = "08nx1iwvxqs1anng32w3c2clhnjf45527j0gxz5fy6h9svmb921q";
+          rev = "badbd859517e0a7c0cb8002cf79f4c474478b16d";
+          sha256 = "13dqzyc99qvspy8fxdjai0x0s0ggyhdlf6apyrq2r1z0j6gaf88g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce38cac422ad82f8b77a1757490daa1f5e284b0/recipes/ssh-config-mode";
@@ -62244,12 +62372,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20161220.2247";
+        version = "20170109.2256";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "f36ffce4a2222c8a2b00881da3bdd114a2f7c628";
-          sha256 = "1lb24avcysc2s4iwd1ivrfsmi0pqya648zb9znlnm01k71ifp26c";
+          rev = "1c1e379b153bc6206985c765969fd6a9f56aec25";
+          sha256 = "10p5yaagv5lhv6d0jcfk8pynqcw6njkjgjmgicl32nwrkgfapa6f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy";
@@ -62412,12 +62540,12 @@
     state = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "state";
-        version = "20161008.535";
+        version = "20170107.535";
         src = fetchFromGitHub {
           owner = "thisirs";
           repo = "state";
-          rev = "ff38227310347ed088fe34ff781037774cc7456b";
-          sha256 = "0hanisrni8i0bbq7f2flvfla990nyv8238nb9dfjpvimkw7rjbsg";
+          rev = "ea6e2cf6f592cbcfc5800b68f0fc2462555cacce";
+          sha256 = "1bb2rrmvkxymqdyv3w4kr36qzszwgmadqck5h87j8pi82nh9j973";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82e955112089569c775e11888d9811119f84a4f8/recipes/state";
@@ -63405,8 +63533,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dc693c37dae89e9a4302a5cce42f5321f83946c8";
-          sha256 = "0bg4ki0zzqr0pir4b3p0bpv747bfb5a8if0pydjcwrwb05b37rmp";
+          rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5";
+          sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -63775,12 +63903,12 @@
     syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }:
     melpaBuild {
         pname = "syslog-mode";
-        version = "20161124.910";
+        version = "20170107.1517";
         src = fetchFromGitHub {
           owner = "vapniks";
           repo = "syslog-mode";
-          rev = "b2582df8f6c1125636f113100a77edcde0879c22";
-          sha256 = "0am4dfaxflhyn4f0vx79w3p302fi0rr1zh7cx07s9id5q4ws7ddm";
+          rev = "e2ade4f27672a644fcb69ceaa8a08f04eaa2ccf2";
+          sha256 = "0b3p91f44ghzlma3vw607fsvzzgrfjq4k3zchv0drlga2kv771vw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/478b307f885a06d9ced43758d8c117370152baae/recipes/syslog-mode";
@@ -64131,12 +64259,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20161228.743";
+        version = "20170110.50";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "c3ae08db2984c68a73468bc66c6517d286c74b48";
-          sha256 = "1r868ywxl62pih1pwjh6rzq2cwlic6358j8ji56p6hx08pbx932m";
+          rev = "54d1a08feb856a984333b420530f42cf1a524043";
+          sha256 = "10490h25igp0vwaplxcz2cbj008q05wz44vik1hv4apkysh31vgh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -64660,8 +64788,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-terraform-mode";
-          rev = "51ecf5858b910ddd373de4c6fbc0c12c202e8613";
-          sha256 = "0dfjdwpyy1kp6j7flkxnfng74vkx93glq3idhzc6hq8a4wh2j64n";
+          rev = "dfd111ea892ab7c3a041d5097207d351df5af7f8";
+          sha256 = "0wxwiy08y89n1qr7wzbpsax05ivppvdcgcnamzx4br0x8lqxab63";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode";
@@ -65048,8 +65176,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "d8bb0e3b9ff7e6cecfc85c01a81280dc3d046430";
-          sha256 = "0n2dy6l9wv08z5f67qlayw1ik3mfcblaflh0dl3ji1f6ygfm6y8h";
+          rev = "5f723cd53980f395a92c438790a127cbd5699d90";
+          sha256 = "1zf3ddyz8579kcwrbhb09nn5r0wxjwmafmrnrwljlch0kxwp79nl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -65105,12 +65233,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20161217.2302";
+        version = "20170107.1619";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "ab0e9fca712c6e890c213198fe9ab20284778f79";
-          sha256 = "1msndmywrj0fny4fys5qj9nh1p01p2vsyn3wfrhj5asshgvp6g48";
+          rev = "026af0842856bcc6dba26272feb1c9bec557de9d";
+          sha256 = "0315lr5xs2ncw6k8d24ms0jk4k83x9jrzvn7534ciny7jjkll6fq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -65837,8 +65965,8 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "e549f0a7f8c6a39cc3129581b85682e3977d2bdd";
-          sha256 = "16c45hb216b3r214p8v7zzlpz26s39lc9fmjl6ll3jwvqpq19kb1";
+          rev = "5444a8dd90691de941509f7cc9ac8329c442dbdd";
+          sha256 = "00dcdszskzqggg4gjp5f2k2v1a03jad52q2pqf04jqjycapkx227";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -66245,12 +66373,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20161229.438";
+        version = "20170109.1459";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "d4c82791b2a4e2c38c09a5afc61dab958b107428";
-          sha256 = "13f4rj45m6qb1m21x9qnyb1xhfpb4pi8aifya0lb8xplav131bsk";
+          rev = "5d53d1cc0478356602dc3d8a838445de9aa2a84a";
+          sha256 = "0qj4racbh4fwsbgm08phbgcam2m348rcli950nd27sn7vza8vcy4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -67188,6 +67316,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    untitled-new-buffer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magic-filetype, melpaBuild }:
+    melpaBuild {
+        pname = "untitled-new-buffer";
+        version = "20161212.708";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "untitled-new-buffer.el";
+          rev = "4eabc6937b0e83062ffce9de0d42110224063a6c";
+          sha256 = "139gysva6hpsk006bcbm1689pzaj18smxs2ar5pv0yvkh60wjvlr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/de62e48115e1e5f9506e6d47a3b23c0420c1205b/recipes/untitled-new-buffer";
+          sha256 = "1hpv7k7jhpif9csdrd2gpz71s3fp4svsvrd1nh8hbx7avjl66pjf";
+          name = "untitled-new-buffer";
+        };
+        packageRequires = [ emacs magic-filetype ];
+        meta = {
+          homepage = "https://melpa.org/#/untitled-new-buffer";
+          license = lib.licenses.free;
+        };
+      }) {};
     url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "url-shortener";
@@ -67503,12 +67652,12 @@
     vc-auto-commit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vc-auto-commit";
-        version = "20160108.215";
+        version = "20170107.533";
         src = fetchFromGitHub {
           owner = "thisirs";
           repo = "vc-auto-commit";
-          rev = "9e60dd775df9771185c8ff79fa0ce7f7cfb90c17";
-          sha256 = "09h7yg44hbxv3pyazfypkvk8j3drlwz0zn8x1wj0kbsviksl1wxk";
+          rev = "446f664f4ec835532f4f18ba18b5fb731f6030aa";
+          sha256 = "18jjl656ps75p7n3hf16mcjrgiagnjvb8m8dl4i261cbnq98qmav";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/770ab1e99fe63789726fc6c8c5d7e9a0287bc5fa/recipes/vc-auto-commit";
@@ -67524,12 +67673,12 @@
     vc-check-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vc-check-status";
-        version = "20160108.216";
+        version = "20170107.534";
         src = fetchFromGitHub {
           owner = "thisirs";
           repo = "vc-check-status";
-          rev = "7c2e8a4e26d16c50343677fd769fc9d9d9778920";
-          sha256 = "0icc4kqfpimxlja4jgcy9gjj4myc8y84vbvacyf79lxixygpaxi1";
+          rev = "37734beb16bfd8633ea328059bf9a47eed826d5c";
+          sha256 = "0mspksr2i6hkb7bhs38ydmn0d2mn7g1hjva60paq86kl7k76f7ra";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0387e08dd7ed69b291e896d85bd975c4f5dcbd09/recipes/vc-check-status";
@@ -67839,12 +67988,12 @@
     viewer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "viewer";
-        version = "20141021.1136";
+        version = "20170106.1802";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "viewer";
-          rev = "4cc7bba34fbf6ff65e26c1f0c3b16af7adf0a190";
-          sha256 = "1ch8lr514f9lp3wdhy1z4dqcbnqkbqkgflnchwd82r5ylzbdxy2a";
+          rev = "6c8db025bf4021428f7f2c3ef9d74fb13f5d267a";
+          sha256 = "1sj4a9zwfv94m0ac503gan6hf9sl2658khab1fnj8szcq7hrdvq1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/viewer";
@@ -68281,8 +68430,8 @@
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "vue-mode";
-          rev = "addc8637f9ab645b758b48b785a5a4c74c8ccc71";
-          sha256 = "0pkjvil3wdcpwm7gq998lqr5dwp8qdzc025qjq0f3pqv9sq4yqq3";
+          rev = "1561da428a1a30170b71cab71c576a508e4f4367";
+          sha256 = "1081kypg9lhc0d3kjw4vkk9s3g9dbb5rr2rh4d2s1zicy7rxhadn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -69562,12 +69711,12 @@
     winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "winum";
-        version = "20161226.1051";
+        version = "20170111.29";
         src = fetchFromGitHub {
           owner = "deb0ch";
           repo = "emacs-winum";
-          rev = "430d24dd29cf5a96eb31ea4bc6af150e4d530331";
-          sha256 = "0ayj466md5xz6gflwl5sa81grpiydy5i2lkdpz7m8wlc81q3ng9j";
+          rev = "e89791b90e45f588f9e8c11884ea1daf3dc98518";
+          sha256 = "1gd0byijl5cyn6gkf5pkadzqvczshgizfrr3ddg6czvgblf1vgl9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
@@ -69960,12 +70109,12 @@
     ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ws-butler";
-        version = "20160913.1902";
+        version = "20170111.1534";
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "ws-butler";
-          rev = "b59e36b2451193bf96176f5a006bf506770a40f3";
-          sha256 = "0ij88qr7gk07dchhjsn3nlk8fqgbkp4qhvn14dqxndn3zr64ix7v";
+          rev = "323b651dd70ee40a25accc940b8f80c3a3185205";
+          sha256 = "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler";
@@ -70149,12 +70298,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20170102.722";
+        version = "20170111.654";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "0f4d6f3239ced83d4f71660feca896ebe594e749";
-          sha256 = "19ps3b60pzr8p8yii49kcsnvy0l0mpsfh231bfjsynrdzaz3zbd6";
+          rev = "b880127e243681796cefc81125953751da15930b";
+          sha256 = "16mcbrmnh5s4982s5jxx8iwnp7l4zczr9d7xvhlx3dnr916nmkf2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -70191,12 +70340,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170103.616";
+        version = "20170111.1606";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "05d97718a519edae9acb4f729cc7b997d3016e21";
-          sha256 = "0b83rn7b5ssqhwj1lgz8na1dlaj8k0900rci1ggyylrdxzbbssnz";
+          rev = "55b7ca9765886f8a750c54882cf07f6e953e60e7";
+          sha256 = "1kpvsd2kbp97pvlya80980znprc6b8h3mr87g16pjqzaayr2nk50";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -70275,12 +70424,12 @@
     xah-reformat-code = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-reformat-code";
-        version = "20161222.525";
+        version = "20170111.812";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-reformat-code";
-          rev = "a5034360857b8d795a8b9a9be72d53737c9e5c66";
-          sha256 = "0sdxh9m3h9ain9ginarwia28qx19bia6f89788d6nvh1swlwxfi9";
+          rev = "7e5bbd09be8035a482a76417d900cb5d3a70e1cd";
+          sha256 = "04xwf9jxk4805bl7xj05kjfgl7m71zp94qdvw4g37s6q8v25j73d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45e731ccee5ccbf97169e32a16300b5fb78e1155/recipes/xah-reformat-code";
@@ -70296,12 +70445,12 @@
     xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-replace-pairs";
-        version = "20161218.2147";
+        version = "20170111.652";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-replace-pairs";
-          rev = "a4e278440afc237907fd3d8c7ada45d2c9ff0141";
-          sha256 = "0jz59iprd8s0ijay4l6mk7j47vd61v28y7l6xhgz9008gn9qbbzi";
+          rev = "fb1b37f482ae2082d0a26214b2160760324d3fce";
+          sha256 = "1am9zyszav8mr1g60g7jdmxd1hnvm2p7zpdrzv3awmr92y3psn1i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs";
@@ -70485,12 +70634,12 @@
     xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xmlgen";
-        version = "20160810.331";
+        version = "20170108.1614";
         src = fetchFromGitHub {
           owner = "philjackson";
           repo = "xmlgen";
-          rev = "fa99dbc8fa233100242a234e915fe658154d2a34";
-          sha256 = "0j2yp6fy3gvgvpjdlrrxxwyax24ngv7jhxfj4rmf8wghf7i2flvg";
+          rev = "f5eb6988efd36e05ace27799dc64dd8c55600f5e";
+          sha256 = "1vwvs6dnvds0svvzbjjxrm6l4fzjw9nh33jc6yfgibavr3zww40j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd19fded2de4e7549121485e81f7405c0176e203/recipes/xmlgen";
@@ -71132,11 +71281,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20161214.2131";
+        version = "20170105.615";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "5428250c886a";
-          sha256 = "0q1b0wpdfdghp6hchc59jgkyra5qqqdam47q7g2ni4ym8nlhwd3c";
+          rev = "59459111e042";
+          sha256 = "072aminyiw7pwm74sq3xqqyd1f2l2ilcwg98r094xjvw4fz3yjq5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -71371,12 +71520,12 @@
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "20170102.1359";
+        version = "20170103.2328";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "0d3a01b564cf0c64a83c3bf0652aff47f13dfaf0";
-          sha256 = "0qazdp1x3mwpi20ilraqsb350rgp9vsk4qhby4qgrxqq1iv3n1nb";
+          rev = "554778b48ffa35b0ebfbed31a6dc249afa16ba24";
+          sha256 = "19zh9ifaqgf8d9lkxsgznd935p4yfhxcrdi583gp8m2vwa22kgrm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -71437,8 +71586,8 @@
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "e2e58a4aabb2b8973b318f5ad1013150f8d06678";
-          sha256 = "1jnjiypm2zarfws1w5ql1c9d6zgl47cjnr8zq5lk0raxwx968lqc";
+          rev = "3f93de4fd1ed7e989873b556517e018f1436f8ed";
+          sha256 = "0rqg3mmh7jxsasai6i8y8r2hngvhnncn38ihvbbylyx4f71h59hi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
@@ -71764,12 +71913,12 @@
     zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }:
     melpaBuild {
         pname = "zotxt";
-        version = "20170102.1009";
+        version = "20170108.1046";
         src = fetchFromGitLab {
           owner = "egh";
           repo = "zotxt-emacs";
-          rev = "ac3946f45c6e9f61fdd23c517d78b1844b231c90";
-          sha256 = "02kr2qladcm82dsq2fii1k6ks21ywk216v2rhffqkxyq6xpanvpj";
+          rev = "fae693a2a1c0701cd534103dddfed46335e38f6e";
+          sha256 = "0pjjjx1gvnjs4x467dr4lnpk3s790vsmjp8ifawc36sfz8vwm5wi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt";
@@ -71806,12 +71955,12 @@
     ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ztree";
-        version = "20161227.426";
+        version = "20170105.208";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "ztree";
-          rev = "2751b96aca36cc5c31dc105ec985c269126420a0";
-          sha256 = "099w5z28aznzc8ri26lz8fkql4lvv23j0cqijif7bfmiz6zq5l1h";
+          rev = "3a4df17edddef84160194802acc034cfa2dbd678";
+          sha256 = "1a5sk4b00sgkgq23xmv0rlx89686dx3p8cmscrcf2lcddx8cq9pl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree";

From 4c1703786c82898281c815b7958a896a12340306 Mon Sep 17 00:00:00 2001
From: "Scott R. Parish" <srparish@gmail.com>
Date: Wed, 11 Jan 2017 19:14:12 -0800
Subject: [PATCH 046/727] nvi: fix linking with ncurses

---
 pkgs/applications/editors/nvi/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix
index 89762d5bc33..82c89ebdca6 100644
--- a/pkgs/applications/editors/nvi/default.nix
+++ b/pkgs/applications/editors/nvi/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
   patchPhase = ''
     sed -i build/configure \
       -e s@vi_cv_path_preserve=no@vi_cv_path_preserve=/tmp/vi.recover@ \
-      -e s@/var/tmp@@
+      -e s@/var/tmp@@ \
+      -e s@-lcurses@-lncurses@
   '';
 
   configurePhase = ''

From 715ff285b65bbdfd747c1db1e904a22740528431 Mon Sep 17 00:00:00 2001
From: Aaron Bull Schaefer <aaron@elasticdog.com>
Date: Wed, 11 Jan 2017 11:10:10 -0800
Subject: [PATCH 047/727] terraform: 0.8.2 -> 0.8.4

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

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index d436aa99d4b..ffbdec6e117 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.8.2";
+  version = "0.8.4";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/terraform";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "hashicorp";
     repo = "terraform";
-    sha256 = "1645la750lqx2m57sbl6xg1cnqgwrfk5dhcw08wm4z7zxdnqys7b";
+    sha256 = "0wjz7plzi7bgrbw22kgqpbai1j3rmqayrmjcp9dq6a361l9a0msw";
   };
 
   postInstall = ''

From 6dbcf7d2e93eb204fd468ca540c37350b97051ea Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 12 Jan 2017 11:11:20 +0300
Subject: [PATCH 048/727] udev service: verify that hwdb is generated without
 errors

---
 nixos/modules/services/hardware/udev.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 14d65978c32..028907693a5 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -143,7 +143,10 @@ let
       done
 
       echo "Generating hwdb database..."
-      ${udev}/bin/udevadm hwdb --update --root=$(pwd)
+      # hwdb --update doesn't return error code even on errors!
+      res="$(${udev}/bin/udevadm hwdb --update --root=$(pwd) 2>&1)"
+      echo "$res"
+      [ -z "$(echo "$res" | egrep '^Error')" ]
       mv etc/udev/hwdb.bin $out
     '';
 

From 2fd0a9f3c74a29e87952c7657aed8194258a83c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Jan 2017 09:58:39 +0100
Subject: [PATCH 049/727] bind: update to 9.10.4-P5 (CVE-2016-9131,
 CVE-2016-9147, CVE-2016-9444, CVE-2016-9778)

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

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index d3daad1e0cb..fb8c9da5f8e 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-P4"; in
+let version = "9.10.4-P5"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "11lxkb7d79c75scrs28q4xmr0ii2li69zj1c650al3qxir8yf754";
+    sha256 = "1sqg7wg05h66vdjc8j215r04f8pg7lphkb93nsqxvzhk6r0ppi49";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From b4fcbf4095828ab99fb6861db34a53700bb09005 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Jan 2017 09:59:46 +0100
Subject: [PATCH 050/727] callHackage: update database to current version

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 812362d6b30..95296108618 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -6,6 +6,6 @@
 fetchFromGitHub {
   owner = "commercialhaskell";
   repo = "all-cabal-hashes";
-  rev = "ee101d34ff8bd59897aa2eb0a124bcd3fb47ceec";
-  sha256 = "1hky0s2c1rv1srfnhbyi3ny14rnfnnp2j9fsr4ylz76xyxgjf5wm";
+  rev = "5c5b04af472eb6c2854b21cb52ee6324252280de";
+  sha256 = "1cnr350044yrlg7wa09fmdarl7y9gkydh25lv94wcqg3w9cdv0fb";
 }

From 086fbfa3088defd3e6b0278161cdca792f1bd704 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 10 Jan 2017 18:32:58 +0000
Subject: [PATCH 051/727] ocamlPackages.owee: init at 0.2

Owee is an experimental library to work with DWARF format.

Homepage: https://github.com/let-def/owee
---
 .../ocaml-modules/owee/default.nix            | 25 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/owee/default.nix

diff --git a/pkgs/development/ocaml-modules/owee/default.nix b/pkgs/development/ocaml-modules/owee/default.nix
new file mode 100644
index 00000000000..7ac6af3edd9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/owee/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-owee-${version}";
+  version = "0.2";
+
+  src = fetchFromGitHub {
+    owner = "let-def";
+    repo = "owee";
+    rev = "v${version}";
+    sha256 = "025a8sm03mm9qr7grdmdhzx7pyrd0dr7ndr5mbj5baalc0al132z";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "An experimental OCaml library to work with DWARF format";
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 6e3f98c7ba2..91e349eede9 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -351,6 +351,8 @@ let
 
     otr = callPackage ../development/ocaml-modules/otr { };
 
+    owee = callPackage ../development/ocaml-modules/owee { };
+
     ounit = callPackage ../development/ocaml-modules/ounit { };
 
     piqi = callPackage ../development/ocaml-modules/piqi { };

From eeda593de45ca095db982d0d30b7a6d79a4cdb14 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 12 Jan 2017 10:16:56 +0100
Subject: [PATCH 052/727] pythonPackages.daphne: 0.15.0 -> 1.0.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e58cc0f63fe..3feac773df9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5833,11 +5833,11 @@ in {
 
   daphne = buildPythonPackage rec {
     name = "daphne-${version}";
-    version = "0.15.0";
+    version = "1.0.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/daphne/${name}.tar.gz";
-      sha256 = "095xdh10v8sqwyas02q72ij3ivd5qjg5ki5cvha0fpzd361izdnp";
+      sha256 = "0l62bd9swv0k9qcpl2s8kj4mgl6qayi0krwkkg1x73a9y48xpi9z";
     };
 
     propagatedBuildInputs = with self; [ asgiref autobahn ];

From 8b8bba90b7ce4a2224b247c0d9af4a7e95fcb16f Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 12 Jan 2017 10:17:18 +0100
Subject: [PATCH 053/727] pythonPackages.channels: 0.17.3 -> 1.0.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3feac773df9..c407c3780d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2321,11 +2321,11 @@ in {
 
   channels = buildPythonPackage rec {
     name = "channels-${version}";
-    version = "0.17.3";
+    version = "1.0.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/channels/${name}.tar.gz";
-      sha256 = "03nalz0mqjxqlgqwkmranair2c1amry2aw52dd78ihf07dfinnc9";
+      sha256 = "0m55qzifg47s0zndnh3w7fnpd3skcbkq3lv8m87xgmcrczl7x5mf";
     };
 
     # Files are missing in the distribution

From 60435691f78dc533d49bf30751e1a8328b67367a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 12 Jan 2017 11:46:55 +0100
Subject: [PATCH 054/727] haskellPackages.servant-auth: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3c48be53141..8395898b2d9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1081,6 +1081,13 @@ self: super: {
     servant = self.servant_0_9_1_1;
   });
 
+  # https://github.com/plow-technologies/servant-auth/issues/20
+  servant-auth = dontCheck super.servant-auth;
+
+  servant-auth-server = super.servant-auth-server.overrideScope (self: super: {
+    jose = super.jose_0_5_0_2;
+  });
+
   # https://github.com/pontarius/pontarius-xmpp/issues/105
   pontarius-xmpp = dontCheck super.pontarius-xmpp;
 

From 4e0a5e7602bd437e5c6be3f2405f49bfb3ff4f5a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 12 Jan 2017 18:08:48 +0800
Subject: [PATCH 055/727] nim: include all supporting tools

This PR makes a few changes to how things are done:

a) build and install "koch" - the nim make-type tool
b) use "koch" to bootstrap nim
c) build additional supporting tools such as nimble, nimgrep and nimsuggest
d) nim can use other c compilers than gcc, so instead of forcing gcc we use the one from stdenv
e) run the full test suite

We do not need the "nimble" package any longer as it is part of nim.
---
 pkgs/development/compilers/nim/default.nix | 64 ++++++++++++++++------
 pkgs/development/tools/nimble/default.nix  | 40 --------------
 pkgs/top-level/all-packages.nix            |  3 +-
 3 files changed, 47 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/development/tools/nimble/default.nix

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index eed702f8512..0cebd40afdb 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, makeWrapper, gcc }:
+{ stdenv, lib, fetchurl, makeWrapper, nodejs, openssl, pcre, readline, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "nim-${version}";
@@ -9,24 +9,52 @@ stdenv.mkDerivation rec {
     sha256 = "0rsibhkc5n548bn9yyb9ycrdgaph5kq84sfxc9gabjs7pqirh6cy";
   };
 
-  buildInputs  = [ makeWrapper ];
+  doCheck = true;
 
-  buildPhase   = "sh build.sh";
+  enableParallelBuilding = true;
 
-  installPhase =
-    ''
-      install -Dt "$out/bin" bin/nim
-      substituteInPlace install.sh --replace '$1/nim' "$out"
-      sh install.sh $out
-      wrapProgram $out/bin/nim \
-        --suffix PATH : ${lib.makeBinPath [ gcc ]}
-    '';
+  NIX_LDFLAGS = [
+    "-lcrypto"
+    "-lpcre"
+    "-lreadline"
+    "-lsqlite3"
+  ];
 
-  meta = with stdenv.lib;
-    { description = "Statically typed, imperative programming language";
-      homepage = http://nim-lang.org/;
-      license = licenses.mit;
-      maintainers = with maintainers; [ ehmry peterhoeg ];
-      platforms = platforms.linux ++ platforms.darwin; # arbitrary
-    };
+  # 1. nodejs is only needed for tests
+  # 2. we could create a separate derivation for the "written in c" version of nim
+  #    used for bootstrapping, but koch insists on moving the nim compiler around
+  #    as part of building it, so it cannot be read-only
+
+  buildInputs  = [
+    makeWrapper nodejs
+    openssl pcre readline sqlite
+  ];
+
+  buildPhase   = ''
+    sh build.sh
+    ./bin/nim c koch
+    ./koch boot  -d:release \
+                 -d:useGnuReadline \
+                 ${lib.optionals (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace"}
+    ./koch tools -d:release
+  '';
+
+  installPhase = ''
+    install -Dt $out/bin bin/* koch
+    ./koch install $out
+    mv $out/nim/bin/* $out/bin/ && rmdir $out/nim/bin
+    mv $out/nim/*     $out/     && rmdir $out/nim
+    wrapProgram $out/bin/nim \
+      --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]}
+  '';
+
+  checkPhase = "./koch tests";
+
+  meta = with stdenv.lib; {
+    description = "Statically typed, imperative programming language";
+    homepage = http://nim-lang.org/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ehmry peterhoeg ];
+    platforms = with platforms; linux ++ darwin; # arbitrary
+  };
 }
diff --git a/pkgs/development/tools/nimble/default.nix b/pkgs/development/tools/nimble/default.nix
deleted file mode 100644
index d3248d6219e..00000000000
--- a/pkgs/development/tools/nimble/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchFromGitHub, nim, openssl }:
-
-stdenv.mkDerivation rec {
-  name = "nimble-${version}";
-
-  version = "0.7.10";
-
-  src = fetchFromGitHub {
-    owner = "nim-lang";
-    repo = "nimble";
-    rev = "v${version}";
-    sha256 = "1bcv8chir73nn6x7q8n3sw2scf3m0x2w9gkkzx162ryivza1nm1r";
-  };
-
-  buildInputs = [ nim openssl ];
-
-  patchPhase = ''
-    substituteInPlace src/nimble.nim.cfg --replace "./vendor/nim" "${nim}/share"
-    echo "--clib:crypto" >> src/nimble.nim.cfg
-  '';
-
-  buildPhase = ''
-    cd src && nim c -d:release nimble
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp nimble $out/bin
-  '';
-
-  dontStrip = true;
-
-  meta = with stdenv.lib; {
-    description = "Package manager for the Nim programming language";
-    homepage = https://github.com/nim-lang/nimble;
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ kamilchm ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69192cd6d3a..cab1c2d230c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5277,7 +5277,6 @@ in
   mozart = mozart-binary;
 
   nim = callPackage ../development/compilers/nim { };
-  nimble = callPackage ../development/tools/nimble { };
   nrpl = callPackage ../development/tools/nrpl { };
 
   neko = callPackage ../development/compilers/neko { };
@@ -8401,7 +8400,7 @@ in
 
   libpfm = callPackage ../development/libraries/libpfm { };
 
-  libpqxx = callPackage ../development/libraries/libpqxx { 
+  libpqxx = callPackage ../development/libraries/libpqxx {
     gnused = gnused_422;
   };
 

From c94c2666bb2ad183b57b6192edc2d8761a319520 Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <loskutov@google.com>
Date: Thu, 12 Jan 2017 03:12:25 +0300
Subject: [PATCH 056/727] tdesktop: 0.10.19 -> 1.0.0

abbradar: add vdpau to fix the build, use qt56 explicitly

Closes #21821.
---
 .../instant-messengers/telegram/tdesktop/default.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix                      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index c07258a7837..16956782a24 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -3,7 +3,7 @@
 , breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus
 , gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2
 , libwebp, libunity, dee, libdbusmenu-glib, libva-full, wayland
-, xcbutilrenderutil, icu, libSM, libICE, libproxy
+, xcbutilrenderutil, icu, libSM, libICE, libproxy, libvdpau
 
 , libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms, libxkbcommon
 , libpng, libjpeg, freetype, harfbuzz, pcre16, xproto, libX11
@@ -19,20 +19,20 @@ let
 
 in stdenv.mkDerivation rec {
   name = "telegram-desktop-${version}";
-  version = "0.10.19";
+  version = "1.0.0";
   qtVersion = lib.replaceStrings ["."] ["_"] packagedQt;
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${version}";
-    sha256 = "1p07kxfmcd90sx9bq046x03h1h807vs0pn64lfghr6m6ln8z44s3";
+    sha256 = "1qxzi82cgd8klk6rn83rzrmik0s76alarfaknknww5iw5px7gi8b";
   };
 
   tgaur = fetchgit {
     url = "https://aur.archlinux.org/telegram-desktop.git";
-    rev = "99bb0519f14e23fafb6884fe296d34b6f8bed5c3";
-    sha256 = "0z5m3binbl06kk34plmfblhqz6hlnkbnjb93sam0c6c995k3sz82";
+    rev = "957a76f9fb691486341bcf4781ad0ef3d16f6b69";
+    sha256 = "01nrvvq0mrdyvamjgqr4z5aahyd1wrf28jyddpfsnixp2w5kxqj8";
   };
 
   buildInputs = [
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
     # Qt dependencies
     libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon
     libpng libjpeg freetype harfbuzz pcre16 xproto libX11
-    inputproto sqlite dbus libwebp wayland
+    inputproto sqlite dbus libwebp wayland libvdpau
   ];
 
   nativeBuildInputs = [ pkgconfig gyp cmake ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e5729fe04f..ae5af7f6343 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15108,7 +15108,7 @@ in
 
   taskserver = callPackage ../servers/misc/taskserver { };
 
-  tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
+  tdesktop = qt56.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
     inherit (pythonPackages) gyp;
   };
 

From e91840cfb6b7778f8c29d455a2f24cffa1b4e43e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 12 Jan 2017 14:25:20 +0100
Subject: [PATCH 057/727] rustc: enable codegen units and parallel building
 (#21742)

---
 pkgs/development/compilers/rust/rustc.nix | 31 ++++++++++++-----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 04543f17ec9..190bb1a69fd 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -20,27 +20,17 @@ let
     else
       "${shortVersion}-g${builtins.substring 0 7 srcRev}";
 
-  name = "rustc-${version}";
-
   procps = if stdenv.isDarwin then darwin.ps else args.procps;
 
   llvmShared = llvm.override { enableSharedLibraries = true; };
 
   target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
 
-  meta = with stdenv.lib; {
-    homepage = http://www.rust-lang.org/;
-    description = "A safe, concurrent, practical language";
-    maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
-    license = [ licenses.mit licenses.asl20 ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
 in
 
 stdenv.mkDerivation {
-  inherit name;
+  name = "rustc-${version}";
   inherit version;
-  inherit meta;
 
   __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ];
 
@@ -52,6 +42,9 @@ stdenv.mkDerivation {
   # versions.
   RUSTC_BOOTSTRAP = "1";
 
+  # Increase codegen units to introduce parallelism within the compiler.
+  RUSTFLAGS = "-Ccodegen-units=10";
+
   src = fetchgit {
     url = https://github.com/rust-lang/rust;
     rev = srcRev;
@@ -130,13 +123,12 @@ stdenv.mkDerivation {
   buildInputs = [ ncurses ] ++ targetToolchains
     ++ optional (!forceBundledLLVM) llvmShared;
 
-  # https://github.com/rust-lang/rust/issues/30181
-  # enableParallelBuilding = false; # missing files during linking, occasionally
-
   outputs = [ "out" "doc" ];
   setOutputFlags = false;
 
+  # Disable codegen units for the tests.
   preCheck = ''
+    export RUSTFLAGS=
     export TZDIR=${tzdata}/share/zoneinfo
   '' +
   # Ensure TMPDIR is set, and disable a test that removing the HOME
@@ -147,7 +139,16 @@ stdenv.mkDerivation {
     sed -i '28s/home_dir().is_some()/true/' ./src/test/run-pass/env-home-dir.rs
   '';
 
-  # Disable doCheck on Darwin to work around upstream issue
   doCheck = true;
   dontSetConfigureCross = true;
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://www.rust-lang.org/;
+    description = "A safe, concurrent, practical language";
+    maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
+    license = [ licenses.mit licenses.asl20 ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
 }

From ac0b6b9a2cc7940de276fa3cb7afde80e14b5d6b Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 12 Jan 2017 14:30:58 +0000
Subject: [PATCH 058/727] miredo: do not run miredo-checkconf

---
 nixos/modules/services/networking/miredo.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/networking/miredo.nix b/nixos/modules/services/networking/miredo.nix
index 932d6cf2903..3d560338e2c 100644
--- a/nixos/modules/services/networking/miredo.nix
+++ b/nixos/modules/services/networking/miredo.nix
@@ -82,7 +82,6 @@ in
       serviceConfig = {
         Restart = "always";
         RestartSec = "5s";
-        ExecStartPre = "${cfg.package}/bin/miredo-checkconf -f ${miredoConf}";
         ExecStart = "${cfg.package}/bin/miredo -c ${miredoConf} -p ${pidFile} -f";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       };

From 45a677b978bd9b1d648a9b455b482dff514f24fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 12 Jan 2017 16:34:52 +0100
Subject: [PATCH 059/727] haskell.packages.ghc802: dontCheck vector-algorithms

---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 5 +++++
 1 file changed, 5 insertions(+)

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 27604897701..095b6ee4f1b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -66,4 +66,9 @@ self: super: {
   # https://github.com/Deewiant/glob/issues/8
   Glob = doJailbreak super.Glob;
 
+  ## GHC 8.0.2
+
+  # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
+  vector-algorithms = dontCheck super.vector-algorithms;
+
 }

From e5dcce837a1a59491e1fc2bc6a479c1c51e2dfe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 12 Jan 2017 16:41:33 +0100
Subject: [PATCH 060/727] nixos: fix terminal-server, fixes #21834

---
 nixos/modules/services/x11/terminal-server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index 09d0ab07751..785394d9648 100644
--- a/nixos/modules/services/x11/terminal-server.nix
+++ b/nixos/modules/services/x11/terminal-server.nix
@@ -41,7 +41,7 @@ with lib;
       { description = "Terminal Server";
 
         path =
-          [ pkgs.xorgserver.out pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth
+          [ pkgs.xorg.xorgserver.out pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth
             pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash
           ];
 

From aa9a9dd1b42f8e17f625a3d6c5466753b19a4428 Mon Sep 17 00:00:00 2001
From: Azul <mail@azulinho.com>
Date: Thu, 12 Jan 2017 16:00:50 +0000
Subject: [PATCH 061/727] python docs: add an example for a virtualenv and pip
 through nix-shell

---
 doc/languages-frameworks/python.md | 37 ++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 82aeb112c93..7fd26c88e38 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -804,6 +804,43 @@ If you want to create a Python environment for development, then the recommended
 method is to use `nix-shell`, either with or without the `python.buildEnv`
 function.
 
+### How to consume python modules using pip in a virtualenv like I am used to on other Operating Systems ?
+
+This is an example of a `default.nix` for a `nix-shell`, which allows to consume a `virtualenv` environment,
+and install python modules through `pip` the traditional way.
+
+Create this `default.nix` file, together with a `requirements.txt` and simply execute `nix-shell`.
+
+```
+
+th import <nixpkgs> {};
+with pkgs.python27Packages;
+
+buildPythonPackage { 
+  name = "impurePythonEnv";
+  buildInputs = [
+    taglib
+    openssl
+    git
+    libxml2
+    libxslt
+    libzip
+    python27Full
+    python27Packages.virtualenv
+    python27Packages.pip
+    stdenv
+    zlib ];
+  src = null;
+  # When used as `nix-shell --pure`
+  shellHook = ''
+  unset http_proxy
+  export GIT_SSL_CAINFO=/etc/ssl/certs/ca-bundle.crt
+  virtualenv --no-wheel --no-setuptools venv 
+  export PATH=$PWD/venv/bin:$PATH
+  pip install -r requirements.txt --no-use-wheel
+  '';
+}
+```
 
 ## Contributing
 

From 58613a7eedb9b24be5d9d05718eed59aa0f1d6bf Mon Sep 17 00:00:00 2001
From: Azul <mail@azulinho.com>
Date: Thu, 12 Jan 2017 16:59:27 +0000
Subject: [PATCH 062/727] python docs: update block according to code review

---
 doc/languages-frameworks/python.md | 34 ++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 7fd26c88e38..6b86312c21f 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -812,36 +812,48 @@ and install python modules through `pip` the traditional way.
 Create this `default.nix` file, together with a `requirements.txt` and simply execute `nix-shell`.
 
 ```
-
-th import <nixpkgs> {};
+with import <nixpkgs> {};
 with pkgs.python27Packages;
 
-buildPythonPackage { 
+stdenv.mkDerivation { 
   name = "impurePythonEnv";
   buildInputs = [
+    # these packages are required for virtualenv and pip to work:
+    #
+    python27Full
+    python27Packages.virtualenv
+    python27Packages.pip
+    # the following packages are related to the dependencies of your python 
+    # project. 
+    # In this particular example the python modules listed in the 
+    # requirements.tx require the following packages to be installed locally 
+    # in order to compile any binary extensions they may require.
+    #
     taglib
     openssl
     git
     libxml2
     libxslt
     libzip
-    python27Full
-    python27Packages.virtualenv
-    python27Packages.pip
     stdenv
     zlib ];
   src = null;
-  # When used as `nix-shell --pure`
   shellHook = ''
-  unset http_proxy
-  export GIT_SSL_CAINFO=/etc/ssl/certs/ca-bundle.crt
-  virtualenv --no-wheel --no-setuptools venv 
+  # set SOURCE_DATE_EPOCH so that we can use python wheels
+  SOURCE_DATE_EPOCH=$(date +%s)
+  virtualenv --no-setuptools venv 
   export PATH=$PWD/venv/bin:$PATH
-  pip install -r requirements.txt --no-use-wheel
+  pip install -r requirements.txt
   '';
 }
 ```
 
+Note that the `pip install` is an imperative action. So every time `nix-shell`
+is executed it will attempt to download the python modules listed in 
+requirements.txt. However these will be cached locally within the `virtualenv`
+folder and not downloaded again.
+
+
 ## Contributing
 
 ### Contributing guidelines

From 9c489165af0f259e48eed0427df5b2498b813b38 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 12 Jan 2017 17:51:29 +0000
Subject: [PATCH 063/727] scala: fix versions and $PATH

---
 pkgs/development/compilers/scala/2.10.nix    | 12 ++++--
 pkgs/development/compilers/scala/2.11.nix    | 43 ++++++++++++++++++++
 pkgs/development/compilers/scala/default.nix |  8 +++-
 pkgs/top-level/all-packages.nix              |  5 ++-
 4 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/compilers/scala/2.11.nix

diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix
index 26fd3850190..946a9bedbf5 100644
--- a/pkgs/development/compilers/scala/2.10.nix
+++ b/pkgs/development/compilers/scala/2.10.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, makeWrapper, jre }:
+{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.10.5";
+  name = "scala-2.10.6";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "1ckyz31gmf2pgdl51h1raa669mkl7sqfdl3vqkrmyc46w5ysz3ci";
+    sha256 = "0rrdrndnxy8m76gppqh7yr68qfx0kxns5bwc69k4swz6va1zbbal";
   };
 
   propagatedBuildInputs = [ jre ] ;
@@ -17,7 +17,11 @@ stdenv.mkDerivation rec {
     mv * $out
 
     for p in $(ls $out/bin/) ; do
-      wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ;
+      wrapProgram $out/bin/$p \
+        --prefix PATH ":" ${coreutils}/bin \
+        --prefix PATH ":" ${gnugrep}/bin \
+        --prefix PATH ":" ${jre}/bin \
+        --set JAVA_HOME ${jre}
     done
   '';
 
diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix
new file mode 100644
index 00000000000..394b2f9da09
--- /dev/null
+++ b/pkgs/development/compilers/scala/2.11.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
+
+stdenv.mkDerivation rec {
+  name = "scala-2.11.8";
+
+  src = fetchurl {
+    url = "http://www.scala-lang.org/files/archive/${name}.tgz";
+    sha256 = "1khs7673wca7gnxz2rxphv6v5k94jkpcarlqznsys9cpknhqdz47";
+  };
+
+  propagatedBuildInputs = [ jre ] ;
+  buildInputs = [ makeWrapper ] ;
+
+  installPhase = ''
+    mkdir -p $out
+    rm "bin/"*.bat
+    mv * $out
+
+    for p in $(ls $out/bin/) ; do
+      wrapProgram $out/bin/$p \
+        --prefix PATH ":" ${coreutils}/bin \
+        --prefix PATH ":" ${gnugrep}/bin \
+        --prefix PATH ":" ${jre}/bin \
+        --set JAVA_HOME ${jre}
+    done
+  '';
+
+  meta = {
+    description = "General purpose programming language";
+    longDescription = ''
+      Scala is a general purpose programming language designed to express
+      common programming patterns in a concise, elegant, and type-safe way.
+      It smoothly integrates features of object-oriented and functional
+      languages, enabling Java and other programmers to be more productive.
+      Code sizes are typically reduced by a factor of two to three when
+      compared to an equivalent Java application.
+    '';
+    homepage = http://www.scala-lang.org/;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
+    branch = "2.11";
+  };
+}
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index bc7da3581de..8e1f8dd4722 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre }:
+{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "scala-2.12.1";
@@ -17,7 +17,11 @@ stdenv.mkDerivation rec {
     mv * $out
 
     for p in $(ls $out/bin/) ; do
-      wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ;
+      wrapProgram $out/bin/$p \
+        --prefix PATH ":" ${coreutils}/bin \
+        --prefix PATH ":" ${gnugrep}/bin \
+        --prefix PATH ":" ${jre}/bin \
+        --set JAVA_HOME ${jre}
     done
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 831be279b67..26dc46ede51 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5379,8 +5379,9 @@ in
 
   scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { };
   scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
-  scala_2_11 = callPackage ../development/compilers/scala { };
-  scala = scala_2_11;
+  scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { };
+  scala_2_12 = callPackage ../development/compilers/scala { };
+  scala = scala_2_12;
 
   scalafmt = callPackage ../development/tools/scalafmt { };
 

From cb6f49a61f9879e3ec652971e44ca3afbc716d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 12 Jan 2017 19:16:54 +0100
Subject: [PATCH 064/727] man-pages: 4.08 -> 4.09

Includes about a dozen new pages.
---
 pkgs/data/documentation/man-pages/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index f739479ac0a..52227e9b2ba 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "man-pages-${version}";
-  version = "4.08";
+  version = "4.09";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "1d32ki8nkwd2xiln619jihqn7s15ydrg7386n4hxq530sys7svic";
+    sha256 = "1740gq9sq28dp5a5sjn1ya7cvrv8mbky6knb7734v8k29a7a0x55";
   };
 
   makeFlags = [ "MANDIR=$(out)/share/man" ];

From ea7a8bf2d990413685ec9ad2e4c4e24dad7aafa5 Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Thu, 12 Jan 2017 18:25:14 +0000
Subject: [PATCH 065/727] ckb: init at 0.2.6

ckb is a driver for Corsair keyboards/mice. It also contains a graphical tool for configuring their LED backlight settings.

The driver is implemented as a userland daemon. A NixOS module is included that runs this as a systemd service.
---
 nixos/modules/hardware/ckb.nix                | 40 +++++++++++++++++
 .../misc/ckb/ckb-animations-location.patch    | 12 ++++++
 pkgs/tools/misc/ckb/default.nix               | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 97 insertions(+)
 create mode 100644 nixos/modules/hardware/ckb.nix
 create mode 100644 pkgs/tools/misc/ckb/ckb-animations-location.patch
 create mode 100644 pkgs/tools/misc/ckb/default.nix

diff --git a/nixos/modules/hardware/ckb.nix b/nixos/modules/hardware/ckb.nix
new file mode 100644
index 00000000000..8429572a882
--- /dev/null
+++ b/nixos/modules/hardware/ckb.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.hardware.ckb;
+
+in
+  {
+    options.hardware.ckb = {
+      enable = mkEnableOption "the Corsair keyboard/mouse driver";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.ckb;
+        defaultText = "pkgs.ckb";
+        description = ''
+          The package implementing the Corsair keyboard/mouse driver.
+        '';
+      };
+    };
+
+    config = mkIf cfg.enable {
+      environment.systemPackages = [ cfg.package ];
+
+      systemd.services.ckb = {
+        description = "Corsair Keyboard Daemon";
+        wantedBy = ["multi-user.target"];
+        script = "${cfg.package}/bin/ckb-daemon";
+        serviceConfig = {
+          Restart = "always";
+          StandardOutput = "syslog";
+        };
+      };
+    };
+
+    meta = {
+      maintainers = with lib.maintainers; [ kierdavis ];
+    };
+  }
diff --git a/pkgs/tools/misc/ckb/ckb-animations-location.patch b/pkgs/tools/misc/ckb/ckb-animations-location.patch
new file mode 100644
index 00000000000..07dcfab86be
--- /dev/null
+++ b/pkgs/tools/misc/ckb/ckb-animations-location.patch
@@ -0,0 +1,12 @@
+diff --git a/src/ckb/animscript.cpp b/src/ckb/animscript.cpp
+index d0b7f46..d7a3459 100644
+--- a/src/ckb/animscript.cpp
++++ b/src/ckb/animscript.cpp
+@@ -30,7 +30,7 @@ QString AnimScript::path(){
+ #ifdef __APPLE__
+     return QDir(QApplication::applicationDirPath() + "/../Resources").absoluteFilePath("ckb-animations");
+ #else
+-    return QDir(QApplication::applicationDirPath()).absoluteFilePath("ckb-animations");
++    return QDir(QApplication::applicationDirPath() + "/../libexec").absoluteFilePath("ckb-animations");
+ #endif
+ }
diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb/default.nix
new file mode 100644
index 00000000000..f2dc5150bbd
--- /dev/null
+++ b/pkgs/tools/misc/ckb/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmakeHook, zlib }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.6";
+  name = "ckb-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ccMSC";
+    repo = "ckb";
+    rev = "v${version}";
+    sha256 = "04h50qdzsbi77mj62jghr52i35vxvmhnvsb7pdfdq95ryry8bnwm";
+  };
+
+  buildInputs = [
+    libudev
+    qtbase
+    zlib
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmakeHook
+  ];
+
+  patches = [
+    ./ckb-animations-location.patch
+  ];
+
+  doCheck = false;
+
+  installPhase = ''
+    install -D --mode 0755 --target-directory $out/bin bin/ckb-daemon bin/ckb
+    install -D --mode 0755 --target-directory $out/libexec/ckb-animations bin/ckb-animations/*
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Driver and configuration tool for Corsair keyboards and mice";
+    homepage = https://github.com/ccMSC/ckb;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ kierdavis ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 679d8037995..3a5143a74da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1267,6 +1267,8 @@ in
 
   cloud-utils = callPackage ../tools/misc/cloud-utils { };
 
+  ckb = qt5.callPackage ../tools/misc/ckb { };
+
   compass = callPackage ../development/tools/compass { };
 
   convmv = callPackage ../tools/misc/convmv { };

From 05bb3fe22e2cfa47a77fa44e278b78e6f21e988f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 12 Jan 2017 20:13:12 +0100
Subject: [PATCH 066/727] avidemux: 2.6.16 -> 2.6.18

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

diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 44b9dca90b6..79e3cfbde1b 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -14,11 +14,11 @@
 }:
 
 let
-  version = "2.6.16";
+  version = "2.6.18";
 
   src = fetchurl {
     url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
-    sha256 = "0jipvpvw871qhhkyykrrrqc9vfbw24v243vzmm8lqifj73h6qvgc";
+    sha256 = "1zmacx8wdhbjc8hpf8hmdmbh2pbkdkcyb23cl3j1mx7vkw06c31l";
   };
 
   common = {

From 90b3648f9c36f4f078ed6d0ff3682fe88ddf663a Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Thu, 12 Jan 2017 20:15:15 +0000
Subject: [PATCH 067/727] i3blocks: search for config in correct system
 directory

The SYSCONFDIR variable used in the Makefile servers two purposes:

1) During buildPhase, it is hardcoded into the executable as one of
   the locations that will be searched for the i3blocks.conf config
   file. We want this set to "/etc", so that "/etc/i3blocks.conf"
   will be automatically loaded if it exists, as specified in the
   manpage.

2) During installPhase, it specifies the location that the sample
   i3blocks.conf should be installed to. We want this to be "$out/etc".

Case 2 was already handled correctly, but case 1 was not. This resulted
in i3blocks instead searching for i3blocks.conf in the default value of
SYSCONFDIR, which is "/usr/local/etc", a directory which generally does
not exist on NixOS. This commit remedies this problem by setting
SYSCONFDIR=/etc during buildPhase.

A minor stylistic fix (correcting a usage of "makeFlags" to "buildFlags"
in the expression) has also been applied in this commit.
---
 pkgs/applications/window-managers/i3/blocks.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix
index c3880b92bdf..496da4232a4 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "c64720057e22cc7cac5e8fcd58fd37e75be3a7d5a3cb8995841a7f18d30c0536";
   };
 
-  makeFlags = "all";
+  buildFlags = "SYSCONFDIR=/etc all";
   installFlags = "PREFIX=\${out} VERSION=${version}";
 
   meta = with stdenv.lib; {

From cb4ebb6749f1256bb014afc3225b0542f5da32b6 Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Thu, 12 Jan 2017 21:04:20 +0000
Subject: [PATCH 068/727] docs: fix a couple of unmatched parentheses

---
 doc/functions.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/functions.xml b/doc/functions.xml
index 70326936a57..f6a0a4352f6 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -35,7 +35,7 @@
     pkgs = import &lt;nixpkgs&gt; {};
     newpkgs = pkgs.overridePackages (self: super: {
       foo = super.foo.override { ... };
-    };
+    });
   in ...</programlisting>
     </para>
 
@@ -96,7 +96,7 @@
   })</programlisting>
       <programlisting>mypkg = pkgs.callPackage ./mypkg.nix {
     mydep = pkgs.mydep.override { ... };
-  })</programlisting>
+  }</programlisting>
     </para>
 
     <para>

From befc29454b6057969ebfc3cbd338c2e55d94114f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 12 Jan 2017 21:23:18 +0000
Subject: [PATCH 069/727] coqPackages.dpdgraph: 0.5 -> 0.6{,.1}

---
 .../coq-modules/dpdgraph/default.nix          | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index 0dec05ebd3f..9dbc3a3f299 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -1,15 +1,27 @@
-{ stdenv, fetchFromGitHub, coq, ocamlPackages }:
+{ stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }:
+
+let param = {
+  "8.6" = {
+    version = "0.6.1";
+    rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663";
+    sha256 = "1jaafkwsb5450378nprjsds1illgdaq60gryi8kspw0i25ykz2c9";
+  };
+  "8.5" = {
+    version = "0.6";
+    rev = "v0.6";
+    sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
+  };
+}."${coq.coq-version}"; in
 
 stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-dpdgraph-0.5";
+  name = "coq${coq.coq-version}-dpdgraph-${param.version}";
   src = fetchFromGitHub {
     owner = "Karmaki";
     repo = "coq-dpdgraph";
-    rev = "227a6a28bf11cf1ea56f359160558965154dd176";
-    sha256 = "1vxf7qq37mnmlclkr394147xvrky3p98ar08c4wndwrp41gfbxhq";
+    inherit (param) rev sha256;
   };
 
-  buildInputs = [ coq ]
+  buildInputs = [ autoreconfHook coq ]
   ++ (with ocamlPackages; [ ocaml findlib ocamlgraph ]);
 
   preInstall = ''

From 71aad4c494838090c3703263b4d4afa9ee965bca Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sun, 25 Dec 2016 02:45:01 +0100
Subject: [PATCH 070/727] xournal: Support gtk backend quartz on darwin

---
 .../applications/graphics/xournal/default.nix | 12 ++-
 .../graphics/xournal/gdk-quartz-backend.patch | 90 +++++++++++++++++++
 2 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/graphics/xournal/gdk-quartz-backend.patch

diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
index 97b418f08c1..38573989266 100644
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@@ -3,6 +3,11 @@
 , libgnomecanvas, libgnomeprint, libgnomeprintui
 , pango, libX11, xproto, zlib, poppler
 , autoconf, automake, libtool, pkgconfig}:
+
+let
+  isGdkQuartzBackend = (gtk2.gdktarget == "quartz");
+in
+
 stdenv.mkDerivation rec {
   version = "0.4.8";
   name = "xournal-" + version;
@@ -21,7 +26,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
 
-  NIX_LDFLAGS = [ "-lX11" "-lz" ];
+  patches = stdenv.lib.optionals isGdkQuartzBackend [
+    ./gdk-quartz-backend.patch
+  ];
+
+  NIX_LDFLAGS = [ "-lz" ]
+    ++ stdenv.lib.optionals (!isGdkQuartzBackend) [ "-lX11" ];
 
   desktopItem = makeDesktopItem {
     name = name;
diff --git a/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch b/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch
new file mode 100644
index 00000000000..d1a42443a88
--- /dev/null
+++ b/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch
@@ -0,0 +1,90 @@
+diff -rup xournal-0.4.8-orig/src/Makefile.am xournal-0.4.8/src/Makefile.am
+--- xournal-0.4.8-orig/src/Makefile.am	2012-07-04 23:12:47.000000000 +0200
++++ xournal-0.4.8/src/Makefile.am	2016-12-25 03:04:00.000000000 +0100
+@@ -31,6 +31,5 @@ if WIN32
+   xournal_LDFLAGS = -mwindows
+   xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz
+ else
+-  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm
++  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz -lm
+ endif
+-
+diff -rup xournal-0.4.8-orig/src/xo-file.c xournal-0.4.8/src/xo-file.c
+--- xournal-0.4.8-orig/src/xo-file.c	2014-06-28 21:52:25.000000000 +0200
++++ xournal-0.4.8/src/xo-file.c	2016-12-25 03:07:19.000000000 +0100
+@@ -31,11 +31,6 @@
+ #include <glib/gstdio.h>
+ #include <poppler/glib/poppler.h>
+ 
+-#ifndef WIN32
+- #include <gdk/gdkx.h>
+- #include <X11/Xlib.h>
+-#endif
+-
+ #include "xournal.h"
+ #include "xo-interface.h"
+ #include "xo-support.h"
+@@ -1275,50 +1270,8 @@ GList *attempt_load_gv_bg(char *filename
+ 
+ struct Background *attempt_screenshot_bg(void)
+ {
+-#ifndef WIN32
+-  struct Background *bg;
+-  GdkPixbuf *pix;
+-  XEvent x_event;
+-  GdkWindow *window;
+-  GdkColormap *cmap;
+-  int x,y,w,h;
+-  Window x_root, x_win;
+-
+-  x_root = gdk_x11_get_default_root_xwindow();
+-  
+-  if (!XGrabButton(GDK_DISPLAY(), AnyButton, AnyModifier, x_root, 
+-      False, ButtonReleaseMask, GrabModeAsync, GrabModeSync, None, None))
+-    return NULL;
+-
+-  XWindowEvent (GDK_DISPLAY(), x_root, ButtonReleaseMask, &x_event);
+-  XUngrabButton(GDK_DISPLAY(), AnyButton, AnyModifier, x_root);
+-
+-  x_win = x_event.xbutton.subwindow;
+-  if (x_win == None) x_win = x_root;
+-
+-  window = gdk_window_foreign_new_for_display(gdk_display_get_default(), x_win);
+-    
+-  gdk_window_get_geometry(window, &x, &y, &w, &h, NULL);
+-  cmap = gdk_drawable_get_colormap(window);
+-  if (cmap == NULL) cmap = gdk_colormap_get_system();
+-  
+-  pix = gdk_pixbuf_get_from_drawable(NULL, window,
+-     cmap, 0, 0, 0, 0, w, h);
+-    
+-  if (pix == NULL) return NULL;
+-  
+-  bg = g_new(struct Background, 1);
+-  bg->type = BG_PIXMAP;
+-  bg->canvas_item = NULL;
+-  bg->pixbuf = pix;
+-  bg->pixbuf_scale = DEFAULT_ZOOM;
+-  bg->filename = new_refstring(NULL);
+-  bg->file_domain = DOMAIN_ATTACH;
+-  return bg;
+-#else
+   // not implemented under WIN32
+   return FALSE;
+-#endif
+ }
+ 
+ /************** pdf annotation ***************/
+diff -rup xournal-0.4.8-orig/src/xo-misc.c xournal-0.4.8/src/xo-misc.c
+--- xournal-0.4.8-orig/src/xo-misc.c	2014-06-28 15:17:44.000000000 +0200
++++ xournal-0.4.8/src/xo-misc.c	2016-12-25 03:05:50.000000000 +0100
+@@ -2288,9 +2288,7 @@ void hide_unimplemented(void)
+   }  
+   
+   /* screenshot feature doesn't work yet in Win32 */
+-#ifdef WIN32
+   gtk_widget_hide(GET_COMPONENT("journalScreenshot"));
+-#endif
+ }  
+ 
+ // toggle fullscreen mode

From da563e5773be82c56d8ad2855f49b299c21aa2d1 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Thu, 12 Jan 2017 23:44:26 +0100
Subject: [PATCH 071/727] Do not trim trailing whitespace in patch files

---
 .editorconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index 969e613536b..7b40ff1ff56 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -22,3 +22,7 @@ indent_size = 2
 [*.{sh,py,pl}]
 indent_style = space
 indent_size = 4
+
+# Match diffs, avoid to trim trailing whitespace
+[*.{diff,patch}]
+trim_trailing_whitespace = false

From 07dfecdc99995f5bcee3fb12c3385673f766aa1a Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 13 Jan 2017 01:23:48 +0100
Subject: [PATCH 072/727] clipster: 2016-12-08 -> 2017-01-12

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

diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index 1425c725206..445b486c851 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation  rec {
   name = "clipster-unstable-${version}";
-  version = "2016-12-08";
+  version = "2017-01-12";
 
   src = fetchFromGitHub {
     owner = "mrichar1";
     repo = "clipster";
-    rev = "7a3511d89dbbb4157118eec15f1e9e6fd0ad1a6b";
-    sha256 = "005akgk1wn3z5vxfjii202zzwz85zydimfgm69ml68imj5vbhkg1";
+    rev = "d66fbb098149bef687f062bfa111a21c9121851f";
+    sha256 = "0yncjfl0822v2b7f9g7a6ihb99g5hd1s8bfpr2r9nqga6m11k90q";
   };
 
   pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);

From ea0f8fbd5306776e3e31b4ee849188bfd67fa11d Mon Sep 17 00:00:00 2001
From: Christopher League <league@contrapunctus.net>
Date: Thu, 12 Jan 2017 23:08:55 -0500
Subject: [PATCH 073/727] yuicompressor: add bin wrapper for jar

yuicompressor is a JavaScript and CSS minifier, distributed as a jar
file. This change uses `makeWrapper` to create a corresponding bin
script, adding `jre` as a dependency.
---
 pkgs/development/tools/yuicompressor/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix
index 1a5485af541..da9b9df3cd4 100644
--- a/pkgs/development/tools/yuicompressor/default.nix
+++ b/pkgs/development/tools/yuicompressor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
   name = "yuicompressor";
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
   };
 
+  buildInputs = [makeWrapper jre];
+
   meta = {
     description = "A JavaScript and CSS minifier";
     maintainers = [ stdenv.lib.maintainers.jwiegley ];
@@ -17,7 +19,9 @@ stdenv.mkDerivation rec {
   };
 
   buildCommand = ''
-    mkdir -p $out/lib
+    mkdir -p $out/{bin,lib}
     ln -s $src $out/lib/yuicompressor.jar
+    makeWrapper ${jre}/bin/java $out/bin/${name} --add-flags \
+     "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor"
   '';
 }

From 80ea1c0631d6ea5cca3340fb04367e68f2c280be Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Thu, 12 Jan 2017 20:18:37 -0500
Subject: [PATCH 074/727] rr: 4.3.0 -> 4.4.0

---
 pkgs/development/tools/analysis/rr/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index 7606705edd8..11ba86724e6 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb }:
 
 stdenv.mkDerivation rec {
-  version = "4.3.0";
+  version = "4.4.0";
   name = "rr-${version}";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "rr";
     rev = version;
-    sha256 = "0hl59g6252zi1j9zng5x5gqlmdwa4gz7mbvz8h3b7z4gnn2q5l6c";
+    sha256 = "1ijzs5lwscg0k5ch1bljiqqh35rzai75xcgghgkjbz86ynmf62rd";
   };
 
   postPatch = ''
@@ -17,7 +17,9 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  buildInputs = [ cmake libpfm zlib python2Packages.python pkgconfig python2Packages.pexpect which procps gdb ];
+  buildInputs = [
+    cmake libpfm zlib python2Packages.python pkgconfig python2Packages.pexpect which procps gdb
+  ];
   cmakeFlags = [
     "-DCMAKE_C_FLAGS_RELEASE:STRING="
     "-DCMAKE_CXX_FLAGS_RELEASE:STRING="

From c4a2bd46685688711cbf5e5605e8fa262728ee70 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 10:14:13 +0000
Subject: [PATCH 075/727] ocamlPackages.topkg: 0.7.8 -> 0.8.1

---
 pkgs/development/ocaml-modules/topkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix
index 23bcc267066..f343eed6b46 100644
--- a/pkgs/development/ocaml-modules/topkg/default.nix
+++ b/pkgs/development/ocaml-modules/topkg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-topkg-${version}";
-  version = "0.7.8";
+  version = "0.8.1";
 
   src = fetchurl {
     url = "http://erratique.ch/software/topkg/releases/topkg-${version}.tbz";
-    sha256 = "029lbmabczpmcgkj53mc20vmpcn3f7rf7xms4xf0nywswfzsash6";
+    sha256 = "18rrh6fmf708z7dd30amljmcgaypj3kk49jrmrj68r4wnw8004j8";
   };
 
   nativeBuildInputs = [ opam ];

From 7ebe29a56c4b5260eabbfd659e57fb04bf6e6cea Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 10:13:37 +0000
Subject: [PATCH 076/727] ocamlPackages.uutf: 0.9.4 -> 1.0.0

---
 .../ocaml-modules/uutf/default.nix            | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix
index a08e0ccbf74..feb197defc3 100644
--- a/pkgs/development/ocaml-modules/uutf/default.nix
+++ b/pkgs/development/ocaml-modules/uutf/default.nix
@@ -1,37 +1,26 @@
-{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner}:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner , topkg, uchar }:
 let
   pname = "uutf";
   webpage = "http://erratique.ch/software/${pname}";
 in
 
-buildOcaml rec {
-  name = pname;
-  version = "0.9.4";
-
-  minimumSupportedOcamlVersion = "4.00.0";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-${pname}-${version}";
+  version = "1.0.0";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "1f71fyawxal42x6g82539bv0ava2smlar6rmxxz1cyq3l0i6fw0k";
+    sha256 = "08i0cw02cxw4mi2rs01v9xi307qshs6fnd1dlqyb52kcxzblpp37";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ];
+  propagatedBuildInputs = [ uchar ];
 
   createFindlibDestdir = true;
 
   unpackCmd = "tar xjf $src";
 
-  buildPhase = ''
-    ocaml pkg/build.ml \
-      native=true \
-      native-dynlink=true \
-      cmdliner=true
-  '';
-
-  installPhase = ''
-    opam-installer --prefix=$out --script ${pname}.install | sh
-    ln -s $out/lib/uutf $out/lib/ocaml/${ocaml.version}/site-lib/
-  '';
+  inherit (topkg) buildPhase installPhase;
 
   meta = with stdenv.lib; {
     description = "Non-blocking streaming Unicode codec for OCaml";

From 8990a6c1162742245d9ec46c6bf5a95343e3fda3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 10:33:02 +0000
Subject: [PATCH 077/727] ocamlPackages.uunf: 0.9.3 -> 2.0.0

---
 .../ocaml-modules/uunf/default.nix            | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix
index 11ff9a36a41..a9c7add6129 100644
--- a/pkgs/development/ocaml-modules/uunf/default.nix
+++ b/pkgs/development/ocaml-modules/uunf/default.nix
@@ -1,33 +1,29 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uutf, cmdliner }:
 let
   pname = "uunf";
   webpage = "http://erratique.ch/software/${pname}";
 in
 
-assert stdenv.lib.versionAtLeast ocaml.version "3.12";
+assert stdenv.lib.versionAtLeast ocaml.version "4.01";
 
 stdenv.mkDerivation rec {
   name = "ocaml-${pname}-${version}";
-  version = "0.9.3";
+  version = "2.0.0";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "16cgjy1m0m61srv1pmlc3gr0y40kd4724clvpagdnz68raz4zmn0";
+    sha256 = "1i132168949vdc8magycgf9mdysf50vvr7zngnjl4vi3zdayq20c";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
+  buildInputs = [ ocaml findlib ocamlbuild opam topkg uutf cmdliner ];
+
+  propagatedBuildInputs = [ uchar ];
 
   createFindlibDestdir = true;
 
   unpackCmd = "tar xjf $src";
 
-  buildPhase = "./pkg/build true false";
-
-  installPhase = ''
-    opam-installer --script --prefix=$out ${pname}.install > install.sh
-    sh install.sh
-    ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
-  '';
+  inherit (topkg) buildPhase installPhase;
 
   meta = with stdenv.lib; {
     description = "An OCaml module for normalizing Unicode text";

From 7565673f718eb2598612bfb9d613f3cdea49b580 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 10:39:58 +0000
Subject: [PATCH 078/727] ocamlPackages.uucp: 1.1.0 -> 2.0.0

---
 .../ocaml-modules/uucp/default.nix            | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix
index 456fc8a1976..db0b29d94c5 100644
--- a/pkgs/development/ocaml-modules/uucp/default.nix
+++ b/pkgs/development/ocaml-modules/uucp/default.nix
@@ -1,36 +1,31 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar }:
 
 let
-  inherit (stdenv.lib) getVersion versionAtLeast;
-
   pname = "uucp";
-  version = "1.1.0";
+  version = "2.0.0";
   webpage = "http://erratique.ch/software/${pname}";
 in
 
-assert versionAtLeast (getVersion ocaml) "4.00";
+assert stdenv.lib.versionAtLeast ocaml.version "4.01";
 
 stdenv.mkDerivation {
 
-  name = "ocaml-${pname}-${version}";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "1vm5f2ppdrnk19j0ppjiqz56qf5bzyk26gs0lz071s7iblk459jz";
+    sha256 = "07m7pfpcf03dqsbvqpq88y9hzic8fighlp4fgbav6n6xla35mk5k";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
+  buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+
+  propagatedBuildInputs = [ uchar ];
 
   createFindlibDestdir = true;
 
   unpackCmd = "tar xjf $src";
 
-  buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
-
-  installPhase = ''
-    opam-installer --script --prefix=$out ${pname}.install | sh
-    ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname}
-  '';
+  inherit (topkg) buildPhase installPhase;
 
   meta = with stdenv.lib; {
     description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database";

From 190cc673109ec9112cf857293982bd8ec561e4f2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 10:55:37 +0000
Subject: [PATCH 079/727] ocamlPackages.uuseg: 0.9.0 -> 1.0.0

---
 .../ocaml-modules/uuseg/default.nix           | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix
index 92777129ca0..d1e95814461 100644
--- a/pkgs/development/ocaml-modules/uuseg/default.nix
+++ b/pkgs/development/ocaml-modules/uuseg/default.nix
@@ -1,39 +1,28 @@
-{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uucp, uutf, cmdliner }:
 
 let
   pname = "uuseg";
   webpage = "http://erratique.ch/software/${pname}";
 in
 
-buildOcaml rec {
+stdenv.mkDerivation rec {
 
-  minimumSupportedOcamlVersion = "4.01";
-
-  name = pname;
-  version = "0.9.0";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
+  version = "1.0.0";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "00n4zi8dyw2yzi4nr2agcrr33b0q4dr9mgnkczipf4c0gm5cm50h";
+    sha256 = "0m5n0kn70w862g5dhfkfvrnmb98z1r02g21ap7l81hy8sn08cbsz";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ];
-  propagatedBuildInputs = [ uucp uutf ];
+  buildInputs = [ ocaml findlib ocamlbuild opam cmdliner topkg uutf ];
+  propagatedBuildInputs = [ uucp uchar ];
 
   createFindlibDestdir = true;
 
   unpackCmd = "tar xjf $src";
 
-  buildPhase = ''
-    ocaml pkg/build.ml \
-      native=true native-dynlink=true \
-      uutf=true cmdliner=true
-  '';
-
-  installPhase = ''
-    opam-installer --script --prefix=$out ${pname}.install | sh
-    ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/${pname}
-  '';
+  inherit (topkg) buildPhase installPhase;
 
   meta = with stdenv.lib; {
     description = "An OCaml library for segmenting Unicode text";

From 221f20413d4efe044f939f0af2c0851c58a2420b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 10:15:09 +0000
Subject: [PATCH 080/727] ocamlPackages.jsonm: 0.9.1 -> 1.0.0

---
 pkgs/development/ocaml-modules/jsonm/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix
index f473527c15c..fb73df808fe 100644
--- a/pkgs/development/ocaml-modules/jsonm/default.nix
+++ b/pkgs/development/ocaml-modules/jsonm/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, uutf }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, uutf }:
 
-let version = "0.9.1"; in
+let version = "1.0.0"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-jsonm-${version}";
+  name = "ocaml${ocaml.version}-jsonm-${version}";
 
   src = fetchurl {
     url = "http://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz";
-    sha256 = "0wszqrmx8iqlwzvs76fjf4sqh15mv20yjrbyhkd348yq8nhdrm1z";
+    sha256 = "1v3ln6d965lplj28snjdqdqablpp1kx8bw2cfx0m6i157mqyln62";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
   propagatedBuildInputs = [ uutf ];
 
   unpackCmd = "tar xjf $src";
 
-  configurePhase = "ocaml setup.ml -configure --prefix $prefix";
-  buildPhase = "ocaml setup.ml -build";
   createFindlibDestdir = true;
-  installPhase = "ocaml setup.ml -install";
+
+  inherit (topkg) buildPhase installPhase;
 
   meta = {
     description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format";

From bf1723a89b6d98ed64a935695b1b7ae39cd11696 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 10:16:35 +0000
Subject: [PATCH 081/727] ocamlPackages.otfm: 0.2.0 -> 0.3.0

---
 .../ocaml-modules/otfm/default.nix            | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix
index 30946da1c0b..5deef60520b 100644
--- a/pkgs/development/ocaml-modules/otfm/default.nix
+++ b/pkgs/development/ocaml-modules/otfm/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uutf }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uutf, result }:
 
 let
-  inherit (stdenv.lib) getVersion versionAtLeast;
-
   pname = "otfm";
-  version = "0.2.0";
+  version = "0.3.0";
   webpage = "http://erratique.ch/software/${pname}";
 in
 
-assert versionAtLeast (getVersion ocaml) "4.01.0";
+assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
 
 stdenv.mkDerivation rec {
 
@@ -16,23 +14,18 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "1wgi9plf98gd7x3b7fzjxds089sivsap97bl1bw2lj73nxwnyb9c";
+    sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
+  buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
 
-  propagatedBuildInputs = [ uutf ];
+  propagatedBuildInputs = [ uutf result ];
 
   createFindlibDestdir = true;
 
   unpackCmd = "tar xjf $src";
 
-  buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
-
-  installPhase = ''
-    opam-installer --script --prefix=$out ${pname}.install | sh
-    ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname}
-  '';
+  inherit (topkg) buildPhase installPhase;
 
   meta = with stdenv.lib; {
     description = "OpenType font decoder for OCaml";

From 110a0fb028438120447e1b1e6f359ca4ee9b398c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 10:17:42 +0000
Subject: [PATCH 082/727] ocamlPackages.markup: 0.7.2 -> 0.7.3

---
 pkgs/development/ocaml-modules/markup/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix
index a177ae240d1..bb973607044 100644
--- a/pkgs/development/ocaml-modules/markup/default.nix
+++ b/pkgs/development/ocaml-modules/markup/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, uutf, lwt }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, lwt }:
 
 stdenv.mkDerivation rec {
-  pname = "ocaml-markup";
-  version = "0.7.2";
-  name = "${pname}-${version}";
+  pname = "markup";
+  version = "0.7.3";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "http://github.com/aantron/markup.ml/archive/${version}.tar.gz";
-    sha256 = "0d3wi22v7h0iqzq8dgl0g4fj2wb67gvmbzdckacifghinrx762k3";
+    sha256 = "03vyv609a60azw8qs7v0kkmy4704hkzw7c3skpzax5krwgwcqfxj";
     };
 
   buildInputs = [ ocaml findlib ocamlbuild ];

From 5dc59fbf383956d60eeae8a101f23984f6fa825c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 10:20:46 +0000
Subject: [PATCH 083/727] ocamlPackages.vg: 0.8.1 -> 0.9.0

---
 pkgs/development/ocaml-modules/vg/default.nix | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index 17bb8eeb464..aa6047c7901 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, ocaml, findlib, opam, gg, uutf, otfm, js_of_ocaml,
+{ stdenv, fetchurl, ocaml, findlib, opam, topkg
+, uchar, result, gg, uutf, otfm, js_of_ocaml,
   pdfBackend ? true, # depends on uutf and otfm
   htmlcBackend ? true # depends on js_of_ocaml
 }:
 
 let
-  inherit (stdenv.lib) getVersion optionals versionAtLeast;
+  inherit (stdenv.lib) optionals versionAtLeast;
 
   pname = "vg";
-  version = "0.8.1";
+  version = "0.9.0";
   webpage = "http://erratique.ch/software/${pname}";
+  sob = b: if b then "true" else "false";
 in
 
-assert versionAtLeast (getVersion ocaml) "4.01.0";
+assert versionAtLeast ocaml.version "4.02.0";
 
 stdenv.mkDerivation rec {
 
@@ -19,12 +21,12 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "1cdcvsr5z8845ndilnrz7p4n6yn4gv2p91z2mgi4vrailcmn5vzd";
+    sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f";
   };
 
-  buildInputs = [ ocaml findlib opam ];
+  buildInputs = [ ocaml findlib opam topkg ];
 
-  propagatedBuildInputs = [ gg ]
+  propagatedBuildInputs = [ uchar result gg ]
                           ++ optionals pdfBackend [ uutf otfm ]
                           ++ optionals htmlcBackend [ js_of_ocaml ];
 
@@ -32,16 +34,12 @@ stdenv.mkDerivation rec {
 
   unpackCmd = "tar xjf $src";
 
-  buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"
-               + (if pdfBackend then " uutf=true otfm=true"
-                                else " uutf=false otfm=false")
-               + (if htmlcBackend then " jsoo=true"
-                                  else " jsoo=false");
+  buildPhase = topkg.buildPhase
+  + " --with-uutf ${sob pdfBackend} --with-otfm ${sob pdfBackend}"
+  + " --with-js_of_ocaml ${sob htmlcBackend}"
+  + " --with-cairo2 false";
 
-  installPhase = ''
-    opam-installer --script --prefix=$out ${pname}.install | sh
-    ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname}
-  '';
+  inherit (topkg) installPhase;
 
   meta = with stdenv.lib; {
     description = "Declarative 2D vector graphics for OCaml";

From 33c2805324061de7658aa959ed6fb2104b76355f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 10:23:03 +0000
Subject: [PATCH 084/727] ocamlPackages.tyxml: 3.6.0 -> 4.0.1

---
 .../ocaml-modules/tyxml/default.nix           | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix
index b8c415b7566..49cc56a1db6 100644
--- a/pkgs/development/ocaml-modules/tyxml/default.nix
+++ b/pkgs/development/ocaml-modules/tyxml/default.nix
@@ -1,14 +1,22 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re }:
+{ stdenv, fetchzip, fetchpatch, ocaml, findlib, ocamlbuild, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re
+}:
+
+assert stdenv.lib.versionAtLeast ocaml.version "4.02";
 
 stdenv.mkDerivation rec {
   pname = "tyxml";
-  version = "3.6.0";
-  name = "${pname}-${version}";
+  version = "4.0.1";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "http://github.com/ocsigen/tyxml/archive/${version}.tar.gz";
-    sha256 = "1rz0f48x8p1m30723rn5v85pp7rd0spr04sd7gzryy99vn3ianga";
-    };
+    sha256 = "1mwkjvl78gvw7pvql5qp64cfjjca6aqsb04999qkllifyicaaq8y";
+  };
+
+  patches = [ (fetchpatch {
+    url = https://github.com/dbuenzli/tyxml/commit/a2bf5ccc0b6e684e7b81274ff19df8d72e2def8d.diff;
+    sha256 = "11sidgiwz3zqw815vlslbfzb456z0lndkh425mlmvnmck4d2v2i3";
+  })];
 
   buildInputs = [ ocaml findlib ocamlbuild camlp4 ];
 

From 7a31f234e1d154ba624aef7df9cda7ad419cc189 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 10:23:48 +0000
Subject: [PATCH 085/727] js_of_ocaml: 2.7 -> 2.8.3

---
 .../tools/ocaml/js_of_ocaml/default.nix       | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index 33a7fe52c39..d88dd9eb896 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -1,16 +1,26 @@
-{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4,
- cmdliner, tyxml, reactivedata, cppo, which, base64}:
+{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4
+, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar
+}:
+
+let version = if stdenv.lib.versionAtLeast ocaml.version "4.02"
+  then "2.8.3" else "2.7";
+in
 
 stdenv.mkDerivation {
-  name = "js_of_ocaml-2.7";
+  name = "js_of_ocaml-${version}";
   src = fetchurl {
-    url = https://github.com/ocsigen/js_of_ocaml/archive/2.7.tar.gz;
-    sha256 = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj";
-    };
+    url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz";
+    sha256 = {
+      "2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj";
+      "2.8.3" = "0xrw215w5saqdcdd9ipjhvg8f982z63znsds9ih445s3jr49szm7";
+    }."${version}";
+  };
 
   buildInputs = [ ocaml findlib menhir ocsigen_deriving
-                 cmdliner tyxml reactivedata cppo which base64];
-  propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ];
+                 cmdliner reactivedata cppo which base64 ]
+  ++ stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.02") tyxml;
+  propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ]
+  ++ stdenv.lib.optional (version == "2.8.3") uchar;
 
   patches = [ ./Makefile.conf.diff ];
 

From 67a245356dd9388ea5495546d33e3d1312730408 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 10:25:14 +0000
Subject: [PATCH 086/727] ocsigen-server: 2.7 -> 2.8

---
 pkgs/development/ocaml-modules/ocsigen-server/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index e5c5439fda3..5c424cfe059 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -9,11 +9,11 @@ let mkpath = p: n:
 in
 
 stdenv.mkDerivation {
-  name = "ocsigenserver-2.7";
+  name = "ocsigenserver-2.8";
 
   src = fetchurl {
-    url = https://github.com/ocsigen/ocsigenserver/archive/2.7.tar.gz;
-    sha256 = "0gv9nchsx9z74hh46gn7bd0053j4694fhxriannf13sqh2qpg901";
+    url = https://github.com/ocsigen/ocsigenserver/archive/2.8.tar.gz;
+    sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
   };
 
   buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt

From 6636dfa845f0290cc8fb7c8c59e9e33d12ef2269 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 11:13:32 +0000
Subject: [PATCH 087/727] ocamlPackages.ocb-stubblr: init at 0.1.0

---
 .../ocaml-modules/ocb-stubblr/default.nix     | 26 +++++++++++++++++++
 .../ocb-stubblr/pkg-config.patch              | 25 ++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 3 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocb-stubblr/default.nix
 create mode 100644 pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch

diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix
new file mode 100644
index 00000000000..bb4b24cec67
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, opam, topkg, astring }:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ocb-stubblr-0.1.0";
+  src = fetchzip {
+    url = http://github.com/pqwy/ocb-stubblr/releases/download/v0.1.0/ocb-stubblr-0.1.0.tbz;
+    name = "src.tar.bz";
+    sha256 = "0hpds1lkq4j8wgslv7hnirgfrjmqi36h5rarpw9mwf24gfp5ays2";
+  };
+
+  patches = [ ./pkg-config.patch ];
+
+  buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+
+  propagatedBuildInputs = [ astring ];
+
+  inherit (topkg) buildPhase installPhase;
+
+  meta = {
+    description = "OCamlbuild plugin for C stubs";
+    homepage = https://github.com/pqwy/ocb-stubblr;
+    license = stdenv.lib.licenses.isc;
+    inherit (ocaml.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch b/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch
new file mode 100644
index 00000000000..d86b3f8da9f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch
@@ -0,0 +1,25 @@
+--- a/src/ocb_stubblr.ml	1970-01-01 00:00:01.000000000 +0000
++++ b/src/ocb_stubblr.ml	2016-12-04 11:10:10.000000000 +0000
+@@ -31,20 +31,9 @@
+ 
+   (* XXX Would be nice to move pkg-config results to a build artefact. *)
+ 
+-  let opam_prefix =
+-    let cmd = "opam config var prefix" in
+-    lazy ( try run_and_read cmd with Failure _ ->
+-            error_msgf "error running opam")
+-
+-  let var = "PKG_CONFIG_PATH"
+-
+-  let path () =
+-    Lazy.force opam_prefix / "lib" / "pkgconfig" ::
+-      (try [Sys.getenv var] with Not_found -> []) |> String.concat ~sep:":"
+-
+   let run ~flags package =
+-    let cmd = strf "%s=%s pkg-config %s %s 2>/dev/null"
+-              var (path ()) package (String.concat ~sep:" " flags) in
++    let cmd = strf "pkg-config %s %s 2>/dev/null"
++              package (String.concat ~sep:" " flags) in
+     try `Res (run_and_read cmd) with Failure _ -> `Nonexistent
+ end
+ 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 91e349eede9..583cbab0b34 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -414,6 +414,8 @@ let
       minimal = false;
     };
 
+    ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { };
+
     ocurl = callPackage ../development/ocaml-modules/ocurl { };
 
     pa_ounit = callPackage ../development/ocaml-modules/pa_ounit { };

From 5d309cc8345b1346ea67be2805b751b107f6617f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Dec 2016 10:55:13 +0000
Subject: [PATCH 088/727] ocamlPackages.notty: 0.1.1 -> 0.1.1a (53f5946)

---
 .../ocaml-modules/notty/default.nix           | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix
index 3178789c399..b967728d048 100644
--- a/pkgs/development/ocaml-modules/notty/default.nix
+++ b/pkgs/development/ocaml-modules/notty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildOcaml, fetchFromGitHub, findlib
+{ stdenv, buildOcaml, fetchpatch, fetchFromGitHub, findlib, topkg, opam, ocb-stubblr
 , result, uucp, uuseg, uutf
 , lwt     ? null }:
 
@@ -7,7 +7,7 @@ with stdenv.lib;
 let withLwt = lwt != null; in
 
 buildOcaml rec {
-  version = "0.1.1";
+  version = "0.1.1a";
   name = "notty";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -15,18 +15,23 @@ buildOcaml rec {
   src = fetchFromGitHub {
     owner  = "pqwy";
     repo   = "notty";
-    rev    = "v${version}";
-    sha256 = "0bw3bq8z2y1rhc20zn13s78sazywyzpg8nmyjch33p7ypxfglf01";
+    rev    = "53f5946653490fce980dc5d8cadf8b122cff4f19";
+    sha256 = "0qmwb1hrp04py2i5spy0yd6c5jqxyss3wzvlkgxyl9r07kvsx6xf";
   };
 
-  buildInputs = [ findlib ];
+  patches = [ (fetchpatch {
+    url = https://github.com/dbuenzli/notty/commit/b0e12930acc26d030a74d6d63d622ae220b12c92.patch;
+    sha256 = "0pklplbnjbsjriqj73pc8fsadg404px534w7zknz2617zb44m6x6";
+  })];
+
+  buildInputs = [ findlib opam topkg ocb-stubblr ];
   propagatedBuildInputs = [ result uucp uuseg uutf ] ++
-                          optional withLwt [ lwt ];
+                          optional withLwt lwt;
 
-  configureFlags = [ "--enable-unix" ] ++
-                   (if withLwt then ["--enable-lwt"] else ["--disable-lwt"]);
+  buildPhase = topkg.buildPhase
+  + " --with-lwt ${if withLwt then "true" else "false"}";
 
-  configurePhase = "./configure --prefix $out $configureFlags";
+  inherit (topkg) installPhase;
 
   meta = {
     inherit (src.meta) homepage;

From 6b546f254340f16dae30bfc00e3b6ca2373e96d1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 10 Dec 2016 09:58:33 +0000
Subject: [PATCH 089/727] ocamlPackages.reactivedata: 0.2 -> 0.2.1

---
 .../ocaml-modules/reactivedata/default.nix    | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix
index cd64e6578c1..828a3fb6068 100644
--- a/pkgs/development/ocaml-modules/reactivedata/default.nix
+++ b/pkgs/development/ocaml-modules/reactivedata/default.nix
@@ -1,28 +1,20 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, camlp4, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, opam }:
 
-let
-  ocamlVersion = stdenv.lib.getVersion ocaml;
-in
-
-assert stdenv.lib.versionAtLeast ocamlVersion "3.11";
+assert stdenv.lib.versionAtLeast ocaml.version "3.11";
 
 stdenv.mkDerivation {
-  name = "ocaml-reactiveData-0.2";
+  name = "ocaml${ocaml.version}-reactiveData-0.2.1";
   src = fetchurl {
-    url = https://github.com/ocsigen/reactiveData/archive/0.2.tar.gz;
-    sha256 = "0rskcxnyjn8sxqnncdm6rh9wm99nha5m5sc83fywgzs64xfl43fq";
+    url = https://github.com/ocsigen/reactiveData/archive/0.2.1.tar.gz;
+    sha256 = "0wcs0z50nia1cpk8mh6i5qbc6sff9cc8x7s7q1q89d7m73bnv4vf";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam camlp4 ];
+  buildInputs = [ ocaml findlib ocamlbuild opam ];
   propagatedBuildInputs = [ocaml_react];
 
   buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
 
-  installPhase = ''
-    opam-installer --script --prefix=$out reactiveData.install > install.sh
-    sed -i s!lib/reactiveData!lib/ocaml/${ocamlVersion}/site-lib/reactiveData! install.sh
-    sh install.sh
-  '';
+  installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
 
   meta = with stdenv.lib; {
     description = "An OCaml module for functional reactive programming (FRP) based on React";

From 6f48e4d99dfa02f58f9ef4c201358cadd32b0443 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 10 Dec 2016 09:59:01 +0000
Subject: [PATCH 090/727] ocamlPackages.eliom: 5.0.0 -> 6.0.0

---
 .../ocaml-modules/eliom/default.nix           | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 293faad2301..f3c9f4cecef 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,37 +1,31 @@
-{ buildOcaml, stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
+{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
   js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml,
   ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
-  reactivedata, opam, ppx_tools, ppx_deriving, camlp4}:
+  reactivedata, opam, ppx_tools, ppx_deriving, findlib
+}:
 
-let ocamlVersion = (stdenv.lib.getVersion ocaml); in
-buildOcaml rec
+assert stdenv.lib.versionAtLeast ocaml.version "4.02";
+
+stdenv.mkDerivation rec
 {
   pname = "eliom";
-  version = "5.0.0";
+  version = "6.0.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
-    sha256 = "1g9wq2qpn0sgzyb6iq0h9afq5p68il4h8pc7jppqsislk87m09k7";
+    sha256 = "1yaqi5fdzvi2ga412chw5rk3533a3xamwfmias1crk793d43cmpc";
   };
 
   patches = [ ./camlp4.patch ];
 
-  buildInputs = [ which ocaml_optcomp opam ppx_tools camlp4 ];
+  buildInputs = [ ocaml which findlib ocaml_optcomp opam ppx_tools ];
 
   propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
                             ocsigen_deriving js_of_ocaml
                             calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ];
 
-  preConfigure = stdenv.lib.optionalString (!stdenv.lib.versionAtLeast ocamlVersion "4.02") ''
-      export PPX=false
-    '';
-
-  installPhase =
-  ''opam-installer --script --prefix=$out ${pname}.install > install.sh
-    sh install.sh
-    ln -s $out/lib/${pname} $out/lib/ocaml/${ocamlVersion}/site-lib/
-  '';
+  installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
 
   createFindlibDestdir = true;
 

From 34d78bc31267001158921b154d1d32ca1bf4462f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 10 Dec 2016 21:30:18 +0000
Subject: [PATCH 091/727] ocamlPackages.markup: 0.7.3 -> 0.7.4

---
 pkgs/development/ocaml-modules/markup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix
index bb973607044..3ee84d0d1b1 100644
--- a/pkgs/development/ocaml-modules/markup/default.nix
+++ b/pkgs/development/ocaml-modules/markup/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "markup";
-  version = "0.7.3";
+  version = "0.7.4";
   name = "ocaml${ocaml.version}-${pname}-${version}";
 
   src = fetchzip {
     url = "http://github.com/aantron/markup.ml/archive/${version}.tar.gz";
-    sha256 = "03vyv609a60azw8qs7v0kkmy4704hkzw7c3skpzax5krwgwcqfxj";
+    sha256 = "1hchlqzsy9pax91gcdmxzakfm22fbvhxzwyzpvz8fqkx4372zs37";
     };
 
   buildInputs = [ ocaml findlib ocamlbuild ];

From 720c8e457c82e082a49013fd06dcd7c5033e7db6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 18 Dec 2016 13:12:52 +0000
Subject: [PATCH 092/727] jackline: fix after uutf and notty updates

---
 .../instant-messengers/jackline/default.nix   |   2 +
 .../instant-messengers/jackline/uchar.patch   | 302 ++++++++++++++++++
 2 files changed, 304 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/jackline/uchar.patch

diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index bbeb6c4aa4a..25d71fa8859 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "0h7wdsic4v6ys130w61zvxm5s2vc7y574hn7zby12rq88lhhrjh7";
   };
 
+  patches = [ ./uchar.patch ];
+
   buildInputs = with ocamlPackages; [
                   ocaml ocamlbuild findlib topkg ppx_sexp_conv
                   erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring
diff --git a/pkgs/applications/networking/instant-messengers/jackline/uchar.patch b/pkgs/applications/networking/instant-messengers/jackline/uchar.patch
new file mode 100644
index 00000000000..f861135090e
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/jackline/uchar.patch
@@ -0,0 +1,302 @@
+diff --git a/_tags b/_tags
+index 88318d9..b433ee8 100644
+--- a/_tags
++++ b/_tags
+@@ -7,9 +7,11 @@ true : package(sexplib astring)
+ 
+ <src/xconfig.ml>: package(otr ppx_sexp_conv)
+ <src/utils.ml>: package(uutf)
++<src/muc.ml>: package(uchar)
++<src/contact.mli>: package(uchar)
+ <src/persistency.ml>: package(lwt nocrypto)
+ <src/xjid.{ml,mli}>: package(ppx_sexp_conv erm_xmpp)
+-<src/user.{ml,mli}>: package(ppx_sexp_conv otr hex ptime ptime.clock.os)
++<src/user.{ml,mli}>: package(uchar ppx_sexp_conv otr hex ptime ptime.clock.os)
+ <src/xmpp_callbacks.ml>: package(erm_xmpp lwt tls tls.lwt ptime)
+ <src/xmpp_connection.ml>: package(erm_xmpp lwt tls tls.lwt)
+ 
+@@ -18,6 +20,6 @@ true : package(sexplib astring)
+ <cli/cli_input.ml>: package(notty lwt erm_xmpp otr)
+ <cli/cli_commands.ml>: package(lwt otr erm_xmpp)
+ <cli/cli_config.ml>: package(lwt nocrypto otr notty tls.lwt x509)
+-<cli/cli_state.ml>: package(hex lwt nocrypto erm_xmpp tls.lwt x509)
++<cli/cli_state.ml>: package(uchar hex lwt nocrypto erm_xmpp tls.lwt x509)
+ 
+ <bin/jackline.{ml,byte,native}>: package(erm_xmpp hex lwt notty notty.lwt nocrypto otr sexplib tls tls.lwt ptime ptime.clock.os)
+diff --git a/cli/cli_config.ml b/cli/cli_config.ml
+index 618d655..dac6e68 100644
+--- a/cli/cli_config.ml
++++ b/cli/cli_config.ml
+@@ -34,7 +34,7 @@ let rewrap term above below (prefix, inp, inp2) (width, _) =
+     let height = if col mod width = 0 then succ h else h in
+     (succ (col mod width), height)
+   in
+-  Notty_lwt.Term.cursor term (Some (col, row))
++  Notty_lwt.Term.cursor term (Some (col - 1, row - 1))
+ 
+ let read_line ?(above = []) ?(prefix = "") ?default ?(below = []) term =
+   let rec go (pre, post) =
+@@ -56,8 +56,8 @@ let read_line ?(above = []) ?(prefix = "") ?default ?(below = []) term =
+       | `Unhandled k ->
+         match k with
+         | `Key (`Enter, []) -> Lwt.return (char_list_to_str (pre @ post))
+-        | `Key (`Uchar 0x43, [`Ctrl]) -> Lwt.fail (Invalid_argument "Ctrl-c")
+-        | `Key (`Uchar 0x44, [`Ctrl]) -> Lwt.fail (Invalid_argument "Ctrl-d")
++        | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x43 -> Lwt.fail (Invalid_argument "Ctrl-c")
++        | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x44 -> Lwt.fail (Invalid_argument "Ctrl-d")
+         | _ -> go (pre, post)
+   in
+   let pre = Utils.option [] str_to_char_list default in
+@@ -180,7 +180,7 @@ let configure term () =
+     let pw = "Password: " in
+     let chars = match password with
+       | None -> I.string A.empty "will be asked at startup"
+-      | Some _ -> I.uchar A.empty 0x2605 5 1
++      | Some _ -> I.uchar A.empty (Uchar.of_int 0x2605) 5 1
+     in
+     above @ [I.(string A.empty pw <|> chars)]
+   in
+diff --git a/cli/cli_input.ml b/cli/cli_input.ml
+index 34b4288..07488f2 100644
+--- a/cli/cli_input.ml
++++ b/cli/cli_input.ml
+@@ -314,19 +314,19 @@ let read_terminal term mvar input_mvar () =
+           | `Key (`Arrow `Up, []) -> p (fun s -> ok (history s Up)) >>= fun () -> loop ()
+           | `Key (`Arrow `Down, []) -> p (fun s -> ok (history s Down)) >>= fun () -> loop ()
+ 
+-          | `Key (`Uchar 0x44, [`Ctrl]) (* C-d *) -> p (fun s -> Lwt.return (`Quit s))
++          | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x44 (* C-d *) -> p (fun s -> Lwt.return (`Quit s))
+ 
+           (* UI navigation and toggles *)
+           | `Key (`Page `Up, []) -> p (fun s -> ok (navigate_buddy_list s Up)) >>= fun () -> loop ()
+           | `Key (`Page `Down, []) -> p (fun s -> ok (navigate_buddy_list s Down)) >>= fun () -> loop ()
+ 
+           | `Key (`Page `Up, [`Ctrl]) -> p (fun s -> ok (navigate_message_buffer s Up)) >>= fun () -> loop ()
+-          | `Key (`Uchar 0x50, [`Ctrl]) (* C-p *) -> p (fun s -> ok (navigate_message_buffer s Up)) >>= fun () -> loop ()
++          | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x50 (* C-p *) -> p (fun s -> ok (navigate_message_buffer s Up)) >>= fun () -> loop ()
+           | `Key (`Page `Down, [`Ctrl]) -> p (fun s -> ok (navigate_message_buffer s Down)) >>= fun () -> loop ()
+-          | `Key (`Uchar 0x4E, [`Ctrl]) (* C-n *) -> p (fun s -> ok (navigate_message_buffer s Down)) >>= fun () -> loop ()
++          | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x4E (* C-n *) -> p (fun s -> ok (navigate_message_buffer s Down)) >>= fun () -> loop ()
+ 
+-          | `Key (`Uchar 0x58, [`Ctrl]) (* C-x *) -> p (fun s -> ok (activate_contact s s.last_active_contact)) >>= fun () -> loop ()
+-          | `Key (`Uchar 0x51, [`Ctrl]) (* C-q *) ->
++          | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x58 (* C-x *) -> p (fun s -> ok (activate_contact s s.last_active_contact)) >>= fun () -> loop ()
++          | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x51 (* C-q *) ->
+             let handle s =
+               let s = match List.rev s.notifications with
+                 | x::_ -> activate_contact s x
+diff --git a/cli/cli_state.ml b/cli/cli_state.ml
+index 5603cfe..ee320ce 100644
+--- a/cli/cli_state.ml
++++ b/cli/cli_state.ml
+@@ -24,7 +24,7 @@ type connect_v =
+   | Reconnect
+   | Presence of (User.presence * string option * int option)
+ 
+-type input = int list * int list
++type input = Uchar.t list * Uchar.t list
+ 
+ type state = {
+   (* set only initially *)
+diff --git a/cli/cli_support.ml b/cli/cli_support.ml
+index 1c54df6..8275c38 100644
+--- a/cli/cli_support.ml
++++ b/cli/cli_support.ml
+@@ -4,17 +4,17 @@ open Notty
+ module Char = struct
+   let hdash a w =
+     if !Utils.unicode then
+-      I.uchar a 0x2500 w 1
++      I.uchar a (Uchar.of_int 0x2500) w 1
+     else
+       I.char a '-' w 1
+   and vdash a h =
+     if !Utils.unicode then
+-      I.uchar a 0x2502 1 h
++      I.uchar a (Uchar.of_int 0x2502) 1 h
+     else
+       I.char a '|' 1 h
+   and star a w =
+     if !Utils.unicode then
+-      I.uchar a 0x2605 w 1
++      I.uchar a (Uchar.of_int 0x2605) w 1
+     else
+       I.char a '*' w 1
+ end
+@@ -186,8 +186,8 @@ let v_center left right width =
+   and rw = I.width right
+   in
+   match rw, lw >= width with
+-  | 0, true -> (I.hcrop (lw - width + 1) 0 left, width)
+-  | 0, false -> (left, succ lw)
++  | 0, true -> (I.hcrop (lw - width + 1) 0 left, width - 1)
++  | 0, false -> (left, lw)
+   | _, _ ->
+     if lw + rw >= width then
+       let leftw = min (max (width - rw) (width / 2)) lw in
+@@ -195,11 +195,11 @@ let v_center left right width =
+       let l = I.hcrop (lw - leftw) 0 left
+       and r = I.hcrop 0 (rw - rightw) right
+       in
+-      (I.(l <|> r), succ leftw)
++      (I.(l <|> r), leftw)
+     else
+-      (I.(left <|> right), succ lw)
++      (I.(left <|> right), lw)
+ 
+-let str_to_char_list str : int list =
++let str_to_char_list str : Uchar.t list =
+   let open Uutf in
+   List.rev (String.fold_utf_8 (fun acc _ -> function `Uchar i -> i :: acc | `Malformed _ -> acc) [] str)
+ 
+@@ -236,22 +236,26 @@ let readline_input = function
+   | k -> `Unhandled k
+ 
+ let emacs_bindings = function
+-  | `Key (`Uchar 0x41, [`Ctrl]) (* C-a *) -> `Ok (fun (pre, post) -> ([], pre @ post))
+-  | `Key (`Uchar 0x45, [`Ctrl]) (* C-e *) -> `Ok (fun (pre, post) -> (pre @ post, []))
++  | `Key (`Uchar u, [`Ctrl]) as k ->
++    begin match Uchar.to_int u with
++    | 0x41 (* C-a *) -> `Ok (fun (pre, post) -> ([], pre @ post))
++    | 0x45 (* C-e *) -> `Ok (fun (pre, post) -> (pre @ post, []))
+ 
+-  | `Key (`Uchar 0x4b, [`Ctrl]) (* C-k *) -> `Ok (fun (pre, _) -> (pre, []))
+-  | `Key (`Uchar 0x55, [`Ctrl]) (* C-u *) -> `Ok (fun (_, post) -> ([], post))
++    | 0x4b (* C-k *) -> `Ok (fun (pre, _) -> (pre, []))
++    | 0x55 (* C-u *) -> `Ok (fun (_, post) -> ([], post))
+ 
+-  | `Key (`Uchar 0x46, [`Ctrl]) (* C-f *) ->
++    | 0x46 (* C-f *) ->
+     `Ok (fun (pre, post) ->
+         match post with
+         | [] -> (pre, post)
+         | hd::tl -> (pre @ [hd], tl))
+-  | `Key (`Uchar 0x42, [`Ctrl]) (* C-b *) ->
++    | 0x42 (* C-b *) ->
+     `Ok (fun (pre, post) ->
+         match List.rev pre with
+         | [] -> ([], post)
+         | hd::tl -> (List.rev tl, hd :: post))
++    | _ -> `Unhandled k
++    end
+ 
+   | `Key (`Arrow `Left, [`Ctrl]) ->
+     `Ok (fun (pre, post) ->
+diff --git a/src/contact.mli b/src/contact.mli
+index 6926296..d6c795b 100644
+--- a/src/contact.mli
++++ b/src/contact.mli
+@@ -8,7 +8,7 @@ val bare : contact -> Xjid.bare_jid
+ val preserve_messages : contact -> bool
+ val expanded : contact -> bool
+ val messages : contact -> User.message list
+-val input_buffer : contact -> (int list * int list)
++val input_buffer : contact -> (Uchar.t list * Uchar.t list)
+ 
+ val readline_history : contact -> string list
+ val add_readline_history : contact -> string -> contact
+@@ -18,7 +18,7 @@ val set_history_position : contact -> int -> contact
+ val received : contact -> string -> contact
+ 
+ val expand : contact -> contact
+-val set_input_buffer : contact -> (int list * int list) -> contact
++val set_input_buffer : contact -> (Uchar.t list * Uchar.t list) -> contact
+ val set_preserve_messages : contact -> bool -> contact
+ 
+ val reset : contact -> contact
+diff --git a/src/muc.ml b/src/muc.ml
+index 1c98037..3293541 100644
+--- a/src/muc.ml
++++ b/src/muc.ml
+@@ -132,7 +132,7 @@ type groupchat = {
+   expand : bool ;
+   preserve_messages : bool ;
+   message_history : User.message list ; (* persistent if preserve_messages *)
+-  input_buffer : (int list * int list) ;
++  input_buffer : (Uchar.t list * Uchar.t list) ;
+   readline_history : string list ;
+   history_position : int ;
+   autojoin : bool ;
+diff --git a/src/user.ml b/src/user.ml
+index d039278..42a8c47 100644
+--- a/src/user.ml
++++ b/src/user.ml
+@@ -229,7 +229,7 @@ type user = {
+   properties        : property list ;
+   preserve_messages : bool ;
+   message_history   : message list ; (* persistent if preserve_messages is true *)
+-  input_buffer: (int list * int list) ; (* not persistent *)
++  input_buffer: (Uchar.t list * Uchar.t list) ; (* not persistent *)
+   readline_history  : string list ; (* not persistent *)
+   history_position  : int ; (* not persistent *)
+   otr_fingerprints  : fingerprint list ;
+diff --git a/src/user.mli b/src/user.mli
+index 52b503d..5ce41be 100644
+--- a/src/user.mli
++++ b/src/user.mli
+@@ -118,7 +118,7 @@ type user = {
+   properties        : property list ;
+   preserve_messages : bool ;
+   message_history   : message list ; (* persistent if preserve_messages is true *)
+-  input_buffer: (int list * int list) ; (* not persistent *)
++  input_buffer: (Uchar.t list * Uchar.t list) ; (* not persistent *)
+   readline_history  : string list ; (* not persistent *)
+   history_position  : int ;
+   otr_fingerprints  : fingerprint list ;
+diff --git a/src/utils.ml b/src/utils.ml
+index 0b4a3a7..cd9cb10 100644
+--- a/src/utils.ml
++++ b/src/utils.ml
+@@ -30,31 +30,33 @@ let validate_utf8 txt =
+   let rec loop d buf = match Uutf.decode d with
+     | `Await -> Buffer.contents buf
+     | `End -> Buffer.contents buf
+-    | `Malformed _ -> if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD; loop d buf
+-    | `Uchar 0x000A -> (* newline *) Uutf.Buffer.add_utf_8 buf 0x000A ; loop d buf
+-    | `Uchar 0x0009 -> (* tab -> 4 spaces *) Uutf.Buffer.add_utf_8 buf 0x0020 ; Uutf.Buffer.add_utf_8 buf 0x0020 ; Uutf.Buffer.add_utf_8 buf 0x0020 ; Uutf.Buffer.add_utf_8 buf 0x0020 ; loop d buf
+-    | `Uchar 0x007F (* DEL *)
++    | `Malformed _ -> if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD); loop d buf
++    | `Uchar u ->
++      match Uchar.to_int u with
++      | 0x000A -> (* newline *) Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x000A) ; loop d buf
++      | 0x0009 -> (* tab -> 4 spaces *) Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; loop d buf
++      | 0x007F (* DEL *)
+     (* See https://en.wikipedia.org/wiki/Unicode_control_characters / https://en.wikipedia.org/wiki/Bi-directional_text *)
+-    | `Uchar 0x200E | `Uchar 0x200F (* left-to-right / right-to-left *)
+-    | `Uchar 0x202A | `Uchar 0x202D (* left-to-right embedding / override *)
+-    | `Uchar 0x202B | `Uchar 0x202E (* right-to-left embedding / override *)
+-    | `Uchar 0x202C  (* pop directional format *)
+-    | `Uchar 0x2066 | `Uchar 0x2067 (* l-t-r isolate r-t-l isolate *)
+-    | `Uchar 0x2068 | `Uchar 0x2069 (* first strong isolate / pop directional isolate *)
+-    | `Uchar 0x2028 | `Uchar 0x2029 (* line separator / page separator *) ->
+-      if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD ; loop d buf
+-    | `Uchar x when x < 0x20 ->
++      | 0x200E | 0x200F (* left-to-right / right-to-left *)
++      | 0x202A | 0x202D (* left-to-right embedding / override *)
++      | 0x202B | 0x202E (* right-to-left embedding / override *)
++      | 0x202C  (* pop directional format *)
++      | 0x2066 | 0x2067 (* l-t-r isolate r-t-l isolate *)
++      | 0x2068 | 0x2069 (* first strong isolate / pop directional isolate *)
++      | 0x2028 | 0x2029 (* line separator / page separator *) ->
++      if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD) ; loop d buf
++      | x when x < 0x20 ->
+       (* other control characters *)
+-      if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD ; loop d buf
+-    | `Uchar x when x >= 0x0080 && x <= 0x009F ->
++      if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD) ; loop d buf
++      | x when x >= 0x0080 && x <= 0x009F ->
+       (* ctrl chars used in conjunction with ISO 8859 character sets (C0/C1) *)
+-      if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD ; loop d buf
++      if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD) ; loop d buf
+ 
+-    | `Uchar x ->
++      | x ->
+       let c = if !unicode then x else if x > 0xff then 0x3f else x in
+-      Uutf.Buffer.add_utf_8 buf c ; loop d buf
++      Uutf.Buffer.add_utf_8 buf (Uchar.of_int c) ; loop d buf
+   in
+-  let nln = `Readline 0x000A in
++  let nln = `Readline (Uchar.of_int 0x000A) in
+   loop (Uutf.decoder ~nln ~encoding:`UTF_8 (`String txt)) (Buffer.create (String.length txt))
+ 
+ let version = "%%VERSION_NUM%%"

From 10303e9e47525389334222a441010edebe972513 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 20 Dec 2016 18:26:49 +0100
Subject: [PATCH 093/727] services.logstash: update example and default filter

---
 nixos/modules/services/logging/logstash.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index 62f6e187ea0..d9b37039255 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -77,7 +77,7 @@ in
 
       inputConfig = mkOption {
         type = types.lines;
-        default = ''stdin { type => "example" }'';
+        default = ''generator { }'';
         description = "Logstash input configuration.";
         example = ''
           # Read from journal
@@ -90,7 +90,7 @@ in
 
       filterConfig = mkOption {
         type = types.lines;
-        default = ''noop {}'';
+        default = "";
         description = "logstash filter configuration.";
         example = ''
           if [type] == "syslog" {
@@ -108,11 +108,11 @@ in
 
       outputConfig = mkOption {
         type = types.lines;
-        default = ''stdout { debug => true debug_format => "json"}'';
+        default = ''stdout { codec => rubydebug }'';
         description = "Logstash output configuration.";
         example = ''
-          redis { host => "localhost" data_type => "list" key => "logstash" codec => json }
-          elasticsearch { embedded => true }
+          redis { host => ["localhost"] data_type => "list" key => "logstash" codec => json }
+          elasticsearch { }
         '';
       };
 

From e9c6cf02e6886bfc91f3bb866184e95054199ff1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 20 Dec 2016 18:27:29 +0100
Subject: [PATCH 094/727] services.logstash: rename address to listenAddress

---
 nixos/modules/rename.nix                    | 1 +
 nixos/modules/services/logging/logstash.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index a89ce2c743d..41af40965c6 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -18,6 +18,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index d9b37039255..c9477b9e3ab 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -63,7 +63,7 @@ in
         description = "Enable the logstash web interface.";
       };
 
-      address = mkOption {
+      listenAddress = mkOption {
         type = types.str;
         default = "0.0.0.0";
         description = "Address on which to start webserver.";
@@ -147,7 +147,7 @@ in
               ${cfg.outputConfig}
             }
           ''} " +
-          ops cfg.enableWeb "-- web -a ${cfg.address} -p ${cfg.port}";
+          ops cfg.enableWeb "-- web -a ${cfg.listenAddress} -p ${cfg.port}";
       };
     };
   };

From b91fa0f47765b05c11bad9b4327e9cd8389a87ef Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 13 Jan 2017 09:51:04 +0000
Subject: [PATCH 095/727] syncthing: remove runtime dependency on go

The hack used here is shamelessly stolen from buildGoPackage. If it is
going to be applied to more expressions, it may make sense to factor it
out so it can be shared.
---
 pkgs/applications/networking/syncthing/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 8e568798df8..48a348b699d 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,4 +1,10 @@
 { stdenv, lib, fetchFromGitHub, go, pkgs }:
+let
+  removeExpr = ref: ''
+    sed -i "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \
+  '';
+
+in
 
 stdenv.mkDerivation rec {
   version = "0.14.18";
@@ -42,6 +48,10 @@ stdenv.mkDerivation rec {
                --replace /usr/bin/syncthing $out/bin/syncthing
   '';
 
+  preFixup = ''
+    find $out/bin -type f -exec ${removeExpr go} '{}' '+'
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://www.syncthing.net/;
     description = "Open Source Continuous File Synchronization";

From 96b69689500e96364abe35fdd6ed324eee5e462f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 13 Jan 2017 11:34:21 +0100
Subject: [PATCH 096/727] nix: 1.11.5 -> 1.11.6

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 6 +++---
 pkgs/tools/package-management/nix/default.nix        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index ddc624a77de..d73d67ef472 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,5 +1,5 @@
 {
-  x86_64-linux = "/nix/store/m8z91vpfxyszhjpq4wl8m1zwlqik4fkn-nix-1.11.5";
-  i686-linux = "/nix/store/vk71likl32igqg6apqsj52ln3vhkq1pa-nix-1.11.5";
-  x86_64-darwin = "/nix/store/qfwm0b5qkr8v8gsv9dh2z3arky9p1myg-nix-1.11.5";
+  x86_64-linux = "/nix/store/qdkzm17csr24snk247a1s0c47ikq5sl6-nix-1.11.6";
+  i686-linux = "/nix/store/hiwp53747lxlniqy5wpbql5izjrs8z0z-nix-1.11.6";
+  x86_64-darwin = "/nix/store/hca2hqcvwncf23hiqyqgwbsdy8vvl9xv-nix-1.11.6";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 5bfb0b45c1b..069eab421ec 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -103,10 +103,10 @@ in rec {
   nix = nixStable;
 
   nixStable = common rec {
-    name = "nix-1.11.5";
+    name = "nix-1.11.6";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "272361d091c735b0e80627fa23fb7c600957472301dd7e54d237069452f3addb";
+      sha256 = "e729d55a9276756108a56bc1cbe2e182ee2e4be2b59b1c77d5f0e3edd879b2a3";
     };
   };
 

From e2be232c65432d8e543be80b1ba67756c389ab10 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 13 Jan 2017 14:01:03 +0100
Subject: [PATCH 097/727] perlPackages.CompressRawBzip2: 2.064 -> 2.070

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1587cee7430..3e3bc8f3b45 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2094,11 +2094,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  CompressRawBzip2 = buildPerlPackage {
-    name = "Compress-Raw-Bzip2-2.064";
+  CompressRawBzip2 = buildPerlPackage rec {
+    name = "Compress-Raw-Bzip2-2.070";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.064.tar.gz;
-      sha256 = "0aqbggr9yf4hn21a9fra111rlmva3w8f3mqvbchl5l86knkbkwy3";
+      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+      sha256 = "0rmwpqhnhw5n11gm9mbxrxnardm0jfy7568ln9zw21bq3d7dsmn8";
     };
 
     # Don't build a private copy of bzip2.

From 74846b2c717e9fdf3f04ec6109b0411b092dfdd9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 13 Jan 2017 14:13:56 +0100
Subject: [PATCH 098/727] prometheus-blackbox-exporter: 0.3.0 -> 0.4.0

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

diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 00292afb8ce..1eaef1010d3 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "blackbox_exporter-${version}";
-  version = "0.3.0";
+  version = "0.4.0";
   rev = version;
 
   goPackagePath = "github.com/prometheus/blackbox_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "prometheus";
     repo = "blackbox_exporter";
-    sha256 = "0imn7ggxl5zqp8i4i8pnsipacx28dirm1mdmmxxbxc5aal3b656m";
+    sha256 = "1wx3lbhg8ljq6ryl1yji0fkrl6hcsda9i5cw042nhqy29q0ymqsh";
   };
 
   meta = with stdenv.lib; {

From a6cd5cdc15bc4cf549c256315ab99917929f14a3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 13 Jan 2017 14:14:51 +0100
Subject: [PATCH 099/727] prometheus-cli: remove due to pkg being obsolete

---
 pkgs/servers/monitoring/prometheus/cli.nix    | 26 -------------------
 .../monitoring/prometheus/cli_deps.nix        | 11 --------
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 38 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/cli.nix
 delete mode 100644 pkgs/servers/monitoring/prometheus/cli_deps.nix

diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix
deleted file mode 100644
index 39bd3f12e95..00000000000
--- a/pkgs/servers/monitoring/prometheus/cli.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  name = "prometheus_cli-${version}";
-  version = "0.3.0";
-  rev = version;
-
-  goPackagePath = "github.com/prometheus/prometheus_cli";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "prometheus";
-    repo = "prometheus_cli";
-    sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn";
-  };
-
-  goDeps = ./cli_deps.nix;
-
-  meta = with stdenv.lib; {
-    description = "Command line tool for querying the Prometheus HTTP API";
-    homepage = https://github.com/prometheus/prometheus_cli;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/servers/monitoring/prometheus/cli_deps.nix b/pkgs/servers/monitoring/prometheus/cli_deps.nix
deleted file mode 100644
index 192b6917bf0..00000000000
--- a/pkgs/servers/monitoring/prometheus/cli_deps.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/prometheus/client_golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_golang";
-      rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864";
-      sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna";
-    };
-  }
-]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26dc46ede51..e0f8be8f8d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10530,7 +10530,6 @@ in
   prometheus = callPackage ../servers/monitoring/prometheus { };
   prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
   prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
-  prometheus-cli = callPackage ../servers/monitoring/prometheus/cli.nix { };
   prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
   prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
   prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };

From 0ef8b69d12d1ab1574568f5660b44feba1f44179 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 19 Dec 2016 08:10:47 -0800
Subject: [PATCH 100/727] top-level: Modernize stdenv.overrides giving it self
 and super

Document breaking change in 17.03 release notes
---
 nixos/doc/manual/release-notes/rl-1703.xml |  8 +++++
 pkgs/stdenv/darwin/default.nix             | 32 ++++++++---------
 pkgs/stdenv/generic/default.nix            |  2 +-
 pkgs/stdenv/linux/default.nix              | 41 +++++++++++-----------
 pkgs/stdenv/native/default.nix             |  4 +--
 pkgs/stdenv/nix/default.nix                |  2 +-
 pkgs/top-level/stage.nix                   |  2 +-
 7 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index d8b0ae01e33..6997155d94d 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -28,6 +28,14 @@ has the following highlights: </para>
 following incompatible changes:</para>
 
 <itemizedlist>
+  <listitem>
+    <para>
+      <literal>stdenv.overrides</literal> is now expected to take <literal>self</literal>
+      and <literal>super</literal> arguments. See <literal>lib.trivial.extends</literal>
+      for what those parameters represent.
+    </para>
+  </listitem>
+
   <listitem>
     <para>
       <literal>gnome</literal> alias has been removed along with
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index b9044f25cd7..0ff583e6ebb 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -54,7 +54,7 @@ in rec {
   };
 
   stageFun = step: last: {shell             ? "${bootstrapTools}/bin/sh",
-                          overrides         ? (pkgs: {}),
+                          overrides         ? (self: super: {}),
                           extraPreHook      ? "",
                           extraBuildInputs,
                           allowedRequisites ? null}:
@@ -96,7 +96,7 @@ in rec {
         extraSandboxProfile  = binShClosure + libSystemProfile;
 
         extraAttrs = { inherit platform; parent = last; };
-        overrides  = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
+        overrides  = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
       };
 
       thisPkgs = allPackages {
@@ -107,8 +107,8 @@ in rec {
     in { stdenv = thisStdenv; pkgs = thisPkgs; };
 
   stage0 = stageFun 0 null {
-    overrides = orig: with stage0; rec {
-      darwin = orig.darwin // {
+    overrides = self: super: with stage0; rec {
+      darwin = super.darwin // {
         Libsystem = stdenv.mkDerivation {
           name = "bootstrap-Libsystem";
           buildCommand = ''
@@ -145,7 +145,7 @@ in rec {
     extraBuildInputs = [];
   };
 
-  persistent0 = _: {};
+  persistent0 = _: _: {};
 
   stage1 = with stage0; stageFun 1 stage0 {
     extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
@@ -157,14 +157,14 @@ in rec {
     overrides = persistent0;
   };
 
-  persistent1 = orig: with stage1.pkgs; {
+  persistent1 = self: super: with stage1.pkgs; {
     inherit
       zlib patchutils m4 scons flex perl bison unifdef unzip openssl icu python
       libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
       openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
       findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils;
 
-    darwin = orig.darwin // {
+    darwin = super.darwin // {
       inherit (darwin)
         dyld Libsystem xnu configd libdispatch libclosure launchd;
     };
@@ -185,7 +185,7 @@ in rec {
     overrides = persistent1;
   };
 
-  persistent2 = orig: with stage2.pkgs; {
+  persistent2 = self: super: with stage2.pkgs; {
     inherit
       patchutils m4 scons flex perl bison unifdef unzip openssl python
       gettext sharutils libarchive pkg-config groff bash subversion
@@ -193,7 +193,7 @@ in rec {
       findfreetype libssh curl cmake autoconf automake libtool cpio
       libcxx libcxxabi;
 
-    darwin = orig.darwin // {
+    darwin = super.darwin // {
       inherit (darwin)
         dyld Libsystem xnu configd libdispatch libclosure launchd libiconv locale;
     };
@@ -221,19 +221,19 @@ in rec {
     overrides = persistent2;
   };
 
-  persistent3 = orig: with stage3.pkgs; {
+  persistent3 = self: super: with stage3.pkgs; {
     inherit
       gnumake gzip gnused bzip2 gawk ed xz patch bash
       libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep
       coreutils findutils diffutils patchutils;
 
     llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; };
-    in orig.llvmPackages // {
+    in super.llvmPackages // {
       llvm = llvmOverride;
       clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; };
     };
 
-    darwin = orig.darwin // {
+    darwin = super.darwin // {
       inherit (darwin) dyld Libsystem libiconv locale;
     };
   };
@@ -247,17 +247,17 @@ in rec {
     overrides = persistent3;
   };
 
-  persistent4 = orig: with stage4.pkgs; {
+  persistent4 = self: super: with stage4.pkgs; {
     inherit
       gnumake gzip gnused bzip2 gawk ed xz patch bash
       libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep
       coreutils findutils diffutils patchutils binutils binutils-raw;
 
-    llvmPackages = orig.llvmPackages // {
+    llvmPackages = super.llvmPackages // {
       inherit (llvmPackages) llvm clang-unwrapped;
     };
 
-    darwin = orig.darwin // {
+    darwin = super.darwin // {
       inherit (darwin) dyld Libsystem cctools libiconv;
     };
   };
@@ -307,7 +307,7 @@ in rec {
       dyld Libsystem CF cctools libiconv locale
     ]);
 
-    overrides = orig: persistent4 orig // {
+    overrides = self: super: persistent4 self super // {
       clang = cc;
       inherit cc;
     };
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index bd35970e0d1..32e0d894818 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -1,7 +1,7 @@
 let lib = import ../../../lib; in lib.makeOverridable (
 
 { system, name ? "stdenv", preHook ? "", initialPath, cc, shell
-, allowedRequisites ? null, extraAttrs ? {}, overrides ? (pkgs: {}), config
+, allowedRequisites ? null, extraAttrs ? {}, overrides ? (self: super: {}), config
 
 , # The `fetchurl' to use for downloading curl and its dependencies
   # (see all-packages.nix).
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 9900fc6dd3d..708f0ec3b6d 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -44,7 +44,7 @@ rec {
   # the bootstrap.  In all stages, we build an stdenv and the package
   # set that can be built with that stdenv.
   stageFun =
-    {gccPlain, glibc, binutils, coreutils, gnugrep, name, overrides ? (pkgs: {}), extraBuildInputs ? []}:
+    {gccPlain, glibc, binutils, coreutils, gnugrep, name, overrides ? (self: super: {}), extraBuildInputs ? []}:
 
     let
 
@@ -87,7 +87,7 @@ rec {
           # /usr/include directory.
           inherit glibc;
         };
-        overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
+        overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
       };
 
       thisPkgs = allPackages {
@@ -109,13 +109,13 @@ rec {
     gnugrep = null;
     name = null;
 
-    overrides = pkgs: {
+    overrides = self: super: {
       # The Glibc include directory cannot have the same prefix as the
       # GCC include directory, since GCC gets confused otherwise (it
       # will search the Glibc headers before the GCC headers).  So
       # create a dummy Glibc here, which will be used in the stdenv of
       # stage1.
-      glibc = stage0.stdenv.mkDerivation {
+      glibc = self.stdenv.mkDerivation {
         name = "bootstrap-glibc";
         buildCommand = ''
           mkdir -p $out
@@ -146,8 +146,8 @@ rec {
     name = "bootstrap-gcc-wrapper";
 
     # Rebuild binutils to use from stage2 onwards.
-    overrides = pkgs: {
-      binutils = pkgs.binutils.override { gold = false; };
+    overrides = self: super: {
+      binutils = super.binutils.override { gold = false; };
       inherit (stage0.pkgs) glibc;
 
       # A threaded perl build needs glibc/libpthread_nonshared.a,
@@ -155,7 +155,7 @@ rec {
       # This is not an issue for the final stdenv, because this perl
       # won't be included in the final stdenv and won't be exported to
       # top-level pkgs as an override either.
-      perl = pkgs.perl.override { enableThreading = false; };
+      perl = super.perl.override { enableThreading = false; };
     };
   };
 
@@ -170,7 +170,7 @@ rec {
     gnugrep = bootstrapTools;
     name = "bootstrap-gcc-wrapper";
 
-    overrides = pkgs: {
+    overrides = self: super: {
       inherit (stage1.pkgs) perl binutils paxctl gnum4 bison;
       # This also contains the full, dynamically linked, final Glibc.
     };
@@ -187,16 +187,16 @@ rec {
     gnugrep = bootstrapTools;
     name = "bootstrap-gcc-wrapper";
 
-    overrides = pkgs: rec {
+    overrides = self: super: rec {
       inherit (stage2.pkgs) binutils glibc perl patchelf linuxHeaders gnum4 bison;
       # Link GCC statically against GMP etc.  This makes sense because
       # these builds of the libraries are only used by GCC, so it
       # reduces the size of the stdenv closure.
-      gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
-      mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
-      libmpc = pkgs.libmpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
-      isl_0_14 = pkgs.isl_0_14.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
-      gccPlain = pkgs.gcc.cc.override {
+      gmp = super.gmp.override { stdenv = self.makeStaticLibraries self.stdenv; };
+      mpfr = super.mpfr.override { stdenv = self.makeStaticLibraries self.stdenv; };
+      libmpc = super.libmpc.override { stdenv = self.makeStaticLibraries self.stdenv; };
+      isl_0_14 = super.isl_0_14.override { stdenv = self.makeStaticLibraries self.stdenv; };
+      gccPlain = super.gcc.cc.override {
         isl = isl_0_14;
       };
     };
@@ -212,7 +212,7 @@ rec {
     coreutils = bootstrapTools;
     name = "";
 
-    overrides = pkgs: {
+    overrides = self: super: {
       # Zlib has to be inherited and not rebuilt in this stage,
       # because gcc (since JAR support) already depends on zlib, and
       # then if we already have a zlib we want to use that for the
@@ -223,12 +223,11 @@ rec {
         nativeTools = false;
         nativeLibc = false;
         isGNU = true;
-        cc = stage4.stdenv.cc.cc;
-        libc = stage4.pkgs.glibc;
-        inherit (stage4.pkgs) binutils coreutils gnugrep;
+        cc = self.stdenv.cc.cc;
+        libc = self.glibc;
+        inherit (self) stdenv binutils coreutils gnugrep;
         name = "";
-        stdenv = stage4.stdenv;
-        shell = stage4.pkgs.bash + "/bin/bash";
+        shell = self.bash + "/bin/bash";
       };
     };
     extraBuildInputs = [ stage3.pkgs.patchelf stage3.pkgs.xz ];
@@ -278,7 +277,7 @@ rec {
       ];
       */
 
-    overrides = pkgs: {
+    overrides = self: super: {
       gcc = cc;
 
       inherit (stage4.pkgs)
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 8396bd0cb01..5a2d2c96559 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -77,7 +77,7 @@ rec {
   # A function that builds a "native" stdenv (one that uses tools in
   # /usr etc.).
   makeStdenv =
-    { cc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }:
+    { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }) }:
 
     import ../generic {
       preHook =
@@ -142,7 +142,7 @@ rec {
   stdenvBoot2 = makeStdenv {
     inherit cc fetchurl;
     extraPath = [ stdenvBoot1Pkgs.xz ];
-    overrides = pkgs: { inherit (stdenvBoot1Pkgs) xz; };
+    overrides = self: super: { inherit (stdenvBoot1Pkgs) xz; };
   };
 
 
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index e58972e5c8a..21ee29ad5af 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -29,7 +29,7 @@ import ../generic rec {
 
   fetchurlBoot = stdenv.fetchurlBoot;
 
-  overrides = pkgs_: {
+  overrides = self: super: {
     inherit cc;
     inherit (cc) binutils;
     inherit (pkgs)
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 1d6305151ca..7c8860bf4e9 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -67,7 +67,7 @@ let
   # crossStdenv adapter.
   stdenvOverrides = self: super:
     lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides)
-      (super.stdenv.overrides super);
+      (super.stdenv.overrides self super);
 
   # Allow packages to be overridden globally via the `packageOverrides'
   # configuration option, which must be a function that takes `pkgs'

From 3cbc64d5bb9f3f2a386409e87b924a35ddcd16e8 Mon Sep 17 00:00:00 2001
From: Maarten Hoogendoorn <maarten@moretea.nl>
Date: Fri, 13 Jan 2017 14:22:21 +0100
Subject: [PATCH 101/727] minikube: 0.13.1 -> 0.15.0

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

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 2fe9db26765..bf6085273d4 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -4,12 +4,12 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if stdenv.isLinux
-             then "17r8w4lvj7fhh7qppi9z5i2fpqqry4s61zjr9zmsbybc5flnsw2j"
-             else "0jf0kd1mm35qcf0ydr5yyzfq6qi8ifxchvpjsydb1gm1kikp5g3p";
+             then "1g6k3va84nm2h9z2ywbbkc8jabgkarqlf8wv1sp2p6s6hw7hi5h3"
+             else "0jpwyvgpl34n07chcyd7ldvk3jq3rx72cp8yf0bh7gnzr5lcnxnc";
 in
 stdenv.mkDerivation rec {
   pname = "minikube";
-  version = "0.13.1";
+  version = "0.15.0";
   name = "${pname}-${version}";
 
   src = fetchurl {

From af299d94ebc383b391dc58f165f40e8b4e25897a Mon Sep 17 00:00:00 2001
From: Maarten Hoogendoorn <maarten@moretea.nl>
Date: Fri, 13 Jan 2017 14:25:07 +0100
Subject: [PATCH 102/727] minikube: disable shell autocompletion; causes
 impurities.

Apparently the the generation of auto completion files depends on a
network connection. My `nix-build --pure` failed because of this.
Disabled autocompletion for now, given that minikube prints out lots of
documentaton if you provide partial commands.
---
 pkgs/applications/networking/cluster/minikube/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index bf6085273d4..cd1ace993d6 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -30,9 +30,6 @@ stdenv.mkDerivation rec {
   installPhase = ''
     cp $src $out/bin/${pname}
     chmod +x $out/bin/${pname}
-
-    mkdir -p $out/share/bash-completion/completions/
-    HOME=$(pwd) $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube
   '';
 
   meta = with stdenv.lib; {

From 32f991f0948c15df474addf977dc6a579a5efc4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Birger=20J=2E=20Nord=C3=B8lum?= <birgerjn@gmail.com>
Date: Fri, 13 Jan 2017 17:04:47 +0100
Subject: [PATCH 103/727] i3blocks: specify supported platforms

---
 pkgs/applications/window-managers/i3/blocks.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix
index 496da4232a4..6040e7f8fae 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/vivien/i3blocks;
     license = licenses.gpl3;
     maintainers = [ "MindTooth" ];
-    platforms = platforms.all;
+    platforms = freebsd ++ linux ++ netbsd;
   };
 }

From 15d36c1f0e1b649f24e0ace1bb4461d5f05d9e1c Mon Sep 17 00:00:00 2001
From: Niclas Thall <niclas.thall@gmail.com>
Date: Fri, 13 Jan 2017 17:26:26 +0100
Subject: [PATCH 104/727] spotify: 1.0.45 -> 1.0.47 (#21856)

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 1f8924cd03e..9e310d6e4e4 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux";
 
 let
   # Please update the stable branch!
-  version = "1.0.45.186.g3b5036d6-95";
+  version = "1.0.47.13.gd8e05b1f-47";
 
   deps = [
     alsaLib
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "0fpvz1mzyva1sypg4gjmrv0clckb0c3xwjfcxnb8gvkxx9vm56p1";
+      sha256 = "0079vq2nw07795jyqrjv68sc0vqjy6abjh6jjd5cg3hqlxdf4ckz";
     };
 
   buildInputs = [ dpkg makeWrapper ];

From bc2e81f6102e9f16fab845434db3e78100c86823 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 13 Jan 2017 19:09:28 +0100
Subject: [PATCH 105/727] i3blocks: fix platforms

---
 pkgs/applications/window-managers/i3/blocks.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix
index 6040e7f8fae..00de6b87453 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/vivien/i3blocks;
     license = licenses.gpl3;
     maintainers = [ "MindTooth" ];
-    platforms = freebsd ++ linux ++ netbsd;
+    platforms = with platforms; freebsd ++ linux;
   };
 }

From a652099c46ceffe4b578e49a9870dedee6232a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 13 Jan 2017 19:05:10 +0100
Subject: [PATCH 106/727] fetchurl: change to grep -E to fix #8561

Close #21861.
---
 pkgs/build-support/fetchurl/write-mirror-list.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchurl/write-mirror-list.sh b/pkgs/build-support/fetchurl/write-mirror-list.sh
index 55508742dd3..2dabd2e722b 100644
--- a/pkgs/build-support/fetchurl/write-mirror-list.sh
+++ b/pkgs/build-support/fetchurl/write-mirror-list.sh
@@ -1,4 +1,4 @@
 source $stdenv/setup
 
 # !!! this is kinda hacky.
-set | grep '^[a-zA-Z]\+=.*://' > $out
+set | grep -E '^[a-zA-Z]+=.*://' > $out

From 3e197f7d81130defacfe5bdad71ca5ebe63324ff Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 16 Dec 2016 05:22:02 -0800
Subject: [PATCH 107/727] top-level: Normalize stdenv booting

Introduce new abstraction, `stdenv/booter.nix` for composing bootstraping
stages, and use it everywhere for consistency. See that file for more doc.

Stdenvs besides Linux and Darwin are completely refactored to utilize this.
Those two, due to their size and complexity, are minimally edited for
easier reviewing.

No hashes should be changed.
---
 pkgs/stdenv/booter.nix                      |  65 +++++++++++
 pkgs/stdenv/cross/default.nix               |  55 +++++----
 pkgs/stdenv/custom/default.nix              |  24 ++--
 pkgs/stdenv/darwin/default.nix              |  62 ++++++-----
 pkgs/stdenv/darwin/make-bootstrap-tools.nix |   4 +-
 pkgs/stdenv/default.nix                     |  78 ++++++-------
 pkgs/stdenv/freebsd/default.nix             | 117 ++++++++++++--------
 pkgs/stdenv/linux/default.nix               |  73 ++++++------
 pkgs/stdenv/native/default.nix              |  82 +++++++-------
 pkgs/stdenv/nix/default.nix                 |  76 +++++++------
 pkgs/top-level/default.nix                  |  23 ++--
 pkgs/top-level/stage.nix                    |   2 +-
 12 files changed, 391 insertions(+), 270 deletions(-)
 create mode 100644 pkgs/stdenv/booter.nix

diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix
new file mode 100644
index 00000000000..b1e1e898aa3
--- /dev/null
+++ b/pkgs/stdenv/booter.nix
@@ -0,0 +1,65 @@
+# This file defines a single function for booting a package set from a list of
+# stages. The exact mechanics of that function are defined below; here I
+# (@Ericson2314) wish to describe the purpose of the abstraction.
+#
+# The first goal is consistency across stdenvs. Regardless of what this function
+# does, by making every stdenv use it for bootstrapping we ensure that they all
+# work in a similar way. [Before this abstraction, each stdenv was its own
+# special snowflake due to different authors writing in different times.]
+#
+# The second goal is consistency across each stdenv's stage functions. By
+# writing each stage it terms of the previous stage, commonalities between them
+# are more easily observable. [Before, there usually was a big attribute set
+# with each stage, and stages would access the previous stage by name.]
+#
+# The third goal is composition. Because each stage is written in terms of the
+# previous, the list can be reordered or, more practically, extended with new
+# stages. The latter is used for cross compiling and custom
+# stdenvs. Additionally, certain options should by default apply only to the
+# last stage, whatever it may be. By delaying the creation of stage package sets
+# until the final fold, we prevent these options from inhibiting composition.
+#
+# The fourth and final goal is debugging. Normal packages should only source
+# their dependencies from the current stage. But for the sake of debugging, it
+# is nice that all packages still remain accessible. We make sure previous
+# stages are kept around with a `stdenv.__bootPackges` attribute referring the
+# previous stage. It is idiomatic that attributes prefixed with `__` come with
+# special restrictions and should not be used under normal circumstances.
+{ lib, allPackages }:
+
+# Type:
+#   [ pkgset -> (args to stage/default.nix) or ({ __raw = true; } // pkgs) ]
+#   -> pkgset
+#
+# In english: This takes a list of function from the previous stage pkgset and
+# returns the final pkgset. Each of those functions returns, if `__raw` is
+# undefined or false, args for this stage's pkgset (the most complex and
+# important arg is the stdenv), or, if `__raw = true`, simply this stage's
+# pkgset itself.
+#
+# The list takes stages in order, so the final stage is last in the list. In
+# other words, this does a foldr not foldl.
+stageFuns: let
+
+  # Take the list and disallow custom overrides in all but the final stage,
+  # and allow it in the final flag. Only defaults this boolean field if it
+  # isn't already set.
+  withAllowCustomOverrides = lib.lists.imap
+    (index: stageFun: prevStage:
+      { allowCustomOverrides = index == 1; } # first element, 1-indexed
+      // (stageFun prevStage))
+    (lib.lists.reverseList stageFuns);
+
+  # Adds the stdenv to the arguments, and sticks in it the previous stage for
+  # debugging purposes.
+  folder = stageFun: finalSoFar: let
+    args = stageFun finalSoFar;
+    stdenv = args.stdenv // {
+      # For debugging
+      __bootPackages = finalSoFar;
+    };
+    args' = args // { inherit stdenv; };
+  in
+    (if args.__raw or false then lib.id else allPackages) args';
+
+in lib.lists.fold folder {} withAllowCustomOverrides
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 10e2a766356..728424c0a7a 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -1,35 +1,48 @@
-{ lib, allPackages
+{ lib
 , system, platform, crossSystem, config
 }:
 
-rec {
-  vanillaStdenv = (import ../. {
-    inherit lib allPackages system platform;
+let
+  bootStages = import ../. {
+    inherit lib system platform;
     crossSystem = null;
     # Ignore custom stdenvs when cross compiling for compatability
     config = builtins.removeAttrs config [ "replaceStdenv" ];
-  }) // {
-    # Needed elsewhere as a hacky way to pass the target
-    cross = crossSystem;
   };
 
-  # For now, this is just used to build the native stdenv. Eventually, it should
-  # be used to build compilers and other such tools targeting the cross
+in bootStages ++ [
+
+  # Build Packages.
+  #
+  # For now, this is just used to build the native stdenv. Eventually, it
+  # should be used to build compilers and other such tools targeting the cross
   # platform. Then, `forceNativeDrv` can be removed.
-  buildPackages = allPackages {
+  (vanillaPackages: {
     inherit system platform crossSystem config;
     # It's OK to change the built-time dependencies
     allowCustomOverrides = true;
-    stdenv = vanillaStdenv;
-  };
+    stdenv = vanillaPackages.stdenv // {
+      # Needed elsewhere as a hacky way to pass the target
+      cross = crossSystem;
+    };
+  })
 
-  stdenvCross = buildPackages.makeStdenvCross
-    buildPackages.stdenv crossSystem
-    buildPackages.binutilsCross buildPackages.gccCrossStageFinal;
+  # Run packages
+  (buildPackages: {
+    inherit system platform crossSystem config;
+    stdenv = if crossSystem.useiOSCross or false
+      then let
+          inherit (buildPackages.darwin.ios-cross {
+              prefix = crossSystem.config;
+              inherit (crossSystem) arch;
+              simulator = crossSystem.isiPhoneSimulator or false; })
+            cc binutils;
+        in buildPackages.makeStdenvCross
+          buildPackages.stdenv crossSystem
+          binutils cc
+      else buildPackages.makeStdenvCross
+        buildPackages.stdenv crossSystem
+        buildPackages.binutilsCross buildPackages.gccCrossStageFinal;
+  })
 
-  stdenvCrossiOS = let
-    inherit (buildPackages.darwin.ios-cross { prefix = crossSystem.config; inherit (crossSystem) arch; simulator = crossSystem.isiPhoneSimulator or false; }) cc binutils;
-  in buildPackages.makeStdenvCross
-    buildPackages.stdenv crossSystem
-    binutils cc;
-}
+]
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix
index 188d0027773..59a6e871cfd 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/pkgs/stdenv/custom/default.nix
@@ -1,22 +1,22 @@
-{ lib, allPackages
+{ lib
 , system, platform, crossSystem, config
 }:
 
 assert crossSystem == null;
 
-rec {
-  vanillaStdenv = import ../. {
-    inherit lib allPackages system platform crossSystem;
+let
+  bootStages = import ../. {
+    inherit lib system platform crossSystem;
     # Remove config.replaceStdenv to ensure termination.
     config = builtins.removeAttrs config [ "replaceStdenv" ];
   };
 
-  buildPackages = allPackages {
-    inherit system platform crossSystem config;
-    # It's OK to change the built-time dependencies
-    allowCustomOverrides = true;
-    stdenv = vanillaStdenv;
-  };
+in bootStages ++ [
 
-  stdenvCustom = config.replaceStdenv { pkgs = buildPackages; };
-}
+  # Additional stage, built using custom stdenv
+  (vanillaPackages: {
+    inherit system platform crossSystem config;
+    stdenv = config.replaceStdenv { pkgs = vanillaPackages; };
+  })
+
+]
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 0ff583e6ebb..9c860bfb0f9 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -1,4 +1,4 @@
-{ lib, allPackages
+{ lib
 , system, platform, crossSystem, config
 
 # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
@@ -22,8 +22,6 @@ let
     (import "${./standard-sandbox.sb}")
   '';
 in rec {
-  inherit allPackages;
-
   commonPreHook = ''
     export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
     export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
@@ -99,12 +97,10 @@ in rec {
         overrides  = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
       };
 
-      thisPkgs = allPackages {
-        inherit system platform crossSystem config;
-        allowCustomOverrides = false;
-        stdenv = thisStdenv;
-      };
-    in { stdenv = thisStdenv; pkgs = thisPkgs; };
+    in {
+      inherit system platform crossSystem config;
+      stdenv = thisStdenv;
+    };
 
   stage0 = stageFun 0 null {
     overrides = self: super: with stage0; rec {
@@ -145,19 +141,19 @@ in rec {
     extraBuildInputs = [];
   };
 
-  persistent0 = _: _: {};
+  persistent0 = _: _: _: {};
 
-  stage1 = with stage0; stageFun 1 stage0 {
+  stage1 = prevStage: with prevStage; stageFun 1 prevStage {
     extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
     extraBuildInputs = [ pkgs.libcxx ];
 
     allowedRequisites =
       [ bootstrapTools ] ++ (with pkgs; [ libcxx libcxxabi ]) ++ [ pkgs.darwin.Libsystem ];
 
-    overrides = persistent0;
+    overrides = persistent0 prevStage;
   };
 
-  persistent1 = self: super: with stage1.pkgs; {
+  persistent1 = prevStage: self: super: with prevStage; {
     inherit
       zlib patchutils m4 scons flex perl bison unifdef unzip openssl icu python
       libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
@@ -170,7 +166,7 @@ in rec {
     };
   };
 
-  stage2 = with stage1; stageFun 2 stage1 {
+  stage2 = prevStage: with prevStage; stageFun 2 prevStage {
     extraPreHook = ''
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
@@ -182,10 +178,10 @@ in rec {
       (with pkgs; [ xz.bin xz.out libcxx libcxxabi icu.out ]) ++
       (with pkgs.darwin; [ dyld Libsystem CF locale ]);
 
-    overrides = persistent1;
+    overrides = persistent1 prevStage;
   };
 
-  persistent2 = self: super: with stage2.pkgs; {
+  persistent2 = prevStage: self: super: with prevStage; {
     inherit
       patchutils m4 scons flex perl bison unifdef unzip openssl python
       gettext sharutils libarchive pkg-config groff bash subversion
@@ -199,7 +195,7 @@ in rec {
     };
   };
 
-  stage3 = with stage2; stageFun 3 stage2 {
+  stage3 = prevStage: with prevStage; stageFun 3 prevStage {
     shell = "${pkgs.bash}/bin/bash";
 
     # We have a valid shell here (this one has no bootstrap-tools runtime deps) so stageFun
@@ -218,10 +214,10 @@ in rec {
       (with pkgs; [ xz.bin xz.out icu.out bash libcxx libcxxabi ]) ++
       (with pkgs.darwin; [ dyld Libsystem locale ]);
 
-    overrides = persistent2;
+    overrides = persistent2 prevStage;
   };
 
-  persistent3 = self: super: with stage3.pkgs; {
+  persistent3 = prevStage: self: super: with prevStage; {
     inherit
       gnumake gzip gnused bzip2 gawk ed xz patch bash
       libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep
@@ -238,16 +234,16 @@ in rec {
     };
   };
 
-  stage4 = with stage3; stageFun 4 stage3 {
+  stage4 = prevStage: with prevStage; stageFun 4 prevStage {
     shell = "${pkgs.bash}/bin/bash";
     extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ];
     extraPreHook = ''
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
-    overrides = persistent3;
+    overrides = persistent3 prevStage;
   };
 
-  persistent4 = self: super: with stage4.pkgs; {
+  persistent4 = prevStage: self: super: with prevStage; {
     inherit
       gnumake gzip gnused bzip2 gawk ed xz patch bash
       libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep
@@ -262,9 +258,9 @@ in rec {
     };
   };
 
-  stage5 = with stage4; import ../generic rec {
+  stdenvDarwin = prevStage: let pkgs = prevStage; in import ../generic rec {
     inherit system config;
-    inherit (stdenv) fetchurlBoot;
+    inherit (pkgs.stdenv) fetchurlBoot;
 
     name = "stdenv-darwin";
 
@@ -279,7 +275,8 @@ in rec {
     shell       = "${pkgs.bash}/bin/bash";
 
     cc = import ../../build-support/cc-wrapper {
-      inherit stdenv shell;
+      inherit (pkgs) stdenv;
+      inherit shell;
       nativeTools = false;
       nativeLibc  = false;
       inherit (pkgs) coreutils binutils gnugrep;
@@ -294,7 +291,6 @@ in rec {
       inherit platform bootstrapTools;
       libc         = pkgs.darwin.Libsystem;
       shellPackage = pkgs.bash;
-      parent       = stage4;
     };
 
     allowedRequisites = (with pkgs; [
@@ -307,11 +303,21 @@ in rec {
       dyld Libsystem CF cctools libiconv locale
     ]);
 
-    overrides = self: super: persistent4 self super // {
+    overrides = self: super: persistent4 prevStage self super // {
       clang = cc;
       inherit cc;
     };
   };
 
-  stdenvDarwin = stage5;
+  stagesDarwin = [
+    ({}: stage0)
+    stage1
+    stage2
+    stage3
+    stage4
+    (prevStage: {
+      inherit system crossSystem platform config;
+      stdenv = stdenvDarwin prevStage;
+    })
+  ];
 }
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index c862eb141a8..85e4dabbbde 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -334,8 +334,8 @@ in rec {
   # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it
   test-pkgs = import test-pkgspath {
     inherit system;
-    stdenvFunc = args: let
+    stdenvStages = args: let
         args' = args // { inherit bootstrapFiles; };
-      in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stdenvDarwin;
+      in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stagesDarwin;
   };
 }
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 3b49d0de830..e8e609c7220 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -1,13 +1,12 @@
-# This file defines the various standard build environments.
+# This file chooses a sane default stdenv given the system, platform, etc.
 #
-# On Linux systems, the standard build environment consists of
-# Nix-built instances glibc and the `standard' Unix tools, i.e., the
-# Posix utilities, the GNU C compiler, and so on.  On other systems,
-# we use the native C library.
+# Rather than returning a stdenv, this returns a list of functions---one per
+# each bootstrapping stage. See `./booter.nix` for exactly what this list should
+# contain.
 
 { # Args just for stdenvs' usage
-  lib, allPackages
-  # Args to pass on to `allPacakges` too
+  lib
+  # Args to pass on to the pkgset builder, too
 , system, platform, crossSystem, config
 } @ args:
 
@@ -17,50 +16,39 @@ let
   # i.e., the stuff in /bin, /usr/bin, etc.  This environment should
   # be used with care, since many Nix packages will not build properly
   # with it (e.g., because they require GNU Make).
-  inherit (import ./native args) stdenvNative;
-
-  stdenvNativePkgs = allPackages {
-    inherit system platform crossSystem config;
-    allowCustomOverrides = false;
-    stdenv = stdenvNative;
-    noSysDirs = false;
-  };
-
+  stagesNative = import ./native args;
 
   # The Nix build environment.
-  stdenvNix = assert crossSystem == null; import ./nix {
-    inherit config lib;
-    stdenv = stdenvNative;
-    pkgs = stdenvNativePkgs;
-  };
+  stagesNix = import ./nix (args // { bootStages = stagesNative; });
 
-  inherit (import ./freebsd args) stdenvFreeBSD;
+  stagesFreeBSD = import ./freebsd args;
 
-  # Linux standard environment.
-  inherit (import ./linux args) stdenvLinux;
+  # On Linux systems, the standard build environment consists of Nix-built
+  # instances glibc and the `standard' Unix tools, i.e., the Posix utilities,
+  # the GNU C compiler, and so on.
+  inherit (import ./linux args) stagesLinux;
 
-  inherit (import ./darwin args) stdenvDarwin;
+  inherit (import ./darwin args) stagesDarwin;
 
-  inherit (import ./cross args) stdenvCross stdenvCrossiOS;
+  stagesCross = import ./cross args;
 
-  inherit (import ./custom args) stdenvCustom;
+  stagesCustom = import ./custom args;
 
-  # Select the appropriate stdenv for the platform `system'.
+  # Select the appropriate stages for the platform `system'.
 in
-    if crossSystem != null then
-      if crossSystem.useiOSCross or false then stdenvCrossiOS
-      else stdenvCross else
-    if config ? replaceStdenv then stdenvCustom else
-    if system == "i686-linux" then stdenvLinux else
-    if system == "x86_64-linux" then stdenvLinux else
-    if system == "armv5tel-linux" then stdenvLinux else
-    if system == "armv6l-linux" then stdenvLinux else
-    if system == "armv7l-linux" then stdenvLinux else
-    if system == "mips64el-linux" then stdenvLinux else
-    if system == "powerpc-linux" then /* stdenvLinux */ stdenvNative else
-    if system == "x86_64-darwin" then stdenvDarwin else
-    if system == "x86_64-solaris" then stdenvNix else
-    if system == "i686-cygwin" then stdenvNative else
-    if system == "x86_64-cygwin" then stdenvNative else
-    if system == "x86_64-freebsd" then stdenvFreeBSD else
-    stdenvNative
+  if crossSystem != null then stagesCross
+  else if config ? replaceStdenv then stagesCustom
+  else { # switch
+    "i686-linux" = stagesLinux;
+    "x86_64-linux" = stagesLinux;
+    "armv5tel-linux" = stagesLinux;
+    "armv6l-linux" = stagesLinux;
+    "armv7l-linux" = stagesLinux;
+    "mips64el-linux" = stagesLinux;
+    "powerpc-linux" = /* stagesLinux */ stagesNative;
+    "x86_64-darwin" = stagesDarwin;
+    "x86_64-solaris" = stagesNix;
+    "i686-cygwin" = stagesNative;
+    "x86_64-cygwin" = stagesNative;
+    "x86_64-freebsd" = stagesFreeBSD;
+  }.${system} or stagesNative
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index ea2ebcc7917..e0256e26f5f 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -1,65 +1,86 @@
-{ lib, allPackages
+{ lib
 , system, platform, crossSystem, config
 }:
 
 assert crossSystem == null;
 
-rec {
-  inherit allPackages;
 
-  bootstrapTools = derivation {
-    inherit system;
+[
 
-    name    = "trivial-bootstrap-tools";
-    builder = "/usr/local/bin/bash";
-    args    = [ ./trivial-bootstrap.sh ];
+  ({}: {
+    __raw = true;
 
-    mkdir   = "/bin/mkdir";
-    ln      = "/bin/ln";
-  };
+    bootstrapTools = derivation {
+      inherit system;
+
+      name = "trivial-bootstrap-tools";
+      builder = "/usr/local/bin/bash";
+      args = [ ./trivial-bootstrap.sh ];
+
+      mkdir = "/bin/mkdir";
+      ln = "/bin/ln";
+    };
+  })
+
+  ({ bootstrapTools, ... }: rec {
+    __raw = true;
+
+    inherit bootstrapTools;
+
+    fetchurl = import ../../build-support/fetchurl {
+      inherit stdenv;
+      curl = bootstrapTools;
+    };
 
-  fetchurl = import ../../build-support/fetchurl {
     stdenv = import ../generic {
       name = "stdenv-freebsd-boot-1";
       inherit system config;
-
-      initialPath  = [ "/" "/usr" ];
-      shell        = "${bootstrapTools}/bin/bash";
+      initialPath = [ "/" "/usr" ];
+      shell = "${bootstrapTools}/bin/bash";
       fetchurlBoot = null;
       cc = null;
-    };
-    curl = bootstrapTools;
-  };
-
-  stdenvFreeBSD = import ../generic {
-    name = "stdenv-freebsd-boot-3";
-
-    inherit system config;
-
-    initialPath  = [ bootstrapTools ];
-    shell        = "${bootstrapTools}/bin/bash";
-    fetchurlBoot = fetchurl;
-
-    cc = import ../../build-support/cc-wrapper {
-      nativeTools  = true;
-      nativePrefix = "/usr";
-      nativeLibc   = true;
-      stdenv = import ../generic {
-        inherit system config;
-        name         = "stdenv-freebsd-boot-0";
-        initialPath  = [ bootstrapTools ];
-        shell = stdenvFreeBSD.shell;
-        fetchurlBoot = fetchurl;
-        cc           = null;
+      overrides = self: super: {
       };
-      cc           = {
-        name    = "clang-9.9.9";
-        cc      = "/usr";
-        outPath = "/usr";
-      };
-      isClang      = true;
     };
+  })
 
-    preHook = ''export NIX_NO_SELF_RPATH=1'';
-  };
-}
+  (prevStage: {
+    __raw = true;
+
+    stdenv = import ../generic {
+      name = "stdenv-freebsd-boot-0";
+      inherit system config;
+      initialPath = [ prevStage.bootstrapTools ];
+      inherit (prevStage.stdenv) shell;
+      fetchurlBoot = prevStage.fetchurl;
+      cc = null;
+    };
+  })
+
+  (prevStage: {
+    inherit system crossSystem platform config;
+    stdenv = import ../generic {
+      name = "stdenv-freebsd-boot-3";
+      inherit system config;
+
+      inherit (prevStage.stdenv)
+        initialPath shell fetchurlBoot;
+
+      cc = import ../../build-support/cc-wrapper {
+        nativeTools  = true;
+        nativePrefix = "/usr";
+        nativeLibc   = true;
+        inherit (prevStage) stdenv;
+        cc           = {
+          name    = "clang-9.9.9";
+          cc      = "/usr";
+          outPath = "/usr";
+        };
+        isClang      = true;
+      };
+
+      preHook = ''export NIX_NO_SELF_RPATH=1'';
+    };
+  })
+
+]
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 708f0ec3b6d..71642332079 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -3,7 +3,7 @@
 # external (non-Nix) tools, such as /usr/bin/gcc, and it contains a C
 # compiler and linker that do not search in default locations,
 # ensuring purity of components produced by it.
-{ lib, allPackages
+{ lib
 , system, platform, crossSystem, config
 
 , bootstrapFiles ?
@@ -90,14 +90,10 @@ rec {
         overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
       };
 
-      thisPkgs = allPackages {
-        inherit system platform crossSystem config;
-        allowCustomOverrides = false;
-        stdenv = thisStdenv;
-      };
-
-    in { stdenv = thisStdenv; pkgs = thisPkgs; };
-
+    in {
+      inherit system platform crossSystem config;
+      stdenv = thisStdenv;
+    };
 
   # Build a dummy stdenv with no GCC or working fetchurl.  This is
   # because we need a stdenv to build the GCC wrapper and fetchurl.
@@ -137,9 +133,9 @@ rec {
   # If we ever need to use a package from more than one stage back, we
   # simply re-export those packages in the middle stage(s) using the
   # overrides attribute and the inherit syntax.
-  stage1 = stageFun {
+  stage1 = prevStage: stageFun {
     gccPlain = bootstrapTools;
-    inherit (stage0.pkgs) glibc;
+    inherit (prevStage) glibc;
     binutils = bootstrapTools;
     coreutils = bootstrapTools;
     gnugrep = bootstrapTools;
@@ -148,7 +144,7 @@ rec {
     # Rebuild binutils to use from stage2 onwards.
     overrides = self: super: {
       binutils = super.binutils.override { gold = false; };
-      inherit (stage0.pkgs) glibc;
+      inherit (prevStage) glibc;
 
       # A threaded perl build needs glibc/libpthread_nonshared.a,
       # which is not included in bootstrapTools, so disable threading.
@@ -162,16 +158,16 @@ rec {
 
   # 2nd stdenv that contains our own rebuilt binutils and is used for
   # compiling our own Glibc.
-  stage2 = stageFun {
+  stage2 = prevStage: stageFun {
     gccPlain = bootstrapTools;
-    inherit (stage1.pkgs) glibc;
-    binutils = stage1.pkgs.binutils;
+    inherit (prevStage) glibc;
+    binutils = prevStage.binutils;
     coreutils = bootstrapTools;
     gnugrep = bootstrapTools;
     name = "bootstrap-gcc-wrapper";
 
     overrides = self: super: {
-      inherit (stage1.pkgs) perl binutils paxctl gnum4 bison;
+      inherit (prevStage) perl binutils paxctl gnum4 bison;
       # This also contains the full, dynamically linked, final Glibc.
     };
   };
@@ -180,15 +176,15 @@ rec {
   # Construct a third stdenv identical to the 2nd, except that this
   # one uses the rebuilt Glibc from stage2.  It still uses the recent
   # binutils and rest of the bootstrap tools, including GCC.
-  stage3 = stageFun {
+  stage3 = prevStage: stageFun {
     gccPlain = bootstrapTools;
-    inherit (stage2.pkgs) glibc binutils;
+    inherit (prevStage) glibc binutils;
     coreutils = bootstrapTools;
     gnugrep = bootstrapTools;
     name = "bootstrap-gcc-wrapper";
 
     overrides = self: super: rec {
-      inherit (stage2.pkgs) binutils glibc perl patchelf linuxHeaders gnum4 bison;
+      inherit (prevStage) binutils glibc perl patchelf linuxHeaders gnum4 bison;
       # Link GCC statically against GMP etc.  This makes sense because
       # these builds of the libraries are only used by GCC, so it
       # reduces the size of the stdenv closure.
@@ -200,14 +196,14 @@ rec {
         isl = isl_0_14;
       };
     };
-    extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];
+    extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ];
   };
 
 
   # Construct a fourth stdenv that uses the new GCC.  But coreutils is
   # still from the bootstrap tools.
-  stage4 = stageFun {
-    inherit (stage3.pkgs) gccPlain glibc binutils;
+  stage4 = prevStage: stageFun {
+    inherit (prevStage) gccPlain glibc binutils;
     gnugrep = bootstrapTools;
     coreutils = bootstrapTools;
     name = "";
@@ -217,7 +213,7 @@ rec {
       # because gcc (since JAR support) already depends on zlib, and
       # then if we already have a zlib we want to use that for the
       # other purposes (binutils and top-level pkgs) too.
-      inherit (stage3.pkgs) gettext gnum4 bison gmp perl glibc zlib linuxHeaders;
+      inherit (prevStage) gettext gnum4 bison gmp perl glibc zlib linuxHeaders;
 
       gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) {
         nativeTools = false;
@@ -230,7 +226,7 @@ rec {
         shell = self.bash + "/bin/bash";
       };
     };
-    extraBuildInputs = [ stage3.pkgs.patchelf stage3.pkgs.xz ];
+    extraBuildInputs = [ prevStage.patchelf prevStage.xz ];
   };
 
 
@@ -241,7 +237,7 @@ rec {
   # When updating stdenvLinux, make sure that the result has no
   # dependency (`nix-store -qR') on bootstrapTools or the first
   # binutils built.
-  stdenvLinux = import ../generic rec {
+  stdenvLinux = prevStage: import ../generic rec {
     inherit system config;
 
     preHook =
@@ -253,24 +249,24 @@ rec {
       '';
 
     initialPath =
-      ((import ../common-path.nix) {pkgs = stage4.pkgs;});
+      ((import ../common-path.nix) {pkgs = prevStage;});
 
-    extraBuildInputs = [ stage4.pkgs.patchelf stage4.pkgs.paxctl ];
+    extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ];
 
-    cc = stage4.pkgs.gcc;
+    cc = prevStage.gcc;
 
     shell = cc.shell;
 
-    inherit (stage4.stdenv) fetchurlBoot;
+    inherit (prevStage.stdenv) fetchurlBoot;
 
     extraAttrs = {
-      inherit (stage4.pkgs) glibc;
+      inherit (prevStage) glibc;
       inherit platform bootstrapTools;
-      shellPackage = stage4.pkgs.bash;
+      shellPackage = prevStage.bash;
     };
 
     /* outputs TODO
-    allowedRequisites = with stage4.pkgs;
+    allowedRequisites = with prevStage;
       [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
         glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl
         paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv
@@ -280,11 +276,22 @@ rec {
     overrides = self: super: {
       gcc = cc;
 
-      inherit (stage4.pkgs)
+      inherit (prevStage)
         gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
         glibc gnumake gnused gnutar gnugrep gnupatch patchelf
         attr acl paxctl zlib pcre;
     };
   };
 
+  stagesLinux = [
+    ({}: stage0)
+    stage1
+    stage2
+    stage3
+    stage4
+    (prevStage: {
+      inherit system crossSystem platform config;
+      stdenv = stdenvLinux prevStage;
+    })
+  ];
 }
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 5a2d2c96559..57182fae523 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -1,10 +1,10 @@
-{ lib, allPackages
+{ lib
 , system, platform, crossSystem, config
 }:
 
 assert crossSystem == null;
 
-rec {
+let
 
   shell =
     if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash"
@@ -101,50 +101,54 @@ rec {
       inherit system shell cc overrides config;
     };
 
+in
 
-  stdenvBoot0 = makeStdenv {
-    cc = null;
-    fetchurl = null;
-  };
+[
 
+  ({}: rec {
+    __raw = true;
 
-  cc = import ../../build-support/cc-wrapper {
-    name = "cc-native";
-    nativeTools = true;
-    nativeLibc = true;
-    nativePrefix = if system == "i686-solaris" then "/usr/gnu" else if system == "x86_64-solaris" then "/opt/local/gcc47" else "/usr";
-    stdenv = stdenvBoot0;
-  };
+    stdenv = makeStdenv {
+      cc = null;
+      fetchurl = null;
+    };
 
+    cc = import ../../build-support/cc-wrapper {
+      name = "cc-native";
+      nativeTools = true;
+      nativeLibc = true;
+      nativePrefix = { # switch
+        "i686-solaris" = "/usr/gnu";
+        "x86_64-solaris" = "/opt/local/gcc47";
+      }.${system} or "/usr";
+      inherit stdenv;
+    };
 
-  fetchurl = import ../../build-support/fetchurl {
-    stdenv = stdenvBoot0;
-    # Curl should be in /usr/bin or so.
-    curl = null;
-  };
+    fetchurl = import ../../build-support/fetchurl {
+      inherit stdenv;
+      # Curl should be in /usr/bin or so.
+      curl = null;
+    };
 
+  })
 
   # First build a stdenv based only on tools outside the store.
-  stdenvBoot1 = makeStdenv {
-    inherit cc fetchurl;
-  } // {inherit fetchurl;};
+  (prevStage: {
+    inherit system crossSystem platform config;
+    stdenv = makeStdenv {
+      inherit (prevStage) cc fetchurl;
+    } // { inherit (prevStage) fetchurl; };
+  })
 
-  stdenvBoot1Pkgs = allPackages {
-    inherit system platform crossSystem config;
-    allowCustomOverrides = false;
-    stdenv = stdenvBoot1;
-  };
+  # Using that, build a stdenv that adds the ‘xz’ command (which most systems
+  # don't have, so we mustn't rely on the native environment providing it).
+  (prevStage: {
+    inherit system crossSystem platform config;
+    stdenv = makeStdenv {
+      inherit (prevStage.stdenv) cc fetchurl;
+      extraPath = [ prevStage.xz ];
+      overrides = self: super: { inherit (prevStage) xz; };
+    };
+  })
 
-
-  # Using that, build a stdenv that adds the ‘xz’ command (which most
-  # systems don't have, so we mustn't rely on the native environment
-  # providing it).
-  stdenvBoot2 = makeStdenv {
-    inherit cc fetchurl;
-    extraPath = [ stdenvBoot1Pkgs.xz ];
-    overrides = self: super: { inherit (stdenvBoot1Pkgs) xz; };
-  };
-
-
-  stdenvNative = stdenvBoot2;
-}
+]
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index 21ee29ad5af..a5f0a18464c 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -1,39 +1,53 @@
-{ stdenv, pkgs, config, lib }:
+{ lib
+, crossSystem, config
+, bootStages
+, ...
+}:
 
-import ../generic rec {
-  inherit config;
+assert crossSystem == null;
 
-  preHook =
-    ''
-      export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
-      export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
-      export NIX_IGNORE_LD_THROUGH_GCC=1
-    '';
+bootStages ++ [
+  (prevStage: let
+    inherit (prevStage) stdenv;
+    inherit (stdenv) system platform;
+  in {
+    inherit system platform crossSystem config;
 
-  initialPath = (import ../common-path.nix) {pkgs = pkgs;};
+    stdenv = import ../generic rec {
+      inherit config;
 
-  system = stdenv.system;
+      preHook = ''
+        export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
+        export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
+        export NIX_IGNORE_LD_THROUGH_GCC=1
+      '';
 
-  cc = import ../../build-support/cc-wrapper {
-    nativeTools = false;
-    nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr";
-    nativeLibc = true;
-    inherit stdenv;
-    inherit (pkgs) binutils coreutils gnugrep;
-    cc = pkgs.gcc.cc;
-    isGNU = true;
-    shell = pkgs.bash + "/bin/sh";
-  };
+      initialPath = (import ../common-path.nix) { pkgs = prevStage; };
 
-  shell = pkgs.bash + "/bin/sh";
+      system = stdenv.system;
 
-  fetchurlBoot = stdenv.fetchurlBoot;
+      cc = import ../../build-support/cc-wrapper {
+        nativeTools = false;
+        nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr";
+        nativeLibc = true;
+        inherit stdenv;
+        inherit (prevStage) binutils coreutils gnugrep;
+        cc = prevStage.gcc.cc;
+        isGNU = true;
+        shell = prevStage.bash + "/bin/sh";
+      };
 
-  overrides = self: super: {
-    inherit cc;
-    inherit (cc) binutils;
-    inherit (pkgs)
-      gzip bzip2 xz bash coreutils diffutils findutils gawk
-      gnumake gnused gnutar gnugrep gnupatch perl;
-  };
-}
+      shell = prevStage.bash + "/bin/sh";
+
+      fetchurlBoot = stdenv.fetchurlBoot;
+
+      overrides = self: super: {
+        inherit cc;
+        inherit (cc) binutils;
+        inherit (prevStage)
+          gzip bzip2 xz bash coreutils diffutils findutils gawk
+          gnumake gnused gnutar gnugrep gnupatch perl;
+      };
+    };
+  })
+]
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index db3abb531f1..04daf9778ff 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -7,11 +7,11 @@
 
      3. Defaults to no non-standard config and no cross-compilation target
 
-     4. Uses the above to infer the default standard environment (stdenv) if
-        none is provided
+     4. Uses the above to infer the default standard environment's (stdenv's)
+        stages if no stdenv's are provided
 
-     5. Builds the final stage --- a fully booted package set with the chosen
-        stdenv
+     5. Folds the stages to yield the final fully booted package set for the
+        chosen stdenv
 
    Use `impure.nix` to also infer the `system` based on the one on which
    evaluation is taking place, and the configuration from environment variables
@@ -23,9 +23,10 @@
 , # Allow a configuration attribute set to be passed in as an argument.
   config ? {}
 
-, # The standard environment for building packages, or rather a function
-  # providing it. See below for the arguments given to that function.
-  stdenvFunc ? import ../stdenv
+, # A function booting the final package set for a specific standard
+  # environment. See below for the arguments given to that function,
+  # the type of list it returns.
+  stdenvStages ? import ../stdenv
 
 , crossSystem ? null
 , platform ? assert false; null
@@ -76,10 +77,12 @@ in let
     inherit lib nixpkgsFun;
   } // newArgs);
 
-  stdenv = stdenvFunc {
-    inherit lib allPackages system platform crossSystem config;
+  boot = import ../stdenv/booter.nix { inherit lib allPackages; };
+
+  stages = stdenvStages {
+    inherit lib system platform crossSystem config;
   };
 
-  pkgs = allPackages { inherit system stdenv config crossSystem platform; };
+  pkgs = boot stages;
 
 in pkgs
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 7c8860bf4e9..0b1326414b6 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -18,7 +18,7 @@
 , # This is used because stdenv replacement and the stdenvCross do benefit from
   # the overridden configuration provided by the user, as opposed to the normal
   # bootstrapping stdenvs.
-  allowCustomOverrides ? true
+  allowCustomOverrides
 
 , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc
   # outside of the store.  Thus, GCC, GFortran, & co. must always look for

From 0f33b9f7f11e414ff6213359ec2859199a68d550 Mon Sep 17 00:00:00 2001
From: David Grayson <davidegrayson@gmail.com>
Date: Wed, 21 Dec 2016 18:42:53 -0800
Subject: [PATCH 108/727] top-level: Do stdenvOverrides in stage.nix even if
 crossSystem exists.

Instead, the cross stdenv will patch up the override field -- the complexity
is now confined to the one place it matters.
---
 pkgs/stdenv/cross/default.nix |  1 +
 pkgs/top-level/stage.nix      | 13 ++++---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 728424c0a7a..359d45b78b9 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -24,6 +24,7 @@ in bootStages ++ [
     stdenv = vanillaPackages.stdenv // {
       # Needed elsewhere as a hacky way to pass the target
       cross = crossSystem;
+      overrides = _: _: {};
     };
   })
 
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 0b1326414b6..f6f11b43980 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -58,16 +58,11 @@ let
 
   aliases = self: super: import ./aliases.nix super;
 
-  # stdenvOverrides is used to avoid circular dependencies for building
-  # the standard build environment. This mechanism uses the override
-  # mechanism to implement some staged compilation of the stdenv.
-  #
-  # We don't want stdenv overrides in the case of cross-building, or
-  # otherwise the basic overridden packages will not be built with the
-  # crossStdenv adapter.
+  # stdenvOverrides is used to avoid having multiple of versions
+  # of certain dependencies that were used in bootstrapping the
+  # standard environment.
   stdenvOverrides = self: super:
-    lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides)
-      (super.stdenv.overrides self super);
+    (super.stdenv.overrides or (_: _: {})) self super;
 
   # Allow packages to be overridden globally via the `packageOverrides'
   # configuration option, which must be a function that takes `pkgs'

From 67ebd3161b82caf8a1ed30e0cd21dc7bb0177c35 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 17 Dec 2016 23:51:18 -0800
Subject: [PATCH 109/727] top-level: Inherit `system` and `platform` in
 stage.nix not all-packages.nix

These are not packages, and so its more elegant to do this outside of
all-packages.nix.
---
 pkgs/top-level/all-packages.nix |  7 +------
 pkgs/top-level/stage.nix        | 11 +++++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69192cd6d3a..a5a1f17d75b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5,9 +5,7 @@
  * to merges. Please use the full-text search of your editor. ;)
  * Hint: ### starts category names.
  */
-{ system, noSysDirs, config, crossSystem, platform, lib
-, nixpkgsFun
-}:
+{ lib, nixpkgsFun, noSysDirs, config}:
 self: pkgs:
 
 with pkgs;
@@ -18,9 +16,6 @@ in
 
 {
 
-  # Make some arguments passed to all-packages.nix available
-  inherit system platform;
-
   # Allow callPackage to fill in the pkgs argument
   inherit pkgs;
 
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index f6f11b43980..ebc6473e425 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -47,12 +47,15 @@ let
       inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir;
     };
 
-  stdenvDefault = self: super:
-    { stdenv = stdenv // { inherit platform; }; };
+  stdenvBootstappingAndPlatforms = self: super: {
+    stdenv = stdenv // { inherit platform; };
+    inherit
+      system platform crossSystem;
+  };
 
   allPackages = self: super:
     let res = import ./all-packages.nix
-      { inherit system noSysDirs config crossSystem platform lib nixpkgsFun; }
+      { inherit lib nixpkgsFun noSysDirs config; }
       res self;
     in res;
 
@@ -77,7 +80,7 @@ let
 
   # The complete chain of package set builders, applied from top to bottom
   toFix = lib.foldl' (lib.flip lib.extends) (self: {}) [
-    stdenvDefault
+    stdenvBootstappingAndPlatforms
     stdenvAdapters
     trivialBuilders
     allPackages

From 6a45e911c408bfd256531ba4d81bf8151f2f4df8 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 24 Dec 2016 07:07:20 -0800
Subject: [PATCH 110/727] linux stdenv: Utilize overrides and prevStage better

`gcc-unwrapped` basically replaces `gccPlain`. It may seem like an ugly
polution to stick it in all-packages, but a future PR will enshrine this
`*-unwrapped` pattern. In any event, the long term goal is stdenvs might
need to tweak how compilers are booted and wrapped, but the code to build
the unwrapped compilers themselves should be generic.
---
 pkgs/stdenv/linux/default.nix   | 68 +++++++++++++++------------------
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 71642332079..76c15372d1d 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -43,8 +43,8 @@ rec {
   # This function builds the various standard environments used during
   # the bootstrap.  In all stages, we build an stdenv and the package
   # set that can be built with that stdenv.
-  stageFun =
-    {gccPlain, glibc, binutils, coreutils, gnugrep, name, overrides ? (self: super: {}), extraBuildInputs ? []}:
+  stageFun = prevStage:
+    { name, overrides ? (self: super: {}), extraBuildInputs ? [] }:
 
     let
 
@@ -65,15 +65,15 @@ rec {
           inherit system;
         };
 
-        cc = if isNull gccPlain
+        cc = if isNull prevStage.gcc-unwrapped
              then null
              else lib.makeOverridable (import ../../build-support/cc-wrapper) {
           nativeTools = false;
           nativeLibc = false;
-          cc = gccPlain;
+          cc = prevStage.gcc-unwrapped;
           isGNU = true;
-          libc = glibc;
-          inherit binutils coreutils gnugrep;
+          libc = prevStage.glibc;
+          inherit (prevStage) binutils coreutils gnugrep;
           name = name;
           stdenv = stage0.stdenv;
         };
@@ -85,7 +85,7 @@ rec {
 
           # stdenv.glibc is used by GCC build to figure out the system-level
           # /usr/include directory.
-          inherit glibc;
+          inherit (prevStage) glibc;
         };
         overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
       };
@@ -95,14 +95,17 @@ rec {
       stdenv = thisStdenv;
     };
 
-  # Build a dummy stdenv with no GCC or working fetchurl.  This is
-  # because we need a stdenv to build the GCC wrapper and fetchurl.
-  stage0 = stageFun {
-    gccPlain = null;
+  baseCase = {
+    gcc-unwrapped = null;
     glibc = null;
     binutils = null;
     coreutils = null;
     gnugrep = null;
+  };
+
+  # Build a dummy stdenv with no GCC or working fetchurl.  This is
+  # because we need a stdenv to build the GCC wrapper and fetchurl.
+  stage0 = stageFun baseCase {
     name = null;
 
     overrides = self: super: {
@@ -119,6 +122,10 @@ rec {
           ln -s ${bootstrapTools}/include-glibc $out/include
         '';
       };
+      gcc-unwrapped = bootstrapTools;
+      binutils = bootstrapTools;
+      coreutils = bootstrapTools;
+      gnugrep = bootstrapTools;
     };
   };
 
@@ -133,18 +140,13 @@ rec {
   # If we ever need to use a package from more than one stage back, we
   # simply re-export those packages in the middle stage(s) using the
   # overrides attribute and the inherit syntax.
-  stage1 = prevStage: stageFun {
-    gccPlain = bootstrapTools;
-    inherit (prevStage) glibc;
-    binutils = bootstrapTools;
-    coreutils = bootstrapTools;
-    gnugrep = bootstrapTools;
+  stage1 = prevStage: stageFun prevStage {
     name = "bootstrap-gcc-wrapper";
 
     # Rebuild binutils to use from stage2 onwards.
     overrides = self: super: {
       binutils = super.binutils.override { gold = false; };
-      inherit (prevStage) glibc;
+      inherit (prevStage) glibc gcc-unwrapped coreutils gnugrep;
 
       # A threaded perl build needs glibc/libpthread_nonshared.a,
       # which is not included in bootstrapTools, so disable threading.
@@ -158,16 +160,13 @@ rec {
 
   # 2nd stdenv that contains our own rebuilt binutils and is used for
   # compiling our own Glibc.
-  stage2 = prevStage: stageFun {
-    gccPlain = bootstrapTools;
-    inherit (prevStage) glibc;
-    binutils = prevStage.binutils;
-    coreutils = bootstrapTools;
-    gnugrep = bootstrapTools;
+  stage2 = prevStage: stageFun prevStage {
     name = "bootstrap-gcc-wrapper";
 
     overrides = self: super: {
-      inherit (prevStage) perl binutils paxctl gnum4 bison;
+      inherit (prevStage)
+        binutils gcc-unwrapped coreutils gnugrep
+        perl paxctl gnum4 bison;
       # This also contains the full, dynamically linked, final Glibc.
     };
   };
@@ -176,15 +175,13 @@ rec {
   # Construct a third stdenv identical to the 2nd, except that this
   # one uses the rebuilt Glibc from stage2.  It still uses the recent
   # binutils and rest of the bootstrap tools, including GCC.
-  stage3 = prevStage: stageFun {
-    gccPlain = bootstrapTools;
-    inherit (prevStage) glibc binutils;
-    coreutils = bootstrapTools;
-    gnugrep = bootstrapTools;
+  stage3 = prevStage: stageFun prevStage {
     name = "bootstrap-gcc-wrapper";
 
     overrides = self: super: rec {
-      inherit (prevStage) binutils glibc perl patchelf linuxHeaders gnum4 bison;
+      inherit (prevStage)
+        binutils glibc coreutils gnugrep
+        perl patchelf linuxHeaders gnum4 bison;
       # Link GCC statically against GMP etc.  This makes sense because
       # these builds of the libraries are only used by GCC, so it
       # reduces the size of the stdenv closure.
@@ -192,7 +189,7 @@ rec {
       mpfr = super.mpfr.override { stdenv = self.makeStaticLibraries self.stdenv; };
       libmpc = super.libmpc.override { stdenv = self.makeStaticLibraries self.stdenv; };
       isl_0_14 = super.isl_0_14.override { stdenv = self.makeStaticLibraries self.stdenv; };
-      gccPlain = super.gcc.cc.override {
+      gcc-unwrapped = super.gcc-unwrapped.override {
         isl = isl_0_14;
       };
     };
@@ -202,10 +199,7 @@ rec {
 
   # Construct a fourth stdenv that uses the new GCC.  But coreutils is
   # still from the bootstrap tools.
-  stage4 = prevStage: stageFun {
-    inherit (prevStage) gccPlain glibc binutils;
-    gnugrep = bootstrapTools;
-    coreutils = bootstrapTools;
+  stage4 = prevStage: stageFun prevStage {
     name = "";
 
     overrides = self: super: {
@@ -219,7 +213,7 @@ rec {
         nativeTools = false;
         nativeLibc = false;
         isGNU = true;
-        cc = self.stdenv.cc.cc;
+        cc = prevStage.gcc-unwrapped;
         libc = self.glibc;
         inherit (self) stdenv binutils coreutils gnugrep;
         name = "";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5a1f17d75b..ed9bea3a140 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4721,6 +4721,7 @@ in
   gambit = callPackage ../development/compilers/gambit { };
 
   gcc = gcc5;
+  gcc-unwrapped = gcc.cc;
 
   wrapCCMulti = cc:
     if system == "x86_64-linux" then lowPrio (

From b10f415c2172b3b89b7f93aa62c466fcef911d61 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 24 Dec 2016 07:28:40 -0800
Subject: [PATCH 111/727] linux stdenv: Remove stray use of stage0 to bootstrap
 more elegantly

---
 pkgs/stdenv/linux/default.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 76c15372d1d..f841c7a778a 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -75,7 +75,7 @@ rec {
           libc = prevStage.glibc;
           inherit (prevStage) binutils coreutils gnugrep;
           name = name;
-          stdenv = stage0.stdenv;
+          stdenv = prevStage.ccWrapperStdenv;
         };
 
         extraAttrs = {
@@ -95,7 +95,9 @@ rec {
       stdenv = thisStdenv;
     };
 
-  baseCase = {
+  baseCase = {}: {
+    __raw = true;
+
     gcc-unwrapped = null;
     glibc = null;
     binutils = null;
@@ -105,10 +107,15 @@ rec {
 
   # Build a dummy stdenv with no GCC or working fetchurl.  This is
   # because we need a stdenv to build the GCC wrapper and fetchurl.
-  stage0 = stageFun baseCase {
+  stage0 = prevStage: stageFun prevStage {
     name = null;
 
     overrides = self: super: {
+      # We thread stage0's stdenv through under this name so downstream stages
+      # can use it for wrapping gcc too. This way, downstream stages don't need
+      # to refer to this stage directly, which violates the principle that each
+      # stage should only access the stage that came before it.
+      ccWrapperStdenv = self.stdenv;
       # The Glibc include directory cannot have the same prefix as the
       # GCC include directory, since GCC gets confused otherwise (it
       # will search the Glibc headers before the GCC headers).  So
@@ -146,7 +153,9 @@ rec {
     # Rebuild binutils to use from stage2 onwards.
     overrides = self: super: {
       binutils = super.binutils.override { gold = false; };
-      inherit (prevStage) glibc gcc-unwrapped coreutils gnugrep;
+      inherit (prevStage)
+        ccWrapperStdenv
+        glibc gcc-unwrapped coreutils gnugrep;
 
       # A threaded perl build needs glibc/libpthread_nonshared.a,
       # which is not included in bootstrapTools, so disable threading.
@@ -165,6 +174,7 @@ rec {
 
     overrides = self: super: {
       inherit (prevStage)
+        ccWrapperStdenv
         binutils gcc-unwrapped coreutils gnugrep
         perl paxctl gnum4 bison;
       # This also contains the full, dynamically linked, final Glibc.
@@ -180,6 +190,7 @@ rec {
 
     overrides = self: super: rec {
       inherit (prevStage)
+        ccWrapperStdenv
         binutils glibc coreutils gnugrep
         perl patchelf linuxHeaders gnum4 bison;
       # Link GCC statically against GMP etc.  This makes sense because
@@ -278,7 +289,8 @@ rec {
   };
 
   stagesLinux = [
-    ({}: stage0)
+    baseCase
+    stage0
     stage1
     stage2
     stage3

From ff355604602edb2d71e7fecaec4b3871ffc943e3 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 24 Dec 2016 07:38:56 -0800
Subject: [PATCH 112/727] linux stdenv: Inline stage funs to conform to new
 convention

Code is just moved around
---
 pkgs/stdenv/default.nix       |   2 +-
 pkgs/stdenv/linux/default.nix | 111 ++++++++++++++++------------------
 2 files changed, 53 insertions(+), 60 deletions(-)

diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index e8e609c7220..0ca03ecdde1 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -26,7 +26,7 @@ let
   # On Linux systems, the standard build environment consists of Nix-built
   # instances glibc and the `standard' Unix tools, i.e., the Posix utilities,
   # the GNU C compiler, and so on.
-  inherit (import ./linux args) stagesLinux;
+  stagesLinux = import ./linux args;
 
   inherit (import ./darwin args) stagesDarwin;
 
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index f841c7a778a..430122c36f7 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -18,7 +18,7 @@
 
 assert crossSystem == null;
 
-rec {
+let
 
   commonPreHook =
     ''
@@ -95,7 +95,11 @@ rec {
       stdenv = thisStdenv;
     };
 
-  baseCase = {}: {
+in
+
+[
+
+  ({}: {
     __raw = true;
 
     gcc-unwrapped = null;
@@ -103,11 +107,11 @@ rec {
     binutils = null;
     coreutils = null;
     gnugrep = null;
-  };
+  })
 
   # Build a dummy stdenv with no GCC or working fetchurl.  This is
   # because we need a stdenv to build the GCC wrapper and fetchurl.
-  stage0 = prevStage: stageFun prevStage {
+  (prevStage: stageFun prevStage {
     name = null;
 
     overrides = self: super: {
@@ -134,7 +138,7 @@ rec {
       coreutils = bootstrapTools;
       gnugrep = bootstrapTools;
     };
-  };
+  })
 
 
   # Create the first "real" standard environment.  This one consists
@@ -147,7 +151,7 @@ rec {
   # If we ever need to use a package from more than one stage back, we
   # simply re-export those packages in the middle stage(s) using the
   # overrides attribute and the inherit syntax.
-  stage1 = prevStage: stageFun prevStage {
+  (prevStage: stageFun prevStage {
     name = "bootstrap-gcc-wrapper";
 
     # Rebuild binutils to use from stage2 onwards.
@@ -164,12 +168,12 @@ rec {
       # top-level pkgs as an override either.
       perl = super.perl.override { enableThreading = false; };
     };
-  };
+  })
 
 
   # 2nd stdenv that contains our own rebuilt binutils and is used for
   # compiling our own Glibc.
-  stage2 = prevStage: stageFun prevStage {
+  (prevStage: stageFun prevStage {
     name = "bootstrap-gcc-wrapper";
 
     overrides = self: super: {
@@ -179,13 +183,13 @@ rec {
         perl paxctl gnum4 bison;
       # This also contains the full, dynamically linked, final Glibc.
     };
-  };
+  })
 
 
   # Construct a third stdenv identical to the 2nd, except that this
   # one uses the rebuilt Glibc from stage2.  It still uses the recent
   # binutils and rest of the bootstrap tools, including GCC.
-  stage3 = prevStage: stageFun prevStage {
+  (prevStage: stageFun prevStage {
     name = "bootstrap-gcc-wrapper";
 
     overrides = self: super: rec {
@@ -205,12 +209,12 @@ rec {
       };
     };
     extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ];
-  };
+  })
 
 
   # Construct a fourth stdenv that uses the new GCC.  But coreutils is
   # still from the bootstrap tools.
-  stage4 = prevStage: stageFun prevStage {
+  (prevStage: stageFun prevStage {
     name = "";
 
     overrides = self: super: {
@@ -232,8 +236,7 @@ rec {
       };
     };
     extraBuildInputs = [ prevStage.patchelf prevStage.xz ];
-  };
-
+  })
 
   # Construct the final stdenv.  It uses the Glibc and GCC, and adds
   # in a new binutils that doesn't depend on bootstrap-tools, as well
@@ -242,62 +245,52 @@ rec {
   # When updating stdenvLinux, make sure that the result has no
   # dependency (`nix-store -qR') on bootstrapTools or the first
   # binutils built.
-  stdenvLinux = prevStage: import ../generic rec {
-    inherit system config;
+  (prevStage: {
+    inherit system crossSystem platform config;
+    stdenv = import ../generic rec {
+      inherit system config;
 
-    preHook =
-      ''
+      preHook = ''
         # Make "strip" produce deterministic output, by setting
         # timestamps etc. to a fixed value.
         commonStripFlags="--enable-deterministic-archives"
         ${commonPreHook}
       '';
 
-    initialPath =
-      ((import ../common-path.nix) {pkgs = prevStage;});
+      initialPath =
+        ((import ../common-path.nix) {pkgs = prevStage;});
 
-    extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ];
+      extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ];
 
-    cc = prevStage.gcc;
+      cc = prevStage.gcc;
 
-    shell = cc.shell;
+      shell = cc.shell;
 
-    inherit (prevStage.stdenv) fetchurlBoot;
+      inherit (prevStage.stdenv) fetchurlBoot;
 
-    extraAttrs = {
-      inherit (prevStage) glibc;
-      inherit platform bootstrapTools;
-      shellPackage = prevStage.bash;
+      extraAttrs = {
+        inherit (prevStage) glibc;
+        inherit platform bootstrapTools;
+        shellPackage = prevStage.bash;
+      };
+
+      /* outputs TODO
+      allowedRequisites = with prevStage;
+        [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
+          glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl
+          paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv
+        ];
+        */
+
+      overrides = self: super: {
+        gcc = cc;
+
+        inherit (prevStage)
+          gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
+          glibc gnumake gnused gnutar gnugrep gnupatch patchelf
+          attr acl paxctl zlib pcre;
+      };
     };
+  })
 
-    /* outputs TODO
-    allowedRequisites = with prevStage;
-      [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
-        glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl
-        paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv
-      ];
-      */
-
-    overrides = self: super: {
-      gcc = cc;
-
-      inherit (prevStage)
-        gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
-        glibc gnumake gnused gnutar gnugrep gnupatch patchelf
-        attr acl paxctl zlib pcre;
-    };
-  };
-
-  stagesLinux = [
-    baseCase
-    stage0
-    stage1
-    stage2
-    stage3
-    stage4
-    (prevStage: {
-      inherit system crossSystem platform config;
-      stdenv = stdenvLinux prevStage;
-    })
-  ];
-}
+]

From abaf790ea915f826dff694afe032f081c0f5a510 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 13 Jan 2017 13:47:17 -0500
Subject: [PATCH 113/727] stdenv/booter.nix: Add longer note explaining
 indexing

---
 pkgs/stdenv/booter.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix
index b1e1e898aa3..11ca8e1440e 100644
--- a/pkgs/stdenv/booter.nix
+++ b/pkgs/stdenv/booter.nix
@@ -46,7 +46,10 @@ stageFuns: let
   # isn't already set.
   withAllowCustomOverrides = lib.lists.imap
     (index: stageFun: prevStage:
-      { allowCustomOverrides = index == 1; } # first element, 1-indexed
+      # So true by default for only the first element because one
+      # 1-indexing. Since we reverse the list, this means this is true
+      # for the final stage.
+      { allowCustomOverrides = index == 1; }
       // (stageFun prevStage))
     (lib.lists.reverseList stageFuns);
 

From 782e2fa807a5b5de2284b7e009105ed58d8a8e4e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 13 Jan 2017 20:24:24 +0100
Subject: [PATCH 114/727] google-talk-plugin: 5.41.0.0 -> 5.41.3.0

---
 .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 3e89fb731d3..461db272b12 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -51,18 +51,18 @@ stdenv.mkDerivation rec {
   # You can get the upstream version and SHA-1 hash from the following URLs:
   # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA1'
   # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages | grep -E 'Version|SHA1'
-  version = "5.41.0.0";
+  version = "5.41.3.0";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
-        sha1 = "1c3cc0411444587b56178de4868eb5d0ff742ec0";
+        sha1 = "0bbc3d6997ba22ce712d93e5bc336c894b54fc81";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
-        sha1 = "0d31d726c5e9a49917e2749e73386b1c0fdcb376";
+        sha1 = "6eae0544858f85c68b0cc46d7786e990bd94f139";
       }
     else throw "Google Talk does not support your platform.";
 

From 75aaae34a973fcf967bd264d45fda23577d4be33 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@devalot.com>
Date: Fri, 13 Jan 2017 14:19:29 -0700
Subject: [PATCH 115/727] dovecot: Fix sieve scripts

Make sure that the output of the sieve compiler produces files that
have a newer time stamp than the source sieve script.  Otherwise you
get errors in the logs about Dovecot not being able to compile do to a
permission issue.
---
 nixos/modules/services/mail/dovecot.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 4c9df935deb..f2097638c63 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -241,6 +241,9 @@ in
         RuntimeDirectory = [ "dovecot2" ];
       };
 
+      # When copying sieve scripts preserve the original time stamp
+      # (should be 0) so that the compiled sieve script is newer than
+      # the source file and Dovecot won't try to compile it.
       preStart = ''
         rm -rf ${stateDir}/sieve
       '' + optionalString (cfg.sieveScripts != {}) ''
@@ -248,11 +251,11 @@ in
         ${concatStringsSep "\n" (mapAttrsToList (to: from: ''
           if [ -d '${from}' ]; then
             mkdir '${stateDir}/sieve/${to}'
-            cp "${from}/"*.sieve '${stateDir}/sieve/${to}'
+            cp -p "${from}/"*.sieve '${stateDir}/sieve/${to}'
           else
-            cp '${from}' '${stateDir}/sieve/${to}'
+            cp -p '${from}' '${stateDir}/sieve/${to}'
           fi
-           ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}'
+          ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}'
         '') cfg.sieveScripts)}
         chown -R '${cfg.mailUser}:${cfg.mailGroup}' '${stateDir}/sieve'
       '';

From 0a3bd8164830d2dec76cd5d97e59497b548ea3b3 Mon Sep 17 00:00:00 2001
From: Richard Lupton <richard.lupton@gmail.com>
Date: Fri, 13 Jan 2017 22:48:36 +0000
Subject: [PATCH 116/727] kubernetes-helm: 2.1.2 -> 2.1.3

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

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index a258a802477..f5496457157 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -4,12 +4,12 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if stdenv.isLinux
-             then "1797ab74720f122432eace591fb415e5e5f5db97f4b6608ca8dbe59bae988374"
-             else "2b522dcfe27e987138f7826c79fb26a187075dd9be5c5a4c76fd6846bf109014";
+             then "8bb6f9d336ca7913556e463c5b65eb8d69778c518df2fab0d20be943fbf0efc1"
+             else "94c9f2d511aec3d4b7dcc5f0ce6f846506169b4eb7235e1dc137d08edf408098";
 in
 stdenv.mkDerivation rec {
   pname = "helm";
-  version = "2.1.2";
+  version = "2.1.3";
   name = "${pname}-${version}";
 
   src = fetchurl {

From 4f130dd21986b2e983462ab10fc6bac139eeb558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 12 Jan 2017 23:04:17 +0100
Subject: [PATCH 117/727] manul: init at 2016-09-30

---
 pkgs/development/tools/manul/default.nix | 25 ++++++++
 pkgs/development/tools/manul/deps.nix    | 75 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 3 files changed, 102 insertions(+)
 create mode 100644 pkgs/development/tools/manul/default.nix
 create mode 100644 pkgs/development/tools/manul/deps.nix

diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix
new file mode 100644
index 00000000000..c4df52da170
--- /dev/null
+++ b/pkgs/development/tools/manul/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "manul-unstable-2016-09-30";
+
+  goPackagePath = "github.com/kovetskiy/manul";
+  excludedPackages = "tests";
+
+  src = fetchFromGitHub {
+    owner = "kovetskiy";
+    repo = "manul";
+    rev = "7bddb5404b9ecc66fd28075bb899c2d6dc7a1c51";
+    sha256 = "06kglxdgj1dfpc9bdnvhsh8z0c1pdbmwmfx4km01wpppzk06dnvm";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "The madness vendoring utility for Golang programs";
+    homepage = https://github.com/kovetskiy/manul;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/development/tools/manul/deps.nix b/pkgs/development/tools/manul/deps.nix
new file mode 100644
index 00000000000..e99a597b078
--- /dev/null
+++ b/pkgs/development/tools/manul/deps.nix
@@ -0,0 +1,75 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "github.com/PuerkitoBio/goquery";
+    fetch = {
+      type = "git";
+      url = "https://github.com/PuerkitoBio/goquery";
+      rev = "3cb3b8656883c2cc3deb9c643d93ea6e5157e425";
+      sha256 = "0qhyssjwv98jncsiph95iz77sygkismvpprsalqi3xm3k50xi6r7";
+    };
+  }
+  {
+    goPackagePath = "github.com/andybalholm/cascadia";
+    fetch = {
+      type = "git";
+      url = "https://github.com/andybalholm/cascadia";
+      rev = "349dd0209470eabd9514242c688c403c0926d266";
+      sha256 = "12ikz849vkdb3dsdn6mdpkihvm0hbmkplyi0qdcm7s4ib4n003b1";
+    };
+  }
+  {
+    goPackagePath = "github.com/kovetskiy/godocs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kovetskiy/godocs";
+      rev = "2d9428f80f3442e07f67daf7ba378cd0ff6cfe24";
+      sha256 = "128dlvxqk31crzl9p3ps0nir724cjzxv4lxpgdvsir0wvfp8f83j";
+    };
+  }
+  {
+    goPackagePath = "github.com/reconquest/executil-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/reconquest/executil-go";
+      rev = "e72bce509b1a5e89ab21f29c92830d4304620765";
+      sha256 = "06z05hl4bym5agv0h1vgksj0mx0l4987ganwqcfb153w7pclvan3";
+    };
+  }
+  {
+    goPackagePath = "github.com/reconquest/hierr-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/reconquest/hierr-go";
+      rev = "bbf802f3f943e7b6a364a485ccf90807f3bfcc0e";
+      sha256 = "1v3fssw881vcawc2abvp8abwb7705yzxrb0khbzmn8qvdpqwh7hl";
+    };
+  }
+  {
+    goPackagePath = "github.com/reconquest/ser-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/reconquest/ser-go";
+      rev = "47f084a1e4a5433ac3d6ab6cfe8c1e30028a4d76";
+      sha256 = "1hgafiqc3mlazs2zg4rqjm4sasy2gjrjl64cy8mmlg5cayvbj4hq";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6";
+      sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "6acef71eb69611914f7a30939ea9f6e194c78172";
+      sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26dc46ede51..3707a95a30a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13419,6 +13419,8 @@ in
 
   manuskript = callPackage ../applications/editors/manuskript { };
 
+  manul = callPackage ../development/tools/manul { };
+
   mi2ly = callPackage ../applications/audio/mi2ly {};
 
   praat = callPackage ../applications/audio/praat { };

From a798850675321c5104c78accfdeaaddfa76bfa27 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 13 Jan 2017 21:21:21 -0500
Subject: [PATCH 118/727] ghc with-packages-wrapper: Add support for
 cross-compiling

---
 pkgs/development/haskell-modules/with-packages-wrapper.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 7929d99de15..2dcf206cec9 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -32,8 +32,10 @@ let
   isGhcjs       = ghc.isGhcjs or false;
   ghc761OrLater = isGhcjs || lib.versionOlder "7.6.1" ghc.version;
   packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf";
-  ghcCommand    = if isGhcjs then "ghcjs" else "ghc";
-  ghcCommandCaps= lib.toUpper ghcCommand;
+  ghcCommand'    = if isGhcjs then "ghcjs" else "ghc";
+  crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else "";
+  ghcCommand = "${crossPrefix}${ghcCommand'}";
+  ghcCommandCaps= lib.toUpper ghcCommand';
   libDir        = "$out/lib/${ghcCommand}-${ghc.version}";
   docDir        = "$out/share/doc/ghc/html";
   packageCfgDir = "${libDir}/package.conf.d";

From a541f86f8b6095eaa4ee576d2655a0fe8dc9dad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Fri, 13 Jan 2017 19:28:06 +0100
Subject: [PATCH 119/727] services: ipfs: add emptyRepo option, refactor

---
 .../services/network-filesystems/ipfs.nix     | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 104b5b92620..d43147a16f3 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -67,6 +67,14 @@ in
         '';
       };
 
+      emptyRepo = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If set to true, the repo won't be initialized with help files
+        '';
+      };
+
       extraFlags = mkOption {
         type = types.listOf types.str;
         description = "Extra flags passed to the IPFS daemon";
@@ -103,16 +111,17 @@ in
       after = [ "network.target" "local-fs.target" ];
       path  = [ pkgs.ipfs pkgs.su pkgs.bash ];
 
-      preStart =
-        ''
-          install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}
-          if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then
-            cd ${cfg.dataDir}
-            ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs init"
-          fi
-          ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs config Addresses.API ${cfg.apiAddress}"
-          ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs config Addresses.Gateway ${cfg.gatewayAddress}"
-        '';
+      preStart = ''
+        install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}
+        if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then
+          cd ${cfg.dataDir}
+          ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \
+             "${ipfs}/bin/ipfs init ${if cfg.emptyRepo then "-e" else ""}"
+        fi
+        ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \
+           "${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress} && \
+            ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}"
+      '';
 
       serviceConfig = {
         ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}";

From 5c5648b1f66f44361048dc6c25ac52c858e84a79 Mon Sep 17 00:00:00 2001
From: Sheena Artrip <sheena.artrip@gmail.com>
Date: Fri, 13 Jan 2017 22:29:26 -0500
Subject: [PATCH 120/727] caddy: add package config option

---
 nixos/modules/services/web-servers/caddy.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index 0666dfddaff..619e0f90b12 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -39,6 +39,13 @@ in
       type = types.path;
       description = "The data directory, for storing certificates.";
     };
+
+    package = mkOption {
+      default = pkgs.caddy;
+      defaultText = "pkgs.caddy";
+      type = types.package;
+      description = "Caddy package to use.";
+    };
   };
 
   config = mkIf cfg.enable {
@@ -47,7 +54,7 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
-        ExecStart = ''${pkgs.caddy.bin}/bin/caddy -conf=${configFile} \
+        ExecStart = ''${cfg.package.bin}/bin/caddy -conf=${configFile} \
           -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"}
         '';
         Type = "simple";

From e00c61fd36d604585fb4285d270eca97a4a66262 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 14 Jan 2017 06:36:44 +0200
Subject: [PATCH 121/727] gnused: Fix cross build after upgrade to 4.3.0

Fixes:
````
  GEN      doc/sed.1
help2man: can't get `--help' info from sed/sed
make[2]: *** [Makefile:5775: doc/sed.1] Error 126
make[2]: Leaving directory '/tmp/nix-build-gnused-4.3-arm-linux-gnueabihf.drv-0/sed-4.3'
make[1]: *** [Makefile:3024: all-recursive] Error 1
make[1]: Leaving directory '/tmp/nix-build-gnused-4.3-arm-linux-gnueabihf.drv-0/sed-4.3'
make: *** [Makefile:2156: all] Error 2
````

http://hydra.nixos.org/build/46051086/nixlog/11/raw
---
 pkgs/tools/text/gnused/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index aa25101636e..ca038b3ccb4 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl ];
   preConfigure = "patchShebangs ./build-aux/help2man";
 
+  crossAttrs = {
+    # The tarball ships with a fine prebuilt manpage, but the make rules try to rebuild it,
+    # which won't work when cross compiling as help2man needs to execute the binaries.
+    postConfigure = ''
+      sed -i Makefile -e 's|doc/sed\.1:|dummy:|'
+    '';
+  };
+
   meta = {
     homepage = http://www.gnu.org/software/sed/;
     description = "GNU sed, a batch stream editor";

From 5ad75554b685dcfd0bde8fe0bcc2074ce5659e3d Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 14 Jan 2017 09:37:48 +0100
Subject: [PATCH 122/727] lean: 2017-01-06 -> 2017-01-14

---
 pkgs/applications/science/logic/lean/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index ece867de2a0..52cdca0b169 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lean-${version}";
-  version = "2017-01-06";
+  version = "2017-01-14";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
-    rev    = "6f8ccb5873b6f72d735e700e25044e99c6ebb7b6";
-    sha256 = "1nxbqdc6faxivbrifb7b9j5zl5kml9w5pa63afh93z2ng7mn0jyg";
+    rev    = "6e9a6d15dbfba3e8a1560d2cfcdbc7d81314d7bb";
+    sha256 = "0wi1jssj1bi45rji4prlnvzs8nr48mqnj9yg5vnhah4rsjwl20km";
   };
 
   buildInputs = [ gmp mpfr cmake gperftools ];

From 99d0e1d84baf660cb7d4be3985b53a8f3a48e13a Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sat, 14 Jan 2017 08:39:36 +0000
Subject: [PATCH 123/727] haskellPackages.lentil: override dep versions

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8395898b2d9..82a220010fa 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1153,4 +1153,11 @@ self: super: {
   turtle_1_3_0 = super.turtle_1_3_0.overrideScope (self: super: {
     optparse-applicative = self.optparse-applicative_0_13_0_0;
   });
+
+  lentil = super.lentil.overrideScope (self: super: {
+    pipes = self.pipes_4_3_2;
+    optparse-applicative = self.optparse-applicative_0_13_0_0;
+    # https://github.com/roelvandijk/terminal-progress-bar/issues/14
+    terminal-progress-bar = doJailbreak self.terminal-progress-bar_0_1_1;
+  });
 }

From 8d67d5689ca4d48d58fe43fdae3fffd476e4515a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 24 Dec 2016 00:53:15 +0100
Subject: [PATCH 124/727] pyroute2: init at 0.4.12

---
 .../python-modules/pyroute2/default.nix       | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  6 ++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyroute2/default.nix

diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
new file mode 100644
index 00000000000..7fb7b7f5e68
--- /dev/null
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -0,0 +1,21 @@
+{stdenv, buildPythonPackage, fetchurl}:
+
+buildPythonPackage rec {
+  name = "pyroute2-0.4.12";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
+    sha256 = "0csp6y38pgswhn46rivdgrlqw99dpjzwa0g32h6iiaj12n2f9qlq";
+  };
+
+  # requires root priviledges
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python Netlink library";
+    homepage = https://github.com/svinota/pyroute2;
+    license = licenses.asl20;
+    maintainers = [maintainers.mic92];
+    platform = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e58cc0f63fe..30638781e8b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9207,6 +9207,8 @@ in {
     propagatedBuildInputs = with self; [ pyramid hawkauthlib tokenlib webtest ];
   };
 
+  pyroute2 = callPackage ../development/python-modules/pyroute2 { };
+
   pyspf = buildPythonPackage rec {
     name = "pyspf-${version}";
     version = "2.0.12";
@@ -20064,8 +20066,8 @@ in {
 
     buildInputs = [ pkgs.libev ];
 
-    libEvSharedLibrary = 
-      if !stdenv.isDarwin  
+    libEvSharedLibrary =
+      if !stdenv.isDarwin
       then "${pkgs.libev}/lib/libev.so.4"
       else "${pkgs.libev}/lib/libev.4.dylib";
 

From 0121066f5f34701a4c404d04434083fb83f82942 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 12 Oct 2016 12:20:40 +0200
Subject: [PATCH 125/727] camlidl: fix build with OCaml 4.03

 by making warning 31 non fatal
---
 pkgs/development/tools/ocaml/camlidl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index feedd883548..780862b6727 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
     substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out
     substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl
     substituteInPlace config/Makefile --replace CPP=/lib/cpp CPP=${stdenv.cc}/bin/cpp
+    substituteInPlace config/Makefile --replace "OCAMLC=ocamlc -g" "OCAMLC=ocamlc -g -warn-error -31"
     mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml
   '';
 

From 2f2fbc9966f56789d6f513ba7d57cea6b5797d7c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 12 Oct 2016 12:12:46 +0200
Subject: [PATCH 126/727] ocamlPackages.mlgmpidl: init at 1.2.4

mlgmpidl is an OCaml interface to the GMP library.

Homepage: https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/
---
 .../ocaml-modules/mlgmpidl/default.nix        | 36 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/mlgmpidl/default.nix

diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix
new file mode 100644
index 00000000000..7e12abe386b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, camlidl, gmp, mpfr }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-mlgmpidl-${version}";
+  version = "1.2.4";
+  src = fetchFromGitHub {
+    owner = "nberth";
+    repo = "mlgmpidl";
+    rev = version;
+    sha256 = "09f9rk2bavhb7cdwjpibjf8bcjk59z85ac9dr8nvks1s842dp65s";
+  };
+
+  buildInputs = [ gmp mpfr ocaml findlib camlidl ];
+
+  configurePhase = ''
+    cp Makefile.config.model Makefile.config
+    sed -i Makefile.config \
+      -e 's|^MLGMPIDL_PREFIX.*$|MLGMPIDL_PREFIX = $out|' \
+      -e 's|^GMP_PREFIX.*$|GMP_PREFIX = ${gmp.dev}|' \
+      -e 's|^MPFR_PREFIX.*$|MPFR_PREFIX = ${mpfr.dev}|' \
+      -e 's|^CAMLIDL_DIR.*$|CAMLIDL_DIR = ${camlidl}/lib/ocaml/${ocaml.version}/site-lib/camlidl|'
+    echo HAS_NATIVE_PLUGINS = 1 >> Makefile.config
+    sed -i Makefile \
+      -e 's|^	/bin/rm |	rm |'
+  '';
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "OCaml interface to the GMP library";
+    homepage = https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/;
+    license = stdenv.lib.licenses.lgpl21;
+    inherit (ocaml.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 91e349eede9..c66bd2e518f 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -263,6 +263,8 @@ let
 
     mlgmp =  callPackage ../development/ocaml-modules/mlgmp { };
 
+    mlgmpidl =  callPackage ../development/ocaml-modules/mlgmpidl { };
+
     nocrypto =  callPackage ../development/ocaml-modules/nocrypto {
       lwt = ocaml_lwt;
     };

From 67a583333057efd0ba1b16af6388881c365c703e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 12 Oct 2016 12:35:21 +0200
Subject: [PATCH 127/727] ocamlPackages.apron: init at 20160125

APRON is an OCaml library of numerical abstract domains

Homepage: http://apron.cri.ensmp.fr/library/
---
 .../ocaml-modules/apron/default.nix           | 24 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/apron/default.nix

diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix
new file mode 100644
index 00000000000..0e73c6a73d3
--- /dev/null
+++ b/pkgs/development/ocaml-modules/apron/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchzip, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-apron-${version}";
+  version = "20160125";
+  src = fetchzip {
+    url = "http://apron.gforge.inria.fr/apron-${version}.tar.gz";
+    sha256 = "1a7b7b9wsd0gdvm41lgg6ayb85wxc2a3ggcrghy4qiphs4b9v4m4";
+  };
+
+  buildInputs = [ perl gmp mpfr ppl ocaml findlib camlidl ];
+  propagatedBuildInputs = [ mlgmpidl ];
+
+  prefixKey = "-prefix ";
+  createFindlibDestdir = true;
+
+  meta = {
+    license = stdenv.lib.licenses.lgpl21;
+    homepage = http://apron.cri.ensmp.fr/library/;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    description = "Numerical abstract domain library";
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index c66bd2e518f..4b4d1e150b3 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -20,6 +20,8 @@ let
 
     ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { };
 
+    apron = callPackage ../development/ocaml-modules/apron { };
+
     asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { };
 
     astring = callPackage ../development/ocaml-modules/astring { };

From 939e2d702f494d25a0bbfd788d5c83b59866eb8d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 12 Oct 2016 13:20:57 +0200
Subject: [PATCH 128/727] frama-c: link to the apron library

---
 .../tools/analysis/frama-c/default.nix          | 17 ++++++++++++++---
 .../tools/analysis/frama-c/dynamic.diff         | 12 ++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/tools/analysis/frama-c/dynamic.diff

diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index fc817a8e391..a1239c6a121 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -1,6 +1,11 @@
-{ stdenv, fetchurl, ncurses, ocamlPackages, graphviz
+{ stdenv, fetchurl, makeWrapper, ncurses, ocamlPackages, graphviz
 , ltl2ba, coq, alt-ergo, why3 }:
 
+let
+  mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib";
+  ocamlpath = "${mkocamlpath ocamlPackages.apron}:${mkocamlpath ocamlPackages.mlgmpidl}";
+in
+
 stdenv.mkDerivation rec {
   name    = "frama-c-${version}";
   version = "20160501";
@@ -16,9 +21,11 @@ stdenv.mkDerivation rec {
     sha256 = "1335bhq9v3h46m8aba2c5myi9ghm87q41in0m15xvdrwq5big1jg";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   buildInputs = with ocamlPackages; [
     ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph
-    lablgtk coq graphviz zarith why3 zarith
+    lablgtk coq graphviz zarith why3 apron
   ];
 
 
@@ -38,11 +45,15 @@ stdenv.mkDerivation rec {
     FRAMAC=$out/bin/frama-c ./configure --prefix=$out
     make
     make install
+    for p in $out/bin/frama-c{,-gui};
+    do
+      wrapProgram $p --prefix OCAMLPATH ':' ${ocamlpath}
+    done
   '';
 
-
   # Enter frama-c directory before patching
   prePatch = ''cd frama*'';
+  patches = [ ./dynamic.diff ];
   postPatch = ''
     # strip absolute paths to /usr/bin
     for file in ./configure ./share/Makefile.common ./src/*/configure; do
diff --git a/pkgs/development/tools/analysis/frama-c/dynamic.diff b/pkgs/development/tools/analysis/frama-c/dynamic.diff
new file mode 100644
index 00000000000..7ab2b32de1e
--- /dev/null
+++ b/pkgs/development/tools/analysis/frama-c/dynamic.diff
@@ -0,0 +1,12 @@
+--- a/src/kernel_services/plugin_entry_points/dynamic.ml	2016-05-30 16:15:22.000000000 +0200
++++ b/src/kernel_services/plugin_entry_points/dynamic.ml	2016-10-13 18:25:31.000000000 +0200
+@@ -287,7 +287,8 @@
+         (List.fold_right (add_dir ~user:false) Config.plugin_dir []) ;
+     let pkgs = ref [] in
+     List.iter (scan_directory pkgs) !load_path ;
+-    let findlib_path = String.concat ":" !load_path in
++    let findlib_path = String.concat ":" (!load_path @
++      try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in
+     Klog.debug ~dkey "setting findlib path to %s" findlib_path;
+     Findlib.init ~env_ocamlpath:findlib_path ();
+     load_packages (List.rev !pkgs) ;

From f0c230c2c7cc5c88b0d80b95ca61d86d1dfb700f Mon Sep 17 00:00:00 2001
From: Ganesh Sittampalam <ganesh@earth.li>
Date: Sat, 14 Jan 2017 10:48:38 +0000
Subject: [PATCH 129/727] selenium-server-standalone: restore htmlunit-driver
 support It was moved to a separate project between versions 2.45 and 2.53:
 https://github.com/SeleniumHQ/selenium/commit/2d3150b

---
 .../selenium/htmlunit-driver/default.nix      | 25 +++++++++++++++++++
 .../tools/selenium/server/default.nix         |  7 +++---
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/tools/selenium/htmlunit-driver/default.nix

diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix
new file mode 100644
index 00000000000..2fc38db1bb0
--- /dev/null
+++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "htmlunit-driver-standalone-${version}";
+  version = "2.21";
+
+  src = fetchurl {
+    url = "https://github.com/SeleniumHQ/htmlunit-driver/releases/download/${version}/htmlunit-driver-standalone-${version}.jar";
+    sha256 = "1wrbam0hb036717z3y73lsw4pwp5sdiw2i1818kg9pvc7i3fb3yn";
+  };
+
+  unpackPhase = "true";
+
+  installPhase = "install -D $src $out/share/lib/${name}/${name}.jar";
+
+  meta = {
+    homepage = https://github.com/SeleniumHQ/htmlunit-driver;
+    description = "A WebDriver server for running Selenium tests on the HtmlUnit headless browser";
+    maintainers = with maintainers; [ coconnor offline ];
+    platforms = platforms.all;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index fe8bf2b13b5..ca225adab6d 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg
-, chromedriver, chromeSupport ? true }:
+, htmlunit-driver, chromedriver, chromeSupport ? true }:
 
 with stdenv.lib;
 
@@ -25,8 +25,9 @@ in stdenv.mkDerivation rec {
     mkdir -p $out/share/lib/${name}
     cp $src $out/share/lib/${name}/${name}.jar
     makeWrapper ${jre}/bin/java $out/bin/selenium-server \
-      --add-flags "-jar $out/share/lib/${name}/${name}.jar" \
-      --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"}
+      --add-flags "-cp ${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar:$out/share/lib/${name}/${name}.jar" \
+      --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \
+      --add-flags "org.openqa.grid.selenium.GridLauncher"
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f0085c2bca..ab9d1d692b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6356,6 +6356,8 @@ in
 
   heroku = callPackage ../development/tools/heroku { };
 
+  htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { };
+
   hyenae = callPackage ../tools/networking/hyenae { };
 
   icestorm = callPackage ../development/tools/icestorm { };

From 2dda1ed3ad57f7acd3a58c1f874a4b2786261188 Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Fri, 13 Jan 2017 16:59:46 -0500
Subject: [PATCH 130/727] solc: 0.4.6 -> 0.4.8

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

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 0935891dcbd..354c8f4e5f5 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchgit, boost, cmake, jsoncpp }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.6";
+  version = "0.4.8";
   name = "solc-${version}";
 
   # Cannot use `fetchFromGitHub' because of submodules
   src = fetchgit {
     url = "https://github.com/ethereum/solidity";
-    rev = "2dabbdf06f414750ef0425c664f861aeb3e470b8";
-    sha256 = "0q1dvizx60f7l97w8241wra7vpghimc9x7gzb18vn34sxv4bqy9g";
+    rev = "60cc1668517f56ce6ca8225555472e7a27eab8b0";
+    sha256 = "09mwah7c5ca1bgnqp5qgghsi6mbsi7p16z8yxm0aylsn2cjk23na";
   };
 
   patchPhase = ''

From a04337d5c82f69bb8f026c74fdbd0e9b6697a573 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jan 2017 13:44:19 +0100
Subject: [PATCH 131/727] smplayer: 16.1.0 -> 16.11.0

---
 pkgs/applications/video/smplayer/basegui.cpp.patch | 11 -----------
 pkgs/applications/video/smplayer/default.nix       |  9 ++++-----
 2 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/applications/video/smplayer/basegui.cpp.patch

diff --git a/pkgs/applications/video/smplayer/basegui.cpp.patch b/pkgs/applications/video/smplayer/basegui.cpp.patch
deleted file mode 100644
index 05664ee96e6..00000000000
--- a/pkgs/applications/video/smplayer/basegui.cpp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/basegui.cpp	2014-08-20 01:04:51.000000000 +0100
-+++ b/src/basegui.cpp	2014-10-11 10:25:57.561983556 +0100
-@@ -5235,7 +5235,7 @@
- #ifdef YOUTUBE_SUPPORT
- void BaseGui::showTubeBrowser() {
- 	qDebug("BaseGui::showTubeBrowser");
--	QString exec = Paths::appPath() + "/smtube";
-+	QString exec = "smtube";
- 	qDebug("BaseGui::showTubeBrowser: '%s'", exec.toUtf8().constData());
- 	if (!QProcess::startDetached(exec, QStringList())) {
- 		QMessageBox::warning(this, "SMPlayer",
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 15b178fc8e6..118d416df05 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,16 +1,15 @@
 { stdenv, fetchurl, qmakeHook, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-16.1.0";
+  name = "smplayer-16.11.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "1jfqpmbbjrs9lna44dp10zblj7b0cras9sb0nczycpkcsdi9np6j";
+    sha256 = "0nhbr33p21qb7n6wry0nkavl5nfjzl5yylrhnxz0pyv69n5msfp5";
   };
 
-  patches = [ ./basegui.cpp.patch ];
-
-  buildInputs = [ qmakeHook qtscript ];
+  buildInputs = [ qtscript ];
+  nativeBuildInputs = [ qmakeHook ];
 
   dontUseQmakeConfigure = true;
 

From d535b2df06e0d1e8cd38143a2000deb07fc074f9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jan 2017 14:09:20 +0100
Subject: [PATCH 132/727] smtube: 16.1.0 -> 16.7.2

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

diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 729c90d052c..5026e6c4831 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }:
 
 stdenv.mkDerivation rec {
-  version = "16.1.0";
+  version = "16.7.2";
   name = "smtube-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
-    sha256 = "1yjn7gj5pfw8835gfazk29mhcvfh1dhfjqmbqln1ajxr89imjj4r";
+    sha256 = "0k64hc6grn4nlp739b0w5fznh0k9xx9qdwx6s7w3fb5m5pfkdrmm";
   };
 
   makeFlags = [

From 4e88fe4998eca8ac15f8ac36c587471ef477b8df Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jan 2017 14:55:18 +0100
Subject: [PATCH 133/727] grass: fix build

---
 pkgs/applications/gis/grass/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index 7d2828115f7..790997e328b 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
   postInstall = ''
     wrapProgram $out/bin/grass70 \
     --set PYTHONPATH $PYTHONPATH \
-    --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable}
+    --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \
     --suffix LD_LIBRARY_PATH ':' '${gdal}/lib'
     ln -s $out/grass-*/lib $out/lib
   '';

From 7d75dd71dc2ec829bc16a5ea074df0afa4bffc02 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jan 2017 15:36:02 +0100
Subject: [PATCH 134/727] coqPackages.coq-ext-lib: 0.9.3 -> 0.9.{4,5}

---
 pkgs/development/coq-modules/coq-ext-lib/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
index d35c062d6e4..ed9312b5c57 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -3,7 +3,8 @@
 let param =
   {
     "8.4" = { version = "0.9.0"; sha256 = "1n3bk003vvbghbrxkhal6drnc0l65jv9y77wd56is3jw9xgiif0w"; };
-    "8.5" = { version = "0.9.3"; sha256 = "05zff5mrkxpvcsw4gi8whjj5w0mdbqzjmb247lq5b7mry0bypwc5"; };
+    "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; };
+    "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
   }."${coq.coq-version}";
 in
 

From d2413943fa3a66c63df5a13822523067468c2f60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 22 Dec 2016 23:18:39 +0100
Subject: [PATCH 135/727] nixos/prometheus: add configText option for
 alertmanager

The reason being less mental overhead when reading upstream
documentation. Examples can be pasted right into the configuration
instead of translating to Nix attrset first.
---
 .../monitoring/prometheus/alertmanager.nix      | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index da2cd02eaa3..cf761edad92 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@@ -5,6 +5,10 @@ with lib;
 let
   cfg = config.services.prometheus.alertmanager;
   mkConfigFile = pkgs.writeText "alertmanager.yml" (builtins.toJSON cfg.configuration);
+  alertmanagerYml =
+    if cfg.configText != null then
+      pkgs.writeText "alertmanager.yml" cfg.configText
+    else mkConfigFile;
 in {
   options = {
     services.prometheus.alertmanager = {
@@ -34,6 +38,17 @@ in {
         '';
       };
 
+      configText = mkOption {
+        type = types.nullOr types.lines;
+        default = null;
+        description = ''
+          Alertmanager configuration as YAML text. If non-null, this option
+          defines the text that is written to alertmanager.yml. If null, the
+          contents of alertmanager.yml is generated from the structured config
+          options.
+        '';
+      };
+
       logFormat = mkOption {
         type = types.nullOr types.str;
         default = null;
@@ -96,7 +111,7 @@ in {
       after    = [ "network.target" ];
       script = ''
         ${pkgs.prometheus-alertmanager.bin}/bin/alertmanager \
-        -config.file ${mkConfigFile} \
+        -config.file ${alertmanagerYml} \
         -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
         -log.level ${cfg.logLevel} \
         ${optionalString (cfg.webExternalUrl != null) ''-web.external-url ${cfg.webExternalUrl} \''}

From f537f842d6509df67971b6dd60782ed0d24ca85d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jan 2017 15:52:03 +0100
Subject: [PATCH 136/727] coqPackages.flocq: 2.5.1 -> 2.5.2

---
 pkgs/development/coq-modules/flocq/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix
index 09af50db971..30ec69ba653 100644
--- a/pkgs/development/coq-modules/flocq/default.nix
+++ b/pkgs/development/coq-modules/flocq/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
 
-  name = "coq-flocq-${coq.coq-version}-${version}";
-  version = "2.5.1";
+  name = "coq${coq.coq-version}-flocq-${version}";
+  version = "2.5.2";
 
   src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/35430/flocq-2.5.1.tar.gz;
-    sha256 = "1a0gznvg32ckxgs3jzznc1368p8x2ny4vfwrnavb3h0ljcl1mlzy";
+    url = https://gforge.inria.fr/frs/download.php/file/36199/flocq-2.5.2.tar.gz;
+    sha256 = "0h5mlasirfzc0wwn2isg4kahk384n73145akkpinrxq5jsn5d22h";
   };
 
   buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ];

From 2fe19b18e84d990c611b421c7fd5b5abac302077 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sat, 14 Jan 2017 15:53:43 +0100
Subject: [PATCH 137/727] clerk: fix version string

---
 pkgs/applications/audio/clerk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix
index 3599991551c..babbcc51e40 100644
--- a/pkgs/applications/audio/clerk/default.nix
+++ b/pkgs/applications/audio/clerk/default.nix
@@ -2,7 +2,7 @@
 utillinux, pythonPackages, libnotify }:
 
 stdenv.mkDerivation {
-  name = "clerk-unstable-2016-10-14";
+  name = "clerk-2016-10-14";
 
   src = fetchFromGitHub {
     owner = "carnager";

From 503329e0506d1e21000e03241e12809fed46c249 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jan 2017 16:32:16 +0100
Subject: [PATCH 138/727] bluefish: 2.2.7 -> 2.2.9

And fix some missing icons
---
 pkgs/applications/editors/bluefish/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix
index 25538df0384..59e8076c787 100644
--- a/pkgs/applications/editors/bluefish/default.nix
+++ b/pkgs/applications/editors/bluefish/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, intltool, pkgconfig , gtk, libxml2
-, enchant, gucharmap, python
+{ stdenv, fetchurl, intltool, wrapGAppsHook, pkgconfig , gtk, libxml2
+, enchant, gucharmap, python, gnome3
 }:
 
 stdenv.mkDerivation rec {
-  name = "bluefish-2.2.7";
+  name = "bluefish-2.2.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/bluefish/${name}.tar.bz2";
-    sha256 = "1psqx3ljz13ylqs4zkaxv9lv1hgzld6904kdp0alwx99p5rlnlr3";
+    sha256 = "1l7pg6h485yj84i34jr09y8qzc1yr4ih6w5jdhmnrg156db7nwav";
   };
 
-  buildInputs = [ intltool pkgconfig gtk libxml2
+  nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
+  buildInputs = [ gnome3.defaultIconTheme gtk libxml2
     enchant gucharmap python ];
 
   meta = with stdenv.lib; {

From f7fc5d256429180593b0235b67272c1a5263ca88 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jan 2017 16:49:32 +0100
Subject: [PATCH 139/727] matio: 1.5.2 -> 1.5.9

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

diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix
index da4b8a8570b..b33950d35e0 100644
--- a/pkgs/development/libraries/matio/default.nix
+++ b/pkgs/development/libraries/matio/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "matio-1.5.2";
+  name = "matio-1.5.9";
   src = fetchurl {
     url = "mirror://sourceforge/matio/${name}.tar.gz";
-    sha256 = "0i8xj4g1gv50y6lj3s8hasjqspaawqbrnc06lrkdghvk6gxx00nv";
+    sha256 = "0p60c3wdj4w7v7hzdc0iivciq4hwxzhhx0zq8gpv9i8yhdjzkdxy";
   };
 
   meta = with stdenv.lib; {

From 5fff41c94807d6933ba791363187e0a48d096909 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jan 2017 16:49:57 +0100
Subject: [PATCH 140/727] getdata: 0.8.9 -> 0.9.4

---
 pkgs/development/libraries/getdata/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix
index e3dfc9fe0a9..5dbf22df552 100644
--- a/pkgs/development/libraries/getdata/default.nix
+++ b/pkgs/development/libraries/getdata/default.nix
@@ -1,9 +1,10 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "getdata-0.8.9";
+  name = "getdata-${version}";
+  version = "0.9.4";
   src = fetchurl {
-    url = "mirror://sourceforge/getdata/${name}.tar.bz2";
-    sha256 = "1cgwrflpp9ia2cwnhmwp45nmsg15ymjh03pysrfigyfmag94ac51";
+    url = "mirror://sourceforge/getdata/${name}.tar.xz";
+    sha256 = "0kikla8sxv6f1rlh77m86dajcsa7b1029zb8iigrmksic27mj9ja";
   };
 
   meta = with stdenv.lib; {

From 9158b89fd3b424c40e385b5b17b0208bf109a611 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 14 Jan 2017 11:01:52 -0500
Subject: [PATCH 141/727] linux: 4.4.41 -> 4.4.42

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index f3eceb5fe26..82126f8a680 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.41";
+  version = "4.4.42";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1z26frg7sx5n9bvkpg9pfspwhxxvlnnfnrnjr7aqhcgsbxzq8vca";
+    sha256 = "0y788bnhfddackx19lhs1y3qpxb8m28v5j2yxvih7wljirb4firj";
   };
 
   kernelPatches = args.kernelPatches;

From 295337ead544c4726a83321562e4d73c09fa7a5c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 14 Jan 2017 11:02:26 -0500
Subject: [PATCH 142/727] linux: 4.9.2 -> 4.9.3

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 29f0eba7175..b39e0e023c7 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.2";
+  version = "4.9.3";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0f2p12pkzgrh9k5c7g2wwjnv6gzqha8bgd7b0qgbzq3ss7nrmnld";
+    sha256 = "1a7cn0bfxjyrn4va3cgylbs32k30zigqavzgan720zj761icmyvl";
   };
 
   kernelPatches = args.kernelPatches;

From 139ed790da0cb7bc8d40e6e0ba64500e67e6b985 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jan 2017 17:03:56 +0100
Subject: [PATCH 143/727] qarte: 3.2.0+146 -> 3.2.0+158

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

diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix
index 40011e11b2d..8bfe3c0b91f 100644
--- a/pkgs/applications/video/qarte/default.nix
+++ b/pkgs/applications/video/qarte/default.nix
@@ -3,11 +3,11 @@
 let
   pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 sip ]);
 in stdenv.mkDerivation {
-  name = "qarte-3.2.0";
+  name = "qarte-3.2.0+158";
   src = fetchbzr {
     url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-3;
-    rev = "146";
-    sha256 = "0dvl38dknmnj2p4yr25p88kw3mh502c6qdp2bd43bhd2sqc3b0v0";
+    rev = "158";
+    sha256 = "0nj9yxylz1nz0hdjm0jzrq2l3dgfdqkafwxnzydp6qv6261w564n";
   };
 
   buildInputs = [ makeWrapper pythonEnv ];

From afb73be9f7de5ee4c69419aa47916caf23c806a1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 14 Jan 2017 11:03:37 -0500
Subject: [PATCH 144/727] busybox: 1.26.1 -> 1.26.2

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

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index b3502d269b0..4956f13950d 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -26,11 +26,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.26.1";
+  name = "busybox-1.26.2";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "1wl1yy82am53srhgpi1w04hs5hbqjljrrxwwfic35k1mza3y9fqg";
+    sha256 = "05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns";
   };
 
   hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];

From e1d0c9ae2051f3d121160c1dd68e4696c03fa2e1 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 14 Jan 2017 17:38:46 +0100
Subject: [PATCH 145/727] rustc: disable parallel building because of
 https://github.com/rust-lang/rust/issues/30181

https://github.com/NixOS/nixpkgs/pull/21742
---
 pkgs/development/compilers/rust/rustc.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 190bb1a69fd..056177fd265 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -142,7 +142,9 @@ stdenv.mkDerivation {
   doCheck = true;
   dontSetConfigureCross = true;
 
-  enableParallelBuilding = true;
+  # https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764
+  # https://github.com/rust-lang/rust/issues/30181
+  # enableParallelBuilding = false;
 
   meta = with stdenv.lib; {
     homepage = http://www.rust-lang.org/;

From fe6e4e24645f3c6a396934ff9a8898f9617fa1d7 Mon Sep 17 00:00:00 2001
From: Clemens Lutz <lutzcle@cml.li>
Date: Sat, 14 Jan 2017 17:55:27 +0100
Subject: [PATCH 146/727] makemkv: 1.9.10 -> 1.10.4

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

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 6a13bcc015a..c156c5d607f 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -4,17 +4,17 @@
 
 stdenv.mkDerivation rec {
   name = "makemkv-${ver}";
-  ver = "1.9.10";
+  ver = "1.10.4";
   builder = ./builder.sh;
 
   src_bin = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
-    sha256 = "1i5nqk5gyin6rgvc0fy96pdzq0wsmfvsm6w9mfsibj0yrfqnhi6r";
+    sha256 = "bc6f66897c09b0b756b352cc02a092c5b3a9547e4c129b3472ae4c605eff94aa";
   };
 
   src_oss = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
-    sha256 = "1ypc2hisx71kpmjwxnlq6zh4q6r2i1p32gapb0ampjflcjyvx5dk";
+    sha256 = "bacbd6a27ebd67f2e6f6c4356cafb92918d54a8bb15872f694232043039f63c4";
   };
 
   buildInputs = [openssl qt4 mesa zlib pkgconfig libav];

From 10b0a6d411d6ad66a553adfc4d1677526df24178 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 13 Jan 2017 18:10:33 +0100
Subject: [PATCH 147/727] altcoins.stellar-core: assertion fails on i686

---
 pkgs/applications/altcoins/stellar-core.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix
index 8d365590147..b098ffdd1db 100644
--- a/pkgs/applications/altcoins/stellar-core.nix
+++ b/pkgs/applications/altcoins/stellar-core.nix
@@ -39,7 +39,7 @@ in stdenv.mkDerivation {
       store historical records of the ledger and participate in consensus.
     '';
     homepage = https://www.stellar.org/;
-    platforms = platforms.linux;
+    platforms = "x86_64-linux";
     maintainers = with maintainers; [ chris-martin ];
     license = licenses.asl20;
   };

From 34b6f1f18b22743de12eac6397fffd108512dd7d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 13 Jan 2017 18:11:01 +0100
Subject: [PATCH 148/727] angband: pin to ncurses5 to fix build

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

diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix
index c0445811f39..34b31cdf7ec 100644
--- a/pkgs/games/angband/default.nix
+++ b/pkgs/games/angband/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, ncurses }:
+{ stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }:
 
 stdenv.mkDerivation rec {
   version = "4.0.5";
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses5 ];
   installFlags = "bindir=$(out)/bin";
 
   meta = with stdenv.lib; {
     homepage = http://rephial.org/;
     description = "A single-player roguelike dungeon exploration game";
-    maintainers = [ maintainers.chattered  ];
+    maintainers = [ maintainers.chattered ];
     license = licenses.gpl2;
   };
 }

From b20e130a46a52f09c62dd1b3f3a718c1c750235a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20G=C3=B6tz?= <stefan.goetz@uni-ulm.de>
Date: Sat, 14 Jan 2017 18:43:53 +0100
Subject: [PATCH 149/727] youtube-dl: 2017-01-10 -> 2017-01-14

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 6822f79baf1..ef2164b5a14 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.01.10";
+  version = "2017.01.14";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "6493d1400c5735221d65688548ada4d45875f25562f7c49c73263d9ae4369932";
+    sha256 = "76c8bd77db6c820bfa72f1e2a873101ca736fd1d9954ccebf349fa7caef99cca";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From e8d3c74b499ad026e40ca77f54214444f9461e3c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 14 Jan 2017 12:57:58 -0500
Subject: [PATCH 150/727] util-linux: 2.28.1 -> 2.29

---
 pkgs/os-specific/linux/util-linux/default.nix      |  6 +++---
 .../rtcwake-search-PATH-for-shutdown.patch         | 14 +++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index f8461113903..f6e26f51cc8 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -4,12 +4,12 @@ stdenv.mkDerivation rec {
   name = "util-linux-${version}";
   version = lib.concatStringsSep "." ([ majorVersion ]
     ++ lib.optional (patchVersion != "") patchVersion);
-  majorVersion = "2.28";
-  patchVersion = "1";
+  majorVersion = "2.29";
+  patchVersion = "";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
-    sha256 = "03xnaw3c7pavxvvh1vnimcr44hlhhf25whawiyv8dxsflfj4xkiy";
+    sha256 = "1rzrmdrz51p9sy7vlw5qmj8pmqazm7hgcch5yq242mkvrikyln9c";
   };
 
   patches = [
diff --git a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
index 3615984ed0c..2dd3fcc4ebe 100644
--- a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
+++ b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
@@ -3,21 +3,17 @@ which isn't valid on NixOS (and a compatibility link on most other modern
 distros anyway).
 
   -- nckx <tobias.geerinckx.rice@gmail.com>
-diff --git a/include/pathnames.h b/include/pathnames.h
-index de6a13c..0c1aeb9 100644
 --- a/include/pathnames.h
 +++ b/include/pathnames.h
-@@ -50,7 +50,7 @@
- #define	_PATH_VAR_NOLOGIN	"/var/run/nologin"
- 
+@@ -53,7 +53,7 @@
+ #ifndef _PATH_LOGIN
  #define _PATH_LOGIN		"/bin/login"
+ #endif
 -#define _PATH_SHUTDOWN		"/sbin/shutdown"
-+#define _PATH_SHUTDOWN		"shutdown"
- 
++#define _PATH_SHUTDOWN   "shutdown"
+
  #define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"
  #define _PATH_TERMCOLORS_DIR	"/etc/" _PATH_TERMCOLORS_DIRNAME
-diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
-index 7c748dc..9a99a7c 100644
 --- a/sys-utils/rtcwake.c
 +++ b/sys-utils/rtcwake.c
 @@ -575,7 +575,7 @@ int main(int argc, char **argv)

From b518598a402a294d0ffdd84a92d324440265777d Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@yahoo.com>
Date: Sat, 14 Jan 2017 13:21:10 -0500
Subject: [PATCH 151/727] gzip: `xz.bin` should be native input---accidentally
 worked because `bin` (#21887)

Otherwise http://hydra.nixos.org/build/46501984/nixlog/2
---
 pkgs/tools/compression/gzip/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index 31a67b1baf9..5a27d336c29 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ xz.bin ];
+  nativeBuildInputs = [ xz.bin ];
 
   preConfigure = if stdenv.isCygwin then ''
     sed -i lib/fpending.h -e 's,include <stdio_ext.h>,,'

From 14da7be1b957c71007ed8f520c3fe2d8b85d2d9d Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 14 Jan 2017 10:51:53 -0800
Subject: [PATCH 152/727] haskellPackages.GLUT: remove freeglut on darwin

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8395898b2d9..701410d57e9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1042,7 +1042,10 @@ self: super: {
   # Note: Simply patching the dynamic library (.so) of the GLUT build will *not* work, since the
   # RPATH also needs to be propagated when using static linking. GHC automatically handles this for
   # us when we patch the cabal file (Link options will be recored in the ghc package registry).
-  GLUT = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut;
+  #
+  # Additional note: nixpkgs' freeglut and macOS's OpenGL implementation do not cooperate,
+  # so disable this on Darwin only
+  ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut;
 
   # https://github.com/Philonous/hs-stun/pull/1
   # Remove if a version > 0.1.0.1 ever gets released.

From 3405f703f221aa5b31c16605f38fe233c6c5c52e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 14 Jan 2017 20:01:28 +0100
Subject: [PATCH 153/727] gxemul: fix disappeared download link

---
 pkgs/misc/emulators/gxemul/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix
index 1e4827942b9..ba1b63855e3 100644
--- a/pkgs/misc/emulators/gxemul/default.nix
+++ b/pkgs/misc/emulators/gxemul/default.nix
@@ -9,7 +9,7 @@ composableDerivation.composableDerivation {} {
   inherit name;
 
   src = fetchurl {
-    url = "http://gavare.se/gxemul/src/${name}.tar.gz";
+    url = "http://gxemul.sourceforge.net/src/${name}.tar.gz";
     sha256 = "1afd9l0igyv7qgc0pn3rkdgrl5d0ywlyib0qhg4li23zilyq5407";
   };
 

From 427dbcb1d71873573b28d0963149d751345faf3b Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 14 Jan 2017 14:25:01 -0500
Subject: [PATCH 154/727] top-level: Add more options to release-cross.nix,
 normalize param comments

---
 pkgs/top-level/release-cross.nix | 10 +++++++++-
 pkgs/top-level/release.nix       |  8 ++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index de64c2b3cc7..a2f5903e55d 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -1,4 +1,12 @@
-with import ./release-lib.nix { supportedSystems = [ builtins.currentSystem ]; };
+
+{ # The platforms for which we build Nixpkgs.
+  supportedSystems ? [ builtins.currentSystem ]
+, # Strip most of attributes when evaluating to spare memory usage
+  scrubJobs ? true
+}:
+
+with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
+
 let
   lib = import ../../lib;
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index d3fb4e646c3..2052957edd6 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -11,10 +11,10 @@
 
 { nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
-# The platforms for which we build Nixpkgs.
-, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
-# Strip most of attributes when evaluating to spare memory usage
-, scrubJobs ? true
+, # The platforms for which we build Nixpkgs.
+  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
+, # Strip most of attributes when evaluating to spare memory usage
+  scrubJobs ? true
 }:
 
 with import ./release-lib.nix { inherit supportedSystems scrubJobs; };

From 4b9349698ae7c6a7032b9d7659a5d2afddd996ab Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sat, 14 Jan 2017 20:08:40 +0100
Subject: [PATCH 155/727] pangomm: Add ApplicationServices on darwin

---
 pkgs/development/libraries/pangomm/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix
index b99498f2013..b5ec5198975 100644
--- a/pkgs/development/libraries/pangomm/default.nix
+++ b/pkgs/development/libraries/pangomm/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm }:
+{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm
+, ApplicationServices }:
 
 let
   ver_maj = "2.40";
@@ -14,7 +15,9 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin [
+    ApplicationServices
+  ];
   propagatedBuildInputs = [ pango glibmm cairomm ];
 
   doCheck = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d35ed158e64..eda77bf4754 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7492,7 +7492,9 @@ in
   cairomm = callPackage ../development/libraries/cairomm { };
 
   pango = callPackage ../development/libraries/pango { };
-  pangomm = callPackage ../development/libraries/pangomm { };
+  pangomm = callPackage ../development/libraries/pangomm {
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+  };
 
   pangox_compat = callPackage ../development/libraries/pangox-compat { };
 

From 666810cd25d7309f609a5c40231b52b8848b4222 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 14 Jan 2017 20:30:57 +0100
Subject: [PATCH 156/727] elixir: 1.3.3 -> 1.4.0

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

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 6999ee07e3d..2d27185a9fc 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "elixir-${version}";
-  version = "1.3.3";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "elixir";
     rev = "v${version}";
-    sha256 = "1l4ff3awil1nzrgd4pv4bx6n9ml83ci4czplv03yfz18q7jbipq2";
+    sha256 = "1q05f1s581nk475a8d9hakh2irgvsg50x3084yjzhrcmmykwnysi";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];

From f0338024b9278b44ff97bc86778d4fd618401df8 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 14 Jan 2017 20:41:51 +0100
Subject: [PATCH 157/727] strongswan: enable charon-systemd (#21872)

See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd
---
 pkgs/tools/networking/strongswan/default.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 7bcbb4fddb6..7da47e339d0 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook
 , curl, trousers, sqlite, iptables, libxml2, openresolv
-, ldns, unbound, pcsclite, openssl
+, ldns, unbound, pcsclite, openssl, systemd
 , enableTNC ? false }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
 
   buildInputs =
-    [ gmp pkgconfig python autoreconfHook iptables ldns unbound openssl pcsclite ]
+    [ gmp pkgconfig python autoreconfHook iptables ldns unbound openssl pcsclite systemd.dev ]
     ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ];
 
   patches = [
@@ -26,10 +26,21 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/libcharon/plugins/resolve/resolve_handler.c --replace "/sbin/resolvconf" "${openresolv}/sbin/resolvconf"
+
+    # swanctl can be configured by files in SWANCTLDIR which defaults to
+    # $out/etc/swanctl. Since that directory is in the nix store users can't
+    # modify it. Ideally swanctl accepts a command line option for specifying
+    # the configuration files. In the absence of that we patch swanctl to look
+    # for configuration files in /etc/swanctl.
+    substituteInPlace src/swanctl/swanctl.h --replace "SWANCTLDIR" "\"/etc/swanctl\""
     '';
 
+  preConfigure = ''
+    configureFlagsArray+=("--with-systemdsystemunitdir=$out/etc/systemd/system")
+  '';
+
   configureFlags =
-    [ "--enable-swanctl" "--enable-cmd"
+    [ "--enable-swanctl" "--enable-cmd" "--enable-systemd"
       "--enable-farp" "--enable-dhcp"
       "--enable-eap-sim" "--enable-eap-sim-file" "--enable-eap-simaka-pseudonym"
       "--enable-eap-simaka-reauth" "--enable-eap-identity" "--enable-eap-md5"

From 61fe18d5b471d9bc6c5e83ba089dbacd9604acb4 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sat, 7 Jan 2017 02:23:20 +0100
Subject: [PATCH 158/727] palemoon: init at 27.0.3

---
 .../networking/browsers/palemoon/default.nix  | 94 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 96 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/palemoon/default.nix

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
new file mode 100644
index 00000000000..de21c37bc79
--- /dev/null
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -0,0 +1,94 @@
+{ stdenv, fetchFromGitHub, makeDesktopItem
+, pkgconfig, autoconf213, alsaLib, bzip2, cairo
+, dbus, dbus_glib, file, fontconfig, freetype
+, gstreamer, gst_plugins_base, gst_all_1
+, gtk2, hunspell, icu, libevent, libjpeg, libnotify
+, libstartup_notification, libvpx, makeWrapper, mesa 
+, nspr, nss, pango, perl, python, libpulseaudio, sqlite 
+, unzip, xlibs, which, yasm, zip, zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "palemoon-${version}";
+  version = "27.0.3";
+
+  src = fetchFromGitHub {
+    name   = "palemoon-src";
+    owner  = "MoonchildProductions";
+    repo   = "Pale-Moon";
+    rev    = "c09119484da17c682a66e32bacbffb8cff411608";
+    sha256 = "1i4hp1lz0xaryy4zpncr67gbqg8v7a2cnyqjwvs2an86rk1vg913";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "palemoon";
+    exec = "palemoon %U";
+    desktopName = "Pale Moon";
+    genericName = "Web Browser";
+    categories = "Application;Network;WebBrowser;";
+    mimeType = stdenv.lib.concatStringsSep ";" [
+      "text/html"
+      "text/xml"
+      "application/xhtml+xml"
+      "application/vnd.mozilla.xul+xml"
+      "x-scheme-handler/http"
+      "x-scheme-handler/https"
+      "x-scheme-handler/ftp"
+    ];
+  };
+
+  buildInputs = [
+    alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype
+    gst_plugins_base gstreamer gst_all_1.gst-plugins-base gtk2
+    hunspell icu libevent libjpeg libnotify libstartup_notification
+    libvpx makeWrapper mesa nspr nss pango perl pkgconfig python
+    libpulseaudio sqlite unzip which yasm zip zlib
+  ] ++ (with xlibs; [
+    libX11 libXext libXft libXi libXrender libXScrnSaver
+    libXt pixman scrnsaverproto xextproto
+  ]);
+
+  enableParallelBuilding = true;
+
+  configurePhase = ''
+    export AUTOCONF=${autoconf213}/bin/autoconf
+    export MOZBUILD_STATE_PATH=$(pwd)/.mozbuild
+    export MOZ_CONFIG=$(pwd)/.mozconfig
+    export builddir=$(pwd)/build
+    mkdir -p $MOZBUILD_STATE_PATH $builddir
+    echo > $MOZ_CONFIG "
+    . $src/build/mozconfig.common
+    ac_add_options --prefix=$out
+    ac_add_options --enable-application=browser
+    ac_add_options --enable-official-branding
+    ac_add_options --enable-optimize="-O2"
+    ac_add_options --enable-jemalloc
+    ac_add_options --enable-shared-js
+    ac_add_options --disable-tests
+    "
+  '';
+
+  patchPhase = ''
+    chmod u+w .
+    sed -i /status4evar/d browser/installer/package-manifest.in
+  '';
+
+  buildPhase = ''
+    cd $builddir
+    $src/mach build
+  '';
+
+  installPhase = ''
+    cd $builddir
+    $src/mach install
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A web browser";
+    homepage    = https://www.palemoon.org/;
+    license     = licenses.mpl20;
+    maintainers = with maintainers; [ rnhmjoj ];
+    platforms   = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d1dbc3c607..5be50cbab3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14212,6 +14212,8 @@ in
 
   osmo = callPackage ../applications/office/osmo { };
 
+  palemoon = callPackage ../applications/networking/browsers/palemoon { };
+
   pamix = callPackage ../applications/audio/pamix { };
 
   pamixer = callPackage ../applications/audio/pamixer { };

From bb0d0a366b58f8922a055cbb2d4a7e2d318bfefd Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 14 Jan 2017 20:49:57 +0100
Subject: [PATCH 159/727] yarn: init at 0.18.1

---
 pkgs/development/tools/yarn/default.nix | 26 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/yarn/default.nix

diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
new file mode 100644
index 00000000000..2276eb04e6f
--- /dev/null
+++ b/pkgs/development/tools/yarn/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, nodejs, fetchzip, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "yarn-${version}";
+  version = "0.18.1";
+
+  src = fetchzip {
+    url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
+    sha256 = "1jkgd2d0n78jw66a0v3cgawcc9qvzjy1zp8c1wzfqf0hl5wrcv9q";
+  };
+
+  buildInputs = [makeWrapper nodejs];
+
+  installPhase = ''
+    mkdir -p $out/{bin,libexec/yarn/}
+    cp -R . $out/libexec/yarn
+    makeWrapper $out/libexec/yarn/bin/yarn.js $out/bin/yarn
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://yarnpkg.com/;
+    description = "Fast, reliable, and secure dependency management for javascript";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.offline ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 465a872aa2b..02e1a2a6150 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4462,6 +4462,8 @@ in
 
   xwinmosaic = callPackage ../tools/X11/xwinmosaic {};
 
+  yarn = callPackage ../development/tools/yarn  { };
+
   yank = callPackage ../tools/misc/yank { };
 
   yaml-merge = callPackage ../tools/text/yaml-merge { };

From fa0a12e35dc947c34a12fa663e446792d824ba44 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 14 Jan 2017 16:39:03 -0500
Subject: [PATCH 160/727] release-cross: Use `nativeDrv` rather than relying on
 default

The default will soon change
---
 pkgs/top-level/release-cross.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index a2f5903e55d..ec013816145 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -24,7 +24,7 @@ let
   /* Basic list of packages to be natively built,
      but need a crossSystem defined to get meaning */
   basicNativeDrv = {
-    gdbCross = nativePlatforms;
+    gdbCross.nativeDrv = nativePlatforms;
   };
 
   basic = basicCrossDrv // basicNativeDrv;

From 238a090b4fc3f9354bd6c36d159269a15b3f7456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 12 Jan 2017 23:04:00 +0100
Subject: [PATCH 161/727] gdm: init at 1.4

---
 pkgs/development/tools/gdm/default.nix | 24 ++++++++++++++++++++++++
 pkgs/development/tools/gdm/deps.nix    | 12 ++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/tools/gdm/default.nix
 create mode 100644 pkgs/development/tools/gdm/deps.nix

diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix
new file mode 100644
index 00000000000..ee805ff04b5
--- /dev/null
+++ b/pkgs/development/tools/gdm/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "gdm-${version}";
+  version = "1.4";
+
+  goPackagePath = "github.com/sparrc/gdm";
+
+  src = fetchFromGitHub {
+    url = "https://github.com/sparrc/gdm";
+    sha256 = "0kpqmbg144qcvd8k88j9yx9lrld85ray2viw161xajafk16plvld";
+    rev = version;
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Minimalist dependency manager for Go written in Go.";
+    homepage = https://github.com/sparrc/gdm;
+    license = licenses.unlicense;
+    platforms = platforms.all;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/development/tools/gdm/deps.nix b/pkgs/development/tools/gdm/deps.nix
new file mode 100644
index 00000000000..62a3df65e3a
--- /dev/null
+++ b/pkgs/development/tools/gdm/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "0d047c8d5a8c3a1c89d9d78511f4ed7aef49ea0c";
+      sha256 = "0ahyxvqy25zpyppmrb7vsad332gmq2cdi7hb0si6ni0cmrlqcfwr";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d35ed158e64..394bb455753 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -876,6 +876,8 @@ in
 
   gdrivefs = python27Packages.gdrivefs;
 
+  go-dependency-manager = callPackage ../development/tools/gdm { };
+
   gencfsm = callPackage ../tools/security/gencfsm { };
 
   genromfs = callPackage ../tools/filesystems/genromfs { };

From 9f56dd9d63a4636b540fd99f2e7ecd28fcd9783c Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Sat, 14 Jan 2017 22:58:16 +0100
Subject: [PATCH 162/727] nixos/pulseaudio: make daemon.conf configurable
 (#20888)

This adds pulseaudio.daemon.config, which is a set of keys to values
which are directly translated to keys and values of pulseaudio's
daemon.conf, e. g.

    hardware.pulseaudio.daemon.config = { flat-volumes = "no"; }

becomes

    flat-volumes=no

in pulse/daemon.conf.
---
 nixos/modules/config/pulseaudio.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 742167fbf69..d5cb4fce0f9 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -160,6 +160,13 @@ in {
             if activated.
           '';
         };
+
+        config = mkOption {
+          type = types.attrsOf types.unspecified;
+          default = {};
+          description = ''Config of the pulse daemon. See <literal>man pulse-daemon.conf</literal>.'';
+          example = literalExample ''{ flat-volumes = "no"; }'';
+        };
       };
 
       zeroconf = {
@@ -204,10 +211,13 @@ in {
     (mkIf cfg.enable {
       environment.systemPackages = [ overriddenPackage ];
 
-      environment.etc = singleton {
-        target = "asound.conf";
-        source = alsaConf;
-      };
+      environment.etc = [
+        { target = "asound.conf";
+          source = alsaConf; }
+
+        { target = "pulse/daemon.conf";
+          source = writeText "daemon.conf" (lib.generators.toKeyValue {} cfg.daemon.config); }
+      ];
 
       # Allow PulseAudio to get realtime priority using rtkit.
       security.rtkit.enable = true;

From 1fe51342a98638d32349e0930afe6c1751e612ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 22:59:19 +0100
Subject: [PATCH 163/727] powerdns: 4.0.1 -> 4.0.2

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

diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index 6eec9c3b305..b1e4ec6e368 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "powerdns-${version}";
-  version = "4.0.1";
+  version = "4.0.2";
 
   src = fetchurl {
     url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
-    sha256 = "1mzdj5077cn6cip51sxknz5hx0cyqlsrix39b7l30i36lvafx4fi";
+    sha256 = "17b2gv7r53skj54ms4hx8rdjiggpc8bais0cy0jck1pmccxyalfh";
   };
 
   buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp pkgconfig libsodium curl ];

From 8a7d373795f197dbc492ad95e3ad4d1b60ba0d07 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes.bornhold@gmail.com>
Date: Sat, 14 Jan 2017 23:53:56 +0100
Subject: [PATCH 164/727] Darwin gtk quartz follow up (#21883)

* gtk2-x11: Add gtk2 configuration with X11 backend

After making quartz the default for darwin, some builds started to fail since
they only support gtk with the X11 backend.

* apvlv: Use gtk2-x11 on darwin

* gpicview: Use gtk2-x11 for darwin

* lxappearance: Use gtk2-x11 for darwin

* fontforge-gtk: Use gtk2-x11 for darwin

* gbdfed: Use gtk2-x11 for darwin
---
 pkgs/development/libraries/gtk+/2.x.nix |  2 +-
 pkgs/top-level/all-packages.nix         | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index bcbbecd242d..306e2db29ce 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     ++ libintlOrEmpty
     ++ optional xineramaSupport libXinerama
     ++ optionals cupsSupport [ cups ]
-    ++ optionals (gdktarget == "quartz") [ AppKit Cocoa ];
+    ++ optionals stdenv.isDarwin [ AppKit Cocoa ];
 
   configureFlags = [
     "--with-gdktarget=${gdktarget}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0e889f9666..5cfb05aed6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1738,6 +1738,7 @@ in
   });
   fontforge-gtk = callPackage ../tools/misc/fontforge {
     withGTK = true;
+    gtk2 = gtk2-x11;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };
 
@@ -1842,7 +1843,7 @@ in
   gazebo-headless = gazeboSimulator.gazebo6-headless;
 
   gbdfed = callPackage ../tools/misc/gbdfed {
-    gtk = gtk2;
+    gtk = gtk2-x11;
   };
 
   gdmap = callPackage ../tools/system/gdmap { };
@@ -5623,7 +5624,9 @@ in
 
   kanif = callPackage ../applications/networking/cluster/kanif { };
 
-  lxappearance = callPackage ../desktops/lxde/core/lxappearance {};
+  lxappearance = callPackage ../desktops/lxde/core/lxappearance {
+    gtk2 = gtk2-x11;
+  };
 
   lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
 
@@ -7512,6 +7515,10 @@ in
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
   };
 
+  gtk2-x11 = gtk2.override {
+    gdktarget = "x11";
+  };
+
   gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { };
 
   gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { };
@@ -13173,7 +13180,9 @@ in
 
   gpa = callPackage ../applications/misc/gpa { };
 
-  gpicview = callPackage ../applications/graphics/gpicview { };
+  gpicview = callPackage ../applications/graphics/gpicview {
+    gtk2 = gtk2-x11;
+  };
 
   gqrx = callPackage ../applications/misc/gqrx { };
 
@@ -15668,7 +15677,9 @@ in
     inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas;
   };
 
-  apvlv = callPackage ../applications/misc/apvlv { };
+  apvlv = callPackage ../applications/misc/apvlv {
+    gtk2 = gtk2-x11;
+  };
 
   xpdf = callPackage ../applications/misc/xpdf {
     base14Fonts = "${ghostscript}/share/ghostscript/fonts";

From 27b47ef7360f6dee2fec603f22854bff023a2d57 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 14 Jan 2017 17:52:54 -0500
Subject: [PATCH 165/727] gawk: xz.bin should be a native build input

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

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index c7e0857c2ca..271a89b784d 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
     || stdenv.isFreeBSD
   );
 
-  buildInputs = [ xz.bin ]
-    ++ stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv
+  nativeBuildInputs = [ xz.bin ];
+  buildInputs =
+       stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv
     ++ stdenv.lib.optional interactive readline
     ++ stdenv.lib.optional stdenv.isDarwin locale;
 

From 2ab883c9da231619f33da82f909576ae049a8223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 10 Jan 2017 11:56:33 +0100
Subject: [PATCH 166/727] sysdig: patch for linux >= 4.9.1

---
 pkgs/os-specific/linux/sysdig/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 281ee101eac..abe1388e9a5 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc}:
+{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, fetchpatch}:
 let
   inherit (stdenv.lib) optional optionalString;
   baseName = "sysdig";
@@ -18,6 +18,15 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "pic" ];
 
+  patches = [
+    # patch for linux >= 4.9.1
+    # is included in the next release
+    (fetchpatch {
+      url = "https://github.com/draios/sysdig/commit/68823ffd3a76f88ad34c3d0d9f6fdf1ada0eae43.patch";
+      sha256 = "02vgyd70mwrk6mcdkacaahk49irm6vxzqb7dfickk6k32lh3m44k";
+    })
+  ];
+
   postPatch = ''
     sed '1i#include <cmath>' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp
   '';

From 17c61810e37c57fd83dcbf48bf5b348e33d1fad0 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sun, 15 Jan 2017 00:32:20 +0100
Subject: [PATCH 167/727] Add johbo to maintainers

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 95b836130af..9ba52bdefb4 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -221,6 +221,7 @@
   joamaki = "Jussi Maki <joamaki@gmail.com>";
   joelmo = "Joel Moberg <joel.moberg@gmail.com>";
   joelteon = "Joel Taylor <me@joelt.io>";
+  johbo = "Johannes Bornhold <johannes@bornhold.name>";
   joko = "Ioannis Koutras <ioannis.koutras@gmail.com>";
   jonafato = "Jon Banafato <jon@jonafato.com>";
   jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";

From eedd562f76562f67f6cc97cb1cfccea734c5ae67 Mon Sep 17 00:00:00 2001
From: Sven Slootweg <jamsoftgamedev@gmail.com>
Date: Sun, 15 Jan 2017 00:45:52 +0100
Subject: [PATCH 168/727] capstone: fix pkgconfig file generation (#21897)

---
 pkgs/development/libraries/capstone/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 97a97523260..64e3690eb3e 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash }:
+{ stdenv, fetchurl, bash, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name    = "capstone-${version}";
@@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
   configurePhase = '' patchShebangs make.sh '';
   buildPhase = '' ./make.sh '';
   installPhase = '' env PREFIX=$out ./make.sh install '';
+  
+  nativeBuildInputs = [
+    pkgconfig
+  ];
 
   enableParallelBuilding = true;
 

From b0faf21bb4bfb88f7ca6d474da5f1d1ccd2fdb0b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 14 Jan 2017 08:44:40 -0600
Subject: [PATCH 169/727] kde5.frameworks: 5.29 -> 5.30

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../kde-frameworks/frameworkintegration.nix   |  10 +-
 .../kpackage/allow-external-paths.patch       |   8 +-
 .../qdiriterator-follow-symlinks.patch        |  18 +-
 .../libraries/kde-frameworks/srcs.nix         | 592 +++++++++---------
 5 files changed, 316 insertions(+), 314 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 5ca0631730b..9c8d06b14c6 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/frameworks/5.29/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/frameworks/5.30/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
index 161ce52d4f2..029a661601d 100644
--- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
@@ -1,6 +1,8 @@
-{ kdeFramework, lib, ecm, kbookmarks, kcompletion
-, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications, kpackage
-, kwidgetsaddons, libXcursor, qtx11extras
+{
+  kdeFramework, lib,
+  ecm,
+  kbookmarks, kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kio,
+  knewstuff, knotifications, kpackage, kwidgetsaddons, libXcursor, qtx11extras
 }:
 
 kdeFramework {
@@ -9,6 +11,6 @@ kdeFramework {
   nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes
-    knotifications kpackage kwidgetsaddons libXcursor qtx11extras
+    knewstuff knotifications kpackage kwidgetsaddons libXcursor qtx11extras
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
index e9d74444814..5fa1c3fe79b 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
@@ -1,8 +1,8 @@
-Index: kpackage-5.18.0/src/kpackage/package.cpp
+Index: kpackage-5.30.0/src/kpackage/package.cpp
 ===================================================================
---- kpackage-5.18.0.orig/src/kpackage/package.cpp
-+++ kpackage-5.18.0/src/kpackage/package.cpp
-@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate()
+--- kpackage-5.30.0.orig/src/kpackage/package.cpp
++++ kpackage-5.30.0/src/kpackage/package.cpp
+@@ -820,7 +820,7 @@ PackagePrivate::PackagePrivate()
      : QSharedData(),
        fallbackPackage(0),
        metadata(0),
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch
index ddbf17d0006..cab334838ee 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch
@@ -1,21 +1,21 @@
-Index: kpackage-5.18.0/src/kpackage/packageloader.cpp
+Index: kpackage-5.30.0/src/kpackage/packageloader.cpp
 ===================================================================
---- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp
-+++ kpackage-5.18.0/src/kpackage/packageloader.cpp
-@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li
+--- kpackage-5.30.0.orig/src/kpackage/packageloader.cpp
++++ kpackage-5.30.0/src/kpackage/packageloader.cpp
+@@ -238,7 +238,7 @@ QList<KPluginMetaData> PackageLoader::li
          } else {
              //qDebug() << "Not cached";
              // If there's no cache file, fall back to listing the directory
 -            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
 +            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
-             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json");
+             const QStringList nameFilters = { QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop") };
  
              QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
-Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
+Index: kpackage-5.30.0/src/kpackage/private/packagejobthread.cpp
 ===================================================================
---- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp
-+++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
-@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir,
+--- kpackage-5.30.0.orig/src/kpackage/private/packagejobthread.cpp
++++ kpackage-5.30.0/src/kpackage/private/packagejobthread.cpp
+@@ -121,7 +121,7 @@ bool indexDirectory(const QString& dir,
  
      QJsonArray plugins;
  
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 7bc0f55dc8b..6fb62c53eec 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,595 +3,595 @@
 
 {
   attica = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/attica-5.29.0.tar.xz";
-      sha256 = "1xiaqqq77w0hxr79rpixvy5kak2xgxwi5860qf3bbpz89bpyi5d1";
-      name = "attica-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/attica-5.30.0.tar.xz";
+      sha256 = "1v8y6dx5qcqrs1dlybmc3lx05qsra0111qf7kzlq8azljdy20i2v";
+      name = "attica-5.30.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/baloo-5.29.0.tar.xz";
-      sha256 = "06zq0nnqm8qs4dx548l952i5hi6yazi4c3kb75d0k6jvjsfhgh3n";
-      name = "baloo-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/baloo-5.30.0.tar.xz";
+      sha256 = "022frn2f5mw71496r2i70q3z9diq6d5386nh8aymvii0l84c0mm9";
+      name = "baloo-5.30.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/bluez-qt-5.29.0.tar.xz";
-      sha256 = "15rnh8vnmxrq6phvk3g7x69pvsblhrr91z4ldd8x4q895dpwk3vg";
-      name = "bluez-qt-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/bluez-qt-5.30.0.tar.xz";
+      sha256 = "1asf2hcljzhca9pmh42fz25nnp05xxf4yab4r13wwwdzk4ms0x6f";
+      name = "bluez-qt-5.30.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/breeze-icons-5.29.0.tar.xz";
-      sha256 = "1bpvpza0hm3krr4b6pp9aakmjs4vnmk2bbl9zirzsj7rg2nnrb8b";
-      name = "breeze-icons-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/breeze-icons-5.30.0.tar.xz";
+      sha256 = "0n8705sly52sp4lsikr8xs671ch23ykk8xg3ksb9na700v837rak";
+      name = "breeze-icons-5.30.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/extra-cmake-modules-5.29.0.tar.xz";
-      sha256 = "1n4q1s9q3gnxp050s0kddabbhgl0rfxrpsmfci5vsd92dri6xxs8";
-      name = "extra-cmake-modules-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/extra-cmake-modules-5.30.0.tar.xz";
+      sha256 = "0v59f76ghqckg857559sb4vla1d6pza4hj5bai8dnd712isn9abx";
+      name = "extra-cmake-modules-5.30.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/frameworkintegration-5.29.0.tar.xz";
-      sha256 = "0ljsrz1yyj09k00q0xx0zps3wi6wrmkqvxrc81kw0qv14d5rxf7b";
-      name = "frameworkintegration-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/frameworkintegration-5.30.0.tar.xz";
+      sha256 = "1a9zqd96jn9p8niqz0jwclfl1np1ryszdz8q02s9cwy35zia1dfk";
+      name = "frameworkintegration-5.30.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kactivities-5.29.0.tar.xz";
-      sha256 = "1mnpqwz6rfv07fmpdccp2fxxf0pdjp2b8jamjfn51zk4krz0vjrr";
-      name = "kactivities-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kactivities-5.30.0.tar.xz";
+      sha256 = "0njq8jc9vqag3h6ryjiraib44sgrd66fswnldl0w0n2kvgf948qv";
+      name = "kactivities-5.30.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kactivities-stats-5.29.0.tar.xz";
-      sha256 = "16cxmp9pzmcap722fclx8xjap56ldslghcn8qj0n8ds5crcd6h80";
-      name = "kactivities-stats-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kactivities-stats-5.30.0.tar.xz";
+      sha256 = "116mcnadlqidx90hllpwkxrmhwapnvmak5rzmqngnzkdvrpicl6r";
+      name = "kactivities-stats-5.30.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kapidox-5.29.0.tar.xz";
-      sha256 = "184jjm3kyb1m1mdqac8h37g4cibni86zan4d52ac00mz7lmibmhp";
-      name = "kapidox-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kapidox-5.30.0.tar.xz";
+      sha256 = "08qpbmgw8cb4ygs4m3y9529dwsyn7nrln5rkfmbfkvfjlfry7njf";
+      name = "kapidox-5.30.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/karchive-5.29.0.tar.xz";
-      sha256 = "11i9kj890n2y4mgs3vykfg0r5iva4g3ydk3ywbkcmvryd2hvp4ch";
-      name = "karchive-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/karchive-5.30.0.tar.xz";
+      sha256 = "0f0zax2hihiq504nr3m5vap0ssmx5hvnc3rxk006zgvwgr1mvcqq";
+      name = "karchive-5.30.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kauth-5.29.0.tar.xz";
-      sha256 = "0789q90sk4203x94y508sd03zzd7pll9yg480kbfavqr8bxivigj";
-      name = "kauth-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kauth-5.30.0.tar.xz";
+      sha256 = "0qf0wkkiaykcl79q0rsfmg7h7v342ycz9s6xr841qqs9w17dns3c";
+      name = "kauth-5.30.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kbookmarks-5.29.0.tar.xz";
-      sha256 = "1ipziszcf7hddzi0kd41ddz56m79dy6jz325k37byzmc4xj15abi";
-      name = "kbookmarks-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kbookmarks-5.30.0.tar.xz";
+      sha256 = "0cibgw032n9n92fp78w04qw851lp3bfkd1rnyqvz7biypx4cz82z";
+      name = "kbookmarks-5.30.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kcmutils-5.29.0.tar.xz";
-      sha256 = "1winmnr1pdspj3i3qwlblqsppb641yj3bcvl50xy8gh47w1n39q2";
-      name = "kcmutils-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kcmutils-5.30.0.tar.xz";
+      sha256 = "12x32jwf8gb77l5brj169ahrgdlsmn0zrzmjfp7f4dfykfnbfws9";
+      name = "kcmutils-5.30.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kcodecs-5.29.0.tar.xz";
-      sha256 = "0ki9aws9kfhcchp8qwl696qwcgz4a2z4w1f9rarl7hblhlly0mx7";
-      name = "kcodecs-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kcodecs-5.30.0.tar.xz";
+      sha256 = "1via1xv4qswlyasyppi3q3a76bl5hk5ji34k63bp06p029ar7dkf";
+      name = "kcodecs-5.30.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kcompletion-5.29.0.tar.xz";
-      sha256 = "1h2yd5gsb24h7k41fcmmbg96i4k3rmqc5pgp6vnb7m767mlcy6kb";
-      name = "kcompletion-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kcompletion-5.30.0.tar.xz";
+      sha256 = "1205xq2r550lb4v39h3g1sr8cgsysfkkxkk5scp4d92vawlbsrx6";
+      name = "kcompletion-5.30.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kconfig-5.29.0.tar.xz";
-      sha256 = "0izss1hz41pbmfsxa8xlj5f6hx4r5jjpapp1km9926yy104jxhfn";
-      name = "kconfig-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kconfig-5.30.0.tar.xz";
+      sha256 = "1p23q7ykkrsj847m244v1wjcg7b85rh7shc8lkn290cydk5kr6m2";
+      name = "kconfig-5.30.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kconfigwidgets-5.29.0.tar.xz";
-      sha256 = "0xay4kfz3cfhs82h0qp707qflb4vxrar7sh7b7wwkp4s0yhq15fa";
-      name = "kconfigwidgets-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kconfigwidgets-5.30.0.tar.xz";
+      sha256 = "15ir4qr4hzr8ia9g8c13fnn2szhs07wys54nialbj0dggx9qa782";
+      name = "kconfigwidgets-5.30.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kcoreaddons-5.29.0.tar.xz";
-      sha256 = "1xmk9hqrzfn7bix9ch5v7nrl7ff16z1pmz3rghyb06cvvbx3k2z2";
-      name = "kcoreaddons-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kcoreaddons-5.30.0.tar.xz";
+      sha256 = "0h505lcfnngv3wj9h4klygarz6wxmlsk3c3yg7l644rrmbqcwazn";
+      name = "kcoreaddons-5.30.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kcrash-5.29.0.tar.xz";
-      sha256 = "097294n52ac2mh55i8cwvx75rfgr12kvpf5zszha97whn0hm9nrv";
-      name = "kcrash-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kcrash-5.30.0.tar.xz";
+      sha256 = "0hmcg81iahd2bvcm57yk7mdy6lnrsrzl7z6cv8lxpj9xw0ajd8h4";
+      name = "kcrash-5.30.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kdbusaddons-5.29.0.tar.xz";
-      sha256 = "15is9d0kmcwd7qy8annf2y1bqwq3vwcrlqym1pjsifyc5n226b0j";
-      name = "kdbusaddons-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kdbusaddons-5.30.0.tar.xz";
+      sha256 = "1ql5xjxfq8y0bmagq2zw44rilyrm1cmkjsfcfrjy0d2adhl23w7p";
+      name = "kdbusaddons-5.30.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kdeclarative-5.29.0.tar.xz";
-      sha256 = "0ki58bd97a7vw90989msxy9npgha6652qhydn8ks0x8gxd9zwcq3";
-      name = "kdeclarative-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kdeclarative-5.30.0.tar.xz";
+      sha256 = "0898mxh7izxn9d4iyv8gsxrjl2wms4m6mr69qd4bfygd8z8hqp46";
+      name = "kdeclarative-5.30.0.tar.xz";
     };
   };
   kded = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kded-5.29.0.tar.xz";
-      sha256 = "092j7a7jm0h4lc0yphy5z6mg3r29fxjvghajcdla5vfqha33j8pb";
-      name = "kded-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kded-5.30.0.tar.xz";
+      sha256 = "1sqmnxii0i3m65cacjxasm99pq2cvfymbalak8r0mip8g8fdarrd";
+      name = "kded-5.30.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/portingAids/kdelibs4support-5.29.0.tar.xz";
-      sha256 = "1wiilwgyk3rdxha076mz2wpwmpgaprv7j0c8bzk2qqmxph5n9hz1";
-      name = "kdelibs4support-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/portingAids/kdelibs4support-5.30.0.tar.xz";
+      sha256 = "0fkg5bk1p91iq1na67h02wdqnq71ln8g22r6sc7rva54w5ilnwxm";
+      name = "kdelibs4support-5.30.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kdesignerplugin-5.29.0.tar.xz";
-      sha256 = "01x8i7rm0c71cql57s7ikwdb03n1i0hkhgf88w24dzwnv7b6l2yg";
-      name = "kdesignerplugin-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kdesignerplugin-5.30.0.tar.xz";
+      sha256 = "0hf7209zd398v4m3aa99yva1bbphzlyn0x9i5ydalwvwykmvjvdz";
+      name = "kdesignerplugin-5.30.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kdesu-5.29.0.tar.xz";
-      sha256 = "1lkxfss8i641k09h4b5qcf7xiybskfrp8z1zzllcmjfaqfcwwk45";
-      name = "kdesu-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kdesu-5.30.0.tar.xz";
+      sha256 = "1cnl6pap4399s7l9ggi23f5b6mscfddsgwra4d2qy1093y0nb8mk";
+      name = "kdesu-5.30.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kdewebkit-5.29.0.tar.xz";
-      sha256 = "0xg41ij5in3n08np65wgf5h4qwy4p7y8nlrcn4qakiincif7xqs0";
-      name = "kdewebkit-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kdewebkit-5.30.0.tar.xz";
+      sha256 = "1rq3ypsw2svvzfxjd6gj231phhnw19fwyr5qkcsik4076h6ycwvk";
+      name = "kdewebkit-5.30.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kdnssd-5.29.0.tar.xz";
-      sha256 = "1bg3z5ng43iy2v081n5ma8lk9qnhks2m95hmfn82wc19jb5lgvja";
-      name = "kdnssd-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kdnssd-5.30.0.tar.xz";
+      sha256 = "1if1gaykgad5vg32p0impx4vwjaxd77r34gajg1kiywan6jpq6d8";
+      name = "kdnssd-5.30.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kdoctools-5.29.0.tar.xz";
-      sha256 = "0zd3zc42avw4ml0i4ayvzif1s0lrg5770q8hvi7m2ycxip2xrfk0";
-      name = "kdoctools-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kdoctools-5.30.0.tar.xz";
+      sha256 = "14i7ffmlwqhbq7gp5k8wajvg7x65nwxr5p1qqgxhmpmranyickvy";
+      name = "kdoctools-5.30.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kemoticons-5.29.0.tar.xz";
-      sha256 = "0xxm4haxkyqb3sbifbp9k58vb9n79y8h3c5xfxwc3y7xiwbswaba";
-      name = "kemoticons-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kemoticons-5.30.0.tar.xz";
+      sha256 = "0h3a9xs110l1d2wyp8dfkaf3fnpc0wvfdacpgbnihk1xvccmq4nl";
+      name = "kemoticons-5.30.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kfilemetadata-5.29.0.tar.xz";
-      sha256 = "1hliggn5h3mi81hz6d4flrv5d25bqbih6xq6miysrr7ws5vg07c2";
-      name = "kfilemetadata-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kfilemetadata-5.30.0.tar.xz";
+      sha256 = "1m07hj5nnb81wraylhh36f2k82zqxz5g766wwcn12pd8v0r99ilh";
+      name = "kfilemetadata-5.30.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kglobalaccel-5.29.0.tar.xz";
-      sha256 = "0wsmnwxnmcgi7rnkvh4vfcvv9pwq1kcd98j5l6h9xwbirz247caz";
-      name = "kglobalaccel-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kglobalaccel-5.30.0.tar.xz";
+      sha256 = "123c7sqwj4davrwrgwy16qag8ss205pk9af4jc9sky74h531fdm1";
+      name = "kglobalaccel-5.30.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kguiaddons-5.29.0.tar.xz";
-      sha256 = "1cgq04k66xzmawqrgh2xhyl1dmylkcfsf1mgbilanq46niv6v47k";
-      name = "kguiaddons-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kguiaddons-5.30.0.tar.xz";
+      sha256 = "0kn0ia6ciafng227lrrdslmxhh30426wywarxvihlcqfzrgmnpzm";
+      name = "kguiaddons-5.30.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/portingAids/khtml-5.29.0.tar.xz";
-      sha256 = "1rrhpx5ny868nhd2z52zf4n2kybxv8lciyi3wla0k87gwcdm3ryv";
-      name = "khtml-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/portingAids/khtml-5.30.0.tar.xz";
+      sha256 = "1z4pj3cr8bzbl80bi1z87lsg1adr9hbm60wf3811wdma2d4w4bbh";
+      name = "khtml-5.30.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/ki18n-5.29.0.tar.xz";
-      sha256 = "0w4nqyqi9p92vfi5b07s9k8hjmkj2qdclnyclsdy7lshkxsqfbm7";
-      name = "ki18n-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/ki18n-5.30.0.tar.xz";
+      sha256 = "1wvjrmpsypfhivk3hfpb9lm09d0w2c9lc4mxvbyfkibhan1x1lid";
+      name = "ki18n-5.30.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kiconthemes-5.29.0.tar.xz";
-      sha256 = "09dj6v7mvmhbkax35884g729ikfdvazvnhz327vgsb3ybbmx475h";
-      name = "kiconthemes-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kiconthemes-5.30.0.tar.xz";
+      sha256 = "0sixqg2fvm9m14xbn3dmsk564i9ig3zn6zf5ww10hnqd1wcd4sg9";
+      name = "kiconthemes-5.30.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kidletime-5.29.0.tar.xz";
-      sha256 = "0nnrgi38jn5r2gvmsg3425y1k53g5n5bzbhcf71d484d00740rix";
-      name = "kidletime-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kidletime-5.30.0.tar.xz";
+      sha256 = "1vbjvwy5ihz5id2484d2hn5a81p85vz3mvwpcjbypkd3y5mqcrq6";
+      name = "kidletime-5.30.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kimageformats-5.29.0.tar.xz";
-      sha256 = "0385al48zdnpv2d2g59ls8y8fljlfyflpvrladxcqr75ywsap7xa";
-      name = "kimageformats-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kimageformats-5.30.0.tar.xz";
+      sha256 = "057a9gallq1j3a51ijyp47x82hmn8vssxb74jchlf90jjnyq4g2i";
+      name = "kimageformats-5.30.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kinit-5.29.0.tar.xz";
-      sha256 = "0cqh8dljgr72zny4hhypc4j7mc6lrplbdvw262vszq5hqn25dn6n";
-      name = "kinit-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kinit-5.30.0.tar.xz";
+      sha256 = "047vxnq4ypl70vspq800k00cj2cjqd6hx46yp11m33np03106rj2";
+      name = "kinit-5.30.0.tar.xz";
     };
   };
   kio = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kio-5.29.0.tar.xz";
-      sha256 = "0sswjmbjnfi7sh6j3qzc98jkpp3bwgmfmvg61r484sj65900xkjj";
-      name = "kio-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kio-5.30.0.tar.xz";
+      sha256 = "0finbv7kcaz81bsj6yv6pxwxcjrwkj5mmkxhg0pa5j77jn1nhnm1";
+      name = "kio-5.30.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kitemmodels-5.29.0.tar.xz";
-      sha256 = "1ss291hkvyhkzm5v1klrbhkkvw0f35acdf7q2x04ggs06cvryxw3";
-      name = "kitemmodels-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kitemmodels-5.30.0.tar.xz";
+      sha256 = "1yf2bfzxqgw75p5bi7byg9rbbiclhqayybiyd8cq3d8b8ws4bfdf";
+      name = "kitemmodels-5.30.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kitemviews-5.29.0.tar.xz";
-      sha256 = "1872rynqi9pgc0670vhxa5n7r63arh4q1g62sw76xp5s0kzgxpvh";
-      name = "kitemviews-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kitemviews-5.30.0.tar.xz";
+      sha256 = "0fx4sdrflp2h0y6ixdnbaxd8l5cham4lx0f36y7dfz6jlk56d12y";
+      name = "kitemviews-5.30.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kjobwidgets-5.29.0.tar.xz";
-      sha256 = "0sim3sxz02sg9y1vlp9d5xxby9anx2s10z80iys2mbhw1hw1ivn8";
-      name = "kjobwidgets-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kjobwidgets-5.30.0.tar.xz";
+      sha256 = "0ilzl1sm9fx7cx03nh5y2y656jfssp7b46xiawgnasvc94ysl9hf";
+      name = "kjobwidgets-5.30.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/portingAids/kjs-5.29.0.tar.xz";
-      sha256 = "196lnlynnc4kf7hy2zw2dyba5h1mn6l5d1000h50g62fbg8xwh7k";
-      name = "kjs-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/portingAids/kjs-5.30.0.tar.xz";
+      sha256 = "0yh7n0q1vbx8nd6j25jys6hd24m3knn44n6xc09pwnr3mn0shvih";
+      name = "kjs-5.30.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/portingAids/kjsembed-5.29.0.tar.xz";
-      sha256 = "1g5ppari446fa4ybjgj5j63fz4grj341019w2s4dqyp05l5sf197";
-      name = "kjsembed-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/portingAids/kjsembed-5.30.0.tar.xz";
+      sha256 = "0ixd56krz66psxk9h8dzd5jr693kh9xx4303zicws85014ba33q5";
+      name = "kjsembed-5.30.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/portingAids/kmediaplayer-5.29.0.tar.xz";
-      sha256 = "0hs6vy28c0f41c8s0ip5ggy96rhrf3p3kb1d69v8z9yi1jd9jhaw";
-      name = "kmediaplayer-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/portingAids/kmediaplayer-5.30.0.tar.xz";
+      sha256 = "0bir4g7bfhjdrs2skhr7jclc3f7frmfm6p8n2q10ag9in8h5hwd8";
+      name = "kmediaplayer-5.30.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/knewstuff-5.29.0.tar.xz";
-      sha256 = "1cfkppd1p40lbadrj34lh7msix0bpqmnnc1xwh2wx35va58phrc1";
-      name = "knewstuff-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/knewstuff-5.30.0.tar.xz";
+      sha256 = "1srh98dqd54nibzcaxpvn8vw0amprx4986hd17j32633hs93a69g";
+      name = "knewstuff-5.30.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/knotifications-5.29.0.tar.xz";
-      sha256 = "0bb6s72p78wiq172fx5f07c55zvd3rackgh1fcgkzg84lnvzx938";
-      name = "knotifications-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/knotifications-5.30.0.tar.xz";
+      sha256 = "199jh1gizdwc1xz97khac9m6bdg38n5hr5c96pq7sk7b2rdr49ks";
+      name = "knotifications-5.30.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/knotifyconfig-5.29.0.tar.xz";
-      sha256 = "1kab22gfb12bc2dl87m13crcrwhf8djdr8cmwrykjdm1ln2a1d4w";
-      name = "knotifyconfig-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/knotifyconfig-5.30.0.tar.xz";
+      sha256 = "04l5hjdd0376y9ygmrz8a49w8hxnb01y0fi13spvkmx8dhal0fmq";
+      name = "knotifyconfig-5.30.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.29.1";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kpackage-5.29.1.tar.xz";
-      sha256 = "1vbwq5s1psii3qa6g260lpar37y19k8b2g5hn3pyx4llz5wnrali";
-      name = "kpackage-5.29.1.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kpackage-5.30.0.tar.xz";
+      sha256 = "1j1vwna5w67wqsdfl5s83gx7vizj5qnsl6nck7ny055yzzwb2gna";
+      name = "kpackage-5.30.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kparts-5.29.0.tar.xz";
-      sha256 = "0arpaz5qdswyj47z9craijsf4zafh50bw8vvklg1jc385bbgxhv1";
-      name = "kparts-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kparts-5.30.0.tar.xz";
+      sha256 = "1sgqylynq35d6xir99kgqial3p0pf0lcaqagl2vh1qandipmcp8g";
+      name = "kparts-5.30.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kpeople-5.29.0.tar.xz";
-      sha256 = "19sb0j5qbi299f752z589cbbh3rjxkzm074v3rj9sqgah1hdssg8";
-      name = "kpeople-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kpeople-5.30.0.tar.xz";
+      sha256 = "1h72fwr6121w0cfhaci32s4510kwinjah9ynfhjl998mg00k42hj";
+      name = "kpeople-5.30.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kplotting-5.29.0.tar.xz";
-      sha256 = "07yz1f5ifjvxsaphbyvbvqzvmc1w6rkb9fh8xglf8z9p9drz23qb";
-      name = "kplotting-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kplotting-5.30.0.tar.xz";
+      sha256 = "00wrz16m4blh130713fk0q3gzpsx33zs6wnd4ghwhaakmqydn2gh";
+      name = "kplotting-5.30.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kpty-5.29.0.tar.xz";
-      sha256 = "08b8qg35g9g4rkfn6zwv2kggh6y5wlg33zbj28n1idszq6qpgh7i";
-      name = "kpty-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kpty-5.30.0.tar.xz";
+      sha256 = "0dna8a0n7lg22522khxq0vxn76g484198p80hzvysnkl218fav60";
+      name = "kpty-5.30.0.tar.xz";
     };
   };
   kross = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/portingAids/kross-5.29.0.tar.xz";
-      sha256 = "1q6pm6iv3896y1sj7b8p7agjlzfi9f5qmpbadk499d0rn9c6520v";
-      name = "kross-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/portingAids/kross-5.30.0.tar.xz";
+      sha256 = "1bqfznfrr87c88ffs7hj0iqcv8vgzrz57l31zpij3cgiy09q7axz";
+      name = "kross-5.30.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/krunner-5.29.0.tar.xz";
-      sha256 = "1kjzl239a136p6zpkgj570s5i649hzwrgylq213jh31h251a93qx";
-      name = "krunner-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/krunner-5.30.0.tar.xz";
+      sha256 = "1smkanc14nlsdrg31skzb9y7f0fahyf09iq1h2xfla4kvgk811qz";
+      name = "krunner-5.30.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kservice-5.29.0.tar.xz";
-      sha256 = "0440hgcwm8p421y8xrlill9n2bzfrr0v8ln7pcm45b09bwsgz5l7";
-      name = "kservice-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kservice-5.30.0.tar.xz";
+      sha256 = "1jcb938m3kllmrzmwz21zjlhrx0r6dmyrglsf0zbjs2cg9hwww0l";
+      name = "kservice-5.30.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/ktexteditor-5.29.0.tar.xz";
-      sha256 = "19krz968bxyv9r43gw1nh7fkkfsgsidhg2k9z0p7cplm6asqvdas";
-      name = "ktexteditor-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/ktexteditor-5.30.0.tar.xz";
+      sha256 = "0bhbcqfkmpy95p3w66xxnhi4h7h3k3k362fhsrl38rc83r9agnns";
+      name = "ktexteditor-5.30.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/ktextwidgets-5.29.0.tar.xz";
-      sha256 = "11iwcak2r12wxbkj8i7pg3g1cnymmgh8lvkpbsszkmyisqbyrz27";
-      name = "ktextwidgets-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/ktextwidgets-5.30.0.tar.xz";
+      sha256 = "1fpqjig6wzb1gycvak9h4p48c623fkzj2lxvf0p3vmb6b0yxr1jw";
+      name = "ktextwidgets-5.30.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kunitconversion-5.29.0.tar.xz";
-      sha256 = "1vzmx3wiphi88xc5dh69vj5jdmz0pxzbiiqiqyi38a1nkq7a9pv7";
-      name = "kunitconversion-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kunitconversion-5.30.0.tar.xz";
+      sha256 = "0fjkl355dwcgd4a39212qwmmbj37nfhmw3ik2bxg3gxg07a4yra5";
+      name = "kunitconversion-5.30.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kwallet-5.29.0.tar.xz";
-      sha256 = "15jcn8zg7bz2vn6kwxvj0b6k9kpnx48zrcfa2ibb1rjp71cxgwc1";
-      name = "kwallet-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kwallet-5.30.0.tar.xz";
+      sha256 = "1nnc0gcn7w5jmmzs4zr4qlrhn3ns9x42f2dfcwc5vi281gghl54k";
+      name = "kwallet-5.30.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kwayland-5.29.0.tar.xz";
-      sha256 = "0mz9v7g91im2xwdh5f4ym8z52ylva7kyr0hxl5p88b7y6azxqmz9";
-      name = "kwayland-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kwayland-5.30.0.tar.xz";
+      sha256 = "0sc2mdiazql2012qadbqjm4wxmhhanbba9r9qjxqx2li14ax6yci";
+      name = "kwayland-5.30.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kwidgetsaddons-5.29.0.tar.xz";
-      sha256 = "19hvs3jqmj0jwsjszq6fn7m6d5d80bsd5wz4x8m39w1nmsgj032d";
-      name = "kwidgetsaddons-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kwidgetsaddons-5.30.0.tar.xz";
+      sha256 = "0jn2iw46cwfqh550rrb37yfznr4lrlsj8bh8v21xhgm3afm25hrl";
+      name = "kwidgetsaddons-5.30.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kwindowsystem-5.29.0.tar.xz";
-      sha256 = "19bzirhkjqn41f9n540wnhrc0y5qvxcbgi87np9ijc3mpkzfn7in";
-      name = "kwindowsystem-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kwindowsystem-5.30.0.tar.xz";
+      sha256 = "0sz1wyawah03ygx3kh1x6wy1y1gp9f5h6296yy1mxy4qz4jp1b10";
+      name = "kwindowsystem-5.30.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kxmlgui-5.29.0.tar.xz";
-      sha256 = "1h85hiy58jl25r7d9z43kkybfvd2hjk5l4nmcy9jw5lrmmgnrgq0";
-      name = "kxmlgui-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kxmlgui-5.30.0.tar.xz";
+      sha256 = "005cn74h0rjvjsmfzrn3pai0jrgczj3y6h50g07rgmynmrcnygys";
+      name = "kxmlgui-5.30.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kxmlrpcclient-5.29.0.tar.xz";
-      sha256 = "09rw4id0lg5j4ql46vj2pvwnjcn5nk40s0bl03z8jkqygg8w57b2";
-      name = "kxmlrpcclient-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kxmlrpcclient-5.30.0.tar.xz";
+      sha256 = "18azc85vfng9gnjf09yhvg5g4432dy5ia9hk54jk9ibmy7kaqlqq";
+      name = "kxmlrpcclient-5.30.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/modemmanager-qt-5.29.0.tar.xz";
-      sha256 = "08imlqr8xxah58gcyqv968gbmamf2xkjg31cs32h79yqcddjpvrd";
-      name = "modemmanager-qt-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/modemmanager-qt-5.30.0.tar.xz";
+      sha256 = "1qh39nd3lwdb8z58brqf0k48k5n3xx9wdi4kak2wg7vwmqwwammf";
+      name = "modemmanager-qt-5.30.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/networkmanager-qt-5.29.0.tar.xz";
-      sha256 = "0km2yv0gpl584n6vh27d0q0lrrmc79hpcfxwihwk6g5rrlv5qnba";
-      name = "networkmanager-qt-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/networkmanager-qt-5.30.0.tar.xz";
+      sha256 = "1scxcqrwxjwdzg2j3r6wz3bk23h7v9dil8n892ykfrpxa4cidgzi";
+      name = "networkmanager-qt-5.30.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/oxygen-icons5-5.29.0.tar.xz";
-      sha256 = "1j9jxlfzndzimvk0zvk5nqqnic5bj04yg4a0v9kqlmr8l1mj4g4k";
-      name = "oxygen-icons5-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/oxygen-icons5-5.30.0.tar.xz";
+      sha256 = "1b1kfgk2vgr85kbgvx8fwpyib5yvdkz07vi6p1s8a61cabcymkhl";
+      name = "oxygen-icons5-5.30.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/plasma-framework-5.29.0.tar.xz";
-      sha256 = "1c341i5gvm65mk8dhwn61fmw0hc1npvj3mcwz0gy1ynkgch6afrh";
-      name = "plasma-framework-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/plasma-framework-5.30.0.tar.xz";
+      sha256 = "1qdyc0li07sns71gdyw31jhzhnghcvzc0r0y4y8f157nyz23pw70";
+      name = "plasma-framework-5.30.0.tar.xz";
     };
   };
   prison = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/prison-5.29.0.tar.xz";
-      sha256 = "0hc7gk1xxhk5s6fk6rm822kpbr2k0kc40xpjg07gpglbvnxdbr7l";
-      name = "prison-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/prison-5.30.0.tar.xz";
+      sha256 = "15vlz67qv1pm87hlnyak2jbdw87xw3jx3vaqwjfn07hbzlh8dmpc";
+      name = "prison-5.30.0.tar.xz";
     };
   };
   solid = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/solid-5.29.0.tar.xz";
-      sha256 = "01y9fqar113bjh5l8mh03xwgv1j88ivnb1rxjcpgilv63qx2cw9k";
-      name = "solid-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/solid-5.30.0.tar.xz";
+      sha256 = "10rfsp39s8d8zgz02f4biyh9n7hbwxkib5r6g3cldbbf0ch3inmh";
+      name = "solid-5.30.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/sonnet-5.29.0.tar.xz";
-      sha256 = "0rb9fslf6y694cwbng198r21nrid07gzirn3c11g91skskh8sd90";
-      name = "sonnet-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/sonnet-5.30.0.tar.xz";
+      sha256 = "1i4i59vjq16mmqjfyr5hc7afnc5w2h54iz4rmqi0wdfk37cl5zcr";
+      name = "sonnet-5.30.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/syntax-highlighting-5.29.0.tar.xz";
-      sha256 = "0fbqkj3qsai3m322d2qmvh93h35sx7wdc28jxp8v8yddl59a1k6b";
-      name = "syntax-highlighting-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/syntax-highlighting-5.30.0.tar.xz";
+      sha256 = "0iipg1khc27a3cgysk6qpj5lf846z3n29gj2yas36lgr8n6ddm53";
+      name = "syntax-highlighting-5.30.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/threadweaver-5.29.0.tar.xz";
-      sha256 = "0sl9r6dz4l63f40a15kzsgqrsvdaxnm1rqkj61za8cbdbk2q42g6";
-      name = "threadweaver-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/threadweaver-5.30.0.tar.xz";
+      sha256 = "12zirga9qyjrizwxja2n5mh7kxgdb7xyl2d3makdjpnjk5kry8by";
+      name = "threadweaver-5.30.0.tar.xz";
     };
   };
 }

From 37788f13b7283aa245f2e3b00b66e636ae57c48c Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sun, 15 Jan 2017 00:39:40 +0100
Subject: [PATCH 170/727] tryton: init at 4.2.1

---
 pkgs/applications/office/tryton/default.nix | 35 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/office/tryton/default.nix

diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix
new file mode 100644
index 00000000000..31774b6b55c
--- /dev/null
+++ b/pkgs/applications/office/tryton/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, python2Packages, librsvg }:
+
+with stdenv.lib;
+
+python2Packages.buildPythonApplication rec {
+  name = "tryton-${version}";
+  version = "4.2.1";
+  src = fetchurl {
+    url = "mirror://pypi/t/tryton/${name}.tar.gz";
+    sha256 = "1ry3kvbk769m8rwqa90pplfvmmgsv4jj9w1aqhv892smia8f0ybm";
+  };
+  propagatedBuildInputs = with python2Packages; [
+    chardet
+    dateutil
+    pygtk
+    librsvg
+  ];
+  makeWrapperArgs = [
+    ''--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"''
+  ];
+  meta = {
+    description = "The client of the Tryton application platform";
+    longDescription = ''
+      The client for Tryton, a three-tier high-level general purpose
+      application platform under the license GPL-3 written in Python and using
+      PostgreSQL as database engine.
+
+      It is the core base of a complete business solution providing
+      modularity, scalability and security.
+    '';
+    homepage = http://www.tryton.org/;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.johbo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d35ed158e64..185351c54cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4066,6 +4066,8 @@ in
 
   trousers = callPackage ../tools/security/trousers { };
 
+  tryton = callPackage ../applications/office/tryton { };
+
   omapd = callPackage ../tools/security/omapd { };
 
   ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };

From d6ac33482629a8e45a1fe047eb29b8fb731931e1 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 14 Jan 2017 13:58:16 +0800
Subject: [PATCH 171/727] terragrunt: 0.8.0 -> 0.9.1

---
 .../networking/cluster/terragrunt/default.nix            | 9 ++++-----
 pkgs/applications/networking/cluster/terragrunt/deps.nix | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index e4a267ec1b5..98f5870ca69 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,16 +2,15 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.8.0";
-  rev = "v${version}";
+  version = "0.9.1";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
   src = fetchFromGitHub {
-    inherit rev;
+    rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "1d035p2r6d8c1crxvpi5ayb9jx6f2pdgzw2197zhllavyi8n8dw1";
+    sha256 = "19im4sazw09854lnzalljwx22qswly8ffyys3yrjkd2l9vfxfly3";
   };
 
   goDeps = ./deps.nix;
@@ -20,7 +19,7 @@ buildGoPackage rec {
 
   postInstall = ''
     wrapProgram $bin/bin/terragrunt \
-      --suffix PATH : ${lib.makeBinPath [ terraform ]}
+      --set TERRAGRUNT_TFPATH {lib.getBin terraform}/bin/terraform
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index ba1ac2b6a1e..d903863118c 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "8649d278323ebf6bd20c9cd56ecb152b1c617375";
-      sha256 = "0m2nxdlvi90vw68ds9qby291skc5d0dgqi3pkalr8ma3kd9r9khv";
+      rev = "5e1afe1c0a077fb2da9b5f74232b790d99397ce8";
+      sha256 = "073yx5acqybw0h2zshg209wmldm0g5h5x9bhbn6h08ak0r4i80al";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-zglob";
-      rev = "0b24567ec079616e9897f635f542e3bf56abb3d0";
-      sha256 = "0380dqsy0qdjranl5qfmmcr6a4g7sw4z26g1bld9y1s66madl03l";
+      rev = "1783ae1a9f7ff3a79240e8c249d8b575d70a6528";
+      sha256 = "0g4ih6swqpq0bqwsv5mv8ymicgr92xh9i6sm1793lqwb63x8ga1x";
     };
   }
   {

From 388371152a1b94d39ca771729d02d30d79e679d2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 15 Jan 2017 19:11:56 +0800
Subject: [PATCH 172/727] terragrunt: fix typo

In my earlier PR #21901, I had pushed the wrong local branch without a '$'.

Apologies @Mic92 - please apply.
---
 pkgs/applications/networking/cluster/terragrunt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 98f5870ca69..4362d7cff90 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
 
   postInstall = ''
     wrapProgram $bin/bin/terragrunt \
-      --set TERRAGRUNT_TFPATH {lib.getBin terraform}/bin/terraform
+      --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform
   '';
 
   meta = with stdenv.lib; {

From ce9b34d3d41e462cb0a8e02e0ea497b74995541f Mon Sep 17 00:00:00 2001
From: Maarten Hoogendoorn <maarten@moretea.nl>
Date: Tue, 13 Dec 2016 15:24:18 +0100
Subject: [PATCH 173/727] kubernetes: 1.4.6 -> 1.5.2

---
 .../networking/cluster/kubernetes/default.nix             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index da5d426a0c5..377c5ee9cd6 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -17,13 +17,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.4.6";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1n5ppzr9hnn7ljfdgx40rnkn6n6a9ya0qyrhjhpnbfwz5mdp8ws3";
+    sha256 = "1ps9bn5gqknyjv0b9jvp7xg3cyd4anq11j785p22347al0b8w81v";
   };
 
   buildInputs = [ makeWrapper which go rsync go-bindata ];
@@ -43,14 +43,14 @@ stdenv.mkDerivation rec {
 
   postBuild = ''
     ./hack/generate-docs.sh
-    (cd build/pause && gcc pause.c -o pause)
+    (cd build-tools/pause && gcc pause.c -o pause)
   '';
 
   installPhase = ''
     mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$man/share/man" "$pause/bin"
 
     cp _output/local/go/bin/* "$out/bin/"
-    cp build/pause/pause "$pause/bin/pause"
+    cp build-tools/pause/pause "$pause/bin/pause"
     cp -R docs/man/man1 "$man/share/man"
 
     $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl

From e81f400ac4736c7d85dddb25561723da0cbb34f5 Mon Sep 17 00:00:00 2001
From: Maarten Hoogendoorn <maarten@moretea.nl>
Date: Sun, 15 Jan 2017 02:30:43 +0100
Subject: [PATCH 174/727] kubernetes: Fix build

Disabled "mungedocs", which broke the build.
This appears to be a piece of development tooling to make sure that
the documentation is correct. We don't really care about that when we
a specific k8s version for NixOS.
---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 377c5ee9cd6..50519278895 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -33,8 +33,9 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
     substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
-    substituteInPlace "hack/update-munge-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
-    substituteInPlace "hack/update-munge-docs.sh" --replace "kube::util::git_upstream_remote_name" "echo origin"
+    # hack/update-munge-docs.sh only performs some tests on the documentation.
+    # They broke building k8s; disabled for now.
+    echo "true" > "hack/update-munge-docs.sh"
 
     patchShebangs ./hack
   '';

From 6345b76b9170f91fae3abdd9a4694a9c247227cc Mon Sep 17 00:00:00 2001
From: Maarten Hoogendoorn <maarten@moretea.nl>
Date: Sun, 15 Jan 2017 03:22:36 +0100
Subject: [PATCH 175/727] kubernetes: build-tools was renamed to build

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

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 50519278895..2b2cca6a609 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -44,14 +44,14 @@ stdenv.mkDerivation rec {
 
   postBuild = ''
     ./hack/generate-docs.sh
-    (cd build-tools/pause && gcc pause.c -o pause)
+    (cd build/pause && gcc pause.c -o pause)
   '';
 
   installPhase = ''
     mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$man/share/man" "$pause/bin"
 
     cp _output/local/go/bin/* "$out/bin/"
-    cp build-tools/pause/pause "$pause/bin/pause"
+    cp build/pause/pause "$pause/bin/pause"
     cp -R docs/man/man1 "$man/share/man"
 
     $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl

From 69391e342322e2f3ac9efe1f312c15197eb3cf07 Mon Sep 17 00:00:00 2001
From: Maarten Hoogendoorn <maarten@moretea.nl>
Date: Wed, 14 Dec 2016 13:47:29 +0100
Subject: [PATCH 176/727] kube-controller-manager service: Allow restarts on
 failure

---
 nixos/modules/services/cluster/kubernetes.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index fbf7412a6cd..029b11ad98b 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -737,6 +737,8 @@ in {
         wantedBy = [ "multi-user.target" ];
         after = [ "kube-apiserver.service" ];
         serviceConfig = {
+          RestartSec = "30s";
+          Restart = "on-failure";
           ExecStart = ''${cfg.package}/bin/kube-controller-manager \
             --address=${cfg.controllerManager.address} \
             --port=${toString cfg.controllerManager.port} \

From 9f892de069b5dbe4edc94e6f1142eccda34be991 Mon Sep 17 00:00:00 2001
From: Maarten Hoogendoorn <maarten@moretea.nl>
Date: Sun, 18 Dec 2016 15:04:08 +0100
Subject: [PATCH 177/727] kubernetes vm test: make dig and netcat available

Dig could not be found in the test cases. Adding it as a global package
fixes this.
---
 nixos/tests/kubernetes.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix
index 273bd3c80c1..dcd25e21197 100644
--- a/nixos/tests/kubernetes.nix
+++ b/nixos/tests/kubernetes.nix
@@ -59,6 +59,7 @@ in {
             virtualisation.diskSize = 2048;
 
             programs.bash.enableCompletion = true;
+            environment.systemPackages = with pkgs; [ netcat bind ];
 
             services.kubernetes.roles = ["master" "node"];
             virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0";

From 3ba22934e8f5939ec10723566e8bd5ed24c6a884 Mon Sep 17 00:00:00 2001
From: Jordan Cran <jordan@instantepiphany.com.au>
Date: Sun, 15 Jan 2017 23:23:48 +1100
Subject: [PATCH 178/727] vimPlugins: add typescript-vim, tsuquyomi

---
 pkgs/misc/vim-plugins/default.nix      | 22 ++++++++++++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 6a4105c7323..872e71b936e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -750,6 +750,17 @@ rec {
 
   };
 
+  typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "typescript-vim-2016-08-10";
+    src = fetchgit {
+      url = "git://github.com/leafgarland/typescript-vim";
+      rev = "7e25a901af7cd993498cc9ecfc833ca2ac21db7a";
+      sha256 = "0n5lrn741ar6wkvsi86kf7hgdjdwq34sn3ppzcddhvic5hayrkyk";
+    };
+    dependencies = [];
+
+  };
+
   vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-ipython-2015-06-23";
     src = fetchgit {
@@ -1752,6 +1763,17 @@ rec {
 
   };
 
+  tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tsuquyomi-2017-01-02";
+    src = fetchgit {
+      url = "git://github.com/Quramy/tsuquyomi";
+      rev = "473aa2703950816748329acca56c069df7339c96";
+      sha256 = "0h5gbhs4gsvyjsin2wvdlbrr6ykpcmipmpwpf39595j1dlqnab59";
+    };
+    dependencies = [];
+
+  };
+
   undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "undotree-2016-07-19";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 3809ea8fc01..1fc82f96d15 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -23,6 +23,7 @@
 "github:907th/vim-auto-save"
 "github:Chiel92/vim-autoformat"
 "github:LnL7/vim-nix"
+"github:Quramy/tsuquyomi"
 "github:Shougo/deoplete.nvim"
 "github:ajh17/Spacegray.vim"
 "github:alvan/vim-closetag"
@@ -66,6 +67,7 @@
 "github:junegunn/vim-peekaboo"
 "github:justincampbell/vim-eighties"
 "github:latex-box-team/latex-box"
+"github:leafgarland/typescript-vim"
 "github:lepture/vim-jinja"
 "github:lervag/vimtex"
 "github:lokaltog/vim-easymotion"

From 936e2086e617f8046f712b7812a65cc50e501090 Mon Sep 17 00:00:00 2001
From: 2chilled <matthias.mh.herrmann@googlemail.com>
Date: Sun, 15 Jan 2017 14:01:07 +0100
Subject: [PATCH 179/727] h2: init at 1.4.193 (#21893)

---
 pkgs/servers/h2/default.nix     | 44 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/servers/h2/default.nix

diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix
new file mode 100644
index 00000000000..a5dbf74947e
--- /dev/null
+++ b/pkgs/servers/h2/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchzip, jre, makeWrapper, unzip }:
+stdenv.mkDerivation rec {
+  name = "h2-${version}";
+
+  version = "1.4.193";
+
+  src = fetchzip {
+    url = "http://www.h2database.com/h2-2016-10-31.zip";
+    sha256 = "1da1qcfwi5gvh68i6w6y0qpcqp3rbgakizagkajmjxk2ryc4b3z9";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase =
+    let
+      h2ToolScript = ''
+        #!/usr/bin/env bash
+        dir=$(dirname "$0")
+
+        if [ -n "$1" ]; then
+          ${jre}/bin/java -cp "$dir/h2-${version}.jar:$H2DRIVERS:$CLASSPATH" $1 "''${@:2}"
+        else
+          echo "You have to provide the full java class path for the h2 tool you want to run. E.g. 'org.h2.tools.Server'"
+        fi
+      '';
+    in ''
+      mkdir -p $out
+      cp -R * $out
+
+      echo '${h2ToolScript}' > $out/bin/h2tool.sh
+
+      substituteInPlace $out/bin/h2.sh --replace "java" "${jre}/bin/java"
+
+      chmod +x $out/bin/*.sh
+    '';
+
+  meta = with stdenv.lib; {
+    description = "The Java SQL database";
+    homepage = http://www.h2database.com/html/main.html;
+    license = licenses.mpl20;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ mahe ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b51ccc1b84..ae6a3191b85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2125,6 +2125,8 @@ in
 
   hans = callPackage ../tools/networking/hans { };
 
+  h2 = callPackage ../servers/h2 { };
+
   haproxy = callPackage ../tools/networking/haproxy { };
 
   haveged = callPackage ../tools/security/haveged { };

From 5b5100c5ecba88c706498e3f1a337a27571bf86b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 15 Jan 2017 14:02:05 +0100
Subject: [PATCH 180/727] altcoins.stellar-core: fix evaluation

---
 pkgs/applications/altcoins/stellar-core.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix
index b098ffdd1db..9942f0898a2 100644
--- a/pkgs/applications/altcoins/stellar-core.nix
+++ b/pkgs/applications/altcoins/stellar-core.nix
@@ -39,7 +39,7 @@ in stdenv.mkDerivation {
       store historical records of the ledger and participate in consensus.
     '';
     homepage = https://www.stellar.org/;
-    platforms = "x86_64-linux";
+    platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ chris-martin ];
     license = licenses.asl20;
   };

From 30621e1052e39471459c12bd74ad1bb9a9280686 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 15 Jan 2017 14:03:18 +0100
Subject: [PATCH 181/727] go-dependency-manager: fix fetchFromGitHub call

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

diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix
index ee805ff04b5..35328fdf66c 100644
--- a/pkgs/development/tools/gdm/default.nix
+++ b/pkgs/development/tools/gdm/default.nix
@@ -7,9 +7,10 @@ buildGoPackage rec {
   goPackagePath = "github.com/sparrc/gdm";
 
   src = fetchFromGitHub {
-    url = "https://github.com/sparrc/gdm";
-    sha256 = "0kpqmbg144qcvd8k88j9yx9lrld85ray2viw161xajafk16plvld";
+    owner = "sparrc";
+    repo = "gdm";
     rev = version;
+    sha256 = "0kpqmbg144qcvd8k88j9yx9lrld85ray2viw161xajafk16plvld";
   };
 
   goDeps = ./deps.nix;

From 7adf2ff42ec3f8d7c2fb53bf63988a9a2227f4bc Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 15 Jan 2017 12:21:45 +0100
Subject: [PATCH 182/727] git-crecord: init at 20161216.0

---
 .../git-crecord/default.nix                   | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-crecord/default.nix

diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix
new file mode 100644
index 00000000000..fd999dc17d4
--- /dev/null
+++ b/pkgs/applications/version-management/git-crecord/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "git-crecord-${version}";
+  version = "20161216.0";
+
+  src = fetchFromGitHub {
+    owner = "andrewshadura";
+    repo = "git-crecord";
+    rev = version;
+    sha256 = "0v3y90zi43myyi4k7q3892dcrbyi9dn2q6xgk12nw9db9zil269i";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [ docutils ];
+
+  meta = {
+    homepage = https://github.com/andrewshadura/git-crecord;
+    description = "Git subcommand to interactively select changes to commit or stage";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b51ccc1b84..bc93a95eef5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1868,6 +1868,8 @@ in
 
   gifsicle = callPackage ../tools/graphics/gifsicle { };
 
+  git-crecord = callPackage ../applications/version-management/git-crecord { };
+
   git-lfs = callPackage ../applications/version-management/git-lfs { };
 
   git-up = callPackage ../applications/version-management/git-up { };

From fd3d2b1a8dca6a4a90093a54cecbdb3e66f163fb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 15 Jan 2017 07:50:24 -0600
Subject: [PATCH 183/727] kde5.knewstuff: 5.30.0 -> 5.30.1

---
 pkgs/development/libraries/kde-frameworks/srcs.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 6fb62c53eec..3b48537afcb 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -363,11 +363,11 @@
     };
   };
   knewstuff = {
-    version = "5.30.0";
+    version = "5.30.1";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/knewstuff-5.30.0.tar.xz";
-      sha256 = "1srh98dqd54nibzcaxpvn8vw0amprx4986hd17j32633hs93a69g";
-      name = "knewstuff-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/knewstuff-5.30.1.tar.xz";
+      sha256 = "1vsaprynq6dazg64zmj6j1wd8g4aw6pzz3208nqgjjwk5kw8zh0h";
+      name = "knewstuff-5.30.1.tar.xz";
     };
   };
   knotifications = {

From 2608adeb179089e1005fd9fba1cc0e3c784df4ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jan 2017 21:03:21 +0100
Subject: [PATCH 184/727] LTS Haskell 7.15

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d07a9be0c4e..10acd16e7b5 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 7.14
+  # LTS Haskell 7.15
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -143,10 +143,10 @@ default-package-overrides:
   - ansi-wl-pprint ==0.6.7.3
   - ansigraph ==0.2.0.0
   - api-field-json-th ==0.1.0.1
-  - app-settings ==0.2.0.9
+  - app-settings ==0.2.0.10
   - appar ==0.1.4
   - apply-refact ==0.3.0.0
-  - arbtt ==0.9.0.11
+  - arbtt ==0.9.0.12
   - arithmoi ==0.4.3.0
   - array-memoize ==0.6.0
   - arrow-list ==0.7
@@ -168,7 +168,7 @@ default-package-overrides:
   - authenticate-oauth ==1.5.1.2
   - auto ==0.4.3.0
   - auto-update ==0.1.4
-  - autoexporter ==0.2.2
+  - autoexporter ==0.2.3
   - aws ==0.14.1
   - b9 ==0.5.30
   - bake ==0.4
@@ -194,7 +194,7 @@ default-package-overrides:
   - binary-bits ==0.5
   - binary-conduit ==1.2.4.1
   - binary-list ==1.1.1.2
-  - binary-orphans ==0.1.5.1
+  - binary-orphans ==0.1.5.2
   - binary-parser ==0.5.2
   - binary-search ==1.0.0.3
   - binary-tagged ==0.1.4.2
@@ -318,10 +318,10 @@ default-package-overrides:
   - classy-prelude-yesod ==1.0.2
   - clay ==0.11
   - clckwrks ==0.23.19.2
-  - clckwrks-cli ==0.2.16
-  - clckwrks-plugin-media ==0.6.16
+  - clckwrks-cli ==0.2.17.1
+  - clckwrks-plugin-media ==0.6.16.1
   - clckwrks-plugin-page ==0.4.3.5
-  - clckwrks-theme-bootstrap ==0.4.2
+  - clckwrks-theme-bootstrap ==0.4.2.1
   - cli ==0.1.2
   - clientsession ==0.9.1.2
   - Clipboard ==2.3.0.2
@@ -347,7 +347,7 @@ default-package-overrides:
   - concatenative ==1.0.1
   - concurrency ==1.0.0.0
   - concurrent-extra ==0.7.0.10
-  - concurrent-output ==1.7.7
+  - concurrent-output ==1.7.8
   - concurrent-supply ==0.1.8
   - conduit ==1.2.8
   - conduit-combinators ==1.0.8.3
@@ -431,7 +431,7 @@ default-package-overrides:
   - declarative ==0.2.3
   - deepseq-generics ==0.2.0.0
   - dejafu ==0.4.0.0
-  - dependent-map ==0.2.3.0
+  - dependent-map ==0.2.4.0
   - dependent-sum ==0.3.2.2
   - dependent-sum-template ==0.0.0.5
   - derive ==2.5.26
@@ -462,7 +462,7 @@ default-package-overrides:
   - distributed-closure ==0.3.3.0
   - distributed-static ==0.3.5.0
   - distribution-nixpkgs ==1.0.0.1
-  - distributive ==0.5.0.2
+  - distributive ==0.5.1
   - diversity ==0.8.0.1
   - djinn-ghc ==0.0.2.3
   - djinn-lib ==0.0.1.2
@@ -500,9 +500,9 @@ default-package-overrides:
   - effect-handlers ==0.1.0.8
   - either ==4.4.1.1
   - either-unwrap ==1.1
-  - ekg ==0.4.0.11
+  - ekg ==0.4.0.12
   - ekg-core ==0.1.1.1
-  - ekg-json ==0.1.0.3
+  - ekg-json ==0.1.0.4
   - elerea ==2.9.0
   - elm-bridge ==0.3.0.2
   - elm-core-sources ==1.0.0
@@ -529,7 +529,7 @@ default-package-overrides:
   - exception-transformers ==0.4.0.5
   - exceptional ==0.3.0.0
   - exceptions ==0.8.3
-  - executable-hash ==0.2.0.2
+  - executable-hash ==0.2.0.4
   - executable-path ==0.0.3
   - exp-pairs ==0.1.5.1
   - expiring-cache-map ==0.0.6.1
@@ -555,7 +555,7 @@ default-package-overrides:
   - fb ==1.0.13
   - fclabels ==2.0.3.2
   - feature-flags ==0.1.0.1
-  - feed ==0.3.11.1
+  - feed ==0.3.12.0
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.4
   - fgl ==5.5.3.0
@@ -581,7 +581,7 @@ default-package-overrides:
   - focus ==0.1.5
   - fold-debounce ==0.2.0.4
   - fold-debounce-conduit ==0.1.0.4
-  - foldl ==1.2.1
+  - foldl ==1.2.2
   - FontyFruity ==0.5.3.2
   - force-layout ==0.4.0.6
   - forecast-io ==0.2.0.0
@@ -641,7 +641,7 @@ default-package-overrides:
   - gi-soup ==2.4.3
   - gi-webkit ==3.0.3
   - gio ==0.13.3.1
-  - gipeda ==0.3.2.2
+  - gipeda ==0.3.3.0
   - giphy-api ==0.4.0.0
   - git-fmt ==0.4.1.0
   - github-types ==0.2.1
@@ -655,10 +655,10 @@ default-package-overrides:
   - glabrous ==0.1.3.0
   - GLFW-b ==1.4.8.1
   - glib ==0.13.4.1
-  - Glob ==0.7.13
-  - gloss ==1.10.2.3
+  - Glob ==0.7.14
+  - gloss ==1.10.2.5
   - gloss-rendering ==1.10.3.5
-  - GLURaw ==2.0.0.2
+  - GLURaw ==2.0.0.3
   - GLUT ==2.7.0.10
   - gogol ==0.1.0
   - gogol-adexchange-buyer ==0.1.0
@@ -758,7 +758,7 @@ default-package-overrides:
   - gogol-youtube-analytics ==0.1.0
   - gogol-youtube-reporting ==0.1.0
   - google-cloud ==0.0.4
-  - google-oauth2-jwt ==0.1.2.1
+  - google-oauth2-jwt ==0.1.3
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graph-wrapper ==0.2.5.1
@@ -821,7 +821,7 @@ default-package-overrides:
   - hasql ==0.19.15.2
   - hastache ==0.6.1
   - hasty-hamiltonian ==1.1.5
-  - HaTeX ==3.17.0.2
+  - HaTeX ==3.17.1.0
   - hatex-guide ==1.3.1.5
   - hbayes ==0.5.2
   - hbeanstalk ==0.2.4
@@ -830,7 +830,7 @@ default-package-overrides:
   - hdaemonize ==0.5.2
   - HDBC ==2.4.0.1
   - HDBC-session ==0.1.1.0
-  - hdevtools ==0.1.4.1
+  - hdevtools ==0.1.5.0
   - heap ==1.0.3
   - heaps ==0.3.3
   - hebrew-time ==0.1.1
@@ -862,7 +862,7 @@ default-package-overrides:
   - hmatrix-gsl ==0.17.0.0
   - hmatrix-gsl-stats ==0.4.1.4
   - hmatrix-special ==0.4.0.1
-  - hmpfr ==0.4.2
+  - hmpfr ==0.4.2.1
   - hmt ==0.15
   - hoauth2 ==0.5.4.0
   - hocilib ==0.1.0
@@ -932,7 +932,7 @@ default-package-overrides:
   - html ==1.0.1.2
   - html-conduit ==1.2.1.1
   - htoml ==1.0.0.3
-  - HTTP ==4000.3.3
+  - HTTP ==4000.3.4
   - http-api-data ==0.2.4
   - http-client ==0.4.31.2
   - http-client-openssl ==0.2.0.4
@@ -1008,12 +1008,12 @@ default-package-overrides:
   - io-storage ==0.3
   - io-streams ==1.3.5.0
   - io-streams-haproxy ==1.0.0.1
-  - ip6addr ==0.5.1.4
+  - ip6addr ==0.5.2
   - iproute ==1.7.1
-  - IPv6Addr ==0.6.2.0
+  - IPv6Addr ==0.6.3
   - irc ==0.6.1.0
   - irc-client ==0.4.4.1
-  - irc-conduit ==0.2.1.1
+  - irc-conduit ==0.2.2.0
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.0
   - islink ==0.1.0.0
@@ -1024,12 +1024,12 @@ default-package-overrides:
   - ix-shapable ==0.1.0
   - ixset ==1.0.7
   - ixset-typed ==0.3.1
-  - jailbreak-cabal ==1.3.1
+  - jailbreak-cabal ==1.3.2
   - jmacro ==0.6.14
   - jmacro-rpc ==0.3.2
   - jmacro-rpc-happstack ==0.3.2
   - jose ==0.4.0.3
-  - jose-jwt ==0.7.3
+  - jose-jwt ==0.7.4
   - js-flot ==0.8.3
   - js-jquery ==3.1.1
   - json ==0.9.1
@@ -1117,7 +1117,7 @@ default-package-overrides:
   - mainland-pretty ==0.4.1.4
   - makefile ==0.1.0.5
   - managed ==1.0.5
-  - mandrill ==0.5.2.3
+  - mandrill ==0.5.3.1
   - markdown ==0.1.16
   - markdown-unlit ==0.4.0
   - markup ==3.1.0
@@ -1138,12 +1138,12 @@ default-package-overrides:
   - MFlow ==0.4.6.0
   - microformats2-parser ==1.0.1.6
   - microlens ==0.4.7.0
-  - microlens-aeson ==2.1.1.1
+  - microlens-aeson ==2.1.1.2
   - microlens-contra ==0.1.0.1
   - microlens-ghc ==0.4.7.0
   - microlens-mtl ==0.1.10.0
   - microlens-platform ==0.3.7.0
-  - microlens-th ==0.4.1.0
+  - microlens-th ==0.4.1.1
   - mighty-metropolis ==1.0.4
   - mime-mail ==0.4.12
   - mime-mail-ses ==0.3.2.3
@@ -1230,7 +1230,7 @@ default-package-overrides:
   - network-simple ==0.4.0.5
   - network-transport ==0.4.4.0
   - network-transport-composed ==0.2.0.1
-  - network-transport-inmemory ==0.5.1
+  - network-transport-inmemory ==0.5.2
   - network-transport-tcp ==0.5.1
   - network-transport-tests ==0.2.3.0
   - network-uri ==2.6.1.0
@@ -1296,7 +1296,7 @@ default-package-overrides:
   - partial-handler ==1.0.2
   - path ==0.5.11
   - path-extra ==0.0.3
-  - path-io ==1.2.0
+  - path-io ==1.2.2
   - path-pieces ==0.2.1
   - pathwalk ==0.3.1.2
   - patience ==0.1.1
@@ -1338,7 +1338,7 @@ default-package-overrides:
   - pipes-extras ==1.0.8
   - pipes-fastx ==0.3.0.0
   - pipes-group ==1.0.6
-  - pipes-http ==1.0.4
+  - pipes-http ==1.0.5
   - pipes-illumina ==0.1.0.0
   - pipes-mongodb ==0.1.0.0
   - pipes-network ==0.6.4.1
@@ -1405,7 +1405,7 @@ default-package-overrides:
   - pure-io ==0.2.1
   - pureMD5 ==2.1.3
   - purescript ==0.9.3
-  - purescript-bridge ==0.8.0.0
+  - purescript-bridge ==0.8.0.1
   - pwstore-fast ==2.4.4
   - pwstore-purehaskell ==2.1.4
   - quantum-random ==0.6.3
@@ -1434,7 +1434,7 @@ default-package-overrides:
   - rank1dynamic ==0.3.3.0
   - Rasterific ==0.6.1.1
   - rasterific-svg ==0.3.1.2
-  - ratel ==0.3.1
+  - ratel ==0.3.2
   - ratel-wai ==0.2.0
   - raw-strings-qq ==1.1
   - read-editor ==0.1.0.2
@@ -1476,9 +1476,9 @@ default-package-overrides:
   - repa-io ==3.4.1.1
   - RepLib ==0.5.4
   - reroute ==0.4.0.1
-  - resolve-trivial-conflicts ==0.3.2.3
+  - resolve-trivial-conflicts ==0.3.2.4
   - resource-pool ==0.2.3.2
-  - resourcet ==1.1.8.1
+  - resourcet ==1.1.9
   - rest-client ==0.5.1.1
   - rest-core ==0.39
   - rest-gen ==0.19.0.3
@@ -1545,7 +1545,7 @@ default-package-overrides:
   - servant-server ==0.8.1
   - servant-subscriber ==0.5.0.3
   - servant-swagger ==1.1.2
-  - servant-swagger-ui ==0.2.0.2.1.5
+  - servant-swagger-ui ==0.2.1.2.2.8
   - servant-yaml ==0.1.0.0
   - serversession ==1.0.1
   - serversession-backend-acid-state ==1.0.3
@@ -1559,7 +1559,7 @@ default-package-overrides:
   - SHA ==1.6.4.2
   - shake ==0.15.10
   - shake-language-c ==0.10.0
-  - shakespeare ==2.0.11.2
+  - shakespeare ==2.0.12.1
   - shell-conduit ==4.5.2
   - shelly ==1.6.8.1
   - shortcut-links ==0.4.2.0
@@ -1581,10 +1581,10 @@ default-package-overrides:
   - skein ==1.0.9.4
   - skeletons ==0.4.0
   - slave-thread ==1.0.2
-  - slug ==0.1.5
+  - slug ==0.1.6
   - smallcaps ==0.6.0.3
   - smallcheck ==1.1.1
-  - smoothie ==0.4.2.3
+  - smoothie ==0.4.2.4
   - smsaero ==0.6.2
   - smtLib ==1.0.8
   - smtp-mail ==0.1.4.6
@@ -1616,7 +1616,7 @@ default-package-overrides:
   - spool ==0.1
   - spoon ==0.3.1
   - sql-words ==0.1.4.1
-  - sqlite-simple ==0.4.12.0
+  - sqlite-simple ==0.4.12.1
   - srcloc ==0.5.1.0
   - stache ==0.1.8
   - stack-run-auto ==0.1.1.4
@@ -1645,7 +1645,7 @@ default-package-overrides:
   - Strafunski-StrategyLib ==5.0.0.9
   - stratosphere ==0.1.6
   - streaming ==0.1.4.3
-  - streaming-bytestring ==0.1.4.4
+  - streaming-bytestring ==0.1.4.5
   - streaming-commons ==0.1.16
   - streamproc ==1.6.2
   - streams ==3.3
@@ -1654,13 +1654,13 @@ default-package-overrides:
   - string-class ==0.1.6.5
   - string-combinators ==0.6.0.5
   - string-conv ==0.1.2
-  - string-conversions ==0.4
+  - string-conversions ==0.4.0.1
   - string-qq ==0.0.2
   - stringable ==0.1.3
   - stringbuilder ==0.5.0
   - stringsearch ==0.3.6.6
   - stripe-core ==2.1.0
-  - strive ==3.0.1
+  - strive ==3.0.2
   - stylish-haskell ==0.6.1.0
   - success ==0.2.6
   - sundown ==0.6
@@ -1689,7 +1689,7 @@ default-package-overrides:
   - tar ==0.5.0.3
   - tardis ==0.4.1.0
   - tasty ==0.11.0.4
-  - tasty-ant-xml ==1.0.3
+  - tasty-ant-xml ==1.0.4
   - tasty-dejafu ==0.3.0.2
   - tasty-expected-failure ==0.11.0.4
   - tasty-golden ==2.3.1.1
@@ -1729,7 +1729,7 @@ default-package-overrides:
   - text-ldap ==0.1.1.8
   - text-manipulate ==0.2.0.1
   - text-metrics ==0.1.0
-  - text-postgresql ==0.0.2.1
+  - text-postgresql ==0.0.2.2
   - text-region ==0.1.0.1
   - text-show ==3.4
   - text-show-instances ==3.4
@@ -1828,7 +1828,7 @@ default-package-overrides:
   - unix-compat ==0.4.3.1
   - unix-time ==0.3.7
   - Unixutils ==1.54.1
-  - unordered-containers ==0.2.7.1
+  - unordered-containers ==0.2.7.2
   - uri-bytestring ==0.2.2.1
   - uri-encode ==1.5.0.5
   - url ==2.1.3
@@ -1860,7 +1860,7 @@ default-package-overrides:
   - vector-instances ==3.3.1
   - vector-space ==0.10.4
   - vector-th-unbox ==0.2.1.6
-  - vectortiles ==1.2.0
+  - vectortiles ==1.2.0.1
   - versions ==3.0.0
   - vhd ==0.2.2
   - ViennaRNAParser ==1.2.9
@@ -1887,7 +1887,7 @@ default-package-overrides:
   - wai-middleware-throttle ==0.2.1.0
   - wai-middleware-verbs ==0.3.2
   - wai-predicates ==0.9.0
-  - wai-request-spec ==0.10.2.1
+  - wai-request-spec ==0.10.2.4
   - wai-session ==0.3.2
   - wai-session-postgresql ==0.2.1.0
   - wai-transformers ==0.0.7
@@ -1965,7 +1965,7 @@ default-package-overrides:
   - YampaSynth ==0.2
   - yarr ==1.4.0.2
   - yes-precure5-command ==5.5.3
-  - yesod ==1.4.3.1
+  - yesod ==1.4.4
   - yesod-auth ==1.4.15
   - yesod-auth-account ==1.4.3
   - yesod-auth-basic ==0.1.0.2
@@ -1982,7 +1982,7 @@ default-package-overrides:
   - yesod-gitrev ==0.1.0.0
   - yesod-job-queue ==0.3.0.1
   - yesod-newsfeed ==1.6
-  - yesod-persistent ==1.4.1.0
+  - yesod-persistent ==1.4.1.1
   - yesod-sitemap ==1.4.0.1
   - yesod-static ==1.5.1.1
   - yesod-static-angular ==0.1.8
@@ -1996,7 +1996,7 @@ default-package-overrides:
   - yjtools ==0.9.18
   - zero ==0.1.4
   - zeromq4-haskell ==0.6.5
-  - zip ==0.1.4
+  - zip ==0.1.5
   - zip-archive ==0.3.0.5
   - zippers ==0.2.2
   - zlib ==0.6.1.2

From a37e0866f381f00bc1b1448d2e49b719c59420a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jan 2017 21:34:46 +0100
Subject: [PATCH 185/727] Hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-7-g48fad11 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/1b50a4ce72fa5c53cf4dfa81abde0949be972b06.
---
 .../haskell-modules/hackage-packages.nix      | 3012 +++++++++--------
 1 file changed, 1605 insertions(+), 1407 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 453ce86a060..939370ba732 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2769,6 +2769,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Clipboard_2_3_1_0" = callPackage
+    ({ mkDerivation, base, directory, unix, utf8-string, X11 }:
+     mkDerivation {
+       pname = "Clipboard";
+       version = "2.3.1.0";
+       sha256 = "ddbb85e3e3fa01edc9c98b0798d0db8cec803a8f85a3c6b56684a604dff053e3";
+       libraryHaskellDepends = [ base directory unix utf8-string X11 ];
+       homepage = "http://haskell.org/haskellwiki/Clipboard";
+       description = "System clipboard interface";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ClustalParser" = callPackage
     ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec
      , vector
@@ -2786,6 +2799,24 @@ self: {
        license = "GPL";
      }) {};
 
+  "ClustalParser_1_2_0" = callPackage
+    ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec, text
+     , vector
+     }:
+     mkDerivation {
+       pname = "ClustalParser";
+       version = "1.2.0";
+       sha256 = "e444b4780a976d13178ba0d47d34ff1c7e1222077d2ec6c81f4370dce58a8ec8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base parsec text vector ];
+       executableHaskellDepends = [ base cmdargs either-unwrap ];
+       testHaskellDepends = [ base hspec parsec ];
+       description = "Libary for parsing Clustal tools output";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Coadjute" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-csv
      , containers, directory, fgl, filepath, mtl, old-time, pretty
@@ -5259,6 +5290,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "FloatingHex" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "FloatingHex";
+       version = "0.2";
+       sha256 = "5a5f44f6bff788eb26a98f19c61c5a3e021ce1d20a43ba16f3b69126814223d1";
+       revision = "1";
+       editedCabalFile = "d43ab83000132911eeab85ed2bf74a37e9e7f152f1a31c00f14e0a8e34048ba6";
+       libraryHaskellDepends = [ base template-haskell ];
+       description = "Read and write hexadecimal floating point numbers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Focus" = callPackage
     ({ mkDerivation, base, MissingH, split }:
      mkDerivation {
@@ -5703,19 +5747,6 @@ self: {
      }) {};
 
   "GLURaw" = callPackage
-    ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
-     mkDerivation {
-       pname = "GLURaw";
-       version = "2.0.0.2";
-       sha256 = "884b3dbefbaabdc66cf8e240d33adb0d491bcf9119e53a7d42b8cf0972df15de";
-       libraryHaskellDepends = [ base OpenGLRaw transformers ];
-       librarySystemDepends = [ freeglut mesa ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
-       description = "A raw binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
-
-  "GLURaw_2_0_0_3" = callPackage
     ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
      mkDerivation {
        pname = "GLURaw";
@@ -5726,7 +5757,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT" = callPackage
@@ -6177,29 +6207,6 @@ self: {
      }) {};
 
   "Glob" = callPackage
-    ({ mkDerivation, base, containers, directory, dlist, filepath
-     , HUnit, QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "Glob";
-       version = "0.7.13";
-       sha256 = "fe99d9434a2dbbac5385cb6690cbb6e2f2eb25df6ab5ce99c8121fc3fdddbd4c";
-       libraryHaskellDepends = [
-         base containers directory dlist filepath transformers
-         transformers-compat
-       ];
-       testHaskellDepends = [
-         base containers directory dlist filepath HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
-         transformers transformers-compat
-       ];
-       homepage = "http://iki.fi/matti.niemenmaa/glob/";
-       description = "Globbing library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Glob_0_7_14" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, filepath
      , HUnit, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, transformers, transformers-compat
@@ -6220,7 +6227,6 @@ self: {
        homepage = "http://iki.fi/matti.niemenmaa/glob/";
        description = "Globbing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GlomeTrace" = callPackage
@@ -8127,29 +8133,6 @@ self: {
      }) {};
 
   "HTTP" = callPackage
-    ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
-     , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
-     , network, network-uri, parsec, pureMD5, split, test-framework
-     , test-framework-hunit, time, wai, warp
-     }:
-     mkDerivation {
-       pname = "HTTP";
-       version = "4000.3.3";
-       sha256 = "bbada3c2088dc1384234cdbc1bb6089ea588da068a6a38878ea259dd19de9bf2";
-       libraryHaskellDepends = [
-         array base bytestring mtl network network-uri parsec time
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive conduit conduit-extra deepseq
-         http-types httpd-shed HUnit mtl network network-uri pureMD5 split
-         test-framework test-framework-hunit wai warp
-       ];
-       homepage = "https://github.com/haskell/HTTP";
-       description = "A library for client-side HTTP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HTTP_4000_3_4" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
      , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
      , network, network-uri, parsec, pureMD5, split, test-framework
@@ -8170,7 +8153,6 @@ self: {
        homepage = "https://github.com/haskell/HTTP";
        description = "A library for client-side HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HTTP-Simple" = callPackage
@@ -8444,27 +8426,6 @@ self: {
      }) {};
 
   "HaTeX" = callPackage
-    ({ mkDerivation, base, bytestring, containers, matrix, parsec
-     , QuickCheck, tasty, tasty-quickcheck, text, transformers
-     , wl-pprint-extras
-     }:
-     mkDerivation {
-       pname = "HaTeX";
-       version = "3.17.0.2";
-       sha256 = "3f5aced48ee59425e3ccaa2b6c4490f43b395fe9331b3be4a277261ac45e80fe";
-       libraryHaskellDepends = [
-         base bytestring containers matrix parsec QuickCheck text
-         transformers wl-pprint-extras
-       ];
-       testHaskellDepends = [
-         base QuickCheck tasty tasty-quickcheck text
-       ];
-       homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
-       description = "The Haskell LaTeX library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HaTeX_3_17_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, matrix, parsec
      , QuickCheck, tasty, tasty-quickcheck, text, transformers
      , wl-pprint-extras
@@ -8483,7 +8444,6 @@ self: {
        homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
        description = "The Haskell LaTeX library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaTeX-meta" = callPackage
@@ -9737,27 +9697,6 @@ self: {
      }) {};
 
   "IPv6Addr" = callPackage
-    ({ mkDerivation, attoparsec, base, HUnit, iproute, network
-     , network-info, random, test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "IPv6Addr";
-       version = "0.6.2.0";
-       sha256 = "c0123cbacaba0266ea6eed1cf0ceb0cf323600e9eaa0ca855090edae0b085926";
-       revision = "1";
-       editedCabalFile = "7da9aae32a048aca882ec02c1f184ed24e53119de5345ff8b8d6fc62ccd6808e";
-       libraryHaskellDepends = [
-         attoparsec base iproute network network-info random text
-       ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit text
-       ];
-       homepage = "https://github.com/MichelBoucey/IPv6Addr";
-       description = "Library to deal with IPv6 address text representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "IPv6Addr_0_6_3" = callPackage
     ({ mkDerivation, attoparsec, base, HUnit, iproute, network
      , network-info, random, test-framework, test-framework-hunit, text
      }:
@@ -9776,7 +9715,6 @@ self: {
        homepage = "https://github.com/MichelBoucey/IPv6Addr";
        description = "Library to deal with IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IcoGrid" = callPackage
@@ -9984,6 +9922,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "JSONParser" = callPackage
+    ({ mkDerivation, base, parsec }:
+     mkDerivation {
+       pname = "JSONParser";
+       version = "0.1.0.2";
+       sha256 = "724a71c2d97a470744949d37683565ee77890d144d5ded63098e557ad538deba";
+       libraryHaskellDepends = [ base parsec ];
+       description = "Parse JSON";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "JSONb" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, bytestring-nums
      , bytestring-trie, containers, utf8-string
@@ -10488,13 +10437,15 @@ self: {
      }) {inherit (pkgs) openblasCompat;};
 
   "LDAP" = callPackage
-    ({ mkDerivation, base, lber, openldap }:
+    ({ mkDerivation, base, HUnit, lber, openldap }:
      mkDerivation {
        pname = "LDAP";
-       version = "0.6.10";
-       sha256 = "4050875df6157fd71ce14bb0025499a1e9ccbb4d7a03686d68d3521dd2539f82";
+       version = "0.6.11";
+       sha256 = "01cb48801eb3033fbd8be6d755863e7fea7d9083afc76aff07b9c42f8e1890b3";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ lber openldap ];
+       testHaskellDepends = [ base HUnit ];
+       testSystemDepends = [ lber openldap ];
        homepage = "https://github.com/ezyang/ldap-haskell";
        description = "Haskell binding for C LDAP API";
        license = stdenv.lib.licenses.bsd3;
@@ -16242,6 +16193,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Strafunski-StrategyLib_5_0_0_10" = callPackage
+    ({ mkDerivation, base, directory, mtl, syb, transformers }:
+     mkDerivation {
+       pname = "Strafunski-StrategyLib";
+       version = "5.0.0.10";
+       sha256 = "308a1a051df6bb617c9d37bda297fdbedfb8b4c7f6ea5864443cfb9f15e80cc2";
+       libraryHaskellDepends = [ base directory mtl syb transformers ];
+       description = "Library for strategic programming";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "StrappedTemplates" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
      , filemanip, filepath, hspec, mtl, parsec, text, transformers
@@ -17211,8 +17174,8 @@ self: {
      }:
      mkDerivation {
        pname = "Unique";
-       version = "0.4.6";
-       sha256 = "4fd37ceafe74b95af73f01ccc64a5c1e3282e6b74ab2dd193507aac289ae2480";
+       version = "0.4.6.1";
+       sha256 = "8b9648383b28087fedf16b7bcb7c6c2137873a59af2d1ef8460fba1c902a84f9";
        libraryHaskellDepends = [
          base containers extra hashable unordered-containers
        ];
@@ -17922,6 +17885,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Win32-shortcut" = callPackage
+    ({ mkDerivation, base, libossp_uuid, mtl, ole32, th-utilities
+     , Win32
+     }:
+     mkDerivation {
+       pname = "Win32-shortcut";
+       version = "0.0.1";
+       sha256 = "5c2d67d8ca20d1a7452f3a0c3258e9d8b6540b40401a81dd199e56809144ffb7";
+       libraryHaskellDepends = [ base mtl th-utilities Win32 ];
+       librarySystemDepends = [ libossp_uuid ole32 ];
+       homepage = "https://github.com/opasly-wieprz/Win32-shortcut";
+       description = "Support for manipulating shortcuts (.lnk files) on Windows";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) libossp_uuid; ole32 = null;};
+
   "Wired" = callPackage
     ({ mkDerivation, base, chalmers-lava2000, containers, mtl
      , QuickCheck
@@ -18200,8 +18178,8 @@ self: {
     ({ mkDerivation, base, parsec }:
      mkDerivation {
        pname = "XMLParser";
-       version = "0.1.0.4";
-       sha256 = "79e55f9ae14054c8673f25325503c75af2bb750e0068f5fefbce3a98c7e04d94";
+       version = "0.1.0.6";
+       sha256 = "d2cc3144a74de8aaa20e9467e25d981b63598736b603921b10d9ddb47be36d79";
        libraryHaskellDepends = [ base parsec ];
        homepage = "xy30.com";
        description = "A library to parse xml";
@@ -20302,8 +20280,8 @@ self: {
        pname = "aeson-compat";
        version = "0.3.6";
        sha256 = "7aa365d9f44f708f25c939489528836aa10b411e0a3e630c8c2888670874d142";
-       revision = "2";
-       editedCabalFile = "1000ae33d38d919e685b31f6f4de79bab9298318ced3ded0ff7e4a24c10258c3";
+       revision = "4";
+       editedCabalFile = "534f6f1d1b09f88910407d670dfc9283ceaf824bf929373e0be1566f206011a3";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring containers exceptions
          hashable nats scientific semigroups tagged text time
@@ -20360,8 +20338,8 @@ self: {
        pname = "aeson-extra";
        version = "0.4.0.0";
        sha256 = "78ecedf65f8b68c09223912878e2a055aa38536489eddc9b47911cbc05aba594";
-       revision = "1";
-       editedCabalFile = "2a114863b515ec4b326bd31e4493ce2bcf7598b03361f76b44637e62d334b621";
+       revision = "2";
+       editedCabalFile = "205ca010ed9726b27ebe1f63fe6260dc26b327e2998cc4bc744a30bd3b708c3b";
        libraryHaskellDepends = [
          aeson aeson-compat attoparsec base base-compat bytestring
          containers exceptions hashable parsec recursion-schemes scientific
@@ -21350,8 +21328,8 @@ self: {
      }:
      mkDerivation {
        pname = "alex-meta";
-       version = "0.3.0.8";
-       sha256 = "2ed9c0e13ad7f73d732d7bf87d187628009fe1ef19b6848f3490d0e89bf045c9";
+       version = "0.3.0.9";
+       sha256 = "d933ff9ee92f2372bebef64c1780e20e8ff8bbbde6d53749c2b0892364ba0221";
        libraryHaskellDepends = [
          array base containers haskell-src-meta QuickCheck template-haskell
        ];
@@ -25121,6 +25099,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "amqp_0_14_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, clock, connection
+     , containers, data-binary-ieee754, hspec, hspec-expectations
+     , monad-control, network, network-uri, split, stm, text, vector
+     , xml
+     }:
+     mkDerivation {
+       pname = "amqp";
+       version = "0.14.1";
+       sha256 = "500465d278790117e08b7c5aa2c9f917a93cf3a87e81c079d509cd5fd52d300b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring clock connection containers
+         data-binary-ieee754 monad-control network network-uri split stm
+         text vector
+       ];
+       executableHaskellDepends = [ base containers xml ];
+       testHaskellDepends = [
+         base binary bytestring clock connection containers
+         data-binary-ieee754 hspec hspec-expectations network network-uri
+         split stm text vector
+       ];
+       homepage = "https://github.com/hreinhardt/amqp";
+       description = "Client library for AMQP servers (currently only RabbitMQ)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amqp-conduit" = callPackage
     ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec
      , HUnit, lifted-base, monad-control, mtl, resourcet, text
@@ -26317,25 +26324,6 @@ self: {
      }) {};
 
   "app-settings" = callPackage
-    ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl
-     , parsec, text
-     }:
-     mkDerivation {
-       pname = "app-settings";
-       version = "0.2.0.9";
-       sha256 = "ee844c5ed2847539c84d13d81e827fd2a4f0f9b0b53308f65d24244a027e9024";
-       libraryHaskellDepends = [
-         base containers directory mtl parsec text
-       ];
-       testHaskellDepends = [
-         base containers directory hspec HUnit mtl parsec text
-       ];
-       homepage = "https://github.com/emmanueltouzery/app-settings";
-       description = "A library to manage application settings (INI file-like)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "app-settings_0_2_0_10" = callPackage
     ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl
      , parsec, text
      }:
@@ -26352,7 +26340,6 @@ self: {
        homepage = "https://github.com/emmanueltouzery/app-settings";
        description = "A library to manage application settings (INI file-like)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "appar" = callPackage
@@ -26688,36 +26675,6 @@ self: {
      }) {arbb_dev = null;};
 
   "arbtt" = callPackage
-    ({ mkDerivation, aeson, array, base, binary, bytestring
-     , bytestring-progress, containers, deepseq, directory, filepath
-     , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty
-     , tasty-golden, tasty-hunit, terminal-progress-bar, time
-     , transformers, unix, utf8-string, X11
-     }:
-     mkDerivation {
-       pname = "arbtt";
-       version = "0.9.0.11";
-       sha256 = "9133fb9cc88568c3baec403e674e95cfe0ebedc1ff974499d97e93d916bdefef";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson array base binary bytestring bytestring-progress containers
-         deepseq directory filepath parsec pcre-light strict
-         terminal-progress-bar time transformers unix utf8-string X11
-       ];
-       executableSystemDepends = [ libXScrnSaver ];
-       testHaskellDepends = [
-         base binary bytestring containers deepseq directory parsec
-         pcre-light process-extras tasty tasty-golden tasty-hunit time
-         transformers unix utf8-string
-       ];
-       homepage = "http://arbtt.nomeata.de/";
-       description = "Automatic Rule-Based Time Tracker";
-       license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.xorg) libXScrnSaver;};
-
-  "arbtt_0_9_0_12" = callPackage
     ({ mkDerivation, aeson, array, base, binary, bytestring
      , bytestring-progress, containers, deepseq, directory, filepath
      , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty
@@ -27061,11 +27018,12 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "arithmatic";
-       version = "0.1.0.1";
-       sha256 = "487edb83b111065637d8ad313788aa43df14654cf098f5de682cd06322f641e1";
+       version = "0.1.0.2";
+       sha256 = "1de210330bfde4124c1fc898b71bfc423926c6dc91fbc78b01ad927af3b02939";
        libraryHaskellDepends = [ base ];
-       description = "Basic arithmatic in haskell";
-       license = stdenv.lib.licenses.gpl3;
+       doHaddock = false;
+       description = "do things with numbers";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "arithmetic" = callPackage
@@ -27814,6 +27772,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "async-extra" = callPackage
+    ({ mkDerivation, async, base, containers, deepseq }:
+     mkDerivation {
+       pname = "async-extra";
+       version = "0.1.0.0";
+       sha256 = "47cf509bc09d106cd229c4568e4c02ce085b2541e856b3be0c75cf62217dc02a";
+       libraryHaskellDepends = [ async base containers deepseq ];
+       homepage = "https://github.com/agrafix/async-extra#readme";
+       description = "Useful concurrent combinators";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "async-extras" = callPackage
     ({ mkDerivation, async, base, lifted-async, lifted-base
      , monad-control, SafeSemaphore, stm, transformers-base
@@ -28719,6 +28689,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "auto_0_4_3_1" = callPackage
+    ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
+     , deepseq, MonadRandom, profunctors, random, semigroups
+     , transformers
+     }:
+     mkDerivation {
+       pname = "auto";
+       version = "0.4.3.1";
+       sha256 = "c6e26d1cbb17e3645e55bc8e9432b124520fbcba5ff32445acd4260c25cd3b41";
+       libraryHaskellDepends = [
+         base base-orphans bytestring cereal containers deepseq MonadRandom
+         profunctors random semigroups transformers
+       ];
+       homepage = "https://github.com/mstksg/auto";
+       description = "Denotative, locally stateful programming DSL & platform";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "auto-update" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -28735,8 +28724,8 @@ self: {
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
-       version = "0.2.2";
-       sha256 = "2ad4c6d948984c0a5542f5ce87d806b3597088083bc179217d36d08380880d03";
+       version = "0.2.3";
+       sha256 = "b3b9bfb44a5942ee83b45b4c9bcf3a61335362c507a98acddaf47889e394ab8a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal directory filepath ];
@@ -30281,20 +30270,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base_4_9_0_0" = callPackage
-    ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }:
+  "base_4_9_1_0" = callPackage
+    ({ mkDerivation, ghc-prim, integer-gmp, rts }:
      mkDerivation {
        pname = "base";
-       version = "4.9.0.0";
-       sha256 = "de577e8bd48de97be954c32951b9544ecdbbede721042c71f7f611af4ba8be2d";
-       libraryHaskellDepends = [
-         ghc-prim invalid-cabal-flag-settings rts
-       ];
+       version = "4.9.1.0";
+       sha256 = "7a5b85805f06f869ca86f99e12cb098c611ab623dd70305ca2b389823d71fb7e";
+       libraryHaskellDepends = [ ghc-prim integer-gmp rts ];
        description = "Basic libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {invalid-cabal-flag-settings = null;};
+     }) {};
 
   "base-compat" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, unix }:
@@ -30347,6 +30333,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base-noprelude_4_9_1_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-noprelude";
+       version = "4.9.1.0";
+       sha256 = "11611df31326a31694f13393d1ee1d3c684c2688eeaca8d8627f40ac9435f895";
+       libraryHaskellDepends = [ base ];
+       doHaddock = false;
+       homepage = "https://github.com/hvr/base-noprelude";
+       description = "\"base\" package sans \"Prelude\" module";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-orphans" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
@@ -30977,8 +30977,8 @@ self: {
     ({ mkDerivation, base, process, random, time }:
      mkDerivation {
        pname = "benchmark-function";
-       version = "0.1.0.0";
-       sha256 = "abb023c298bb0ad58e376f668e7b11ce3f89be786fb8e6eeeae9d4008053abb1";
+       version = "0.1.0.1";
+       sha256 = "6ce46b2f88b444b14594d4b6f3b2b491005b211f2daa95f16aac9be3680193ff";
        libraryHaskellDepends = [ base process random time ];
        homepage = "xy30.com";
        description = "Test the time it takes to run a haskell function";
@@ -31757,33 +31757,6 @@ self: {
      }) {};
 
   "binary-orphans" = callPackage
-    ({ mkDerivation, aeson, base, binary, case-insensitive, hashable
-     , QuickCheck, quickcheck-instances, scientific, tagged, tasty
-     , tasty-quickcheck, text, text-binary, time, unordered-containers
-     , vector, vector-binary-instances
-     }:
-     mkDerivation {
-       pname = "binary-orphans";
-       version = "0.1.5.1";
-       sha256 = "c60442199ad6139654a6a672dc66d321dbe8a23199fb5269ef295b2adc23af4c";
-       revision = "4";
-       editedCabalFile = "842aed0eac15d13b8178dd9ded2b2e296eabc950bd607593bb22c307d77c551e";
-       libraryHaskellDepends = [
-         aeson base binary case-insensitive hashable scientific tagged text
-         text-binary time unordered-containers vector
-         vector-binary-instances
-       ];
-       testHaskellDepends = [
-         aeson base binary case-insensitive hashable QuickCheck
-         quickcheck-instances scientific tagged tasty tasty-quickcheck text
-         time unordered-containers vector
-       ];
-       homepage = "https://github.com/phadej/binary-orphans#readme";
-       description = "Orphan instances for binary";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "binary-orphans_0_1_5_2" = callPackage
     ({ mkDerivation, aeson, base, binary, case-insensitive, hashable
      , QuickCheck, quickcheck-instances, scientific, tagged, tasty
      , tasty-quickcheck, text, text-binary, time, unordered-containers
@@ -31793,6 +31766,8 @@ self: {
        pname = "binary-orphans";
        version = "0.1.5.2";
        sha256 = "7c644fb1d1657719c04c0f115a36efaeba7287c953de826b55c28fae87aca33d";
+       revision = "1";
+       editedCabalFile = "cb0932145cefc3ae3be46ef890b0db68864ddb96b0ed69371cbc878f385b6252";
        libraryHaskellDepends = [
          aeson base binary case-insensitive hashable scientific tagged text
          text-binary time unordered-containers vector
@@ -31806,7 +31781,6 @@ self: {
        homepage = "https://github.com/phadej/binary-orphans#readme";
        description = "Orphan instances for binary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-parser" = callPackage
@@ -31981,8 +31955,8 @@ self: {
        pname = "binary-tagged";
        version = "0.1.4.2";
        sha256 = "311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784";
-       revision = "1";
-       editedCabalFile = "51f87f18bfe7ba8a3edc318cfb95f4aae9c2bb3feb54277553ac895b09ce0cf1";
+       revision = "2";
+       editedCabalFile = "7abacbe953b33132ec4cd7f4765e58918404e22c8b05eb6411f6bd62b05a828c";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          generics-sop hashable nats scientific semigroups SHA tagged text
@@ -34252,8 +34226,8 @@ self: {
      }:
      mkDerivation {
        pname = "blazeT";
-       version = "0.0.4";
-       sha256 = "8ff74e6a75f4c77b13d122e57b9ef61e7365a7df0ca5efa7f1aba3a42a39c204";
+       version = "0.0.5";
+       sha256 = "81d25882110a62ba8ef99f76f35a98c58ec034f283244d5af6506832991e7091";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring mtl text
@@ -34401,7 +34375,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "bloodhound_0_12_0_0" = callPackage
+  "bloodhound_0_12_1_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
      , data-default-class, directory, doctest, errors, exceptions
      , filepath, generics-sop, hashable, hspec, http-client, http-types
@@ -34411,8 +34385,8 @@ self: {
      }:
      mkDerivation {
        pname = "bloodhound";
-       version = "0.12.0.0";
-       sha256 = "b3673675c75ee393281502ce45d0d9768c6a9165df9cebc23beb25539d7acbdc";
+       version = "0.12.1.0";
+       sha256 = "da3ed23c1cc9cfc1d1b44c1255522f6c164b8ed53d2e008c92789e72a232e46c";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers data-default-class
          exceptions hashable http-client http-types mtl mtl-compat
@@ -34738,8 +34712,8 @@ self: {
      }:
      mkDerivation {
        pname = "bolt";
-       version = "0.2.2.0";
-       sha256 = "07d04b418f1106f4fb4e11f8466d18121f7d63d162e86389a69a58f23270339b";
+       version = "0.3.0.1";
+       sha256 = "dd7f157db6fe2c6cac86a19803ac56ed132d8aa27f602a98e3506d2765b23ff9";
        libraryHaskellDepends = [
          base bifunctors bytestring cereal containers hashable network
          network-uri scientific text transformers unordered-containers
@@ -34905,8 +34879,8 @@ self: {
     ({ mkDerivation, base, bytestring, HUnit }:
      mkDerivation {
        pname = "boolean-list";
-       version = "0.1.0.0";
-       sha256 = "774f3f3313a8909505834e647b744fa53178b6a4eee5cf55b5207da5e6d7217b";
+       version = "0.1.0.1";
+       sha256 = "ac02910213e71b1e8f4d0de1227e7463836ee1e1985626effe1bf41af5b8e077";
        libraryHaskellDepends = [ base bytestring HUnit ];
        homepage = "http://xy30.com";
        description = "convert numbers to binary coded lists";
@@ -35294,6 +35268,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "brain-bleep" = callPackage
+    ({ mkDerivation, array, base, containers, parsec }:
+     mkDerivation {
+       pname = "brain-bleep";
+       version = "0.1.0.1";
+       sha256 = "043d66bf97458ccf83129c29574e44b0704b04602f5450562f72fa9bb2b3a9a1";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ array base containers parsec ];
+       description = "primitive imperative language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "brainfuck" = callPackage
     ({ mkDerivation, array, base, mtl, unix }:
      mkDerivation {
@@ -35364,19 +35351,19 @@ self: {
   "breve" = callPackage
     ({ mkDerivation, aeson, base, binary, blaze-html, bytestring
      , configurator, cryptohash, directory, hashtables, http-types, mtl
-     , random, Spock, text, tls, transformers, wai, wai-extra
-     , wai-middleware-static, warp, warp-tls, xdg-basedir
+     , random, Spock, Spock-core, text, tls, transformers, wai
+     , wai-extra, wai-middleware-static, warp, warp-tls, xdg-basedir
      }:
      mkDerivation {
        pname = "breve";
-       version = "0.4.3.0";
-       sha256 = "e4740b0cc882ada54bb7e89957349639ef2a3f171598818b7e678b9880d1f939";
+       version = "0.4.3.1";
+       sha256 = "2c1a7d1cb1653a4bf66d5cb53e064b498d8165aa67d7380580a0b69d0f5f2581";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson base binary blaze-html bytestring configurator cryptohash
-         directory hashtables http-types mtl random Spock text tls
-         transformers wai wai-extra wai-middleware-static warp warp-tls
+         directory hashtables http-types mtl random Spock Spock-core text
+         tls transformers wai wai-extra wai-middleware-static warp warp-tls
          xdg-basedir
        ];
        homepage = "https://github.com/rnhmjoj/breve";
@@ -35656,10 +35643,19 @@ self: {
      }:
      mkDerivation {
        pname = "buchhaltung";
-       version = "0.0.3";
-       sha256 = "6ba38b02094431f1f24e698eed4b4dc3c0169f2154d2b66a584c16162c4cf276";
-       isLibrary = false;
+       version = "0.0.5";
+       sha256 = "38a63a043e6360c393400c90b59102f5295e9603379c8d5838bf2cf0e2527569";
+       isLibrary = true;
        isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint array async base boxes bytestring cassava
+         containers data-default Decimal deepseq directory edit-distance
+         file-embed filepath formatting hashable haskeline hint hledger
+         hledger-lib lens lifted-base ListLike megaparsec MissingH
+         monad-control mtl optparse-applicative parsec process regex-compat
+         regex-tdfa regex-tdfa-text safe semigroups split strict temporary
+         text time transformers unordered-containers vector yaml
+       ];
        executableHaskellDepends = [
          aeson ansi-wl-pprint array async base boxes bytestring cassava
          containers data-default Decimal deepseq directory edit-distance
@@ -37122,8 +37118,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-macosx";
-       version = "0.2.3.4";
-       sha256 = "4c3ae50fdafa3283055624156016834f077bdf5b8237441497e7ccea69308570";
+       version = "0.2.3.5";
+       sha256 = "6f5604cd4d1e7e67736c408babda35fdf1b1ff7348254d1f308ccea953615633";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38228,14 +38224,15 @@ self: {
   "canteven-http" = callPackage
     ({ mkDerivation, base, bytestring, canteven-log, exceptions
      , http-types, monad-logger, text, time, transformers, uuid, wai
+     , wai-extra
      }:
      mkDerivation {
        pname = "canteven-http";
-       version = "0.1.1.2";
-       sha256 = "378a453137fa9d1d1ad8f4771c02bb74b5a634624d437fbec00356a153f4b874";
+       version = "0.1.2.0";
+       sha256 = "194fbbb36eaa70c4ed2dbf8cdc9e5831761bbefba2cccd473f1068bf33ac0977";
        libraryHaskellDepends = [
          base bytestring canteven-log exceptions http-types monad-logger
-         text time transformers uuid wai
+         text time transformers uuid wai wai-extra
        ];
        homepage = "https://github.com/SumAll/canteven-http";
        description = "Utilities for HTTP programming";
@@ -38687,12 +38684,16 @@ self: {
      }) {};
 
   "case-conversion" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, HUnit }:
      mkDerivation {
        pname = "case-conversion";
-       version = "0.1";
-       sha256 = "24061f58765007efdff7024b2c9986c311734281f8acb941ee1fb020f18256da";
+       version = "0.2";
+       sha256 = "d8ac5def42d113050ccfc8724ea7408d4f748e2daa942a23b053d5b5602bb9cd";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "www.xy30.com";
        description = "Convert between different cases";
        license = stdenv.lib.licenses.bsd3;
@@ -39328,17 +39329,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cayley-client_0_3_1" = callPackage
+  "cayley-client_0_3_2" = 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.3.1";
-       sha256 = "c2d8eeeebf3814a10abfadb032132c8f1deff393909312d17755a9547463ebf7";
-       revision = "1";
-       editedCabalFile = "2f59497bc4c4e60596223f1f64ccb621a5f7906c06fac51780875c9c8923bdde";
+       version = "0.3.2";
+       sha256 = "f6e8b5cd6909554b8a75dedd303df0948fd3d27826b053ab2fc5779e7a7e5bc7";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring exceptions http-client
          http-conduit lens lens-aeson mtl text transformers
@@ -41333,6 +41332,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-multisignal" = callPackage
+    ({ mkDerivation, base, clash-prelude, QuickCheck }:
+     mkDerivation {
+       pname = "clash-multisignal";
+       version = "0.1.0.0";
+       sha256 = "84da3f9ea59db5e2594d6c207aa8be6219331c7cfa08415e791af1f65ebf6941";
+       libraryHaskellDepends = [ base clash-prelude QuickCheck ];
+       homepage = "https://github.com/ra1u/clash-multisignal";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "clash-prelude" = callPackage
     ({ mkDerivation, array, base, data-default, deepseq, doctest
      , ghc-prim, ghc-typelits-extra, ghc-typelits-natnormalise
@@ -41618,7 +41628,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
-  "clckwrks_0_24_0" = callPackage
+  "clckwrks_0_24_0_1" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
      , blaze-html, bytestring, cereal, containers, directory, filepath
      , happstack-authenticate, happstack-hsp, happstack-jmacro
@@ -41632,8 +41642,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks";
-       version = "0.24.0";
-       sha256 = "aae3a0d63da228eb0876505ec574f90955d5f2c3512003b57371d988b94a2e5c";
+       version = "0.24.0.1";
+       sha256 = "94e21d56e4a1e7efcc3f8f39252ff1ee6b74b3dd3408fd265dddbdf1606cdede";
        libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
@@ -41653,25 +41663,6 @@ self: {
      }) {inherit (pkgs) openssl;};
 
   "clckwrks-cli" = callPackage
-    ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl
-     , network, parsec
-     }:
-     mkDerivation {
-       pname = "clckwrks-cli";
-       version = "0.2.16";
-       sha256 = "424fcaa1f1b6b39be1d727073b9b9ab37c9a201f6c2eca5a8c30d469919c12e7";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         acid-state base clckwrks haskeline mtl network parsec
-       ];
-       homepage = "http://www.clckwrks.com/";
-       description = "a command-line interface for adminstrating some aspects of clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clckwrks-cli_0_2_17_1" = callPackage
     ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl
      , network, parsec
      }:
@@ -41764,30 +41755,6 @@ self: {
      }) {};
 
   "clckwrks-plugin-media" = callPackage
-    ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal
-     , clckwrks, containers, directory, filepath, gd, happstack-server
-     , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack
-     , reform-hsp, safecopy, text, web-plugins, web-routes
-     , web-routes-th
-     }:
-     mkDerivation {
-       pname = "clckwrks-plugin-media";
-       version = "0.6.16";
-       sha256 = "7e4dbb81a28a3e4bf81c5d1ef5d0820a858877c00d1f2c98488d391a4a478598";
-       libraryHaskellDepends = [
-         acid-state attoparsec base blaze-html cereal clckwrks containers
-         directory filepath gd happstack-server hsp ixset magic mtl reform
-         reform-happstack reform-hsp safecopy text web-plugins web-routes
-         web-routes-th
-       ];
-       libraryToolDepends = [ hsx2hs ];
-       homepage = "http://clckwrks.com/";
-       description = "media plugin for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clckwrks-plugin-media_0_6_16_1" = callPackage
     ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal
      , clckwrks, containers, directory, filepath, gd, happstack-server
      , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack
@@ -41837,7 +41804,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clckwrks-plugin-page_0_4_3_7" = callPackage
+  "clckwrks-plugin-page_0_4_3_8" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
      , containers, directory, filepath, happstack-hsp, happstack-server
      , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
@@ -41847,8 +41814,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-page";
-       version = "0.4.3.7";
-       sha256 = "4f621eea6793307fb025ac9738f273c61c0e643f604bd2489b2bdf6fc06639d7";
+       version = "0.4.3.8";
+       sha256 = "57be510f5d829eb54a37e2777748250923283f8d9eb1690abb069368c36c00e6";
        libraryHaskellDepends = [
          acid-state aeson attoparsec base clckwrks containers directory
          filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
@@ -41864,24 +41831,6 @@ self: {
      }) {};
 
   "clckwrks-theme-bootstrap" = callPackage
-    ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp
-     , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins
-     }:
-     mkDerivation {
-       pname = "clckwrks-theme-bootstrap";
-       version = "0.4.2";
-       sha256 = "6b613719a51e4df718559b3517d9e6322ced8e75a874e69fcfc38d1648f22348";
-       libraryHaskellDepends = [
-         base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
-         mtl text web-plugins
-       ];
-       homepage = "http://www.clckwrks.com/";
-       description = "simple bootstrap based template for clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clckwrks-theme-bootstrap_0_4_2_1" = callPackage
     ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp
      , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins
      }:
@@ -43557,6 +43506,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "comma" = callPackage
+    ({ mkDerivation, attoparsec, base, QuickCheck, text }:
+     mkDerivation {
+       pname = "comma";
+       version = "1.0.0";
+       sha256 = "e5f02dc70c400c389821116054fdcce5745a3aafd5f018b8dfb39e3e019e5462";
+       libraryHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [ base QuickCheck text ];
+       homepage = "https://github.com/lovasko/comma";
+       description = "CSV Parser & Producer";
+       license = "unknown";
+     }) {};
+
   "command" = callPackage
     ({ mkDerivation, base, deepseq, process }:
      mkDerivation {
@@ -44478,22 +44440,6 @@ self: {
      }) {};
 
   "concurrent-output" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
-     , process, stm, terminal-size, text, transformers, unix
-     }:
-     mkDerivation {
-       pname = "concurrent-output";
-       version = "1.7.7";
-       sha256 = "d3f7330fa5f194ba759af30f4be0b8aaa509dc84ed24e8340a8cdbe470c6dfd1";
-       libraryHaskellDepends = [
-         ansi-terminal async base directory exceptions process stm
-         terminal-size text transformers unix
-       ];
-       description = "Ungarble output from several threads or commands";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "concurrent-output_1_7_8" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
      , process, stm, terminal-size, text, transformers, unix
      }:
@@ -44507,7 +44453,6 @@ self: {
        ];
        description = "Ungarble output from several threads or commands";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-rpc" = callPackage
@@ -46196,17 +46141,17 @@ self: {
   "convert-annotation" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, containers
      , deepseq, HTTP, inline-r, lens, lens-aeson, optparse-generic
-     , pipes, pipes-bytestring, pipes-csv, safe, text, vector, wreq
+     , pipes, pipes-bytestring, pipes-csv, req, safe, text, vector
      }:
      mkDerivation {
        pname = "convert-annotation";
-       version = "0.5.0.0";
-       sha256 = "946e3b0961a64fe7c3a8ffe28c8f87675a4f37000f3a4a7431f9b9c1af7dca67";
+       version = "0.5.0.1";
+       sha256 = "11a2eb8d8f02fd28bb1772aa42fea95dcc9ef8e4c8843f44e401c8a0749c1fa5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq HTTP inline-r lens
-         lens-aeson safe text wreq
+         lens-aeson req safe text
        ];
        executableHaskellDepends = [
          base bytestring cassava inline-r lens optparse-generic pipes
@@ -47285,6 +47230,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "crackNum_1_7" = callPackage
+    ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
+     mkDerivation {
+       pname = "crackNum";
+       version = "1.7";
+       sha256 = "60e9bfb0b75ba32d0fbdd87ba3ebcf89d6f3150c48fbaa6b5637f4414598c853";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base data-binary-ieee754 FloatingHex ieee754
+       ];
+       executableHaskellDepends = [
+         base data-binary-ieee754 FloatingHex ieee754
+       ];
+       description = "Crack various integer, floating-point data formats";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "craft" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
      , bytestring, conduit, conduit-combinators, conduit-extra
@@ -48985,8 +48949,8 @@ self: {
     ({ mkDerivation, array, base, c2hs, cudd, mtl, transformers }:
      mkDerivation {
        pname = "cudd";
-       version = "0.1.0.3.1";
-       sha256 = "95c05f80bb0caad6bc372ab511a7a74c6cf1c025c54d15105a573b3fec64d730";
+       version = "0.1.0.4";
+       sha256 = "d15b95b34d8d29d201cab78baf79c8e18636429ca5516d84dc03a26486b1d7a0";
        libraryHaskellDepends = [ array base mtl transformers ];
        librarySystemDepends = [ cudd ];
        libraryToolDepends = [ c2hs ];
@@ -49547,6 +49511,51 @@ self: {
        license = "GPL";
      }) {inherit (pkgs) curl;};
 
+  "darcs_2_12_5" = callPackage
+    ({ mkDerivation, array, async, attoparsec, base, base16-bytestring
+     , binary, bytestring, cmdargs, containers, cryptohash, curl
+     , data-ordlist, directory, fgl, filepath, FindBin, graphviz
+     , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network
+     , network-uri, old-time, parsec, process, QuickCheck, random
+     , regex-applicative, regex-compat-tdfa, sandi, shelly, split, tar
+     , terminfo, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , transformers-compat, unix, unix-compat, utf8-string, vector
+     , zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "darcs";
+       version = "2.12.5";
+       sha256 = "355b04c85c27bca43c8c380212988d9c1e9a984b0b593ceb2884de4295063553";
+       configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array async attoparsec base base16-bytestring binary bytestring
+         containers cryptohash data-ordlist directory fgl filepath graphviz
+         hashable haskeline html HTTP mmap mtl network network-uri old-time
+         parsec process random regex-applicative regex-compat-tdfa sandi tar
+         terminfo text time transformers transformers-compat unix
+         unix-compat utf8-string vector zip-archive zlib
+       ];
+       librarySystemDepends = [ curl ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         array base bytestring cmdargs containers directory filepath FindBin
+         HUnit mtl QuickCheck shelly split test-framework
+         test-framework-hunit test-framework-quickcheck2 text zip-archive
+       ];
+       doCheck = false;
+       postInstall = ''
+         mkdir -p $out/etc/bash_completion.d
+         mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
+       '';
+       homepage = "http://darcs.net/";
+       description = "a distributed, interactive, smart revision control system";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) curl;};
+
   "darcs-benchmark" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, containers, datetime
      , directory, filepath, hs-gchart, html, HTTP, json, mtl, network
@@ -51689,6 +51698,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dawg-ord_0_5_1_0" = callPackage
+    ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "dawg-ord";
+       version = "0.5.1.0";
+       sha256 = "d9129acfb71ce41b6994d2c72a040319fc85af408226122d3958d5617e8922e9";
+       libraryHaskellDepends = [
+         base containers mtl transformers vector
+       ];
+       testHaskellDepends = [
+         base containers HUnit mtl smallcheck tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/kawu/dawg-ord";
+       description = "Directed acyclic word graphs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dbcleaner" = callPackage
     ({ mkDerivation, base, hspec, postgresql-simple, text }:
      mkDerivation {
@@ -51987,8 +52018,8 @@ self: {
      }:
      mkDerivation {
        pname = "dcpu16";
-       version = "0.1.0.0";
-       sha256 = "d3838fcd4838a668319791c4996a2af7e11f6a0496485c61389f40e376f335bc";
+       version = "0.1.0.2";
+       sha256 = "92de2844f087051e94be731f127b06c1cdb4ed3747b82c8ab33fc4feedcdc7fc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -51996,8 +52027,8 @@ self: {
        ];
        executableHaskellDepends = [ base filepath optparse-applicative ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/githubuser/dcpu16#readme";
-       description = "Initial project template from stack";
+       homepage = "https://github.com/anatolat/dcpu16#readme";
+       description = "DCPU-16 Emulator & Assembler";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -53109,18 +53140,6 @@ self: {
      }) {};
 
   "dependent-map" = callPackage
-    ({ mkDerivation, base, containers, dependent-sum }:
-     mkDerivation {
-       pname = "dependent-map";
-       version = "0.2.3.0";
-       sha256 = "4a0b9c615dab33e9ef3b628ed88664e9d24e33fdb29b3aa5c66cb4b3fc1b2a20";
-       libraryHaskellDepends = [ base containers dependent-sum ];
-       homepage = "https://github.com/mokus0/dependent-map";
-       description = "Dependent finite maps (partial dependent products)";
-       license = "unknown";
-     }) {};
-
-  "dependent-map_0_2_4_0" = callPackage
     ({ mkDerivation, base, containers, dependent-sum }:
      mkDerivation {
        pname = "dependent-map";
@@ -53130,7 +53149,6 @@ self: {
        homepage = "https://github.com/mokus0/dependent-map";
        description = "Dependent finite maps (partial dependent products)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dependent-state" = callPackage
@@ -54153,6 +54171,8 @@ self: {
        pname = "diagrams-lib";
        version = "1.4.0.1";
        sha256 = "5140b590c83047058d4253842ef1105b2ecf71d8dd72a280123c00b030a32dc6";
+       revision = "1";
+       editedCabalFile = "b099abcd3adb35dae8f260909ac343a82a1bf728f9d4529cac15fdae5dce5e8a";
        libraryHaskellDepends = [
          active adjunctions array base cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
@@ -54529,6 +54549,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dice2tex" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "dice2tex";
+       version = "0.1.0.1";
+       sha256 = "a985961404bd7ceac10a1ea5ef0751643aecd506874c581a76a69e398479a841";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base ];
+       description = "Convert a Diceware wordlist into a printer-ready LaTeX file";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "dicom" = callPackage
     ({ mkDerivation, base, binary, bytestring, pretty, safe, time }:
      mkDerivation {
@@ -55625,6 +55658,8 @@ self: {
        pname = "distributed-process-async";
        version = "0.2.3";
        sha256 = "d3031457c36bb3c35496031c185354417b54ce253e1878f35072d04e8161ad95";
+       revision = "1";
+       editedCabalFile = "56ae624c478fa2a42dd48850189ffdd1540416e820a83bbe00c54569b76af288";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-extras fingertree hashable mtl stm time
@@ -56123,23 +56158,6 @@ self: {
      }) {};
 
   "distributive" = callPackage
-    ({ mkDerivation, base, base-orphans, directory, doctest, filepath
-     , tagged, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "distributive";
-       version = "0.5.0.2";
-       sha256 = "f884996f491fe5b275b7dda2cebdadfecea0d7788a142546e0271e9575cc1609";
-       libraryHaskellDepends = [
-         base base-orphans tagged transformers transformers-compat
-       ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/ekmett/distributive/";
-       description = "Distributive functors -- Dual to Traversable";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "distributive_0_5_1" = callPackage
     ({ mkDerivation, base, base-orphans, directory, doctest, filepath
      , tagged, transformers, transformers-compat
      }:
@@ -56154,7 +56172,6 @@ self: {
        homepage = "http://github.com/ekmett/distributive/";
        description = "Distributive functors -- Dual to Traversable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diversity" = callPackage
@@ -57063,6 +57080,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "double-extra" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava, deepseq
+     , double-conversion, rawstring-qm, text
+     }:
+     mkDerivation {
+       pname = "double-extra";
+       version = "0.1.0.4";
+       sha256 = "f7df3804982a8acb19b774080922b7625209abf14a328b2efaa39df4f6d7b6a0";
+       libraryHaskellDepends = [
+         aeson base bytestring cassava deepseq double-conversion
+         rawstring-qm text
+       ];
+       homepage = "https://github.com/tolysz/double-extra#readme";
+       description = "Missing presentations for Double numbers (fixed, scientific etc.)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "double-metaphone" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -57826,6 +57860,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dump-core" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, ghc, monadLib, text
+     }:
+     mkDerivation {
+       pname = "dump-core";
+       version = "0.1.3";
+       sha256 = "003fde9e29824a4dfc2523c29fefd873d4eae0c1e9a17547021aab5e738bd6c6";
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath ghc monadLib
+         text
+       ];
+       description = "A plug-in for rendering GHC core";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "dunai" = callPackage
     ({ mkDerivation, base, transformers, transformers-base }:
      mkDerivation {
@@ -58540,8 +58590,8 @@ self: {
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "echo";
-       version = "0.1.1";
-       sha256 = "e1fc1756f255e47db28c6c0520c43fe45ac0c1093009f378683273ebe02851c6";
+       version = "0.1.2";
+       sha256 = "819afc6655c4973f5ff3e65bb604cc871d2a1b17faf2a9840224e27b51a9f030";
        libraryHaskellDepends = [ base process ];
        homepage = "https://github.com/RyanGlScott/echo";
        description = "A cross-platform, cross-console way to handle echoing terminal input";
@@ -59165,25 +59215,6 @@ self: {
      }) {};
 
   "ekg" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
-     , filepath, network, snap-core, snap-server, text, time
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "ekg";
-       version = "0.4.0.11";
-       sha256 = "8cd041f6b7da4f57df1795d619f9140a071ed2adb6ed5ade1c3e899957edb603";
-       libraryHaskellDepends = [
-         aeson base bytestring ekg-core ekg-json filepath network snap-core
-         snap-server text time transformers unordered-containers
-       ];
-       homepage = "https://github.com/tibbe/ekg";
-       description = "Remote monitoring of processes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "ekg_0_4_0_12" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
      , filepath, network, snap-core, snap-server, text, time
      , transformers, unordered-containers
@@ -59293,21 +59324,6 @@ self: {
      }) {};
 
   "ekg-json" = callPackage
-    ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "ekg-json";
-       version = "0.1.0.3";
-       sha256 = "3c97d423ac85903d0fed400845c29ccd39f1ca80666b09659a0238983b743317";
-       libraryHaskellDepends = [
-         aeson base ekg-core text unordered-containers
-       ];
-       homepage = "https://github.com/tibbe/ekg-json";
-       description = "JSON encoding of ekg metrics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ekg-json_0_1_0_4" = callPackage
     ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
      }:
      mkDerivation {
@@ -59320,7 +59336,6 @@ self: {
        homepage = "https://github.com/tibbe/ekg-json";
        description = "JSON encoding of ekg metrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-log" = callPackage
@@ -62057,27 +62072,6 @@ self: {
      }) {};
 
   "executable-hash" = callPackage
-    ({ mkDerivation, base, bytestring, cryptohash, directory
-     , executable-path, file-embed, template-haskell
-     }:
-     mkDerivation {
-       pname = "executable-hash";
-       version = "0.2.0.2";
-       sha256 = "7285dc07aef00b71d76ef3fa9403c88e976a0517fcc3aec6e7e1ac5512007a80";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring cryptohash directory executable-path file-embed
-         template-haskell
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
-       homepage = "http://github.com/fpco/executable-hash";
-       description = "Provides the SHA1 hash of the program executable";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "executable-hash_0_2_0_4" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cryptohash, directory
      , executable-path, file-embed, filepath, template-haskell
      }:
@@ -62100,7 +62094,6 @@ self: {
        homepage = "http://github.com/fpco/executable-hash";
        description = "Provides the SHA1 hash of the program executable";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "executable-path" = callPackage
@@ -63416,8 +63409,8 @@ self: {
        pname = "fay-builder";
        version = "0.2.0.5";
        sha256 = "116dea6dc304834be81d70faec7e3de1fd867ebbda0d02d3c1c6a0f96d2b31a2";
-       revision = "3";
-       editedCabalFile = "7e6aeeae40ee69594e435dd7e6d133fbaea764b3b06271b607cc0ae185178e89";
+       revision = "4";
+       editedCabalFile = "75a6193b829d2d606a20782ca37f4ee8f02baa91d8f49f989e820e51710e3d26";
        libraryHaskellDepends = [
          base Cabal data-default directory fay filepath safe split text
        ];
@@ -63775,28 +63768,6 @@ self: {
      }) {};
 
   "feed" = callPackage
-    ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework
-     , test-framework-hunit, time, time-locale-compat, utf8-string, xml
-     }:
-     mkDerivation {
-       pname = "feed";
-       version = "0.3.11.1";
-       sha256 = "ed04d0fc120a4b1b47c7675d395afbb419506431bc6f8e0f2c382c73a4afc983";
-       revision = "4";
-       editedCabalFile = "ecce0a16a0d695b1c8ed80af4ea59e33c767ad9c6bdac5898e7cae20bd5da8c6";
-       libraryHaskellDepends = [
-         base old-locale old-time time time-locale-compat utf8-string xml
-       ];
-       testHaskellDepends = [
-         base HUnit old-locale old-time test-framework test-framework-hunit
-         time time-locale-compat utf8-string xml
-       ];
-       homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "feed_0_3_12_0" = callPackage
     ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework
      , test-framework-hunit, time, time-locale-compat, utf8-string, xml
      }:
@@ -63814,7 +63785,6 @@ self: {
        homepage = "https://github.com/bergmark/feed";
        description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed-cli" = callPackage
@@ -65342,8 +65312,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "fizz-buzz";
-       version = "0.1.0.1";
-       sha256 = "97bca955036b0ae3d33757fdcbb44421f9cd5a49ee0ed0b6ade07f168f543d99";
+       version = "0.1.0.2";
+       sha256 = "b7845c186b3471b9db735e98361540890eb7c94fe8c9c4d97991a339e01d7426";
        libraryHaskellDepends = [ base ];
        description = "Functional Fizz/Buzz";
        license = stdenv.lib.licenses.bsd3;
@@ -65370,8 +65340,8 @@ self: {
        pname = "flac";
        version = "0.1.1";
        sha256 = "58b7287cb39bdfc39cf7aab95b87d81111234fed502a8d1743ecfbcef001873e";
-       revision = "1";
-       editedCabalFile = "482d7352bb284c86021b513c37837746fe8a293146c3cf0d91b91dbc4a34ae34";
+       revision = "2";
+       editedCabalFile = "2aa55d857d01dde6f3ae1ae7664a7f5ed94f4eb0ddeb9fd9b8a5e3c866a315d0";
        libraryHaskellDepends = [
          base bytestring containers data-default-class directory exceptions
          filepath mtl text transformers vector wave
@@ -65394,6 +65364,8 @@ self: {
        pname = "flac-picture";
        version = "0.1.0";
        sha256 = "3c36dff9cebb44502a69e300f233e792900d051bd7eadc2c7390feb53efb3293";
+       revision = "1";
+       editedCabalFile = "aafff32fbe612805b32e0497ec2132c5b0e329a8a5b13ce23df865ce6954cd00";
        libraryHaskellDepends = [ base bytestring flac JuicyPixels ];
        testHaskellDepends = [
          base bytestring data-default-class directory flac hspec JuicyPixels
@@ -66175,8 +66147,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.2.1";
-       sha256 = "86afa8df81991d9901e717107fa12fc6f3577e8fd40ef9e57d388435b6e68073";
+       version = "1.2.2";
+       sha256 = "c869deb0dc7d41d496539968968ff6045022d1286dfb2c1d53f61dc974f455eb";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant mwc-random
          primitive profunctors text transformers vector
@@ -66873,6 +66845,8 @@ self: {
        pname = "foundation";
        version = "0.0.3";
        sha256 = "72d7f2af963d42cb7e1164b854978ad3f351175449ba2d27c6b639ffca0b75fa";
+       revision = "1";
+       editedCabalFile = "d3e2dc092452ec38bd2b555ecb5c5aceecb21880810c115973bf5cf2b4e0da5b";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -67945,6 +67919,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ftp-client" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, connection, network
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ftp-client";
+       version = "0.2.0.0";
+       sha256 = "cab25efcdf876396bdf70dfb83d4d2cdbb3dfe018fc2aea5bcc0b5b934f4518a";
+       libraryHaskellDepends = [
+         attoparsec base bytestring connection network transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/mr/ftp-client";
+       description = "Transfer files with FTP and FTPS";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
+  "ftp-client-conduit" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, ftp-client
+     , ftp-clientconduit, resourcet
+     }:
+     mkDerivation {
+       pname = "ftp-client-conduit";
+       version = "0.2.0.0";
+       sha256 = "f4bc3746b62ce12645b8c1ebdd45368f159d7c1ae7cf2b5a8a079a0d804eb315";
+       libraryHaskellDepends = [
+         base bytestring conduit connection ftp-client resourcet
+       ];
+       testHaskellDepends = [ base ftp-clientconduit ];
+       homepage = "https://github.com/mr/ftp-client";
+       description = "Transfer file with FTP and FTPS with Conduit";
+       license = stdenv.lib.licenses.publicDomain;
+       broken = true;
+     }) {ftp-clientconduit = null;};
+
   "ftp-conduit" = callPackage
     ({ mkDerivation, base, byteorder, bytestring, conduit, MissingH
      , network, transformers, utf8-string
@@ -70012,14 +70021,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-boot_8_0_1" = callPackage
+  "ghc-boot_8_0_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, filepath
      , ghc-boot-th
      }:
      mkDerivation {
        pname = "ghc-boot";
-       version = "8.0.1";
-       sha256 = "ba9bfbe6d18c0cf445f2b38ab42b649286f8b61d727dec2ba37fea648ebb28da";
+       version = "8.0.2";
+       sha256 = "f703203a2460f31f05af3aa82d23f314a5d7a077db0b324da238a3f1d9328460";
        libraryHaskellDepends = [
          base binary bytestring directory filepath ghc-boot-th
        ];
@@ -70028,12 +70037,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-boot-th_8_0_1" = callPackage
+  "ghc-boot-th_8_0_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ghc-boot-th";
-       version = "8.0.1";
-       sha256 = "c2eb6746801ca289d940099b3c68113963f9eddec90b454258a1442cd993e385";
+       version = "8.0.2";
+       sha256 = "5d00e271f2dd83ff2c69df4d3c17ced26eaffd5a65898b2a04b0dc75f99bf8f0";
        libraryHaskellDepends = [ base ];
        description = "Shared functionality between GHC and the @template-haskell@ library";
        license = stdenv.lib.licenses.bsd3;
@@ -70096,6 +70105,8 @@ self: {
        pname = "ghc-dump-tree";
        version = "0.2.0.2";
        sha256 = "a89a52e448926eab7ecd97ba7081b858486bcaf487cd800403c3e2a0a76a9cc3";
+       revision = "2";
+       editedCabalFile = "9a950ee81c799050c982191431e3df03a178288c03faa077f21bc5b136ee002e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70336,8 +70347,8 @@ self: {
        pname = "ghc-mod";
        version = "5.6.0.0";
        sha256 = "69b880410c028e9b7bf60c67120eeb567927fc6fba4df5400b057eba9efaa20e";
-       revision = "3";
-       editedCabalFile = "d21d034e1e1df7a5b478e2fd8dad0e11e01e46ce095ea39a90acacfdd34661ea";
+       revision = "4";
+       editedCabalFile = "c432e3b9ee808551fe785d6c61b9daa8370add1a6a9b7ec1a25869e2122cd3e4";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [
@@ -70748,14 +70759,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghci_8_0_1" = callPackage
+  "ghci_8_0_2" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , deepseq, filepath, ghc-boot, template-haskell, transformers, unix
      }:
      mkDerivation {
        pname = "ghci";
-       version = "8.0.1";
-       sha256 = "6becea2e7f687eefda4acc9ddf90dbd90d82fd497d0d9f72f47d8f1e9614988e";
+       version = "8.0.2";
+       sha256 = "986d4d8e2ae1077c9b41f441bb6c509cb5d932fc13d3996a1f00481c36dde135";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq filepath ghc-boot
          template-haskell transformers unix
@@ -72121,8 +72132,8 @@ self: {
      }:
      mkDerivation {
        pname = "gipeda";
-       version = "0.3.2.2";
-       sha256 = "ce8bea4e3c75cde5296f834bb8e91300b4d3bdad95df4819d9e43b4c414f61c7";
+       version = "0.3.3.0";
+       sha256 = "9b3f111ed3b980a5b9a721948df16c6a05b28f3a805657d0cfa271e356169744";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -72489,10 +72500,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-mediate";
-       version = "1.0.1";
-       sha256 = "12320be6a3a0c8f982346c3fdb15e2102339ca2ae454b413d2664124f08c3c57";
-       revision = "1";
-       editedCabalFile = "208ad1540eab41d7530395ef31095f6aa8a1c0e415f6e9f6236418f6d4ebb32d";
+       version = "1.0.2";
+       sha256 = "1b0811b1d26a11f564b6136fed1fc440711f9554433d25475e03d3e5dd28306c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -72699,8 +72708,8 @@ self: {
        pname = "github";
        version = "0.15.0";
        sha256 = "f091c35c446619bace51bd4d3831563cccfbda896954ed98d2aed818feead609";
-       revision = "1";
-       editedCabalFile = "d56da89ceea0c330c54b4820d397e3cea2bba43978ca4dfa42bb153459d29f7d";
+       revision = "2";
+       editedCabalFile = "dfa08cdd826d10c2b751d80356cb956f38dddd4b7247fdb0beeefb6f98e94373";
        libraryHaskellDepends = [
          aeson aeson-compat base base-compat base16-bytestring binary
          binary-orphans byteable bytestring containers cryptohash deepseq
@@ -73233,15 +73242,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "glabrous_0_2_3" = callPackage
+  "glabrous_0_3_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , cereal, cereal-text, directory, either, hspec, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "glabrous";
-       version = "0.2.3";
-       sha256 = "f9e1c11f1702a1710cd172c972d618dcecc62197b7b37f66aa31a2aad45e4bad";
+       version = "0.3.0";
+       sha256 = "3e1547d3e2ec7098e52262961bb710683ff83422793ce68b59cc9a0918831490";
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring cereal cereal-text
          either text unordered-containers
@@ -73439,8 +73448,8 @@ self: {
        pname = "glirc";
        version = "2.20.2";
        sha256 = "acefc316a6075dbeb2fa95bf1ee99a8e4c3097eaf5be9273d676719d07a94b00";
-       revision = "1";
-       editedCabalFile = "4eb4ef433d48ddf947ede4423212b39ea82b665e50b17d2a0cf6ac3154cc33dd";
+       revision = "2";
+       editedCabalFile = "78d1b995b9b7bcb4dc012341c65b8e4d6c4893c8db7c6b66146cfe0726ca1be3";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -73603,22 +73612,6 @@ self: {
      }) {};
 
   "gloss" = callPackage
-    ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
-     , gloss-rendering, GLUT, OpenGL
-     }:
-     mkDerivation {
-       pname = "gloss";
-       version = "1.10.2.3";
-       sha256 = "33d457f0b01c844abf50687a8c0d060df5c6b1177da6236ae39561491f7a7210";
-       libraryHaskellDepends = [
-         base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
-       ];
-       homepage = "http://gloss.ouroborus.net";
-       description = "Painless 2D vector graphics, animations and simulations";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gloss_1_10_2_5" = callPackage
     ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
      , gloss-rendering, GLUT, OpenGL
      }:
@@ -73632,7 +73625,6 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-accelerate" = callPackage
@@ -74214,6 +74206,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "goat" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, floating-bits
+     , QuickCheck, safe, split
+     }:
+     mkDerivation {
+       pname = "goat";
+       version = "1.0.0";
+       sha256 = "4f1329355c52d45ccc915001dae10e563402188cb3c486491cbd8c0c73046cef";
+       libraryHaskellDepends = [
+         base bytestring cereal floating-bits safe split
+       ];
+       testHaskellDepends = [ base bytestring cereal QuickCheck safe ];
+       homepage = "https://github.com/lovasko/goat";
+       description = "Time Series Compression";
+       license = "unknown";
+     }) {};
+
   "goatee" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, parsec
      , template-haskell
@@ -76965,23 +76974,6 @@ self: {
      }) {};
 
   "google-oauth2-jwt" = 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-oauth2-jwt_0_1_3" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
      , RSA, text, unix-time
      }:
@@ -78036,6 +78028,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "graql" = callPackage
+    ({ mkDerivation, aeson, base, containers, hspec, markdown-unlit
+     , process, regex-posix, scientific, text
+     }:
+     mkDerivation {
+       pname = "graql";
+       version = "0.1.1";
+       sha256 = "2173fcd327ea273c8ef30077c3e875242a6fe3b9ae19af07accc78671ec75800";
+       libraryHaskellDepends = [
+         aeson base containers process regex-posix scientific text
+       ];
+       testHaskellDepends = [ base hspec markdown-unlit text ];
+       homepage = "https://github.com/graknlabs/graql-haskell";
+       description = "Execute Graql queries on a Grakn graph";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "grasp" = callPackage
     ({ mkDerivation, base, clock, directory, extra, filepath, hashable
      , lens, megaparsec, MonadRandom, mtl, pcre-heavy, primitive
@@ -78308,6 +78317,17 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "gross" = callPackage
+    ({ mkDerivation, base, mtl, ncurses }:
+     mkDerivation {
+       pname = "gross";
+       version = "0.0.0.0";
+       sha256 = "5d9af8583c00c0af8800562cadc81203e8043335ab7dd4211a90a211f6889396";
+       libraryHaskellDepends = [ base mtl ncurses ];
+       description = "A spoof on gloss for terminal animation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "groundhog" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, containers, monad-control
@@ -78904,6 +78924,28 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "gtk2hs-buildtools_0_13_2_2" = callPackage
+    ({ mkDerivation, alex, array, base, Cabal, containers, directory
+     , filepath, happy, hashtables, pretty, process, random
+     }:
+     mkDerivation {
+       pname = "gtk2hs-buildtools";
+       version = "0.13.2.2";
+       sha256 = "c5e4b59f8711ec4e4e25a91ce4213c5396dd0b56179751ed6da255ac35edfb4b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base Cabal containers directory filepath hashtables pretty
+         process random
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [ base ];
+       homepage = "http://projects.haskell.org/gtk2hs/";
+       description = "Tools to build the Gtk2Hs suite of User Interface libraries";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gtk2hs-cast-glade" = callPackage
     ({ mkDerivation, base, glade, gtk, gtk2hs-cast-glib, hint
      , template-haskell
@@ -82246,6 +82288,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "happstack-authenticate_2_3_4_7" = callPackage
+    ({ mkDerivation, acid-state, aeson, authenticate, base
+     , base64-bytestring, boomerang, bytestring, containers
+     , data-default, email-validate, filepath, happstack-hsp
+     , happstack-jmacro, happstack-server, hsp, hsx-jmacro, hsx2hs
+     , http-conduit, http-types, ixset-typed, jmacro, jwt, lens
+     , mime-mail, mtl, pwstore-purehaskell, random, safecopy
+     , shakespeare, text, time, unordered-containers, userid, web-routes
+     , web-routes-boomerang, web-routes-happstack, web-routes-hsp
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "happstack-authenticate";
+       version = "2.3.4.7";
+       sha256 = "6c2d83aa09fe2fb630a1aaca8b25e7e09b0a91b475f24e5dfb0c307c8f34b607";
+       libraryHaskellDepends = [
+         acid-state aeson authenticate base base64-bytestring boomerang
+         bytestring containers data-default email-validate filepath
+         happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro
+         hsx2hs http-conduit http-types ixset-typed jmacro jwt lens
+         mime-mail mtl pwstore-purehaskell random safecopy shakespeare text
+         time unordered-containers userid web-routes web-routes-boomerang
+         web-routes-happstack web-routes-hsp web-routes-th
+       ];
+       homepage = "http://www.happstack.com/";
+       description = "Happstack Authentication Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happstack-clientsession" = callPackage
     ({ mkDerivation, base, bytestring, cereal, clientsession
      , happstack-server, monad-control, mtl, safecopy, transformers-base
@@ -82757,8 +82829,8 @@ self: {
      }:
      mkDerivation {
        pname = "happy-meta";
-       version = "0.2.0.8";
-       sha256 = "4fad1eabd825ffbd1aa858a3e056f991a1f53c403e15064ef51b5fbdd300d242";
+       version = "0.2.0.9";
+       sha256 = "6fa5083d41a9e0b6e6d0150a9b2f6e2292af005fd9fd8efd24e1a4a72daf6bf0";
        libraryHaskellDepends = [
          array base containers haskell-src-meta mtl template-haskell
        ];
@@ -83075,8 +83147,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.0.4";
-       sha256 = "d17bffafa4c729eab2e9b288c636d201013dd05ed04656e40de5a5fb7bc052a4";
+       version = "0.1.0.5";
+       sha256 = "f0ec1be21cb5560fa575c414c691bcf48f14e6dfb8f53ae5feae013a105639fa";
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 data-default
          hex network network-simple text transformers
@@ -83142,10 +83214,8 @@ self: {
      }:
      mkDerivation {
        pname = "hascas";
-       version = "1.0.0";
-       sha256 = "004dba51e8cfa2b2e41fd9b51d8bdfb877a4ce19c46b412862327d567c64ccea";
-       revision = "1";
-       editedCabalFile = "dd3a3609ef9afd3507fc7c0a425683e2900da0b70512a5ef4342f39548c8d1a2";
+       version = "1.2.0";
+       sha256 = "99c670290558ffc2686040e36c8411be63e6210065621a8be6c427406731b1ff";
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 mtl network
          safe-exceptions stm template-haskell uuid
@@ -83706,20 +83776,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskeline_0_7_2_3" = callPackage
+  "haskeline_0_7_3_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , terminfo, transformers, unix
      }:
      mkDerivation {
        pname = "haskeline";
-       version = "0.7.2.3";
-       sha256 = "6d3ef986ffea93c999a7be1f8c19037351eec763c1c376e6edbd18fbba368d27";
+       version = "0.7.3.0";
+       sha256 = "566f625ef50877631d72ab2a8335c92c2b03a8c84a1473d915b40e69c9bb4d8a";
        configureFlags = [ "-fterminfo" ];
        libraryHaskellDepends = [
          base bytestring containers directory filepath terminfo transformers
          unix
        ];
-       homepage = "https://github.com/judah/haskeline";
+       homepage = "http://trac.haskell.org/haskeline";
        description = "A command-line interface for user input, written in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83875,24 +83945,24 @@ self: {
      }) {};
 
   "haskell-compression" = callPackage
-    ({ mkDerivation, base, bimap, boolean-list, bytestring, containers
+    ({ mkDerivation, base, bimap, booleanlist, bytestring, containers
      }:
      mkDerivation {
        pname = "haskell-compression";
-       version = "0.1.1";
-       sha256 = "3504d935a6ab3f881a888da0d71a8f139769411ade8e0134a0ba296ae8741934";
+       version = "0.2";
+       sha256 = "4b8dea429507697df12dfeeae6e0963e1db11f7c1d153cb8d0198353cb87127c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bimap boolean-list bytestring containers
+         base bimap booleanlist bytestring containers
        ];
-       executableHaskellDepends = [
-         base bimap boolean-list bytestring containers
-       ];
-       homepage = "codekinder.com";
-       license = stdenv.lib.licenses.bsd3;
+       executableHaskellDepends = [ base bimap bytestring containers ];
+       homepage = "http://xy30.com";
+       description = "compress files";
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       broken = true;
+     }) {booleanlist = null;};
 
   "haskell-course-preludes" = callPackage
     ({ mkDerivation, base, deepseq }:
@@ -84747,14 +84817,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-src-meta_0_7_0" = callPackage
+  "haskell-src-meta_0_7_0_1" = callPackage
     ({ mkDerivation, base, haskell-src-exts, pretty, syb
      , template-haskell, th-orphans
      }:
      mkDerivation {
        pname = "haskell-src-meta";
-       version = "0.7.0";
-       sha256 = "2a6735cc3379171a722f2a1df15dc67f216a404db4396b05f5e06ac82ab89856";
+       version = "0.7.0.1";
+       sha256 = "428e5a1c90c645d4c9cb54f984721b1b21e494677d1d7d8e7206f6c0e9286a3a";
        libraryHaskellDepends = [
          base haskell-src-exts pretty syb template-haskell th-orphans
        ];
@@ -84811,8 +84881,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-ast";
-       version = "0.4.1.1";
-       sha256 = "857c0f5b57d129aa49fd8b5375703638c4cd1e5cd4c85d5160d7ad13d308f88e";
+       version = "0.4.1.3";
+       sha256 = "f456e74ada1c5ce4386a2b0e6a844c893b75dcdaaccac4dabc49977da8ae3405";
        libraryHaskellDepends = [
          base ghc mtl references template-haskell uniplate
        ];
@@ -84883,8 +84953,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-backend-ghc";
-       version = "0.4.1.1";
-       sha256 = "d01fe6e236fb57e7d79b35ada30e8aa0ff56f626444f25bd907bb8e785de3006";
+       version = "0.4.1.3";
+       sha256 = "590147059de94fc0224e86fd1cba144b32737dd9e9e3efa91d6389e99265642e";
        libraryHaskellDepends = [
          base bytestring containers ghc haskell-tools-ast mtl references
          safe split template-haskell transformers uniplate
@@ -84903,8 +84973,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
-       version = "0.4.1.1";
-       sha256 = "7c843bcd923987679d17359b2881173af72b5beea8b66db241058c69d2a1530f";
+       version = "0.4.1.3";
+       sha256 = "e37721ca8bcbdc0e5eb2977a956b1e97c858a13f7d8c236c3a04e948e4ebe699";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84926,23 +84996,23 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl
-     , network, references, split, tasty, tasty-hunit
+     , network, process, references, split, tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "haskell-tools-daemon";
-       version = "0.4.1.1";
-       sha256 = "c1334b480b4c7ed5fb918ad887ee50a4eaa610b8c626ae00154eecdf2bb11dc1";
+       version = "0.4.1.3";
+       sha256 = "0a10d80c3ed2bdc65010ef73b7d090544a086e4eba09b613f3045b23a141814a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-prettyprint haskell-tools-refactor
-         mtl network references split
+         mtl network process references split
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         aeson base bytestring directory filepath HUnit network tasty
-         tasty-hunit
+         aeson base bytestring directory filepath HUnit network process
+         tasty tasty-hunit
        ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Background process for Haskell-tools refactor that editors can connect to";
@@ -84957,12 +85027,15 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-debug";
-       version = "0.4.1.1";
-       sha256 = "092da28a3924ec7855f910123cc6d3adaf02c8aea28c09d370ca40e4b66df02c";
+       version = "0.4.1.3";
+       sha256 = "2e89fee8acdd91b92b6ce9f079e1f3c445c19f37ac0092310ed20ba51a8a677e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc
          haskell-tools-prettyprint haskell-tools-refactor references
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Debugging Tools for Haskell-tools";
        license = stdenv.lib.licenses.bsd3;
@@ -84978,8 +85051,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-demo";
-       version = "0.4.1.1";
-       sha256 = "97e23bce841240eb60f9d959922e5e262dd2d5351954ac1b183aa96910fe0b2b";
+       version = "0.4.1.3";
+       sha256 = "d8ab6534f3f04cd2bfb3c636d88f008501b23cee15171a435f8aea464398ed20";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85005,8 +85078,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-prettyprint";
-       version = "0.4.1.1";
-       sha256 = "2d0b5df63f5709359ad5bbc7c67475bf511cc732f1ad682c71506b196519eae8";
+       version = "0.4.1.3";
+       sha256 = "77fc5cab4b93e3e58022a23282776a667d0e90f357341f41ff72771919530490";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast mtl references split uniplate
        ];
@@ -85020,14 +85093,13 @@ self: {
     ({ mkDerivation, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
-     , haskell-tools-rewrite, mtl, old-time, polyparse, references
-     , split, tasty, tasty-hunit, template-haskell, time, transformers
-     , uniplate
+     , haskell-tools-rewrite, mtl, references, split, tasty, tasty-hunit
+     , template-haskell, time, transformers, uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "0.4.1.1";
-       sha256 = "a6f1cf8f908f10424919ded1077abe4f15c423548830c4c1a0c117f8a8d8e894";
+       version = "0.4.1.3";
+       sha256 = "d732fb853cf0e066cec00f126030edd2e43abbde423affc3c8f2ceacab18cb82";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -85037,9 +85109,8 @@ self: {
        testHaskellDepends = [
          base Cabal containers directory either filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl old-time
-         polyparse references split tasty tasty-hunit template-haskell time
-         transformers uniplate
+         haskell-tools-prettyprint haskell-tools-rewrite mtl references
+         split tasty tasty-hunit template-haskell time transformers uniplate
        ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Refactoring Tool for Haskell";
@@ -85054,8 +85125,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-rewrite";
-       version = "0.4.1.1";
-       sha256 = "17b2523cbf0b13fc83a28e3b2a55dc7a9118c26ee87c180ec3db46f6571668c8";
+       version = "0.4.1.3";
+       sha256 = "a92dafd6fd3511517edfc6517ba040130caaf0d24608270af69ae75bd84ff59b";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
          references
@@ -85775,15 +85846,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskintex_0_7_0_0" = callPackage
+  "haskintex_0_7_0_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text
      , transformers
      }:
      mkDerivation {
        pname = "haskintex";
-       version = "0.7.0.0";
-       sha256 = "99523779fa18e2a6565b9603ae5c8c6a079dbaa2c315188a5ac05ebbd384a591";
+       version = "0.7.0.1";
+       sha256 = "7647f19964cce0be886ff01a4c53f902b4dd995d005090724a57bd4cc6dae31b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86410,8 +86481,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-migration";
-       version = "0.1.1";
-       sha256 = "0cb83fffe9ebda4632fd426a97506c9c5f803c42a01d0987e7752240aceff595";
+       version = "0.1.2";
+       sha256 = "cac93fcc517e7c57c14c9415bc885615442975b97572fb5928335042e151247c";
        libraryHaskellDepends = [
          base base64-bytestring bytestring contravariant cryptohash
          data-default-class directory hasql hasql-transaction text time
@@ -86765,6 +86836,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hatex-guide_1_3_1_6" = callPackage
+    ({ mkDerivation, base, blaze-html, directory, filepath, HaTeX
+     , parsec, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "hatex-guide";
+       version = "1.3.1.6";
+       sha256 = "7ad7cf5f94d5e684891cdbd6f74d1bb8843564390929d0802fd359a05f5da56d";
+       libraryHaskellDepends = [
+         base blaze-html directory filepath HaTeX parsec text time
+         transformers
+       ];
+       description = "HaTeX User's Guide";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hath" = callPackage
     ({ mkDerivation, base, cmdargs, MissingH, process, split, tasty
      , tasty-hunit, tasty-quickcheck
@@ -86888,20 +86976,20 @@ self: {
 
   "haxl" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , deepseq, directory, exceptions, filepath, ghc-prim, hashable
-     , HUnit, pretty, test-framework, test-framework-hunit, text, time
-     , transformers, unordered-containers, vector
+     , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
+     , test-framework, test-framework-hunit, text, time, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "haxl";
-       version = "0.4.0.2";
-       sha256 = "272b50d432da234803d7a590530ae87266de1f3f75b6d98bdbc53262183fd634";
+       version = "0.5.0.0";
+       sha256 = "dcc94089593a159b20e6f29eeeb7dd8caec0e0e8abcee8533321f2e9a96dd1e8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary bytestring containers deepseq directory
-         exceptions filepath ghc-prim hashable HUnit pretty text time
-         transformers unordered-containers vector
+         aeson base binary bytestring containers deepseq exceptions filepath
+         ghc-prim hashable HUnit pretty text time transformers
+         unordered-containers vector
        ];
        executableHaskellDepends = [ base hashable time ];
        testHaskellDepends = [
@@ -87681,26 +87769,6 @@ self: {
      }) {};
 
   "hdevtools" = callPackage
-    ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc
-     , ghc-boot, ghc-paths, network, process, syb, time, transformers
-     , unix
-     }:
-     mkDerivation {
-       pname = "hdevtools";
-       version = "0.1.4.1";
-       sha256 = "3e95943fbd6986800e00c1e49ef97deb83b56a37cc8ffafc00f6192510f8596a";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base Cabal cmdargs directory filepath ghc ghc-boot ghc-paths
-         network process syb time transformers unix
-       ];
-       homepage = "https://github.com/hdevtools/hdevtools/";
-       description = "Persistent GHC powered background server for FAST haskell development tools";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hdevtools_0_1_5_0" = callPackage
     ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc
      , ghc-boot, ghc-paths, network, process, syb, time, transformers
      , unix
@@ -87718,7 +87786,6 @@ self: {
        homepage = "https://github.com/hdevtools/hdevtools/";
        description = "Persistent GHC powered background server for FAST haskell development tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdf" = callPackage
@@ -91024,14 +91091,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hjsonpointer_1_1_0_0" = callPackage
+  "hjsonpointer_1_1_0_1" = callPackage
     ({ mkDerivation, aeson, base, hashable, hspec, http-types
      , QuickCheck, semigroups, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hjsonpointer";
-       version = "1.1.0.0";
-       sha256 = "af2ea643f97d8ed1aca85651b8b65dbabc4967753f0024255baa36d410177dfa";
+       version = "1.1.0.1";
+       sha256 = "ebdd6c5528da76fd59871ca14903576e2b5ca8a1327ec952ae0957ed6b37c2ed";
        libraryHaskellDepends = [
          aeson base hashable QuickCheck semigroups text unordered-containers
          vector
@@ -91073,7 +91140,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hjsonschema_1_3_0_0" = callPackage
+  "hjsonschema_1_5_0_0" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hashable, hjsonpointer, hspec
      , http-client, http-types, pcre-heavy, profunctors, protolude
@@ -91082,8 +91149,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "1.3.0.0";
-       sha256 = "ad54c4ee176376ef2fb7a92b5d6f35e70900fbc032000438fc37d3bdd7df819b";
+       version = "1.5.0.0";
+       sha256 = "a8295fff702386bc03777c0a01455e4f13539795153a60b5b3f5bb24d188ff95";
        libraryHaskellDepends = [
          aeson base bytestring containers file-embed filepath hashable
          hjsonpointer http-client http-types pcre-heavy profunctors
@@ -91306,8 +91373,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.1.2";
-       sha256 = "2a224047975e11f7c443c21a8f67bd0b58a058de370a9103ae020d3968450e17";
+       version = "1.1.3";
+       sha256 = "ee0a1d448a761f471a777f7e7b66af11bd5955df3e5823970db5bf4602a8b350";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91322,7 +91389,7 @@ self: {
        ];
        testHaskellDepends = [
          base free hledger-lib hspec megaparsec QuickCheck text text-format
-         time transformers vector
+         text-zipper time transformers vector
        ];
        homepage = "https://github.com/hpdeifel/hledger-iadd#readme";
        description = "A terminal UI as drop-in replacement for hledger add";
@@ -92145,19 +92212,6 @@ self: {
      }) {inherit (pkgs) ncurses;};
 
   "hmpfr" = callPackage
-    ({ mkDerivation, base, integer-gmp, mpfr }:
-     mkDerivation {
-       pname = "hmpfr";
-       version = "0.4.2";
-       sha256 = "7b01d747db796fc0ae908872bf9105b773ea8b1d2a5957ea353e22e003b03961";
-       libraryHaskellDepends = [ base integer-gmp ];
-       librarySystemDepends = [ mpfr ];
-       homepage = "https://github.com/michalkonecny/hmpfr";
-       description = "Haskell binding to the MPFR library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) mpfr;};
-
-  "hmpfr_0_4_2_1" = callPackage
     ({ mkDerivation, base, integer-gmp, mpfr }:
      mkDerivation {
        pname = "hmpfr";
@@ -92168,7 +92222,6 @@ self: {
        homepage = "https://github.com/michalkonecny/hmpfr";
        description = "Haskell binding to the MPFR library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mpfr;};
 
   "hmt" = callPackage
@@ -93803,28 +93856,29 @@ self: {
      }) {};
 
   "hpack" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
-     , deepseq, directory, filepath, Glob, hspec, interpolate, mockery
-     , QuickCheck, temporary, text, unordered-containers, yaml
+    ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
+     , containers, deepseq, directory, filepath, Glob, hspec
+     , interpolate, mockery, QuickCheck, temporary, text
+     , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.15.0";
-       sha256 = "72a39a5d7d8dc2e94a37f75642f7e491ae9d560070b07c5c17e9ced6e3cbab63";
+       version = "0.16.0";
+       sha256 = "2ec0d00aaaddfc18bc3c55b6455f7697524578dd9d0e3ea32849067293f167b9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base base-compat containers deepseq directory filepath Glob
-         text unordered-containers yaml
+         aeson base base-compat bytestring containers deepseq directory
+         filepath Glob text unordered-containers yaml
        ];
        executableHaskellDepends = [
-         aeson base base-compat containers deepseq directory filepath Glob
-         text unordered-containers yaml
+         aeson base base-compat bytestring containers deepseq directory
+         filepath Glob text unordered-containers yaml
        ];
        testHaskellDepends = [
-         aeson aeson-qq base base-compat containers deepseq directory
-         filepath Glob hspec interpolate mockery QuickCheck temporary text
-         unordered-containers yaml
+         aeson aeson-qq base base-compat bytestring containers deepseq
+         directory filepath Glob hspec interpolate mockery QuickCheck
+         temporary text unordered-containers yaml
        ];
        homepage = "https://github.com/sol/hpack#readme";
        description = "An alternative format for Haskell packages";
@@ -94050,15 +94104,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hpc-coveralls_1_0_7" = callPackage
+  "hpc-coveralls_1_0_8" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
      , containers, curl, directory, directory-tree, hpc, HUnit, process
      , pureMD5, regex-posix, retry, safe, split, transformers
      }:
      mkDerivation {
        pname = "hpc-coveralls";
-       version = "1.0.7";
-       sha256 = "1e3ca630dd142ffa474268e8e7cc95c4d15ad7521affaec0ac28e3cd53452584";
+       version = "1.0.8";
+       sha256 = "431db6ee058bf459c3e433c2d9ad89f1fcb344590745c3f62d0b744fc7d288b1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -94156,6 +94210,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hpio_0_8_0_5" = 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.5";
+       sha256 = "7493096673b13301ebdcdbc8b5076b1af0422b6650418b9510d3536a72edcf0d";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hplayground" = callPackage
     ({ mkDerivation, base, containers, data-default, haste-compiler
      , haste-perch, monads-tf, transformers
@@ -94450,6 +94536,8 @@ self: {
        pname = "hquantlib";
        version = "0.0.3.3";
        sha256 = "208839f68a4af5f3b0e09214623c8e166f768a46b6cdc7369937ab73e8d78c28";
+       revision = "1";
+       editedCabalFile = "64f94ba75cb01860e3a31eb2ff872e79ec18dc773545ac487c9404f37b500878";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97672,6 +97760,29 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "hspkcs11" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, cipher-aes, cprng-aes
+     , crypto-api, RSA, testpack, unix, utf8-string
+     }:
+     mkDerivation {
+       pname = "hspkcs11";
+       version = "0.2";
+       sha256 = "c66b9527f152d5ed29d5de18883905863a3b87fa177514ad0728cb56ae172f98";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring crypto-api RSA unix utf8-string
+       ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
+         base bytestring cipher-aes cprng-aes crypto-api RSA testpack unix
+         utf8-string
+       ];
+       homepage = "https://github.com/denisenkom/hspkcs11";
+       description = "Wrapper for PKCS #11 interface";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hspr-sh" = callPackage
     ({ mkDerivation, base, old-time }:
      mkDerivation {
@@ -98462,6 +98573,8 @@ self: {
        pname = "htaglib";
        version = "1.0.4";
        sha256 = "0b23c25f6ef721e193176fd2c4e491376235c5cb04dea0d75ebf721bd10b40a7";
+       revision = "1";
+       editedCabalFile = "beb694fc3cccb59cf1f9e3a8568325673cc9d7733c2118681eeb9c9a2bfc127c";
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ taglib ];
        testHaskellDepends = [ base directory filepath hspec ];
@@ -99165,15 +99278,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "http-client-tls_0_3_3" = callPackage
+  "http-client-tls_0_3_3_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, connection
      , cryptonite, data-default-class, exceptions, hspec, http-client
      , http-types, memory, network, tls, transformers
      }:
      mkDerivation {
        pname = "http-client-tls";
-       version = "0.3.3";
-       sha256 = "ec1c676989aa7a53aa414d4bf2613573a8766dcf81db826365bdf20ce981a064";
+       version = "0.3.3.1";
+       sha256 = "56317378785688a129fdc7abdf5d721fe15e46178f89f457878aa3acd1ac7d12";
        libraryHaskellDepends = [
          base bytestring case-insensitive connection cryptonite
          data-default-class exceptions http-client http-types memory network
@@ -104358,6 +104471,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) R;};
 
+  "inline-r_0_9_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, c2hs, containers
+     , data-default-class, deepseq, directory, exceptions, filepath
+     , ieee754, mtl, pretty, primitive, process, quickcheck-assertions
+     , R, reflection, setenv, silently, singletons, strict, tasty
+     , tasty-expected-failure, tasty-golden, tasty-hunit
+     , tasty-quickcheck, template-haskell, temporary, text, th-lift
+     , th-orphans, transformers, unix, vector
+     }:
+     mkDerivation {
+       pname = "inline-r";
+       version = "0.9.0.1";
+       sha256 = "e95ba2d92f514a102675365e74c87442a2620fad54d3e1ecd15cf1a7253ec2af";
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default-class deepseq
+         exceptions mtl pretty primitive process reflection setenv
+         singletons template-haskell text th-lift th-orphans transformers
+         unix vector
+       ];
+       libraryPkgconfigDepends = [ R ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base bytestring directory filepath ieee754 mtl process
+         quickcheck-assertions silently singletons strict tasty
+         tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
+         template-haskell temporary text unix vector
+       ];
+       homepage = "https://tweag.github.io/HaskellR";
+       description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) R;};
+
   "inquire" = callPackage
     ({ mkDerivation, aether, base, text }:
      mkDerivation {
@@ -104595,8 +104741,8 @@ self: {
     ({ mkDerivation, array, base, containers, music-diatonic }:
      mkDerivation {
        pname = "instrument-chord";
-       version = "0.1.0.9";
-       sha256 = "cb0a629a88db8f0baaad638d2a9c61cb4e00d112f93a866adf7e5d5c434c073f";
+       version = "0.1.0.10";
+       sha256 = "d6094aaef5498a377ef3efa8b4d5acf3c3457d9d7ddad161fe86288f729777ad";
        libraryHaskellDepends = [ array base containers music-diatonic ];
        homepage = "https://github.com/xpika/chord";
        description = "Render Instrument Chords";
@@ -105030,20 +105176,26 @@ self: {
 
   "intro" = callPackage
     ({ mkDerivation, base, bifunctors, binary, bytestring, containers
-     , deepseq, dlist, extra, hashable, mtl, safe, string-conversions
-     , tagged, text, transformers, unordered-containers, writer-cps-mtl
+     , deepseq, dlist, extra, hashable, lens, mtl, safe
+     , string-conversions, tagged, text, transformers
+     , unordered-containers, writer-cps-mtl
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.0.2.2";
-       sha256 = "9dc34d967b510b6022f55a4a653a13fcf36513ba753d5b3f8a156d88060e5611";
+       version = "0.1.0.2";
+       sha256 = "fa4b8dce96686431f867bc972153a694a3a1d1f8daee08123d7c30e7d1e00d5f";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
          hashable mtl safe string-conversions tagged text transformers
          unordered-containers writer-cps-mtl
        ];
+       testHaskellDepends = [
+         base bifunctors binary bytestring containers deepseq dlist extra
+         hashable lens mtl safe string-conversions tagged text transformers
+         unordered-containers writer-cps-mtl
+       ];
        homepage = "https://github.com/minad/intro#readme";
-       description = "Total Prelude with Text and Monad transformers";
+       description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -105053,6 +105205,8 @@ self: {
        pname = "intro-prelude";
        version = "0.1.0.0";
        sha256 = "602df3463f556cfff5b3784b7b49f0548768f11e7651175fae1028f4565faaba";
+       revision = "1";
+       editedCabalFile = "a6ffadd4b02b26ea9170eae2f37ee3f5af32cb128a3c1d1099b34b86daec5de6";
        libraryHaskellDepends = [ intro ];
        testHaskellDepends = [ intro ];
        doHaddock = false;
@@ -105313,6 +105467,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "io-streams_1_3_6_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
+     , deepseq, directory, filepath, HUnit, mtl, network, primitive
+     , process, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers, vector
+     , zlib, zlib-bindings
+     }:
+     mkDerivation {
+       pname = "io-streams";
+       version = "1.3.6.0";
+       sha256 = "5e2ae8363cc30d69687db98bfa6711ec53b3b104fcc1829c1e62d8de3d249e3d";
+       configureFlags = [ "-fnointeractivetests" ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-builder network primitive
+         process text time transformers vector zlib-bindings
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring bytestring-builder deepseq directory
+         filepath HUnit mtl network primitive process QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time transformers vector zlib zlib-bindings
+       ];
+       description = "Simple, composable, and easy-to-use stream I/O";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "io-streams-haproxy" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams
      , network, test-framework, test-framework-hunit, transformers
@@ -105486,20 +105667,6 @@ self: {
      }) {};
 
   "ip6addr" = callPackage
-    ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
-     mkDerivation {
-       pname = "ip6addr";
-       version = "0.5.1.4";
-       sha256 = "fe5f93753026cc82123cbf626473d9353c94d8f681e90771b63dfebdd2f1f2f8";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base cmdargs IPv6Addr text ];
-       homepage = "https://github.com/MichelBoucey/ip6addr";
-       description = "Commandline tool to generate IPv6 address text representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ip6addr_0_5_2" = callPackage
     ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
      mkDerivation {
        pname = "ip6addr";
@@ -105513,7 +105680,6 @@ self: {
        homepage = "https://github.com/MichelBoucey/ip6addr";
        description = "Commandline tool to generate IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ipatch" = callPackage
@@ -105741,24 +105907,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.1";
-       sha256 = "ae575fcb8f8b2e1450387cad47fbae00d4f48f16238e656867678fd344ead51b";
-       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_2_0" = callPackage
     ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
      , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text
      , time, tls, transformers, x509-validation
@@ -105775,7 +105923,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
@@ -105786,6 +105933,8 @@ self: {
        pname = "irc-core";
        version = "2.2.0.1";
        sha256 = "6c160d1073ee40b12d294f1e4dbb4691aedb73150eebf027475db05ce1efa20a";
+       revision = "1";
+       editedCabalFile = "fd862f303735a1a3c2f7913d5f6834a2711c20aacdabb98515504b8a4de986a6";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring hashable primitive
          text time vector
@@ -106891,23 +107040,6 @@ self: {
      }) {};
 
   "jailbreak-cabal" = callPackage
-    ({ mkDerivation, base, Cabal }:
-     mkDerivation {
-       pname = "jailbreak-cabal";
-       version = "1.3.1";
-       sha256 = "610d8dbd04281eee3d5da05c9eef45bfd1a1ddca20dfe54f283e15ddf6d5c235";
-       revision = "1";
-       editedCabalFile = "ad923093f40ae8a7b7faa64a4e65a8545057987e5efe8baafec455fbcc85a52c";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base Cabal ];
-       homepage = "http://github.com/peti/jailbreak-cabal";
-       description = "Strip version restrictions from build dependencies in Cabal files";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "jailbreak-cabal_1_3_2" = callPackage
     ({ mkDerivation, base, Cabal }:
      mkDerivation {
        pname = "jailbreak-cabal";
@@ -106919,7 +107051,6 @@ self: {
        homepage = "https://github.com/peti/jailbreak-cabal#readme";
        description = "Strip version restrictions from build dependencies in Cabal files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -107489,28 +107620,6 @@ self: {
      }) {};
 
   "jose-jwt" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cereal, containers
-     , cryptonite, doctest, either, hspec, HUnit, memory, mtl
-     , QuickCheck, text, time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "jose-jwt";
-       version = "0.7.3";
-       sha256 = "b405c3c35936fe5a44e44416e4689207d94eff808b10b9bae60840c1ff11b9f4";
-       libraryHaskellDepends = [
-         aeson base bytestring cereal containers cryptonite either memory
-         mtl text time unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring cryptonite doctest either hspec HUnit memory
-         mtl QuickCheck text unordered-containers vector
-       ];
-       homepage = "http://github.com/tekul/jose-jwt";
-       description = "JSON Object Signing and Encryption Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "jose-jwt_0_7_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
      , cryptonite, doctest, either, hspec, HUnit, memory, mtl
      , QuickCheck, text, time, unordered-containers, vector
@@ -107530,7 +107639,6 @@ self: {
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jpeg" = callPackage
@@ -107665,8 +107773,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-webkit2gtk";
-       version = "0.8.2.1";
-       sha256 = "01cf836ba8aa03d4d2cba539156ac0051c651fc7ec77b53eb20a41b3b445a606";
+       version = "0.8.2.2";
+       sha256 = "d9444c5ec1ef4abe74410beddf8a892f97d98d836501dd05169c962a3e108353";
        libraryHaskellDepends = [
          aeson base bytestring directory gi-gio gi-glib gi-gtk
          gi-javascriptcore gi-webkit2 haskell-gi-base jsaddle text unix
@@ -107684,8 +107792,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-webkitgtk";
-       version = "0.8.2.1";
-       sha256 = "e4cfcdf07d34f5b8fb00c747097830c9338e9f0c43c9a69bad10511e72ff2132";
+       version = "0.8.2.2";
+       sha256 = "ef64f87f898566ff786ef6632800f0c0700b78137e65250e313c67683bb3d457";
        libraryHaskellDepends = [
          aeson base bytestring directory gi-glib gi-gtk gi-javascriptcore
          gi-webkit haskell-gi-base jsaddle text unix
@@ -108163,8 +108271,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-client";
-       version = "0.2.4.0";
-       sha256 = "9f65be9991b073441332023cdfdf232e8455a530fb2fe922af2932e39436cee7";
+       version = "0.2.5.0";
+       sha256 = "5349f5c0b0fa8f6c5433152d6effc10846cfb3480e78c5aa99adb7540bcff49c";
        libraryHaskellDepends = [
          aeson base bytestring json-rpc-server mtl text unordered-containers
          vector vector-algorithms
@@ -108207,8 +108315,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-server";
-       version = "0.2.5.0";
-       sha256 = "049c5248847b0b4da9b1cf34c36dbbf9f69fb4190228820cebf642f58204f850";
+       version = "0.2.6.0";
+       sha256 = "169e9997734bd1d7d07a13b5ae0223d5363c43de93b0d5fbb845a598f9eaccf5";
        libraryHaskellDepends = [
          aeson base bytestring deepseq mtl text unordered-containers vector
        ];
@@ -109135,8 +109243,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.3.1.3";
-       sha256 = "8a733a9888157781c60ec3b223bf0256839fb923e41473f3118289ab175413fa";
+       version = "0.3.1.4";
+       sha256 = "04778447b9446aaad4206f4acc1c7d19322f13f467418461ad4a5fec981b8493";
        libraryHaskellDepends = [
          aeson auto-update base bytestring containers either exceptions
          hostname microlens microlens-th monad-control mtl old-locale
@@ -109164,8 +109272,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip-elasticsearch";
-       version = "0.3.0.1";
-       sha256 = "92ad73f911363b879e7d8ba4b4249469ca7b6807f0469ca5648e64e38d5720d6";
+       version = "0.3.0.2";
+       sha256 = "bc23e4565f2bd6627b456c210e2b74e333e743da46354be90062d1c9ed0039ed";
        libraryHaskellDepends = [
          aeson async base bloodhound enclosed-exceptions exceptions
          http-client http-types katip retry scientific stm stm-chans text
@@ -109316,6 +109424,26 @@ self: {
        license = "GPL";
      }) {};
 
+  "kcd" = callPackage
+    ({ mkDerivation, base, conduit, conduit-parse, exceptions
+     , kcd-parser, lens, resourcet, tasty, tasty-hunit, text
+     , xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "kcd";
+       version = "0.1.0.0";
+       sha256 = "e7b1db6f0b48e1482b6e0dd6c2e47512713c933f92f08a577158b192f9b90041";
+       libraryHaskellDepends = [
+         base conduit conduit-parse exceptions lens resourcet text
+         xml-conduit xml-types
+       ];
+       testHaskellDepends = [ base kcd-parser tasty tasty-hunit ];
+       homepage = "https://github.com/marcelbuesing/kcd";
+       description = "Kayak .kcd parsing library.";
+       license = stdenv.lib.licenses.mit;
+       broken = true;
+     }) {kcd-parser = null;};
+
   "kd-tree" = callPackage
     ({ mkDerivation, base, lens, linear, vector, vector-algorithms }:
      mkDerivation {
@@ -112061,7 +112189,7 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
-  "language-puppet_1_3_4" = callPackage
+  "language-puppet_1_3_4_1" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, either, exceptions, filecache, formatting
@@ -112075,8 +112203,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.4";
-       sha256 = "6944b5f03001c07d3b8208db6125594af6ebd101f7025ef45bb01cee071018bc";
+       version = "1.3.4.1";
+       sha256 = "41cfb18f96af7d30f4477c78b559d78b3bfa3fa385c1a06dd9177f221f0cce71";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112827,8 +112955,8 @@ self: {
      }:
      mkDerivation {
        pname = "ldapply";
-       version = "0.1.0";
-       sha256 = "5c99e6f200c58aeb897a3a8f2e283ad2caba73c6f7eba919102912715891d04b";
+       version = "0.2.0";
+       sha256 = "485058de9f3b22897325a71fad13613db3829c84ceffe625872dcf348558f761";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -114473,6 +114601,8 @@ self: {
        pname = "libsystemd-journal";
        version = "1.4.1";
        sha256 = "6d23d1a7ba6cf2bb014955ce13b482f422f75264185b86323dc100aa288e3a1b";
+       revision = "1";
+       editedCabalFile = "5c775e26f3173d812a4080ea94b13d7cc25a350f59a800e3d403a05c04a9933c";
        libraryHaskellDepends = [
          base bytestring hashable hsyslog pipes pipes-safe text transformers
          uniplate unix-bytestring unordered-containers uuid vector
@@ -114688,6 +114818,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lifted-async_0_9_1" = callPackage
+    ({ mkDerivation, async, base, constraints, HUnit, lifted-base
+     , monad-control, mtl, tasty, tasty-hunit, tasty-th
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "lifted-async";
+       version = "0.9.1";
+       sha256 = "0f483e83079226f404d13c445a94c01dbfb5250159328016f023c900e9f3930d";
+       libraryHaskellDepends = [
+         async base constraints lifted-base monad-control transformers-base
+       ];
+       testHaskellDepends = [
+         async base HUnit lifted-base monad-control mtl tasty tasty-hunit
+         tasty-th
+       ];
+       homepage = "https://github.com/maoe/lifted-async";
+       description = "Run lifted IO operations asynchronously and wait for their results";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lifted-base" = callPackage
     ({ mkDerivation, base, HUnit, monad-control, test-framework
      , test-framework-hunit, transformers, transformers-base
@@ -114945,7 +115097,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "line_2_1_0_2" = callPackage
+  "line_2_2_0" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types
      , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text
@@ -114953,8 +115105,8 @@ self: {
      }:
      mkDerivation {
        pname = "line";
-       version = "2.1.0.2";
-       sha256 = "456d5ffaec68338fc5892371445e0ff8fa768a68008107f0de22aa0fb962a813";
+       version = "2.2.0";
+       sha256 = "ab22bb9cccc8aafaa61a1a42e8c9b65bcd3995e269949a5e2df8ebd0677697a8";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring cryptohash-sha256
          http-conduit http-types scotty text time transformers wai
@@ -114974,8 +115126,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "line-break";
-       version = "0.1.0.0";
-       sha256 = "2430db2915ce1f910a3053a2c342d5f15d3862262ca3c54cb49b048bca5c8507";
+       version = "0.1.0.1";
+       sha256 = "16a447a8f57319ff868d5c37c83150d38af607f2c085674a717d954cf77ecf5d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -116968,6 +117120,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "log-warper" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring
+     , data-default, directory, dlist, errors, exceptions, extra
+     , filepath, formatting, hashable, hslogger, lens, monad-control
+     , mtl, safecopy, text, text-format, time, transformers
+     , transformers-base, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "log-warper";
+       version = "0.2.2";
+       sha256 = "f0008e0cd1a031f17dcb179f4b6767836f5daf25ee1ed2515f321179650d295a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring data-default directory dlist
+         errors exceptions extra filepath formatting hashable hslogger lens
+         monad-control mtl safecopy text text-format time transformers
+         transformers-base unordered-containers yaml
+       ];
+       executableHaskellDepends = [ base exceptions hslogger text ];
+       homepage = "https://github.com/serokell/log-warper";
+       description = "Flexible, configurable, monadic and pretty logging";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "log2json" = callPackage
     ({ mkDerivation, base, containers, json, parsec }:
      mkDerivation {
@@ -118401,8 +118578,8 @@ self: {
      }:
      mkDerivation {
        pname = "mDNSResponder-client";
-       version = "1.0.1";
-       sha256 = "205820b45d91f0459fa3a810bfdb5691249d3275e95abf9d75aec69e2285e1c8";
+       version = "1.0.3";
+       sha256 = "e222726559744e95809a307605c1a4af0b096adc36f4cdb6eb88f995189b264f";
        libraryHaskellDepends = [
          base bytestring ctrie data-endian network network-msg transformers
        ];
@@ -119378,30 +119555,6 @@ self: {
      }) {};
 
   "mandrill" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
-     , bytestring, containers, email-validate, http-client
-     , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
-     , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "mandrill";
-       version = "0.5.2.3";
-       sha256 = "fe53d80b0c082119e58ff78a8b89084b182e7a82f685d6dfc57d6154b1420a27";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring blaze-html bytestring containers
-         email-validate http-client http-client-tls http-types lens mtl
-         old-locale QuickCheck text time unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       description = "Library for interfacing with the Mandrill JSON API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mandrill_0_5_3_1" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
      , bytestring, containers, email-validate, http-client
      , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
@@ -119423,7 +119576,6 @@ self: {
        ];
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mandulia" = callPackage
@@ -119887,22 +120039,26 @@ self: {
 
   "marvin" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, configurator
-     , directory, filepath, hashable, lens, lifted-async, lifted-base
-     , marvin-interpolate, monad-logger, mono-traversable, mtl, mustache
-     , network-uri, optparse-applicative, random, stm, text, text-icu
-     , unordered-containers, vector, websockets, wreq, wuss
+     , directory, filepath, hashable, haskeline, lens, lifted-async
+     , lifted-base, marvin-interpolate, monad-control, monad-logger
+     , monad-loops, mono-traversable, mtl, mustache, network-uri
+     , optparse-applicative, random, stm, text, text-icu, time
+     , transformers-base, unordered-containers, vector, wai, warp
+     , websockets, wreq, wuss
      }:
      mkDerivation {
        pname = "marvin";
-       version = "0.0.5";
-       sha256 = "bb2de5f531e8f670476af97795f4e13dd06335fedf212e196787e635c97a217d";
+       version = "0.0.9";
+       sha256 = "10c98f4282208ec6c99ac4530dd8e4127b5e6635b1d6df9d250432e0eff01dfa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bytestring configurator hashable lens lifted-async
-         lifted-base marvin-interpolate monad-logger mono-traversable mtl
-         network-uri optparse-applicative random stm text text-icu
-         unordered-containers vector websockets wreq wuss
+         aeson async base bytestring configurator hashable haskeline lens
+         lifted-async lifted-base marvin-interpolate monad-control
+         monad-logger monad-loops mono-traversable mtl network-uri
+         optparse-applicative random stm text text-icu time
+         transformers-base unordered-containers vector wai warp websockets
+         wreq wuss
        ];
        executableHaskellDepends = [
          aeson base bytestring configurator directory filepath
@@ -121541,8 +121697,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-aeson";
-       version = "2.1.1.1";
-       sha256 = "301011a83092af23039a953730551af799af30e81fec9c0c31885fc40cd0ca98";
+       version = "2.1.1.2";
+       sha256 = "f1295f2b6b4db3118b445551ae585650e9ddb2d40bd50194514e478710840f79";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring microlens scientific text
          unordered-containers vector
@@ -121654,21 +121810,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "microlens-th" = callPackage
-    ({ mkDerivation, base, containers, microlens, template-haskell }:
+  "microlens-platform_0_3_7_1" = callPackage
+    ({ mkDerivation, base, hashable, microlens, microlens-ghc
+     , microlens-mtl, microlens-th, text, unordered-containers, vector
+     }:
      mkDerivation {
-       pname = "microlens-th";
-       version = "0.4.1.0";
-       sha256 = "c62afe3fbac955771f4b000181e0c237ab61105a26a76e45c4958b37b7155baa";
+       pname = "microlens-platform";
+       version = "0.3.7.1";
+       sha256 = "e242c6f454305e5a310f7f3b4e8b3ee00158fe7160321e27a56b47ffaa2c4493";
        libraryHaskellDepends = [
-         base containers microlens template-haskell
+         base hashable microlens microlens-ghc microlens-mtl microlens-th
+         text unordered-containers vector
        ];
        homepage = "http://github.com/aelve/microlens";
-       description = "Automatic generation of record lenses for microlens";
+       description = "Feature-complete microlens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens-th_0_4_1_1" = callPackage
+  "microlens-th" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
        pname = "microlens-th";
@@ -121680,7 +121840,6 @@ self: {
        homepage = "http://github.com/aelve/microlens";
        description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "micrologger" = callPackage
@@ -123155,8 +123314,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-classes";
-       version = "0.3.1.1";
-       sha256 = "0c906dc616414c84250c79dba279fd29a963de56aeb98e55d4096e80e9f119d8";
+       version = "0.3.2.0";
+       sha256 = "99bb3597d72d792e1d18f9b26490b43979ea038cf66b5f03ade0a0d60f75dc64";
        libraryHaskellDepends = [
          base ghc-prim mmorph monad-control peano reflection transformers
          transformers-base transformers-compat
@@ -124415,6 +124574,8 @@ self: {
        pname = "mono-traversable";
        version = "1.0.1";
        sha256 = "a96d449eb00e062be003d314884fdb06b1e02e18e0d43e5008500ae7ef3de268";
+       revision = "1";
+       editedCabalFile = "023e5f7596dbfe73456063ed6aa336d2262da4717c267225c9a50c6e6045dc41";
        libraryHaskellDepends = [
          base bytestring containers hashable split text transformers
          unordered-containers vector vector-algorithms
@@ -125658,8 +125819,8 @@ self: {
      }:
      mkDerivation {
        pname = "multifile";
-       version = "0.1.0.4";
-       sha256 = "0c6224001af91ba477e08c774212ae48fd94cdc86666b2a686fe414ee8ac4973";
+       version = "0.1.0.6";
+       sha256 = "594d45265060a8347f9653e4bdacb9e8362cce7d2a06322369e13d4b1e829614";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -126059,8 +126220,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "music-diatonic";
-       version = "0.1.1";
-       sha256 = "7af1534a0647af75d4440ed61aebc89cde76057b4c792e316554e3b280a44ea7";
+       version = "0.1.2";
+       sha256 = "64183c5980878264d2f847d6eeceb91bb887ada3d30912b2b96e5bb061519064";
        libraryHaskellDepends = [ base ];
        description = "Implementation of basic western musical theory objects";
        license = stdenv.lib.licenses.bsd3;
@@ -128380,6 +128541,8 @@ self: {
        pname = "network-carbon";
        version = "1.0.7";
        sha256 = "9cb794e29273aedf7f3fba7eed81a6a9f83791809095c22c11bf094a687dc9c0";
+       revision = "1";
+       editedCabalFile = "aed14a345bcd3d3ef50f393ffd360e8d2870aa0272926190565c39e7e4989c4b";
        libraryHaskellDepends = [
          base bytestring network text time vector
        ];
@@ -128925,25 +129088,6 @@ self: {
      }) {};
 
   "network-transport-inmemory" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-accessor
-     , network-transport, network-transport-tests, stm
-     }:
-     mkDerivation {
-       pname = "network-transport-inmemory";
-       version = "0.5.1";
-       sha256 = "e34ae4169e91739851b31eda9750d3df711389279961290fd006a79b51a70bdd";
-       libraryHaskellDepends = [
-         base bytestring containers data-accessor network-transport stm
-       ];
-       testHaskellDepends = [
-         base network-transport network-transport-tests
-       ];
-       homepage = "http://haskell-distributed.github.com";
-       description = "In-memory instantiation of Network.Transport";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-transport-inmemory_0_5_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , network-transport, network-transport-tests, stm
      }:
@@ -128960,7 +129104,6 @@ self: {
        homepage = "http://haskell-distributed.github.com";
        description = "In-memory instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-transport-tcp" = callPackage
@@ -133196,15 +133339,15 @@ self: {
      }) {};
 
   "overload" = callPackage
-    ({ mkDerivation, base, containers, simple-effects, template-haskell
+    ({ mkDerivation, base, simple-effects, template-haskell
      , th-expand-syns
      }:
      mkDerivation {
        pname = "overload";
-       version = "0.1.0.1";
-       sha256 = "6583c3c90021bc42bf93d8a287fd81970270f05f423b961a35ac06e11f35af6e";
+       version = "0.1.0.2";
+       sha256 = "9880a0c4d5ffbfb6b681a785b581d1bac0fadcb677d0dc5edf6ea75bf01fa598";
        libraryHaskellDepends = [
-         base containers simple-effects template-haskell th-expand-syns
+         base simple-effects template-haskell th-expand-syns
        ];
        homepage = "https://gitlab.com/LukaHorvat/overload";
        description = "Finite overloading";
@@ -133705,8 +133848,8 @@ self: {
        pname = "pandoc";
        version = "1.19.1";
        sha256 = "9d22db0a1536de0984f4a605f1a28649e68d540e6d892947d9644987ecc4172a";
-       revision = "2";
-       editedCabalFile = "6282ee80ee941d2c5582eb81a0c269df6e0d9267912fc85f00b40b5ec35a472c";
+       revision = "3";
+       editedCabalFile = "fd4285e9e69d662c7dce04f9153d8b4c571cd0dbd8d7ea2708c2fc50a0ee2abc";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -135240,26 +135383,6 @@ self: {
      }) {};
 
   "path-io" = callPackage
-    ({ mkDerivation, base, containers, directory, exceptions, filepath
-     , hspec, path, temporary, time, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "path-io";
-       version = "1.2.0";
-       sha256 = "cb8bfb9fca81eb0f0f9b81761cc5a6edc61204e2c630f7277173147cf149336f";
-       revision = "1";
-       editedCabalFile = "bf7a036207155e1b752828736f43541ad0c20a5e780cd17fdec823a5be07da83";
-       libraryHaskellDepends = [
-         base containers directory exceptions filepath path temporary time
-         transformers unix-compat
-       ];
-       testHaskellDepends = [ base exceptions hspec path unix-compat ];
-       homepage = "https://github.com/mrkkrp/path-io";
-       description = "Interface to ‘directory’ package for users of ‘path’";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "path-io_1_2_2" = callPackage
     ({ mkDerivation, base, containers, directory, exceptions, filepath
      , hspec, path, temporary, time, transformers, unix-compat
      }:
@@ -135275,7 +135398,6 @@ self: {
        homepage = "https://github.com/mrkkrp/path-io";
        description = "Interface to ‘directory’ package for users of ‘path’";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "path-pieces" = callPackage
@@ -137059,8 +137181,8 @@ self: {
      }:
      mkDerivation {
        pname = "pgdl";
-       version = "10.5";
-       sha256 = "cd4a959d4648589e14b71aa0940141c7881166f8ad0257eb427c3acf71942c7b";
+       version = "10.6";
+       sha256 = "f3b2c7b1871a0a906db45d963233e2cd124ac206526a37421552e6456d57d249";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -137512,8 +137634,8 @@ self: {
     ({ mkDerivation, base, cli, hmatrix, JuicyPixels, vector }:
      mkDerivation {
        pname = "picedit";
-       version = "0.1.1.1";
-       sha256 = "29cb93ae27ac980884f4a8db3896ae8e7d2b2bcf1b77d368a9ff9a3fb9a7bfcd";
+       version = "0.1.1.2";
+       sha256 = "e56601b9a206f1d51de3d16abb20fe94a3fc1e5a775662108dd2d0d0d09dab58";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hmatrix JuicyPixels vector ];
@@ -137653,7 +137775,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "pinboard_0_9_12_2" = callPackage
+  "pinboard_0_9_12_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , http-client, http-client-tls, http-types, monad-logger, mtl
      , network, profunctors, QuickCheck, random, safe-exceptions
@@ -137662,8 +137784,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinboard";
-       version = "0.9.12.2";
-       sha256 = "f9c5dbf3206d0c0075704feb4582c58a5eb3ef4704ca7a2000c5c8d49dbeeec9";
+       version = "0.9.12.3";
+       sha256 = "b38931a4cd32bc6a43862c38116779af76c0b5b5eb6f117ba6b60ef3f717324b";
        libraryHaskellDepends = [
          aeson base bytestring containers http-client http-client-tls
          http-types monad-logger mtl network profunctors random
@@ -137702,6 +137824,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pinch_0_3_0_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "pinch";
+       version = "0.3.0.2";
+       sha256 = "f511ab7e13de146ed075eb52ee7954b1b4c2deaf5bb54e83375dc159e5803e4a";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq ghc-prim hashable text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec hspec-discover QuickCheck text
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/abhinav/pinch#readme";
+       description = "An alternative implementation of Thrift for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pinchot" = callPackage
     ({ mkDerivation, base, containers, Earley, lens, ListLike
      , non-empty-sequence, pretty-show, semigroups, template-haskell
@@ -138235,21 +138380,6 @@ self: {
      }) {};
 
   "pipes-http" = callPackage
-    ({ mkDerivation, base, bytestring, http-client, http-client-tls
-     , pipes
-     }:
-     mkDerivation {
-       pname = "pipes-http";
-       version = "1.0.4";
-       sha256 = "f5cff84b9f415f1a65dbe04837884793fa10b1b52e96b29d52987b820c5a0216";
-       libraryHaskellDepends = [
-         base bytestring http-client http-client-tls pipes
-       ];
-       description = "HTTP client with pipes interface";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-http_1_0_5" = callPackage
     ({ mkDerivation, base, bytestring, http-client, http-client-tls
      , pipes
      }:
@@ -138262,7 +138392,6 @@ self: {
        ];
        description = "HTTP client with pipes interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-illumina" = callPackage
@@ -140610,6 +140739,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) postgresql;};
 
+  "postgresql-libpq_0_9_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, postgresql }:
+     mkDerivation {
+       pname = "postgresql-libpq";
+       version = "0.9.3.0";
+       sha256 = "510df3e08753e011c108c4d4c6d048a4b67545419eb9eedc3ef23e7758fedb05";
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ postgresql ];
+       homepage = "http://github.com/lpsmith/postgresql-libpq";
+       description = "low-level binding to libpq";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) postgresql;};
+
   "postgresql-orm" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , bytestring-builder, directory, filepath, ghc-prim, mtl
@@ -141053,15 +141196,18 @@ self: {
      }) {};
 
   "powermate" = callPackage
-    ({ mkDerivation, base, directory, network, unix }:
+    ({ mkDerivation, base, directory, unix }:
      mkDerivation {
        pname = "powermate";
-       version = "0.1";
-       sha256 = "40671ae08feb11a63d5f77dee6d3fc99101b577e09bfa1ef53bc894d1e891aa7";
-       libraryHaskellDepends = [ base directory network unix ];
-       homepage = "http://neugierig.org/software/darcs/powermate/";
-       description = "PowerMate bindings";
-       license = stdenv.lib.licenses.bsd3;
+       version = "1.0";
+       sha256 = "cf3f0a3e1754489569c3b2a6c8ea1b856919de782c72b86884e31a70fc585b98";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory unix ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/ppelleti/powermate";
+       description = "bindings for Griffin PowerMate USB";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -141200,8 +141346,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.14";
-       sha256 = "6b01da606303e72bad6055d436e1c199ad58bb6c93efd89b8d4c43ad5aa6ff21";
+       version = "0.0.16";
+       sha256 = "fdcb911e5f035d4b6ee6040e7f043daa9b0c10d964ef607fef2538b1874c9d90";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141770,20 +141916,21 @@ self: {
      }) {};
 
   "pretty-simple" = callPackage
-    ({ mkDerivation, ansi-terminal, base, doctest, Glob, lens
-     , mono-traversable, mtl, parsec, semigroups, transformers
+    ({ mkDerivation, ansi-terminal, base, containers, doctest, Glob
+     , lens, mono-traversable, mtl, parsec, semigroups, text
+     , transformers
      }:
      mkDerivation {
        pname = "pretty-simple";
-       version = "0.3.0.0";
-       sha256 = "b34af2742904717e1a46c6aa9816eeffedc4aea67452f61dd98fb06aae1d4f0d";
+       version = "1.0.0.3";
+       sha256 = "f455dc0bbbfb068a59088e43cb354741c1bbf877d0bfc440667790aa3d550740";
        libraryHaskellDepends = [
-         ansi-terminal base lens mono-traversable mtl parsec semigroups
-         transformers
+         ansi-terminal base containers lens mono-traversable mtl parsec
+         semigroups text transformers
        ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/cdepillabout/pretty-simple";
-       description = "Simple pretty printer for any datatype with a 'Show' instance";
+       description = "pretty printer for data types with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -143561,12 +143708,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "publicsuffix_0_20161206" = callPackage
+  "publicsuffix_0_20170109" = callPackage
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20161206";
-       sha256 = "0f6ef27c6e71f62c7f994dff75f53ba46a469da00a688c6428932426e80b2959";
+       version = "0.20170109";
+       sha256 = "1b8c8b6c4eb93604598f5f6b7b671cc72b2f0d50a4dfe174e97a72d9919c1844";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -144102,8 +144249,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript-bridge";
-       version = "0.8.0.0";
-       sha256 = "5c52581099c42d3fe337a8b9d3b141dc5fb2a591c0bfbb7e898a701ad99b1e4f";
+       version = "0.8.0.1";
+       sha256 = "ab3cf87f637053e0378ca266166e5699ae4acfb5f404dae9ac4a793890124329";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving lens mtl text
          transformers
@@ -144116,15 +144263,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "purescript-bridge_0_8_0_1" = callPackage
+  "purescript-bridge_0_9_0_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
      , mtl, text, transformers
      }:
      mkDerivation {
        pname = "purescript-bridge";
-       version = "0.8.0.1";
-       sha256 = "ab3cf87f637053e0378ca266166e5699ae4acfb5f404dae9ac4a793890124329";
+       version = "0.9.0.0";
+       sha256 = "ba7ed603c5cc92099b48388ce4caade457f6f51a8b3eaf87c665aea21d394f04";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving lens mtl text
          transformers
@@ -144731,8 +144878,8 @@ self: {
      }:
      mkDerivation {
        pname = "qtah-examples";
-       version = "0.2.0";
-       sha256 = "a2f8e4b352742f97beae28eae0a5d8adbb939b51654274a7e26e3769b2f5f835";
+       version = "0.2.1";
+       sha256 = "a9713bf999eaf60b08f6c9770860bea35c3b4f823850c36b799485d8f7593c8f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -144917,6 +145064,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "quantum-random_0_6_4" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, ansigraph, base, bytestring
+     , directory, haskeline, hspec, http-conduit, mtl, QuickCheck
+     , terminal-size, text
+     }:
+     mkDerivation {
+       pname = "quantum-random";
+       version = "0.6.4";
+       sha256 = "7e1461974f2ea9bc5018b3a88f6fbf7ad39cb40a81f70f588597b8274d25139b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal ansigraph base bytestring directory
+         http-conduit terminal-size text
+       ];
+       executableHaskellDepends = [ base haskeline mtl ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "http://github.com/BlackBrane/quantum-random/";
+       description = "Retrieve, store and manage real quantum random data";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "qudb" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, directory, happy
      , mtl, snappy
@@ -145417,6 +145587,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quickson" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, text }:
+     mkDerivation {
+       pname = "quickson";
+       version = "0.3";
+       sha256 = "8a0435bd78381c0abe931fbcd7eae135df56cbab784340da0c49d1429e3545a9";
+       libraryHaskellDepends = [ aeson attoparsec base bytestring text ];
+       homepage = "https://github.com/libscott/quickson";
+       description = "Quick JSON extractions with Aeson";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "quickspec" = callPackage
     ({ mkDerivation, array, base, containers, ghc-prim, QuickCheck
      , random, spoon, transformers
@@ -145765,14 +145947,18 @@ self: {
      }) {};
 
   "rabocsv2qif" = callPackage
-    ({ mkDerivation, base, old-locale, split, time }:
+    ({ mkDerivation, base, bytestring, bytestring-conversion, split
+     , time
+     }:
      mkDerivation {
        pname = "rabocsv2qif";
-       version = "1.1.5";
-       sha256 = "6f8c2b10adb695147979f027f0a5f88f4e13cb77ff4aa172e8cbc359adc869ed";
+       version = "2.0.0";
+       sha256 = "c6a362bb9f3f48be7e577498f8fdb26175cabab62534860cc1eec8f4d145ebdc";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base old-locale split time ];
+       libraryHaskellDepends = [
+         base bytestring bytestring-conversion split time
+       ];
        executableHaskellDepends = [ base ];
        description = "A library and program to create QIF files from Rabobank CSV exports";
        license = "GPL";
@@ -146513,10 +146699,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasa";
-       version = "0.1.3";
-       sha256 = "2247542b18000d21309747e55b65ccb6207dace606ad7e84166c46b7966caed1";
-       revision = "1";
-       editedCabalFile = "3677de9868bb117c8aa7845db9cbe0c614a8ec41e0f24efc50ccaff3963422db";
+       version = "0.1.6";
+       sha256 = "ec2c1f23f4a44f691a32d1b4784cd72bf2452076908f4c8cf61945d499da22bd";
        libraryHaskellDepends = [
          async base containers data-default lens mtl text text-lens
          transformers yi-rope
@@ -146527,32 +146711,48 @@ self: {
      }) {};
 
   "rasa-example-config" = callPackage
-    ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-cursors
-     , rasa-ext-files, rasa-ext-logger, rasa-ext-slate
+    ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-bufs
+     , rasa-ext-cursors, rasa-ext-files, rasa-ext-logger, rasa-ext-slate
      , rasa-ext-status-bar, rasa-ext-style, rasa-ext-vim
      }:
      mkDerivation {
        pname = "rasa-example-config";
-       version = "0.1.0.0";
-       sha256 = "5d3cbf04bb2b7a18bfc0ecc03d3c6ed72a23c45827291537d34938fdde21821a";
+       version = "0.1.1";
+       sha256 = "efc1307d1f0e616977ae5c5f637b6e8d45fc45ccebe367d2282a9b6344041855";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base lens mtl rasa rasa-ext-cursors rasa-ext-files rasa-ext-logger
-         rasa-ext-slate rasa-ext-status-bar rasa-ext-style rasa-ext-vim
+         base lens mtl rasa rasa-ext-bufs rasa-ext-cursors rasa-ext-files
+         rasa-ext-logger rasa-ext-slate rasa-ext-status-bar rasa-ext-style
+         rasa-ext-vim
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Example user config for Rasa";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rasa-ext-bufs" = callPackage
+    ({ mkDerivation, base, containers, data-default, lens, rasa, text
+     }:
+     mkDerivation {
+       pname = "rasa-ext-bufs";
+       version = "0.1.1";
+       sha256 = "c7b935f44138f2fba37882504574986a8e88886d14d300f16ad6de1719e2c412";
+       libraryHaskellDepends = [
+         base containers data-default lens rasa text
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext for useful buffer utilities";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "rasa-ext-cmd" = callPackage
     ({ mkDerivation, base, containers, data-default, lens, rasa, text
      }:
      mkDerivation {
        pname = "rasa-ext-cmd";
-       version = "0.1.0.0";
-       sha256 = "91efb87afe1a4c9d610c450742f623ff1170957327856ef4265754e1ed4d8123";
+       version = "0.1.1";
+       sha256 = "8ba6c787802bf3f1a665d973052bfcfc1ee6ce4c883a867a900c41e0f5eab378";
        libraryHaskellDepends = [
          base containers data-default lens rasa text
        ];
@@ -146567,8 +146767,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-cursors";
-       version = "0.1.0.0";
-       sha256 = "3d53163dcf3b5d1f897f0c006f83a1ea71306dad3ed2fefc4f7af21a2ff7fda6";
+       version = "0.1.3";
+       sha256 = "e7eb3007b5afb21ceb1122dce2cbbd52bb246a36c9efef4e237bfa3f26d827a2";
        libraryHaskellDepends = [
          base data-default lens mtl rasa rasa-ext-style text text-lens
          yi-rope
@@ -146579,15 +146779,16 @@ self: {
      }) {};
 
   "rasa-ext-files" = callPackage
-    ({ mkDerivation, base, data-default, lens, rasa, rasa-ext-cmd
-     , rasa-ext-status-bar, text
+    ({ mkDerivation, base, data-default, lens, rasa, rasa-ext-bufs
+     , rasa-ext-cmd, rasa-ext-status-bar, text, yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-files";
-       version = "0.1.0.0";
-       sha256 = "9bfc3d47df893b23e4259887f95078b81fc9bfb489d9ce96d232f4ecdb39c3a4";
+       version = "0.1.1";
+       sha256 = "5f81d7e731216ae25d571ec4dc567e155619ce0f97451efd1d5b998f311d6dea";
        libraryHaskellDepends = [
-         base data-default lens rasa rasa-ext-cmd rasa-ext-status-bar text
+         base data-default lens rasa rasa-ext-bufs rasa-ext-cmd
+         rasa-ext-status-bar text yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for filesystem actions";
@@ -146598,8 +146799,8 @@ self: {
     ({ mkDerivation, base, lens, mtl, rasa }:
      mkDerivation {
        pname = "rasa-ext-logger";
-       version = "0.1.0.0";
-       sha256 = "4d951f1c54328715c3e923c1f89c833f687bb291e4d7af1ac563c77d8606e3e0";
+       version = "0.1.1";
+       sha256 = "60dc316154e0c3a1a51c0eb54d18b2612e02b4c76745fe72ab7fc3f3efafcb77";
        libraryHaskellDepends = [ base lens mtl rasa ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for logging state/actions";
@@ -146607,16 +146808,17 @@ self: {
      }) {};
 
   "rasa-ext-slate" = callPackage
-    ({ mkDerivation, base, lens, rasa, rasa-ext-logger
-     , rasa-ext-status-bar, rasa-ext-style, text, vty, yi-rope
+    ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-logger
+     , rasa-ext-status-bar, rasa-ext-style, rasa-ext-views
+     , recursion-schemes, text, vty, yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-slate";
-       version = "0.1.0.0";
-       sha256 = "75d5c973d41acc016e4f3aa87f0babfb2cfd0d979a848da6a6fb8c9d3c6e4eb9";
+       version = "0.1.3";
+       sha256 = "eb5b0055822825079abefe9066d05380881f003d7e4842a841352de08268f612";
        libraryHaskellDepends = [
-         base lens rasa rasa-ext-logger rasa-ext-status-bar rasa-ext-style
-         text vty yi-rope
+         base lens mtl rasa rasa-ext-logger rasa-ext-status-bar
+         rasa-ext-style rasa-ext-views recursion-schemes text vty yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa extension for rendering to terminal with vty";
@@ -146624,12 +146826,12 @@ self: {
      }) {};
 
   "rasa-ext-status-bar" = callPackage
-    ({ mkDerivation, base, data-default, lens, rasa, text }:
+    ({ mkDerivation, base, data-default, lens, rasa, yi-rope }:
      mkDerivation {
        pname = "rasa-ext-status-bar";
-       version = "0.1.0.0";
-       sha256 = "20791e8facaf3e452c1bdc60e8d519169f50a34213a8cdbd6503cb838c550c71";
-       libraryHaskellDepends = [ base data-default lens rasa text ];
+       version = "0.1.1";
+       sha256 = "96b5c3a0331b0fe1d16223a98768345adfce7c15193b3113df904e7860dd4a37";
+       libraryHaskellDepends = [ base data-default lens rasa yi-rope ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for populating status-bar";
        license = stdenv.lib.licenses.mit;
@@ -146639,26 +146841,42 @@ self: {
     ({ mkDerivation, base, data-default, lens, rasa }:
      mkDerivation {
        pname = "rasa-ext-style";
-       version = "0.1.0.0";
-       sha256 = "496afd72cdbfca75bf530c022e5ad7bbcfd7878e1373ec497ec864a3e7beaee0";
+       version = "0.1.2";
+       sha256 = "638cab2cc0f07db50663d1fce116ab7c5e9aeeeea4d3163bb8eec5066649ff60";
        libraryHaskellDepends = [ base data-default lens rasa ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext managing rendering styles";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rasa-ext-views" = callPackage
+    ({ mkDerivation, base, bifunctors, data-default, lens, mtl, rasa
+     , recursion-schemes
+     }:
+     mkDerivation {
+       pname = "rasa-ext-views";
+       version = "0.1.1";
+       sha256 = "d7b234282b2d9f0127550645932b3df065f75ad4365662a8aa80b82472ff4580";
+       libraryHaskellDepends = [
+         base bifunctors data-default lens mtl rasa recursion-schemes
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext managing rendering views";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "rasa-ext-vim" = callPackage
     ({ mkDerivation, base, data-default, lens, mtl, rasa
-     , rasa-ext-cursors, rasa-ext-files, rasa-ext-status-bar, text
-     , text-lens, yi-rope
+     , rasa-ext-cursors, rasa-ext-files, rasa-ext-status-bar
+     , rasa-ext-views, text, text-lens, yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-vim";
-       version = "0.1.0.0";
-       sha256 = "3e936fe4fca11737f9983db671d2c94f240aa95d81d934b93e4d211575d8d045";
+       version = "0.1.2";
+       sha256 = "d3fb58f10308d6a156691c37844eec7ecf1ff48f88bb81c8294625184b6f86ea";
        libraryHaskellDepends = [
          base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files
-         rasa-ext-status-bar text text-lens yi-rope
+         rasa-ext-status-bar rasa-ext-views text text-lens yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for vim bindings";
@@ -146761,25 +146979,6 @@ self: {
      }) {};
 
   "ratel" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, http-client, http-client-tls, http-types, tasty
-     , tasty-hspec, text, uuid
-     }:
-     mkDerivation {
-       pname = "ratel";
-       version = "0.3.1";
-       sha256 = "20178614b08e446c50717ba4988440ad342adc70dfa3ab51a1357057223f31fe";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-client
-         http-client-tls http-types text uuid
-       ];
-       testHaskellDepends = [ base tasty tasty-hspec ];
-       homepage = "https://github.com/tfausak/ratel#readme";
-       description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel_0_3_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, http-client, http-client-tls, http-types, tasty
      , tasty-hspec, text, uuid
@@ -146796,7 +146995,6 @@ self: {
        homepage = "https://github.com/tfausak/ratel#readme";
        description = "Notify Honeybadger about exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ratel-wai" = callPackage
@@ -147935,6 +148133,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "recursors" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "recursors";
+       version = "0.1.0.0";
+       sha256 = "0b18df01b9cb06ba1ef5c25b74f46dda87ae254c66a1b29b06017a2217e443cc";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base hspec QuickCheck template-haskell ];
+       homepage = "https://www.github.com/jwiegley/recursors";
+       description = "Auto-generate final encodings and their isomorphisms using Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "redHandlers" = callPackage
     ({ mkDerivation, array, base, bytestring, cgi, containers
      , haskell98, MaybeT, mtl, network, old-time, parsec, stm, unix
@@ -148145,8 +148356,8 @@ self: {
      }:
      mkDerivation {
        pname = "reedsolomon";
-       version = "0.0.4.2";
-       sha256 = "1f2e6d4d781692ed5cbb6f655486fa7d9a8a2872feb6a4a0626e3e778e067d9f";
+       version = "0.0.4.3";
+       sha256 = "b74acd24ee1524e684860a20a8bf44eea5524ff8fd22c6efd0baf20bb5a0a42b";
        libraryHaskellDepends = [
          base bytestring exceptions gitrev loop mtl primitive profunctors
          vector
@@ -148681,8 +148892,8 @@ self: {
     ({ mkDerivation, aeson, base, containers, text }:
      mkDerivation {
        pname = "refty";
-       version = "0.1.0.1";
-       sha256 = "621883d618e539b9938327e2faf09d36628a81db9ab051c7a4c07b644b7f5d28";
+       version = "0.2.0.0";
+       sha256 = "d8dbabf5ae6f076d640a801aa19da10e3e4e5ae373b0e7bb96a512739b9ae2c9";
        libraryHaskellDepends = [ aeson base containers text ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/oreshinya/refty";
@@ -149643,6 +149854,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "remark" = callPackage
+    ({ mkDerivation, base, GenericPretty, tasty, tasty-golden
+     , tasty-hunit
+     }:
+     mkDerivation {
+       pname = "remark";
+       version = "0.0.0.0";
+       sha256 = "889e58c559ede3b9402cff8b32428f7968d408f2138daaff64d5e5bf6b684511";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base GenericPretty ];
+       executableHaskellDepends = [ base GenericPretty ];
+       testHaskellDepends = [
+         base GenericPretty tasty tasty-golden tasty-hunit
+       ];
+       homepage = "https://github.com/oleks/remark#readme";
+       description = "A DSL for marking student work";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rematch" = callPackage
     ({ mkDerivation, base, hspec, HUnit }:
      mkDerivation {
@@ -150367,8 +150598,8 @@ self: {
        pname = "req-conduit";
        version = "0.1.0";
        sha256 = "689a8592555b39859ab0d2e50b111217112d51077553dc7103d84afc865ca447";
-       revision = "1";
-       editedCabalFile = "2f7008556081fcfb641b008c499f0c12958f7ccdfbc62b8aa2c1459c7efb3e81";
+       revision = "2";
+       editedCabalFile = "dc6ccfa651214632bd0c4517f0c5e86d228cf93b792a6a44ef7330c85041a67b";
        libraryHaskellDepends = [
          base bytestring conduit http-client req resourcet transformers
        ];
@@ -150504,25 +150735,6 @@ self: {
      }) {};
 
   "resolve-trivial-conflicts" = callPackage
-    ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory
-     , filepath, mtl, optparse-applicative, process, unix
-     }:
-     mkDerivation {
-       pname = "resolve-trivial-conflicts";
-       version = "0.3.2.3";
-       sha256 = "12459698d44496475f48a5f62a8fba5cd746b0aa7552fa577304ee875f85c596";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         ansi-terminal base base-compat Diff directory filepath mtl
-         optparse-applicative process unix
-       ];
-       homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
-       description = "Remove trivial conflict markers in a git repository";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "resolve-trivial-conflicts_0_3_2_4" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory
      , filepath, mtl, optparse-applicative, process, unix
      }:
@@ -150539,7 +150751,6 @@ self: {
        homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resource-effect" = callPackage
@@ -150646,25 +150857,6 @@ self: {
      }) {};
 
   "resourcet" = callPackage
-    ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
-     , mmorph, monad-control, mtl, transformers, transformers-base
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "resourcet";
-       version = "1.1.8.1";
-       sha256 = "833a3104a554bda7c434c38a8a63992e8b456f057fa8ec6d039e6abe28715527";
-       libraryHaskellDepends = [
-         base containers exceptions lifted-base mmorph monad-control mtl
-         transformers transformers-base transformers-compat
-       ];
-       testHaskellDepends = [ base hspec lifted-base transformers ];
-       homepage = "http://github.com/snoyberg/conduit";
-       description = "Deterministic allocation and freeing of scarce resources";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "resourcet_1_1_9" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
      , mmorph, monad-control, mtl, transformers, transformers-base
      , transformers-compat
@@ -150681,7 +150873,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "respond" = callPackage
@@ -150828,8 +151019,8 @@ self: {
        pname = "rest-gen";
        version = "0.20.0.0";
        sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542";
-       revision = "4";
-       editedCabalFile = "df0abba48ce1b506060711b616a027680314c92960bdefca0f548eecc058e062";
+       revision = "5";
+       editedCabalFile = "f215b849b6a581cb87b835c7feeee8de835d6cd5039eb7c15272c4b9fdc9456a";
        libraryHaskellDepends = [
          aeson base base-compat blaze-html Cabal code-builder directory
          fclabels filepath hashable haskell-src-exts HStringTemplate hxt
@@ -152933,6 +153124,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "runmany" = callPackage
+    ({ mkDerivation, async, base, bytestring, optparse-applicative
+     , process, stm
+     }:
+     mkDerivation {
+       pname = "runmany";
+       version = "0.1.2";
+       sha256 = "378255e7a54189a204e53197e472076093b34e4c55dae5463e6df0577b15c7b0";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async base bytestring optparse-applicative process stm
+       ];
+       homepage = "https://github.com/jwiegley/runmany";
+       description = "Run multiple commands, interleaving output and errors";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "runmemo" = callPackage
     ({ mkDerivation, base, data-memocombinators, time }:
      mkDerivation {
@@ -153974,15 +154183,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sbv_5_13" = callPackage
+  "sbv_5_14" = 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";
+       version = "5.14";
+       sha256 = "92dc71b96071162a47383c5f4833e8b78c2874009e671e2a6bc8de9707328e7e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -154009,8 +154218,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbvPlugin";
-       version = "0.7";
-       sha256 = "87af8c5e6d590f6cfcef96ad0c110aadc8c90fe07a72f65af77feac31717baf8";
+       version = "0.8";
+       sha256 = "71ec51df5c185b8380d5275935170fa52f3002c192b65dddf93312a512e8ed9f";
        libraryHaskellDepends = [
          base containers ghc ghc-prim mtl sbv template-haskell
        ];
@@ -155565,6 +155774,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "secureUDP" = callPackage
+    ({ mkDerivation, base, bytestring, containers, network }:
+     mkDerivation {
+       pname = "secureUDP";
+       version = "0.1.1.3";
+       sha256 = "2c59bceee71903722ddecd4d4b31306ef21037048b1ded5a4c049d238334c129";
+       libraryHaskellDepends = [ base bytestring containers network ];
+       description = "Setups secure (unsorted) UDP packet transfer";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "securemem" = callPackage
     ({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }:
      mkDerivation {
@@ -156329,22 +156549,22 @@ self: {
      , 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, monad-control, mtl
-     , optparse-applicative, parsec, QuickCheck, quickcheck-instances
-     , safecopy, scientific, semigroups, stm, template-haskell, text
-     , text-format, time-units, transformers, unordered-containers
-     , vector, yaml
+     , filepath, formatting, hashable, hspec, lens, log-warper
+     , monad-control, mtl, optparse-applicative, parsec, QuickCheck
+     , quickcheck-instances, safecopy, scientific, semigroups, stm
+     , template-haskell, text, text-format, time-units, transformers
+     , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.1.3.1";
-       sha256 = "5765de74022ed024a407a3869892294d50e3027f7cf79ef9b63fca0b61c8b306";
+       version = "0.1.3.2";
+       sha256 = "0fc433fd42e2281fc9cb3e76a55cd0d6806b611c25fdba516734350507682a77";
        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
-         monad-control mtl optparse-applicative parsec QuickCheck
+         log-warper monad-control mtl optparse-applicative parsec QuickCheck
          quickcheck-instances safecopy scientific semigroups stm
          template-haskell text text-format time-units transformers
          unordered-containers vector yaml
@@ -157621,37 +157841,6 @@ self: {
      }) {};
 
   "servant-swagger-ui" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring
-     , directory, file-embed, filepath, http-media, lens, servant
-     , servant-blaze, servant-server, servant-swagger, swagger2
-     , template-haskell, text, transformers, transformers-compat, wai
-     , wai-app-static, warp
-     }:
-     mkDerivation {
-       pname = "servant-swagger-ui";
-       version = "0.2.0.2.1.5";
-       sha256 = "57fa0b9d8a46482051f3e2bcab7c513adec07450b3fb6bb00281758f99922d57";
-       revision = "2";
-       editedCabalFile = "cd0f97ba669671dd13af499483c4e0262e7fd032a50e97396dc56bec8256c869";
-       libraryHaskellDepends = [
-         base blaze-markup bytestring directory file-embed filepath
-         http-media servant servant-blaze servant-server servant-swagger
-         swagger2 template-haskell text transformers transformers-compat
-         wai-app-static
-       ];
-       testHaskellDepends = [
-         aeson base base-compat blaze-markup bytestring directory file-embed
-         filepath http-media lens servant servant-blaze servant-server
-         servant-swagger swagger2 template-haskell text transformers
-         transformers-compat wai wai-app-static warp
-       ];
-       homepage = "https://github.com/phadej/servant-swagger-ui#readme";
-       description = "Servant swagger ui";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "servant-swagger-ui_0_2_1_2_2_8" = callPackage
     ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring
      , directory, file-embed, filepath, http-media, lens, servant
      , servant-blaze, servant-server, servant-swagger, swagger2
@@ -158581,8 +158770,8 @@ self: {
     ({ mkDerivation, base, basic-prelude, directory, shake }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.8";
-       sha256 = "13495dad7f64f7f6fd79d86c138ceb517659e28fd138169d1df957892036ab51";
+       version = "0.0.13";
+       sha256 = "dbb3062ff1e3d416e3bc83efaf3da7771161cdadc9583a8eeab9c5328716919d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base basic-prelude directory shake ];
@@ -158593,32 +158782,6 @@ self: {
      }) {};
 
   "shakespeare" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
-     , process, scientific, template-haskell, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "shakespeare";
-       version = "2.0.11.2";
-       sha256 = "536327335c60f144aa372e4e0f163097bb0b435e28438bf7c54f1f22271f71d4";
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions ghc-prim parsec process scientific template-haskell text
-         time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions ghc-prim hspec HUnit parsec process template-haskell
-         text time transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-       description = "A toolkit for making compile-time interpolated templates";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "shakespeare_2_0_12_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
      , process, scientific, template-haskell, text, time, transformers
@@ -158641,7 +158804,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A toolkit for making compile-time interpolated templates";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -161028,8 +161190,8 @@ self: {
     ({ mkDerivation, base, time }:
      mkDerivation {
        pname = "sleep";
-       version = "0.1.0.0";
-       sha256 = "ce74c6970b5d83bb92ddf75783fce4ce6d3976cf69c31d18385171787cf80895";
+       version = "0.1.0.1";
+       sha256 = "af74975f289f74330a890d897db4708db4d31122321325c97ead929daf0d7eec";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base time ];
@@ -161162,28 +161324,6 @@ self: {
      }) {};
 
   "slug" = callPackage
-    ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent
-     , QuickCheck, test-framework, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "slug";
-       version = "0.1.5";
-       sha256 = "6bc271612759fd9a415ee382b620b0f5b1154c762eb3469a409dafd5f35282fc";
-       revision = "1";
-       editedCabalFile = "1cbade6e74ca1f38368323dc0e124d4b8f0abc661a53e8738f3700cbf553b218";
-       libraryHaskellDepends = [
-         aeson base exceptions path-pieces persistent text
-       ];
-       testHaskellDepends = [
-         base exceptions path-pieces QuickCheck test-framework
-         test-framework-quickcheck2 text
-       ];
-       homepage = "https://github.com/mrkkrp/slug";
-       description = "Type-safe slugs for Yesod ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "slug_0_1_6" = callPackage
     ({ mkDerivation, aeson, base, exceptions, hspec, http-api-data
      , path-pieces, persistent, QuickCheck, text
      }:
@@ -161201,7 +161341,6 @@ self: {
        homepage = "https://github.com/mrkkrp/slug";
        description = "Type-safe slugs for Yesod ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallarray" = callPackage
@@ -161239,6 +161378,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smallcaps_0_6_0_4" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, data-default
+     , directory, filepath, parsec, text, transformers
+     }:
+     mkDerivation {
+       pname = "smallcaps";
+       version = "0.6.0.4";
+       sha256 = "c5224d8f48f86b6d8e788194cbe1e4f13015ba3eb90794ea5d99ff78ddff85d3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base containers data-default directory filepath parsec
+         text transformers
+       ];
+       executableHaskellDepends = [ base containers data-default text ];
+       testHaskellDepends = [
+         attoparsec base containers data-default parsec text
+       ];
+       description = "Flatten camel case text in LaTeX files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smallcheck" = callPackage
     ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
      mkDerivation {
@@ -161448,18 +161610,6 @@ self: {
      }) {};
 
   "smoothie" = callPackage
-    ({ mkDerivation, aeson, base, linear, text, vector }:
-     mkDerivation {
-       pname = "smoothie";
-       version = "0.4.2.3";
-       sha256 = "ae9f1fd411fc6c57ce4f3d51f23f96ef6cc8362a3df3f932e0fcfa988029e84d";
-       libraryHaskellDepends = [ aeson base linear text vector ];
-       homepage = "https://github.com/phaazon/smoothie";
-       description = "Smooth curves via several interpolation modes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "smoothie_0_4_2_4" = callPackage
     ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
        pname = "smoothie";
@@ -161469,7 +161619,6 @@ self: {
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smsaero" = callPackage
@@ -162295,6 +162444,8 @@ self: {
        pname = "snaplet-fay";
        version = "0.3.3.14";
        sha256 = "97a9a3ec90e03be064df0a6e3dcf5834de063fb43a24d1014eb3d0ba8bac4207";
+       revision = "1";
+       editedCabalFile = "58f323693af14f209668396e60d99aaf46c3adc1415f8e2df951a54494be8619";
        libraryHaskellDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
@@ -164946,27 +165097,6 @@ self: {
      }) {inherit (pkgs) sqlite;};
 
   "sqlite-simple" = callPackage
-    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
-     , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text
-     , time, transformers
-     }:
-     mkDerivation {
-       pname = "sqlite-simple";
-       version = "0.4.12.0";
-       sha256 = "eb5732bea0fff46a1761c5aa635533c7200c748624825440276774ce4bf56093";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-textual bytestring containers
-         direct-sqlite text time transformers
-       ];
-       testHaskellDepends = [
-         base base16-bytestring bytestring direct-sqlite HUnit text time
-       ];
-       homepage = "http://github.com/nurpax/sqlite-simple";
-       description = "Mid-Level SQLite client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sqlite-simple_0_4_12_1" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
      , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text
      , time, transformers
@@ -164985,7 +165115,6 @@ self: {
        homepage = "http://github.com/nurpax/sqlite-simple";
        description = "Mid-Level SQLite client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlite-simple-errors" = callPackage
@@ -165580,6 +165709,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stack-type" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "stack-type";
+       version = "0.1.0.0";
+       sha256 = "f310965736f096cdf099e0a61c5fad39b066692d72643da989b64e61ae196c8e";
+       libraryHaskellDepends = [ base transformers ];
+       homepage = "https://github.com/aiya000/hs-stack-type";
+       description = "The basic stack type";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stackage" = callPackage
     ({ mkDerivation, base, stackage-build-plan, stackage-cabal
      , stackage-cli, stackage-install, stackage-sandbox, stackage-setup
@@ -167492,23 +167633,6 @@ self: {
      }) {};
 
   "streaming-bytestring" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl
-     , resourcet, streaming, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "streaming-bytestring";
-       version = "0.1.4.4";
-       sha256 = "0a8b6623cff9fa1310c835a3c3f374cbf1c14ca385dd401db9c13b503e347662";
-       libraryHaskellDepends = [
-         base bytestring deepseq exceptions mmorph mtl resourcet streaming
-         transformers transformers-base
-       ];
-       homepage = "https://github.com/michaelt/streaming-bytestring";
-       description = "effectful byte steams, or: bytestring io done right";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "streaming-bytestring_0_1_4_5" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl
      , resourcet, smallcheck, streaming, tasty, tasty-smallcheck
      , transformers, transformers-base
@@ -167528,7 +167652,6 @@ self: {
        homepage = "https://github.com/michaelt/streaming-bytestring";
        description = "effectful byte steams, or: bytestring io done right";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-commons" = callPackage
@@ -167897,17 +168020,6 @@ self: {
      }) {};
 
   "string-conversions" = callPackage
-    ({ mkDerivation, base, bytestring, text, utf8-string }:
-     mkDerivation {
-       pname = "string-conversions";
-       version = "0.4";
-       sha256 = "1a64a6db3c7fe37c798aaa433ee4c951c0727fd46a9c096c002b6bf0adac24ae";
-       libraryHaskellDepends = [ base bytestring text utf8-string ];
-       description = "Simplifies dealing with different types for strings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "string-conversions_0_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck
      , quickcheck-instances, text, utf8-string
      }:
@@ -167923,7 +168035,6 @@ self: {
        homepage = "https://github.com/soenkehahn/string-conversions#readme";
        description = "Simplifies dealing with different types for strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "string-convert" = callPackage
@@ -168212,25 +168323,6 @@ self: {
      }) {};
 
   "strive" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
-     , http-client, http-client-tls, http-types, markdown-unlit
-     , template-haskell, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "strive";
-       version = "3.0.1";
-       sha256 = "3a03d0b5c1ac8121be624dedd995c17c99543428225789483693ca7a69654a69";
-       libraryHaskellDepends = [
-         aeson base bytestring data-default gpolyline http-client
-         http-client-tls http-types template-haskell text time transformers
-       ];
-       testHaskellDepends = [ base bytestring markdown-unlit time ];
-       homepage = "https://github.com/tfausak/strive#readme";
-       description = "A client for the Strava V3 API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "strive_3_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
      , http-client, http-client-tls, http-types, markdown-unlit
      , template-haskell, text, time, transformers
@@ -168247,7 +168339,6 @@ self: {
        homepage = "https://github.com/tfausak/strive#readme";
        description = "A client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strptime" = callPackage
@@ -168662,6 +168753,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "suffix-array" = callPackage
+    ({ mkDerivation, array, base, containers, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "suffix-array";
+       version = "0.3.0.0";
+       sha256 = "4109af4d3ae346c3984acf704ac3c3fb463cdca0a37ee35e7b698ef236e64794";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ array base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         array base containers tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/kadoban/suffix-array#readme";
+       description = "Simple and moderately efficient suffix array implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "suffixarray" = callPackage
     ({ mkDerivation, base, HUnit, vector }:
      mkDerivation {
@@ -169974,14 +170085,18 @@ self: {
      }:
      mkDerivation {
        pname = "synthesizer-midi";
-       version = "0.6.0.3";
-       sha256 = "e1b1597c54265661893b258ea2dccdb6e5776560fb78f47faa7704333af09434";
+       version = "0.6.0.4";
+       sha256 = "607da1d5dd809228f89a73fc7caa26f5f7b7c41da0c8fa928848610835c47ff5";
        libraryHaskellDepends = [
          array base containers data-accessor data-accessor-transformers
          deepseq event-list midi non-negative numeric-prelude sox
          storable-record storablevector synthesizer-core
          synthesizer-dimensional transformers utility-ht
        ];
+       testHaskellDepends = [
+         base event-list midi numeric-prelude storablevector
+         synthesizer-core transformers
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Render audio signals from MIDI files or realtime messages";
        license = "GPL";
@@ -170298,12 +170413,12 @@ self: {
     ({ mkDerivation, base, bytestring, network, transformers, unix }:
      mkDerivation {
        pname = "systemd";
-       version = "1.0.5";
-       sha256 = "6eda0e556aa555f031d82a075baed227c389a9f40df13c5a5632b94c6c5b4906";
+       version = "1.1.2";
+       sha256 = "59461920b66b4b63b055b08af464a6fd9ff529f64527dfb573f9396dadd39287";
        libraryHaskellDepends = [
          base bytestring network transformers unix
        ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base network unix ];
        homepage = "https://github.com/erebe/systemd";
        description = "Systemd facilities (Socket activation, Notify)";
        license = stdenv.lib.licenses.bsd3;
@@ -171022,6 +171137,27 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "tailfile-hinotify" = callPackage
+    ({ mkDerivation, async, base, bytestring, conceit, directory, foldl
+     , hinotify, pipes, process-streaming, streaming, streaming-eversion
+     , tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "tailfile-hinotify";
+       version = "1.0.0.2";
+       sha256 = "e63dab76d95842cef9b3b47c48cb0c2ee1fe0e5bb7bd73ff349a9c49a03aa43f";
+       libraryHaskellDepends = [
+         async base bytestring foldl hinotify pipes streaming
+         streaming-eversion
+       ];
+       testHaskellDepends = [
+         async base bytestring conceit directory foldl hinotify pipes
+         process-streaming streaming streaming-eversion tasty tasty-hunit
+       ];
+       description = "Tail files in Unix, using hinotify";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tak" = callPackage
     ({ mkDerivation, base, bytestring, hashable, hslogger, HUnit
      , matrix, network, parsec, random-shuffle, safe
@@ -171393,24 +171529,6 @@ self: {
      }) {};
 
   "tasty-ant-xml" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath
-     , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
-     , xml
-     }:
-     mkDerivation {
-       pname = "tasty-ant-xml";
-       version = "1.0.3";
-       sha256 = "34a55d29a962a24aa1d5150795a0cae7a4769950c7ecb7cc1facf3bb0b067562";
-       libraryHaskellDepends = [
-         base containers directory filepath generic-deriving ghc-prim mtl
-         stm tagged tasty transformers xml
-       ];
-       homepage = "http://github.com/ocharles/tasty-ant-xml";
-       description = "Render tasty output to XML for Jenkins";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-ant-xml_1_0_4" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
      , xml
@@ -171426,7 +171544,6 @@ self: {
        homepage = "http://github.com/ocharles/tasty-ant-xml";
        description = "Render tasty output to XML for Jenkins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-dejafu" = callPackage
@@ -171767,8 +171884,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-tap";
-       version = "0.0.3";
-       sha256 = "b65cde7c662dd1d204a4e8efb84c1210c1ed0571def12ccf3c59f3036f0bc0fc";
+       version = "0.0.4";
+       sha256 = "c85ee6356f7bcdf3756add5baca06d942656400c3e9765e5087229b53d2eff75";
        libraryHaskellDepends = [ base containers stm tasty ];
        testHaskellDepends = [
          base directory tasty tasty-golden tasty-hunit
@@ -172185,12 +172302,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "template-haskell_2_11_0_0" = callPackage
+  "template-haskell_2_11_1_0" = callPackage
     ({ mkDerivation, base, ghc-boot-th, pretty }:
      mkDerivation {
        pname = "template-haskell";
-       version = "2.11.0.0";
-       sha256 = "e7bddc18f980f6b8a589a2c4d5e6dd3e1d76e533321cb7ad22afb7242269f6d4";
+       version = "2.11.1.0";
+       sha256 = "5fb340b665fad764238a67b6dd04870a8c4b15e891a8d2d2cd37c5915a7b369c";
        libraryHaskellDepends = [ base ghc-boot-th pretty ];
        description = "Support library for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -172262,8 +172379,8 @@ self: {
     ({ mkDerivation, base, mtl, tagsoup, uniplate }:
      mkDerivation {
        pname = "templateify";
-       version = "0.1.0.0";
-       sha256 = "ccbb2c48f9d7a6f1f3df3d00e807416bb8b7fe62fb298fb6cb9d0bb5a043d269";
+       version = "0.1.0.1";
+       sha256 = "0dc8b3a5bf54dbcba6740f9338c49c8c211b13cee16ef7cd1803edb2f4220321";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl tagsoup uniplate ];
@@ -173742,21 +173859,6 @@ self: {
      }) {};
 
   "text-postgresql" = callPackage
-    ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple
-     , transformers
-     }:
-     mkDerivation {
-       pname = "text-postgresql";
-       version = "0.0.2.1";
-       sha256 = "10f83683108faa8a704f649bb10ab1962f926b0ac4e481922764cc87bb92f2f6";
-       libraryHaskellDepends = [ base dlist transformers ];
-       testHaskellDepends = [ base QuickCheck quickcheck-simple ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Parser and Printer of PostgreSQL extended types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-postgresql_0_0_2_2" = callPackage
     ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple
      , transformers, transformers-compat
      }:
@@ -173771,7 +173873,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Parser and Printer of PostgreSQL extended types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-printer" = callPackage
@@ -174403,6 +174504,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-expand-syns_0_4_2_0" = callPackage
+    ({ mkDerivation, base, containers, syb, template-haskell }:
+     mkDerivation {
+       pname = "th-expand-syns";
+       version = "0.4.2.0";
+       sha256 = "66fed79828e9a13375f0f801f5ecc3763186667228ad91e19919219ff1654db9";
+       libraryHaskellDepends = [ base containers syb template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
+       homepage = "https://github.com/DanielSchuessler/th-expand-syns";
+       description = "Expands type synonyms in Template Haskell ASTs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-extras" = callPackage
     ({ mkDerivation, base, syb, template-haskell }:
      mkDerivation {
@@ -174810,8 +174925,8 @@ self: {
        pname = "these";
        version = "0.7.3";
        sha256 = "14339c111ec2caffcb2a9f64164a5dc307a0afb716925ddcb1774d9d442a3d9b";
-       revision = "1";
-       editedCabalFile = "d351c189525daded1e727f4a705f568d019238c9a4dd60e0277be462f49bede2";
+       revision = "2";
+       editedCabalFile = "12ec949fc6530adb5b534e773a786d467f59e8087480d5b50a298894aec96e2b";
        libraryHaskellDepends = [
          aeson base bifunctors binary containers data-default-class deepseq
          hashable keys mtl profunctors QuickCheck semigroupoids transformers
@@ -175237,6 +175352,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk; webkit2gtk = null;};
 
+  "tibetan-utils" = callPackage
+    ({ mkDerivation, base, composition, either, hspec, hspec-megaparsec
+     , megaparsec, text, text-show
+     }:
+     mkDerivation {
+       pname = "tibetan-utils";
+       version = "0.1.0.2";
+       sha256 = "6afa74aaef0d2fa8ae42f840ab19100f747abc8ddef5e1ffd1186f0a0035182c";
+       libraryHaskellDepends = [
+         base composition either megaparsec text text-show
+       ];
+       testHaskellDepends = [
+         base hspec hspec-megaparsec megaparsec text
+       ];
+       homepage = "https://github.com/vmchale/tibetan-utils#readme";
+       description = "Parse and display tibetan numerals";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tic-tac-toe" = callPackage
     ({ mkDerivation, base, glade, gtk, haskell98 }:
      mkDerivation {
@@ -175667,8 +175801,8 @@ self: {
     ({ mkDerivation, base, intervals, time }:
      mkDerivation {
        pname = "time-patterns";
-       version = "0.1.4.1";
-       sha256 = "5114525b97e376303540feea7b7d780d6c13d558d130a8d95d8577db5e004f41";
+       version = "0.1.4.2";
+       sha256 = "542b04487ef986e921888b3f6df73f154ed501c00cd7c12e0b623693e90505f6";
        libraryHaskellDepends = [ base intervals time ];
        homepage = "https://github.com/j-mueller/time-patterns";
        description = "Patterns for recurring events";
@@ -175810,8 +175944,7 @@ self: {
        description = "Distributed systems execution emulation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {log-warper = null;};
+     }) {};
 
   "timecalc" = callPackage
     ({ mkDerivation, base, haskeline, uu-parsinglib }:
@@ -175831,8 +175964,8 @@ self: {
     ({ mkDerivation, base, process, time }:
      mkDerivation {
        pname = "timeconsole";
-       version = "0.1.0.1";
-       sha256 = "519f2c90f2ee0b8d58f26fa67fecb83dc77002ed1ea94007b5c256155e9ff022";
+       version = "0.1.0.3";
+       sha256 = "472e1640c0ee395e3a5d3fed81ddb54ede94123ee38d8330fdb6387768c20ac0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process time ];
@@ -176255,6 +176388,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tinyXml" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , hexml, mtl, optparse-generic, primitive, process, vector
+     }:
+     mkDerivation {
+       pname = "tinyXml";
+       version = "0.1.0.2";
+       sha256 = "a80c87a31010902e209d8738584bf1261ceda26f45dec5f42b239c599dcf9336";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers mtl primitive vector
+       ];
+       executableHaskellDepends = [
+         base bytestring directory filepath mtl optparse-generic
+       ];
+       testHaskellDepends = [
+         base bytestring containers filepath hexml mtl primitive process
+         vector
+       ];
+       description = "A fast DOM parser for a subset of XML";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tinylog" = callPackage
     ({ mkDerivation, base, bytestring, containers, double-conversion
      , fast-logger, text, transformers, unix-time
@@ -178462,7 +178619,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "turtle_1_3_0" = callPackage
+  "turtle_1_3_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , directory, doctest, foldl, hostname, managed, optional-args
      , optparse-applicative, process, stm, system-fileio
@@ -178471,8 +178628,8 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.3.0";
-       sha256 = "6004c179342c8b341f804046584d1ff6630483af5053d74603877df8d1699a47";
+       version = "1.3.1";
+       sha256 = "233d05f8d73d171278be765872d623e56f1d795234a94d33a57f1bcca98edd5e";
        libraryHaskellDepends = [
          ansi-wl-pprint async base bytestring clock directory foldl hostname
          managed optional-args optparse-applicative process stm
@@ -180073,6 +180230,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ua-parser_0_7_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, file-embed
+     , filepath, HUnit, pcre-light, tasty, tasty-hunit, tasty-quickcheck
+     , text, yaml
+     }:
+     mkDerivation {
+       pname = "ua-parser";
+       version = "0.7.3";
+       sha256 = "bdb23301552c6e429765ea503d1ec598eec3cdfd15732b34745b08e7bcce7a10";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default file-embed pcre-light text yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring data-default file-embed filepath HUnit
+         pcre-light tasty tasty-hunit tasty-quickcheck text yaml
+       ];
+       description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uacpid" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, hslogger
      , mtl, network, process, regex-compat, time, time-locale-compat
@@ -180862,6 +181040,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unidecode" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "unidecode";
+       version = "0.1.0.4";
+       sha256 = "3fcb3da74a14a2718be8144068feaec0a426bdf7296e91935fce48d8ee0e12e9";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/mwotton/unidecode#readme";
+       description = "Haskell binding of Unidecode";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unification-fd" = callPackage
     ({ mkDerivation, base, containers, logict, mtl }:
      mkDerivation {
@@ -181272,6 +181463,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "universum" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, deepseq
+     , exceptions, ghc-prim, hashable, mtl, safe, stm, text, text-format
+     , transformers, unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "universum";
+       version = "0.1.12";
+       sha256 = "7826471999166223a737b5b265c489e35c208a6bb48cc8be6edf3543c147f021";
+       libraryHaskellDepends = [
+         async base bytestring containers deepseq exceptions ghc-prim
+         hashable mtl safe stm text text-format transformers
+         unordered-containers utf8-string
+       ];
+       homepage = "https://github.com/serokell/universum";
+       description = "Custom prelude used in Serokell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "unix_2_7_2_1" = callPackage
     ({ mkDerivation, base, bytestring, time }:
      mkDerivation {
@@ -181305,6 +181515,8 @@ self: {
        pname = "unix-compat";
        version = "0.4.3.1";
        sha256 = "72801d5a654a6e108c153f412ebd54c37fb445643770e0b97701a59e109f7e27";
+       revision = "1";
+       editedCabalFile = "6c1914a5322b96837ac47296bf0ce287ce9c89cc131f844483f5d9784e36910a";
        libraryHaskellDepends = [ base unix ];
        homepage = "http://github.com/jystic/unix-compat";
        description = "Portable POSIX-compatibility layer";
@@ -181484,25 +181696,6 @@ self: {
      }) {};
 
   "unordered-containers" = callPackage
-    ({ mkDerivation, base, ChasingBottoms, containers, deepseq
-     , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "unordered-containers";
-       version = "0.2.7.1";
-       sha256 = "2f9277f1d61c409775835f094c031fbb5462dd564d639f4f1357ee086fc4d702";
-       libraryHaskellDepends = [ base deepseq hashable ];
-       testHaskellDepends = [
-         base ChasingBottoms containers hashable HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       homepage = "https://github.com/tibbe/unordered-containers";
-       description = "Efficient hashing-based container types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unordered-containers_0_2_7_2" = callPackage
     ({ mkDerivation, base, ChasingBottoms, containers, deepseq
      , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -181519,7 +181712,6 @@ self: {
        homepage = "https://github.com/tibbe/unordered-containers";
        description = "Efficient hashing-based container types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unordered-containers-rematch" = callPackage
@@ -181695,8 +181887,8 @@ self: {
      }:
      mkDerivation {
        pname = "unused";
-       version = "0.6.1.1";
-       sha256 = "4a88183dd96bd9e4285e93e0592608666e15b537403799cecd7f963d54623f60";
+       version = "0.7.0.0";
+       sha256 = "4eee152fd54f52f1c1ff7b12ff8fa78b0d2c84def118f7be2fa51a0c3d70c68b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182235,6 +182427,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "userid_0_1_2_8" = callPackage
+    ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "userid";
+       version = "0.1.2.8";
+       sha256 = "b0b2718880dacfefbd7ded80e4fcd1d016a51e5ec638200b6cd5552f4f102124";
+       libraryHaskellDepends = [
+         aeson base boomerang safecopy web-routes web-routes-th
+       ];
+       homepage = "http://www.github.com/Happstack/userid";
+       description = "The UserId type and useful instances for web development";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "users" = callPackage
     ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }:
      mkDerivation {
@@ -182883,6 +183092,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "vado_0_0_8" = callPackage
+    ({ mkDerivation, attoparsec, base, directory, filepath, process
+     , QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "vado";
+       version = "0.0.8";
+       sha256 = "bb085062b807c08adc3bed2c0e736d4f888bd15a85e1d3d2babf4e6e25acc256";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base directory filepath process text
+       ];
+       executableHaskellDepends = [
+         attoparsec base directory filepath process text
+       ];
+       testHaskellDepends = [
+         attoparsec base directory filepath process QuickCheck text
+       ];
+       homepage = "https://github.com/hamishmack/vado";
+       description = "Runs commands on remote machines using ssh";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "valid-names" = callPackage
     ({ mkDerivation, base, containers, MonadRandom }:
      mkDerivation {
@@ -183334,8 +183568,8 @@ self: {
      }:
      mkDerivation {
        pname = "vcsgui";
-       version = "0.2.1.0";
-       sha256 = "ef43f033ca5ad099a48890bc0b29a881b846e94e0fad833d65091027243836b8";
+       version = "0.2.1.1";
+       sha256 = "76fa0af1c68195097059ea05e3bf7337dd94590d5f6d10109b33a2def474176b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183375,6 +183609,30 @@ self: {
        license = "GPL";
      }) {};
 
+  "vcswrapper_0_1_5" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, hxt, mtl
+     , parsec, process, split, text
+     }:
+     mkDerivation {
+       pname = "vcswrapper";
+       version = "0.1.5";
+       sha256 = "56584523ecd4c40a58345e0fcfc66a8aba4cfcdf49c8b1269d767f3b82b1f17b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath hxt mtl parsec process split
+         text
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath hxt mtl parsec process split
+         text
+       ];
+       homepage = "https://github.com/forste/haskellVCSWrapper";
+       description = "Wrapper for source code management systems";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vect" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -183490,6 +183748,8 @@ self: {
        pname = "vector-algorithms";
        version = "0.7.0.1";
        sha256 = "ed460a41ca068f568bc2027579ab14185fbb72c7ac469b5179ae5f8a52719070";
+       revision = "1";
+       editedCabalFile = "82d67db49c85c1e136b6e6e44f99c908b405628a17b0d220c95aed34845426a5";
        libraryHaskellDepends = [ base bytestring primitive vector ];
        testHaskellDepends = [
          base bytestring containers QuickCheck vector
@@ -183891,8 +184151,8 @@ self: {
      }:
      mkDerivation {
        pname = "vectortiles";
-       version = "1.2.0";
-       sha256 = "c8876068442349178a8626608b777f707cbe9dc7dc465b250b6e303de4c654ae";
+       version = "1.2.0.1";
+       sha256 = "fb034cb99c10f61ff0d2d7454b51d0e5996c5443a652e436490313d7a064401d";
        libraryHaskellDepends = [
          base bytestring cereal containers deepseq protobuf text th-printf
          transformers vector
@@ -183905,17 +184165,16 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "vectortiles_1_2_0_1" = callPackage
+  "vectortiles_1_2_0_2" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, deepseq, hex
-     , protobuf, tasty, tasty-hunit, text, th-printf, transformers
-     , vector
+     , protobuf, tasty, tasty-hunit, text, transformers, vector
      }:
      mkDerivation {
        pname = "vectortiles";
-       version = "1.2.0.1";
-       sha256 = "fb034cb99c10f61ff0d2d7454b51d0e5996c5443a652e436490313d7a064401d";
+       version = "1.2.0.2";
+       sha256 = "9540f0b55c63ae9185a7e2e264a4f10a5fbd0e682e3ecad33e52245d5e32a886";
        libraryHaskellDepends = [
-         base bytestring cereal containers deepseq protobuf text th-printf
+         base bytestring cereal containers deepseq protobuf text
          transformers vector
        ];
        testHaskellDepends = [
@@ -184020,24 +184279,26 @@ self: {
      }) {};
 
   "vgrep" = callPackage
-    ({ mkDerivation, async, attoparsec, base, cabal-file-th, containers
-     , directory, doctest, fingertree, lens, lifted-base, mmorph, mtl
-     , pipes, pipes-concurrency, process, QuickCheck, stm, tasty
-     , tasty-quickcheck, text, transformers, unix, vty
+    ({ mkDerivation, aeson, async, attoparsec, base, cabal-file-th
+     , containers, directory, doctest, fingertree, generic-deriving
+     , lens, lifted-base, mmorph, mtl, pipes, pipes-concurrency, process
+     , QuickCheck, stm, tasty, tasty-quickcheck, template-haskell, text
+     , transformers, unix, vty, yaml
      }:
      mkDerivation {
        pname = "vgrep";
-       version = "0.1.4.1";
-       sha256 = "5362e0a156df7e01be495da161d63d62e9e31d82e8290ca2d1b02c5ec9c24cd9";
+       version = "0.2.0.0";
+       sha256 = "2b53c200e872d253c1195e93ed8362111461d621759a15562f9fd06d333c2d33";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         async attoparsec base containers fingertree lens lifted-base mmorph
-         mtl pipes pipes-concurrency process stm text transformers unix vty
+         aeson async attoparsec base containers directory fingertree
+         generic-deriving lens lifted-base mmorph mtl pipes
+         pipes-concurrency process stm text transformers unix vty yaml
        ];
        executableHaskellDepends = [
          async base cabal-file-th containers directory lens mtl pipes
-         pipes-concurrency process text unix vty
+         pipes-concurrency process template-haskell text vty
        ];
        testHaskellDepends = [
          base containers doctest lens QuickCheck tasty tasty-quickcheck text
@@ -185853,22 +186114,6 @@ self: {
      }) {};
 
   "wai-request-spec" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , http-types, text, wai
-     }:
-     mkDerivation {
-       pname = "wai-request-spec";
-       version = "0.10.2.1";
-       sha256 = "48b04912b04bb045c6e103adea8f20c50af7705e802e706b9c67249ee6a5f57b";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers http-types text wai
-       ];
-       homepage = "https://gitlab.com/cpp.cabrera/wai-request-spec";
-       description = "Declarative request parsing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-request-spec_0_10_2_4" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-types, text, wai
      }:
@@ -185882,7 +186127,6 @@ self: {
        homepage = "https://gitlab.com/queertypes/wai-request-spec";
        description = "Declarative request parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-responsible" = callPackage
@@ -186922,8 +187166,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.5.1.0";
-       sha256 = "57eb367f392f1c7ed230cb151b6a7ac8fda44e11075bbd39407e9c34125947ee";
+       version = "0.5.2.0";
+       sha256 = "cabc70b3db50df42644d0806def72838b5d7f20bcc6ddefec48e42acda417c4e";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring cryptonite
          http-client http-client-tls memory template-haskell text
@@ -187952,6 +188196,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wiringPi" = callPackage
+    ({ mkDerivation, base, wiringPi }:
+     mkDerivation {
+       pname = "wiringPi";
+       version = "0.1.0.0";
+       sha256 = "b38a690d3c0e05c892a04f212dcf729f784fb6f05e4ecff2933cd969da04b23f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ wiringPi ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/ppelleti/hs-wiringPi";
+       description = "Access GPIO pins on Raspberry Pi via wiringPi library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {wiringPi = null;};
+
   "with-location" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
@@ -188272,8 +188532,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.6";
-       sha256 = "0be99a2ae98daaf9f2d499dd3f360a79e258c97874d81a3f32d97da17dce64fa";
+       version = "0.3.7";
+       sha256 = "6ecd4a1430d63568683fd3d9282cf778e94b27f2d076de67f5853aa5eacb007e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -188698,6 +188958,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wreq-stringless" = callPackage
+    ({ mkDerivation, base, bytestring, text, utf8-string, wreq }:
+     mkDerivation {
+       pname = "wreq-stringless";
+       version = "0.4.1.0";
+       sha256 = "f2d80a50007a7f9666d67a3cfe15b8b459c53945c6b1add310d0733246fe41e2";
+       libraryHaskellDepends = [ base bytestring text utf8-string wreq ];
+       homepage = "https://github.com/j-keck/wreq-stringless#readme";
+       description = "Simple wrapper to use wreq without Strings";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "wright" = callPackage
     ({ mkDerivation, assertions, base, bed-and-breakfast, containers
      , filepath, lens
@@ -189822,20 +190094,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "xlsx-tabular_0_2_0" = callPackage
+  "xlsx-tabular_0_2_1_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , lens, text, xlsx
      }:
      mkDerivation {
        pname = "xlsx-tabular";
-       version = "0.2.0";
-       sha256 = "95ee0e839d58131a296580fdb73884a208ed017c9b1bfbda1ad05227ec54db77";
+       version = "0.2.1.1";
+       sha256 = "17e6c4c6a91bed2648356da244b5d664681c97929462dada5d7fcf834b07fd06";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default lens text xlsx
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/kkazuo/xlsx-tabular#readme";
-       description = "Xlsx table decode utility";
+       homepage = "https://github.com/kkazuo/xlsx-tabular";
+       description = "Xlsx table cell value extraction utility";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -190107,10 +190379,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-html-conduit-lens";
-       version = "0.3.2.1";
-       sha256 = "22dcbfe4e70a87dcc6d477c9e1c3c51cb1317b4799e42efc6c3d9a55b045c547";
-       revision = "2";
-       editedCabalFile = "6c3305bb07c0fd40c933640ebe9e6114a798115cfb2f3cb976e40f1ece955132";
+       version = "0.3.2.2";
+       sha256 = "bf2b242411168e2287d2189e8c74c4c3751afac03003a852ee6068ce7cc643ac";
        libraryHaskellDepends = [
          base bytestring containers html-conduit lens text xml-conduit
        ];
@@ -191043,10 +191313,8 @@ self: {
      }:
      mkDerivation {
        pname = "xxhash";
-       version = "0.0.1";
-       sha256 = "b645bff86157f46c8a1194c59bcaa6c182ded708c66a290d50041831f7dc3533";
-       revision = "1";
-       editedCabalFile = "1d641797e9e431c6152dc41cbe72551bb2f91cec8265d3a5e3b2b9718764d274";
+       version = "0.0.2";
+       sha256 = "4f5cc71564d71b7ab1e9f70ce9b8d32a3d73cb0b1e08ff96bc54298b21eb2f27";
        libraryHaskellDepends = [ base bytestring crypto-api tagged ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "A Haskell implementation of the xxHash algorithm";
@@ -191725,32 +191993,6 @@ self: {
      }) {};
 
   "yesod" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , conduit, conduit-extra, data-default, directory, fast-logger
-     , monad-control, monad-logger, resourcet, safe, semigroups
-     , shakespeare, streaming-commons, template-haskell, text
-     , transformers, unix, unordered-containers, wai, wai-extra
-     , wai-logger, warp, yaml, yesod-auth, yesod-core, yesod-form
-     , yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod";
-       version = "1.4.3.1";
-       sha256 = "8ad23252817780afc10aee5cf1bd862b3cf46e08aabb884477e874caa351ab21";
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring conduit conduit-extra
-         data-default directory fast-logger monad-control monad-logger
-         resourcet safe semigroups shakespeare streaming-commons
-         template-haskell text transformers unix unordered-containers wai
-         wai-extra wai-logger warp yaml yesod-auth yesod-core yesod-form
-         yesod-persistent
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod_1_4_4" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , conduit, conduit-extra, data-default-class, directory
      , fast-logger, monad-control, monad-logger, resourcet, semigroups
@@ -191772,7 +192014,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-angular" = callPackage
@@ -192379,6 +192620,8 @@ self: {
        pname = "yesod-core";
        version = "1.4.30";
        sha256 = "1136dbf0beacbb7ea18b73616e059aa85ec5fbbf0ecae88e7ff3ac8eb685f654";
+       revision = "1";
+       editedCabalFile = "34f11a73eab3b105720ffa017f48217bc3dc383347e36b7584e137e0462bd181";
        libraryHaskellDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          byteable bytestring case-insensitive cereal clientsession conduit
@@ -192905,16 +193148,19 @@ self: {
      }) {};
 
   "yesod-paginator" = callPackage
-    ({ mkDerivation, base, persistent, resourcet, text, transformers
-     , yesod
+    ({ mkDerivation, base, data-default, hspec, persistent, resourcet
+     , text, transformers, wai-extra, yesod, yesod-core, yesod-test
      }:
      mkDerivation {
        pname = "yesod-paginator";
-       version = "0.10.0";
-       sha256 = "d5316cc72b8c59fc5cac5b4b31deb4597d3ea9c86a5e58b914d38e07ca34af65";
+       version = "0.10.1";
+       sha256 = "06dd2e4ffb031176e3e9538f5ed5051e4e188ad803b8071bbc69a95e59d576c3";
        libraryHaskellDepends = [
          base persistent resourcet text transformers yesod
        ];
+       testHaskellDepends = [
+         base data-default hspec wai-extra yesod-core yesod-test
+       ];
        homepage = "http://github.com/pbrisbin/yesod-paginator";
        description = "A pagination approach for yesod";
        license = stdenv.lib.licenses.bsd3;
@@ -192935,28 +193181,6 @@ self: {
      }) {};
 
   "yesod-persistent" = callPackage
-    ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
-     , persistent-sqlite, persistent-template, resource-pool, resourcet
-     , text, transformers, wai-extra, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-persistent";
-       version = "1.4.1.0";
-       sha256 = "98f422757210b30b2bd0d75828408a9fb1d67fa81e02ec304848c1922da4e91c";
-       libraryHaskellDepends = [
-         base blaze-builder conduit persistent persistent-template
-         resource-pool resourcet transformers yesod-core
-       ];
-       testHaskellDepends = [
-         base blaze-builder conduit hspec persistent persistent-sqlite text
-         wai-extra yesod-core
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Some helpers for using Persistent from Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-persistent_1_4_1_1" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
      , persistent-sqlite, persistent-template, resource-pool, resourcet
      , text, transformers, wai-extra, yesod-core
@@ -192976,7 +193200,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-platform" = callPackage
@@ -194838,30 +195061,6 @@ self: {
      }) {};
 
   "zip" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
-     , cereal, conduit, conduit-extra, containers, digest, exceptions
-     , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck
-     , resourcet, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "zip";
-       version = "0.1.4";
-       sha256 = "073c9f8320ed16048d099fbec10c42a76ae0bcbd13e344fd0ca99f3a6716db78";
-       libraryHaskellDepends = [
-         base bytestring bzlib-conduit case-insensitive cereal conduit
-         conduit-extra containers digest exceptions filepath mtl path
-         path-io plan-b resourcet text time transformers
-       ];
-       testHaskellDepends = [
-         base bytestring conduit containers exceptions filepath hspec path
-         path-io QuickCheck text time transformers
-       ];
-       homepage = "https://github.com/mrkkrp/zip";
-       description = "Operations on zip archives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "zip_0_1_5" = callPackage
     ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
      , cereal, conduit, conduit-extra, containers, digest, exceptions
      , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck
@@ -194883,7 +195082,6 @@ self: {
        homepage = "https://github.com/mrkkrp/zip";
        description = "Operations on zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zip-archive" = callPackage

From bdad3a69fe52d42d67debac47548df7f24480cc9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Jan 2017 13:37:12 +0100
Subject: [PATCH 186/727] jailbreak-cabal: fix reference in ghc-HEAD overrides

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index c6fcf0bff07..f093c0e427e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -35,7 +35,7 @@ self: super: {
   xhtml = null;
 
   # jailbreak-cabal can use the native Cabal library.
-  jailbreak-cabal = super.jailbreak-cabal_1_3_2.override { Cabal = null; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 
   # haddock: No input file(s).
   nats = dontHaddock super.nats;

From 4171ba5ecc9b90d50d1196de10c14836221a6036 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 9 Jan 2017 19:42:18 -0500
Subject: [PATCH 187/727] git-annex: Remove versioned yesod-persistent override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 701410d57e9..ad6320a052c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -60,8 +60,6 @@ self: super: {
   })).overrideScope (self: super: {
     # https://github.com/bitemyapp/esqueleto/issues/8
     esqueleto = self.esqueleto_2_4_3;
-    # https://github.com/yesodweb/yesod/issues/1324
-    yesod-persistent = self.yesod-persistent_1_4_1_1;
     # https://github.com/prowdsponsor/esqueleto/issues/137
     persistent = self.persistent_2_2_4_1;
     persistent-template = self.persistent-template_2_1_8_1;

From 5928e6d598b617bb21b7a844a416f03e9ac416ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Jan 2017 13:27:52 +0100
Subject: [PATCH 188/727] stack: update reference for http-client-tls to
 version 0.3.3.1

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ad6320a052c..c3c943eb205 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1001,7 +1001,7 @@ self: super: {
   # The most current version needs some packages to build that are not in LTS 7.x.
   stack = super.stack.overrideScope (self: super: {
     http-client = self.http-client_0_5_5;
-    http-client-tls = self.http-client-tls_0_3_3;
+    http-client-tls = self.http-client-tls_0_3_3_1;
     http-conduit = self.http-conduit_2_2_3;
     optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;
     criterion = super.criterion.override { inherit (super) optparse-applicative; };
@@ -1108,7 +1108,7 @@ self: super: {
   # https://github.com/NixOS/nixpkgs/issues/19612
   wai-app-file-cgi = (dontCheck super.wai-app-file-cgi).overrideScope (self: super: {
     http-client = self.http-client_0_5_5;
-    http-client-tls = self.http-client-tls_0_3_3;
+    http-client-tls = self.http-client-tls_0_3_3_1;
     http-conduit = self.http-conduit_2_2_3;
   });
 

From 6e079bdd6014acfd91319ee2e22d1183317131c3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 15 Jan 2017 17:06:39 +0100
Subject: [PATCH 189/727] gitlab: 8.13.5 -> 8.15.4

---
 .../gitlab-shell/default.nix                  |   4 +-
 .../gitlab-workhorse/default.nix              |   4 +-
 .../version-management/gitlab/Gemfile         |  60 +--
 .../version-management/gitlab/Gemfile.lock    | 254 +++++-----
 .../version-management/gitlab/default.nix     |   4 +-
 .../version-management/gitlab/gemset.nix      | 440 +++++++++++-------
 .../gitlab/nulladapter.patch                  |  10 +-
 7 files changed, 470 insertions(+), 306 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index 3bcf8cd4e1b..a67ca4acfb6 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,14 +1,14 @@
 { stdenv, ruby, bundler, fetchFromGitLab }:
 
 stdenv.mkDerivation rec {
-  version = "3.6.6";
+  version = "4.1.1";
   name = "gitlab-shell-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    sha256 = "1dg9ldsyly2r3amkl0d96m084az360b7nz9rhhf61x06d4z09xif";
+    sha256 = "1i7dqs0csqcjwkvg8csz5f1zxy1inrzxzz3g9j618aldqxzjfgnr";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index 54be33beff5..4cbec62b2f9 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitLab, git, go }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.5";
+  version = "1.2.1";
   name = "gitlab-workhorse-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "0q6kd59sb5wm63r8zdvbkn4j6fk2n743pjhkbmg4rzngvjivxqzr";
+    sha256 = "1z4iyymld3pssf1dwar0hy6c5hii79gk4k59mqj0mgy2k73405y0";
   };
 
   buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index ef131cb719a..8edb08638dd 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -22,17 +22,17 @@ gem 'doorkeeper',             '~> 4.2.0'
 gem 'omniauth',               '~> 1.3.1'
 gem 'omniauth-auth0',         '~> 1.4.1'
 gem 'omniauth-azure-oauth2',  '~> 0.0.6'
-gem 'omniauth-bitbucket',     '~> 0.0.2'
 gem 'omniauth-cas3',          '~> 1.1.2'
 gem 'omniauth-facebook',      '~> 4.0.0'
 gem 'omniauth-github',        '~> 1.1.1'
-gem 'omniauth-gitlab',        '~> 1.0.0'
+gem 'omniauth-gitlab',        '~> 1.0.2'
 gem 'omniauth-google-oauth2', '~> 0.4.1'
 gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
 gem 'omniauth-saml',          '~> 1.7.0'
 gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
 gem 'omniauth_crowd',         '~> 2.2.0'
+gem 'omniauth-authentiq',     '~> 0.2.0'
 gem 'rack-oauth2',            '~> 1.2.1'
 gem 'jwt'
 
@@ -67,8 +67,8 @@ gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
 gem 'github-linguist', '~> 4.7.0', require: 'linguist'
 
 # API
-gem 'grape',        '~> 0.15.0'
-gem 'grape-entity', '~> 0.4.2'
+gem 'grape',        '~> 0.18.0'
+gem 'grape-entity', '~> 0.6.0'
 gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
 
 # Pagination
@@ -85,13 +85,15 @@ gem 'dropzonejs-rails', '~> 0.7.1'
 
 # for backups
 gem 'fog-aws', '~> 0.9'
-gem 'fog-azure', '~> 0.0'
 gem 'fog-core', '~> 1.40'
+gem 'fog-google', '~> 0.5'
 gem 'fog-local', '~> 0.3'
-gem 'fog-google', '~> 0.3'
 gem 'fog-openstack', '~> 0.1'
 gem 'fog-rackspace', '~> 0.1.1'
 
+# for Google storage
+gem 'google-api-client', '~> 0.8.6'
+
 # for aws storage
 gem 'unf', '~> 0.1.4'
 
@@ -100,11 +102,11 @@ gem 'seed-fu', '~> 2.3.5'
 
 # Markdown and HTML processing
 gem 'html-pipeline',      '~> 1.11.0'
-gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie'
-gem 'gitlab-markup',      '~> 1.5.0'
+gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie'
+gem 'gitlab-markup',      '~> 1.5.1'
 gem 'redcarpet',          '~> 3.3.3'
 gem 'RedCloth',           '~> 4.3.2'
-gem 'rdoc',               '~>3.6'
+gem 'rdoc',               '~> 4.2'
 gem 'org-ruby',           '~> 0.9.12'
 gem 'creole',             '~> 0.5.0'
 gem 'wikicloth',          '0.8.1'
@@ -117,7 +119,7 @@ gem 'truncato',           '~> 0.7.8'
 gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2', '< 1.6.8'
 
 # Diffs
-gem 'diffy', '~> 3.0.3'
+gem 'diffy', '~> 3.1.0'
 
 # Application server
 group :unicorn do
@@ -134,9 +136,10 @@ gem 'after_commit_queue', '~> 1.3.0'
 gem 'acts-as-taggable-on', '~> 4.0'
 
 # Background jobs
-gem 'sidekiq', '~> 4.2'
-gem 'sidekiq-cron', '~> 0.4.0'
+gem 'sidekiq', '~> 4.2.7'
+gem 'sidekiq-cron', '~> 0.4.4'
 gem 'redis-namespace', '~> 1.5.2'
+gem 'sidekiq-limit_fetch', '~> 3.4'
 
 # HTTP requests
 gem 'httparty', '~> 0.13.3'
@@ -152,7 +155,7 @@ gem 'settingslogic', '~> 2.0.9'
 gem 'version_sorter', '~> 2.1.0'
 
 # Cache
-gem 'redis-rails', '~> 4.0.0'
+gem 'redis-rails', '~> 5.0.1'
 
 # Redis
 gem 'redis', '~> 3.2'
@@ -161,6 +164,9 @@ gem 'connection_pool', '~> 2.0'
 # HipChat integration
 gem 'hipchat', '~> 1.5.0'
 
+# JIRA integration
+gem 'jira-ruby', '~> 1.1.2'
+
 # Flowdock integration
 gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
 
@@ -168,7 +174,7 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
 gem 'gemnasium-gitlab-service', '~> 0.2'
 
 # Slack integration
-gem 'slack-notifier', '~> 1.2.0'
+gem 'slack-notifier', '~> 1.5.1'
 
 # Asana integration
 gem 'asana', '~> 0.4.0'
@@ -176,6 +182,9 @@ gem 'asana', '~> 0.4.0'
 # FogBugz integration
 gem 'ruby-fogbugz', '~> 0.2.1'
 
+# Kubernetes integration
+gem 'kubeclient', '~> 2.2.0'
+
 # d3
 gem 'd3_rails', '~> 3.5.0'
 
@@ -193,7 +202,7 @@ gem 'loofah', '~> 2.0.3'
 gem 'licensee', '~> 8.0.0'
 
 # Protect against bruteforcing
-gem 'rack-attack', '~> 4.3.1'
+gem 'rack-attack', '~> 4.4.1'
 
 # Ace editor
 gem 'ace-rails-ap', '~> 4.1.0'
@@ -214,8 +223,7 @@ gem 'chronic_duration', '~> 0.10.6'
 gem 'sass-rails', '~> 5.0.6'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'uglifier', '~> 2.7.2'
-gem 'turbolinks', '~> 2.5.0'
-gem 'jquery-turbolinks', '~> 2.1.0'
+gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6'
 
 gem 'addressable',        '~> 2.3.8'
 gem 'bootstrap-sass',     '~> 3.3.0'
@@ -257,22 +265,19 @@ group :development do
   gem 'better_errors', '~> 1.0.1'
   gem 'binding_of_caller', '~> 0.7.2'
 
-  # Docs generator
-  gem 'sdoc', '~> 0.3.20'
-
   # thin instead webrick
   gem 'thin', '~> 1.7.0'
 end
 
 group :development, :test do
-  gem 'byebug', '~> 8.2.1', platform: :mri
+  gem 'pry-byebug', '~> 3.4.1', platform: :mri
   gem 'pry-rails', '~> 0.3.4'
 
   gem 'awesome_print', '~> 1.2.0', require: false
   gem 'fuubar', '~> 2.0.0'
 
   gem 'database_cleaner',   '~> 1.5.0'
-  gem 'factory_girl_rails', '~> 4.6.0'
+  gem 'factory_girl_rails', '~> 4.7.0'
   gem 'rspec-rails',        '~> 3.5.0'
   gem 'rspec-retry',        '~> 0.4.5'
   gem 'spinach-rails',      '~> 0.2.1'
@@ -310,6 +315,8 @@ group :development, :test do
   gem 'knapsack', '~> 1.11.0'
 
   gem 'activerecord_sane_schema_dumper', '0.2'
+
+  gem 'stackprof', '~> 0.2.10'
 end
 
 group :test do
@@ -326,21 +333,18 @@ gem 'newrelic_rpm', '~> 3.16'
 
 gem 'octokit', '~> 4.3.0'
 
-gem 'mail_room', '~> 0.8.1'
+gem 'mail_room', '~> 0.9.0'
 
 gem 'email_reply_parser', '~> 0.5.8'
+gem 'html2text'
 
 gem 'ruby-prof', '~> 0.16.2'
 
-## CI
-gem 'activerecord-session_store', '~> 1.0.0'
-gem 'nested_form', '~> 0.3.2'
-
 # OAuth
 gem 'oauth2', '~> 1.2.0'
 
 # Soft deletion
-gem 'paranoia', '~> 2.0'
+gem 'paranoia', '~> 2.2'
 
 # Health check
 gem 'health_check', '~> 2.2.0'
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index b9501e68aae..211bdd20fd1 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -34,12 +34,6 @@ GEM
       arel (~> 6.0)
     activerecord-nulldb-adapter (0.3.3)
       activerecord (>= 2.0.0)
-    activerecord-session_store (1.0.0)
-      actionpack (>= 4.0, < 5.1)
-      activerecord (>= 4.0, < 5.1)
-      multi_json (~> 1.11, >= 1.11.2)
-      rack (>= 1.5.2, < 3)
-      railties (>= 4.0, < 5.1)
     activerecord_sane_schema_dumper (0.2)
       rails (>= 4, < 5)
     activesupport (4.2.7.1)
@@ -66,6 +60,10 @@ GEM
     attr_encrypted (3.0.3)
       encryptor (~> 3.0.0)
     attr_required (1.0.0)
+    autoparse (0.3.3)
+      addressable (>= 2.3.1)
+      extlib (>= 0.9.15)
+      multi_json (>= 1.0.0)
     autoprefixer-rails (6.2.3)
       execjs
       json
@@ -74,21 +72,6 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    azure (0.7.5)
-      addressable (~> 2.3)
-      azure-core (~> 0.1)
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.10)
-      json (~> 1.8)
-      mime-types (>= 1, < 3.0)
-      nokogiri (~> 1.6)
-      systemu (~> 2.6)
-      thor (~> 0.19)
-      uuid (~> 2.0)
-    azure-core (0.1.2)
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.10)
-      nokogiri (~> 1.6)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
@@ -114,7 +97,7 @@ GEM
     bundler-audit (0.5.0)
       bundler (~> 1.2)
       thor (~> 0.18)
-    byebug (8.2.1)
+    byebug (9.0.6)
     capybara (2.6.2)
       addressable
       mime-types (>= 1.16)
@@ -149,7 +132,7 @@ GEM
     coffee-script-source (1.10.0)
     colorize (0.7.7)
     concurrent-ruby (1.0.2)
-    connection_pool (2.2.0)
+    connection_pool (2.2.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     creole (0.5.0)
@@ -161,7 +144,7 @@ GEM
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
     debugger-ruby_core_source (1.3.8)
-    deckar01-task_list (1.0.5)
+    deckar01-task_list (1.0.6)
       activesupport (~> 4.0)
       html-pipeline
       rack (~> 1.0)
@@ -182,8 +165,10 @@ GEM
       railties
       rotp (~> 2.0)
     diff-lcs (1.2.5)
-    diffy (3.0.7)
+    diffy (3.1.0)
     docile (1.1.5)
+    domain_name (0.5.20161021)
+      unf (>= 0.0.5, < 1.0.0)
     doorkeeper (4.2.0)
       railties (>= 4.2)
     dropzonejs-rails (0.7.2)
@@ -200,10 +185,11 @@ GEM
     excon (0.52.0)
     execjs (2.6.0)
     expression_parser (0.9.0)
-    factory_girl (4.5.0)
+    extlib (0.9.16)
+    factory_girl (4.7.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.6.0)
-      factory_girl (~> 4.5.0)
+    factory_girl_rails (4.7.0)
+      factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -225,16 +211,11 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-azure (0.0.2)
-      azure (~> 0.6)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
     fog-core (1.42.0)
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
-    fog-google (0.3.2)
+    fog-google (0.5.0)
       fog-core
       fog-json
       fog-xml
@@ -284,7 +265,9 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16, < 3)
       posix-spawn (~> 0.3)
-    gitlab-markup (1.5.0)
+    gitlab-markup (1.5.1)
+    gitlab-turbolinks-classic (2.5.6)
+      coffee-rails
     gitlab_git (10.7.0)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.7.3)
@@ -314,17 +297,36 @@ GEM
       json
       multi_json
       request_store (>= 1.0)
-    grape (0.15.0)
+    google-api-client (0.8.7)
+      activesupport (>= 3.2, < 5.0)
+      addressable (~> 2.3)
+      autoparse (~> 0.3)
+      extlib (~> 0.9)
+      faraday (~> 0.9)
+      googleauth (~> 0.3)
+      launchy (~> 2.4)
+      multi_json (~> 1.10)
+      retriable (~> 1.4)
+      signet (~> 0.6)
+    googleauth (0.5.1)
+      faraday (~> 0.9)
+      jwt (~> 1.4)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
+    grape (0.18.0)
       activesupport
       builder
       hashie (>= 2.1.0)
       multi_json (>= 1.3.2)
       multi_xml (>= 0.5.2)
+      mustermann-grape (~> 0.4.0)
       rack (>= 1.3.0)
       rack-accept
-      rack-mount
       virtus (>= 1.0.0)
-    grape-entity (0.4.8)
+    grape-entity (0.6.0)
       activesupport
       multi_json (>= 1.3.2)
     haml (4.0.7)
@@ -347,7 +349,18 @@ GEM
     html-pipeline (1.11.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
+    html2text (0.2.0)
+      nokogiri (~> 1.6)
     htmlentities (4.3.4)
+    http (0.9.8)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 1.0.1)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (1.0.1)
+    http_parser.rb (0.6.0)
     httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
@@ -358,14 +371,14 @@ GEM
       cause
       json
     ipaddress (0.8.3)
+    jira-ruby (1.1.2)
+      activesupport
+      oauth (~> 0.5, >= 0.5.0)
     jquery-atwho-rails (1.3.2)
     jquery-rails (4.1.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-turbolinks (2.1.0)
-      railties (>= 3.1.0)
-      turbolinks
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     json (1.8.3)
@@ -379,6 +392,10 @@ GEM
     knapsack (1.11.0)
       rake
       timecop (>= 0.1.0)
+    kubeclient (2.2.0)
+      http (= 0.9.8)
+      recursive-open-struct (= 1.0.0)
+      rest-client
     launchy (2.4.3)
       addressable (~> 2.3)
     letter_opener (1.4.1)
@@ -398,13 +415,16 @@ GEM
     listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
+    little-plugger (1.1.4)
+    logging (2.1.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    macaddr (1.7.1)
-      systemu (~> 2.6.2)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    mail_room (0.8.1)
+    mail_room (0.9.0)
+    memoist (0.15.0)
     method_source (0.8.2)
     mime-types (2.99.3)
     mimemagic (0.3.0)
@@ -414,16 +434,20 @@ GEM
     multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
+    mustermann (0.4.0)
+      tool (~> 0.2)
+    mustermann-grape (0.4.0)
+      mustermann (= 0.4.0)
     mysql2 (0.3.20)
-    nested_form (0.3.2)
     net-ldap (0.12.1)
     net-ssh (3.0.1)
+    netrc (0.11.0)
     newrelic_rpm (3.16.0.318)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
     numerizer (0.1.1)
-    oauth (0.4.7)
+    oauth (0.5.1)
     oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
@@ -438,14 +462,12 @@ GEM
       rack (>= 1.0, < 3)
     omniauth-auth0 (1.4.1)
       omniauth-oauth2 (~> 1.1)
+    omniauth-authentiq (0.2.2)
+      omniauth-oauth2 (~> 1.3, >= 1.3.1)
     omniauth-azure-oauth2 (0.0.6)
       jwt (~> 1.0)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
-    omniauth-bitbucket (0.0.2)
-      multi_json (~> 1.7)
-      omniauth (~> 1.1)
-      omniauth-oauth (~> 1.0)
     omniauth-cas3 (1.1.3)
       addressable (~> 2.3)
       nokogiri (~> 1.6.6)
@@ -455,7 +477,7 @@ GEM
     omniauth-github (1.1.2)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
-    omniauth-gitlab (1.0.1)
+    omniauth-gitlab (1.0.2)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
     omniauth-google-oauth2 (0.4.1)
@@ -490,8 +512,9 @@ GEM
     org-ruby (0.9.12)
       rubypants (~> 0.2)
     orm_adapter (0.5.0)
-    paranoia (2.1.4)
-      activerecord (~> 4.0)
+    os (0.9.6)
+    paranoia (2.2.0)
+      activerecord (>= 4.0, < 5.1)
     parser (2.3.1.4)
       ast (~> 2.2)
     pg (0.18.4)
@@ -513,17 +536,18 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry-byebug (3.4.1)
+      byebug (~> 9.0)
+      pry (~> 0.10)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
     pyu-ruby-sasl (0.0.3.3)
-    rack (1.6.4)
+    rack (1.6.5)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-attack (4.3.1)
+    rack-attack (4.4.1)
       rack
     rack-cors (0.4.0)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-oauth2 (1.2.3)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
@@ -566,38 +590,44 @@ GEM
       ffi (>= 0.5.0)
     rblineprof (0.3.6)
       debugger-ruby_core_source (~> 1.3)
-    rdoc (3.12.2)
+    rdoc (4.2.2)
       json (~> 1.4)
     recaptcha (3.0.0)
       json
+    recursive-open-struct (1.0.0)
     redcarpet (3.3.3)
     redis (3.2.2)
-    redis-actionpack (4.0.1)
-      actionpack (~> 4)
-      redis-rack (~> 1.5.0)
-      redis-store (~> 1.1.0)
-    redis-activesupport (4.1.5)
-      activesupport (>= 3, < 5)
-      redis-store (~> 1.1.0)
+    redis-actionpack (5.0.1)
+      actionpack (>= 4.0, < 6)
+      redis-rack (>= 1, < 3)
+      redis-store (>= 1.1.0, < 1.4.0)
+    redis-activesupport (5.0.1)
+      activesupport (>= 3, < 6)
+      redis-store (~> 1.2.0)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
-    redis-rack (1.5.0)
+    redis-rack (1.6.0)
       rack (~> 1.5)
-      redis-store (~> 1.1.0)
-    redis-rails (4.0.0)
-      redis-actionpack (~> 4)
-      redis-activesupport (~> 4)
-      redis-store (~> 1.1.0)
-    redis-store (1.1.7)
+      redis-store (~> 1.2.0)
+    redis-rails (5.0.1)
+      redis-actionpack (~> 5.0.0)
+      redis-activesupport (~> 5.0.0)
+      redis-store (~> 1.2.0)
+    redis-store (1.2.0)
       redis (>= 2.2)
     request_store (1.3.1)
     rerun (0.11.0)
       listen (~> 3.0)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
+    rest-client (2.0.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    retriable (1.4.1)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (2.0.6)
+    rouge (2.0.7)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -662,9 +692,6 @@ GEM
     scss_lint (0.47.1)
       rake (>= 0.9, < 11)
       sass (~> 3.4.15)
-    sdoc (0.3.20)
-      json (>= 1.1.3)
-      rdoc (~> 3.10)
     seed-fu (2.3.6)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
@@ -678,21 +705,28 @@ GEM
       rack
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sidekiq (4.2.1)
+    sidekiq (4.2.7)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (~> 1.5)
+      rack-protection (>= 1.5.0)
       redis (~> 3.2, >= 3.2.1)
-    sidekiq-cron (0.4.0)
+    sidekiq-cron (0.4.4)
       redis-namespace (>= 1.5.2)
       rufus-scheduler (>= 2.0.24)
-      sidekiq (>= 4.0.0)
+      sidekiq (>= 4.2.1)
+    sidekiq-limit_fetch (3.4.0)
+      sidekiq (>= 4)
+    signet (0.7.3)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (~> 1.5)
+      multi_json (~> 1.10)
     simplecov (0.12.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    slack-notifier (1.2.1)
+    slack-notifier (1.5.1)
     slop (3.6.0)
     spinach (0.8.10)
       colorize
@@ -722,6 +756,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    stackprof (0.2.10)
     state_machines (0.4.0)
     state_machines-activemodel (0.4.0)
       activemodel (>= 4.1, < 5.1)
@@ -733,7 +768,6 @@ GEM
     sys-filesystem (1.1.6)
       ffi
     sysexits (1.2.0)
-    systemu (2.6.5)
     teaspoon (1.1.5)
       railties (>= 3.2.5, < 6)
     teaspoon-jasmine (2.2.0)
@@ -750,11 +784,10 @@ GEM
     tilt (2.0.5)
     timecop (0.8.1)
     timfel-krb5-auth (0.8.3)
+    tool (0.2.3)
     truncato (0.7.8)
       htmlentities (~> 4.3.1)
       nokogiri (~> 1.6.1)
-    turbolinks (2.5.3)
-      coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     u2f (0.2.1)
@@ -773,8 +806,6 @@ GEM
       get_process_mem (~> 0)
       unicorn (>= 4, < 6)
     uniform_notifier (1.10.0)
-    uuid (2.3.8)
-      macaddr (~> 1.0)
     version_sorter (2.1.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
@@ -810,7 +841,6 @@ DEPENDENCIES
   RedCloth (~> 4.3.2)
   ace-rails-ap (~> 4.1.0)
   activerecord-nulldb-adapter
-  activerecord-session_store (~> 1.0.0)
   activerecord_sane_schema_dumper (= 0.2)
   acts-as-taggable-on (~> 4.0)
   addressable (~> 2.3.8)
@@ -831,7 +861,6 @@ DEPENDENCIES
   browser (~> 2.2)
   bullet (~> 5.2.0)
   bundler-audit (~> 0.5.0)
-  byebug (~> 8.2.1)
   capybara (~> 2.6.2)
   capybara-screenshot (~> 1.0.0)
   carrierwave (~> 0.10.0)
@@ -843,22 +872,21 @@ DEPENDENCIES
   creole (~> 0.5.0)
   d3_rails (~> 3.5.0)
   database_cleaner (~> 1.5.0)
-  deckar01-task_list (= 1.0.5)
+  deckar01-task_list (= 1.0.6)
   default_value_for (~> 3.0.0)
   devise (~> 4.2)
   devise-two-factor (~> 3.0.0)
-  diffy (~> 3.0.3)
+  diffy (~> 3.1.0)
   doorkeeper (~> 4.2.0)
   dropzonejs-rails (~> 0.7.1)
   email_reply_parser (~> 0.5.8)
   email_spec (~> 1.6.0)
-  factory_girl_rails (~> 4.6.0)
+  factory_girl_rails (~> 4.7.0)
   ffaker (~> 2.0.0)
   flay (~> 2.6.1)
   fog-aws (~> 0.9)
-  fog-azure (~> 0.0)
   fog-core (~> 1.40)
-  fog-google (~> 0.3)
+  fog-google (~> 0.5)
   fog-local (~> 0.3)
   fog-openstack (~> 0.1)
   fog-rackspace (~> 0.1.1)
@@ -869,39 +897,42 @@ DEPENDENCIES
   gemojione (~> 3.0)
   github-linguist (~> 4.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
-  gitlab-markup (~> 1.5.0)
+  gitlab-markup (~> 1.5.1)
+  gitlab-turbolinks-classic (~> 2.5, >= 2.5.6)
   gitlab_git (~> 10.7.0)
   gitlab_omniauth-ldap (~> 1.2.1)
   gollum-lib (~> 4.2)
   gollum-rugged_adapter (~> 0.4.2)
   gon (~> 6.1.0)
-  grape (~> 0.15.0)
-  grape-entity (~> 0.4.2)
+  google-api-client (~> 0.8.6)
+  grape (~> 0.18.0)
+  grape-entity (~> 0.6.0)
   haml_lint (~> 0.18.2)
   hamlit (~> 2.6.1)
   health_check (~> 2.2.0)
   hipchat (~> 1.5.0)
   html-pipeline (~> 1.11.0)
+  html2text
   httparty (~> 0.13.3)
   influxdb (~> 0.2)
+  jira-ruby (~> 1.1.2)
   jquery-atwho-rails (~> 1.3.2)
   jquery-rails (~> 4.1.0)
-  jquery-turbolinks (~> 2.1.0)
   jquery-ui-rails (~> 5.0.0)
   json-schema (~> 2.6.2)
   jwt
   kaminari (~> 0.17.0)
   knapsack (~> 1.11.0)
+  kubeclient (~> 2.2.0)
   letter_opener_web (~> 1.3.0)
   license_finder (~> 2.1.0)
   licensee (~> 8.0.0)
   loofah (~> 2.0.3)
-  mail_room (~> 0.8.1)
+  mail_room (~> 0.9.0)
   method_source (~> 0.8)
   minitest (~> 5.7.0)
   mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.3.16)
-  nested_form (~> 0.3.2)
   net-ssh (~> 3.0.1)
   newrelic_rpm (~> 3.16)
   nokogiri (~> 1.6.7, >= 1.6.7.2)
@@ -910,12 +941,12 @@ DEPENDENCIES
   oj (~> 2.17.4)
   omniauth (~> 1.3.1)
   omniauth-auth0 (~> 1.4.1)
+  omniauth-authentiq (~> 0.2.0)
   omniauth-azure-oauth2 (~> 0.0.6)
-  omniauth-bitbucket (~> 0.0.2)
   omniauth-cas3 (~> 1.1.2)
   omniauth-facebook (~> 4.0.0)
   omniauth-github (~> 1.1.1)
-  omniauth-gitlab (~> 1.0.0)
+  omniauth-gitlab (~> 1.0.2)
   omniauth-google-oauth2 (~> 0.4.1)
   omniauth-kerberos (~> 0.3.0)
   omniauth-saml (~> 1.7.0)
@@ -923,24 +954,25 @@ DEPENDENCIES
   omniauth-twitter (~> 1.2.0)
   omniauth_crowd (~> 2.2.0)
   org-ruby (~> 0.9.12)
-  paranoia (~> 2.0)
+  paranoia (~> 2.2)
   pg (~> 0.18.2)
   poltergeist (~> 1.9.0)
   premailer-rails (~> 1.9.0)
+  pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
-  rack-attack (~> 4.3.1)
+  rack-attack (~> 4.4.1)
   rack-cors (~> 0.4.0)
   rack-oauth2 (~> 1.2.1)
   rails (= 4.2.7.1)
   rails-deprecated_sanitizer (~> 1.0.3)
   rainbow (~> 2.1.0)
   rblineprof (~> 0.3.6)
-  rdoc (~> 3.6)
+  rdoc (~> 4.2)
   recaptcha (~> 3.0)
   redcarpet (~> 3.3.3)
   redis (~> 3.2)
   redis-namespace (~> 1.5.2)
-  redis-rails (~> 4.0.0)
+  redis-rails (~> 5.0.1)
   request_store (~> 1.3)
   rerun (~> 0.11.0)
   responders (~> 2.0)
@@ -955,17 +987,17 @@ DEPENDENCIES
   sanitize (~> 2.0)
   sass-rails (~> 5.0.6)
   scss_lint (~> 0.47.0)
-  sdoc (~> 0.3.20)
   seed-fu (~> 2.3.5)
   select2-rails (~> 3.5.9)
   sentry-raven (~> 2.0.0)
   settingslogic (~> 2.0.9)
   sham_rack (~> 1.3.6)
   shoulda-matchers (~> 2.8.0)
-  sidekiq (~> 4.2)
-  sidekiq-cron (~> 0.4.0)
+  sidekiq (~> 4.2.7)
+  sidekiq-cron (~> 0.4.4)
+  sidekiq-limit_fetch (~> 3.4)
   simplecov (= 0.12.0)
-  slack-notifier (~> 1.2.0)
+  slack-notifier (~> 1.5.1)
   spinach-rails (~> 0.2.1)
   spinach-rerun-reporter (~> 0.0.2)
   spring (~> 1.7.0)
@@ -974,6 +1006,7 @@ DEPENDENCIES
   spring-commands-teaspoon (~> 0.0.2)
   sprockets (~> 3.7.0)
   sprockets-es6 (~> 0.9.2)
+  stackprof (~> 0.2.10)
   state_machines-activerecord (~> 0.4.0)
   sys-filesystem (~> 1.1.6)
   teaspoon (~> 1.1.0)
@@ -982,7 +1015,6 @@ DEPENDENCIES
   thin (~> 1.7.0)
   timecop (~> 0.8.0)
   truncato (~> 0.7.8)
-  turbolinks (~> 2.5.0)
   u2f (~> 0.2.1)
   uglifier (~> 2.7.2)
   underscore-rails (~> 1.8.0)
@@ -997,4 +1029,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.13.5
+   1.13.7
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 9e03135e89c..6c2b42ddbc5 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.13.5";
+  version = "8.15.4";
 
   buildInputs = [ env ruby bundler tzdata git nodejs procps ];
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "1ir52fdg81jawkfk03xj6c2j4lmw8sy4mwc25p024l0zpsg2gpz3";
+    sha256 = "1cd6dl8niy1xxifxdrm1kwm8qhy4x4zyvwdsb722kr136rwnxm84";
   };
 
   patches = [
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index fc36db0d603..64ebf34e477 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -63,14 +63,6 @@
     };
     version = "0.3.3";
   };
-  activerecord-session_store = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1b8q5p7wl0xpmlcjig2im1yryzj4aipvw7zq3z1ig8fdg4m2m943";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
   activerecord_sane_schema_dumper = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -175,6 +167,14 @@
     };
     version = "1.0.0";
   };
+  autoparse = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q5wkd8gc2ckmgry9fba4b8vxb5kr8k8gqq2wycbirgq06mbllb6";
+      type = "gem";
+    };
+    version = "0.3.3";
+  };
   autoprefixer-rails = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -199,22 +199,6 @@
     };
     version = "0.1.1";
   };
-  azure = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vfnx47ihizg1d6szdyf48xfdghjfk66k4r39z6b0gl5i40vcm8v";
-      type = "gem";
-    };
-    version = "0.7.5";
-  };
-  azure-core = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "016krlc7wfg27zgg5i6j0pys32ra8jszgls8wz4dz64h2zf1kd7a";
-      type = "gem";
-    };
-    version = "0.1.2";
-  };
   babel-source = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -330,10 +314,10 @@
   byebug = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yx89b7vh5mbvxyi8n7zl25ia1bqdj71995m4daj6d41rnkmrpnc";
+      sha256 = "1kbfcn65rgdhi72n8x9l393b89rvi5z542459k7d1ggchpb0idb0";
       type = "gem";
     };
-    version = "8.2.1";
+    version = "9.0.6";
   };
   capybara = {
     source = {
@@ -466,10 +450,10 @@
   connection_pool = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1b2bb3k39ni5mzcnqlv9y4yjkbin20s7dkwzp0jw2jf1rmzcgrmy";
+      sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.2.1";
   };
   crack = {
     source = {
@@ -538,10 +522,10 @@
   deckar01-task_list = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x2va9b7p2x82ind3cbk9dr4pk97c4g7vqccwzb20xdwdq0q4j91";
+      sha256 = "0nfbja4br77ad79snq2a7wg38vvvf5brchv12vfk9vpbzzyfdnrq";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.0.6";
   };
   default_value_for = {
     source = {
@@ -586,10 +570,10 @@
   diffy = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0il0ri511g9rm88qbvncbzgwc6wk6265hmnf7grcczmrs1z49vl0";
+      sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj";
       type = "gem";
     };
-    version = "3.0.7";
+    version = "3.1.0";
   };
   docile = {
     source = {
@@ -599,6 +583,14 @@
     };
     version = "1.1.5";
   };
+  domain_name = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y5c96gzyh6z4nrnkisljqngfvljdba36dww657ka0x7khzvx7jl";
+      type = "gem";
+    };
+    version = "0.5.20161021";
+  };
   doorkeeper = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -695,21 +687,29 @@
     };
     version = "0.9.0";
   };
+  extlib = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cbw3vgb189z3vfc1arijmsd604m3w5y5xvdfkrblc9qh7sbk2rh";
+      type = "gem";
+    };
+    version = "0.9.16";
+  };
   factory_girl = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qn34ba1midnzms1854yzx0g16sgy7bd9wcsvs66rxd65idsay20";
+      sha256 = "1xzl4z9z390fsnyxp10c9if2n46zan3n6zwwpfnwc33crv4s410i";
       type = "gem";
     };
-    version = "4.5.0";
+    version = "4.7.0";
   };
   factory_girl_rails = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00vngc59bww75hqkr1hbnvnqm5763w0jlv3lsq3js1r1wxdzix2r";
+      sha256 = "0hzpirb33xdqaz44i1mbcfv0icjrghhgaz747llcfsflljd4pa4r";
       type = "gem";
     };
-    version = "4.6.0";
+    version = "4.7.0";
   };
   faraday = {
     source = {
@@ -775,14 +775,6 @@
     };
     version = "0.11.0";
   };
-  fog-azure = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1bdgzn1a1z79drfvashs6gzpg98dijvxm168cq0czzkx3wvbrfcl";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
   fog-core = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -794,10 +786,10 @@
   fog-google = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vzwid3s4c39fqixg1zb0dr5g3q6lafm9pan6bk3csys62v6fnm9";
+      sha256 = "06irf9gcg5v8iwaa5qilhwir6gl82rrp7jyyw87ad15v8p3xa59f";
       type = "gem";
     };
-    version = "0.3.2";
+    version = "0.5.0";
   };
   fog-json = {
     source = {
@@ -939,10 +931,18 @@
   gitlab-markup = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yxwp4q0dwiykxv24x2yhvnn59wmw1jv0vz3d8hjw44nn9jxn25a";
+      sha256 = "1aam7zvvbai5nv7vf0c0640pvik6s71f276lip4yb4slbg0pfpn2";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.5.1";
+  };
+  gitlab-turbolinks-classic = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zfqwa1pahhcz1yxvwigg94bck2zsqk2jsrc0wdcybhr0iwi5jra";
+      type = "gem";
+    };
+    version = "2.5.6";
   };
   gitlab_git = {
     source = {
@@ -1000,21 +1000,37 @@
     };
     version = "6.1.0";
   };
+  google-api-client = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11wr57j9fp6x6fym4k1a7jqp72qgc8l24mfwb4y55bbvdmkv1b2d";
+      type = "gem";
+    };
+    version = "0.8.7";
+  };
+  googleauth = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nzkg63s161c6jsia92c1jfwpayzbpwn588smd286idn07y0az2m";
+      type = "gem";
+    };
+    version = "0.5.1";
+  };
   grape = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13rbm0whhirpzn2n58kjyvqn9989vvipynlxsj1ihmwp8xsmcj1i";
+      sha256 = "17spanyj7kpvqm4ap82vq4s1hlrad5mcv8rj4q1mva40zg1f8cgj";
       type = "gem";
     };
-    version = "0.15.0";
+    version = "0.18.0";
   };
   grape-entity = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hxghs2p9ncvdwhp6dwr1a74g552c49dd0jzy0szp4pg2xjbgjk8";
+      sha256 = "18jhjn1164z68xrjz23wf3qha3x9az086dr7p6405jv6rszyxihq";
       type = "gem";
     };
-    version = "0.4.8";
+    version = "0.6.0";
   };
   haml = {
     source = {
@@ -1072,6 +1088,14 @@
     };
     version = "1.11.0";
   };
+  html2text = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kxdj8pf9pss9xgs8aac0alj5g1fi225yzdhh33lzampkazg1hii";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
   htmlentities = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1080,6 +1104,38 @@
     };
     version = "4.3.4";
   };
+  http = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ll9x8qjp97l8gj0jx23nj7xvm0rsxj5pb3d19f7bhmdb70r0xsi";
+      type = "gem";
+    };
+    version = "0.9.8";
+  };
+  http-cookie = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  http-form_data = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10r6hy8wcf8n4nbdmdz9hrm8mg45lncfc7anaycpzrhfp3949xh9";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  "http_parser.rb" = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
   httparty = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1128,6 +1184,14 @@
     };
     version = "0.8.3";
   };
+  jira-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03n76a8m2d352q29j3yna1f9g3xg9dc9p3fvvx77w67h19ks7zrf";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
   jquery-atwho-rails = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1144,14 +1208,6 @@
     };
     version = "4.1.1";
   };
-  jquery-turbolinks = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1d23mnl3lgamk9ziw4yyv2ixck6d8s8xp4f9pmwimk0by0jq7xhc";
-      type = "gem";
-    };
-    version = "2.1.0";
-  };
   jquery-ui-rails = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1208,6 +1264,14 @@
     };
     version = "1.11.0";
   };
+  kubeclient = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09hr5cb6rzf9876wa0c8pv3kxjj4s8hcjpf7jjdg2n9prb7hhmgi";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
   launchy = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1256,6 +1320,22 @@
     };
     version = "3.0.5";
   };
+  little-plugger = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
+      type = "gem";
+    };
+    version = "1.1.4";
+  };
+  logging = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1agk0dv5lxn0qpnxadi6dvg36pc0x5fsrmzhw4sc91x52mjc381l";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
   loofah = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1264,14 +1344,6 @@
     };
     version = "2.0.3";
   };
-  macaddr = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b";
-      type = "gem";
-    };
-    version = "1.7.1";
-  };
   mail = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1283,10 +1355,18 @@
   mail_room = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15zjqscdzm4rv8qpz8y8334nc5kvlqp0xk4wiics98hbjs8cd59i";
+      sha256 = "17q8km4n9jzjb5vj3hhyv4bwr1gxdh84yghvcdrmq88jh5ki8p8k";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "0.9.0";
+  };
+  memoist = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q";
+      type = "gem";
+    };
+    version = "0.15.0";
   };
   method_source = {
     source = {
@@ -1360,6 +1440,22 @@
     };
     version = "2.0.0";
   };
+  mustermann = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0km27zp3mnlmh157nmj3pyd2g7n2da4dh4mr0psq53a9r0d4gli8";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  mustermann-grape = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g6kf753v0kf8zfz0z46kyb7cbpinpc3qqh02qm4s9n49s1v2fva";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
   mysql2 = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1368,14 +1464,6 @@
     };
     version = "0.3.20";
   };
-  nested_form = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0f053j4zfagxyym28msxj56hrpvmyv4lzxy2c5c270f7xbbnii5i";
-      type = "gem";
-    };
-    version = "0.3.2";
-  };
   net-ldap = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1392,6 +1480,14 @@
     };
     version = "3.0.1";
   };
+  netrc = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
+      type = "gem";
+    };
+    version = "0.11.0";
+  };
   newrelic_rpm = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1419,10 +1515,10 @@
   oauth = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w";
+      sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky";
       type = "gem";
     };
-    version = "0.4.7";
+    version = "0.5.1";
   };
   oauth2 = {
     source = {
@@ -1464,6 +1560,14 @@
     };
     version = "1.4.1";
   };
+  omniauth-authentiq = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01br0snvbxbx1zgs857alfs0ay3xhgdjgk4hc2vjzf3jn6bwizvk";
+      type = "gem";
+    };
+    version = "0.2.2";
+  };
   omniauth-azure-oauth2 = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1472,14 +1576,6 @@
     };
     version = "0.0.6";
   };
-  omniauth-bitbucket = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lals2z1yixffrc97zh7zn1jpz9l6vpb3alcp13im42dq9q0g845";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
   omniauth-cas3 = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1507,10 +1603,10 @@
   omniauth-gitlab = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "083yyc8612kq8ygd8y7s8lxg2d51jcsakbs4pa19aww67gcm72iz";
+      sha256 = "0hv672p372jq7p9p6dw8i7qyisbny3lq0si077yys1fy4bjw127x";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.0.2";
   };
   omniauth-google-oauth2 = {
     source = {
@@ -1600,13 +1696,21 @@
     };
     version = "0.5.0";
   };
+  os = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz";
+      type = "gem";
+    };
+    version = "0.9.6";
+  };
   paranoia = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0z2smnnghjhcs4l5fkz9scs1kj0bvj2n8xmzcvw4rg9yprdnlxr0";
+      sha256 = "1kfznq6lba1xb3nskvn8kdb08ljh4a0lvbm3lv91xvj6n9hm15k0";
       type = "gem";
     };
-    version = "2.1.4";
+    version = "2.2.0";
   };
   parser = {
     source = {
@@ -1680,6 +1784,14 @@
     };
     version = "0.10.3";
   };
+  pry-byebug = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "147kiwnggdzz7jvlplfi0baffng808rb5lk263qxp648k8x03vgc";
+      type = "gem";
+    };
+    version = "3.4.1";
+  };
   pry-rails = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1699,10 +1811,10 @@
   rack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
+      sha256 = "1374xyh8nnqb8sy6g9gcvchw8gifckn5v3bhl6dzbwwsx34qz7gz";
       type = "gem";
     };
-    version = "1.6.4";
+    version = "1.6.5";
   };
   rack-accept = {
     source = {
@@ -1715,10 +1827,10 @@
   rack-attack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ihic8ar2ddfv15p5gia8nqzsl3y7iayg5v4rmg72jlvikgsabls";
+      sha256 = "1czx68p70x98y21dkdndsb64lrxf9qrv09wl1dbcxrypcjnpsdl1";
       type = "gem";
     };
-    version = "4.3.1";
+    version = "4.4.1";
   };
   rack-cors = {
     source = {
@@ -1728,14 +1840,6 @@
     };
     version = "0.4.0";
   };
-  rack-mount = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2";
-      type = "gem";
-    };
-    version = "0.8.3";
-  };
   rack-oauth2 = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1851,10 +1955,10 @@
   rdoc = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8";
+      sha256 = "027dvwz1g1h4bm40v3kxqbim4p7ww4fcmxa2l1mvwiqm5cjiqd7k";
       type = "gem";
     };
-    version = "3.12.2";
+    version = "4.2.2";
   };
   recaptcha = {
     source = {
@@ -1864,6 +1968,14 @@
     };
     version = "3.0.0";
   };
+  recursive-open-struct = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "102bgpfkjsaghpb1qs1ah5s89100dchpimzah2wxdy9rv9318rqw";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
   redcarpet = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1891,18 +2003,18 @@
   redis-actionpack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jjl6dhhpdapdaywq5iqz7z36mwbw0cn0m30wcc5wcbv7xmiiygw";
+      sha256 = "0gnkqi7cji2q5yfwm8b752k71pqrb3dqksv983yrf23virqnjfjr";
       type = "gem";
     };
-    version = "4.0.1";
+    version = "5.0.1";
   };
   redis-activesupport = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10y3kybz21n2z11478sf0cp4xzclvxf0b428787brmgpc6i7p7zg";
+      sha256 = "0i0r23rv32k25jqwbr4cb73alyaxwvz9crdaw3gv26h1zjrdjisd";
       type = "gem";
     };
-    version = "4.1.5";
+    version = "5.0.1";
   };
   redis-namespace = {
     source = {
@@ -1915,26 +2027,26 @@
   redis-rack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y1mxx8gn0krdrpwllv7fqsbvki1qjnb2dz8b4q9gwc326829gk8";
+      sha256 = "0fbxl5gv8krjf6n88gvn44xbzhfnsysnzawz7zili298ak98lsb3";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.6.0";
   };
   redis-rails = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0igww7hb58aq74mh50dli3zjg78b54y8nhd0h1h9vz4vgjd4q8m7";
+      sha256 = "04l2y26k4v30p3dx0pqf9gz257q73qzgrfqf3qv6bxwyv8z9f5hm";
       type = "gem";
     };
-    version = "4.0.0";
+    version = "5.0.1";
   };
   redis-store = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0gf462p0wx4hn7m1m8ghs701n6xx0ijzm5cff9xfagd2s6va145m";
+      sha256 = "1da15wr3wc1d4hqy7h7smdc2k2jpfac3waa9d65si6f4dmqymkkq";
       type = "gem";
     };
-    version = "1.1.7";
+    version = "1.2.0";
   };
   request_store = {
     source = {
@@ -1960,6 +2072,22 @@
     };
     version = "2.3.0";
   };
+  rest-client = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v2jp2ilpb2rm97yknxcnay9lfagcm4k82pfsmmcm9v290xm1ib7";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  retriable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cmhwgv5r4vn7iqy4bfbnbb73pzl8ik69zrwq9vdim45v8b13gsj";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
   rinku = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1979,10 +2107,10 @@
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "182hp2fh6gd3p5c862i36k6jxkc02mhi08qd94gsyfj3v34ngza0";
+      sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d";
       type = "gem";
     };
-    version = "2.0.6";
+    version = "2.0.7";
   };
   rqrcode = {
     source = {
@@ -2200,14 +2328,6 @@
     };
     version = "0.47.1";
   };
-  sdoc = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "17l8qk0ld47z4h5avcnylvds8nc6dp25zc64w23z8li2hs341xf2";
-      type = "gem";
-    };
-    version = "0.3.20";
-  };
   seed-fu = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2267,18 +2387,34 @@
   sidekiq = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1l9ji9lmgvgc9p45js3hrbpv6fj0kvrvx5lkrjd751g8r3h98z0l";
+      sha256 = "0d711y4s5clh5xx9k12c8c3x84xxqk61qwykya2xw39fqcxgzx04";
       type = "gem";
     };
-    version = "4.2.1";
+    version = "4.2.7";
   };
   sidekiq-cron = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xnbvh8kjv6954vsiwfcpp7bn8sgpwvnyapnq7b94w8h7kj3ykqy";
+      sha256 = "1bsi80hyfh0lgpcdphxn2aw7av3d8xd87bmx6jz6lj7lw49gzkda";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.4.4";
+  };
+  sidekiq-limit_fetch = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr";
+      type = "gem";
+    };
+    version = "3.4.0";
+  };
+  signet = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6";
+      type = "gem";
+    };
+    version = "0.7.3";
   };
   simplecov = {
     source = {
@@ -2299,10 +2435,10 @@
   slack-notifier = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08z6fv186yw1nrpl6zwp3lwqksin145aa1jv6jf00bnv3sicliiz";
+      sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.5.1";
   };
   slop = {
     source = {
@@ -2392,6 +2528,14 @@
     };
     version = "3.1.1";
   };
+  stackprof = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1c88j2d6ipjw5s3hgdgfww37gysgrkicawagj33hv3knijjc9ski";
+      type = "gem";
+    };
+    version = "0.2.10";
+  };
   state_machines = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2440,14 +2584,6 @@
     };
     version = "1.2.0";
   };
-  systemu = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1";
-      type = "gem";
-    };
-    version = "2.6.5";
-  };
   teaspoon = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2528,6 +2664,14 @@
     };
     version = "0.8.3";
   };
+  tool = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iymkxi4lv2b2k905s9pl4d9k9k4455ksk3a98ssfn7y94h34np0";
+      type = "gem";
+    };
+    version = "0.2.3";
+  };
   truncato = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2536,14 +2680,6 @@
     };
     version = "0.7.8";
   };
-  turbolinks = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ddrx25vvvqxlz4h59lrmjhc2bfwxf4bpicvyhgbpjd48ckj81jn";
-      type = "gem";
-    };
-    version = "2.5.3";
-  };
   tzinfo = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2624,14 +2760,6 @@
     };
     version = "1.10.0";
   };
-  uuid = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0gr2mxg27l380wpiy66mgv9wq02myj6m4gmp6c4g1vsbzkh0213v";
-      type = "gem";
-    };
-    version = "2.3.8";
-  };
   version_sorter = {
     source = {
       remotes = ["https://rubygems.org"];
diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch
index 2ee416dbb8e..1bb2718aceb 100644
--- a/pkgs/applications/version-management/gitlab/nulladapter.patch
+++ b/pkgs/applications/version-management/gitlab/nulladapter.patch
@@ -27,9 +27,9 @@ index 5511d71..38d357e 100644
        arel (~> 6.0)
 +    activerecord-nulldb-adapter (0.3.3)
 +      activerecord (>= 2.0.0)
-     activerecord-session_store (1.0.0)
-       actionpack (>= 4.0, < 5.1)
-       activerecord (>= 4.0, < 5.1)
+     activerecord_sane_schema_dumper (0.2)
+       rails (>= 4, < 5)
+     activesupport (4.2.7.1)
 @@ -396,7 +398,7 @@ GEM
      method_source (0.8.2)
      mime-types (2.99.2)
@@ -55,6 +55,6 @@ index 5511d71..38d357e 100644
    RedCloth (~> 4.3.2)
    ace-rails-ap (~> 4.1.0)
 +  activerecord-nulldb-adapter
-   activerecord-session_store (~> 1.0.0)
-   acts-as-taggable-on (~> 3.4)
+   activerecord_sane_schema_dumper (= 0.2)
+   acts-as-taggable-on (~> 4.0)
    addressable (~> 2.3.8)

From 986dba716f8244304e5e9afb92924eb543fc5596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 15 Jan 2017 16:32:05 +0100
Subject: [PATCH 190/727] nodePackages.yarn: remove package

was replaced by a dedicated yarn package
---
 .../node-packages/composition-v4.nix          |    4 +-
 .../node-packages/composition-v6.nix          |    4 +-
 .../node-packages/node-packages-v4.nix        | 6640 +++++++----------
 .../node-packages/node-packages-v6.nix        | 4947 ++++++------
 .../node-packages/node-packages.json          |    1 -
 5 files changed, 4759 insertions(+), 6837 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index ad8c76b4e6e..1c0f5f0626e 100644
--- a/pkgs/development/node-packages/composition-v4.nix
+++ b/pkgs/development/node-packages/composition-v4.nix
@@ -6,11 +6,11 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in
 import ./node-packages-v4.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index 57bd88bd2a1..289a8ab1201 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -6,11 +6,11 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in
 import ./node-packages-v6.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 20197d1833e..356228cca0b 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -76,13 +76,13 @@ let
         sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3";
       };
     };
-    "resolve-1.1.7" = {
+    "resolve-1.2.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.1.7";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
-        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz";
+        sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c";
       };
     };
     "global-paths-0.1.2" = {
@@ -274,13 +274,13 @@ let
         sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe";
       };
     };
-    "global-prefix-0.1.4" = {
+    "global-prefix-0.1.5" = {
       name = "global-prefix";
       packageName = "global-prefix";
-      version = "0.1.4";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.4.tgz";
-        sha1 = "05158db1cde2dd491b455e290eb3ab8bfc45c6e1";
+        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz";
+        sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f";
       };
     };
     "is-windows-0.2.0" = {
@@ -292,6 +292,15 @@ let
         sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c";
       };
     };
+    "homedir-polyfill-1.0.1" = {
+      name = "homedir-polyfill";
+      packageName = "homedir-polyfill";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz";
+        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
+      };
+    };
     "ini-1.3.4" = {
       name = "ini";
       packageName = "ini";
@@ -301,15 +310,6 @@ let
         sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
       };
     };
-    "osenv-0.1.3" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz";
-        sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217";
-      };
-    };
     "which-1.2.12" = {
       name = "which";
       packageName = "which";
@@ -319,22 +319,13 @@ let
         sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
       };
     };
-    "os-homedir-1.0.2" = {
-      name = "os-homedir";
-      packageName = "os-homedir";
-      version = "1.0.2";
+    "parse-passwd-1.0.0" = {
+      name = "parse-passwd";
+      packageName = "parse-passwd";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
-        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
-      };
-    };
-    "os-tmpdir-1.0.2" = {
-      name = "os-tmpdir";
-      packageName = "os-tmpdir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
-        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+        url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz";
+        sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
       };
     };
     "isexe-1.1.2" = {
@@ -409,13 +400,13 @@ let
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-arm-cdn-0.2.1" = {
+    "azure-arm-cdn-1.0.0" = {
       name = "azure-arm-cdn";
       packageName = "azure-arm-cdn";
-      version = "0.2.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-0.2.1.tgz";
-        sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz";
+        sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85";
       };
     };
     "azure-arm-commerce-0.2.0" = {
@@ -427,13 +418,31 @@ let
         sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
-    "azure-arm-compute-0.19.0" = {
+    "azure-arm-compute-0.19.1" = {
       name = "azure-arm-compute";
       packageName = "azure-arm-compute";
-      version = "0.19.0";
+      version = "0.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.0.tgz";
-        sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e";
+        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz";
+        sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd";
+      };
+    };
+    "azure-arm-datalake-analytics-1.0.1-preview" = {
+      name = "azure-arm-datalake-analytics";
+      packageName = "azure-arm-datalake-analytics";
+      version = "1.0.1-preview";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.1-preview.tgz";
+        sha1 = "75461904000427e12ce11d634d74c052c86de994";
+      };
+    };
+    "azure-arm-datalake-store-1.0.1-preview" = {
+      name = "azure-arm-datalake-store";
+      packageName = "azure-arm-datalake-store";
+      version = "1.0.1-preview";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.1-preview.tgz";
+        sha1 = "bd07cbeb5eb355a00b7bed69e198a1a968115dd5";
       };
     };
     "azure-arm-hdinsight-0.2.2" = {
@@ -535,24 +544,6 @@ let
         sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02";
       };
     };
-    "azure-arm-datalake-analytics-0.4.3" = {
-      name = "azure-arm-datalake-analytics";
-      packageName = "azure-arm-datalake-analytics";
-      version = "0.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-0.4.3.tgz";
-        sha1 = "10c81e59d3064289a42ab37fea805a334333ed91";
-      };
-    };
-    "azure-arm-datalake-store-0.4.2" = {
-      name = "azure-arm-datalake-store";
-      packageName = "azure-arm-datalake-store";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-0.4.2.tgz";
-        sha1 = "479f4a28986c9737b8fef14090c0c7ccc33cb123";
-      };
-    };
     "azure-arm-devtestlabs-0.1.0" = {
       name = "azure-arm-devtestlabs";
       packageName = "azure-arm-devtestlabs";
@@ -643,13 +634,13 @@ let
         sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54";
       };
     };
-    "azure-arm-resource-1.4.5-preview" = {
+    "azure-arm-resource-1.6.1-preview" = {
       name = "azure-arm-resource";
       packageName = "azure-arm-resource";
-      version = "1.4.5-preview";
+      version = "1.6.1-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.5-preview.tgz";
-        sha1 = "166934783752607e9a4128ea0ad715b9b7a9015f";
+        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz";
+        sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
       };
     };
     "azure-arm-storage-0.13.1-preview" = {
@@ -742,13 +733,13 @@ let
         sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e";
       };
     };
-    "applicationinsights-0.15.12" = {
+    "applicationinsights-0.16.0" = {
       name = "applicationinsights";
       packageName = "applicationinsights";
-      version = "0.15.12";
+      version = "0.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.15.12.tgz";
-        sha1 = "d03f282da9424f33729eb7da8279e8e8a20dc7fc";
+        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
+        sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3";
       };
     };
     "caller-id-0.1.0" = {
@@ -868,13 +859,13 @@ let
         sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
       };
     };
-    "moment-2.17.0" = {
+    "moment-2.17.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.17.0";
+      version = "2.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz";
-        sha1 = "a4c292e02aac5ddefb29a6eed24f51938dd3b74f";
+        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
+        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
       };
     };
     "ms-rest-1.15.2" = {
@@ -904,15 +895,6 @@ let
         sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
       };
     };
-    "node-uuid-1.2.0" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz";
-        sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b";
-      };
-    };
     "omelette-0.1.0" = {
       name = "omelette";
       packageName = "omelette";
@@ -1039,6 +1021,15 @@ let
         sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
       };
     };
+    "uuid-3.0.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
+        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
+      };
+    };
     "validator-5.2.0" = {
       name = "validator";
       packageName = "validator";
@@ -1120,13 +1111,13 @@ let
         sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
       };
     };
-    "xmldom-0.1.22" = {
+    "xmldom-0.1.27" = {
       name = "xmldom";
       packageName = "xmldom";
-      version = "0.1.22";
+      version = "0.1.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
-        sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz";
+        sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
       };
     };
     "xpath.js-1.0.7" = {
@@ -1147,13 +1138,13 @@ let
         sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb";
       };
     };
-    "jwa-1.1.4" = {
+    "jwa-1.1.5" = {
       name = "jwa";
       packageName = "jwa";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz";
-        sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e";
+        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz";
+        sha1 = "a0552ce0220742cd52e153774a32905c30e756e5";
       };
     };
     "safe-buffer-5.0.1" = {
@@ -1174,22 +1165,13 @@ let
         sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
       };
     };
-    "ecdsa-sig-formatter-1.0.7" = {
+    "ecdsa-sig-formatter-1.0.9" = {
       name = "ecdsa-sig-formatter";
       packageName = "ecdsa-sig-formatter";
-      version = "1.0.7";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.7.tgz";
-        sha1 = "3137e976a1d6232517e2513e04e32f79bcbdf126";
-      };
-    };
-    "base64-url-1.3.3" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
-        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
+        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz";
+        sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1";
       };
     };
     "xml2js-0.2.7" = {
@@ -1831,13 +1813,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.13" = {
+    "mime-types-2.1.14" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.13";
+      version = "2.1.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz";
-        sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
+        sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -1903,13 +1885,13 @@ let
         sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
       };
     };
-    "lodash-4.17.2" = {
+    "lodash-4.17.4" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.2";
+      version = "4.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz";
-        sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
+        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
       };
     };
     "chalk-1.1.3" = {
@@ -1993,13 +1975,13 @@ let
         sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
       };
     };
-    "ansi-regex-2.0.0" = {
+    "ansi-regex-2.1.1" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
-        sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
       };
     };
     "graceful-readlink-1.0.1" = {
@@ -2029,13 +2011,13 @@ let
         sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
       };
     };
-    "jsonpointer-4.0.0" = {
+    "jsonpointer-4.0.1" = {
       name = "jsonpointer";
       packageName = "jsonpointer";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz";
-        sha1 = "6661e161d2fc445f19f98430231343722e1fcbd5";
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
+        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
       };
     };
     "xtend-4.0.1" = {
@@ -2119,13 +2101,13 @@ let
         sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252";
       };
     };
-    "sshpk-1.10.1" = {
+    "sshpk-1.10.2" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.10.1";
+      version = "1.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz";
-        sha1 = "30e1a5d329244974a1af61511339d595af6638b0";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz";
+        sha1 = "d5a804ce22695515638e798dbe23273de070a5fa";
       };
     };
     "extsprintf-1.0.2" = {
@@ -2173,13 +2155,13 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "dashdash-1.14.0" = {
+    "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
-      version = "1.14.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz";
-        sha1 = "29e486c5418bf0f356034a993d51686a33e84141";
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     };
     "getpass-0.1.6" = {
@@ -2200,13 +2182,13 @@ let
         sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
       };
     };
-    "tweetnacl-0.14.3" = {
+    "tweetnacl-0.14.5" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
-      version = "0.14.3";
+      version = "0.14.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz";
-        sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d";
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
     "jodid25519-1.0.2" = {
@@ -2236,13 +2218,13 @@ let
         sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
       };
     };
-    "mime-db-1.25.0" = {
+    "mime-db-1.26.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.25.0";
+      version = "1.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz";
-        sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
+        sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
       };
     };
     "punycode-1.4.1" = {
@@ -2299,13 +2281,13 @@ let
         sha1 = "0c989774f2870c69378aa665648cdc60f343aa53";
       };
     };
-    "concat-stream-1.5.2" = {
+    "concat-stream-1.6.0" = {
       name = "concat-stream";
       packageName = "concat-stream";
-      version = "1.5.2";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
-        sha1 = "708978624d856af41a5a741defdd261da752c266";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz";
+        sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
       };
     };
     "http-response-object-1.1.0" = {
@@ -2335,6 +2317,24 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
+    "readable-stream-2.2.2" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
+        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
+      };
+    };
+    "buffer-shims-1.0.0" = {
+      name = "buffer-shims";
+      packageName = "buffer-shims";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
+        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
+      };
+    };
     "http-basic-2.5.1" = {
       name = "http-basic";
       packageName = "http-basic";
@@ -2371,6 +2371,15 @@ let
         sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
       };
     };
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+      };
+    };
     "async-1.0.0" = {
       name = "async";
       packageName = "async";
@@ -2398,13 +2407,13 @@ let
         sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
       };
     };
-    "mute-stream-0.0.6" = {
+    "mute-stream-0.0.7" = {
       name = "mute-stream";
       packageName = "mute-stream";
-      version = "0.0.6";
+      version = "0.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
-        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz";
+        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
       };
     };
     "argparse-1.0.4" = {
@@ -2695,15 +2704,6 @@ let
         sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
       };
     };
-    "readable-stream-2.2.2" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
-        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
-      };
-    };
     "stream-shift-1.0.0" = {
       name = "stream-shift";
       packageName = "stream-shift";
@@ -2722,15 +2722,6 @@ let
         sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
       };
     };
-    "buffer-shims-1.0.0" = {
-      name = "buffer-shims";
-      packageName = "buffer-shims";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
-        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
-      };
-    };
     "camelcase-keys-2.1.0" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -2839,13 +2830,13 @@ let
         sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
       };
     };
-    "signal-exit-3.0.1" = {
+    "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz";
-        sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
     "array-find-index-1.0.2" = {
@@ -3136,13 +3127,13 @@ let
         sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
       };
     };
-    "debug-2.3.3" = {
+    "debug-2.6.0" = {
       name = "debug";
       packageName = "debug";
-      version = "2.3.3";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
-        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
+        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
       };
     };
     "ms-0.7.2" = {
@@ -3154,6 +3145,15 @@ let
         sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
       };
     };
+    "os-tmpdir-1.0.2" = {
+      name = "os-tmpdir";
+      packageName = "os-tmpdir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+      };
+    };
     "rimraf-2.2.8" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -3163,22 +3163,22 @@ let
         sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
       };
     };
-    "JSONStream-1.2.1" = {
+    "JSONStream-1.3.0" = {
       name = "JSONStream";
       packageName = "JSONStream";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
-        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
-      };
-    };
-    "assert-1.3.0" = {
-      name = "assert";
-      packageName = "assert";
       version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
-        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz";
+        sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5";
+      };
+    };
+    "assert-1.4.1" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
+        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
       };
     };
     "browser-pack-6.0.2" = {
@@ -3226,6 +3226,15 @@ let
         sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4";
       };
     };
+    "concat-stream-1.5.2" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
+        sha1 = "708978624d856af41a5a741defdd261da752c266";
+      };
+    };
     "console-browserify-1.1.0" = {
       name = "console-browserify";
       packageName = "console-browserify";
@@ -3298,15 +3307,6 @@ let
         sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
       };
     };
-    "glob-5.0.15" = {
-      name = "glob";
-      packageName = "glob";
-      version = "5.0.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
-        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
-      };
-    };
     "has-1.0.1" = {
       name = "has";
       packageName = "has";
@@ -3442,13 +3442,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.5.0" = {
+    "stream-http-2.6.1" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.5.0";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz";
-        sha1 = "585eee513217ed98fe199817e7313b6f772a6802";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.1.tgz";
+        sha1 = "7d20fcdfebc16b16e4174e31dd94cd9c70f10e89";
       };
     };
     "subarg-1.0.0" = {
@@ -3469,13 +3469,13 @@ let
         sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710";
       };
     };
-    "through2-2.0.1" = {
+    "through2-2.0.3" = {
       name = "through2";
       packageName = "through2";
-      version = "2.0.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz";
-        sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9";
+        url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz";
+        sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be";
       };
     };
     "timers-browserify-1.4.2" = {
@@ -3586,6 +3586,15 @@ let
         sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
       };
     };
+    "resolve-1.1.7" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+      };
+    };
     "pako-0.2.9" = {
       name = "pako";
       packageName = "pako";
@@ -3820,13 +3829,13 @@ let
         sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
       };
     };
-    "asn1.js-4.9.0" = {
+    "asn1.js-4.9.1" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "4.9.0";
+      version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz";
-        sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz";
+        sha1 = "48ba240b45a9280e94748990ba597d216617fd40";
       };
     };
     "ripemd160-1.0.1" = {
@@ -3991,13 +4000,13 @@ let
         sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
       };
     };
-    "builtin-status-codes-2.0.0" = {
+    "builtin-status-codes-3.0.0" = {
       name = "builtin-status-codes";
       packageName = "builtin-status-codes";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz";
-        sha1 = "6f22003baacf003ccd287afe6872151fddc58579";
+        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
+        sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
       };
     };
     "to-arraybuffer-1.0.1" = {
@@ -4063,13 +4072,13 @@ let
         sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395";
       };
     };
-    "castv2-client-1.1.2" = {
+    "castv2-client-1.2.0" = {
       name = "castv2-client";
       packageName = "castv2-client";
-      version = "1.1.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.1.2.tgz";
-        sha1 = "7865eac9181cd1f419fdcee448b5793706f853ad";
+        url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.2.0.tgz";
+        sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544";
       };
     };
     "chalk-1.0.0" = {
@@ -4468,13 +4477,13 @@ let
         sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc";
       };
     };
-    "numeral-1.5.5" = {
+    "numeral-1.5.6" = {
       name = "numeral";
       packageName = "numeral";
-      version = "1.5.5";
+      version = "1.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.5.tgz";
-        sha1 = "b7515d64533626124e9196cfc68c8fd5b2dee208";
+        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz";
+        sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f";
       };
     };
     "open-0.0.5" = {
@@ -4540,13 +4549,13 @@ let
         sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
       };
     };
-    "mdns-js-0.5.1" = {
+    "mdns-js-0.5.3" = {
       name = "mdns-js";
       packageName = "mdns-js";
-      version = "0.5.1";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz";
-        sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec";
+        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.3.tgz";
+        sha1 = "add2958d399319b6d8f2dde29bebac5e845e8b6d";
       };
     };
     "plist-2.0.1" = {
@@ -4702,13 +4711,13 @@ let
         sha1 = "106df57e0e509bafa6756e544d88205e52be33a6";
       };
     };
-    "simple-get-2.3.0" = {
+    "simple-get-2.4.0" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.3.0.tgz";
-        sha1 = "c5fdfcce1e516ad4b2ce7b7c2bd2d710502d8ac9";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz";
+        sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2";
       };
     };
     "thirty-two-1.0.2" = {
@@ -4738,22 +4747,22 @@ let
         sha1 = "717b36fc61c4e9cb3755f0a9f90996ee5b46f0d0";
       };
     };
-    "simple-sha1-2.0.8" = {
+    "simple-sha1-2.1.0" = {
       name = "simple-sha1";
       packageName = "simple-sha1";
-      version = "2.0.8";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.0.8.tgz";
-        sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f";
+        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz";
+        sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3";
       };
     };
-    "rusha-0.8.4" = {
+    "rusha-0.8.5" = {
       name = "rusha";
       packageName = "rusha";
-      version = "0.8.4";
+      version = "0.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rusha/-/rusha-0.8.4.tgz";
-        sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b";
+        url = "https://registry.npmjs.org/rusha/-/rusha-0.8.5.tgz";
+        sha1 = "a30ae9bd5a4e80fbc96fbe7a13232b944be24f84";
       };
     };
     "simple-concat-1.0.0" = {
@@ -4918,13 +4927,13 @@ let
         sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854";
       };
     };
-    "random-access-file-1.3.1" = {
+    "random-access-file-1.4.0" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.3.1.tgz";
-        sha1 = "5302a65a7ff2b83c50e18d79bf4cd619b520ac8d";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz";
+        sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767";
       };
     };
     "run-parallel-1.1.6" = {
@@ -5188,13 +5197,13 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.0.7" = {
+    "simple-peer-6.1.3" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.0.7";
+      version = "6.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.0.7.tgz";
-        sha1 = "ccc5133b7e75e154ab17b9ccdbec91e970cc2278";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.1.3.tgz";
+        sha1 = "c9a8baf72a36a4d4f05eab3df0db50d78a953583";
       };
     };
     "simple-websocket-4.1.0" = {
@@ -5530,13 +5539,13 @@ let
         sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c";
       };
     };
-    "exit-on-epipe-0.1.0" = {
+    "exit-on-epipe-1.0.0" = {
       name = "exit-on-epipe";
       packageName = "exit-on-epipe";
-      version = "0.1.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.1.0.tgz";
-        sha1 = "aa2f0155b78b34fe60dd2b462e84637ba5ed0697";
+        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.0.tgz";
+        sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc";
       };
     };
     "xmlbuilder-4.2.1" = {
@@ -5566,13 +5575,13 @@ let
         sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33";
       };
     };
-    "insight-0.8.3" = {
+    "insight-0.8.4" = {
       name = "insight";
       packageName = "insight";
-      version = "0.8.3";
+      version = "0.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insight/-/insight-0.8.3.tgz";
-        sha1 = "72d1e1b4da6c8b405db25043f9d86900f8cbf59d";
+        url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz";
+        sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884";
       };
     };
     "nopt-3.0.1" = {
@@ -5647,6 +5656,24 @@ let
         sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
       };
     };
+    "glob-5.0.15" = {
+      name = "glob";
+      packageName = "glob";
+      version = "5.0.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
+        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
+      };
+    };
+    "osenv-0.1.4" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz";
+        sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644";
+      };
+    };
     "plist-1.2.0" = {
       name = "plist";
       packageName = "plist";
@@ -5755,13 +5782,13 @@ let
         sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980";
       };
     };
-    "cordova-serve-1.0.0" = {
+    "cordova-serve-1.0.1" = {
       name = "cordova-serve";
       packageName = "cordova-serve";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.0.tgz";
-        sha1 = "7fa1c40183d2b82adb792f9cb9e0d554a23eed85";
+        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.1.tgz";
+        sha1 = "895c7fb4bbe630fa1c89feaf6d74779cbff66da7";
       };
     };
     "dep-graph-1.1.0" = {
@@ -5935,13 +5962,13 @@ let
         sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26";
       };
     };
-    "shelljs-0.7.5" = {
+    "shelljs-0.7.6" = {
       name = "shelljs";
       packageName = "shelljs";
-      version = "0.7.5";
+      version = "0.7.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz";
-        sha1 = "2eef7a50a21e1ccf37da00df767ec69e30ad0675";
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz";
+        sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad";
       };
     };
     "interpret-1.0.1" = {
@@ -5980,6 +6007,15 @@ let
         sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae";
       };
     };
+    "assert-1.3.0" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
+        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
+      };
+    };
     "compression-1.6.2" = {
       name = "compression";
       packageName = "compression";
@@ -6214,13 +6250,13 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "proxy-addr-1.1.2" = {
+    "proxy-addr-1.1.3" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz";
-        sha1 = "b4cc5f22610d9535824c123aef9d3cf73c40ba37";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.3.tgz";
+        sha1 = "dc97502f5722e888467b3fa2297a7b1ff47df074";
       };
     };
     "qs-6.2.0" = {
@@ -6295,15 +6331,6 @@ let
         sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
       };
     };
-    "ipaddr.js-1.1.1" = {
-      name = "ipaddr.js";
-      packageName = "ipaddr.js";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz";
-        sha1 = "c791d95f52b29c1247d5df80ada39b8a73647230";
-      };
-    };
     "destroy-1.0.4" = {
       name = "destroy";
       packageName = "destroy";
@@ -6601,22 +6628,22 @@ let
         sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
       };
     };
-    "lockfile-1.0.2" = {
+    "lockfile-1.0.3" = {
       name = "lockfile";
       packageName = "lockfile";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz";
-        sha1 = "97e1990174f696cbe0a3acd58a43b84aa30c7c83";
+        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz";
+        sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79";
       };
     };
-    "lru-cache-4.0.1" = {
+    "lru-cache-4.0.2" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz";
-        sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz";
+        sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
       };
     };
     "node-gyp-3.4.0" = {
@@ -6727,13 +6754,13 @@ let
         sha1 = "d0def882952b8de3f67eba5e91199661271f41f4";
       };
     };
-    "retry-0.10.0" = {
+    "retry-0.10.1" = {
       name = "retry";
       packageName = "retry";
-      version = "0.10.0";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz";
-        sha1 = "649e15ca408422d98318161935e7f7d652d435dd";
+        url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
+        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
       };
     };
     "sha-2.0.1" = {
@@ -7294,13 +7321,13 @@ let
         sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
       };
     };
-    "write-file-atomic-1.2.0" = {
+    "write-file-atomic-1.3.1" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
-      version = "1.2.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
-        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.1.tgz";
+        sha1 = "7d45ba32316328dd1ec7d90f60ebc0d845bb759a";
       };
     };
     "xdg-basedir-2.0.0" = {
@@ -7447,15 +7474,6 @@ let
         sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
       };
     };
-    "uuid-3.0.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
-        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
-      };
-    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -7582,13 +7600,22 @@ let
         sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
       };
     };
-    "parserlib-1.0.0" = {
+    "clone-2.1.0" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz";
+        sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6";
+      };
+    };
+    "parserlib-1.1.1" = {
       name = "parserlib";
       packageName = "parserlib";
-      version = "1.0.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.0.0.tgz";
-        sha1 = "88340e7e8d95bac9e09236742eef53bec1e4b30f";
+        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz";
+        sha1 = "a64cfa724062434fdfc351c9a4ec2d92b94c06f4";
       };
     };
     "bluebird-2.9.9" = {
@@ -7988,13 +8015,13 @@ let
         sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       };
     };
-    "nan-2.4.0" = {
+    "nan-2.5.0" = {
       name = "nan";
       packageName = "nan";
-      version = "2.4.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz";
-        sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232";
+        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
+        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
       };
     };
     "jsonparse-0.0.6" = {
@@ -8351,22 +8378,22 @@ let
         sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
       };
     };
-    "ndjson-1.4.3" = {
+    "ndjson-1.5.0" = {
       name = "ndjson";
       packageName = "ndjson";
-      version = "1.4.3";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ndjson/-/ndjson-1.4.3.tgz";
-        sha1 = "7aa026fe3ab38a7da1a2b4ad07b1008e733eb239";
+        url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz";
+        sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8";
       };
     };
-    "pump-1.0.1" = {
+    "pump-1.0.2" = {
       name = "pump";
       packageName = "pump";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pump/-/pump-1.0.1.tgz";
-        sha1 = "f1f1409fb9bd1085bbdb576b43b84ec4b5eadc1a";
+        url = "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz";
+        sha1 = "3b3ee6512f94f0e575538c17995f9f16990a5d51";
       };
     };
     "pumpify-1.3.5" = {
@@ -8702,6 +8729,15 @@ let
         sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3";
       };
     };
+    "split2-2.1.1" = {
+      name = "split2";
+      packageName = "split2";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz";
+        sha1 = "7a1f551e176a90ecd3345f7246a0cfe175ef4fd0";
+      };
+    };
     "murl-0.4.1" = {
       name = "murl";
       packageName = "murl";
@@ -8720,31 +8756,40 @@ let
         sha1 = "80ab4e919749351263ef14500d684e57c4202840";
       };
     };
-    "JSONStream-1.1.4" = {
-      name = "JSONStream";
-      packageName = "JSONStream";
-      version = "1.1.4";
+    "bl-1.2.0" = {
+      name = "bl";
+      packageName = "bl";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz";
-        sha1 = "be11a495938e882d277773d11986f3974a8ba37a";
+        url = "https://registry.npmjs.org/bl/-/bl-1.2.0.tgz";
+        sha1 = "1397e7ec42c5f5dc387470c500e34a9f6be9ea98";
       };
     };
-    "async-2.0.1" = {
-      name = "async";
-      packageName = "async";
-      version = "2.0.1";
+    "awscred-1.2.0" = {
+      name = "awscred";
+      packageName = "awscred";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz";
-        sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
+        url = "https://registry.npmjs.org/awscred/-/awscred-1.2.0.tgz";
+        sha1 = "9ba714a0d2feb625b848f15c62746c07aebdc3b5";
       };
     };
-    "got-6.6.3" = {
+    "clipboardy-0.1.2" = {
+      name = "clipboardy";
+      packageName = "clipboardy";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipboardy/-/clipboardy-0.1.2.tgz";
+        sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc";
+      };
+    };
+    "got-6.7.1" = {
       name = "got";
       packageName = "got";
-      version = "6.6.3";
+      version = "6.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz";
-        sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec";
+        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
+        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
       };
     };
     "lodash.debounce-4.0.8" = {
@@ -8765,13 +8810,76 @@ let
         sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1";
       };
     };
-    "mem-0.1.1" = {
+    "mem-1.1.0" = {
       name = "mem";
       packageName = "mem";
-      version = "0.1.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz";
-        sha1 = "24df988c3102b03c074c1b296239c5b2e6647825";
+        url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz";
+        sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
+      };
+    };
+    "execa-0.5.1" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz";
+        sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36";
+      };
+    };
+    "cross-spawn-4.0.2" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz";
+        sha1 = "7b9247621c23adfdd3856004a823cbe397424d41";
+      };
+    };
+    "get-stream-2.3.1" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
+        sha1 = "5f38f93f346009666ee0150a054167f91bdd95de";
+      };
+    };
+    "npm-run-path-2.0.2" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
+        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+      };
+    };
+    "p-finally-1.0.0" = {
+      name = "p-finally";
+      packageName = "p-finally";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
+        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+      };
+    };
+    "strip-eof-1.0.0" = {
+      name = "strip-eof";
+      packageName = "strip-eof";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
+        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
+      };
+    };
+    "path-key-2.0.1" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
+        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     };
     "create-error-class-3.0.2" = {
@@ -8792,13 +8900,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "get-stream-2.3.1" = {
+    "get-stream-3.0.0" = {
       name = "get-stream";
       packageName = "get-stream";
-      version = "2.3.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
-        sha1 = "5f38f93f346009666ee0150a054167f91bdd95de";
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
+        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
       };
     };
     "is-retry-allowed-1.1.0" = {
@@ -8810,22 +8918,13 @@ let
         sha1 = "11a060568b67339444033d0125a61a20d564fb34";
       };
     };
-    "node-status-codes-2.0.1" = {
-      name = "node-status-codes";
-      packageName = "node-status-codes";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz";
-        sha1 = "298067659cb68a2b4670abbefde02a3819981f5b";
-      };
-    };
-    "timed-out-3.0.0" = {
+    "timed-out-4.0.0" = {
       name = "timed-out";
       packageName = "timed-out";
-      version = "3.0.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.0.0.tgz";
-        sha1 = "ff88de96030ce960eabd42487db61d3add229273";
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.0.tgz";
+        sha1 = "b0fb98d7fed4f36b028698122769c07ef87a8690";
       };
     };
     "url-parse-lax-1.0.0" = {
@@ -8846,13 +8945,22 @@ let
         sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
       };
     };
-    "babel-code-frame-6.16.0" = {
+    "mimic-fn-1.1.0" = {
+      name = "mimic-fn";
+      packageName = "mimic-fn";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz";
+        sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18";
+      };
+    };
+    "babel-code-frame-6.20.0" = {
       name = "babel-code-frame";
       packageName = "babel-code-frame";
-      version = "6.16.0";
+      version = "6.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz";
-        sha1 = "f90e60da0862909d3ce098733b5d3987c97cb8de";
+        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.20.0.tgz";
+        sha1 = "b968f839090f9a8bc6d41938fb96cb84f7387b26";
       };
     };
     "doctrine-1.5.0" = {
@@ -9017,6 +9125,15 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
+    "strip-json-comments-2.0.1" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
+      };
+    };
     "table-3.8.3" = {
       name = "table";
       packageName = "table";
@@ -9089,13 +9206,13 @@ let
         sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
       };
     };
-    "acorn-4.0.3" = {
+    "acorn-4.0.4" = {
       name = "acorn";
       packageName = "acorn";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz";
-        sha1 = "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1";
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz";
+        sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a";
       };
     };
     "acorn-jsx-3.0.1" = {
@@ -9107,13 +9224,13 @@ let
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
-    "flat-cache-1.2.1" = {
+    "flat-cache-1.2.2" = {
       name = "flat-cache";
       packageName = "flat-cache";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.1.tgz";
-        sha1 = "6c837d6225a7de5659323740b36d5361f71691ff";
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz";
+        sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96";
       };
     };
     "circular-json-0.3.1" = {
@@ -9287,13 +9404,13 @@ let
         sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
       };
     };
-    "fast-levenshtein-2.0.5" = {
+    "fast-levenshtein-2.0.6" = {
       name = "fast-levenshtein";
       packageName = "fast-levenshtein";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz";
-        sha1 = "bd33145744519ab1c36c3ee9f31f08e9079b67f2";
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
     "caller-path-0.1.0" = {
@@ -9323,22 +9440,22 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.9.0" = {
+    "ajv-4.10.4" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.9.0";
+      version = "4.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz";
-        sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz";
+        sha1 = "c0974dd00b3464984892d6010aa9c2c945933254";
       };
     };
-    "ajv-keywords-1.1.1" = {
+    "ajv-keywords-1.5.0" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "1.1.1";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz";
-        sha1 = "02550bc605a3e576041565628af972e06c549d50";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz";
+        sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c";
       };
     };
     "slice-ansi-0.0.4" = {
@@ -9449,13 +9566,13 @@ let
         sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d";
       };
     };
-    "prettyjson-1.2.0" = {
+    "prettyjson-1.2.1" = {
       name = "prettyjson";
       packageName = "prettyjson";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.0.tgz";
-        sha1 = "2a109cdf14c957896bbad8b77ef5de5db2c691bf";
+        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz";
+        sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289";
       };
     };
     "shush-1.0.0" = {
@@ -9593,13 +9710,13 @@ let
         sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
       };
     };
-    "fsevents-1.0.15" = {
+    "fsevents-1.0.17" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.0.15";
+      version = "1.0.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz";
-        sha1 = "fa63f590f3c2ad91275e4972a6cea545fb0aae44";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.17.tgz";
+        sha1 = "8537f3f12272678765b4fd6528c0f1f66f8f4558";
       };
     };
     "micromatch-2.3.11" = {
@@ -9665,13 +9782,13 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
-    "kind-of-3.0.4" = {
+    "kind-of-3.1.0" = {
       name = "kind-of";
       packageName = "kind-of";
-      version = "3.0.4";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz";
-        sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74";
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz";
+        sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47";
       };
     };
     "normalize-path-2.0.1" = {
@@ -9773,13 +9890,13 @@ let
         sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
       };
     };
-    "randomatic-1.1.5" = {
+    "randomatic-1.1.6" = {
       name = "randomatic";
       packageName = "randomatic";
-      version = "1.1.5";
+      version = "1.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz";
-        sha1 = "5e9ef5f2d573c67bd2b8124ae90b5156e457840b";
+        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz";
+        sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb";
       };
     };
     "repeat-string-1.6.1" = {
@@ -9863,13 +9980,13 @@ let
         sha1 = "207bab91638499c07b2adf240a41a87210034575";
       };
     };
-    "binary-extensions-1.7.0" = {
+    "binary-extensions-1.8.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz";
-        sha1 = "6c1610db163abfb34edfe42fa423343a1e01185d";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz";
+        sha1 = "48ec8d16df4377eae5fa5884682480af4d95c774";
       };
     };
     "set-immediate-shim-1.0.1" = {
@@ -9881,22 +9998,22 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.31" = {
+    "node-pre-gyp-0.6.32" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.31";
+      version = "0.6.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
-        sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
+        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
       };
     };
-    "npmlog-4.0.1" = {
+    "npmlog-4.0.2" = {
       name = "npmlog";
       packageName = "npmlog";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz";
-        sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
+        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
       };
     };
     "tar-pack-3.3.0" = {
@@ -9917,13 +10034,13 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
-    "gauge-2.7.1" = {
+    "gauge-2.7.2" = {
       name = "gauge";
       packageName = "gauge";
-      version = "2.7.1";
+      version = "2.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz";
-        sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7";
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz";
+        sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774";
       };
     };
     "set-blocking-2.0.0" = {
@@ -10080,13 +10197,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.11.1" = {
+    "coffee-script-1.12.2" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.11.1";
+      version = "1.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
-        sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
+        sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
       };
     };
     "jade-1.11.0" = {
@@ -10125,13 +10242,13 @@ let
         sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
       };
     };
-    "clean-css-3.4.21" = {
+    "clean-css-3.4.23" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "3.4.21";
+      version = "3.4.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz";
-        sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.23.tgz";
+        sha1 = "604fbbca24c12feb59b02f00b84f1fb7ded6d001";
       };
     };
     "commander-2.6.0" = {
@@ -10170,13 +10287,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.7.4" = {
+    "uglify-js-2.7.5" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.4";
+      version = "2.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
-        sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
+        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
       };
     };
     "void-elements-2.0.1" = {
@@ -10413,13 +10530,13 @@ let
         sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19";
       };
     };
-    "gulp-util-3.0.7" = {
+    "gulp-util-3.0.8" = {
       name = "gulp-util";
       packageName = "gulp-util";
-      version = "3.0.7";
+      version = "3.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz";
-        sha1 = "78925c4b8f8b49005ac01a011c557e6218941cbb";
+        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz";
+        sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f";
       };
     };
     "liftoff-2.3.0" = {
@@ -10494,22 +10611,22 @@ let
         sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809";
       };
     };
-    "dateformat-1.0.12" = {
+    "dateformat-2.0.0" = {
       name = "dateformat";
       packageName = "dateformat";
-      version = "1.0.12";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz";
-        sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9";
+        url = "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz";
+        sha1 = "2743e3abb5c3fc2462e527dca445e04e9f4dee17";
       };
     };
-    "fancy-log-1.2.0" = {
+    "fancy-log-1.3.0" = {
       name = "fancy-log";
       packageName = "fancy-log";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.2.0.tgz";
-        sha1 = "d5a51b53e9ab22ca07d558f2b67ae55fdb5fcbd8";
+        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz";
+        sha1 = "45be17d02bb9917d60ccffd4995c999e6c8c9948";
       };
     };
     "gulplog-1.0.0" = {
@@ -10899,13 +11016,13 @@ let
         sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5";
       };
     };
-    "is-unc-path-0.1.1" = {
+    "is-unc-path-0.1.2" = {
       name = "is-unc-path";
       packageName = "is-unc-path";
-      version = "0.1.1";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.1.tgz";
-        sha1 = "ab2533d77ad733561124c3dc0f5cd8b90054c86b";
+        url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz";
+        sha1 = "6ab053a72573c10250ff416a3814c35178af39b9";
       };
     };
     "unc-path-regex-0.1.2" = {
@@ -11367,13 +11484,13 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "bluebird-3.4.6" = {
+    "bluebird-3.4.7" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.4.6";
+      version = "3.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz";
-        sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz";
+        sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
       };
     };
     "body-parser-1.15.2" = {
@@ -11439,22 +11556,22 @@ let
         sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea";
       };
     };
-    "http-proxy-1.15.2" = {
+    "http-proxy-1.16.2" = {
       name = "http-proxy";
       packageName = "http-proxy";
-      version = "1.15.2";
+      version = "1.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz";
-        sha1 = "642fdcaffe52d3448d2bda3b0079e9409064da31";
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz";
+        sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742";
       };
     };
-    "isbinaryfile-3.0.1" = {
+    "isbinaryfile-3.0.2" = {
       name = "isbinaryfile";
       packageName = "isbinaryfile";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.1.tgz";
-        sha1 = "6e99573675372e841a0520c036b41513d783e79e";
+        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz";
+        sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621";
       };
     };
     "log4js-0.6.38" = {
@@ -11475,13 +11592,13 @@ let
         sha1 = "659de9f2cf8dcc27a1481276f205377272382e73";
       };
     };
-    "socket.io-1.4.7" = {
+    "socket.io-1.7.2" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "1.4.7";
+      version = "1.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.7.tgz";
-        sha1 = "92b7f7cb88c5797d4daee279fe8075dbe6d3fa1c";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.2.tgz";
+        sha1 = "83bbbdf2e79263b378900da403e7843e05dc3b71";
       };
     };
     "tmp-0.0.28" = {
@@ -11493,13 +11610,13 @@ let
         sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120";
       };
     };
-    "useragent-2.1.9" = {
+    "useragent-2.1.10" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.1.9";
+      version = "2.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.9.tgz";
-        sha1 = "4dba2bc4dad1875777ab15de3ff8098b475000b7";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.10.tgz";
+        sha1 = "2456c5c2b722b47f3d8321ed257b490a3d9bb2af";
       };
     };
     "bytes-2.4.0" = {
@@ -11610,40 +11727,22 @@ let
         sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
       };
     };
-    "engine.io-1.6.10" = {
+    "debug-2.3.3" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
+        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
+      };
+    };
+    "engine.io-1.8.2" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "1.6.10";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.10.tgz";
-        sha1 = "f87d84e1bd21d1a2ec7f8deef0c62054acdfb27a";
-      };
-    };
-    "socket.io-parser-2.2.6" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz";
-        sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99";
-      };
-    };
-    "socket.io-client-1.4.6" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.4.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz";
-        sha1 = "49b0ba537efd15b8297c84016e642e1c7c752c3d";
-      };
-    };
-    "socket.io-adapter-0.4.0" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz";
-        sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.2.tgz";
+        sha1 = "6b59be730b348c0125b0a4589de1c355abcf7a7e";
       };
     };
     "has-binary-0.1.7" = {
@@ -11655,49 +11754,58 @@ let
         sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
       };
     };
-    "base64id-0.1.0" = {
+    "socket.io-adapter-0.5.0" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
+        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
+      };
+    };
+    "socket.io-client-1.7.2" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "1.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.2.tgz";
+        sha1 = "39fdb0c3dd450e321b7e40cfd83612ec533dd644";
+      };
+    };
+    "socket.io-parser-2.3.1" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
+        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
+      };
+    };
+    "base64id-1.0.0" = {
       name = "base64id";
       packageName = "base64id";
-      version = "0.1.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
-        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+        url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz";
+        sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
       };
     };
-    "ws-1.0.1" = {
-      name = "ws";
-      packageName = "ws";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz";
-        sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9";
-      };
-    };
-    "engine.io-parser-1.2.4" = {
+    "engine.io-parser-1.3.2" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
-      version = "1.2.4";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz";
-        sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42";
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz";
+        sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a";
       };
     };
-    "accepts-1.1.4" = {
-      name = "accepts";
-      packageName = "accepts";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
-        sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
-      };
-    };
-    "after-0.8.1" = {
+    "after-0.8.2" = {
       name = "after";
       packageName = "after";
-      version = "0.8.1";
+      version = "0.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz";
-        sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627";
+        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
+        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
       };
     };
     "arraybuffer.slice-0.0.6" = {
@@ -11709,13 +11817,13 @@ let
         sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
       };
     };
-    "base64-arraybuffer-0.1.2" = {
+    "base64-arraybuffer-0.1.5" = {
       name = "base64-arraybuffer";
       packageName = "base64-arraybuffer";
-      version = "0.1.2";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
-        sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154";
+        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
+        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
       };
     };
     "blob-0.0.4" = {
@@ -11727,103 +11835,13 @@ let
         sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
       };
     };
-    "has-binary-0.1.6" = {
-      name = "has-binary";
-      packageName = "has-binary";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz";
-        sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10";
-      };
-    };
-    "utf8-2.1.0" = {
-      name = "utf8";
-      packageName = "utf8";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz";
-        sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5";
-      };
-    };
-    "negotiator-0.4.9" = {
-      name = "negotiator";
-      packageName = "negotiator";
-      version = "0.4.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
-        sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f";
-      };
-    };
-    "json3-3.3.2" = {
-      name = "json3";
-      packageName = "json3";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
-        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
-      };
-    };
-    "benchmark-1.0.0" = {
-      name = "benchmark";
-      packageName = "benchmark";
+    "wtf-8-1.0.0" = {
+      name = "wtf-8";
+      packageName = "wtf-8";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
-        sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73";
-      };
-    };
-    "engine.io-client-1.6.9" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.6.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz";
-        sha1 = "1d6ad48048a5083c95096943b29d36efdb212401";
-      };
-    };
-    "component-bind-1.0.0" = {
-      name = "component-bind";
-      packageName = "component-bind";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
-        sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
-      };
-    };
-    "component-emitter-1.2.0" = {
-      name = "component-emitter";
-      packageName = "component-emitter";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz";
-        sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe";
-      };
-    };
-    "object-component-0.0.3" = {
-      name = "object-component";
-      packageName = "object-component";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
-        sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
-      };
-    };
-    "parseuri-0.0.4" = {
-      name = "parseuri";
-      packageName = "parseuri";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz";
-        sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350";
-      };
-    };
-    "to-array-0.1.4" = {
-      name = "to-array";
-      packageName = "to-array";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
-        sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
+        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
+        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
       };
     };
     "backo2-1.0.2" = {
@@ -11835,40 +11853,58 @@ let
         sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
       };
     };
-    "has-cors-1.1.0" = {
-      name = "has-cors";
-      packageName = "has-cors";
-      version = "1.1.0";
+    "component-bind-1.0.0" = {
+      name = "component-bind";
+      packageName = "component-bind";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
-        sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+        url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
+        sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
       };
     };
-    "xmlhttprequest-ssl-1.5.1" = {
-      name = "xmlhttprequest-ssl";
-      packageName = "xmlhttprequest-ssl";
-      version = "1.5.1";
+    "component-emitter-1.2.1" = {
+      name = "component-emitter";
+      packageName = "component-emitter";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz";
-        sha1 = "3b7741fea4a86675976e908d296d4445961faa67";
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
       };
     };
-    "parsejson-0.0.1" = {
-      name = "parsejson";
-      packageName = "parsejson";
-      version = "0.0.1";
+    "engine.io-client-1.8.2" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
-        sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc";
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.2.tgz";
+        sha1 = "c38767547f2a7d184f5752f6f0ad501006703766";
       };
     };
-    "parseqs-0.0.2" = {
-      name = "parseqs";
-      packageName = "parseqs";
-      version = "0.0.2";
+    "object-component-0.0.3" = {
+      name = "object-component";
+      packageName = "object-component";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
-        sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7";
+        url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
+        sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
+      };
+    };
+    "parseuri-0.0.5" = {
+      name = "parseuri";
+      packageName = "parseuri";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
+        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+      };
+    };
+    "to-array-0.1.4" = {
+      name = "to-array";
+      packageName = "to-array";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
+        sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
       };
     };
     "component-inherit-0.0.3" = {
@@ -11880,6 +11916,42 @@ let
         sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
       };
     };
+    "has-cors-1.1.0" = {
+      name = "has-cors";
+      packageName = "has-cors";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
+        sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+      };
+    };
+    "parsejson-0.0.3" = {
+      name = "parsejson";
+      packageName = "parsejson";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
+        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
+      };
+    };
+    "parseqs-0.0.5" = {
+      name = "parseqs";
+      packageName = "parseqs";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
+        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
+      };
+    };
+    "xmlhttprequest-ssl-1.5.3" = {
+      name = "xmlhttprequest-ssl";
+      packageName = "xmlhttprequest-ssl";
+      version = "1.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
+        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
+      };
+    };
     "yeast-0.1.2" = {
       name = "yeast";
       packageName = "yeast";
@@ -11907,22 +11979,13 @@ let
         sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
       };
     };
-    "socket.io-parser-2.2.2" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz";
-        sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417";
-      };
-    };
-    "json3-3.2.6" = {
+    "json3-3.3.2" = {
       name = "json3";
       packageName = "json3";
-      version = "3.2.6";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
-        sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
+        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
+        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
       };
     };
     "lru-cache-2.2.4" = {
@@ -12231,6 +12294,15 @@ let
         sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
       };
     };
+    "base64-url-1.3.3" = {
+      name = "base64-url";
+      packageName = "base64-url";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
+        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
+      };
+    };
     "rndm-1.2.0" = {
       name = "rndm";
       packageName = "rndm";
@@ -12375,22 +12447,22 @@ let
         sha1 = "a7de988a211f9cf4687377130ea74df32730c918";
       };
     };
-    "oauth-0.9.14" = {
+    "oauth-0.9.15" = {
       name = "oauth";
       packageName = "oauth";
-      version = "0.9.14";
+      version = "0.9.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
-        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz";
+        sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1";
       };
     };
-    "passport-oauth2-1.3.0" = {
+    "passport-oauth2-1.4.0" = {
       name = "passport-oauth2";
       packageName = "passport-oauth2";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.3.0.tgz";
-        sha1 = "d72b4bd62eeb807a4089ff3071a22c26c382dc0c";
+        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz";
+        sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad";
       };
     };
     "uid2-0.0.3" = {
@@ -12456,22 +12528,22 @@ let
         sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
       };
     };
-    "lodash.isequal-4.4.0" = {
+    "lodash.isequal-4.5.0" = {
       name = "lodash.isequal";
       packageName = "lodash.isequal";
-      version = "4.4.0";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.4.0.tgz";
-        sha1 = "6295768e98e14dc15ce8d362ef6340db82852031";
+        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
+        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
       };
     };
-    "merge-stream-1.0.0" = {
+    "merge-stream-1.0.1" = {
       name = "merge-stream";
       packageName = "merge-stream";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz";
-        sha1 = "9cfd156fef35421e2b5403ce11dc6eb1962b026e";
+        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz";
+        sha1 = "4041202d508a342ba00174008df0c251b8c135e1";
       };
     };
     "strip-bom-stream-1.0.0" = {
@@ -12501,13 +12573,13 @@ let
         sha1 = "1b904a59609fb328ef078138420934f6b86709a6";
       };
     };
-    "glob-parent-3.0.1" = {
+    "glob-parent-3.1.0" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "3.0.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.1.tgz";
-        sha1 = "60021327cc963ddc3b5f085764f500479ecd82ff";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
+        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     };
     "ordered-read-streams-0.3.0" = {
@@ -12555,13 +12627,13 @@ let
         sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
       };
     };
-    "is-extglob-2.1.0" = {
+    "is-extglob-2.1.1" = {
       name = "is-extglob";
       packageName = "is-extglob";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.0.tgz";
-        sha1 = "33411a482b046bf95e6b0cb27ee2711af4cf15ad";
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
       };
     };
     "extend-shallow-2.0.1" = {
@@ -12951,15 +13023,6 @@ let
         sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103";
       };
     };
-    "after-0.8.2" = {
-      name = "after";
-      packageName = "after";
-      version = "0.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
-        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
-      };
-    };
     "yargs-1.3.3" = {
       name = "yargs";
       packageName = "yargs";
@@ -13032,13 +13095,13 @@ let
         sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
       };
     };
-    "wrap-ansi-2.0.0" = {
+    "wrap-ansi-2.1.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz";
-        sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f";
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
       };
     };
     "lcid-1.0.0" = {
@@ -13167,13 +13230,13 @@ let
         sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     };
-    "bcryptjs-2.3.0" = {
+    "bcryptjs-2.4.0" = {
       name = "bcryptjs";
       packageName = "bcryptjs";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz";
-        sha1 = "5826900cfef7abaf3425c72e4d464de509b8c2ec";
+        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.0.tgz";
+        sha1 = "fb7f4a0b133854503fe1b2da3f25db834cf0e678";
       };
     };
     "cheerio-0.22.0" = {
@@ -13185,15 +13248,6 @@ let
         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" = {
       name = "cookie-parser";
       packageName = "cookie-parser";
@@ -13203,31 +13257,31 @@ let
         sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
       };
     };
-    "cron-1.1.1" = {
+    "cron-1.2.1" = {
       name = "cron";
       packageName = "cron";
-      version = "1.1.1";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.1.1.tgz";
-        sha1 = "02719d4ef480dfc8ee24d81a3603460ba39013ce";
+        url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz";
+        sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2";
       };
     };
-    "follow-redirects-0.2.0" = {
+    "follow-redirects-1.2.1" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "0.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.2.0.tgz";
-        sha1 = "e0229d7a388bb5ff7b29f44fc1e1b62e921272df";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.1.tgz";
+        sha1 = "796c716970df4fb0096165393545040f61b00f59";
       };
     };
-    "fs-extra-0.30.0" = {
+    "fs-extra-1.0.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
-      version = "0.30.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz";
-        sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
+        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
       };
     };
     "fs.notify-0.0.4" = {
@@ -13248,31 +13302,40 @@ let
         sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
-    "mqtt-1.14.1" = {
+    "jsonata-1.0.10" = {
+      name = "jsonata";
+      packageName = "jsonata";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.0.10.tgz";
+        sha1 = "5177b5aa3ec66e7b5894412b2f9ad170c6107b96";
+      };
+    };
+    "mqtt-2.2.1" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-1.14.1.tgz";
-        sha1 = "7e376987153d01793e946d26d46122ebf0c03554";
-      };
-    };
-    "mustache-2.2.1" = {
-      name = "mustache";
-      packageName = "mustache";
       version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-2.2.1.tgz";
-        sha1 = "2c40ca21c278f53150682bcf9090e41a3339b876";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.2.1.tgz";
+        sha1 = "b3efff8adff78dee07e09cfe89e2d2fb364a1852";
       };
     };
-    "oauth2orize-1.5.0" = {
+    "mustache-2.3.0" = {
+      name = "mustache";
+      packageName = "mustache";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz";
+        sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0";
+      };
+    };
+    "oauth2orize-1.7.0" = {
       name = "oauth2orize";
       packageName = "oauth2orize";
-      version = "1.5.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.5.0.tgz";
-        sha1 = "e352ff4f1b5bf08f0ee94a09757f8f640eb8e0a6";
+        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.7.0.tgz";
+        sha1 = "94c2a511cd0b58bde548548ffcde14fd81f257cc";
       };
     };
     "passport-http-bearer-1.0.1" = {
@@ -13293,22 +13356,22 @@ let
         sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba";
       };
     };
-    "sentiment-1.0.6" = {
-      name = "sentiment";
-      packageName = "sentiment";
-      version = "1.0.6";
+    "raw-body-2.2.0" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sentiment/-/sentiment-1.0.6.tgz";
-        sha1 = "f6096c6271f020f490d58b54a8afd598db8acbb1";
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz";
+        sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96";
       };
     };
-    "uglify-js-2.7.3" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.7.3";
+    "sentiment-2.1.0" = {
+      name = "sentiment";
+      packageName = "sentiment";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
-        sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
+        url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz";
+        sha1 = "33279100c35c38519ca5e435245186c512fe0fdc";
       };
     };
     "when-3.7.7" = {
@@ -13320,15 +13383,6 @@ let
         sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
       };
     };
-    "ws-0.8.1" = {
-      name = "ws";
-      packageName = "ws";
-      version = "0.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-0.8.1.tgz";
-        sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759";
-      };
-    };
     "node-red-node-feedparser-0.1.7" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
@@ -13338,13 +13392,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.12" = {
+    "node-red-node-email-0.1.15" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.12";
+      version = "0.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz";
-        sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz";
+        sha1 = "7a528596d3b693a077b1ee293300299855537142";
       };
     };
     "node-red-node-twitter-0.1.9" = {
@@ -13365,22 +13419,13 @@ let
         sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539";
       };
     };
-    "node-red-node-serialport-0.4.1" = {
-      name = "node-red-node-serialport";
-      packageName = "node-red-node-serialport";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz";
-        sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c";
-      };
-    };
-    "bcrypt-0.8.7" = {
+    "bcrypt-1.0.2" = {
       name = "bcrypt";
       packageName = "bcrypt";
-      version = "0.8.7";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz";
-        sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093";
+        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.2.tgz";
+        sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736";
       };
     };
     "css-select-1.2.0" = {
@@ -13527,13 +13572,13 @@ let
         sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
       };
     };
-    "moment-timezone-0.5.9" = {
+    "moment-timezone-0.5.11" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.9";
+      version = "0.5.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz";
-        sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz";
+        sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f";
       };
     };
     "retry-0.6.1" = {
@@ -13599,22 +13644,13 @@ let
         sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a";
       };
     };
-    "mqtt-connection-2.1.1" = {
-      name = "mqtt-connection";
-      packageName = "mqtt-connection";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-connection/-/mqtt-connection-2.1.1.tgz";
-        sha1 = "7b2e985a74e196619430bebd35da162c34c4e56a";
-      };
-    };
-    "mqtt-packet-3.4.7" = {
+    "mqtt-packet-5.2.1" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "3.4.7";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-3.4.7.tgz";
-        sha1 = "be8c267be7f0bf6a2a2d4f6de28307b6e0940e5f";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.1.tgz";
+        sha1 = "876e35ed616a8e348ac0283b4922039872458b58";
       };
     };
     "reinterval-1.1.0" = {
@@ -13626,15 +13662,6 @@ let
         sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
       };
     };
-    "split2-2.1.0" = {
-      name = "split2";
-      packageName = "split2";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split2/-/split2-2.1.0.tgz";
-        sha1 = "7382c148cb622c4b28af7c727f9673730b73f474";
-      };
-    };
     "websocket-stream-3.3.3" = {
       name = "websocket-stream";
       packageName = "websocket-stream";
@@ -13662,58 +13689,13 @@ let
         sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
       };
     };
-    "reduplexer-1.1.0" = {
-      name = "reduplexer";
-      packageName = "reduplexer";
-      version = "1.1.0";
+    "iconv-lite-0.4.15" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/reduplexer/-/reduplexer-1.1.0.tgz";
-        sha1 = "7dfed18a679e749c1d7ad36de01acb515f08e140";
-      };
-    };
-    "lodash.assign-4.0.1" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.0.1.tgz";
-        sha1 = "8e7ff0206897a99dca32fc8123309f5c4c2c731e";
-      };
-    };
-    "lodash.keys-4.2.0" = {
-      name = "lodash.keys";
-      packageName = "lodash.keys";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz";
-        sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205";
-      };
-    };
-    "lodash.rest-4.0.5" = {
-      name = "lodash.rest";
-      packageName = "lodash.rest";
-      version = "4.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.5.tgz";
-        sha1 = "954ef75049262038c96d1fc98b28fdaf9f0772aa";
-      };
-    };
-    "bufferutil-1.2.1" = {
-      name = "bufferutil";
-      packageName = "bufferutil";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz";
-        sha1 = "37be5d36e1e06492221e68d474b1ac58e510cbd7";
-      };
-    };
-    "utf-8-validate-1.2.1" = {
-      name = "utf-8-validate";
-      packageName = "utf-8-validate";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz";
-        sha1 = "44cb7c6eead73d6b40448f71f745904357b9f72c";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
+        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
       };
     };
     "feedparser-1.1.3" = {
@@ -13779,13 +13761,13 @@ let
         sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3";
       };
     };
-    "imap-0.8.18" = {
+    "imap-0.8.19" = {
       name = "imap";
       packageName = "imap";
-      version = "0.8.18";
+      version = "0.8.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/imap/-/imap-0.8.18.tgz";
-        sha1 = "4a7cdd0ff276efa0298708bb2c6d0db0b77f7a3f";
+        url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz";
+        sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5";
       };
     };
     "libmime-1.2.0" = {
@@ -13833,15 +13815,6 @@ let
         sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398";
       };
     };
-    "iconv-lite-0.4.15" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
-        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
-      };
-    };
     "libbase64-0.1.0" = {
       name = "libbase64";
       packageName = "libbase64";
@@ -13950,58 +13923,13 @@ let
         sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
       };
     };
-    "serialport-4.0.6" = {
-      name = "serialport";
-      packageName = "serialport";
-      version = "4.0.6";
+    "oauth-0.9.14" = {
+      name = "oauth";
+      packageName = "oauth";
+      version = "0.9.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz";
-        sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae";
-      };
-    };
-    "lie-3.1.0" = {
-      name = "lie";
-      packageName = "lie";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lie/-/lie-3.1.0.tgz";
-        sha1 = "65e0139eaef9ae791a1f5c8c53692c8d3b4718f4";
-      };
-    };
-    "object.assign-4.0.4" = {
-      name = "object.assign";
-      packageName = "object.assign";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz";
-        sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
-      };
-    };
-    "immediate-3.0.6" = {
-      name = "immediate";
-      packageName = "immediate";
-      version = "3.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz";
-        sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b";
-      };
-    };
-    "define-properties-1.1.2" = {
-      name = "define-properties";
-      packageName = "define-properties";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
-        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
-      };
-    };
-    "nan-2.3.5" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
-        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
+        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
       };
     };
     "mongoose-3.6.7" = {
@@ -14382,6 +14310,15 @@ let
         sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d";
       };
     };
+    "base64id-0.1.0" = {
+      name = "base64id";
+      packageName = "base64id";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+      };
+    };
     "redis-0.7.3" = {
       name = "redis";
       packageName = "redis";
@@ -14463,13 +14400,13 @@ let
         sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
       };
     };
-    "mailcomposer-3.12.0" = {
+    "mailcomposer-4.0.1" = {
       name = "mailcomposer";
       packageName = "mailcomposer";
-      version = "3.12.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz";
-        sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9";
+        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz";
+        sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4";
       };
     };
     "simplesmtp-0.3.35" = {
@@ -14481,22 +14418,22 @@ let
         sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03";
       };
     };
-    "buildmail-3.10.0" = {
+    "buildmail-4.0.1" = {
       name = "buildmail";
       packageName = "buildmail";
-      version = "3.10.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz";
-        sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159";
+        url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz";
+        sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72";
       };
     };
-    "libmime-2.1.0" = {
+    "libmime-3.0.0" = {
       name = "libmime";
       packageName = "libmime";
-      version = "2.1.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz";
-        sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd";
+        url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz";
+        sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6";
       };
     };
     "addressparser-1.0.1" = {
@@ -14553,6 +14490,15 @@ let
         sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528";
       };
     };
+    "nan-2.3.5" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
+        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
+      };
+    };
     "argparse-0.1.16" = {
       name = "argparse";
       packageName = "argparse";
@@ -14580,6 +14526,15 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
+    "JSONStream-1.2.1" = {
+      name = "JSONStream";
+      packageName = "JSONStream";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
+        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
+      };
+    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14643,6 +14598,15 @@ let
         sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
       };
     };
+    "nopt-4.0.1" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
+        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+      };
+    };
     "npm-install-checks-3.0.0" = {
       name = "npm-install-checks";
       packageName = "npm-install-checks";
@@ -14652,13 +14616,13 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-registry-client-7.3.0" = {
+    "npm-registry-client-7.4.5" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "7.3.0";
+      version = "7.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz";
-        sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.5.tgz";
+        sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df";
       };
     };
     "opener-1.4.2" = {
@@ -14688,15 +14652,6 @@ let
         sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
       };
     };
-    "request-2.78.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.78.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
-        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
-      };
-    };
     "sorted-union-stream-2.1.3" = {
       name = "sorted-union-stream";
       packageName = "sorted-union-stream";
@@ -14715,6 +14670,15 @@ let
         sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
+    "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";
+      };
+    };
     "lodash._baseindexof-3.1.0" = {
       name = "lodash._baseindexof";
       packageName = "lodash._baseindexof";
@@ -15057,13 +15021,13 @@ let
         sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d";
       };
     };
-    "update-notifier-1.0.2" = {
+    "update-notifier-1.0.3" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.2.tgz";
-        sha1 = "27c90519196dc15015be02a34ea52986feab8877";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz";
+        sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a";
       };
     };
     "request-2.75.0" = {
@@ -15210,6 +15174,15 @@ let
         sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
       };
     };
+    "timed-out-3.1.3" = {
+      name = "timed-out";
+      packageName = "timed-out";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
+        sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217";
+      };
+    };
     "unzip-response-1.0.2" = {
       name = "unzip-response";
       packageName = "unzip-response";
@@ -15330,13 +15303,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.1.11" = {
+    "service-runner-2.1.13" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.1.11";
+      version = "2.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz";
-        sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz";
+        sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb";
       };
     };
     "simplediff-0.1.1" = {
@@ -15393,6 +15366,24 @@ let
         sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
       };
     };
+    "object.assign-4.0.4" = {
+      name = "object.assign";
+      packageName = "object.assign";
+      version = "4.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz";
+        sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
+      };
+    };
+    "define-properties-1.1.2" = {
+      name = "define-properties";
+      packageName = "define-properties";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
+        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
+      };
+    };
     "gelfling-0.2.0" = {
       name = "gelfling";
       packageName = "gelfling";
@@ -15817,13 +15808,13 @@ let
         sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364";
       };
     };
-    "array-flatten-2.1.0" = {
+    "array-flatten-2.1.1" = {
       name = "array-flatten";
       packageName = "array-flatten";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.0.tgz";
-        sha1 = "26a692c83881fc68dac3ec5d1f0c1b49bf2304d9";
+        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz";
+        sha1 = "426bb9da84090c1838d812c8150af20a8331e296";
       };
     };
     "dns-equal-1.0.0" = {
@@ -15880,13 +15871,22 @@ let
         sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
       };
     };
-    "run-async-2.2.0" = {
+    "mute-stream-0.0.6" = {
+      name = "mute-stream";
+      packageName = "mute-stream";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
+        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
+      };
+    };
+    "run-async-2.3.0" = {
       name = "run-async";
       packageName = "run-async";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.2.0.tgz";
-        sha1 = "8783abd83c7bb86f41ee0602fc82404b3bd6e8b9";
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
+        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
       };
     };
     "rx-4.1.0" = {
@@ -15943,15 +15943,6 @@ let
         sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
       };
     };
-    "socket.io-1.6.0" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz";
-        sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1";
-      };
-    };
     "torrent-stream-0.18.1" = {
       name = "torrent-stream";
       packageName = "torrent-stream";
@@ -16321,123 +16312,6 @@ let
         sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
       };
     };
-    "engine.io-1.8.0" = {
-      name = "engine.io";
-      packageName = "engine.io";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz";
-        sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa";
-      };
-    };
-    "socket.io-adapter-0.5.0" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
-        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
-      };
-    };
-    "socket.io-client-1.6.0" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz";
-        sha1 = "5b668f4f771304dfeed179064708386fa6717853";
-      };
-    };
-    "socket.io-parser-2.3.1" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
-        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
-      };
-    };
-    "engine.io-parser-1.3.1" = {
-      name = "engine.io-parser";
-      packageName = "engine.io-parser";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz";
-        sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf";
-      };
-    };
-    "base64-arraybuffer-0.1.5" = {
-      name = "base64-arraybuffer";
-      packageName = "base64-arraybuffer";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
-        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
-      };
-    };
-    "wtf-8-1.0.0" = {
-      name = "wtf-8";
-      packageName = "wtf-8";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
-        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
-      };
-    };
-    "component-emitter-1.2.1" = {
-      name = "component-emitter";
-      packageName = "component-emitter";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
-        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
-      };
-    };
-    "engine.io-client-1.8.0" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz";
-        sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c";
-      };
-    };
-    "parseuri-0.0.5" = {
-      name = "parseuri";
-      packageName = "parseuri";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
-        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
-      };
-    };
-    "parsejson-0.0.3" = {
-      name = "parsejson";
-      packageName = "parsejson";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
-        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
-      };
-    };
-    "parseqs-0.0.5" = {
-      name = "parseqs";
-      packageName = "parseqs";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
-        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
-      };
-    };
-    "xmlhttprequest-ssl-1.5.3" = {
-      name = "xmlhttprequest-ssl";
-      packageName = "xmlhttprequest-ssl";
-      version = "1.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
-        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
-      };
-    };
     "bittorrent-dht-3.2.6" = {
       name = "bittorrent-dht";
       packageName = "bittorrent-dht";
@@ -16717,13 +16591,13 @@ let
         sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
       };
     };
-    "recast-0.11.17" = {
+    "recast-0.11.18" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.17";
+      version = "0.11.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.17.tgz";
-        sha1 = "67e829df49ef8ea822381cc516d305411e60bad8";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.18.tgz";
+        sha1 = "07af6257ca769868815209401d4d60eef1b5b947";
       };
     };
     "ast-types-0.9.2" = {
@@ -16735,13 +16609,13 @@ let
         sha1 = "2cc19979d15c655108bf565323b8e7ee38751f6b";
       };
     };
-    "esprima-3.1.1" = {
+    "esprima-3.1.3" = {
       name = "esprima";
       packageName = "esprima";
-      version = "3.1.1";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.1.tgz";
-        sha1 = "02dbcc5ac3ece81070377f99158ec742ab5dda06";
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
       };
     };
     "base62-0.1.1" = {
@@ -16927,11 +16801,11 @@ let
     "oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" = {
       name = "oauth";
       packageName = "oauth";
-      version = "0.9.14";
+      version = "0.9.15";
       src = fetchurl {
-        name = "oauth-0.9.14.tar.gz";
+        name = "oauth-0.9.15.tar.gz";
         url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master;
-        sha256 = "abd0d7be4fb10804e5a38ee66a4db5fc36d2ed045be52e7c8b7e19e4c9e16bd8";
+        sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947";
       };
     };
     "connect-2.3.9" = {
@@ -17213,13 +17087,13 @@ let
         sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414";
       };
     };
-    "sanitize-html-1.13.0" = {
+    "sanitize-html-1.14.1" = {
       name = "sanitize-html";
       packageName = "sanitize-html";
-      version = "1.13.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz";
-        sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631";
+        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz";
+        sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8";
       };
     };
     "linkify-it-1.2.4" = {
@@ -17438,13 +17312,13 @@ let
         sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
       };
     };
-    "csv-parse-1.1.7" = {
+    "csv-parse-1.1.9" = {
       name = "csv-parse";
       packageName = "csv-parse";
-      version = "1.1.7";
+      version = "1.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.7.tgz";
-        sha1 = "6e4678f7967013ac823929a4303a3ce177115abc";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.9.tgz";
+        sha1 = "5010f93e052578fcab67e30e9b59129c6248ad81";
       };
     };
     "stream-transform-0.1.1" = {
@@ -17636,13 +17510,13 @@ let
         sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2";
       };
     };
-    "clap-1.1.1" = {
+    "clap-1.1.2" = {
       name = "clap";
       packageName = "clap";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clap/-/clap-1.1.1.tgz";
-        sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d";
+        url = "https://registry.npmjs.org/clap/-/clap-1.1.2.tgz";
+        sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed";
       };
     };
     "async-2.1.2" = {
@@ -17699,6 +17573,15 @@ let
         sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4";
       };
     };
+    "request-2.78.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.78.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
+        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+      };
+    };
     "sprintf-0.1.5" = {
       name = "sprintf";
       packageName = "sprintf";
@@ -17798,6 +17681,15 @@ let
         sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
       };
     };
+    "xmldom-0.1.22" = {
+      name = "xmldom";
+      packageName = "xmldom";
+      version = "0.1.22";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
+        sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
+      };
+    };
     "qs-6.0.2" = {
       name = "qs";
       packageName = "qs";
@@ -17807,31 +17699,22 @@ let
         sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
       };
     };
-    "bluebird-3.3.5" = {
-      name = "bluebird";
-      packageName = "bluebird";
-      version = "3.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.3.5.tgz";
-        sha1 = "5ee747f1c7bd967658b683936430aee753955a34";
-      };
-    };
-    "blueimp-md5-2.3.1" = {
+    "blueimp-md5-2.6.0" = {
       name = "blueimp-md5";
       packageName = "blueimp-md5";
-      version = "2.3.1";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz";
-        sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a";
+        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.6.0.tgz";
+        sha1 = "c96dd67f57db522da9a0c49b464ca44e20c04e0f";
       };
     };
-    "color-0.11.4" = {
+    "color-1.0.3" = {
       name = "color";
       packageName = "color";
-      version = "0.11.4";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz";
-        sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764";
+        url = "https://registry.npmjs.org/color/-/color-1.0.3.tgz";
+        sha1 = "e48e832d85f14ef694fb468811c2d5cfe729b55d";
       };
     };
     "crossroads-0.12.2" = {
@@ -17843,31 +17726,22 @@ let
         sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2";
       };
     };
-    "diff2html-1.2.0" = {
+    "diff2html-2.0.11" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "1.2.0";
+      version = "2.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-1.2.0.tgz";
-        sha1 = "8b54af41c180befd9cb1caa130a3d76081ae4a07";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.0.11.tgz";
+        sha1 = "b0ccb1d8da49702fdc191737c4b1f5e6fa8affc6";
       };
     };
-    "express-4.13.4" = {
-      name = "express";
-      packageName = "express";
-      version = "4.13.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.13.4.tgz";
-        sha1 = "3c0b76f3c77590c8345739061ec0bd3ba067ec24";
-      };
-    };
-    "express-session-1.13.0" = {
+    "express-session-1.14.2" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.13.0";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.13.0.tgz";
-        sha1 = "8ac3b5c0188b48382851d88207b8e7746efb4011";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz";
+        sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275";
       };
     };
     "forever-monitor-1.1.0" = {
@@ -17915,31 +17789,13 @@ let
         sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
       };
     };
-    "lodash-4.12.0" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz";
-        sha1 = "2bd6dc46a040f59e686c972ed21d93dc59053258";
-      };
-    };
-    "moment-2.13.0" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.13.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.13.0.tgz";
-        sha1 = "24162d99521e6d40f99ae6939e806d2139eaac52";
-      };
-    };
-    "npm-3.9.6" = {
+    "npm-4.1.2" = {
       name = "npm";
       packageName = "npm";
-      version = "3.9.6";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-3.9.6.tgz";
-        sha1 = "0ef1d272a069ad95bdca8b2dfe6fcd82f4b461d7";
+        url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
+        sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
       };
     };
     "octicons-3.5.0" = {
@@ -17960,13 +17816,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-0.11.0" = {
+    "raven-1.1.1" = {
       name = "raven";
       packageName = "raven";
-      version = "0.11.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-0.11.0.tgz";
-        sha1 = "32981138a93e4c8ad08cfc17e46b85b453dc107b";
+        url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz";
+        sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42";
       };
     };
     "signals-1.0.0" = {
@@ -17987,31 +17843,22 @@ let
         sha1 = "e0767014167825957de7e125c29b0fa89796ea03";
       };
     };
-    "socket.io-1.4.8" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "1.4.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.8.tgz";
-        sha1 = "e576f330cd0bed64e55b3fd26df991141884867b";
-      };
-    };
-    "winston-2.2.0" = {
+    "winston-2.3.0" = {
       name = "winston";
       packageName = "winston";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.2.0.tgz";
-        sha1 = "2c853dd87ab552a8e8485d72cbbf9a2286f029b7";
+        url = "https://registry.npmjs.org/winston/-/winston-2.3.0.tgz";
+        sha1 = "207faaab6fccf3fe493743dd2b03dbafc7ceb78c";
       };
     };
-    "yargs-4.7.1" = {
+    "yargs-6.6.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "4.7.1";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-4.7.1.tgz";
-        sha1 = "e60432658a3387ff269c028eacde4a512e438dff";
+        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
       };
     };
     "color-convert-1.8.2" = {
@@ -18023,13 +17870,13 @@ let
         sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339";
       };
     };
-    "color-string-0.3.0" = {
+    "color-string-1.4.0" = {
       name = "color-string";
       packageName = "color-string";
-      version = "0.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz";
-        sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991";
+        url = "https://registry.npmjs.org/color-string/-/color-string-1.4.0.tgz";
+        sha1 = "2b47f8565fb0eb52f9f77c801992b8ca55d6e898";
       };
     };
     "color-name-1.1.1" = {
@@ -18041,58 +17888,58 @@ let
         sha1 = "4b1415304cf50028ea81643643bd82ea05803689";
       };
     };
-    "diff-2.2.3" = {
+    "simple-swizzle-0.2.2" = {
+      name = "simple-swizzle";
+      packageName = "simple-swizzle";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz";
+        sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a";
+      };
+    };
+    "is-arrayish-0.3.1" = {
+      name = "is-arrayish";
+      packageName = "is-arrayish";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz";
+        sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd";
+      };
+    };
+    "diff-3.2.0" = {
       name = "diff";
       packageName = "diff";
-      version = "2.2.3";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
-        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
+        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
+        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
       };
     };
-    "cookie-0.1.5" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.1.5";
+    "hogan.js-3.0.2" = {
+      name = "hogan.js";
+      packageName = "hogan.js";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.5.tgz";
-        sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c";
+        url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz";
+        sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd";
       };
     };
-    "finalhandler-0.4.1" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.4.1";
+    "whatwg-fetch-1.1.1" = {
+      name = "whatwg-fetch";
+      packageName = "whatwg-fetch";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
-        sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
+        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz";
+        sha1 = "ac3c9d39f320c6dce5339969d054ef43dd333319";
       };
     };
-    "send-0.13.1" = {
-      name = "send";
-      packageName = "send";
-      version = "0.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.13.1.tgz";
-        sha1 = "a30d5f4c82c8a9bae9ad00a1d9b1bdbe6f199ed7";
-      };
-    };
-    "cookie-0.2.3" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.2.3.tgz";
-        sha1 = "1a59536af68537a21178a01346f87cb059d2ae5c";
-      };
-    };
-    "crc-3.4.0" = {
+    "crc-3.4.1" = {
       name = "crc";
       packageName = "crc";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz";
-        sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f";
+        url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz";
+        sha1 = "65d5830b1a2569557cfb324c0e679998521473ee";
       };
     };
     "broadway-0.2.10" = {
@@ -18221,103 +18068,13 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "lodash.clonedeep-4.3.2" = {
-      name = "lodash.clonedeep";
-      packageName = "lodash.clonedeep";
-      version = "4.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz";
-        sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de";
-      };
-    };
-    "lodash.union-4.4.0" = {
-      name = "lodash.union";
-      packageName = "lodash.union";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz";
-        sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38";
-      };
-    };
-    "lodash.uniq-4.3.0" = {
-      name = "lodash.uniq";
-      packageName = "lodash.uniq";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz";
-        sha1 = "dcad810876841447d8f3ec662323c86a6d938227";
-      };
-    };
-    "lodash.without-4.2.0" = {
-      name = "lodash.without";
-      packageName = "lodash.without";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz";
-        sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6";
-      };
-    };
-    "node-gyp-3.3.1" = {
+    "node-gyp-3.5.0" = {
       name = "node-gyp";
       packageName = "node-gyp";
-      version = "3.3.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz";
-        sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0";
-      };
-    };
-    "request-2.72.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.72.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz";
-        sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1";
-      };
-    };
-    "retry-0.9.0" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz";
-        sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d";
-      };
-    };
-    "lodash._baseclone-4.5.7" = {
-      name = "lodash._baseclone";
-      packageName = "lodash._baseclone";
-      version = "4.5.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz";
-        sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
-      };
-    };
-    "lodash._baseflatten-4.2.1" = {
-      name = "lodash._baseflatten";
-      packageName = "lodash._baseflatten";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz";
-        sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208";
-      };
-    };
-    "lodash._basedifference-4.5.0" = {
-      name = "lodash._basedifference";
-      packageName = "lodash._basedifference";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz";
-        sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938";
-      };
-    };
-    "qs-6.1.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz";
-        sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26";
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
+        sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
       };
     };
     "lsmod-1.0.0" = {
@@ -18329,13 +18086,13 @@ let
         sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b";
       };
     };
-    "stack-trace-0.0.7" = {
-      name = "stack-trace";
-      packageName = "stack-trace";
-      version = "0.0.7";
+    "uuid-3.0.0" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
-        sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
+        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
       };
     };
     "eve-0.4.2" = {
@@ -18347,67 +18104,13 @@ let
         sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
       };
     };
-    "engine.io-1.6.11" = {
-      name = "engine.io";
-      packageName = "engine.io";
-      version = "1.6.11";
+    "yargs-parser-4.2.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.11.tgz";
-        sha1 = "2533a97a65876c40ffcf95397b7ef9b495c423fe";
-      };
-    };
-    "socket.io-client-1.4.8" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.4.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.8.tgz";
-        sha1 = "481b241e73df140ea1a4fb03486a85ad097f5558";
-      };
-    };
-    "ws-1.1.0" = {
-      name = "ws";
-      packageName = "ws";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.1.0.tgz";
-        sha1 = "c1d6fd1515d3ceff1f0ae2759bf5fd77030aad1d";
-      };
-    };
-    "engine.io-client-1.6.11" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.6.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.11.tgz";
-        sha1 = "7d250d8fa1c218119ecde51390458a57d5171376";
-      };
-    };
-    "pkg-conf-1.1.3" = {
-      name = "pkg-conf";
-      packageName = "pkg-conf";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-1.1.3.tgz";
-        sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b";
-      };
-    };
-    "set-blocking-1.0.0" = {
-      name = "set-blocking";
-      packageName = "set-blocking";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-1.0.0.tgz";
-        sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5";
-      };
-    };
-    "symbol-0.2.3" = {
-      name = "symbol";
-      packageName = "symbol";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/symbol/-/symbol-0.2.3.tgz";
-        sha1 = "3b9873b8a901e47c6efe21526a3ac372ef28bbc7";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
       };
     };
     "kew-0.1.7" = {
@@ -18491,13 +18194,13 @@ let
         sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
       };
     };
-    "node-libs-browser-0.6.0" = {
+    "node-libs-browser-0.7.0" = {
       name = "node-libs-browser";
       packageName = "node-libs-browser";
-      version = "0.6.0";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.6.0.tgz";
-        sha1 = "244806d44d319e048bc8607b5cc4eaf9a29d2e3c";
+        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz";
+        sha1 = "3e272c0819e308935e26674408d7af0e1491b83b";
       };
     };
     "tapable-0.1.10" = {
@@ -18518,13 +18221,13 @@ let
         sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b";
       };
     };
-    "webpack-core-0.6.8" = {
+    "webpack-core-0.6.9" = {
       name = "webpack-core";
       packageName = "webpack-core";
-      version = "0.6.8";
+      version = "0.6.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz";
-        sha1 = "edf9135de00a6a3c26dd0f14b208af0aa4af8d0a";
+        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz";
+        sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2";
       };
     };
     "memory-fs-0.2.0" = {
@@ -18554,76 +18257,40 @@ let
         sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
-    "json5-0.5.0" = {
+    "json5-0.5.1" = {
       name = "json5";
       packageName = "json5";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz";
-        sha1 = "9b20715b026cbe3778fd769edccd822d8332a5b2";
+        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
+        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
       };
     };
-    "assert-1.4.1" = {
-      name = "assert";
-      packageName = "assert";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
-        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" = {
+    "crypto-browserify-3.3.0" = {
       name = "crypto-browserify";
       packageName = "crypto-browserify";
-      version = "3.2.8";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz";
-        sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189";
+        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz";
+        sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c";
       };
     };
-    "http-browserify-1.7.0" = {
-      name = "http-browserify";
-      packageName = "http-browserify";
-      version = "1.7.0";
+    "os-browserify-0.2.1" = {
+      name = "os-browserify";
+      packageName = "os-browserify";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
-        sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
+        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz";
+        sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f";
       };
     };
-    "https-browserify-0.0.0" = {
-      name = "https-browserify";
-      packageName = "https-browserify";
-      version = "0.0.0";
+    "timers-browserify-2.0.2" = {
+      name = "timers-browserify";
+      packageName = "timers-browserify";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
-        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";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz";
+        sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86";
       };
     };
     "pbkdf2-compat-2.0.1" = {
@@ -18653,166 +18320,31 @@ let
         sha1 = "17ddeddc5f722fb66501658895461977867315ba";
       };
     };
-    "Base64-0.2.1" = {
-      name = "Base64";
-      packageName = "Base64";
-      version = "0.2.1";
+    "browserify-aes-0.4.0" = {
+      name = "browserify-aes";
+      packageName = "browserify-aes";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
-        sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
+        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz";
+        sha1 = "067149b668df31c4b58533e02d01e806d8608e2c";
       };
     };
-    "source-list-map-0.1.6" = {
+    "setimmediate-1.0.5" = {
+      name = "setimmediate";
+      packageName = "setimmediate";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz";
+        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
+      };
+    };
+    "source-list-map-0.1.8" = {
       name = "source-list-map";
       packageName = "source-list-map";
-      version = "0.1.6";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.6.tgz";
-        sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f";
-      };
-    };
-    "babel-runtime-6.18.0" = {
-      name = "babel-runtime";
-      packageName = "babel-runtime";
-      version = "6.18.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz";
-        sha1 = "0f4177ffd98492ef13b9f823e9994a02584c9078";
-      };
-    };
-    "death-1.0.0" = {
-      name = "death";
-      packageName = "death";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/death/-/death-1.0.0.tgz";
-        sha1 = "4d46e15488d4b636b699f0671b04632d752fd2de";
-      };
-    };
-    "detect-indent-4.0.0" = {
-      name = "detect-indent";
-      packageName = "detect-indent";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz";
-        sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
-      };
-    };
-    "invariant-2.2.2" = {
-      name = "invariant";
-      packageName = "invariant";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz";
-        sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360";
-      };
-    };
-    "is-ci-1.0.10" = {
-      name = "is-ci";
-      packageName = "is-ci";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz";
-        sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
-      };
-    };
-    "leven-2.0.0" = {
-      name = "leven";
-      packageName = "leven";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/leven/-/leven-2.0.0.tgz";
-        sha1 = "74c45744439550da185801912829f61d22071bc1";
-      };
-    };
-    "node-emoji-1.4.1" = {
-      name = "node-emoji";
-      packageName = "node-emoji";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.4.1.tgz";
-        sha1 = "c9fa0cf91094335bcb967a6f42b2305c15af2ebc";
-      };
-    };
-    "object-path-0.11.3" = {
-      name = "object-path";
-      packageName = "object-path";
-      version = "0.11.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-path/-/object-path-0.11.3.tgz";
-        sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554";
-      };
-    };
-    "proper-lockfile-1.2.0" = {
-      name = "proper-lockfile";
-      packageName = "proper-lockfile";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz";
-        sha1 = "ceff5dd89d3e5f10fb75e1e8e76bc75801a59c34";
-      };
-    };
-    "request-capture-har-1.1.4" = {
-      name = "request-capture-har";
-      packageName = "request-capture-har";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.1.4.tgz";
-        sha1 = "e6ad76eb8e7a1714553fdbeef32cd4518e4e2013";
-      };
-    };
-    "roadrunner-1.1.0" = {
-      name = "roadrunner";
-      packageName = "roadrunner";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz";
-        sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
-      };
-    };
-    "regenerator-runtime-0.9.6" = {
-      name = "regenerator-runtime";
-      packageName = "regenerator-runtime";
-      version = "0.9.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz";
-        sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029";
-      };
-    };
-    "loose-envify-1.3.0" = {
-      name = "loose-envify";
-      packageName = "loose-envify";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz";
-        sha1 = "6b26248c42f6d4fa4b0d8542f78edfcde35642a8";
-      };
-    };
-    "ci-info-1.0.0" = {
-      name = "ci-info";
-      packageName = "ci-info";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz";
-        sha1 = "dc5285f2b4e251821683681c381c3388f46ec534";
-      };
-    };
-    "string.prototype.codepointat-0.2.0" = {
-      name = "string.prototype.codepointat";
-      packageName = "string.prototype.codepointat";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz";
-        sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78";
-      };
-    };
-    "err-code-1.1.1" = {
-      name = "err-code";
-      packageName = "err-code";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.1.tgz";
-        sha1 = "739d71b6851f24d050ea18c79a5b722420771d59";
+        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz";
+        sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106";
       };
     };
   };
@@ -18821,10 +18353,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.4";
+    version = "1.9.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.4.tgz";
-      sha1 = "8f85b28758ed0e7a251a635cd2e6a73ce92e9dde";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz";
+      sha1 = "78be031931f4b9012f6085e1544069c56dcba233";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -18866,21 +18398,20 @@ in
           sources."uglify-to-browserify-1.0.2"
         ];
       })
-      sources."resolve-1.1.7"
+      sources."resolve-1.2.0"
       (sources."global-paths-0.1.2" // {
         dependencies = [
           sources."array-unique-0.2.1"
           (sources."global-modules-0.2.3" // {
             dependencies = [
-              (sources."global-prefix-0.1.4" // {
+              (sources."global-prefix-0.1.5" // {
                 dependencies = [
-                  sources."ini-1.3.4"
-                  (sources."osenv-0.1.3" // {
+                  (sources."homedir-polyfill-1.0.1" // {
                     dependencies = [
-                      sources."os-homedir-1.0.2"
-                      sources."os-tmpdir-1.0.2"
+                      sources."parse-passwd-1.0.0"
                     ];
                   })
+                  sources."ini-1.3.4"
                   (sources."which-1.2.12" // {
                     dependencies = [
                       sources."isexe-1.1.2"
@@ -18926,10 +18457,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.7";
+    version = "0.10.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.7.tgz";
-      sha1 = "48e59f6be202122c0d71153efab4f924065da586";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz";
+      sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc";
     };
     dependencies = [
       (sources."adal-node-0.1.21" // {
@@ -18938,21 +18469,17 @@ in
           (sources."jws-3.1.4" // {
             dependencies = [
               sources."base64url-2.0.0"
-              (sources."jwa-1.1.4" // {
+              (sources."jwa-1.1.5" // {
                 dependencies = [
                   sources."buffer-equal-constant-time-1.0.1"
-                  (sources."ecdsa-sig-formatter-1.0.7" // {
-                    dependencies = [
-                      sources."base64-url-1.3.3"
-                    ];
-                  })
+                  sources."ecdsa-sig-formatter-1.0.9"
                 ];
               })
               sources."safe-buffer-5.0.1"
             ];
           })
           sources."node-uuid-1.4.7"
-          sources."xmldom-0.1.22"
+          sources."xmldom-0.1.27"
           sources."xpath.js-1.0.7"
         ];
       })
@@ -18971,9 +18498,11 @@ in
         ];
       })
       sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-cdn-0.2.1"
+      sources."azure-arm-cdn-1.0.0"
       sources."azure-arm-commerce-0.2.0"
-      sources."azure-arm-compute-0.19.0"
+      sources."azure-arm-compute-0.19.1"
+      sources."azure-arm-datalake-analytics-1.0.1-preview"
+      sources."azure-arm-datalake-store-1.0.1-preview"
       sources."azure-arm-hdinsight-0.2.2"
       sources."azure-arm-hdinsight-jobs-0.1.0"
       sources."azure-arm-insights-0.11.3"
@@ -18985,8 +18514,6 @@ in
       sources."azure-arm-dns-0.11.1"
       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"
@@ -19001,7 +18528,7 @@ in
         ];
       })
       sources."azure-asm-network-0.13.0"
-      sources."azure-arm-resource-1.4.5-preview"
+      sources."azure-arm-resource-1.6.1-preview"
       sources."azure-arm-storage-0.13.1-preview"
       sources."azure-asm-sb-0.10.1"
       sources."azure-asm-sql-0.10.1"
@@ -19043,7 +18570,7 @@ in
       sources."azure-arm-batch-0.3.0"
       sources."azure-batch-0.5.2"
       sources."azure-servicefabric-0.1.4"
-      sources."applicationinsights-0.15.12"
+      sources."applicationinsights-0.16.0"
       (sources."caller-id-0.1.0" // {
         dependencies = [
           sources."stack-trace-0.0.9"
@@ -19099,7 +18626,7 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.17.0"
+      sources."moment-2.17.1"
       (sources."ms-rest-1.15.2" // {
         dependencies = [
           sources."duplexer-0.1.1"
@@ -19113,7 +18640,6 @@ in
         ];
       })
       sources."node-forge-0.6.23"
-      sources."node-uuid-1.2.0"
       sources."omelette-0.1.0"
       (sources."openssl-wrapper-0.2.1" // {
         dependencies = [
@@ -19220,7 +18746,7 @@ in
             dependencies = [
               (sources."async-2.1.4" // {
                 dependencies = [
-                  sources."lodash-4.17.2"
+                  sources."lodash-4.17.4"
                 ];
               })
             ];
@@ -19233,12 +18759,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -19257,7 +18783,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -19286,14 +18812,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -19304,9 +18830,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."node-uuid-1.4.7"
@@ -19341,12 +18867,13 @@ in
       sources."streamline-streams-0.1.5"
       (sources."sync-request-3.0.0" // {
         dependencies = [
-          (sources."concat-stream-1.5.2" // {
+          (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.0.6" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
+                  sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
@@ -19379,6 +18906,7 @@ in
           sources."os-homedir-1.0.2"
         ];
       })
+      sources."uuid-3.0.1"
       sources."validator-5.2.0"
       (sources."winston-2.1.1" // {
         dependencies = [
@@ -19399,7 +18927,7 @@ in
       sources."xmlbuilder-0.4.3"
       (sources."read-1.0.7" // {
         dependencies = [
-          sources."mute-stream-0.0.6"
+          sources."mute-stream-0.0.7"
         ];
       })
     ];
@@ -19524,7 +19052,7 @@ in
                           sources."array-find-index-1.0.2"
                         ];
                       })
-                      sources."signal-exit-3.0.1"
+                      sources."signal-exit-3.0.2"
                     ];
                   })
                   sources."map-obj-1.0.1"
@@ -19691,7 +19219,7 @@ in
       (sources."promised-temp-0.1.0" // {
         dependencies = [
           sources."q-1.4.1"
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -19748,19 +19276,19 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "13.1.1";
+    version = "13.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-13.1.1.tgz";
-      sha1 = "72a2310e2f706ed87db929cf0ee73a5e195d9bb0";
+      url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
+      sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
     };
     dependencies = [
-      (sources."JSONStream-1.2.1" // {
+      (sources."JSONStream-1.3.0" // {
         dependencies = [
           sources."jsonparse-1.2.0"
           sources."through-2.3.8"
         ];
       })
-      sources."assert-1.3.0"
+      sources."assert-1.4.1"
       (sources."browser-pack-6.0.2" // {
         dependencies = [
           (sources."combine-source-map-0.7.2" // {
@@ -19774,7 +19302,11 @@ in
           sources."umd-3.0.1"
         ];
       })
-      sources."browser-resolve-1.11.2"
+      (sources."browser-resolve-1.11.2" // {
+        dependencies = [
+          sources."resolve-1.1.7"
+        ];
+      })
       (sources."browserify-zlib-0.1.4" // {
         dependencies = [
           sources."pako-0.2.9"
@@ -19842,7 +19374,7 @@ in
               })
               (sources."parse-asn1-5.0.0" // {
                 dependencies = [
-                  (sources."asn1.js-4.9.0" // {
+                  (sources."asn1.js-4.9.1" // {
                     dependencies = [
                       sources."minimalistic-assert-1.0.0"
                     ];
@@ -19894,7 +19426,7 @@ in
               sources."browserify-rsa-4.0.1"
               (sources."parse-asn1-5.0.0" // {
                 dependencies = [
-                  (sources."asn1.js-4.9.0" // {
+                  (sources."asn1.js-4.9.1" // {
                     dependencies = [
                       sources."minimalistic-assert-1.0.0"
                     ];
@@ -19918,8 +19450,9 @@ in
       sources."domain-browser-1.1.7"
       sources."duplexer2-0.1.4"
       sources."events-1.1.1"
-      (sources."glob-5.0.15" // {
+      (sources."glob-7.1.1" // {
         dependencies = [
+          sources."fs.realpath-1.0.0"
           (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
@@ -20009,7 +19542,7 @@ in
           sources."util-deprecate-1.0.2"
         ];
       })
-      sources."resolve-1.1.7"
+      sources."resolve-1.2.0"
       (sources."shasum-1.0.2" // {
         dependencies = [
           (sources."json-stable-stringify-0.0.1" // {
@@ -20029,9 +19562,9 @@ in
         ];
       })
       sources."stream-browserify-2.0.1"
-      (sources."stream-http-2.5.0" // {
+      (sources."stream-http-2.6.1" // {
         dependencies = [
-          sources."builtin-status-codes-2.0.0"
+          sources."builtin-status-codes-3.0.0"
           sources."to-arraybuffer-1.0.1"
         ];
       })
@@ -20046,18 +19579,7 @@ in
           sources."acorn-2.7.0"
         ];
       })
-      (sources."through2-2.0.1" // {
-        dependencies = [
-          (sources."readable-stream-2.0.6" // {
-            dependencies = [
-              sources."core-util-is-1.0.2"
-              sources."isarray-1.0.0"
-              sources."process-nextick-args-1.0.7"
-              sources."util-deprecate-1.0.2"
-            ];
-          })
-        ];
-      })
+      sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
       sources."tty-browserify-0.0.0"
       (sources."url-0.11.0" // {
@@ -20096,7 +19618,7 @@ in
     };
     dependencies = [
       sources."array-loop-1.0.0"
-      (sources."castv2-client-1.1.2" // {
+      (sources."castv2-client-1.2.0" // {
         dependencies = [
           (sources."castv2-0.1.9" // {
             dependencies = [
@@ -20165,7 +19687,7 @@ in
         ];
       })
       sources."debounced-seeker-1.0.0"
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -20193,7 +19715,7 @@ in
                       sources."array-find-index-1.0.2"
                     ];
                   })
-                  sources."signal-exit-3.0.1"
+                  sources."signal-exit-3.0.2"
                 ];
               })
               sources."map-obj-1.0.1"
@@ -20307,7 +19829,7 @@ in
         dependencies = [
           (sources."airplay-js-0.2.16" // {
             dependencies = [
-              (sources."mdns-js-0.5.1" // {
+              (sources."mdns-js-0.5.3" // {
                 dependencies = [
                   (sources."dns-js-0.2.1" // {
                     dependencies = [
@@ -20321,7 +19843,7 @@ in
                 dependencies = [
                   sources."base64-js-1.1.2"
                   sources."xmlbuilder-8.2.2"
-                  sources."xmldom-0.1.22"
+                  sources."xmldom-0.1.27"
                 ];
               })
             ];
@@ -20349,7 +19871,7 @@ in
             ];
           })
           sources."network-address-0.0.5"
-          sources."numeral-1.5.5"
+          sources."numeral-1.5.6"
           sources."open-0.0.5"
           (sources."optimist-0.6.1" // {
             dependencies = [
@@ -20370,15 +19892,15 @@ in
               (sources."parse-torrent-file-4.0.0" // {
                 dependencies = [
                   sources."bencode-0.10.0"
-                  (sources."simple-sha1-2.0.8" // {
+                  (sources."simple-sha1-2.1.0" // {
                     dependencies = [
-                      sources."rusha-0.8.4"
+                      sources."rusha-0.8.5"
                     ];
                   })
                   sources."uniq-1.0.1"
                 ];
               })
-              (sources."simple-get-2.3.0" // {
+              (sources."simple-get-2.4.0" // {
                 dependencies = [
                   (sources."once-1.4.0" // {
                     dependencies = [
@@ -20433,7 +19955,7 @@ in
                       sources."minimist-0.0.8"
                     ];
                   })
-                  (sources."random-access-file-1.3.1" // {
+                  (sources."random-access-file-1.4.0" // {
                     dependencies = [
                       sources."inherits-2.0.3"
                     ];
@@ -20462,9 +19984,9 @@ in
                   (sources."parse-torrent-file-2.1.4" // {
                     dependencies = [
                       sources."bencode-0.7.0"
-                      (sources."simple-sha1-2.0.8" // {
+                      (sources."simple-sha1-2.1.0" // {
                         dependencies = [
-                          sources."rusha-0.8.4"
+                          sources."rusha-0.8.5"
                         ];
                       })
                     ];
@@ -20577,13 +20099,13 @@ in
                       })
                       sources."random-iterate-1.0.1"
                       sources."run-series-1.1.4"
-                      (sources."simple-get-2.3.0" // {
+                      (sources."simple-get-2.4.0" // {
                         dependencies = [
                           sources."simple-concat-1.0.0"
                           sources."unzip-response-2.0.1"
                         ];
                       })
-                      (sources."simple-peer-6.0.7" // {
+                      (sources."simple-peer-6.1.3" // {
                         dependencies = [
                           sources."get-browser-rtc-1.0.2"
                           sources."randombytes-2.0.3"
@@ -20682,9 +20204,9 @@ in
               (sources."parse-torrent-file-2.1.4" // {
                 dependencies = [
                   sources."bencode-0.7.0"
-                  (sources."simple-sha1-2.0.8" // {
+                  (sources."simple-sha1-2.1.0" // {
                     dependencies = [
-                      sources."rusha-0.8.4"
+                      sources."rusha-0.8.5"
                     ];
                   })
                 ];
@@ -20730,12 +20252,13 @@ in
           (sources."codepage-1.4.0" // {
             dependencies = [
               sources."voc-0.5.0"
-              (sources."concat-stream-1.5.2" // {
+              (sources."concat-stream-1.6.0" // {
                 dependencies = [
                   sources."inherits-2.0.3"
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.0.6" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
+                      sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."process-nextick-args-1.0.7"
@@ -20745,7 +20268,7 @@ in
                   })
                 ];
               })
-              sources."exit-on-epipe-0.1.0"
+              sources."exit-on-epipe-1.0.0"
               (sources."commander-2.9.0" // {
                 dependencies = [
                   sources."graceful-readlink-1.0.1"
@@ -20762,7 +20285,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.17.2"
+              sources."lodash-4.17.4"
             ];
           })
         ];
@@ -20780,10 +20303,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.11.1";
+    version = "1.12.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
-      sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
+      sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -20842,7 +20365,7 @@ in
               })
             ];
           })
-          (sources."osenv-0.1.3" // {
+          (sources."osenv-0.1.4" // {
             dependencies = [
               sources."os-homedir-1.0.2"
               sources."os-tmpdir-1.0.2"
@@ -20856,7 +20379,7 @@ in
                   sources."lodash-3.10.1"
                 ];
               })
-              sources."xmldom-0.1.22"
+              sources."xmldom-0.1.27"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -20891,7 +20414,7 @@ in
               sources."dependency-ls-1.0.0"
               sources."is-url-1.2.2"
               sources."q-1.4.1"
-              (sources."shelljs-0.7.5" // {
+              (sources."shelljs-0.7.6" // {
                 dependencies = [
                   (sources."glob-7.1.1" // {
                     dependencies = [
@@ -20923,7 +20446,7 @@ in
                   sources."interpret-1.0.1"
                   (sources."rechoir-0.6.2" // {
                     dependencies = [
-                      sources."resolve-1.1.7"
+                      sources."resolve-1.2.0"
                     ];
                   })
                 ];
@@ -20939,7 +20462,7 @@ in
             dependencies = [
               (sources."browserify-13.1.0" // {
                 dependencies = [
-                  (sources."JSONStream-1.2.1" // {
+                  (sources."JSONStream-1.3.0" // {
                     dependencies = [
                       sources."jsonparse-1.2.0"
                       sources."through-2.3.8"
@@ -20959,7 +20482,11 @@ in
                       sources."umd-3.0.1"
                     ];
                   })
-                  sources."browser-resolve-1.11.2"
+                  (sources."browser-resolve-1.11.2" // {
+                    dependencies = [
+                      sources."resolve-1.1.7"
+                    ];
+                  })
                   (sources."browserify-zlib-0.1.4" // {
                     dependencies = [
                       sources."pako-0.2.9"
@@ -21026,7 +20553,7 @@ in
                           })
                           (sources."parse-asn1-5.0.0" // {
                             dependencies = [
-                              (sources."asn1.js-4.9.0" // {
+                              (sources."asn1.js-4.9.1" // {
                                 dependencies = [
                                   sources."minimalistic-assert-1.0.0"
                                 ];
@@ -21078,7 +20605,7 @@ in
                           sources."browserify-rsa-4.0.1"
                           (sources."parse-asn1-5.0.0" // {
                             dependencies = [
-                              (sources."asn1.js-4.9.0" // {
+                              (sources."asn1.js-4.9.1" // {
                                 dependencies = [
                                   sources."minimalistic-assert-1.0.0"
                                 ];
@@ -21169,7 +20696,7 @@ in
                       sources."util-deprecate-1.0.2"
                     ];
                   })
-                  sources."resolve-1.1.7"
+                  sources."resolve-1.2.0"
                   (sources."shasum-1.0.2" // {
                     dependencies = [
                       (sources."json-stable-stringify-0.0.1" // {
@@ -21189,9 +20716,9 @@ in
                     ];
                   })
                   sources."stream-browserify-2.0.1"
-                  (sources."stream-http-2.5.0" // {
+                  (sources."stream-http-2.6.1" // {
                     dependencies = [
-                      sources."builtin-status-codes-2.0.0"
+                      sources."builtin-status-codes-3.0.0"
                       sources."to-arraybuffer-1.0.1"
                     ];
                   })
@@ -21206,18 +20733,7 @@ in
                       sources."acorn-2.7.0"
                     ];
                   })
-                  (sources."through2-2.0.1" // {
-                    dependencies = [
-                      (sources."readable-stream-2.0.6" // {
-                        dependencies = [
-                          sources."core-util-is-1.0.2"
-                          sources."isarray-1.0.0"
-                          sources."process-nextick-args-1.0.7"
-                          sources."util-deprecate-1.0.2"
-                        ];
-                      })
-                    ];
-                  })
+                  sources."through2-2.0.3"
                   sources."timers-browserify-1.4.2"
                   sources."tty-browserify-0.0.0"
                   (sources."url-0.11.0" // {
@@ -21242,7 +20758,7 @@ in
             ];
           })
           sources."cordova-registry-mapper-1.1.15"
-          (sources."cordova-serve-1.0.0" // {
+          (sources."cordova-serve-1.0.1" // {
             dependencies = [
               (sources."chalk-1.1.3" // {
                 dependencies = [
@@ -21250,12 +20766,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -21265,9 +20781,9 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -21276,7 +20792,7 @@ in
                   sources."bytes-2.3.0"
                   (sources."compressible-2.0.9" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   (sources."debug-2.2.0" // {
@@ -21292,9 +20808,9 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -21330,10 +20846,10 @@ in
                   })
                   sources."parseurl-1.3.1"
                   sources."path-to-regexp-0.1.7"
-                  (sources."proxy-addr-1.1.2" // {
+                  (sources."proxy-addr-1.1.3" // {
                     dependencies = [
                       sources."forwarded-0.1.0"
-                      sources."ipaddr.js-1.1.1"
+                      sources."ipaddr.js-1.2.0"
                     ];
                   })
                   sources."qs-6.2.0"
@@ -21356,9 +20872,9 @@ in
                   (sources."type-is-1.6.14" // {
                     dependencies = [
                       sources."media-typer-0.3.0"
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                     ];
@@ -21443,7 +20959,7 @@ in
               sources."promzard-0.3.0"
               (sources."read-1.0.7" // {
                 dependencies = [
-                  sources."mute-stream-0.0.6"
+                  sources."mute-stream-0.0.7"
                 ];
               })
               (sources."read-package-json-2.0.4" // {
@@ -21550,8 +21066,8 @@ in
               sources."inflight-1.0.6"
               sources."inherits-2.0.3"
               sources."ini-1.3.4"
-              sources."lockfile-1.0.2"
-              (sources."lru-cache-4.0.1" // {
+              sources."lockfile-1.0.3"
+              (sources."lru-cache-4.0.2" // {
                 dependencies = [
                   sources."pseudomap-1.0.2"
                   sources."yallist-2.0.0"
@@ -21578,7 +21094,7 @@ in
                     dependencies = [
                       (sources."array-index-1.0.0" // {
                         dependencies = [
-                          (sources."debug-2.3.3" // {
+                          (sources."debug-2.6.0" // {
                             dependencies = [
                               sources."ms-0.7.2"
                             ];
@@ -21614,11 +21130,12 @@ in
               sources."npm-package-arg-4.1.1"
               (sources."npm-registry-client-7.2.1" // {
                 dependencies = [
-                  (sources."concat-stream-1.5.2" // {
+                  (sources."concat-stream-1.6.0" // {
                     dependencies = [
                       sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.0.6" // {
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
+                          sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
                           sources."isarray-1.0.0"
                           sources."process-nextick-args-1.0.7"
@@ -21649,7 +21166,7 @@ in
                 ];
               })
               sources."once-1.4.0"
-              (sources."osenv-0.1.3" // {
+              (sources."osenv-0.1.4" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                   sources."os-tmpdir-1.0.2"
@@ -21658,7 +21175,7 @@ in
               sources."path-is-inside-1.0.2"
               (sources."read-1.0.7" // {
                 dependencies = [
-                  sources."mute-stream-0.0.6"
+                  sources."mute-stream-0.0.7"
                 ];
               })
               (sources."read-installed-4.0.3" // {
@@ -21722,7 +21239,7 @@ in
                     dependencies = [
                       (sources."async-2.1.4" // {
                         dependencies = [
-                          sources."lodash-4.17.2"
+                          sources."lodash-4.17.4"
                         ];
                       })
                     ];
@@ -21750,7 +21267,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-4.0.0"
+                          sources."jsonpointer-4.0.1"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -21779,14 +21296,14 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.10.1" // {
+                      (sources."sshpk-1.10.2" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.0"
+                          sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
                           sources."jsbn-0.1.0"
-                          sources."tweetnacl-0.14.3"
+                          sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.0"
@@ -21797,9 +21314,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   sources."node-uuid-1.4.7"
@@ -21814,7 +21331,7 @@ in
                   sources."tunnel-agent-0.4.3"
                 ];
               })
-              sources."retry-0.10.0"
+              sources."retry-0.10.1"
               sources."rimraf-2.5.4"
               sources."semver-5.1.1"
               sources."sha-2.0.1"
@@ -21844,7 +21361,7 @@ in
               })
               sources."wrappy-1.0.2"
               sources."write-file-atomic-1.1.4"
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
               sources."imurmurhash-0.1.4"
             ];
           })
@@ -21857,7 +21374,7 @@ in
                   sources."lodash-3.10.1"
                 ];
               })
-              sources."xmldom-0.1.22"
+              sources."xmldom-0.1.27"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -21987,7 +21504,7 @@ in
           })
         ];
       })
-      (sources."insight-0.8.3" // {
+      (sources."insight-0.8.4" // {
         dependencies = [
           sources."async-1.5.2"
           (sources."chalk-1.1.3" // {
@@ -21996,12 +21513,12 @@ in
               sources."escape-string-regexp-1.0.5"
               (sources."has-ansi-2.0.0" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               sources."supports-color-2.0.0"
@@ -22016,13 +21533,13 @@ in
                 ];
               })
               sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.3" // {
+              (sources."osenv-0.1.4" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                 ];
               })
               sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.2.0" // {
+              (sources."write-file-atomic-1.3.1" // {
                 dependencies = [
                   sources."imurmurhash-0.1.4"
                   sources."slide-1.1.6"
@@ -22038,7 +21555,7 @@ in
           (sources."inquirer-0.10.1" // {
             dependencies = [
               sources."ansi-escapes-1.4.0"
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
               (sources."cli-cursor-1.0.2" // {
                 dependencies = [
                   (sources."restore-cursor-1.0.1" // {
@@ -22086,7 +21603,6 @@ in
               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 = [
@@ -22134,7 +21650,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -22163,14 +21679,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -22181,16 +21697,15 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
               sources."qs-6.3.0"
               sources."stringstream-0.0.5"
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.0"
             ];
           })
           (sources."tough-cookie-2.3.2" // {
@@ -22198,6 +21713,7 @@ in
               sources."punycode-1.4.1"
             ];
           })
+          sources."uuid-3.0.1"
         ];
       })
       (sources."nopt-3.0.1" // {
@@ -22215,12 +21731,12 @@ in
               sources."escape-string-regexp-1.0.5"
               (sources."has-ansi-2.0.0" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               sources."supports-color-2.0.0"
@@ -22236,13 +21752,13 @@ in
               })
               sources."object-assign-4.1.0"
               sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.3" // {
+              (sources."osenv-0.1.4" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                 ];
               })
               sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.2.0" // {
+              (sources."write-file-atomic-1.3.1" // {
                 dependencies = [
                   sources."imurmurhash-0.1.4"
                   sources."slide-1.1.6"
@@ -22355,7 +21871,7 @@ in
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
             ];
@@ -22373,14 +21889,14 @@ in
   csslint = nodeEnv.buildNodePackage {
     name = "csslint";
     packageName = "csslint";
-    version = "1.0.4";
+    version = "1.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.4.tgz";
-      sha1 = "0d3907933cc3f04b56960496d573387fbe9bb1e7";
+      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz";
+      sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9";
     };
     dependencies = [
-      sources."clone-1.0.2"
-      sources."parserlib-1.0.0"
+      sources."clone-2.1.0"
+      sources."parserlib-1.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22416,9 +21932,9 @@ in
         dependencies = [
           (sources."accepts-1.2.13" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."negotiator-0.5.3"
@@ -22483,7 +21999,7 @@ in
       (sources."hiredis-0.4.1" // {
         dependencies = [
           sources."bindings-1.2.1"
-          sources."nan-2.4.0"
+          sources."nan-2.5.0"
         ];
       })
       (sources."json-rpc2-0.8.1" // {
@@ -22602,7 +22118,7 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -22824,12 +22340,29 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."ndjson-1.4.3" // {
+      (sources."ndjson-1.5.0" // {
         dependencies = [
+          sources."json-stringify-safe-5.0.1"
           sources."minimist-1.2.0"
+          sources."split2-2.1.1"
+          (sources."through2-2.0.3" // {
+            dependencies = [
+              (sources."readable-stream-2.2.2" // {
+                dependencies = [
+                  sources."buffer-shims-1.0.0"
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-1.0.0"
+                  sources."inherits-2.0.3"
+                  sources."process-nextick-args-1.0.7"
+                  sources."string_decoder-0.10.31"
+                  sources."util-deprecate-1.0.2"
+                ];
+              })
+            ];
+          })
         ];
       })
-      (sources."pump-1.0.1" // {
+      (sources."pump-1.0.2" // {
         dependencies = [
           (sources."once-1.4.0" // {
             dependencies = [
@@ -22899,20 +22432,7 @@ in
       })
       (sources."tar-stream-1.5.2" // {
         dependencies = [
-          (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."bl-1.2.0"
           (sources."readable-stream-2.2.2" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
@@ -22952,24 +22472,25 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "2.4.2";
+    version = "3.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-2.4.2.tgz";
-      sha1 = "757c98aea05ee8714f0de2a33224c4136414633e";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.0.2.tgz";
+      sha1 = "0f010dbd6e26db0270abd88e3e5403062eb4f7a4";
     };
     dependencies = [
-      (sources."JSONStream-1.1.4" // {
+      (sources."JSONStream-1.3.0" // {
         dependencies = [
           sources."jsonparse-1.2.0"
           sources."through-2.3.8"
         ];
       })
-      (sources."async-2.0.1" // {
+      (sources."async-2.1.4" // {
         dependencies = [
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
         ];
       })
       sources."aws4-1.5.0"
+      sources."awscred-1.2.0"
       (sources."optimist-0.6.1" // {
         dependencies = [
           sources."wordwrap-0.0.3"
@@ -23000,12 +22521,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -23024,7 +22545,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -23053,14 +22574,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -23071,9 +22592,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -23085,7 +22606,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.0"
+          sources."uuid-3.0.1"
         ];
       })
     ];
@@ -23100,10 +22621,10 @@ in
   emoj = nodeEnv.buildNodePackage {
     name = "emoj";
     packageName = "emoj";
-    version = "0.3.0";
+    version = "1.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz";
-      sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c";
+      url = "https://registry.npmjs.org/emoj/-/emoj-1.0.0.tgz";
+      sha1 = "3cccbeec420e2b45f73b923e880c220392c055bd";
     };
     dependencies = [
       (sources."chalk-1.1.3" // {
@@ -23112,13 +22633,55 @@ in
           sources."escape-string-regexp-1.0.5"
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."got-6.6.3" // {
+      (sources."clipboardy-0.1.2" // {
+        dependencies = [
+          (sources."execa-0.5.1" // {
+            dependencies = [
+              (sources."cross-spawn-4.0.2" // {
+                dependencies = [
+                  (sources."lru-cache-4.0.2" // {
+                    dependencies = [
+                      sources."pseudomap-1.0.2"
+                      sources."yallist-2.0.0"
+                    ];
+                  })
+                  (sources."which-1.2.12" // {
+                    dependencies = [
+                      sources."isexe-1.1.2"
+                    ];
+                  })
+                ];
+              })
+              (sources."get-stream-2.3.1" // {
+                dependencies = [
+                  sources."object-assign-4.1.0"
+                  (sources."pinkie-promise-2.0.1" // {
+                    dependencies = [
+                      sources."pinkie-2.0.4"
+                    ];
+                  })
+                ];
+              })
+              sources."is-stream-1.1.0"
+              (sources."npm-run-path-2.0.2" // {
+                dependencies = [
+                  sources."path-key-2.0.1"
+                ];
+              })
+              sources."p-finally-1.0.0"
+              sources."signal-exit-3.0.2"
+              sources."strip-eof-1.0.0"
+            ];
+          })
+        ];
+      })
+      (sources."got-6.7.1" // {
         dependencies = [
           (sources."create-error-class-3.0.2" // {
             dependencies = [
@@ -23126,22 +22689,13 @@ in
             ];
           })
           sources."duplexer3-0.1.4"
-          (sources."get-stream-2.3.1" // {
-            dependencies = [
-              sources."object-assign-4.1.0"
-              (sources."pinkie-promise-2.0.1" // {
-                dependencies = [
-                  sources."pinkie-2.0.4"
-                ];
-              })
-            ];
-          })
+          sources."get-stream-3.0.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."node-status-codes-2.0.1"
-          sources."timed-out-3.0.0"
+          sources."safe-buffer-5.0.1"
+          sources."timed-out-4.0.0"
           sources."unzip-response-2.0.1"
           (sources."url-parse-lax-1.0.0" // {
             dependencies = [
@@ -23152,7 +22706,7 @@ in
       })
       (sources."has-ansi-2.0.0" // {
         dependencies = [
-          sources."ansi-regex-2.0.0"
+          sources."ansi-regex-2.1.1"
         ];
       })
       sources."lodash.debounce-4.0.8"
@@ -23171,7 +22725,11 @@ in
           })
         ];
       })
-      sources."mem-0.1.1"
+      (sources."mem-1.1.0" // {
+        dependencies = [
+          sources."mimic-fn-1.1.0"
+        ];
+      })
       (sources."meow-3.7.0" // {
         dependencies = [
           (sources."camelcase-keys-2.1.0" // {
@@ -23187,7 +22745,7 @@ in
                   sources."array-find-index-1.0.2"
                 ];
               })
-              sources."signal-exit-3.0.1"
+              sources."signal-exit-3.0.2"
             ];
           })
           sources."map-obj-1.0.1"
@@ -23305,13 +22863,13 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.10.2";
+    version = "3.13.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz";
-      sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz";
+      sha1 = "564d2646b5efded85df96985332edd91a23bff25";
     };
     dependencies = [
-      (sources."babel-code-frame-6.16.0" // {
+      (sources."babel-code-frame-6.20.0" // {
         dependencies = [
           sources."js-tokens-2.0.0"
         ];
@@ -23322,23 +22880,24 @@ in
           sources."escape-string-regexp-1.0.5"
           (sources."has-ansi-2.0.0" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."concat-stream-1.5.2" // {
+      (sources."concat-stream-1.6.0" // {
         dependencies = [
           sources."inherits-2.0.3"
           sources."typedarray-0.0.6"
-          (sources."readable-stream-2.0.6" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
+              sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
               sources."isarray-1.0.0"
               sources."process-nextick-args-1.0.7"
@@ -23348,7 +22907,7 @@ in
           })
         ];
       })
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -23388,7 +22947,7 @@ in
       })
       (sources."espree-3.3.2" // {
         dependencies = [
-          sources."acorn-4.0.3"
+          sources."acorn-4.0.4"
           (sources."acorn-jsx-3.0.1" // {
             dependencies = [
               sources."acorn-3.3.0"
@@ -23400,7 +22959,7 @@ in
       sources."esutils-2.0.2"
       (sources."file-entry-cache-2.0.0" // {
         dependencies = [
-          (sources."flat-cache-1.2.1" // {
+          (sources."flat-cache-1.2.2" // {
             dependencies = [
               sources."circular-json-0.3.1"
               (sources."del-2.2.2" // {
@@ -23470,7 +23029,7 @@ in
       (sources."inquirer-0.12.0" // {
         dependencies = [
           sources."ansi-escapes-1.4.0"
-          sources."ansi-regex-2.0.0"
+          sources."ansi-regex-2.1.1"
           (sources."cli-cursor-1.0.2" // {
             dependencies = [
               (sources."restore-cursor-1.0.1" // {
@@ -23531,7 +23090,7 @@ in
               sources."is-property-1.0.2"
             ];
           })
-          sources."jsonpointer-4.0.0"
+          sources."jsonpointer-4.0.1"
           sources."xtend-4.0.1"
         ];
       })
@@ -23561,7 +23120,7 @@ in
           sources."type-check-0.3.2"
         ];
       })
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -23574,7 +23133,7 @@ in
           sources."deep-is-0.1.3"
           sources."wordwrap-1.0.0"
           sources."type-check-0.3.2"
-          sources."fast-levenshtein-2.0.5"
+          sources."fast-levenshtein-2.0.6"
         ];
       })
       sources."path-is-inside-1.0.2"
@@ -23590,33 +23149,33 @@ in
           sources."resolve-from-1.0.1"
         ];
       })
-      (sources."shelljs-0.7.5" // {
+      (sources."shelljs-0.7.6" // {
         dependencies = [
           sources."interpret-1.0.1"
           (sources."rechoir-0.6.2" // {
             dependencies = [
-              sources."resolve-1.1.7"
+              sources."resolve-1.2.0"
             ];
           })
         ];
       })
       sources."strip-bom-3.0.0"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       (sources."table-3.8.3" // {
         dependencies = [
-          (sources."ajv-4.9.0" // {
+          (sources."ajv-4.10.4" // {
             dependencies = [
               sources."co-4.6.0"
             ];
           })
-          sources."ajv-keywords-1.1.1"
+          sources."ajv-keywords-1.5.0"
           sources."slice-ansi-0.0.4"
           (sources."string-width-2.0.0" // {
             dependencies = [
               sources."is-fullwidth-code-point-2.0.0"
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
             ];
@@ -23641,10 +23200,10 @@ in
   emojione = nodeEnv.buildNodePackage {
     name = "emojione";
     packageName = "emojione";
-    version = "2.2.6";
+    version = "2.2.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-2.2.6.tgz";
-      sha1 = "67dec452937d5b14ee669207ea41cdb1f69fb8f6";
+      url = "https://registry.npmjs.org/emojione/-/emojione-2.2.7.tgz";
+      sha1 = "46457cf6b9b2f8da13ae8a2e4e547de06ee15e96";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -23733,7 +23292,7 @@ in
               sources."pkginfo-0.4.0"
               (sources."read-1.0.7" // {
                 dependencies = [
-                  sources."mute-stream-0.0.6"
+                  sources."mute-stream-0.0.7"
                 ];
               })
               sources."revalidator-0.1.8"
@@ -23788,7 +23347,7 @@ in
                                       sources."isarray-1.0.0"
                                     ];
                                   })
-                                  sources."randomatic-1.1.5"
+                                  sources."randomatic-1.1.6"
                                   sources."repeat-string-1.6.1"
                                 ];
                               })
@@ -23806,7 +23365,7 @@ in
                       sources."extglob-0.3.2"
                       sources."filename-regex-2.0.0"
                       sources."is-extglob-1.0.0"
-                      (sources."kind-of-3.0.4" // {
+                      (sources."kind-of-3.1.0" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -23843,7 +23402,7 @@ in
               sources."inherits-2.0.3"
               (sources."is-binary-path-1.0.1" // {
                 dependencies = [
-                  sources."binary-extensions-1.7.0"
+                  sources."binary-extensions-1.8.0"
                 ];
               })
               (sources."is-glob-2.0.1" // {
@@ -23867,10 +23426,10 @@ in
                   sources."set-immediate-shim-1.0.1"
                 ];
               })
-              (sources."fsevents-1.0.15" // {
+              (sources."fsevents-1.0.17" // {
                 dependencies = [
-                  sources."nan-2.4.0"
-                  (sources."node-pre-gyp-0.6.31" // {
+                  sources."nan-2.5.0"
+                  (sources."node-pre-gyp-0.6.32" // {
                     dependencies = [
                       (sources."mkdirp-0.5.1" // {
                         dependencies = [
@@ -23882,7 +23441,7 @@ in
                           sources."abbrev-1.0.9"
                         ];
                       })
-                      (sources."npmlog-4.0.1" // {
+                      (sources."npmlog-4.0.2" // {
                         dependencies = [
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
@@ -23900,13 +23459,13 @@ in
                             ];
                           })
                           sources."console-control-strings-1.1.0"
-                          (sources."gauge-2.7.1" // {
+                          (sources."gauge-2.7.2" // {
                             dependencies = [
                               sources."aproba-1.0.4"
-                              sources."has-color-0.1.7"
+                              sources."supports-color-0.2.0"
                               sources."has-unicode-2.0.1"
                               sources."object-assign-4.1.0"
-                              sources."signal-exit-3.0.1"
+                              sources."signal-exit-3.0.2"
                               (sources."string-width-1.0.2" // {
                                 dependencies = [
                                   sources."code-point-at-1.1.0"
@@ -23919,7 +23478,7 @@ in
                               })
                               (sources."strip-ansi-3.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.0.0"
+                                  sources."ansi-regex-2.1.1"
                                 ];
                               })
                               sources."wide-align-1.1.0"
@@ -23961,12 +23520,12 @@ in
                                   sources."escape-string-regexp-1.0.5"
                                   (sources."has-ansi-2.0.0" // {
                                     dependencies = [
-                                      sources."ansi-regex-2.0.0"
+                                      sources."ansi-regex-2.1.1"
                                     ];
                                   })
                                   (sources."strip-ansi-3.0.1" // {
                                     dependencies = [
-                                      sources."ansi-regex-2.0.0"
+                                      sources."ansi-regex-2.1.1"
                                     ];
                                   })
                                   sources."supports-color-2.0.0"
@@ -23985,7 +23544,7 @@ in
                                       sources."is-property-1.0.2"
                                     ];
                                   })
-                                  sources."jsonpointer-4.0.0"
+                                  sources."jsonpointer-4.0.1"
                                   sources."xtend-4.0.1"
                                 ];
                               })
@@ -24014,14 +23573,14 @@ in
                                   sources."verror-1.3.6"
                                 ];
                               })
-                              (sources."sshpk-1.10.1" // {
+                              (sources."sshpk-1.10.2" // {
                                 dependencies = [
                                   sources."asn1-0.2.3"
                                   sources."assert-plus-1.0.0"
-                                  sources."dashdash-1.14.0"
+                                  sources."dashdash-1.14.1"
                                   sources."getpass-0.1.6"
                                   sources."jsbn-0.1.0"
-                                  sources."tweetnacl-0.14.3"
+                                  sources."tweetnacl-0.14.5"
                                   sources."jodid25519-1.0.2"
                                   sources."ecc-jsbn-0.1.1"
                                   sources."bcrypt-pbkdf-1.0.0"
@@ -24032,9 +23591,9 @@ in
                           sources."is-typedarray-1.0.0"
                           sources."isstream-0.1.2"
                           sources."json-stringify-safe-5.0.1"
-                          (sources."mime-types-2.1.13" // {
+                          (sources."mime-types-2.1.14" // {
                             dependencies = [
-                              sources."mime-db-1.25.0"
+                              sources."mime-db-1.26.0"
                             ];
                           })
                           sources."oauth-sign-0.8.2"
@@ -24046,7 +23605,7 @@ in
                             ];
                           })
                           sources."tunnel-agent-0.4.3"
-                          sources."uuid-3.0.0"
+                          sources."uuid-3.0.1"
                         ];
                       })
                       (sources."rimraf-2.5.4" // {
@@ -24167,7 +23726,7 @@ in
         ];
       })
       sources."path-is-absolute-1.0.1"
-      (sources."prettyjson-1.2.0" // {
+      (sources."prettyjson-1.2.1" // {
         dependencies = [
           sources."colors-1.1.2"
           sources."minimist-1.2.0"
@@ -24258,10 +23817,10 @@ in
   git-run = nodeEnv.buildNodePackage {
     name = "git-run";
     packageName = "git-run";
-    version = "0.5.2";
+    version = "0.5.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.2.tgz";
-      sha1 = "1edbc7163389067dd9f2c46ab3acff07889f8333";
+      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.3.tgz";
+      sha1 = "92005049d5514753d53c4f90fd6f2b2b29a8e08c";
     };
     dependencies = [
       (sources."minilog-2.0.8" // {
@@ -24344,11 +23903,11 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.11.1"
+      sources."coffee-script-1.12.2"
       (sources."jade-1.11.0" // {
         dependencies = [
           sources."character-parser-1.2.1"
-          (sources."clean-css-3.4.21" // {
+          (sources."clean-css-3.4.23" // {
             dependencies = [
               (sources."commander-2.8.1" // {
                 dependencies = [
@@ -24412,7 +23971,7 @@ in
               })
             ];
           })
-          (sources."uglify-js-2.7.4" // {
+          (sources."uglify-js-2.7.5" // {
             dependencies = [
               sources."async-0.2.10"
               sources."source-map-0.5.6"
@@ -24426,7 +23985,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.0.4" // {
+                              (sources."kind-of-3.1.0" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -24442,7 +24001,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.0.4" // {
+                              (sources."kind-of-3.1.0" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -24487,14 +24046,14 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.17.2"
+              sources."lodash-4.17.4"
             ];
           })
         ];
       })
       (sources."msgpack-1.0.2" // {
         dependencies = [
-          sources."nan-2.4.0"
+          sources."nan-2.5.0"
         ];
       })
     ];
@@ -24521,144 +24080,25 @@ in
           sources."escape-string-regexp-1.0.5"
           (sources."has-ansi-2.0.0" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           sources."supports-color-2.0.0"
         ];
       })
       sources."deprecated-0.0.1"
-      (sources."gulp-util-3.0.7" // {
+      (sources."gulp-util-3.0.8" // {
         dependencies = [
           sources."array-differ-1.0.0"
           sources."array-uniq-1.0.3"
           sources."beeper-1.1.1"
-          (sources."dateformat-1.0.12" // {
-            dependencies = [
-              sources."get-stdin-4.0.1"
-              (sources."meow-3.7.0" // {
-                dependencies = [
-                  (sources."camelcase-keys-2.1.0" // {
-                    dependencies = [
-                      sources."camelcase-2.1.1"
-                    ];
-                  })
-                  sources."decamelize-1.2.0"
-                  (sources."loud-rejection-1.6.0" // {
-                    dependencies = [
-                      (sources."currently-unhandled-0.4.1" // {
-                        dependencies = [
-                          sources."array-find-index-1.0.2"
-                        ];
-                      })
-                      sources."signal-exit-3.0.1"
-                    ];
-                  })
-                  sources."map-obj-1.0.1"
-                  (sources."normalize-package-data-2.3.5" // {
-                    dependencies = [
-                      sources."hosted-git-info-2.1.5"
-                      (sources."is-builtin-module-1.0.0" // {
-                        dependencies = [
-                          sources."builtin-modules-1.1.1"
-                        ];
-                      })
-                      (sources."validate-npm-package-license-3.0.1" // {
-                        dependencies = [
-                          (sources."spdx-correct-1.0.2" // {
-                            dependencies = [
-                              sources."spdx-license-ids-1.2.2"
-                            ];
-                          })
-                          sources."spdx-expression-parse-1.0.4"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."object-assign-4.1.0"
-                  (sources."read-pkg-up-1.0.1" // {
-                    dependencies = [
-                      (sources."find-up-1.1.2" // {
-                        dependencies = [
-                          sources."path-exists-2.1.0"
-                          (sources."pinkie-promise-2.0.1" // {
-                            dependencies = [
-                              sources."pinkie-2.0.4"
-                            ];
-                          })
-                        ];
-                      })
-                      (sources."read-pkg-1.1.0" // {
-                        dependencies = [
-                          (sources."load-json-file-1.1.0" // {
-                            dependencies = [
-                              sources."graceful-fs-4.1.11"
-                              (sources."parse-json-2.2.0" // {
-                                dependencies = [
-                                  (sources."error-ex-1.3.0" // {
-                                    dependencies = [
-                                      sources."is-arrayish-0.2.1"
-                                    ];
-                                  })
-                                ];
-                              })
-                              sources."pify-2.3.0"
-                              (sources."pinkie-promise-2.0.1" // {
-                                dependencies = [
-                                  sources."pinkie-2.0.4"
-                                ];
-                              })
-                              (sources."strip-bom-2.0.0" // {
-                                dependencies = [
-                                  sources."is-utf8-0.2.1"
-                                ];
-                              })
-                            ];
-                          })
-                          (sources."path-type-1.1.0" // {
-                            dependencies = [
-                              sources."graceful-fs-4.1.11"
-                              sources."pify-2.3.0"
-                              (sources."pinkie-promise-2.0.1" // {
-                                dependencies = [
-                                  sources."pinkie-2.0.4"
-                                ];
-                              })
-                            ];
-                          })
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."redent-1.0.0" // {
-                    dependencies = [
-                      (sources."indent-string-2.1.0" // {
-                        dependencies = [
-                          (sources."repeating-2.0.1" // {
-                            dependencies = [
-                              (sources."is-finite-1.0.2" // {
-                                dependencies = [
-                                  sources."number-is-nan-1.0.1"
-                                ];
-                              })
-                            ];
-                          })
-                        ];
-                      })
-                      sources."strip-indent-1.0.1"
-                    ];
-                  })
-                  sources."trim-newlines-1.0.0"
-                ];
-              })
-            ];
-          })
-          (sources."fancy-log-1.2.0" // {
+          sources."dateformat-2.0.0"
+          (sources."fancy-log-1.3.0" // {
             dependencies = [
               sources."time-stamp-1.0.1"
             ];
@@ -24720,13 +24160,14 @@ in
           })
           sources."object-assign-3.0.0"
           sources."replace-ext-0.0.1"
-          (sources."through2-2.0.1" // {
+          (sources."through2-2.0.3" // {
             dependencies = [
-              (sources."readable-stream-2.0.6" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
+                  sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
-                  sources."inherits-2.0.3"
                   sources."isarray-1.0.0"
+                  sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
                   sources."string_decoder-0.10.31"
                   sources."util-deprecate-1.0.2"
@@ -24779,7 +24220,7 @@ in
                                   sources."isarray-1.0.0"
                                 ];
                               })
-                              sources."randomatic-1.1.5"
+                              sources."randomatic-1.1.6"
                               sources."repeat-string-1.6.1"
                             ];
                           })
@@ -24797,7 +24238,7 @@ in
                   sources."extglob-0.3.2"
                   sources."filename-regex-2.0.0"
                   sources."is-extglob-1.0.0"
-                  (sources."kind-of-3.0.4" // {
+                  (sources."kind-of-3.1.0" // {
                     dependencies = [
                       sources."is-buffer-1.1.4"
                     ];
@@ -24840,15 +24281,14 @@ in
                   })
                   (sources."global-modules-0.2.3" // {
                     dependencies = [
-                      (sources."global-prefix-0.1.4" // {
+                      (sources."global-prefix-0.1.5" // {
                         dependencies = [
-                          sources."ini-1.3.4"
-                          (sources."osenv-0.1.3" // {
+                          (sources."homedir-polyfill-1.0.1" // {
                             dependencies = [
-                              sources."os-homedir-1.0.2"
-                              sources."os-tmpdir-1.0.2"
+                              sources."parse-passwd-1.0.0"
                             ];
                           })
+                          sources."ini-1.3.4"
                           (sources."which-1.2.12" // {
                             dependencies = [
                               sources."isexe-1.1.2"
@@ -24879,7 +24319,7 @@ in
                     dependencies = [
                       (sources."is-relative-0.2.1" // {
                         dependencies = [
-                          (sources."is-unc-path-0.1.1" // {
+                          (sources."is-unc-path-0.1.2" // {
                             dependencies = [
                               sources."unc-path-regex-0.1.2"
                             ];
@@ -24904,7 +24344,7 @@ in
           sources."lodash.isstring-4.0.1"
           sources."lodash.mapvalues-4.6.0"
           sources."rechoir-0.6.2"
-          sources."resolve-1.1.7"
+          sources."resolve-1.2.0"
         ];
       })
       sources."minimist-1.2.0"
@@ -25224,7 +24664,7 @@ in
               sources."deep-is-0.1.3"
               sources."type-check-0.3.2"
               sources."levn-0.3.0"
-              sources."fast-levenshtein-2.0.5"
+              sources."fast-levenshtein-2.0.6"
             ];
           })
           (sources."source-map-0.2.0" // {
@@ -25269,7 +24709,7 @@ in
               sources."amdefine-1.0.1"
             ];
           })
-          (sources."uglify-js-2.7.4" // {
+          (sources."uglify-js-2.7.5" // {
             dependencies = [
               sources."async-0.2.10"
               sources."source-map-0.5.6"
@@ -25283,7 +24723,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.0.4" // {
+                              (sources."kind-of-3.1.0" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -25299,7 +24739,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.0.4" // {
+                              (sources."kind-of-3.1.0" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -25521,13 +24961,13 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.3.0";
+    version = "1.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz";
-      sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f";
+      url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz";
+      sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b";
     };
     dependencies = [
-      sources."bluebird-3.4.6"
+      sources."bluebird-3.4.7"
       (sources."body-parser-1.15.2" // {
         dependencies = [
           sources."bytes-2.4.0"
@@ -25560,9 +25000,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -25594,7 +25034,7 @@ in
                                   sources."isarray-1.0.0"
                                 ];
                               })
-                              sources."randomatic-1.1.5"
+                              sources."randomatic-1.1.6"
                               sources."repeat-string-1.6.1"
                             ];
                           })
@@ -25612,7 +25052,7 @@ in
                   sources."extglob-0.3.2"
                   sources."filename-regex-2.0.0"
                   sources."is-extglob-1.0.0"
-                  (sources."kind-of-3.0.4" // {
+                  (sources."kind-of-3.1.0" // {
                     dependencies = [
                       sources."is-buffer-1.1.4"
                     ];
@@ -25649,7 +25089,7 @@ in
           sources."inherits-2.0.3"
           (sources."is-binary-path-1.0.1" // {
             dependencies = [
-              sources."binary-extensions-1.7.0"
+              sources."binary-extensions-1.8.0"
             ];
           })
           (sources."is-glob-2.0.1" // {
@@ -25673,10 +25113,10 @@ in
               sources."set-immediate-shim-1.0.1"
             ];
           })
-          (sources."fsevents-1.0.15" // {
+          (sources."fsevents-1.0.17" // {
             dependencies = [
-              sources."nan-2.4.0"
-              (sources."node-pre-gyp-0.6.31" // {
+              sources."nan-2.5.0"
+              (sources."node-pre-gyp-0.6.32" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
@@ -25688,7 +25128,7 @@ in
                       sources."abbrev-1.0.9"
                     ];
                   })
-                  (sources."npmlog-4.0.1" // {
+                  (sources."npmlog-4.0.2" // {
                     dependencies = [
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
@@ -25706,13 +25146,13 @@ in
                         ];
                       })
                       sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.7.1" // {
+                      (sources."gauge-2.7.2" // {
                         dependencies = [
                           sources."aproba-1.0.4"
-                          sources."has-color-0.1.7"
+                          sources."supports-color-0.2.0"
                           sources."has-unicode-2.0.1"
                           sources."object-assign-4.1.0"
-                          sources."signal-exit-3.0.1"
+                          sources."signal-exit-3.0.2"
                           (sources."string-width-1.0.2" // {
                             dependencies = [
                               sources."code-point-at-1.1.0"
@@ -25725,7 +25165,7 @@ in
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           sources."wide-align-1.1.0"
@@ -25767,12 +25207,12 @@ in
                               sources."escape-string-regexp-1.0.5"
                               (sources."has-ansi-2.0.0" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.0.0"
+                                  sources."ansi-regex-2.1.1"
                                 ];
                               })
                               (sources."strip-ansi-3.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.0.0"
+                                  sources."ansi-regex-2.1.1"
                                 ];
                               })
                               sources."supports-color-2.0.0"
@@ -25791,7 +25231,7 @@ in
                                   sources."is-property-1.0.2"
                                 ];
                               })
-                              sources."jsonpointer-4.0.0"
+                              sources."jsonpointer-4.0.1"
                               sources."xtend-4.0.1"
                             ];
                           })
@@ -25820,14 +25260,14 @@ in
                               sources."verror-1.3.6"
                             ];
                           })
-                          (sources."sshpk-1.10.1" // {
+                          (sources."sshpk-1.10.2" // {
                             dependencies = [
                               sources."asn1-0.2.3"
                               sources."assert-plus-1.0.0"
-                              sources."dashdash-1.14.0"
+                              sources."dashdash-1.14.1"
                               sources."getpass-0.1.6"
                               sources."jsbn-0.1.0"
-                              sources."tweetnacl-0.14.3"
+                              sources."tweetnacl-0.14.5"
                               sources."jodid25519-1.0.2"
                               sources."ecc-jsbn-0.1.1"
                               sources."bcrypt-pbkdf-1.0.0"
@@ -25838,9 +25278,9 @@ in
                       sources."is-typedarray-1.0.0"
                       sources."isstream-0.1.2"
                       sources."json-stringify-safe-5.0.1"
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                       sources."oauth-sign-0.8.2"
@@ -25852,7 +25292,7 @@ in
                         ];
                       })
                       sources."tunnel-agent-0.4.3"
-                      sources."uuid-3.0.0"
+                      sources."uuid-3.0.1"
                     ];
                   })
                   sources."semver-5.3.0"
@@ -25898,7 +25338,7 @@ in
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
         dependencies = [
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
         ];
       })
       (sources."connect-3.5.0" // {
@@ -25968,13 +25408,13 @@ in
         ];
       })
       sources."graceful-fs-4.1.11"
-      (sources."http-proxy-1.15.2" // {
+      (sources."http-proxy-1.16.2" // {
         dependencies = [
           sources."eventemitter3-1.2.0"
           sources."requires-port-1.0.0"
         ];
       })
-      sources."isbinaryfile-3.0.1"
+      sources."isbinaryfile-3.0.2"
       sources."lodash-3.10.1"
       (sources."log4js-0.6.38" // {
         dependencies = [
@@ -26009,105 +25449,101 @@ in
       sources."qjobs-1.1.5"
       sources."range-parser-1.2.0"
       sources."rimraf-2.5.4"
-      (sources."socket.io-1.4.7" // {
+      sources."safe-buffer-5.0.1"
+      (sources."socket.io-1.7.2" // {
         dependencies = [
-          (sources."engine.io-1.6.10" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
-              sources."base64id-0.1.0"
-              (sources."ws-1.0.1" // {
+              sources."ms-0.7.2"
+            ];
+          })
+          (sources."engine.io-1.8.2" // {
+            dependencies = [
+              (sources."accepts-1.3.3" // {
+                dependencies = [
+                  (sources."mime-types-2.1.14" // {
+                    dependencies = [
+                      sources."mime-db-1.26.0"
+                    ];
+                  })
+                  sources."negotiator-0.6.1"
+                ];
+              })
+              sources."base64id-1.0.0"
+              (sources."engine.io-parser-1.3.2" // {
+                dependencies = [
+                  sources."after-0.8.2"
+                  sources."arraybuffer.slice-0.0.6"
+                  sources."base64-arraybuffer-0.1.5"
+                  sources."blob-0.0.4"
+                  sources."wtf-8-1.0.0"
+                ];
+              })
+              (sources."ws-1.1.1" // {
                 dependencies = [
                   sources."options-0.0.6"
                   sources."ultron-1.0.2"
                 ];
               })
-              (sources."engine.io-parser-1.2.4" // {
-                dependencies = [
-                  sources."after-0.8.1"
-                  sources."arraybuffer.slice-0.0.6"
-                  sources."base64-arraybuffer-0.1.2"
-                  sources."blob-0.0.4"
-                  (sources."has-binary-0.1.6" // {
-                    dependencies = [
-                      sources."isarray-0.0.1"
-                    ];
-                  })
-                  sources."utf8-2.1.0"
-                ];
-              })
-              (sources."accepts-1.1.4" // {
-                dependencies = [
-                  (sources."mime-types-2.0.14" // {
-                    dependencies = [
-                      sources."mime-db-1.12.0"
-                    ];
-                  })
-                  sources."negotiator-0.4.9"
-                ];
-              })
+              sources."cookie-0.3.1"
             ];
           })
-          (sources."socket.io-parser-2.2.6" // {
+          (sources."has-binary-0.1.7" // {
             dependencies = [
-              sources."json3-3.3.2"
-              sources."component-emitter-1.1.2"
               sources."isarray-0.0.1"
-              sources."benchmark-1.0.0"
             ];
           })
-          (sources."socket.io-client-1.4.6" // {
+          sources."object-assign-4.1.0"
+          sources."socket.io-adapter-0.5.0"
+          (sources."socket.io-client-1.7.2" // {
             dependencies = [
-              (sources."engine.io-client-1.6.9" // {
+              sources."backo2-1.0.2"
+              sources."component-bind-1.0.0"
+              sources."component-emitter-1.2.1"
+              (sources."engine.io-client-1.8.2" // {
                 dependencies = [
+                  sources."component-inherit-0.0.3"
+                  (sources."engine.io-parser-1.3.2" // {
+                    dependencies = [
+                      sources."after-0.8.2"
+                      sources."arraybuffer.slice-0.0.6"
+                      sources."base64-arraybuffer-0.1.5"
+                      sources."blob-0.0.4"
+                      sources."wtf-8-1.0.0"
+                    ];
+                  })
                   sources."has-cors-1.1.0"
-                  (sources."ws-1.0.1" // {
+                  (sources."parsejson-0.0.3" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."parseqs-0.0.5" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."ws-1.1.1" // {
                     dependencies = [
                       sources."options-0.0.6"
                       sources."ultron-1.0.2"
                     ];
                   })
-                  sources."xmlhttprequest-ssl-1.5.1"
-                  sources."component-emitter-1.1.2"
-                  (sources."engine.io-parser-1.2.4" // {
-                    dependencies = [
-                      sources."after-0.8.1"
-                      sources."arraybuffer.slice-0.0.6"
-                      sources."base64-arraybuffer-0.1.2"
-                      sources."blob-0.0.4"
-                      (sources."has-binary-0.1.6" // {
-                        dependencies = [
-                          sources."isarray-0.0.1"
-                        ];
-                      })
-                      sources."utf8-2.1.0"
-                    ];
-                  })
-                  (sources."parsejson-0.0.1" // {
-                    dependencies = [
-                      (sources."better-assert-1.0.2" // {
-                        dependencies = [
-                          sources."callsite-1.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."parseqs-0.0.2" // {
-                    dependencies = [
-                      (sources."better-assert-1.0.2" // {
-                        dependencies = [
-                          sources."callsite-1.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."component-inherit-0.0.3"
+                  sources."xmlhttprequest-ssl-1.5.3"
                   sources."yeast-0.1.2"
                 ];
               })
-              sources."component-bind-1.0.0"
-              sources."component-emitter-1.2.0"
-              sources."object-component-0.0.3"
               sources."indexof-0.0.1"
-              (sources."parseuri-0.0.4" // {
+              sources."object-component-0.0.3"
+              (sources."parseuri-0.0.5" // {
                 dependencies = [
                   (sources."better-assert-1.0.2" // {
                     dependencies = [
@@ -26117,32 +25553,20 @@ in
                 ];
               })
               sources."to-array-0.1.4"
-              sources."backo2-1.0.2"
             ];
           })
-          (sources."socket.io-adapter-0.4.0" // {
+          (sources."socket.io-parser-2.3.1" // {
             dependencies = [
-              (sources."socket.io-parser-2.2.2" // {
+              (sources."debug-2.2.0" // {
                 dependencies = [
-                  sources."debug-0.7.4"
-                  sources."json3-3.2.6"
-                  sources."component-emitter-1.1.2"
-                  sources."isarray-0.0.1"
-                  sources."benchmark-1.0.0"
+                  sources."ms-0.7.1"
                 ];
               })
-            ];
-          })
-          (sources."has-binary-0.1.7" // {
-            dependencies = [
+              sources."json3-3.3.2"
+              sources."component-emitter-1.1.2"
               sources."isarray-0.0.1"
             ];
           })
-          (sources."debug-2.2.0" // {
-            dependencies = [
-              sources."ms-0.7.1"
-            ];
-          })
         ];
       })
       sources."source-map-0.5.6"
@@ -26151,7 +25575,7 @@ in
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."useragent-2.1.9" // {
+      (sources."useragent-2.1.10" // {
         dependencies = [
           sources."lru-cache-2.2.4"
         ];
@@ -26204,9 +25628,9 @@ in
                 dependencies = [
                   (sources."accepts-1.2.13" // {
                     dependencies = [
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                       sources."negotiator-0.5.3"
@@ -26214,7 +25638,7 @@ in
                   })
                   (sources."compressible-2.0.9" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                 ];
@@ -26244,9 +25668,9 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -26335,9 +25759,9 @@ in
                   })
                   sources."batch-0.5.3"
                   sources."escape-html-1.0.3"
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                 ];
@@ -26364,9 +25788,9 @@ in
               (sources."type-is-1.6.14" // {
                 dependencies = [
                   sources."media-typer-0.3.0"
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                 ];
@@ -26438,7 +25862,7 @@ in
               (sources."passport-oauth1-1.1.0" // {
                 dependencies = [
                   sources."passport-strategy-1.0.0"
-                  sources."oauth-0.9.14"
+                  sources."oauth-0.9.15"
                   sources."utils-merge-1.0.0"
                 ];
               })
@@ -26446,11 +25870,12 @@ in
           })
           (sources."passport-google-oauth20-1.0.0" // {
             dependencies = [
-              (sources."passport-oauth2-1.3.0" // {
+              (sources."passport-oauth2-1.4.0" // {
                 dependencies = [
+                  sources."oauth-0.9.15"
                   sources."passport-strategy-1.0.0"
-                  sources."oauth-0.9.14"
                   sources."uid2-0.0.3"
+                  sources."utils-merge-1.0.0"
                 ];
               })
             ];
@@ -26463,7 +25888,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.17.2"
+              sources."lodash-4.17.4"
             ];
           })
         ];
@@ -26485,13 +25910,14 @@ in
       sha1 = "5de1e6426f885929b77357f014de5fee1dad0553";
     };
     dependencies = [
-      (sources."through2-2.0.1" // {
+      (sources."through2-2.0.3" // {
         dependencies = [
-          (sources."readable-stream-2.0.6" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
+              sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
-              sources."inherits-2.0.3"
               sources."isarray-1.0.0"
+              sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
               sources."string_decoder-0.10.31"
               sources."util-deprecate-1.0.2"
@@ -26553,11 +25979,11 @@ in
                   sources."path-is-absolute-1.0.1"
                 ];
               })
-              (sources."glob-parent-3.0.1" // {
+              (sources."glob-parent-3.1.0" // {
                 dependencies = [
                   (sources."is-glob-3.1.0" // {
                     dependencies = [
-                      sources."is-extglob-2.1.0"
+                      sources."is-extglob-2.1.1"
                     ];
                   })
                   sources."path-dirname-1.0.2"
@@ -26583,7 +26009,7 @@ in
                                   sources."isarray-1.0.0"
                                 ];
                               })
-                              sources."randomatic-1.1.5"
+                              sources."randomatic-1.1.6"
                               sources."repeat-string-1.6.1"
                             ];
                           })
@@ -26602,7 +26028,7 @@ in
                   sources."filename-regex-2.0.0"
                   sources."is-extglob-1.0.0"
                   sources."is-glob-2.0.1"
-                  (sources."kind-of-3.0.4" // {
+                  (sources."kind-of-3.1.0" // {
                     dependencies = [
                       sources."is-buffer-1.1.4"
                     ];
@@ -26682,8 +26108,8 @@ in
           })
           sources."is-valid-glob-0.3.0"
           sources."lazystream-1.0.0"
-          sources."lodash.isequal-4.4.0"
-          sources."merge-stream-1.0.0"
+          sources."lodash.isequal-4.5.0"
+          sources."merge-stream-1.0.1"
           (sources."mkdirp-0.5.1" // {
             dependencies = [
               sources."minimist-0.0.8"
@@ -26809,12 +26235,13 @@ in
       (sources."npm-registry-client-7.1.2" // {
         dependencies = [
           sources."chownr-1.0.1"
-          (sources."concat-stream-1.5.2" // {
+          (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.0.6" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
+                  sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
@@ -26886,12 +26313,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -26910,7 +26337,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -26939,14 +26366,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -26957,9 +26384,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -26971,7 +26398,7 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.0"
+              sources."uuid-3.0.1"
             ];
           })
           sources."retry-0.8.0"
@@ -27027,7 +26454,7 @@ in
                   sources."has-color-0.1.7"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.1"
+                  sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -27040,7 +26467,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."wide-align-1.1.0"
@@ -27075,7 +26502,7 @@ in
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."osenv-0.1.3" // {
+          (sources."osenv-0.1.4" // {
             dependencies = [
               sources."os-homedir-1.0.2"
               sources."os-tmpdir-1.0.2"
@@ -27172,10 +26599,10 @@ in
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
     packageName = "node-gyp";
-    version = "3.4.0";
+    version = "3.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz";
-      sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
+      sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
     };
     dependencies = [
       (sources."fstream-1.0.10" // {
@@ -27221,7 +26648,7 @@ in
           sources."abbrev-1.0.9"
         ];
       })
-      (sources."npmlog-3.1.2" // {
+      (sources."npmlog-4.0.2" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
@@ -27240,13 +26667,13 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.6.0" // {
+          (sources."gauge-2.7.2" // {
             dependencies = [
               sources."aproba-1.0.4"
-              sources."has-color-0.1.7"
+              sources."supports-color-0.2.0"
               sources."has-unicode-2.0.1"
               sources."object-assign-4.1.0"
-              sources."signal-exit-3.0.1"
+              sources."signal-exit-3.0.2"
               (sources."string-width-1.0.2" // {
                 dependencies = [
                   sources."code-point-at-1.1.0"
@@ -27259,7 +26686,7 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               sources."wide-align-1.1.0"
@@ -27268,35 +26695,12 @@ in
           sources."set-blocking-2.0.0"
         ];
       })
-      (sources."osenv-0.1.3" // {
+      (sources."osenv-0.1.4" // {
         dependencies = [
           sources."os-homedir-1.0.2"
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."path-array-1.0.1" // {
-        dependencies = [
-          (sources."array-index-1.0.0" // {
-            dependencies = [
-              (sources."debug-2.3.3" // {
-                dependencies = [
-                  sources."ms-0.7.2"
-                ];
-              })
-              (sources."es6-symbol-3.1.0" // {
-                dependencies = [
-                  sources."d-0.1.1"
-                  (sources."es5-ext-0.10.12" // {
-                    dependencies = [
-                      sources."es6-iterator-2.0.0"
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
-        ];
-      })
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
@@ -27322,12 +26726,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -27346,7 +26750,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -27375,14 +26779,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -27393,9 +26797,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -27407,7 +26811,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.0"
+          sources."uuid-3.0.1"
         ];
       })
       sources."rimraf-2.5.4"
@@ -27453,7 +26857,7 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."osenv-0.1.3" // {
+              (sources."osenv-0.1.4" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                   sources."os-tmpdir-1.0.2"
@@ -27467,7 +26871,7 @@ in
                       sources."lodash-3.10.1"
                     ];
                   })
-                  sources."xmldom-0.1.22"
+                  sources."xmldom-0.1.27"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -27507,7 +26911,7 @@ in
                               sources."array-find-index-1.0.2"
                             ];
                           })
-                          sources."signal-exit-3.0.1"
+                          sources."signal-exit-3.0.2"
                         ];
                       })
                       sources."map-obj-1.0.1"
@@ -27622,7 +27026,7 @@ in
           })
         ];
       })
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -27631,9 +27035,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -27669,10 +27073,10 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.2" // {
+          (sources."proxy-addr-1.1.3" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.1.1"
+              sources."ipaddr.js-1.2.0"
             ];
           })
           sources."qs-6.2.0"
@@ -27695,9 +27099,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -27756,8 +27160,8 @@ in
       })
       (sources."v8-debug-0.7.7" // {
         dependencies = [
-          sources."nan-2.4.0"
-          (sources."node-pre-gyp-0.6.31" // {
+          sources."nan-2.5.0"
+          (sources."node-pre-gyp-0.6.32" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -27769,7 +27173,7 @@ in
                   sources."abbrev-1.0.9"
                 ];
               })
-              (sources."npmlog-4.0.1" // {
+              (sources."npmlog-4.0.2" // {
                 dependencies = [
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
@@ -27788,13 +27192,13 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.1" // {
+                  (sources."gauge-2.7.2" // {
                     dependencies = [
                       sources."aproba-1.0.4"
-                      sources."has-color-0.1.7"
+                      sources."supports-color-0.2.0"
                       sources."has-unicode-2.0.1"
                       sources."object-assign-4.1.0"
-                      sources."signal-exit-3.0.1"
+                      sources."signal-exit-3.0.2"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
                           sources."code-point-at-1.1.0"
@@ -27807,7 +27211,7 @@ in
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."wide-align-1.1.0"
@@ -27841,12 +27245,12 @@ in
                           sources."escape-string-regexp-1.0.5"
                           (sources."has-ansi-2.0.0" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           sources."supports-color-2.0.0"
@@ -27865,7 +27269,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-4.0.0"
+                          sources."jsonpointer-4.0.1"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -27894,14 +27298,14 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.10.1" // {
+                      (sources."sshpk-1.10.2" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.0"
+                          sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
                           sources."jsbn-0.1.0"
-                          sources."tweetnacl-0.14.3"
+                          sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.0"
@@ -27912,9 +27316,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
@@ -27926,7 +27330,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.4.3"
-                  sources."uuid-3.0.0"
+                  sources."uuid-3.0.1"
                 ];
               })
               (sources."rimraf-2.5.4" // {
@@ -28024,8 +27428,8 @@ in
       })
       (sources."v8-profiler-5.6.5" // {
         dependencies = [
-          sources."nan-2.4.0"
-          (sources."node-pre-gyp-0.6.31" // {
+          sources."nan-2.5.0"
+          (sources."node-pre-gyp-0.6.32" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -28037,7 +27441,7 @@ in
                   sources."abbrev-1.0.9"
                 ];
               })
-              (sources."npmlog-4.0.1" // {
+              (sources."npmlog-4.0.2" // {
                 dependencies = [
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
@@ -28056,13 +27460,13 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.1" // {
+                  (sources."gauge-2.7.2" // {
                     dependencies = [
                       sources."aproba-1.0.4"
-                      sources."has-color-0.1.7"
+                      sources."supports-color-0.2.0"
                       sources."has-unicode-2.0.1"
                       sources."object-assign-4.1.0"
-                      sources."signal-exit-3.0.1"
+                      sources."signal-exit-3.0.2"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
                           sources."code-point-at-1.1.0"
@@ -28075,7 +27479,7 @@ in
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."wide-align-1.1.0"
@@ -28109,12 +27513,12 @@ in
                           sources."escape-string-regexp-1.0.5"
                           (sources."has-ansi-2.0.0" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           sources."supports-color-2.0.0"
@@ -28133,7 +27537,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-4.0.0"
+                          sources."jsonpointer-4.0.1"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -28162,14 +27566,14 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.10.1" // {
+                      (sources."sshpk-1.10.2" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.0"
+                          sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
                           sources."jsbn-0.1.0"
-                          sources."tweetnacl-0.14.3"
+                          sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.0"
@@ -28180,9 +27584,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
@@ -28194,7 +27598,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.4.3"
-                  sources."uuid-3.0.0"
+                  sources."uuid-3.0.1"
                 ];
               })
               (sources."rimraf-2.5.4" // {
@@ -28308,10 +27712,10 @@ in
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
-              sources."wrap-ansi-2.0.0"
+              sources."wrap-ansi-2.1.0"
             ];
           })
           sources."decamelize-1.2.0"
@@ -28334,7 +27738,7 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
             ];
@@ -28354,10 +27758,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.31";
+    version = "0.6.32";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
-      sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
+      sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
     };
     dependencies = [
       (sources."mkdirp-0.5.1" // {
@@ -28370,7 +27774,7 @@ in
           sources."abbrev-1.0.9"
         ];
       })
-      (sources."npmlog-4.0.1" // {
+      (sources."npmlog-4.0.2" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
@@ -28389,13 +27793,13 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.1" // {
+          (sources."gauge-2.7.2" // {
             dependencies = [
               sources."aproba-1.0.4"
-              sources."has-color-0.1.7"
+              sources."supports-color-0.2.0"
               sources."has-unicode-2.0.1"
               sources."object-assign-4.1.0"
-              sources."signal-exit-3.0.1"
+              sources."signal-exit-3.0.2"
               (sources."string-width-1.0.2" // {
                 dependencies = [
                   sources."code-point-at-1.1.0"
@@ -28408,7 +27812,7 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               sources."wide-align-1.1.0"
@@ -28450,12 +27854,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -28474,7 +27878,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -28503,14 +27907,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -28521,9 +27925,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -28535,7 +27939,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.0"
+          sources."uuid-3.0.1"
         ];
       })
       (sources."rimraf-2.5.4" // {
@@ -28671,7 +28075,7 @@ in
                                   sources."isarray-1.0.0"
                                 ];
                               })
-                              sources."randomatic-1.1.5"
+                              sources."randomatic-1.1.6"
                               sources."repeat-string-1.6.1"
                             ];
                           })
@@ -28689,7 +28093,7 @@ in
                   sources."extglob-0.3.2"
                   sources."filename-regex-2.0.0"
                   sources."is-extglob-1.0.0"
-                  (sources."kind-of-3.0.4" // {
+                  (sources."kind-of-3.1.0" // {
                     dependencies = [
                       sources."is-buffer-1.1.4"
                     ];
@@ -28726,7 +28130,7 @@ in
           sources."inherits-2.0.3"
           (sources."is-binary-path-1.0.1" // {
             dependencies = [
-              sources."binary-extensions-1.7.0"
+              sources."binary-extensions-1.8.0"
             ];
           })
           (sources."is-glob-2.0.1" // {
@@ -28751,10 +28155,10 @@ in
               sources."set-immediate-shim-1.0.1"
             ];
           })
-          (sources."fsevents-1.0.15" // {
+          (sources."fsevents-1.0.17" // {
             dependencies = [
-              sources."nan-2.4.0"
-              (sources."node-pre-gyp-0.6.31" // {
+              sources."nan-2.5.0"
+              (sources."node-pre-gyp-0.6.32" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
@@ -28766,7 +28170,7 @@ in
                       sources."abbrev-1.0.9"
                     ];
                   })
-                  (sources."npmlog-4.0.1" // {
+                  (sources."npmlog-4.0.2" // {
                     dependencies = [
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
@@ -28784,13 +28188,13 @@ in
                         ];
                       })
                       sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.7.1" // {
+                      (sources."gauge-2.7.2" // {
                         dependencies = [
                           sources."aproba-1.0.4"
-                          sources."has-color-0.1.7"
+                          sources."supports-color-0.2.0"
                           sources."has-unicode-2.0.1"
                           sources."object-assign-4.1.0"
-                          sources."signal-exit-3.0.1"
+                          sources."signal-exit-3.0.2"
                           (sources."string-width-1.0.2" // {
                             dependencies = [
                               sources."code-point-at-1.1.0"
@@ -28803,7 +28207,7 @@ in
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           sources."wide-align-1.1.0"
@@ -28845,12 +28249,12 @@ in
                               sources."escape-string-regexp-1.0.5"
                               (sources."has-ansi-2.0.0" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.0.0"
+                                  sources."ansi-regex-2.1.1"
                                 ];
                               })
                               (sources."strip-ansi-3.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.0.0"
+                                  sources."ansi-regex-2.1.1"
                                 ];
                               })
                               sources."supports-color-2.0.0"
@@ -28869,7 +28273,7 @@ in
                                   sources."is-property-1.0.2"
                                 ];
                               })
-                              sources."jsonpointer-4.0.0"
+                              sources."jsonpointer-4.0.1"
                               sources."xtend-4.0.1"
                             ];
                           })
@@ -28898,14 +28302,14 @@ in
                               sources."verror-1.3.6"
                             ];
                           })
-                          (sources."sshpk-1.10.1" // {
+                          (sources."sshpk-1.10.2" // {
                             dependencies = [
                               sources."asn1-0.2.3"
                               sources."assert-plus-1.0.0"
-                              sources."dashdash-1.14.0"
+                              sources."dashdash-1.14.1"
                               sources."getpass-0.1.6"
                               sources."jsbn-0.1.0"
-                              sources."tweetnacl-0.14.3"
+                              sources."tweetnacl-0.14.5"
                               sources."jodid25519-1.0.2"
                               sources."ecc-jsbn-0.1.1"
                               sources."bcrypt-pbkdf-1.0.0"
@@ -28916,9 +28320,9 @@ in
                       sources."is-typedarray-1.0.0"
                       sources."isstream-0.1.2"
                       sources."json-stringify-safe-5.0.1"
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                       sources."oauth-sign-0.8.2"
@@ -28930,7 +28334,7 @@ in
                         ];
                       })
                       sources."tunnel-agent-0.4.3"
-                      sources."uuid-3.0.0"
+                      sources."uuid-3.0.1"
                     ];
                   })
                   (sources."rimraf-2.5.4" // {
@@ -29000,7 +28404,7 @@ in
           })
         ];
       })
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -29077,12 +28481,12 @@ in
               sources."escape-string-regexp-1.0.5"
               (sources."has-ansi-2.0.0" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               sources."supports-color-2.0.0"
@@ -29098,13 +28502,13 @@ in
               })
               sources."object-assign-4.1.0"
               sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.3" // {
+              (sources."osenv-0.1.4" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                 ];
               })
               sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.2.0" // {
+              (sources."write-file-atomic-1.3.1" // {
                 dependencies = [
                   sources."imurmurhash-0.1.4"
                   sources."slide-1.1.6"
@@ -29217,7 +28621,7 @@ in
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
             ];
@@ -29236,14 +28640,14 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.15.2";
+    version = "0.16.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.15.2.tgz";
-      sha1 = "4533dd93f63828f8e749f0c132a793fbeb636ea6";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.16.0.tgz";
+      sha1 = "5b8e180a7cf211b5450a11deed0aa91e43932661";
     };
     dependencies = [
-      sources."basic-auth-1.0.4"
-      sources."bcryptjs-2.3.0"
+      sources."basic-auth-1.1.0"
+      sources."bcryptjs-2.4.0"
       (sources."body-parser-1.15.2" // {
         dependencies = [
           sources."bytes-2.4.0"
@@ -29268,11 +28672,16 @@ in
             ];
           })
           sources."qs-6.2.0"
+          (sources."raw-body-2.1.7" // {
+            dependencies = [
+              sources."unpipe-1.0.0"
+            ];
+          })
           (sources."type-is-1.6.14" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -29331,7 +28740,7 @@ in
           sources."lodash.some-4.6.0"
         ];
       })
-      sources."clone-2.0.0"
+      sources."clone-2.1.0"
       (sources."cookie-parser-1.4.3" // {
         dependencies = [
           sources."cookie-0.3.1"
@@ -29343,11 +28752,11 @@ in
           sources."vary-1.1.0"
         ];
       })
-      (sources."cron-1.1.1" // {
+      (sources."cron-1.2.1" // {
         dependencies = [
-          (sources."moment-timezone-0.5.9" // {
+          (sources."moment-timezone-0.5.11" // {
             dependencies = [
-              sources."moment-2.17.0"
+              sources."moment-2.17.1"
             ];
           })
         ];
@@ -29356,9 +28765,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -29394,10 +28803,10 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.2" // {
+          (sources."proxy-addr-1.1.3" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.1.1"
+              sources."ipaddr.js-1.2.0"
             ];
           })
           sources."qs-6.2.0"
@@ -29419,9 +28828,9 @@ in
           sources."serve-static-1.11.1"
           (sources."type-is-1.6.14" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -29430,52 +28839,20 @@ in
           sources."vary-1.1.0"
         ];
       })
-      (sources."follow-redirects-0.2.0" // {
+      (sources."follow-redirects-1.2.1" // {
         dependencies = [
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
           })
-          sources."stream-consume-0.1.0"
         ];
       })
-      (sources."fs-extra-0.30.0" // {
+      (sources."fs-extra-1.0.0" // {
         dependencies = [
           sources."graceful-fs-4.1.11"
           sources."jsonfile-2.4.0"
           sources."klaw-1.3.1"
-          sources."path-is-absolute-1.0.1"
-          (sources."rimraf-2.5.4" // {
-            dependencies = [
-              (sources."glob-7.1.1" // {
-                dependencies = [
-                  sources."fs.realpath-1.0.0"
-                  (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."fs.notify-0.0.4" // {
@@ -29497,26 +28874,29 @@ in
         ];
       })
       sources."is-utf8-0.2.1"
+      (sources."js-yaml-3.7.0" // {
+        dependencies = [
+          (sources."argparse-1.0.9" // {
+            dependencies = [
+              sources."sprintf-js-1.0.3"
+            ];
+          })
+          sources."esprima-2.7.3"
+        ];
+      })
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonata-1.0.10"
       sources."media-typer-0.3.0"
-      (sources."mqtt-1.14.1" // {
+      (sources."mqtt-2.2.1" // {
         dependencies = [
           (sources."commist-1.0.0" // {
             dependencies = [
               sources."leven-1.0.2"
             ];
           })
-          (sources."concat-stream-1.5.2" // {
+          (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
             ];
           })
           (sources."end-of-stream-1.1.0" // {
@@ -29559,11 +28939,11 @@ in
                       sources."path-is-absolute-1.0.1"
                     ];
                   })
-                  (sources."glob-parent-3.0.1" // {
+                  (sources."glob-parent-3.1.0" // {
                     dependencies = [
                       (sources."is-glob-3.1.0" // {
                         dependencies = [
-                          sources."is-extglob-2.1.0"
+                          sources."is-extglob-2.1.1"
                         ];
                       })
                       sources."path-dirname-1.0.2"
@@ -29589,7 +28969,7 @@ in
                                       sources."isarray-1.0.0"
                                     ];
                                   })
-                                  sources."randomatic-1.1.5"
+                                  sources."randomatic-1.1.6"
                                   sources."repeat-string-1.6.1"
                                 ];
                               })
@@ -29608,7 +28988,7 @@ in
                       sources."filename-regex-2.0.0"
                       sources."is-extglob-1.0.0"
                       sources."is-glob-2.0.1"
-                      (sources."kind-of-3.0.4" // {
+                      (sources."kind-of-3.1.0" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -29645,19 +29025,19 @@ in
                   (sources."ordered-read-streams-0.3.0" // {
                     dependencies = [
                       sources."is-stream-1.1.0"
-                      (sources."readable-stream-2.2.2" // {
+                    ];
+                  })
+                  (sources."through2-0.6.5" // {
+                    dependencies = [
+                      (sources."readable-stream-1.0.34" // {
                         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."isarray-0.0.1"
                           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" // {
@@ -29676,54 +29056,35 @@ in
                       })
                       (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.3"
                         ];
                       })
                     ];
                   })
                 ];
               })
-              (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.3"
             ];
           })
           sources."inherits-2.0.3"
           sources."minimist-1.2.0"
-          (sources."mqtt-connection-2.1.1" // {
+          (sources."mqtt-packet-5.2.1" // {
             dependencies = [
-              sources."reduplexer-1.1.0"
-              sources."through2-0.6.5"
+              sources."bl-1.2.0"
+              sources."process-nextick-args-1.0.7"
             ];
           })
-          (sources."mqtt-packet-3.4.7" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
-              sources."bl-0.9.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."pump-1.0.1" // {
+          (sources."pump-1.0.2" // {
             dependencies = [
               (sources."once-1.4.0" // {
                 dependencies = [
@@ -29732,29 +29093,10 @@ in
               })
             ];
           })
-          (sources."readable-stream-1.0.34" // {
-            dependencies = [
-              sources."core-util-is-1.0.2"
-              sources."isarray-0.0.1"
-              sources."string_decoder-0.10.31"
-            ];
-          })
           sources."reinterval-1.1.0"
-          (sources."split2-2.1.0" // {
+          (sources."split2-2.1.1" // {
             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.3"
             ];
           })
           (sources."websocket-stream-3.3.3" // {
@@ -29770,54 +29112,26 @@ in
                       })
                     ];
                   })
-                  (sources."readable-stream-2.2.2" // {
-                    dependencies = [
-                      sources."buffer-shims-1.0.0"
-                      sources."core-util-is-1.0.2"
-                      sources."isarray-1.0.0"
-                      sources."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."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."ws-1.1.1" // {
-                dependencies = [
-                  sources."options-0.0.6"
-                  sources."ultron-1.0.2"
-                ];
-              })
+              sources."through2-2.0.3"
             ];
           })
           sources."xtend-4.0.1"
         ];
       })
-      sources."mustache-2.2.1"
+      sources."mustache-2.3.0"
       (sources."nopt-3.0.6" // {
         dependencies = [
           sources."abbrev-1.0.9"
         ];
       })
-      (sources."oauth2orize-1.5.0" // {
+      (sources."oauth2orize-1.7.0" // {
         dependencies = [
           sources."uid2-0.0.3"
           sources."utils-merge-1.0.0"
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -29841,25 +29155,16 @@ in
           sources."passport-strategy-1.0.0"
         ];
       })
-      (sources."raw-body-2.1.7" // {
+      (sources."raw-body-2.2.0" // {
         dependencies = [
           sources."bytes-2.4.0"
-          sources."iconv-lite-0.4.13"
+          sources."iconv-lite-0.4.15"
           sources."unpipe-1.0.0"
         ];
       })
       sources."semver-5.3.0"
-      (sources."sentiment-1.0.6" // {
-        dependencies = [
-          (sources."lodash.assign-4.0.1" // {
-            dependencies = [
-              sources."lodash.keys-4.2.0"
-              sources."lodash.rest-4.0.5"
-            ];
-          })
-        ];
-      })
-      (sources."uglify-js-2.7.3" // {
+      sources."sentiment-2.1.0"
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -29873,7 +29178,7 @@ in
                     dependencies = [
                       (sources."align-text-0.1.4" // {
                         dependencies = [
-                          (sources."kind-of-3.0.4" // {
+                          (sources."kind-of-3.1.0" // {
                             dependencies = [
                               sources."is-buffer-1.1.4"
                             ];
@@ -29889,7 +29194,7 @@ in
                     dependencies = [
                       (sources."align-text-0.1.4" // {
                         dependencies = [
-                          (sources."kind-of-3.0.4" // {
+                          (sources."kind-of-3.1.0" // {
                             dependencies = [
                               sources."is-buffer-1.1.4"
                             ];
@@ -29910,22 +29215,10 @@ in
         ];
       })
       sources."when-3.7.7"
-      (sources."ws-0.8.1" // {
+      (sources."ws-1.1.1" // {
         dependencies = [
           sources."options-0.0.6"
           sources."ultron-1.0.2"
-          (sources."bufferutil-1.2.1" // {
-            dependencies = [
-              sources."bindings-1.2.1"
-              sources."nan-2.4.0"
-            ];
-          })
-          (sources."utf-8-validate-1.2.1" // {
-            dependencies = [
-              sources."bindings-1.2.1"
-              sources."nan-2.4.0"
-            ];
-          })
         ];
       })
       (sources."xml2js-0.4.17" // {
@@ -29933,7 +29226,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.17.2"
+              sources."lodash-4.17.4"
             ];
           })
         ];
@@ -29985,7 +29278,7 @@ in
                 dependencies = [
                   (sources."async-2.1.4" // {
                     dependencies = [
-                      sources."lodash-4.17.2"
+                      sources."lodash-4.17.4"
                     ];
                   })
                 ];
@@ -29998,12 +29291,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -30022,7 +29315,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -30051,14 +29344,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -30068,10 +29361,9 @@ in
               })
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
-              sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."node-uuid-1.4.7"
@@ -30088,7 +29380,7 @@ in
           })
         ];
       })
-      (sources."node-red-node-email-0.1.12" // {
+      (sources."node-red-node-email-0.1.15" // {
         dependencies = [
           (sources."nodemailer-1.11.0" // {
             dependencies = [
@@ -30108,7 +29400,7 @@ in
                       sources."libqp-1.1.0"
                       (sources."needle-0.10.0" // {
                         dependencies = [
-                          (sources."debug-2.3.3" // {
+                          (sources."debug-2.6.0" // {
                             dependencies = [
                               sources."ms-0.7.2"
                             ];
@@ -30122,7 +29414,7 @@ in
               })
               (sources."needle-0.11.0" // {
                 dependencies = [
-                  (sources."debug-2.3.3" // {
+                  (sources."debug-2.6.0" // {
                     dependencies = [
                       sources."ms-0.7.2"
                     ];
@@ -30174,7 +29466,7 @@ in
               })
             ];
           })
-          (sources."imap-0.8.18" // {
+          (sources."imap-0.8.19" // {
             dependencies = [
               sources."utf7-1.0.2"
               (sources."readable-stream-1.1.14" // {
@@ -30218,12 +29510,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -30242,7 +29534,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -30271,14 +29563,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -30288,10 +29580,9 @@ in
               })
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
-              sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -30303,315 +29594,283 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.0"
+              sources."uuid-3.0.1"
             ];
           })
         ];
       })
       sources."node-red-node-rbe-0.1.6"
-      (sources."node-red-node-serialport-0.4.1" // {
+      (sources."bcrypt-1.0.2" // {
         dependencies = [
-          (sources."serialport-4.0.6" // {
+          sources."bindings-1.2.1"
+          sources."nan-2.5.0"
+          (sources."node-pre-gyp-0.6.32" // {
             dependencies = [
-              sources."bindings-1.2.1"
-              (sources."commander-2.9.0" // {
+              (sources."mkdirp-0.5.1" // {
                 dependencies = [
-                  sources."graceful-readlink-1.0.1"
+                  sources."minimist-0.0.8"
                 ];
               })
-              (sources."debug-2.3.3" // {
+              (sources."npmlog-4.0.2" // {
                 dependencies = [
-                  sources."ms-0.7.2"
-                ];
-              })
-              (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" // {
+                  (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
-                      sources."minimist-0.0.8"
-                    ];
-                  })
-                  (sources."npmlog-4.0.1" // {
-                    dependencies = [
-                      (sources."are-we-there-yet-1.1.2" // {
-                        dependencies = [
-                          sources."delegates-1.0.0"
-                          (sources."readable-stream-2.2.2" // {
-                            dependencies = [
-                              sources."buffer-shims-1.0.0"
-                              sources."core-util-is-1.0.2"
-                              sources."isarray-1.0.0"
-                              sources."inherits-2.0.3"
-                              sources."process-nextick-args-1.0.7"
-                              sources."string_decoder-0.10.31"
-                              sources."util-deprecate-1.0.2"
-                            ];
-                          })
-                        ];
-                      })
-                      sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.7.1" // {
-                        dependencies = [
-                          sources."aproba-1.0.4"
-                          sources."has-color-0.1.7"
-                          sources."has-unicode-2.0.1"
-                          sources."object-assign-4.1.0"
-                          sources."signal-exit-3.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."wide-align-1.1.0"
-                        ];
-                      })
-                      sources."set-blocking-2.0.0"
-                    ];
-                  })
-                  (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."request-2.79.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.2" // {
-                        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."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.13" // {
-                        dependencies = [
-                          sources."mime-db-1.25.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."uuid-3.0.0"
-                    ];
-                  })
-                  (sources."rimraf-2.5.4" // {
-                    dependencies = [
-                      (sources."glob-7.1.1" // {
-                        dependencies = [
-                          sources."fs.realpath-1.0.0"
-                          (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."tar-2.2.1" // {
-                    dependencies = [
-                      sources."block-stream-0.0.9"
-                      (sources."fstream-1.0.10" // {
-                        dependencies = [
-                          sources."graceful-fs-4.1.11"
-                        ];
-                      })
-                      sources."inherits-2.0.3"
-                    ];
-                  })
-                  (sources."tar-pack-3.3.0" // {
-                    dependencies = [
-                      (sources."debug-2.2.0" // {
-                        dependencies = [
-                          sources."ms-0.7.1"
-                        ];
-                      })
-                      (sources."fstream-1.0.10" // {
-                        dependencies = [
-                          sources."graceful-fs-4.1.11"
-                          sources."inherits-2.0.3"
-                        ];
-                      })
-                      (sources."fstream-ignore-1.0.5" // {
-                        dependencies = [
-                          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.3.3" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
-                      (sources."readable-stream-2.1.5" // {
+                      sources."delegates-1.0.0"
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
-                          sources."inherits-2.0.3"
                           sources."isarray-1.0.0"
+                          sources."inherits-2.0.3"
                           sources."process-nextick-args-1.0.7"
                           sources."string_decoder-0.10.31"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
-                      sources."uid-number-0.0.6"
+                    ];
+                  })
+                  sources."console-control-strings-1.1.0"
+                  (sources."gauge-2.7.2" // {
+                    dependencies = [
+                      sources."aproba-1.0.4"
+                      sources."supports-color-0.2.0"
+                      sources."has-unicode-2.0.1"
+                      sources."object-assign-4.1.0"
+                      sources."signal-exit-3.0.2"
+                      (sources."string-width-1.0.2" // {
+                        dependencies = [
+                          sources."code-point-at-1.1.0"
+                          (sources."is-fullwidth-code-point-1.0.0" // {
+                            dependencies = [
+                              sources."number-is-nan-1.0.1"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."strip-ansi-3.0.1" // {
+                        dependencies = [
+                          sources."ansi-regex-2.1.1"
+                        ];
+                      })
+                      sources."wide-align-1.1.0"
+                    ];
+                  })
+                  sources."set-blocking-2.0.0"
+                ];
+              })
+              (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."request-2.79.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.2" // {
+                    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.1.1"
+                            ];
+                          })
+                          (sources."strip-ansi-3.0.1" // {
+                            dependencies = [
+                              sources."ansi-regex-2.1.1"
+                            ];
+                          })
+                          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.1"
+                          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.2" // {
+                        dependencies = [
+                          sources."asn1-0.2.3"
+                          sources."assert-plus-1.0.0"
+                          sources."dashdash-1.14.1"
+                          sources."getpass-0.1.6"
+                          sources."jsbn-0.1.0"
+                          sources."tweetnacl-0.14.5"
+                          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."mime-types-2.1.14" // {
+                    dependencies = [
+                      sources."mime-db-1.26.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."uuid-3.0.1"
+                ];
+              })
+              (sources."rimraf-2.5.4" // {
+                dependencies = [
+                  (sources."glob-7.1.1" // {
+                    dependencies = [
+                      sources."fs.realpath-1.0.0"
+                      (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."object.assign-4.0.4" // {
+              (sources."tar-2.2.1" // {
                 dependencies = [
-                  sources."function-bind-1.1.0"
-                  sources."object-keys-1.0.11"
-                  (sources."define-properties-1.1.2" // {
+                  sources."block-stream-0.0.9"
+                  (sources."fstream-1.0.10" // {
                     dependencies = [
-                      sources."foreach-2.0.5"
+                      sources."graceful-fs-4.1.11"
                     ];
                   })
+                  sources."inherits-2.0.3"
+                ];
+              })
+              (sources."tar-pack-3.3.0" // {
+                dependencies = [
+                  (sources."debug-2.2.0" // {
+                    dependencies = [
+                      sources."ms-0.7.1"
+                    ];
+                  })
+                  (sources."fstream-1.0.10" // {
+                    dependencies = [
+                      sources."graceful-fs-4.1.11"
+                      sources."inherits-2.0.3"
+                    ];
+                  })
+                  (sources."fstream-ignore-1.0.5" // {
+                    dependencies = [
+                      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.3.3" // {
+                    dependencies = [
+                      sources."wrappy-1.0.2"
+                    ];
+                  })
+                  (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."uid-number-0.0.6"
                 ];
               })
             ];
           })
         ];
       })
-      (sources."bcrypt-0.8.7" // {
-        dependencies = [
-          sources."bindings-1.2.1"
-          sources."nan-2.3.5"
-        ];
-      })
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -30675,7 +29934,7 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -30688,7 +29947,7 @@ in
       (sources."config-0.4.15" // {
         dependencies = [
           sources."js-yaml-0.3.7"
-          sources."coffee-script-1.11.1"
+          sources."coffee-script-1.12.2"
           (sources."vows-0.8.1" // {
             dependencies = [
               sources."eyes-0.1.8"
@@ -30749,20 +30008,21 @@ in
       sources."moment-2.1.0"
       (sources."nodemailer-0.3.35" // {
         dependencies = [
-          (sources."mailcomposer-3.12.0" // {
+          (sources."mailcomposer-4.0.1" // {
             dependencies = [
-              (sources."buildmail-3.10.0" // {
+              (sources."buildmail-4.0.1" // {
                 dependencies = [
                   sources."addressparser-1.0.1"
                   sources."libbase64-0.1.0"
                   sources."libqp-1.1.0"
                   sources."nodemailer-fetch-1.6.0"
                   sources."nodemailer-shared-1.1.0"
+                  sources."punycode-1.4.1"
                 ];
               })
-              (sources."libmime-2.1.0" // {
+              (sources."libmime-3.0.0" // {
                 dependencies = [
-                  sources."iconv-lite-0.4.13"
+                  sources."iconv-lite-0.4.15"
                   sources."libbase64-0.1.0"
                   sources."libqp-1.1.0"
                 ];
@@ -30814,10 +30074,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.0.2";
+    version = "4.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz";
-      sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae";
+      url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz";
+      sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4";
     };
     dependencies = [
       (sources."JSONStream-1.2.1" // {
@@ -30918,7 +30178,7 @@ in
           sources."promzard-0.3.0"
         ];
       })
-      sources."lockfile-1.0.2"
+      sources."lockfile-1.0.3"
       (sources."lodash._baseuniq-4.6.0" // {
         dependencies = [
           sources."lodash._createset-4.0.3"
@@ -30931,18 +30191,9 @@ in
       sources."lodash.without-4.4.0"
       (sources."mississippi-1.2.0" // {
         dependencies = [
-          (sources."concat-stream-1.5.2" // {
+          (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
             ];
           })
           (sources."duplexify-3.5.0" // {
@@ -30962,24 +30213,15 @@ in
           })
           sources."flush-write-stream-1.0.2"
           sources."from2-2.3.0"
-          sources."pump-1.0.1"
+          sources."pump-1.0.2"
           sources."pumpify-1.3.5"
           (sources."stream-each-1.2.0" // {
             dependencies = [
               sources."stream-shift-1.0.0"
             ];
           })
-          (sources."through2-2.0.1" // {
+          (sources."through2-2.0.3" // {
             dependencies = [
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
               sources."xtend-4.0.1"
             ];
           })
@@ -31002,6 +30244,7 @@ in
               })
             ];
           })
+          sources."nopt-3.0.6"
           (sources."npmlog-3.1.2" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
@@ -31014,7 +30257,7 @@ in
                 dependencies = [
                   sources."has-color-0.1.7"
                   sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.1"
+                  sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -31035,7 +30278,7 @@ in
             dependencies = [
               (sources."array-index-1.0.0" // {
                 dependencies = [
-                  (sources."debug-2.3.3" // {
+                  (sources."debug-2.6.0" // {
                     dependencies = [
                       sources."ms-0.7.2"
                     ];
@@ -31056,7 +30299,7 @@ in
           })
         ];
       })
-      sources."nopt-3.0.6"
+      sources."nopt-4.0.1"
       sources."normalize-git-url-3.0.2"
       (sources."normalize-package-data-2.3.5" // {
         dependencies = [
@@ -31070,55 +30313,17 @@ in
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
       sources."npm-package-arg-4.2.0"
-      (sources."npm-registry-client-7.3.0" // {
+      (sources."npm-registry-client-7.4.5" // {
         dependencies = [
-          (sources."concat-stream-1.5.2" // {
+          (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
-            ];
-          })
-          (sources."npmlog-3.1.2" // {
-            dependencies = [
-              (sources."are-we-there-yet-1.1.2" // {
-                dependencies = [
-                  sources."delegates-1.0.0"
-                ];
-              })
-              sources."console-control-strings-1.1.0"
-              (sources."gauge-2.6.0" // {
-                dependencies = [
-                  sources."has-color-0.1.7"
-                  sources."object-assign-4.1.0"
-                  sources."signal-exit-3.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."wide-align-1.1.0"
-                ];
-              })
-              sources."set-blocking-2.0.0"
             ];
           })
         ];
       })
       sources."npm-user-validate-0.1.5"
-      (sources."npmlog-4.0.1" // {
+      (sources."npmlog-4.0.2" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
@@ -31126,11 +30331,11 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.1" // {
+          (sources."gauge-2.7.2" // {
             dependencies = [
-              sources."has-color-0.1.7"
+              sources."supports-color-0.2.0"
               sources."object-assign-4.1.0"
-              sources."signal-exit-3.0.1"
+              sources."signal-exit-3.0.2"
               (sources."string-width-1.0.2" // {
                 dependencies = [
                   sources."code-point-at-1.1.0"
@@ -31149,7 +30354,7 @@ in
       })
       sources."once-1.4.0"
       sources."opener-1.4.2"
-      (sources."osenv-0.1.3" // {
+      (sources."osenv-0.1.4" // {
         dependencies = [
           sources."os-homedir-1.0.2"
           sources."os-tmpdir-1.0.2"
@@ -31158,7 +30363,7 @@ in
       sources."path-is-inside-1.0.2"
       (sources."read-1.0.7" // {
         dependencies = [
-          sources."mute-stream-0.0.6"
+          sources."mute-stream-0.0.7"
         ];
       })
       sources."read-cmd-shim-1.0.1"
@@ -31192,7 +30397,7 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      (sources."readable-stream-2.1.5" // {
+      (sources."readable-stream-2.2.2" // {
         dependencies = [
           sources."buffer-shims-1.0.0"
           sources."core-util-is-1.0.2"
@@ -31203,7 +30408,7 @@ in
         ];
       })
       sources."realize-package-specifier-3.0.3"
-      (sources."request-2.78.0" // {
+      (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.5.0"
@@ -31243,7 +30448,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -31272,14 +30477,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -31290,12 +30495,11 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
-          sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
           sources."qs-6.3.0"
           sources."stringstream-0.0.5"
@@ -31307,7 +30511,7 @@ in
           sources."tunnel-agent-0.4.3"
         ];
       })
-      sources."retry-0.10.0"
+      sources."retry-0.10.1"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
@@ -31348,6 +30552,7 @@ in
         ];
       })
       sources."unpipe-1.0.0"
+      sources."uuid-3.0.1"
       (sources."validate-npm-package-name-2.2.2" // {
         dependencies = [
           sources."builtins-0.0.7"
@@ -31360,7 +30565,7 @@ in
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.2.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -31433,12 +30638,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -31457,7 +30662,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -31486,14 +30691,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -31504,9 +30709,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -31518,7 +30723,7 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.0"
+              sources."uuid-3.0.1"
             ];
           })
           sources."graceful-fs-2.0.3"
@@ -31559,7 +30764,7 @@ in
           })
           sources."retry-0.6.0"
           sources."couch-login-0.1.20"
-          (sources."npmlog-4.0.1" // {
+          (sources."npmlog-4.0.2" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
@@ -31578,13 +30783,13 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.1" // {
+              (sources."gauge-2.7.2" // {
                 dependencies = [
                   sources."aproba-1.0.4"
-                  sources."has-color-0.1.7"
+                  sources."supports-color-0.2.0"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.1"
+                  sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -31597,7 +30802,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."wide-align-1.1.0"
@@ -31712,7 +30917,7 @@ in
         ];
       })
       sources."findit-1.2.0"
-      sources."coffee-script-1.11.1"
+      sources."coffee-script-1.12.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -31724,25 +30929,25 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.6";
+    version = "2.8.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.6.tgz";
-      sha1 = "9e3a0865b29dfc9af8c3d53d95b43f4bc6b1f212";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.9.tgz";
+      sha1 = "c084b087a08ecf9292352e2cd591de903f8129c3";
     };
     dependencies = [
-      sources."bluebird-3.4.6"
+      sources."bluebird-3.4.7"
       (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."ansi-regex-2.1.1"
             ];
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           sources."supports-color-2.0.0"
@@ -31776,7 +30981,7 @@ in
           sources."jju-1.3.0"
         ];
       })
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       sources."node-alias-1.0.4"
       (sources."npm-3.10.10" // {
         dependencies = [
@@ -31872,7 +31077,7 @@ in
               sources."promzard-0.3.0"
             ];
           })
-          sources."lockfile-1.0.2"
+          sources."lockfile-1.0.3"
           (sources."lodash._baseuniq-4.6.0" // {
             dependencies = [
               sources."lodash._createset-4.0.3"
@@ -31912,7 +31117,7 @@ in
                     dependencies = [
                       sources."has-color-0.1.7"
                       sources."object-assign-4.1.0"
-                      sources."signal-exit-3.0.1"
+                      sources."signal-exit-3.0.2"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
                           sources."code-point-at-1.1.0"
@@ -31933,7 +31138,7 @@ in
                 dependencies = [
                   (sources."array-index-1.0.0" // {
                     dependencies = [
-                      (sources."debug-2.3.3" // {
+                      (sources."debug-2.6.0" // {
                         dependencies = [
                           sources."ms-0.7.2"
                         ];
@@ -31970,11 +31175,12 @@ in
           sources."npm-package-arg-4.2.0"
           (sources."npm-registry-client-7.2.1" // {
             dependencies = [
-              (sources."concat-stream-1.5.2" // {
+              (sources."concat-stream-1.6.0" // {
                 dependencies = [
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.0.6" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
+                      sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."process-nextick-args-1.0.7"
@@ -31996,7 +31202,7 @@ in
                     dependencies = [
                       sources."has-color-0.1.7"
                       sources."object-assign-4.1.0"
-                      sources."signal-exit-3.0.1"
+                      sources."signal-exit-3.0.2"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
                           sources."code-point-at-1.1.0"
@@ -32016,7 +31222,7 @@ in
             ];
           })
           sources."npm-user-validate-0.1.5"
-          (sources."npmlog-4.0.1" // {
+          (sources."npmlog-4.0.2" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
@@ -32024,11 +31230,11 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.1" // {
+              (sources."gauge-2.7.2" // {
                 dependencies = [
-                  sources."has-color-0.1.7"
+                  sources."supports-color-0.2.0"
                   sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.1"
+                  sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -32047,7 +31253,7 @@ in
           })
           sources."once-1.4.0"
           sources."opener-1.4.2"
-          (sources."osenv-0.1.3" // {
+          (sources."osenv-0.1.4" // {
             dependencies = [
               sources."os-homedir-1.0.2"
               sources."os-tmpdir-1.0.2"
@@ -32056,7 +31262,7 @@ in
           sources."path-is-inside-1.0.2"
           (sources."read-1.0.7" // {
             dependencies = [
-              sources."mute-stream-0.0.6"
+              sources."mute-stream-0.0.7"
             ];
           })
           sources."read-cmd-shim-1.0.1"
@@ -32136,7 +31342,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -32165,14 +31371,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -32183,9 +31389,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."node-uuid-1.4.7"
@@ -32200,7 +31406,7 @@ in
               sources."tunnel-agent-0.4.3"
             ];
           })
-          sources."retry-0.10.0"
+          sources."retry-0.10.1"
           sources."rimraf-2.5.4"
           sources."sha-2.0.1"
           sources."slide-1.1.6"
@@ -32232,7 +31438,7 @@ in
           })
           sources."wrappy-1.0.2"
           sources."write-file-atomic-1.2.0"
-          sources."ansi-regex-2.0.0"
+          sources."ansi-regex-2.1.1"
           sources."debuglog-1.0.1"
           sources."imurmurhash-0.1.4"
           sources."lodash._baseindexof-3.1.0"
@@ -32263,7 +31469,7 @@ in
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
       sources."spawn-please-0.2.0"
-      (sources."update-notifier-1.0.2" // {
+      (sources."update-notifier-1.0.3" // {
         dependencies = [
           (sources."boxen-0.6.0" // {
             dependencies = [
@@ -32291,7 +31497,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                 ];
@@ -32314,13 +31520,13 @@ in
               })
               sources."object-assign-4.1.0"
               sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.3" // {
+              (sources."osenv-0.1.4" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                 ];
               })
               sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.2.0" // {
+              (sources."write-file-atomic-1.3.1" // {
                 dependencies = [
                   sources."imurmurhash-0.1.4"
                   sources."slide-1.1.6"
@@ -32373,7 +31579,7 @@ in
                           sources."util-deprecate-1.0.2"
                         ];
                       })
-                      sources."timed-out-3.0.0"
+                      sources."timed-out-3.1.3"
                       sources."unzip-response-1.0.2"
                       (sources."url-parse-lax-1.0.0" // {
                         dependencies = [
@@ -32424,7 +31630,7 @@ in
     meta = {
       description = "Find newer versions of dependencies than what your package.json or bower.json allows";
       homepage = https://github.com/tjunnone/npm-check-updates;
-      license = "MIT";
+      license = "Apache-2.0";
     };
     production = true;
   };
@@ -32476,9 +31682,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -32489,9 +31695,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -32499,7 +31705,7 @@ in
           sources."bytes-2.3.0"
           (sources."compressible-2.0.9" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           (sources."debug-2.2.0" // {
@@ -32541,9 +31747,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -32578,10 +31784,10 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.2" // {
+          (sources."proxy-addr-1.1.3" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.1.1"
+              sources."ipaddr.js-1.2.0"
             ];
           })
           sources."qs-6.2.0"
@@ -32604,9 +31810,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -32658,7 +31864,7 @@ in
                   sources."amdefine-1.0.1"
                 ];
               })
-              (sources."uglify-js-2.7.4" // {
+              (sources."uglify-js-2.7.5" // {
                 dependencies = [
                   sources."async-0.2.10"
                   sources."source-map-0.5.6"
@@ -32672,7 +31878,7 @@ in
                             dependencies = [
                               (sources."align-text-0.1.4" // {
                                 dependencies = [
-                                  (sources."kind-of-3.0.4" // {
+                                  (sources."kind-of-3.1.0" // {
                                     dependencies = [
                                       sources."is-buffer-1.1.4"
                                     ];
@@ -32688,7 +31894,7 @@ in
                             dependencies = [
                               (sources."align-text-0.1.4" // {
                                 dependencies = [
-                                  (sources."kind-of-3.0.4" // {
+                                  (sources."kind-of-3.1.0" // {
                                     dependencies = [
                                       sources."is-buffer-1.1.4"
                                     ];
@@ -32790,12 +31996,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -32814,7 +32020,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -32843,14 +32049,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -32861,9 +32067,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -32875,7 +32081,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.0"
+          sources."uuid-3.0.1"
         ];
       })
       sources."semver-5.3.0"
@@ -32887,14 +32093,14 @@ in
           sources."parseurl-1.3.1"
         ];
       })
-      (sources."service-runner-2.1.11" // {
+      (sources."service-runner-2.1.13" // {
         dependencies = [
-          sources."bluebird-3.4.6"
+          sources."bluebird-3.4.7"
           (sources."bunyan-1.8.5" // {
             dependencies = [
               (sources."dtrace-provider-0.8.0" // {
                 dependencies = [
-                  sources."nan-2.4.0"
+                  sources."nan-2.5.0"
                 ];
               })
               (sources."mv-2.1.1" // {
@@ -32938,7 +32144,7 @@ in
                 ];
               })
               sources."safe-json-stringify-1.0.3"
-              sources."moment-2.17.0"
+              sources."moment-2.17.1"
             ];
           })
           sources."bunyan-syslog-udp-0.1.0"
@@ -32968,19 +32174,7 @@ in
                   sources."ms-0.7.2"
                   (sources."msgpack5-3.4.1" // {
                     dependencies = [
-                      (sources."bl-1.1.2" // {
-                        dependencies = [
-                          (sources."readable-stream-2.0.6" // {
-                            dependencies = [
-                              sources."core-util-is-1.0.2"
-                              sources."isarray-1.0.0"
-                              sources."process-nextick-args-1.0.7"
-                              sources."string_decoder-0.10.31"
-                              sources."util-deprecate-1.0.2"
-                            ];
-                          })
-                        ];
-                      })
+                      sources."bl-1.2.0"
                       sources."inherits-2.0.3"
                     ];
                   })
@@ -33005,10 +32199,10 @@ in
                 dependencies = [
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
-                  sources."wrap-ansi-2.0.0"
+                  sources."wrap-ansi-2.1.0"
                 ];
               })
               sources."decamelize-1.2.0"
@@ -33110,7 +32304,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                 ];
@@ -33134,10 +32328,10 @@ in
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
-              sources."wrap-ansi-2.0.0"
+              sources."wrap-ansi-2.1.0"
             ];
           })
           sources."decamelize-1.2.0"
@@ -33239,7 +32433,7 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
             ];
@@ -33266,10 +32460,10 @@ in
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.36.0";
+    version = "0.36.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.0.tgz";
-      sha1 = "fe3b087f07389ca1c2fd3d71e38a7971d5508924";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.1.tgz";
+      sha1 = "7d2009b814b5b3a2ca573cabea1f2873a4be4a14";
     };
     dependencies = [
       (sources."airplayer-2.0.0" // {
@@ -33286,12 +32480,13 @@ in
                   sources."big-integer-1.6.17"
                 ];
               })
-              (sources."concat-stream-1.5.2" // {
+              (sources."concat-stream-1.6.0" // {
                 dependencies = [
                   sources."inherits-2.0.3"
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.0.6" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
+                      sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."process-nextick-args-1.0.7"
@@ -33309,7 +32504,7 @@ in
                       sources."lodash-3.10.1"
                     ];
                   })
-                  sources."xmldom-0.1.22"
+                  sources."xmldom-0.1.27"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -33346,12 +32541,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -33369,7 +32564,7 @@ in
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                     ];
@@ -33380,7 +32575,7 @@ in
           })
           (sources."bonjour-3.5.0" // {
             dependencies = [
-              sources."array-flatten-2.1.0"
+              sources."array-flatten-2.1.1"
               sources."deep-equal-1.0.1"
               sources."dns-equal-1.0.0"
               (sources."dns-txt-2.0.2" // {
@@ -33419,7 +32614,7 @@ in
                           sources."array-find-index-1.0.2"
                         ];
                       })
-                      sources."signal-exit-3.0.1"
+                      sources."signal-exit-3.0.2"
                     ];
                   })
                   sources."map-obj-1.0.1"
@@ -33540,7 +32735,7 @@ in
               sources."escape-string-regexp-1.0.5"
               (sources."has-ansi-2.0.0" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               sources."supports-color-2.0.0"
@@ -33562,12 +32757,13 @@ in
               sources."extend-3.0.0"
               (sources."spawn-sync-1.0.15" // {
                 dependencies = [
-                  (sources."concat-stream-1.5.2" // {
+                  (sources."concat-stream-1.6.0" // {
                     dependencies = [
                       sources."inherits-2.0.3"
                       sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.0.6" // {
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
+                          sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
                           sources."isarray-1.0.0"
                           sources."process-nextick-args-1.0.7"
@@ -33593,14 +32789,14 @@ in
               sources."object-assign-4.1.0"
             ];
           })
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
           sources."mute-stream-0.0.6"
           (sources."pinkie-promise-2.0.1" // {
             dependencies = [
               sources."pinkie-2.0.4"
             ];
           })
-          (sources."run-async-2.2.0" // {
+          (sources."run-async-2.3.0" // {
             dependencies = [
               sources."is-promise-2.1.0"
             ];
@@ -33618,7 +32814,7 @@ in
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           sources."through-2.3.8"
@@ -33627,7 +32823,7 @@ in
       sources."keypress-0.2.1"
       sources."mime-1.3.4"
       sources."network-address-1.1.0"
-      sources."numeral-1.5.5"
+      sources."numeral-1.5.6"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
         dependencies = [
@@ -33648,15 +32844,15 @@ in
           (sources."parse-torrent-file-4.0.0" // {
             dependencies = [
               sources."bencode-0.10.0"
-              (sources."simple-sha1-2.0.8" // {
+              (sources."simple-sha1-2.1.0" // {
                 dependencies = [
-                  sources."rusha-0.8.4"
+                  sources."rusha-0.8.5"
                 ];
               })
               sources."uniq-1.0.1"
             ];
           })
-          (sources."simple-get-2.3.0" // {
+          (sources."simple-get-2.4.0" // {
             dependencies = [
               (sources."once-1.4.0" // {
                 dependencies = [
@@ -33669,7 +32865,7 @@ in
           })
         ];
       })
-      (sources."pump-1.0.1" // {
+      (sources."pump-1.0.2" // {
         dependencies = [
           (sources."end-of-stream-1.1.0" // {
             dependencies = [
@@ -33716,8 +32912,13 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."random-access-file-1.3.1" // {
+              (sources."random-access-file-1.4.0" // {
                 dependencies = [
+                  (sources."debug-2.6.0" // {
+                    dependencies = [
+                      sources."ms-0.7.2"
+                    ];
+                  })
                   sources."inherits-2.0.3"
                 ];
               })
@@ -33745,9 +32946,9 @@ in
               (sources."parse-torrent-file-2.1.4" // {
                 dependencies = [
                   sources."bencode-0.7.0"
-                  (sources."simple-sha1-2.0.8" // {
+                  (sources."simple-sha1-2.1.0" // {
                     dependencies = [
-                      sources."rusha-0.8.4"
+                      sources."rusha-0.8.5"
                     ];
                   })
                 ];
@@ -33861,13 +33062,13 @@ in
                   })
                   sources."random-iterate-1.0.1"
                   sources."run-series-1.1.4"
-                  (sources."simple-get-2.3.0" // {
+                  (sources."simple-get-2.4.0" // {
                     dependencies = [
                       sources."simple-concat-1.0.0"
                       sources."unzip-response-2.0.1"
                     ];
                   })
-                  (sources."simple-peer-6.0.7" // {
+                  (sources."simple-peer-6.1.3" // {
                     dependencies = [
                       sources."get-browser-rtc-1.0.2"
                       sources."randombytes-2.0.3"
@@ -33912,7 +33113,7 @@ in
                   })
                 ];
               })
-              (sources."debug-2.3.3" // {
+              (sources."debug-2.6.0" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -33939,10 +33140,10 @@ in
   peerflix-server = nodeEnv.buildNodePackage {
     name = "peerflix-server";
     packageName = "peerflix-server";
-    version = "0.1.1";
+    version = "0.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz";
-      sha1 = "683d54067d44699b2eff8bfc793e780df2912666";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz";
+      sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6";
     };
     dependencies = [
       (sources."connect-multiparty-1.2.5" // {
@@ -34079,7 +33280,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."pump-1.0.1" // {
+      (sources."pump-1.0.2" // {
         dependencies = [
           (sources."end-of-stream-1.1.0" // {
             dependencies = [
@@ -34116,9 +33317,9 @@ in
               (sources."parse-torrent-file-2.1.4" // {
                 dependencies = [
                   sources."bencode-0.7.0"
-                  (sources."simple-sha1-2.0.8" // {
+                  (sources."simple-sha1-2.1.0" // {
                     dependencies = [
-                      sources."rusha-0.8.4"
+                      sources."rusha-0.8.5"
                     ];
                   })
                 ];
@@ -34159,37 +33360,32 @@ in
           sources."xtend-4.0.1"
         ];
       })
-      (sources."socket.io-1.6.0" // {
+      (sources."socket.io-1.7.2" // {
         dependencies = [
           (sources."debug-2.3.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
           })
-          (sources."engine.io-1.8.0" // {
+          (sources."engine.io-1.8.2" // {
             dependencies = [
               (sources."accepts-1.3.3" // {
                 dependencies = [
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   sources."negotiator-0.6.1"
                 ];
               })
-              sources."base64id-0.1.0"
-              (sources."engine.io-parser-1.3.1" // {
+              sources."base64id-1.0.0"
+              (sources."engine.io-parser-1.3.2" // {
                 dependencies = [
-                  sources."after-0.8.1"
+                  sources."after-0.8.2"
                   sources."arraybuffer.slice-0.0.6"
                   sources."base64-arraybuffer-0.1.5"
                   sources."blob-0.0.4"
-                  (sources."has-binary-0.1.6" // {
-                    dependencies = [
-                      sources."isarray-0.0.1"
-                    ];
-                  })
                   sources."wtf-8-1.0.0"
                 ];
               })
@@ -34209,25 +33405,20 @@ in
           })
           sources."object-assign-4.1.0"
           sources."socket.io-adapter-0.5.0"
-          (sources."socket.io-client-1.6.0" // {
+          (sources."socket.io-client-1.7.2" // {
             dependencies = [
               sources."backo2-1.0.2"
               sources."component-bind-1.0.0"
               sources."component-emitter-1.2.1"
-              (sources."engine.io-client-1.8.0" // {
+              (sources."engine.io-client-1.8.2" // {
                 dependencies = [
                   sources."component-inherit-0.0.3"
-                  (sources."engine.io-parser-1.3.1" // {
+                  (sources."engine.io-parser-1.3.2" // {
                     dependencies = [
-                      sources."after-0.8.1"
+                      sources."after-0.8.2"
                       sources."arraybuffer.slice-0.0.6"
                       sources."base64-arraybuffer-0.1.5"
                       sources."blob-0.0.4"
-                      (sources."has-binary-0.1.6" // {
-                        dependencies = [
-                          sources."isarray-0.0.1"
-                        ];
-                      })
                       sources."wtf-8-1.0.0"
                     ];
                   })
@@ -34296,7 +33487,7 @@ in
               sources."addr-to-ip-port-1.4.2"
               sources."bencode-0.7.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.3.3" // {
+              (sources."debug-2.6.0" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -34333,7 +33524,7 @@ in
               sources."bencode-0.6.0"
               sources."bn.js-1.3.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.3.3" // {
+              (sources."debug-2.6.0" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -34405,9 +33596,9 @@ in
               (sources."parse-torrent-file-2.1.4" // {
                 dependencies = [
                   sources."bencode-0.7.0"
-                  (sources."simple-sha1-2.0.8" // {
+                  (sources."simple-sha1-2.1.0" // {
                     dependencies = [
-                      sources."rusha-0.8.4"
+                      sources."rusha-0.8.5"
                     ];
                   })
                 ];
@@ -34477,7 +33668,7 @@ in
         dependencies = [
           (sources."async-2.1.4" // {
             dependencies = [
-              sources."lodash-4.17.2"
+              sources."lodash-4.17.4"
             ];
           })
           (sources."which-1.2.12" // {
@@ -34612,15 +33803,15 @@ in
             dependencies = [
               (sources."async-2.1.4" // {
                 dependencies = [
-                  sources."lodash-4.17.2"
+                  sources."lodash-4.17.4"
                 ];
               })
             ];
           })
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."node-uuid-1.4.7"
@@ -34637,14 +33828,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -34678,12 +33869,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -34702,7 +33893,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -34791,10 +33982,10 @@ in
           })
           sources."private-0.1.6"
           sources."q-1.4.1"
-          (sources."recast-0.11.17" // {
+          (sources."recast-0.11.18" // {
             dependencies = [
               sources."ast-types-0.9.2"
-              sources."esprima-3.1.1"
+              sources."esprima-3.1.3"
               sources."source-map-0.5.6"
             ];
           })
@@ -34889,7 +34080,7 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -34943,12 +34134,12 @@ in
                           sources."escape-string-regexp-1.0.5"
                           (sources."has-ansi-2.0.0" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           sources."supports-color-2.0.0"
@@ -34967,7 +34158,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-4.0.0"
+                          sources."jsonpointer-4.0.1"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -34996,14 +34187,14 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.10.1" // {
+                      (sources."sshpk-1.10.2" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.0"
+                          sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
                           sources."jsbn-0.1.0"
-                          sources."tweetnacl-0.14.3"
+                          sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.0"
@@ -35014,9 +34205,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
@@ -35028,7 +34219,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.4.3"
-                  sources."uuid-3.0.0"
+                  sources."uuid-3.0.1"
                 ];
               })
             ];
@@ -35038,7 +34229,7 @@ in
               sources."sax-1.2.1"
               (sources."xmlbuilder-4.2.1" // {
                 dependencies = [
-                  sources."lodash-4.17.2"
+                  sources."lodash-4.17.4"
                 ];
               })
             ];
@@ -35090,9 +34281,9 @@ in
         dependencies = [
           (sources."accepts-1.2.13" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."negotiator-0.5.3"
@@ -35177,9 +34368,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -35223,9 +34414,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -35236,9 +34427,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -35247,7 +34438,7 @@ in
           sources."bytes-2.3.0"
           (sources."compressible-2.0.9" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           (sources."debug-2.2.0" // {
@@ -35305,12 +34496,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -35324,7 +34515,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -35353,14 +34544,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -35371,9 +34562,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -35385,7 +34576,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.0"
+          sources."uuid-3.0.1"
         ];
       })
       sources."async-0.9.2"
@@ -35401,7 +34592,7 @@ in
         dependencies = [
           (sources."dtrace-provider-0.8.0" // {
             dependencies = [
-              sources."nan-2.4.0"
+              sources."nan-2.5.0"
             ];
           })
           (sources."mv-2.1.1" // {
@@ -35440,7 +34631,7 @@ in
             ];
           })
           sources."safe-json-stringify-1.0.3"
-          sources."moment-2.17.0"
+          sources."moment-2.17.1"
         ];
       })
       (sources."handlebars-2.0.0" // {
@@ -35479,7 +34670,7 @@ in
               sources."uc.micro-1.0.3"
             ];
           })
-          (sources."sanitize-html-1.13.0" // {
+          (sources."sanitize-html-1.14.1" // {
             dependencies = [
               (sources."htmlparser2-3.9.2" // {
                 dependencies = [
@@ -35515,7 +34706,7 @@ in
         ];
       })
       sources."jju-1.3.0"
-      (sources."JSONStream-1.2.1" // {
+      (sources."JSONStream-1.3.0" // {
         dependencies = [
           sources."jsonparse-1.2.0"
           sources."through-2.3.8"
@@ -35544,12 +34735,12 @@ in
       })
       (sources."fs-ext-0.5.0" // {
         dependencies = [
-          sources."nan-2.4.0"
+          sources."nan-2.5.0"
         ];
       })
       (sources."crypt3-0.2.0" // {
         dependencies = [
-          sources."nan-2.4.0"
+          sources."nan-2.5.0"
         ];
       })
     ];
@@ -35646,7 +34837,7 @@ in
           (sources."csv-0.4.6" // {
             dependencies = [
               sources."csv-generate-0.0.6"
-              sources."csv-parse-1.1.7"
+              sources."csv-parse-1.1.9"
               sources."stream-transform-0.1.1"
               sources."csv-stringify-0.0.8"
             ];
@@ -35691,7 +34882,7 @@ in
           })
           (sources."dtrace-provider-0.6.0" // {
             dependencies = [
-              sources."nan-2.4.0"
+              sources."nan-2.5.0"
             ];
           })
         ];
@@ -35700,7 +34891,7 @@ in
         dependencies = [
           (sources."dtrace-provider-0.6.0" // {
             dependencies = [
-              sources."nan-2.4.0"
+              sources."nan-2.5.0"
             ];
           })
           (sources."mv-2.1.1" // {
@@ -35786,7 +34977,7 @@ in
               sources."asn1-0.2.3"
               sources."assert-plus-0.2.0"
               sources."jsbn-0.1.0"
-              sources."tweetnacl-0.14.3"
+              sources."tweetnacl-0.14.5"
               sources."jodid25519-1.0.2"
               sources."ecc-jsbn-0.1.1"
             ];
@@ -35853,7 +35044,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -35934,7 +35125,7 @@ in
       })
       (sources."csso-2.2.1" // {
         dependencies = [
-          (sources."clap-1.1.1" // {
+          (sources."clap-1.1.2" // {
             dependencies = [
               (sources."chalk-1.1.3" // {
                 dependencies = [
@@ -35942,12 +35133,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -35978,7 +35169,7 @@ in
     dependencies = [
       (sources."async-2.1.2" // {
         dependencies = [
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
         ];
       })
       sources."colors-1.1.2"
@@ -36045,7 +35236,7 @@ in
                 dependencies = [
                   (sources."async-2.1.4" // {
                     dependencies = [
-                      sources."lodash-4.17.2"
+                      sources."lodash-4.17.4"
                     ];
                   })
                 ];
@@ -36058,12 +35249,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -36082,7 +35273,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -36111,14 +35302,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -36129,9 +35320,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -36157,7 +35348,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.0.4" // {
+                              (sources."kind-of-3.1.0" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -36173,7 +35364,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.0.4" // {
+                              (sources."kind-of-3.1.0" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -36221,12 +35412,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -36245,7 +35436,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -36274,14 +35465,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -36292,9 +35483,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."node-uuid-1.4.7"
@@ -36341,10 +35532,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.0.10";
+    version = "2.1.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz";
-      sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz";
+      sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -36357,10 +35548,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.7.4";
+    version = "2.7.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
-      sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
+      sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
     };
     dependencies = [
       sources."async-0.2.10"
@@ -36375,7 +35566,7 @@ in
                 dependencies = [
                   (sources."align-text-0.1.4" // {
                     dependencies = [
-                      (sources."kind-of-3.0.4" // {
+                      (sources."kind-of-3.1.0" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -36391,7 +35582,7 @@ in
                 dependencies = [
                   (sources."align-text-0.1.4" // {
                     dependencies = [
-                      (sources."kind-of-3.0.4" // {
+                      (sources."kind-of-3.1.0" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -36421,15 +35612,15 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "0.10.3";
+    version = "1.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-0.10.3.tgz";
-      sha1 = "7d4635b9a359c8db06c313374544f27a3890f63c";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz";
+      sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418";
     };
     dependencies = [
-      sources."async-2.0.1"
-      sources."bluebird-3.3.5"
-      sources."blueimp-md5-2.3.1"
+      sources."async-2.1.4"
+      sources."bluebird-3.4.7"
+      sources."blueimp-md5-2.6.0"
       (sources."body-parser-1.15.2" // {
         dependencies = [
           sources."bytes-2.4.0"
@@ -36462,26 +35653,30 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
           })
         ];
       })
-      (sources."color-0.11.4" // {
+      (sources."color-1.0.3" // {
         dependencies = [
-          sources."clone-1.0.2"
           (sources."color-convert-1.8.2" // {
             dependencies = [
               sources."color-name-1.1.1"
             ];
           })
-          (sources."color-string-0.3.0" // {
+          (sources."color-string-1.4.0" // {
             dependencies = [
               sources."color-name-1.1.1"
+              (sources."simple-swizzle-0.2.2" // {
+                dependencies = [
+                  sources."is-arrayish-0.3.1"
+                ];
+              })
             ];
           })
         ];
@@ -36493,27 +35688,38 @@ in
         ];
       })
       sources."crossroads-0.12.2"
-      (sources."diff2html-1.2.0" // {
+      (sources."diff2html-2.0.11" // {
         dependencies = [
-          sources."diff-2.2.3"
-        ];
-      })
-      (sources."express-4.13.4" // {
-        dependencies = [
-          (sources."accepts-1.2.13" // {
+          sources."diff-3.2.0"
+          (sources."hogan.js-3.0.2" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."nopt-1.0.10" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."abbrev-1.0.9"
                 ];
               })
-              sources."negotiator-0.5.3"
+              sources."mkdirp-0.3.0"
+            ];
+          })
+          sources."whatwg-fetch-1.1.1"
+        ];
+      })
+      (sources."express-4.14.0" // {
+        dependencies = [
+          (sources."accepts-1.3.3" // {
+            dependencies = [
+              (sources."mime-types-2.1.14" // {
+                dependencies = [
+                  sources."mime-db-1.26.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.1.5"
+          sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
           (sources."debug-2.2.0" // {
             dependencies = [
@@ -36521,10 +35727,12 @@ in
             ];
           })
           sources."depd-1.1.0"
+          sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."etag-1.7.0"
-          (sources."finalhandler-0.4.1" // {
+          (sources."finalhandler-0.5.0" // {
             dependencies = [
+              sources."statuses-1.3.1"
               sources."unpipe-1.0.0"
             ];
           })
@@ -36538,46 +35746,47 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.0.10" // {
+          (sources."proxy-addr-1.1.3" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.0.5"
+              sources."ipaddr.js-1.2.0"
             ];
           })
-          sources."qs-4.0.0"
-          sources."range-parser-1.0.3"
-          (sources."send-0.13.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.3.1" // {
+              (sources."http-errors-1.5.1" // {
                 dependencies = [
                   sources."inherits-2.0.3"
+                  sources."setprototypeof-1.0.2"
                 ];
               })
               sources."mime-1.3.4"
               sources."ms-0.7.1"
-              sources."statuses-1.2.1"
+              sources."statuses-1.3.1"
             ];
           })
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
           })
           sources."utils-merge-1.0.0"
-          sources."vary-1.0.1"
+          sources."vary-1.1.0"
         ];
       })
-      (sources."express-session-1.13.0" // {
+      (sources."express-session-1.14.2" // {
         dependencies = [
-          sources."cookie-0.2.3"
+          sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
-          sources."crc-3.4.0"
+          sources."crc-3.4.1"
           (sources."debug-2.2.0" // {
             dependencies = [
               sources."ms-0.7.1"
@@ -36586,9 +35795,10 @@ in
           sources."depd-1.1.0"
           sources."on-headers-1.0.1"
           sources."parseurl-1.3.1"
-          (sources."uid-safe-2.0.0" // {
+          (sources."uid-safe-2.1.3" // {
             dependencies = [
-              sources."base64-url-1.2.1"
+              sources."base64-url-1.3.3"
+              sources."random-bytes-1.0.0"
             ];
           })
           sources."utils-merge-1.0.0"
@@ -36719,26 +35929,34 @@ in
         ];
       })
       sources."hasher-1.2.0"
+      sources."ignore-3.2.0"
       (sources."keen.io-0.1.3" // {
         dependencies = [
           sources."underscore-1.5.2"
         ];
       })
       sources."knockout-3.4.1"
-      sources."lodash-4.12.0"
+      sources."lodash-4.17.4"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.13.0"
-      (sources."npm-3.9.6" // {
+      sources."moment-2.17.1"
+      (sources."npm-4.1.2" // {
         dependencies = [
+          (sources."JSONStream-1.3.0" // {
+            dependencies = [
+              sources."jsonparse-1.2.0"
+              sources."through-2.3.8"
+            ];
+          })
           sources."abbrev-1.0.9"
           sources."ansicolors-0.3.2"
           sources."ansistyles-0.1.3"
           sources."aproba-1.0.4"
           sources."archy-1.0.0"
+          sources."asap-2.0.5"
           sources."chownr-1.0.1"
           sources."cmd-shim-2.0.2"
           (sources."columnify-1.5.4" // {
@@ -36759,16 +35977,12 @@ in
               sources."proto-list-1.2.4"
             ];
           })
-          (sources."dezalgo-1.0.3" // {
-            dependencies = [
-              sources."asap-2.0.5"
-            ];
-          })
+          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.1.1" // {
+          (sources."fstream-npm-1.2.0" // {
             dependencies = [
               (sources."fstream-ignore-1.0.5" // {
                 dependencies = [
@@ -36786,7 +36000,7 @@ in
               })
             ];
           })
-          (sources."glob-7.0.6" // {
+          (sources."glob-7.1.1" // {
             dependencies = [
               sources."fs.realpath-1.0.0"
               (sources."minimatch-3.0.3" // {
@@ -36829,83 +36043,71 @@ in
               sources."promzard-0.3.0"
             ];
           })
-          sources."lockfile-1.0.2"
+          sources."lockfile-1.0.3"
           (sources."lodash._baseuniq-4.6.0" // {
             dependencies = [
               sources."lodash._createset-4.0.3"
               sources."lodash._root-3.0.1"
             ];
           })
-          (sources."lodash.clonedeep-4.3.2" // {
+          sources."lodash.clonedeep-4.5.0"
+          sources."lodash.union-4.6.0"
+          sources."lodash.uniq-4.5.0"
+          sources."lodash.without-4.4.0"
+          (sources."mississippi-1.2.0" // {
             dependencies = [
-              sources."lodash._baseclone-4.5.7"
-            ];
-          })
-          (sources."lodash.union-4.4.0" // {
-            dependencies = [
-              sources."lodash._baseflatten-4.2.1"
-              sources."lodash.rest-4.0.5"
-            ];
-          })
-          sources."lodash.uniq-4.3.0"
-          (sources."lodash.without-4.2.0" // {
-            dependencies = [
-              (sources."lodash._basedifference-4.5.0" // {
+              (sources."concat-stream-1.6.0" // {
                 dependencies = [
-                  sources."lodash._root-3.0.1"
+                  sources."typedarray-0.0.6"
+                ];
+              })
+              (sources."duplexify-3.5.0" // {
+                dependencies = [
+                  (sources."end-of-stream-1.0.0" // {
+                    dependencies = [
+                      sources."once-1.3.3"
+                    ];
+                  })
+                  sources."stream-shift-1.0.0"
+                ];
+              })
+              (sources."end-of-stream-1.1.0" // {
+                dependencies = [
+                  sources."once-1.3.3"
+                ];
+              })
+              sources."flush-write-stream-1.0.2"
+              sources."from2-2.3.0"
+              sources."pump-1.0.2"
+              sources."pumpify-1.3.5"
+              (sources."stream-each-1.2.0" // {
+                dependencies = [
+                  sources."stream-shift-1.0.0"
+                ];
+              })
+              (sources."through2-2.0.3" // {
+                dependencies = [
+                  sources."xtend-4.0.1"
                 ];
               })
-              sources."lodash.rest-4.0.5"
             ];
           })
-          (sources."node-gyp-3.3.1" // {
+          (sources."node-gyp-3.5.0" // {
             dependencies = [
-              (sources."glob-4.5.3" // {
+              (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."minimatch-2.0.10" // {
+                  (sources."brace-expansion-1.1.6" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
-                        dependencies = [
-                          sources."balanced-match-0.4.2"
-                          sources."concat-map-0.0.1"
-                        ];
-                      })
-                    ];
-                  })
-                ];
-              })
-              (sources."minimatch-1.0.0" // {
-                dependencies = [
-                  sources."lru-cache-2.7.3"
-                  sources."sigmund-1.0.1"
-                ];
-              })
-              (sources."path-array-1.0.1" // {
-                dependencies = [
-                  (sources."array-index-1.0.0" // {
-                    dependencies = [
-                      (sources."debug-2.3.3" // {
-                        dependencies = [
-                          sources."ms-0.7.2"
-                        ];
-                      })
-                      (sources."es6-symbol-3.1.0" // {
-                        dependencies = [
-                          sources."d-0.1.1"
-                          (sources."es5-ext-0.10.12" // {
-                            dependencies = [
-                              sources."es6-iterator-2.0.0"
-                            ];
-                          })
-                        ];
-                      })
+                      sources."balanced-match-0.4.2"
+                      sources."concat-map-0.0.1"
                     ];
                   })
                 ];
               })
+              sources."nopt-3.0.6"
             ];
           })
-          sources."nopt-3.0.6"
+          sources."nopt-4.0.1"
           sources."normalize-git-url-3.0.2"
           (sources."normalize-package-data-2.3.5" // {
             dependencies = [
@@ -36918,28 +36120,40 @@ in
           })
           sources."npm-cache-filename-1.0.2"
           sources."npm-install-checks-3.0.0"
-          sources."npm-package-arg-4.1.1"
+          sources."npm-package-arg-4.2.0"
           sources."npm-user-validate-0.1.5"
-          (sources."npmlog-2.0.4" // {
+          (sources."npmlog-4.0.2" // {
             dependencies = [
-              sources."ansi-0.3.1"
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
                 ];
               })
-              (sources."gauge-1.2.7" // {
+              sources."console-control-strings-1.1.0"
+              (sources."gauge-2.7.2" // {
                 dependencies = [
-                  sources."lodash.pad-4.5.1"
-                  sources."lodash.padend-4.6.1"
-                  sources."lodash.padstart-4.6.1"
+                  sources."supports-color-0.2.0"
+                  sources."object-assign-4.1.0"
+                  sources."signal-exit-3.0.2"
+                  (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."wide-align-1.1.0"
                 ];
               })
+              sources."set-blocking-2.0.0"
             ];
           })
-          sources."once-1.3.3"
+          sources."once-1.4.0"
           sources."opener-1.4.2"
-          (sources."osenv-0.1.3" // {
+          (sources."osenv-0.1.4" // {
             dependencies = [
               sources."os-tmpdir-1.0.2"
             ];
@@ -36947,7 +36161,7 @@ in
           sources."path-is-inside-1.0.2"
           (sources."read-1.0.7" // {
             dependencies = [
-              sources."mute-stream-0.0.6"
+              sources."mute-stream-0.0.7"
             ];
           })
           sources."read-cmd-shim-1.0.1"
@@ -36981,7 +36195,7 @@ in
             ];
           })
           sources."read-package-tree-5.1.5"
-          (sources."readable-stream-2.1.5" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -36992,23 +36206,10 @@ in
             ];
           })
           sources."realize-package-specifier-3.0.3"
-          (sources."request-2.72.0" // {
+          (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.5.0"
-              (sources."bl-1.1.2" // {
-                dependencies = [
-                  (sources."readable-stream-2.0.6" // {
-                    dependencies = [
-                      sources."core-util-is-1.0.2"
-                      sources."isarray-1.0.0"
-                      sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
-                      sources."util-deprecate-1.0.2"
-                    ];
-                  })
-                ];
-              })
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -37017,7 +36218,11 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              sources."form-data-1.0.1"
+              (sources."form-data-2.1.2" // {
+                dependencies = [
+                  sources."asynckit-0.4.0"
+                ];
+              })
               (sources."har-validator-2.0.6" // {
                 dependencies = [
                   (sources."chalk-1.1.3" // {
@@ -37041,7 +36246,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -37070,14 +36275,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -37088,23 +36293,46 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
-              sources."node-uuid-1.4.7"
               sources."oauth-sign-0.8.2"
-              sources."qs-6.1.0"
+              sources."qs-6.3.0"
               sources."stringstream-0.0.5"
-              sources."tough-cookie-2.2.2"
+              (sources."tough-cookie-2.3.2" // {
+                dependencies = [
+                  sources."punycode-1.4.1"
+                ];
+              })
               sources."tunnel-agent-0.4.3"
             ];
           })
-          sources."retry-0.9.0"
+          sources."retry-0.10.1"
           sources."sha-2.0.1"
           sources."slide-1.1.6"
           sources."sorted-object-2.0.1"
+          (sources."sorted-union-stream-2.1.3" // {
+            dependencies = [
+              (sources."from2-1.3.0" // {
+                dependencies = [
+                  (sources."readable-stream-1.1.14" // {
+                    dependencies = [
+                      sources."core-util-is-1.0.2"
+                      sources."isarray-0.0.1"
+                      sources."string_decoder-0.10.31"
+                    ];
+                  })
+                ];
+              })
+              (sources."stream-iterate-1.2.0" // {
+                dependencies = [
+                  sources."stream-shift-1.0.0"
+                ];
+              })
+            ];
+          })
           sources."strip-ansi-3.0.1"
           (sources."tar-2.2.1" // {
             dependencies = [
@@ -37120,6 +36348,7 @@ in
             ];
           })
           sources."unpipe-1.0.0"
+          sources."uuid-3.0.1"
           (sources."validate-npm-package-name-2.2.2" // {
             dependencies = [
               sources."builtins-0.0.7"
@@ -37131,8 +36360,8 @@ in
             ];
           })
           sources."wrappy-1.0.2"
-          sources."write-file-atomic-1.1.4"
-          sources."ansi-regex-2.0.0"
+          sources."write-file-atomic-1.3.1"
+          sources."ansi-regex-2.1.1"
           sources."debuglog-1.0.1"
           sources."imurmurhash-0.1.4"
           sources."lodash._baseindexof-3.1.0"
@@ -37154,15 +36383,15 @@ in
           })
         ];
       })
-      (sources."npm-registry-client-7.1.2" // {
+      (sources."npm-registry-client-7.4.5" // {
         dependencies = [
-          sources."chownr-1.0.1"
-          (sources."concat-stream-1.5.2" // {
+          (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.0.6" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
+                  sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
@@ -37228,12 +36457,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -37252,7 +36481,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -37281,14 +36510,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -37299,9 +36528,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -37313,12 +36542,12 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.0"
+              sources."uuid-3.0.1"
             ];
           })
-          sources."retry-0.8.0"
+          sources."retry-0.10.1"
           sources."slide-1.1.6"
-          (sources."npmlog-3.1.2" // {
+          (sources."npmlog-4.0.2" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
@@ -37337,13 +36566,13 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.6.0" // {
+              (sources."gauge-2.7.2" // {
                 dependencies = [
                   sources."aproba-1.0.4"
-                  sources."has-color-0.1.7"
+                  sources."supports-color-0.2.0"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.1"
+                  sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -37356,7 +36585,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."wide-align-1.1.0"
@@ -37381,12 +36610,13 @@ in
           sources."passport-strategy-1.0.0"
         ];
       })
-      (sources."raven-0.11.0" // {
+      (sources."raven-1.1.1" // {
         dependencies = [
-          sources."cookie-0.1.0"
+          sources."cookie-0.3.1"
+          sources."json-stringify-safe-5.0.1"
           sources."lsmod-1.0.0"
-          sources."node-uuid-1.4.7"
-          sources."stack-trace-0.0.7"
+          sources."uuid-3.0.0"
+          sources."stack-trace-0.0.9"
         ];
       })
       (sources."rc-1.1.6" // {
@@ -37428,21 +36658,23 @@ in
           })
         ];
       })
-      sources."semver-5.1.1"
-      (sources."serve-static-1.10.3" // {
+      sources."semver-5.3.0"
+      (sources."serve-static-1.11.1" // {
         dependencies = [
+          sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."parseurl-1.3.1"
-          (sources."send-0.13.2" // {
+          (sources."send-0.14.1" // {
             dependencies = [
               sources."debug-2.2.0"
               sources."depd-1.1.0"
               sources."destroy-1.0.4"
               sources."etag-1.7.0"
               sources."fresh-0.3.0"
-              (sources."http-errors-1.3.1" // {
+              (sources."http-errors-1.5.1" // {
                 dependencies = [
                   sources."inherits-2.0.3"
+                  sources."setprototypeof-1.0.2"
                 ];
               })
               sources."mime-1.3.4"
@@ -37452,8 +36684,8 @@ in
                   sources."ee-first-1.1.1"
                 ];
               })
-              sources."range-parser-1.0.3"
-              sources."statuses-1.2.1"
+              sources."range-parser-1.2.0"
+              sources."statuses-1.3.1"
             ];
           })
         ];
@@ -37464,105 +36696,100 @@ in
           sources."eve-0.4.2"
         ];
       })
-      (sources."socket.io-1.4.8" // {
+      (sources."socket.io-1.7.2" // {
         dependencies = [
-          (sources."engine.io-1.6.11" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
-              sources."base64id-0.1.0"
-              (sources."ws-1.1.0" // {
+              sources."ms-0.7.2"
+            ];
+          })
+          (sources."engine.io-1.8.2" // {
+            dependencies = [
+              (sources."accepts-1.3.3" // {
+                dependencies = [
+                  (sources."mime-types-2.1.14" // {
+                    dependencies = [
+                      sources."mime-db-1.26.0"
+                    ];
+                  })
+                  sources."negotiator-0.6.1"
+                ];
+              })
+              sources."base64id-1.0.0"
+              (sources."engine.io-parser-1.3.2" // {
+                dependencies = [
+                  sources."after-0.8.2"
+                  sources."arraybuffer.slice-0.0.6"
+                  sources."base64-arraybuffer-0.1.5"
+                  sources."blob-0.0.4"
+                  sources."wtf-8-1.0.0"
+                ];
+              })
+              (sources."ws-1.1.1" // {
                 dependencies = [
                   sources."options-0.0.6"
                   sources."ultron-1.0.2"
                 ];
               })
-              (sources."engine.io-parser-1.2.4" // {
-                dependencies = [
-                  sources."after-0.8.1"
-                  sources."arraybuffer.slice-0.0.6"
-                  sources."base64-arraybuffer-0.1.2"
-                  sources."blob-0.0.4"
-                  (sources."has-binary-0.1.6" // {
-                    dependencies = [
-                      sources."isarray-0.0.1"
-                    ];
-                  })
-                  sources."utf8-2.1.0"
-                ];
-              })
-              (sources."accepts-1.1.4" // {
-                dependencies = [
-                  (sources."mime-types-2.0.14" // {
-                    dependencies = [
-                      sources."mime-db-1.12.0"
-                    ];
-                  })
-                  sources."negotiator-0.4.9"
-                ];
-              })
+              sources."cookie-0.3.1"
             ];
           })
-          (sources."socket.io-parser-2.2.6" // {
+          (sources."has-binary-0.1.7" // {
             dependencies = [
-              sources."json3-3.3.2"
-              sources."component-emitter-1.1.2"
               sources."isarray-0.0.1"
-              sources."benchmark-1.0.0"
             ];
           })
-          (sources."socket.io-client-1.4.8" // {
+          sources."object-assign-4.1.0"
+          sources."socket.io-adapter-0.5.0"
+          (sources."socket.io-client-1.7.2" // {
             dependencies = [
-              (sources."engine.io-client-1.6.11" // {
+              sources."backo2-1.0.2"
+              sources."component-bind-1.0.0"
+              sources."component-emitter-1.2.1"
+              (sources."engine.io-client-1.8.2" // {
                 dependencies = [
+                  sources."component-inherit-0.0.3"
+                  (sources."engine.io-parser-1.3.2" // {
+                    dependencies = [
+                      sources."after-0.8.2"
+                      sources."arraybuffer.slice-0.0.6"
+                      sources."base64-arraybuffer-0.1.5"
+                      sources."blob-0.0.4"
+                      sources."wtf-8-1.0.0"
+                    ];
+                  })
                   sources."has-cors-1.1.0"
-                  (sources."ws-1.0.1" // {
+                  (sources."parsejson-0.0.3" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."parseqs-0.0.5" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."ws-1.1.1" // {
                     dependencies = [
                       sources."options-0.0.6"
                       sources."ultron-1.0.2"
                     ];
                   })
-                  sources."xmlhttprequest-ssl-1.5.1"
-                  sources."component-emitter-1.1.2"
-                  (sources."engine.io-parser-1.2.4" // {
-                    dependencies = [
-                      sources."after-0.8.1"
-                      sources."arraybuffer.slice-0.0.6"
-                      sources."base64-arraybuffer-0.1.2"
-                      sources."blob-0.0.4"
-                      (sources."has-binary-0.1.6" // {
-                        dependencies = [
-                          sources."isarray-0.0.1"
-                        ];
-                      })
-                      sources."utf8-2.1.0"
-                    ];
-                  })
-                  (sources."parsejson-0.0.1" // {
-                    dependencies = [
-                      (sources."better-assert-1.0.2" // {
-                        dependencies = [
-                          sources."callsite-1.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."parseqs-0.0.2" // {
-                    dependencies = [
-                      (sources."better-assert-1.0.2" // {
-                        dependencies = [
-                          sources."callsite-1.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."component-inherit-0.0.3"
+                  sources."xmlhttprequest-ssl-1.5.3"
                   sources."yeast-0.1.2"
                 ];
               })
-              sources."component-bind-1.0.0"
-              sources."component-emitter-1.2.0"
-              sources."object-component-0.0.3"
               sources."indexof-0.0.1"
-              (sources."parseuri-0.0.4" // {
+              sources."object-component-0.0.3"
+              (sources."parseuri-0.0.5" // {
                 dependencies = [
                   (sources."better-assert-1.0.2" // {
                     dependencies = [
@@ -37572,32 +36799,20 @@ in
                 ];
               })
               sources."to-array-0.1.4"
-              sources."backo2-1.0.2"
             ];
           })
-          (sources."socket.io-adapter-0.4.0" // {
+          (sources."socket.io-parser-2.3.1" // {
             dependencies = [
-              (sources."socket.io-parser-2.2.2" // {
+              (sources."debug-2.2.0" // {
                 dependencies = [
-                  sources."debug-0.7.4"
-                  sources."json3-3.2.6"
-                  sources."component-emitter-1.1.2"
-                  sources."isarray-0.0.1"
-                  sources."benchmark-1.0.0"
+                  sources."ms-0.7.1"
                 ];
               })
-            ];
-          })
-          (sources."has-binary-0.1.7" // {
-            dependencies = [
+              sources."json3-3.3.2"
+              sources."component-emitter-1.1.2"
               sources."isarray-0.0.1"
             ];
           })
-          (sources."debug-2.2.0" // {
-            dependencies = [
-              sources."ms-0.7.1"
-            ];
-          })
         ];
       })
       (sources."superagent-0.21.0" // {
@@ -37608,7 +36823,7 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -37641,32 +36856,31 @@ in
           sources."rimraf-2.2.8"
         ];
       })
-      (sources."winston-2.2.0" // {
+      (sources."winston-2.3.0" // {
         dependencies = [
           sources."async-1.0.0"
           sources."colors-1.0.3"
           sources."cycle-1.0.3"
           sources."eyes-0.1.8"
           sources."isstream-0.1.2"
-          sources."pkginfo-0.3.1"
           sources."stack-trace-0.0.9"
         ];
       })
-      (sources."yargs-4.7.1" // {
+      (sources."yargs-6.6.0" // {
         dependencies = [
           sources."camelcase-3.0.0"
           (sources."cliui-3.2.0" // {
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
-              sources."wrap-ansi-2.0.0"
+              sources."wrap-ansi-2.1.0"
             ];
           })
           sources."decamelize-1.2.0"
-          sources."lodash.assign-4.2.0"
+          sources."get-caller-file-1.0.2"
           (sources."os-locale-1.4.0" // {
             dependencies = [
               (sources."lcid-1.0.0" // {
@@ -37676,47 +36890,6 @@ in
               })
             ];
           })
-          (sources."pkg-conf-1.1.3" // {
-            dependencies = [
-              (sources."find-up-1.1.2" // {
-                dependencies = [
-                  sources."path-exists-2.1.0"
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
-                    ];
-                  })
-                ];
-              })
-              (sources."load-json-file-1.1.0" // {
-                dependencies = [
-                  sources."graceful-fs-4.1.11"
-                  (sources."parse-json-2.2.0" // {
-                    dependencies = [
-                      (sources."error-ex-1.3.0" // {
-                        dependencies = [
-                          sources."is-arrayish-0.2.1"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."pify-2.3.0"
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
-                    ];
-                  })
-                  (sources."strip-bom-2.0.0" // {
-                    dependencies = [
-                      sources."is-utf8-0.2.1"
-                    ];
-                  })
-                ];
-              })
-              sources."object-assign-4.1.0"
-              sources."symbol-0.2.3"
-            ];
-          })
           (sources."read-pkg-up-1.0.1" // {
             dependencies = [
               (sources."find-up-1.1.2" // {
@@ -37791,8 +36964,9 @@ in
               })
             ];
           })
+          sources."require-directory-2.1.1"
           sources."require-main-filename-1.0.1"
-          sources."set-blocking-1.0.0"
+          sources."set-blocking-2.0.0"
           (sources."string-width-1.0.2" // {
             dependencies = [
               sources."code-point-at-1.1.0"
@@ -37803,14 +36977,14 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
             ];
           })
-          sources."window-size-0.2.0"
+          sources."which-module-1.0.0"
           sources."y18n-3.2.1"
-          sources."yargs-parser-2.4.1"
+          sources."yargs-parser-4.2.1"
         ];
       })
     ];
@@ -37967,15 +37141,15 @@ in
                 dependencies = [
                   (sources."async-2.1.4" // {
                     dependencies = [
-                      sources."lodash-4.17.2"
+                      sources."lodash-4.17.4"
                     ];
                   })
                 ];
               })
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."node-uuid-1.4.7"
@@ -37992,14 +37166,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -38033,12 +37207,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -38057,7 +37231,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -38104,12 +37278,13 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "1.13.3";
+    version = "1.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-1.13.3.tgz";
-      sha1 = "e79c46fe5a37c5ca70084ba0894c595cdcb42815";
+      url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz";
+      sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823";
     };
     dependencies = [
+      sources."acorn-3.3.0"
       sources."async-1.5.2"
       sources."clone-1.0.2"
       (sources."enhanced-resolve-0.9.1" // {
@@ -38118,13 +37293,12 @@ in
           sources."graceful-fs-4.1.11"
         ];
       })
-      sources."acorn-3.3.0"
       sources."interpret-0.6.6"
       (sources."loader-utils-0.2.16" // {
         dependencies = [
           sources."big.js-3.1.3"
           sources."emojis-list-2.1.0"
-          sources."json5-0.5.0"
+          sources."json5-0.5.1"
           sources."object-assign-4.1.0"
         ];
       })
@@ -38153,7 +37327,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."node-libs-browser-0.6.0" // {
+      (sources."node-libs-browser-0.7.0" // {
         dependencies = [
           sources."assert-1.4.1"
           (sources."browserify-zlib-0.1.4" // {
@@ -38173,44 +37347,58 @@ in
               sources."date-now-0.1.4"
             ];
           })
-          sources."constants-browserify-0.0.1"
-          (sources."crypto-browserify-3.2.8" // {
+          sources."constants-browserify-1.0.0"
+          (sources."crypto-browserify-3.3.0" // {
             dependencies = [
               sources."pbkdf2-compat-2.0.1"
               sources."ripemd160-0.2.0"
               sources."sha.js-2.2.6"
+              (sources."browserify-aes-0.4.0" // {
+                dependencies = [
+                  sources."inherits-2.0.3"
+                ];
+              })
             ];
           })
           sources."domain-browser-1.1.7"
           sources."events-1.1.1"
-          (sources."http-browserify-1.7.0" // {
-            dependencies = [
-              sources."Base64-0.2.1"
-              sources."inherits-2.0.3"
-            ];
-          })
-          sources."https-browserify-0.0.0"
-          sources."os-browserify-0.1.2"
+          sources."https-browserify-0.0.1"
+          sources."os-browserify-0.2.1"
           sources."path-browserify-0.0.0"
           sources."process-0.11.9"
           sources."punycode-1.4.1"
           sources."querystring-es3-0.2.1"
-          (sources."readable-stream-1.1.14" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
+              sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
-              sources."isarray-0.0.1"
+              sources."isarray-1.0.0"
+              sources."inherits-2.0.3"
+              sources."process-nextick-args-1.0.7"
+              sources."util-deprecate-1.0.2"
+            ];
+          })
+          (sources."stream-browserify-2.0.1" // {
+            dependencies = [
               sources."inherits-2.0.3"
             ];
           })
-          (sources."stream-browserify-1.0.0" // {
+          (sources."stream-http-2.6.1" // {
             dependencies = [
+              sources."builtin-status-codes-3.0.0"
               sources."inherits-2.0.3"
+              sources."to-arraybuffer-1.0.1"
+              sources."xtend-4.0.1"
             ];
           })
           sources."string_decoder-0.10.31"
-          sources."timers-browserify-1.4.2"
+          (sources."timers-browserify-2.0.2" // {
+            dependencies = [
+              sources."setimmediate-1.0.5"
+            ];
+          })
           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"
@@ -38240,7 +37428,7 @@ in
         ];
       })
       sources."tapable-0.1.10"
-      (sources."uglify-js-2.7.4" // {
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -38254,7 +37442,7 @@ in
                     dependencies = [
                       (sources."align-text-0.1.4" // {
                         dependencies = [
-                          (sources."kind-of-3.0.4" // {
+                          (sources."kind-of-3.1.0" // {
                             dependencies = [
                               sources."is-buffer-1.1.4"
                             ];
@@ -38270,7 +37458,7 @@ in
                     dependencies = [
                       (sources."align-text-0.1.4" // {
                         dependencies = [
-                          (sources."kind-of-3.0.4" // {
+                          (sources."kind-of-3.1.0" // {
                             dependencies = [
                               sources."is-buffer-1.1.4"
                             ];
@@ -38318,7 +37506,7 @@ in
                                       sources."isarray-1.0.0"
                                     ];
                                   })
-                                  sources."randomatic-1.1.5"
+                                  sources."randomatic-1.1.6"
                                   sources."repeat-string-1.6.1"
                                 ];
                               })
@@ -38336,7 +37524,7 @@ in
                       sources."extglob-0.3.2"
                       sources."filename-regex-2.0.0"
                       sources."is-extglob-1.0.0"
-                      (sources."kind-of-3.0.4" // {
+                      (sources."kind-of-3.1.0" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -38373,7 +37561,7 @@ in
               sources."inherits-2.0.3"
               (sources."is-binary-path-1.0.1" // {
                 dependencies = [
-                  sources."binary-extensions-1.7.0"
+                  sources."binary-extensions-1.8.0"
                 ];
               })
               (sources."is-glob-2.0.1" // {
@@ -38407,17 +37595,17 @@ in
                   sources."set-immediate-shim-1.0.1"
                 ];
               })
-              (sources."fsevents-1.0.15" // {
+              (sources."fsevents-1.0.17" // {
                 dependencies = [
-                  sources."nan-2.4.0"
-                  (sources."node-pre-gyp-0.6.31" // {
+                  sources."nan-2.5.0"
+                  (sources."node-pre-gyp-0.6.32" // {
                     dependencies = [
                       (sources."nopt-3.0.6" // {
                         dependencies = [
                           sources."abbrev-1.0.9"
                         ];
                       })
-                      (sources."npmlog-4.0.1" // {
+                      (sources."npmlog-4.0.2" // {
                         dependencies = [
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
@@ -38435,13 +37623,13 @@ in
                             ];
                           })
                           sources."console-control-strings-1.1.0"
-                          (sources."gauge-2.7.1" // {
+                          (sources."gauge-2.7.2" // {
                             dependencies = [
                               sources."aproba-1.0.4"
-                              sources."has-color-0.1.7"
+                              sources."supports-color-0.2.0"
                               sources."has-unicode-2.0.1"
                               sources."object-assign-4.1.0"
-                              sources."signal-exit-3.0.1"
+                              sources."signal-exit-3.0.2"
                               (sources."string-width-1.0.2" // {
                                 dependencies = [
                                   sources."code-point-at-1.1.0"
@@ -38454,7 +37642,7 @@ in
                               })
                               (sources."strip-ansi-3.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.0.0"
+                                  sources."ansi-regex-2.1.1"
                                 ];
                               })
                               sources."wide-align-1.1.0"
@@ -38496,12 +37684,12 @@ in
                                   sources."escape-string-regexp-1.0.5"
                                   (sources."has-ansi-2.0.0" // {
                                     dependencies = [
-                                      sources."ansi-regex-2.0.0"
+                                      sources."ansi-regex-2.1.1"
                                     ];
                                   })
                                   (sources."strip-ansi-3.0.1" // {
                                     dependencies = [
-                                      sources."ansi-regex-2.0.0"
+                                      sources."ansi-regex-2.1.1"
                                     ];
                                   })
                                   sources."supports-color-2.0.0"
@@ -38520,7 +37708,7 @@ in
                                       sources."is-property-1.0.2"
                                     ];
                                   })
-                                  sources."jsonpointer-4.0.0"
+                                  sources."jsonpointer-4.0.1"
                                   sources."xtend-4.0.1"
                                 ];
                               })
@@ -38549,14 +37737,14 @@ in
                                   sources."verror-1.3.6"
                                 ];
                               })
-                              (sources."sshpk-1.10.1" // {
+                              (sources."sshpk-1.10.2" // {
                                 dependencies = [
                                   sources."asn1-0.2.3"
                                   sources."assert-plus-1.0.0"
-                                  sources."dashdash-1.14.0"
+                                  sources."dashdash-1.14.1"
                                   sources."getpass-0.1.6"
                                   sources."jsbn-0.1.0"
-                                  sources."tweetnacl-0.14.3"
+                                  sources."tweetnacl-0.14.5"
                                   sources."jodid25519-1.0.2"
                                   sources."ecc-jsbn-0.1.1"
                                   sources."bcrypt-pbkdf-1.0.0"
@@ -38567,9 +37755,9 @@ in
                           sources."is-typedarray-1.0.0"
                           sources."isstream-0.1.2"
                           sources."json-stringify-safe-5.0.1"
-                          (sources."mime-types-2.1.13" // {
+                          (sources."mime-types-2.1.14" // {
                             dependencies = [
-                              sources."mime-db-1.25.0"
+                              sources."mime-db-1.26.0"
                             ];
                           })
                           sources."oauth-sign-0.8.2"
@@ -38581,7 +37769,7 @@ in
                             ];
                           })
                           sources."tunnel-agent-0.4.3"
-                          sources."uuid-3.0.0"
+                          sources."uuid-3.0.1"
                         ];
                       })
                       (sources."rimraf-2.5.4" // {
@@ -38669,14 +37857,14 @@ in
           sources."graceful-fs-4.1.11"
         ];
       })
-      (sources."webpack-core-0.6.8" // {
+      (sources."webpack-core-0.6.9" // {
         dependencies = [
           (sources."source-map-0.4.4" // {
             dependencies = [
               sources."amdefine-1.0.1"
             ];
           })
-          sources."source-list-map-0.1.6"
+          sources."source-list-map-0.1.8"
         ];
       })
     ];
@@ -38704,518 +37892,4 @@ in
     };
     production = true;
   };
-  yarn = nodeEnv.buildNodePackage {
-    name = "yarn";
-    packageName = "yarn";
-    version = "0.17.8";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-0.17.8.tgz";
-      sha1 = "6a95d19aaeb891810618937db98a2080683cbbb4";
-    };
-    dependencies = [
-      (sources."babel-runtime-6.18.0" // {
-        dependencies = [
-          sources."core-js-2.4.1"
-          sources."regenerator-runtime-0.9.6"
-        ];
-      })
-      sources."bytes-2.4.0"
-      sources."camelcase-3.0.0"
-      (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."cmd-shim-2.0.2" // {
-        dependencies = [
-          sources."graceful-fs-4.1.11"
-        ];
-      })
-      (sources."commander-2.9.0" // {
-        dependencies = [
-          sources."graceful-readlink-1.0.1"
-        ];
-      })
-      sources."death-1.0.0"
-      (sources."debug-2.3.3" // {
-        dependencies = [
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."defaults-1.0.3" // {
-        dependencies = [
-          sources."clone-1.0.2"
-        ];
-      })
-      sources."detect-indent-4.0.0"
-      sources."diff-2.2.3"
-      sources."ini-1.3.4"
-      (sources."inquirer-1.2.3" // {
-        dependencies = [
-          sources."ansi-escapes-1.4.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-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-4.17.2"
-          sources."mute-stream-0.0.6"
-          (sources."pinkie-promise-2.0.1" // {
-            dependencies = [
-              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."through-2.3.8"
-        ];
-      })
-      (sources."invariant-2.2.2" // {
-        dependencies = [
-          (sources."loose-envify-1.3.0" // {
-            dependencies = [
-              sources."js-tokens-2.0.0"
-            ];
-          })
-        ];
-      })
-      (sources."is-builtin-module-1.0.0" // {
-        dependencies = [
-          sources."builtin-modules-1.1.1"
-        ];
-      })
-      (sources."is-ci-1.0.10" // {
-        dependencies = [
-          sources."ci-info-1.0.0"
-        ];
-      })
-      sources."leven-2.0.0"
-      (sources."loud-rejection-1.6.0" // {
-        dependencies = [
-          (sources."currently-unhandled-0.4.1" // {
-            dependencies = [
-              sources."array-find-index-1.0.2"
-            ];
-          })
-          sources."signal-exit-3.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."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
-      (sources."node-emoji-1.4.1" // {
-        dependencies = [
-          sources."string.prototype.codepointat-0.2.0"
-        ];
-      })
-      (sources."node-gyp-3.4.0" // {
-        dependencies = [
-          (sources."fstream-1.0.10" // {
-            dependencies = [
-              sources."inherits-2.0.3"
-            ];
-          })
-          (sources."glob-7.1.1" // {
-            dependencies = [
-              sources."fs.realpath-1.0.0"
-              (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."graceful-fs-4.1.11"
-          (sources."nopt-3.0.6" // {
-            dependencies = [
-              sources."abbrev-1.0.9"
-            ];
-          })
-          (sources."npmlog-3.1.2" // {
-            dependencies = [
-              (sources."are-we-there-yet-1.1.2" // {
-                dependencies = [
-                  sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.2" // {
-                    dependencies = [
-                      sources."buffer-shims-1.0.0"
-                      sources."core-util-is-1.0.2"
-                      sources."isarray-1.0.0"
-                      sources."inherits-2.0.3"
-                      sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
-                      sources."util-deprecate-1.0.2"
-                    ];
-                  })
-                ];
-              })
-              sources."console-control-strings-1.1.0"
-              (sources."gauge-2.6.0" // {
-                dependencies = [
-                  sources."aproba-1.0.4"
-                  sources."has-color-0.1.7"
-                  sources."has-unicode-2.0.1"
-                  sources."object-assign-4.1.0"
-                  sources."signal-exit-3.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."wide-align-1.1.0"
-                ];
-              })
-              sources."set-blocking-2.0.0"
-            ];
-          })
-          (sources."osenv-0.1.3" // {
-            dependencies = [
-              sources."os-homedir-1.0.2"
-              sources."os-tmpdir-1.0.2"
-            ];
-          })
-          (sources."path-array-1.0.1" // {
-            dependencies = [
-              (sources."array-index-1.0.0" // {
-                dependencies = [
-                  (sources."es6-symbol-3.1.0" // {
-                    dependencies = [
-                      sources."d-0.1.1"
-                      (sources."es5-ext-0.10.12" // {
-                        dependencies = [
-                          sources."es6-iterator-2.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
-          (sources."which-1.2.12" // {
-            dependencies = [
-              sources."isexe-1.1.2"
-            ];
-          })
-        ];
-      })
-      sources."object-path-0.11.3"
-      (sources."proper-lockfile-1.2.0" // {
-        dependencies = [
-          sources."err-code-1.1.1"
-          sources."extend-3.0.0"
-          sources."graceful-fs-4.1.11"
-          sources."retry-0.10.0"
-        ];
-      })
-      (sources."read-1.0.7" // {
-        dependencies = [
-          sources."mute-stream-0.0.6"
-        ];
-      })
-      (sources."repeating-2.0.1" // {
-        dependencies = [
-          (sources."is-finite-1.0.2" // {
-            dependencies = [
-              sources."number-is-nan-1.0.1"
-            ];
-          })
-        ];
-      })
-      (sources."request-2.79.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.2" // {
-            dependencies = [
-              sources."asynckit-0.4.0"
-            ];
-          })
-          (sources."har-validator-2.0.6" // {
-            dependencies = [
-              (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.13" // {
-            dependencies = [
-              sources."mime-db-1.25.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."uuid-3.0.0"
-        ];
-      })
-      sources."request-capture-har-1.1.4"
-      (sources."rimraf-2.5.4" // {
-        dependencies = [
-          (sources."glob-7.1.1" // {
-            dependencies = [
-              sources."fs.realpath-1.0.0"
-              (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."roadrunner-1.1.0"
-      sources."semver-5.3.0"
-      (sources."strip-bom-2.0.0" // {
-        dependencies = [
-          sources."is-utf8-0.2.1"
-        ];
-      })
-      (sources."tar-2.2.1" // {
-        dependencies = [
-          sources."block-stream-0.0.9"
-          (sources."fstream-1.0.10" // {
-            dependencies = [
-              sources."graceful-fs-4.1.11"
-            ];
-          })
-          sources."inherits-2.0.3"
-        ];
-      })
-      (sources."tar-stream-1.5.2" // {
-        dependencies = [
-          (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."end-of-stream-1.1.0" // {
-            dependencies = [
-              (sources."once-1.3.3" // {
-                dependencies = [
-                  sources."wrappy-1.0.2"
-                ];
-              })
-            ];
-          })
-          (sources."readable-stream-2.2.2" // {
-            dependencies = [
-              sources."buffer-shims-1.0.0"
-              sources."core-util-is-1.0.2"
-              sources."isarray-1.0.0"
-              sources."inherits-2.0.3"
-              sources."process-nextick-args-1.0.7"
-              sources."string_decoder-0.10.31"
-              sources."util-deprecate-1.0.2"
-            ];
-          })
-          sources."xtend-4.0.1"
-        ];
-      })
-      (sources."user-home-2.0.0" // {
-        dependencies = [
-          sources."os-homedir-1.0.2"
-        ];
-      })
-      (sources."validate-npm-package-license-3.0.1" // {
-        dependencies = [
-          (sources."spdx-correct-1.0.2" // {
-            dependencies = [
-              sources."spdx-license-ids-1.2.2"
-            ];
-          })
-          sources."spdx-expression-parse-1.0.4"
-        ];
-      })
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "<p align=\"center\">   <a href=\"https://yarnpkg.com/\">     <img alt=\"Yarn\" src=\"https://github.com/yarnpkg/assets/blob/master/yarn-kitten-full.png?raw=true\" width=\"546\">   </a> </p>";
-      homepage = "https://github.com/yarnpkg/yarn#readme";
-      license = "BSD-2-Clause";
-    };
-    production = true;
-  };
 }
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 2132aff9dd0..1f1d9fb7539 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -76,13 +76,13 @@ let
         sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3";
       };
     };
-    "resolve-1.1.7" = {
+    "resolve-1.2.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.1.7";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
-        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz";
+        sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c";
       };
     };
     "global-paths-0.1.2" = {
@@ -274,13 +274,13 @@ let
         sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe";
       };
     };
-    "global-prefix-0.1.4" = {
+    "global-prefix-0.1.5" = {
       name = "global-prefix";
       packageName = "global-prefix";
-      version = "0.1.4";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.4.tgz";
-        sha1 = "05158db1cde2dd491b455e290eb3ab8bfc45c6e1";
+        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz";
+        sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f";
       };
     };
     "is-windows-0.2.0" = {
@@ -292,6 +292,15 @@ let
         sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c";
       };
     };
+    "homedir-polyfill-1.0.1" = {
+      name = "homedir-polyfill";
+      packageName = "homedir-polyfill";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz";
+        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
+      };
+    };
     "ini-1.3.4" = {
       name = "ini";
       packageName = "ini";
@@ -301,15 +310,6 @@ let
         sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
       };
     };
-    "osenv-0.1.3" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz";
-        sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217";
-      };
-    };
     "which-1.2.12" = {
       name = "which";
       packageName = "which";
@@ -319,22 +319,13 @@ let
         sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
       };
     };
-    "os-homedir-1.0.2" = {
-      name = "os-homedir";
-      packageName = "os-homedir";
-      version = "1.0.2";
+    "parse-passwd-1.0.0" = {
+      name = "parse-passwd";
+      packageName = "parse-passwd";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
-        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
-      };
-    };
-    "os-tmpdir-1.0.2" = {
-      name = "os-tmpdir";
-      packageName = "os-tmpdir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
-        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+        url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz";
+        sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
       };
     };
     "isexe-1.1.2" = {
@@ -409,13 +400,13 @@ let
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-arm-cdn-0.2.1" = {
+    "azure-arm-cdn-1.0.0" = {
       name = "azure-arm-cdn";
       packageName = "azure-arm-cdn";
-      version = "0.2.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-0.2.1.tgz";
-        sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz";
+        sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85";
       };
     };
     "azure-arm-commerce-0.2.0" = {
@@ -427,13 +418,31 @@ let
         sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
-    "azure-arm-compute-0.19.0" = {
+    "azure-arm-compute-0.19.1" = {
       name = "azure-arm-compute";
       packageName = "azure-arm-compute";
-      version = "0.19.0";
+      version = "0.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.0.tgz";
-        sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e";
+        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz";
+        sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd";
+      };
+    };
+    "azure-arm-datalake-analytics-1.0.1-preview" = {
+      name = "azure-arm-datalake-analytics";
+      packageName = "azure-arm-datalake-analytics";
+      version = "1.0.1-preview";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.1-preview.tgz";
+        sha1 = "75461904000427e12ce11d634d74c052c86de994";
+      };
+    };
+    "azure-arm-datalake-store-1.0.1-preview" = {
+      name = "azure-arm-datalake-store";
+      packageName = "azure-arm-datalake-store";
+      version = "1.0.1-preview";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.1-preview.tgz";
+        sha1 = "bd07cbeb5eb355a00b7bed69e198a1a968115dd5";
       };
     };
     "azure-arm-hdinsight-0.2.2" = {
@@ -535,24 +544,6 @@ let
         sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02";
       };
     };
-    "azure-arm-datalake-analytics-0.4.3" = {
-      name = "azure-arm-datalake-analytics";
-      packageName = "azure-arm-datalake-analytics";
-      version = "0.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-0.4.3.tgz";
-        sha1 = "10c81e59d3064289a42ab37fea805a334333ed91";
-      };
-    };
-    "azure-arm-datalake-store-0.4.2" = {
-      name = "azure-arm-datalake-store";
-      packageName = "azure-arm-datalake-store";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-0.4.2.tgz";
-        sha1 = "479f4a28986c9737b8fef14090c0c7ccc33cb123";
-      };
-    };
     "azure-arm-devtestlabs-0.1.0" = {
       name = "azure-arm-devtestlabs";
       packageName = "azure-arm-devtestlabs";
@@ -643,13 +634,13 @@ let
         sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54";
       };
     };
-    "azure-arm-resource-1.4.5-preview" = {
+    "azure-arm-resource-1.6.1-preview" = {
       name = "azure-arm-resource";
       packageName = "azure-arm-resource";
-      version = "1.4.5-preview";
+      version = "1.6.1-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.5-preview.tgz";
-        sha1 = "166934783752607e9a4128ea0ad715b9b7a9015f";
+        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz";
+        sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
       };
     };
     "azure-arm-storage-0.13.1-preview" = {
@@ -742,13 +733,13 @@ let
         sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e";
       };
     };
-    "applicationinsights-0.15.12" = {
+    "applicationinsights-0.16.0" = {
       name = "applicationinsights";
       packageName = "applicationinsights";
-      version = "0.15.12";
+      version = "0.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.15.12.tgz";
-        sha1 = "d03f282da9424f33729eb7da8279e8e8a20dc7fc";
+        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
+        sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3";
       };
     };
     "caller-id-0.1.0" = {
@@ -868,13 +859,13 @@ let
         sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
       };
     };
-    "moment-2.17.0" = {
+    "moment-2.17.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.17.0";
+      version = "2.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz";
-        sha1 = "a4c292e02aac5ddefb29a6eed24f51938dd3b74f";
+        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
+        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
       };
     };
     "ms-rest-1.15.2" = {
@@ -904,15 +895,6 @@ let
         sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
       };
     };
-    "node-uuid-1.2.0" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz";
-        sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b";
-      };
-    };
     "omelette-0.1.0" = {
       name = "omelette";
       packageName = "omelette";
@@ -1039,6 +1021,15 @@ let
         sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
       };
     };
+    "uuid-3.0.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
+        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
+      };
+    };
     "validator-5.2.0" = {
       name = "validator";
       packageName = "validator";
@@ -1120,13 +1111,13 @@ let
         sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
       };
     };
-    "xmldom-0.1.22" = {
+    "xmldom-0.1.27" = {
       name = "xmldom";
       packageName = "xmldom";
-      version = "0.1.22";
+      version = "0.1.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
-        sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz";
+        sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
       };
     };
     "xpath.js-1.0.7" = {
@@ -1147,13 +1138,13 @@ let
         sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb";
       };
     };
-    "jwa-1.1.4" = {
+    "jwa-1.1.5" = {
       name = "jwa";
       packageName = "jwa";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz";
-        sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e";
+        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz";
+        sha1 = "a0552ce0220742cd52e153774a32905c30e756e5";
       };
     };
     "safe-buffer-5.0.1" = {
@@ -1174,22 +1165,13 @@ let
         sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
       };
     };
-    "ecdsa-sig-formatter-1.0.7" = {
+    "ecdsa-sig-formatter-1.0.9" = {
       name = "ecdsa-sig-formatter";
       packageName = "ecdsa-sig-formatter";
-      version = "1.0.7";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.7.tgz";
-        sha1 = "3137e976a1d6232517e2513e04e32f79bcbdf126";
-      };
-    };
-    "base64-url-1.3.3" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
-        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
+        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz";
+        sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1";
       };
     };
     "xml2js-0.2.7" = {
@@ -1831,13 +1813,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.13" = {
+    "mime-types-2.1.14" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.13";
+      version = "2.1.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz";
-        sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
+        sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -1903,13 +1885,13 @@ let
         sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
       };
     };
-    "lodash-4.17.2" = {
+    "lodash-4.17.4" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.2";
+      version = "4.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz";
-        sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
+        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
       };
     };
     "chalk-1.1.3" = {
@@ -1993,13 +1975,13 @@ let
         sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
       };
     };
-    "ansi-regex-2.0.0" = {
+    "ansi-regex-2.1.1" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
-        sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
       };
     };
     "graceful-readlink-1.0.1" = {
@@ -2029,13 +2011,13 @@ let
         sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
       };
     };
-    "jsonpointer-4.0.0" = {
+    "jsonpointer-4.0.1" = {
       name = "jsonpointer";
       packageName = "jsonpointer";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz";
-        sha1 = "6661e161d2fc445f19f98430231343722e1fcbd5";
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
+        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
       };
     };
     "xtend-4.0.1" = {
@@ -2119,13 +2101,13 @@ let
         sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252";
       };
     };
-    "sshpk-1.10.1" = {
+    "sshpk-1.10.2" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.10.1";
+      version = "1.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz";
-        sha1 = "30e1a5d329244974a1af61511339d595af6638b0";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz";
+        sha1 = "d5a804ce22695515638e798dbe23273de070a5fa";
       };
     };
     "extsprintf-1.0.2" = {
@@ -2173,13 +2155,13 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "dashdash-1.14.0" = {
+    "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
-      version = "1.14.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz";
-        sha1 = "29e486c5418bf0f356034a993d51686a33e84141";
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     };
     "getpass-0.1.6" = {
@@ -2200,13 +2182,13 @@ let
         sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
       };
     };
-    "tweetnacl-0.14.3" = {
+    "tweetnacl-0.14.5" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
-      version = "0.14.3";
+      version = "0.14.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz";
-        sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d";
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
     "jodid25519-1.0.2" = {
@@ -2236,13 +2218,13 @@ let
         sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
       };
     };
-    "mime-db-1.25.0" = {
+    "mime-db-1.26.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.25.0";
+      version = "1.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz";
-        sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
+        sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
       };
     };
     "punycode-1.4.1" = {
@@ -2299,13 +2281,13 @@ let
         sha1 = "0c989774f2870c69378aa665648cdc60f343aa53";
       };
     };
-    "concat-stream-1.5.2" = {
+    "concat-stream-1.6.0" = {
       name = "concat-stream";
       packageName = "concat-stream";
-      version = "1.5.2";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
-        sha1 = "708978624d856af41a5a741defdd261da752c266";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz";
+        sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
       };
     };
     "http-response-object-1.1.0" = {
@@ -2335,6 +2317,24 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
+    "readable-stream-2.2.2" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
+        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
+      };
+    };
+    "buffer-shims-1.0.0" = {
+      name = "buffer-shims";
+      packageName = "buffer-shims";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
+        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
+      };
+    };
     "http-basic-2.5.1" = {
       name = "http-basic";
       packageName = "http-basic";
@@ -2362,6 +2362,15 @@ let
         sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
       };
     };
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+      };
+    };
     "async-1.0.0" = {
       name = "async";
       packageName = "async";
@@ -2380,13 +2389,13 @@ let
         sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
       };
     };
-    "mute-stream-0.0.6" = {
+    "mute-stream-0.0.7" = {
       name = "mute-stream";
       packageName = "mute-stream";
-      version = "0.0.6";
+      version = "0.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
-        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz";
+        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
       };
     };
     "argparse-1.0.4" = {
@@ -2677,15 +2686,6 @@ let
         sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
       };
     };
-    "readable-stream-2.2.2" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
-        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
-      };
-    };
     "stream-shift-1.0.0" = {
       name = "stream-shift";
       packageName = "stream-shift";
@@ -2704,15 +2704,6 @@ let
         sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
       };
     };
-    "buffer-shims-1.0.0" = {
-      name = "buffer-shims";
-      packageName = "buffer-shims";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
-        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
-      };
-    };
     "camelcase-keys-2.1.0" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -2821,13 +2812,13 @@ let
         sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
       };
     };
-    "signal-exit-3.0.1" = {
+    "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz";
-        sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
     "array-find-index-1.0.2" = {
@@ -3118,13 +3109,13 @@ let
         sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
       };
     };
-    "debug-2.3.3" = {
+    "debug-2.6.0" = {
       name = "debug";
       packageName = "debug";
-      version = "2.3.3";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
-        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
+        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
       };
     };
     "ms-0.7.2" = {
@@ -3136,6 +3127,15 @@ let
         sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
       };
     };
+    "os-tmpdir-1.0.2" = {
+      name = "os-tmpdir";
+      packageName = "os-tmpdir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+      };
+    };
     "rimraf-2.2.8" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -3145,22 +3145,22 @@ let
         sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
       };
     };
-    "JSONStream-1.2.1" = {
+    "JSONStream-1.3.0" = {
       name = "JSONStream";
       packageName = "JSONStream";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
-        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
-      };
-    };
-    "assert-1.3.0" = {
-      name = "assert";
-      packageName = "assert";
       version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
-        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz";
+        sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5";
+      };
+    };
+    "assert-1.4.1" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
+        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
       };
     };
     "browser-pack-6.0.2" = {
@@ -3208,6 +3208,15 @@ let
         sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4";
       };
     };
+    "concat-stream-1.5.2" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
+        sha1 = "708978624d856af41a5a741defdd261da752c266";
+      };
+    };
     "console-browserify-1.1.0" = {
       name = "console-browserify";
       packageName = "console-browserify";
@@ -3280,15 +3289,6 @@ let
         sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
       };
     };
-    "glob-5.0.15" = {
-      name = "glob";
-      packageName = "glob";
-      version = "5.0.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
-        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
-      };
-    };
     "has-1.0.1" = {
       name = "has";
       packageName = "has";
@@ -3424,13 +3424,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.5.0" = {
+    "stream-http-2.6.1" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.5.0";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz";
-        sha1 = "585eee513217ed98fe199817e7313b6f772a6802";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.1.tgz";
+        sha1 = "7d20fcdfebc16b16e4174e31dd94cd9c70f10e89";
       };
     };
     "subarg-1.0.0" = {
@@ -3451,13 +3451,13 @@ let
         sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710";
       };
     };
-    "through2-2.0.1" = {
+    "through2-2.0.3" = {
       name = "through2";
       packageName = "through2";
-      version = "2.0.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz";
-        sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9";
+        url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz";
+        sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be";
       };
     };
     "timers-browserify-1.4.2" = {
@@ -3568,6 +3568,15 @@ let
         sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
       };
     };
+    "resolve-1.1.7" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+      };
+    };
     "pako-0.2.9" = {
       name = "pako";
       packageName = "pako";
@@ -3802,13 +3811,13 @@ let
         sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
       };
     };
-    "asn1.js-4.9.0" = {
+    "asn1.js-4.9.1" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "4.9.0";
+      version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz";
-        sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz";
+        sha1 = "48ba240b45a9280e94748990ba597d216617fd40";
       };
     };
     "ripemd160-1.0.1" = {
@@ -3973,13 +3982,13 @@ let
         sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
       };
     };
-    "builtin-status-codes-2.0.0" = {
+    "builtin-status-codes-3.0.0" = {
       name = "builtin-status-codes";
       packageName = "builtin-status-codes";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz";
-        sha1 = "6f22003baacf003ccd287afe6872151fddc58579";
+        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
+        sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
       };
     };
     "to-arraybuffer-1.0.1" = {
@@ -4045,13 +4054,13 @@ let
         sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395";
       };
     };
-    "castv2-client-1.1.2" = {
+    "castv2-client-1.2.0" = {
       name = "castv2-client";
       packageName = "castv2-client";
-      version = "1.1.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.1.2.tgz";
-        sha1 = "7865eac9181cd1f419fdcee448b5793706f853ad";
+        url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.2.0.tgz";
+        sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544";
       };
     };
     "chalk-1.0.0" = {
@@ -4450,13 +4459,13 @@ let
         sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc";
       };
     };
-    "numeral-1.5.5" = {
+    "numeral-1.5.6" = {
       name = "numeral";
       packageName = "numeral";
-      version = "1.5.5";
+      version = "1.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.5.tgz";
-        sha1 = "b7515d64533626124e9196cfc68c8fd5b2dee208";
+        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz";
+        sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f";
       };
     };
     "open-0.0.5" = {
@@ -4522,13 +4531,13 @@ let
         sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
       };
     };
-    "mdns-js-0.5.1" = {
+    "mdns-js-0.5.3" = {
       name = "mdns-js";
       packageName = "mdns-js";
-      version = "0.5.1";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz";
-        sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec";
+        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.3.tgz";
+        sha1 = "add2958d399319b6d8f2dde29bebac5e845e8b6d";
       };
     };
     "plist-2.0.1" = {
@@ -4684,13 +4693,13 @@ let
         sha1 = "106df57e0e509bafa6756e544d88205e52be33a6";
       };
     };
-    "simple-get-2.3.0" = {
+    "simple-get-2.4.0" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.3.0.tgz";
-        sha1 = "c5fdfcce1e516ad4b2ce7b7c2bd2d710502d8ac9";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz";
+        sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2";
       };
     };
     "thirty-two-1.0.2" = {
@@ -4720,22 +4729,22 @@ let
         sha1 = "717b36fc61c4e9cb3755f0a9f90996ee5b46f0d0";
       };
     };
-    "simple-sha1-2.0.8" = {
+    "simple-sha1-2.1.0" = {
       name = "simple-sha1";
       packageName = "simple-sha1";
-      version = "2.0.8";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.0.8.tgz";
-        sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f";
+        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz";
+        sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3";
       };
     };
-    "rusha-0.8.4" = {
+    "rusha-0.8.5" = {
       name = "rusha";
       packageName = "rusha";
-      version = "0.8.4";
+      version = "0.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rusha/-/rusha-0.8.4.tgz";
-        sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b";
+        url = "https://registry.npmjs.org/rusha/-/rusha-0.8.5.tgz";
+        sha1 = "a30ae9bd5a4e80fbc96fbe7a13232b944be24f84";
       };
     };
     "simple-concat-1.0.0" = {
@@ -4900,13 +4909,13 @@ let
         sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854";
       };
     };
-    "random-access-file-1.3.1" = {
+    "random-access-file-1.4.0" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.3.1.tgz";
-        sha1 = "5302a65a7ff2b83c50e18d79bf4cd619b520ac8d";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz";
+        sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767";
       };
     };
     "run-parallel-1.1.6" = {
@@ -5170,13 +5179,13 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.0.7" = {
+    "simple-peer-6.1.3" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.0.7";
+      version = "6.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.0.7.tgz";
-        sha1 = "ccc5133b7e75e154ab17b9ccdbec91e970cc2278";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.1.3.tgz";
+        sha1 = "c9a8baf72a36a4d4f05eab3df0db50d78a953583";
       };
     };
     "simple-websocket-4.1.0" = {
@@ -5512,13 +5521,13 @@ let
         sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c";
       };
     };
-    "exit-on-epipe-0.1.0" = {
+    "exit-on-epipe-1.0.0" = {
       name = "exit-on-epipe";
       packageName = "exit-on-epipe";
-      version = "0.1.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.1.0.tgz";
-        sha1 = "aa2f0155b78b34fe60dd2b462e84637ba5ed0697";
+        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.0.tgz";
+        sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc";
       };
     };
     "sax-1.2.1" = {
@@ -5557,13 +5566,13 @@ let
         sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33";
       };
     };
-    "insight-0.8.3" = {
+    "insight-0.8.4" = {
       name = "insight";
       packageName = "insight";
-      version = "0.8.3";
+      version = "0.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insight/-/insight-0.8.3.tgz";
-        sha1 = "72d1e1b4da6c8b405db25043f9d86900f8cbf59d";
+        url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz";
+        sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884";
       };
     };
     "nopt-3.0.1" = {
@@ -5638,6 +5647,24 @@ let
         sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
       };
     };
+    "glob-5.0.15" = {
+      name = "glob";
+      packageName = "glob";
+      version = "5.0.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
+        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
+      };
+    };
+    "osenv-0.1.4" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz";
+        sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644";
+      };
+    };
     "plist-1.2.0" = {
       name = "plist";
       packageName = "plist";
@@ -5746,13 +5773,13 @@ let
         sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980";
       };
     };
-    "cordova-serve-1.0.0" = {
+    "cordova-serve-1.0.1" = {
       name = "cordova-serve";
       packageName = "cordova-serve";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.0.tgz";
-        sha1 = "7fa1c40183d2b82adb792f9cb9e0d554a23eed85";
+        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.1.tgz";
+        sha1 = "895c7fb4bbe630fa1c89feaf6d74779cbff66da7";
       };
     };
     "dep-graph-1.1.0" = {
@@ -5926,13 +5953,13 @@ let
         sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26";
       };
     };
-    "shelljs-0.7.5" = {
+    "shelljs-0.7.6" = {
       name = "shelljs";
       packageName = "shelljs";
-      version = "0.7.5";
+      version = "0.7.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz";
-        sha1 = "2eef7a50a21e1ccf37da00df767ec69e30ad0675";
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz";
+        sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad";
       };
     };
     "interpret-1.0.1" = {
@@ -5971,6 +5998,15 @@ let
         sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae";
       };
     };
+    "assert-1.3.0" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
+        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
+      };
+    };
     "compression-1.6.2" = {
       name = "compression";
       packageName = "compression";
@@ -6205,13 +6241,13 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "proxy-addr-1.1.2" = {
+    "proxy-addr-1.1.3" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz";
-        sha1 = "b4cc5f22610d9535824c123aef9d3cf73c40ba37";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.3.tgz";
+        sha1 = "dc97502f5722e888467b3fa2297a7b1ff47df074";
       };
     };
     "qs-6.2.0" = {
@@ -6286,15 +6322,6 @@ let
         sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
       };
     };
-    "ipaddr.js-1.1.1" = {
-      name = "ipaddr.js";
-      packageName = "ipaddr.js";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz";
-        sha1 = "c791d95f52b29c1247d5df80ada39b8a73647230";
-      };
-    };
     "destroy-1.0.4" = {
       name = "destroy";
       packageName = "destroy";
@@ -6592,22 +6619,22 @@ let
         sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
       };
     };
-    "lockfile-1.0.2" = {
+    "lockfile-1.0.3" = {
       name = "lockfile";
       packageName = "lockfile";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz";
-        sha1 = "97e1990174f696cbe0a3acd58a43b84aa30c7c83";
+        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz";
+        sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79";
       };
     };
-    "lru-cache-4.0.1" = {
+    "lru-cache-4.0.2" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz";
-        sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz";
+        sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
       };
     };
     "node-gyp-3.4.0" = {
@@ -6718,13 +6745,13 @@ let
         sha1 = "d0def882952b8de3f67eba5e91199661271f41f4";
       };
     };
-    "retry-0.10.0" = {
+    "retry-0.10.1" = {
       name = "retry";
       packageName = "retry";
-      version = "0.10.0";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz";
-        sha1 = "649e15ca408422d98318161935e7f7d652d435dd";
+        url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
+        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
       };
     };
     "sha-2.0.1" = {
@@ -6961,15 +6988,6 @@ let
         sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442";
       };
     };
-    "uuid-3.0.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
-        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
-      };
-    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -7573,13 +7591,22 @@ let
         sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
       };
     };
-    "parserlib-1.0.0" = {
+    "clone-2.1.0" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz";
+        sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6";
+      };
+    };
+    "parserlib-1.1.1" = {
       name = "parserlib";
       packageName = "parserlib";
-      version = "1.0.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.0.0.tgz";
-        sha1 = "88340e7e8d95bac9e09236742eef53bec1e4b30f";
+        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz";
+        sha1 = "a64cfa724062434fdfc351c9a4ec2d92b94c06f4";
       };
     };
     "bluebird-2.9.9" = {
@@ -7979,13 +8006,13 @@ let
         sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       };
     };
-    "nan-2.4.0" = {
+    "nan-2.5.0" = {
       name = "nan";
       packageName = "nan";
-      version = "2.4.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz";
-        sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232";
+        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
+        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
       };
     };
     "jsonparse-0.0.6" = {
@@ -8342,22 +8369,22 @@ let
         sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
       };
     };
-    "ndjson-1.4.3" = {
+    "ndjson-1.5.0" = {
       name = "ndjson";
       packageName = "ndjson";
-      version = "1.4.3";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ndjson/-/ndjson-1.4.3.tgz";
-        sha1 = "7aa026fe3ab38a7da1a2b4ad07b1008e733eb239";
+        url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz";
+        sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8";
       };
     };
-    "pump-1.0.1" = {
+    "pump-1.0.2" = {
       name = "pump";
       packageName = "pump";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pump/-/pump-1.0.1.tgz";
-        sha1 = "f1f1409fb9bd1085bbdb576b43b84ec4b5eadc1a";
+        url = "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz";
+        sha1 = "3b3ee6512f94f0e575538c17995f9f16990a5d51";
       };
     };
     "pumpify-1.3.5" = {
@@ -8693,6 +8720,15 @@ let
         sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3";
       };
     };
+    "split2-2.1.1" = {
+      name = "split2";
+      packageName = "split2";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz";
+        sha1 = "7a1f551e176a90ecd3345f7246a0cfe175ef4fd0";
+      };
+    };
     "murl-0.4.1" = {
       name = "murl";
       packageName = "murl";
@@ -8711,31 +8747,40 @@ let
         sha1 = "80ab4e919749351263ef14500d684e57c4202840";
       };
     };
-    "JSONStream-1.1.4" = {
-      name = "JSONStream";
-      packageName = "JSONStream";
-      version = "1.1.4";
+    "bl-1.2.0" = {
+      name = "bl";
+      packageName = "bl";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz";
-        sha1 = "be11a495938e882d277773d11986f3974a8ba37a";
+        url = "https://registry.npmjs.org/bl/-/bl-1.2.0.tgz";
+        sha1 = "1397e7ec42c5f5dc387470c500e34a9f6be9ea98";
       };
     };
-    "async-2.0.1" = {
-      name = "async";
-      packageName = "async";
-      version = "2.0.1";
+    "awscred-1.2.0" = {
+      name = "awscred";
+      packageName = "awscred";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz";
-        sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
+        url = "https://registry.npmjs.org/awscred/-/awscred-1.2.0.tgz";
+        sha1 = "9ba714a0d2feb625b848f15c62746c07aebdc3b5";
       };
     };
-    "got-6.6.3" = {
+    "clipboardy-0.1.2" = {
+      name = "clipboardy";
+      packageName = "clipboardy";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipboardy/-/clipboardy-0.1.2.tgz";
+        sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc";
+      };
+    };
+    "got-6.7.1" = {
       name = "got";
       packageName = "got";
-      version = "6.6.3";
+      version = "6.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz";
-        sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec";
+        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
+        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
       };
     };
     "lodash.debounce-4.0.8" = {
@@ -8756,13 +8801,76 @@ let
         sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1";
       };
     };
-    "mem-0.1.1" = {
+    "mem-1.1.0" = {
       name = "mem";
       packageName = "mem";
-      version = "0.1.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz";
-        sha1 = "24df988c3102b03c074c1b296239c5b2e6647825";
+        url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz";
+        sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
+      };
+    };
+    "execa-0.5.1" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz";
+        sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36";
+      };
+    };
+    "cross-spawn-4.0.2" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz";
+        sha1 = "7b9247621c23adfdd3856004a823cbe397424d41";
+      };
+    };
+    "get-stream-2.3.1" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
+        sha1 = "5f38f93f346009666ee0150a054167f91bdd95de";
+      };
+    };
+    "npm-run-path-2.0.2" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
+        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+      };
+    };
+    "p-finally-1.0.0" = {
+      name = "p-finally";
+      packageName = "p-finally";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
+        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+      };
+    };
+    "strip-eof-1.0.0" = {
+      name = "strip-eof";
+      packageName = "strip-eof";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
+        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
+      };
+    };
+    "path-key-2.0.1" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
+        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     };
     "create-error-class-3.0.2" = {
@@ -8783,13 +8891,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "get-stream-2.3.1" = {
+    "get-stream-3.0.0" = {
       name = "get-stream";
       packageName = "get-stream";
-      version = "2.3.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
-        sha1 = "5f38f93f346009666ee0150a054167f91bdd95de";
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
+        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
       };
     };
     "is-retry-allowed-1.1.0" = {
@@ -8801,22 +8909,13 @@ let
         sha1 = "11a060568b67339444033d0125a61a20d564fb34";
       };
     };
-    "node-status-codes-2.0.1" = {
-      name = "node-status-codes";
-      packageName = "node-status-codes";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz";
-        sha1 = "298067659cb68a2b4670abbefde02a3819981f5b";
-      };
-    };
-    "timed-out-3.0.0" = {
+    "timed-out-4.0.0" = {
       name = "timed-out";
       packageName = "timed-out";
-      version = "3.0.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.0.0.tgz";
-        sha1 = "ff88de96030ce960eabd42487db61d3add229273";
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.0.tgz";
+        sha1 = "b0fb98d7fed4f36b028698122769c07ef87a8690";
       };
     };
     "url-parse-lax-1.0.0" = {
@@ -8837,13 +8936,22 @@ let
         sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
       };
     };
-    "babel-code-frame-6.16.0" = {
+    "mimic-fn-1.1.0" = {
+      name = "mimic-fn";
+      packageName = "mimic-fn";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz";
+        sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18";
+      };
+    };
+    "babel-code-frame-6.20.0" = {
       name = "babel-code-frame";
       packageName = "babel-code-frame";
-      version = "6.16.0";
+      version = "6.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz";
-        sha1 = "f90e60da0862909d3ce098733b5d3987c97cb8de";
+        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.20.0.tgz";
+        sha1 = "b968f839090f9a8bc6d41938fb96cb84f7387b26";
       };
     };
     "doctrine-1.5.0" = {
@@ -9008,6 +9116,15 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
+    "strip-json-comments-2.0.1" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
+      };
+    };
     "table-3.8.3" = {
       name = "table";
       packageName = "table";
@@ -9080,13 +9197,13 @@ let
         sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
       };
     };
-    "acorn-4.0.3" = {
+    "acorn-4.0.4" = {
       name = "acorn";
       packageName = "acorn";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz";
-        sha1 = "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1";
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz";
+        sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a";
       };
     };
     "acorn-jsx-3.0.1" = {
@@ -9098,13 +9215,13 @@ let
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
-    "flat-cache-1.2.1" = {
+    "flat-cache-1.2.2" = {
       name = "flat-cache";
       packageName = "flat-cache";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.1.tgz";
-        sha1 = "6c837d6225a7de5659323740b36d5361f71691ff";
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz";
+        sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96";
       };
     };
     "circular-json-0.3.1" = {
@@ -9278,13 +9395,13 @@ let
         sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
       };
     };
-    "fast-levenshtein-2.0.5" = {
+    "fast-levenshtein-2.0.6" = {
       name = "fast-levenshtein";
       packageName = "fast-levenshtein";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz";
-        sha1 = "bd33145744519ab1c36c3ee9f31f08e9079b67f2";
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
     "caller-path-0.1.0" = {
@@ -9314,22 +9431,22 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.9.0" = {
+    "ajv-4.10.4" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.9.0";
+      version = "4.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz";
-        sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz";
+        sha1 = "c0974dd00b3464984892d6010aa9c2c945933254";
       };
     };
-    "ajv-keywords-1.1.1" = {
+    "ajv-keywords-1.5.0" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "1.1.1";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz";
-        sha1 = "02550bc605a3e576041565628af972e06c549d50";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz";
+        sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c";
       };
     };
     "slice-ansi-0.0.4" = {
@@ -9440,13 +9557,13 @@ let
         sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d";
       };
     };
-    "prettyjson-1.2.0" = {
+    "prettyjson-1.2.1" = {
       name = "prettyjson";
       packageName = "prettyjson";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.0.tgz";
-        sha1 = "2a109cdf14c957896bbad8b77ef5de5db2c691bf";
+        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz";
+        sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289";
       };
     };
     "shush-1.0.0" = {
@@ -9584,13 +9701,13 @@ let
         sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
       };
     };
-    "fsevents-1.0.15" = {
+    "fsevents-1.0.17" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.0.15";
+      version = "1.0.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz";
-        sha1 = "fa63f590f3c2ad91275e4972a6cea545fb0aae44";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.17.tgz";
+        sha1 = "8537f3f12272678765b4fd6528c0f1f66f8f4558";
       };
     };
     "micromatch-2.3.11" = {
@@ -9656,13 +9773,13 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
-    "kind-of-3.0.4" = {
+    "kind-of-3.1.0" = {
       name = "kind-of";
       packageName = "kind-of";
-      version = "3.0.4";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz";
-        sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74";
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz";
+        sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47";
       };
     };
     "normalize-path-2.0.1" = {
@@ -9764,13 +9881,13 @@ let
         sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
       };
     };
-    "randomatic-1.1.5" = {
+    "randomatic-1.1.6" = {
       name = "randomatic";
       packageName = "randomatic";
-      version = "1.1.5";
+      version = "1.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz";
-        sha1 = "5e9ef5f2d573c67bd2b8124ae90b5156e457840b";
+        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz";
+        sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb";
       };
     };
     "repeat-string-1.6.1" = {
@@ -9854,13 +9971,13 @@ let
         sha1 = "207bab91638499c07b2adf240a41a87210034575";
       };
     };
-    "binary-extensions-1.7.0" = {
+    "binary-extensions-1.8.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz";
-        sha1 = "6c1610db163abfb34edfe42fa423343a1e01185d";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz";
+        sha1 = "48ec8d16df4377eae5fa5884682480af4d95c774";
       };
     };
     "set-immediate-shim-1.0.1" = {
@@ -9872,22 +9989,22 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.31" = {
+    "node-pre-gyp-0.6.32" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.31";
+      version = "0.6.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
-        sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
+        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
       };
     };
-    "npmlog-4.0.1" = {
+    "npmlog-4.0.2" = {
       name = "npmlog";
       packageName = "npmlog";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz";
-        sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
+        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
       };
     };
     "tar-pack-3.3.0" = {
@@ -9908,13 +10025,13 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
-    "gauge-2.7.1" = {
+    "gauge-2.7.2" = {
       name = "gauge";
       packageName = "gauge";
-      version = "2.7.1";
+      version = "2.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz";
-        sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7";
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz";
+        sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774";
       };
     };
     "set-blocking-2.0.0" = {
@@ -10071,13 +10188,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.11.1" = {
+    "coffee-script-1.12.2" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.11.1";
+      version = "1.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
-        sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
+        sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
       };
     };
     "jade-1.11.0" = {
@@ -10116,13 +10233,13 @@ let
         sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
       };
     };
-    "clean-css-3.4.21" = {
+    "clean-css-3.4.23" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "3.4.21";
+      version = "3.4.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz";
-        sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.23.tgz";
+        sha1 = "604fbbca24c12feb59b02f00b84f1fb7ded6d001";
       };
     };
     "commander-2.6.0" = {
@@ -10161,13 +10278,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.7.4" = {
+    "uglify-js-2.7.5" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.4";
+      version = "2.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
-        sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
+        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
       };
     };
     "void-elements-2.0.1" = {
@@ -10404,13 +10521,13 @@ let
         sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19";
       };
     };
-    "gulp-util-3.0.7" = {
+    "gulp-util-3.0.8" = {
       name = "gulp-util";
       packageName = "gulp-util";
-      version = "3.0.7";
+      version = "3.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz";
-        sha1 = "78925c4b8f8b49005ac01a011c557e6218941cbb";
+        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz";
+        sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f";
       };
     };
     "liftoff-2.3.0" = {
@@ -10485,22 +10602,22 @@ let
         sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809";
       };
     };
-    "dateformat-1.0.12" = {
+    "dateformat-2.0.0" = {
       name = "dateformat";
       packageName = "dateformat";
-      version = "1.0.12";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz";
-        sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9";
+        url = "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz";
+        sha1 = "2743e3abb5c3fc2462e527dca445e04e9f4dee17";
       };
     };
-    "fancy-log-1.2.0" = {
+    "fancy-log-1.3.0" = {
       name = "fancy-log";
       packageName = "fancy-log";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.2.0.tgz";
-        sha1 = "d5a51b53e9ab22ca07d558f2b67ae55fdb5fcbd8";
+        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz";
+        sha1 = "45be17d02bb9917d60ccffd4995c999e6c8c9948";
       };
     };
     "gulplog-1.0.0" = {
@@ -10890,13 +11007,13 @@ let
         sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5";
       };
     };
-    "is-unc-path-0.1.1" = {
+    "is-unc-path-0.1.2" = {
       name = "is-unc-path";
       packageName = "is-unc-path";
-      version = "0.1.1";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.1.tgz";
-        sha1 = "ab2533d77ad733561124c3dc0f5cd8b90054c86b";
+        url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz";
+        sha1 = "6ab053a72573c10250ff416a3814c35178af39b9";
       };
     };
     "unc-path-regex-0.1.2" = {
@@ -11358,13 +11475,13 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "bluebird-3.4.6" = {
+    "bluebird-3.4.7" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.4.6";
+      version = "3.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz";
-        sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz";
+        sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
       };
     };
     "body-parser-1.15.2" = {
@@ -11430,22 +11547,22 @@ let
         sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea";
       };
     };
-    "http-proxy-1.15.2" = {
+    "http-proxy-1.16.2" = {
       name = "http-proxy";
       packageName = "http-proxy";
-      version = "1.15.2";
+      version = "1.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz";
-        sha1 = "642fdcaffe52d3448d2bda3b0079e9409064da31";
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz";
+        sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742";
       };
     };
-    "isbinaryfile-3.0.1" = {
+    "isbinaryfile-3.0.2" = {
       name = "isbinaryfile";
       packageName = "isbinaryfile";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.1.tgz";
-        sha1 = "6e99573675372e841a0520c036b41513d783e79e";
+        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz";
+        sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621";
       };
     };
     "log4js-0.6.38" = {
@@ -11466,13 +11583,13 @@ let
         sha1 = "659de9f2cf8dcc27a1481276f205377272382e73";
       };
     };
-    "socket.io-1.4.7" = {
+    "socket.io-1.7.2" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "1.4.7";
+      version = "1.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.7.tgz";
-        sha1 = "92b7f7cb88c5797d4daee279fe8075dbe6d3fa1c";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.2.tgz";
+        sha1 = "83bbbdf2e79263b378900da403e7843e05dc3b71";
       };
     };
     "tmp-0.0.28" = {
@@ -11484,13 +11601,13 @@ let
         sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120";
       };
     };
-    "useragent-2.1.9" = {
+    "useragent-2.1.10" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.1.9";
+      version = "2.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.9.tgz";
-        sha1 = "4dba2bc4dad1875777ab15de3ff8098b475000b7";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.10.tgz";
+        sha1 = "2456c5c2b722b47f3d8321ed257b490a3d9bb2af";
       };
     };
     "bytes-2.4.0" = {
@@ -11601,40 +11718,22 @@ let
         sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
       };
     };
-    "engine.io-1.6.10" = {
+    "debug-2.3.3" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
+        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
+      };
+    };
+    "engine.io-1.8.2" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "1.6.10";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.10.tgz";
-        sha1 = "f87d84e1bd21d1a2ec7f8deef0c62054acdfb27a";
-      };
-    };
-    "socket.io-parser-2.2.6" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz";
-        sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99";
-      };
-    };
-    "socket.io-client-1.4.6" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.4.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz";
-        sha1 = "49b0ba537efd15b8297c84016e642e1c7c752c3d";
-      };
-    };
-    "socket.io-adapter-0.4.0" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz";
-        sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.2.tgz";
+        sha1 = "6b59be730b348c0125b0a4589de1c355abcf7a7e";
       };
     };
     "has-binary-0.1.7" = {
@@ -11646,49 +11745,58 @@ let
         sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
       };
     };
-    "base64id-0.1.0" = {
+    "socket.io-adapter-0.5.0" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
+        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
+      };
+    };
+    "socket.io-client-1.7.2" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "1.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.2.tgz";
+        sha1 = "39fdb0c3dd450e321b7e40cfd83612ec533dd644";
+      };
+    };
+    "socket.io-parser-2.3.1" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
+        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
+      };
+    };
+    "base64id-1.0.0" = {
       name = "base64id";
       packageName = "base64id";
-      version = "0.1.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
-        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+        url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz";
+        sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
       };
     };
-    "ws-1.0.1" = {
-      name = "ws";
-      packageName = "ws";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz";
-        sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9";
-      };
-    };
-    "engine.io-parser-1.2.4" = {
+    "engine.io-parser-1.3.2" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
-      version = "1.2.4";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz";
-        sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42";
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz";
+        sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a";
       };
     };
-    "accepts-1.1.4" = {
-      name = "accepts";
-      packageName = "accepts";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
-        sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
-      };
-    };
-    "after-0.8.1" = {
+    "after-0.8.2" = {
       name = "after";
       packageName = "after";
-      version = "0.8.1";
+      version = "0.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz";
-        sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627";
+        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
+        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
       };
     };
     "arraybuffer.slice-0.0.6" = {
@@ -11700,13 +11808,13 @@ let
         sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
       };
     };
-    "base64-arraybuffer-0.1.2" = {
+    "base64-arraybuffer-0.1.5" = {
       name = "base64-arraybuffer";
       packageName = "base64-arraybuffer";
-      version = "0.1.2";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
-        sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154";
+        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
+        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
       };
     };
     "blob-0.0.4" = {
@@ -11718,103 +11826,13 @@ let
         sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
       };
     };
-    "has-binary-0.1.6" = {
-      name = "has-binary";
-      packageName = "has-binary";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz";
-        sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10";
-      };
-    };
-    "utf8-2.1.0" = {
-      name = "utf8";
-      packageName = "utf8";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz";
-        sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5";
-      };
-    };
-    "negotiator-0.4.9" = {
-      name = "negotiator";
-      packageName = "negotiator";
-      version = "0.4.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
-        sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f";
-      };
-    };
-    "json3-3.3.2" = {
-      name = "json3";
-      packageName = "json3";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
-        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
-      };
-    };
-    "benchmark-1.0.0" = {
-      name = "benchmark";
-      packageName = "benchmark";
+    "wtf-8-1.0.0" = {
+      name = "wtf-8";
+      packageName = "wtf-8";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
-        sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73";
-      };
-    };
-    "engine.io-client-1.6.9" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.6.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz";
-        sha1 = "1d6ad48048a5083c95096943b29d36efdb212401";
-      };
-    };
-    "component-bind-1.0.0" = {
-      name = "component-bind";
-      packageName = "component-bind";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
-        sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
-      };
-    };
-    "component-emitter-1.2.0" = {
-      name = "component-emitter";
-      packageName = "component-emitter";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz";
-        sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe";
-      };
-    };
-    "object-component-0.0.3" = {
-      name = "object-component";
-      packageName = "object-component";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
-        sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
-      };
-    };
-    "parseuri-0.0.4" = {
-      name = "parseuri";
-      packageName = "parseuri";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz";
-        sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350";
-      };
-    };
-    "to-array-0.1.4" = {
-      name = "to-array";
-      packageName = "to-array";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
-        sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
+        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
+        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
       };
     };
     "backo2-1.0.2" = {
@@ -11826,40 +11844,58 @@ let
         sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
       };
     };
-    "has-cors-1.1.0" = {
-      name = "has-cors";
-      packageName = "has-cors";
-      version = "1.1.0";
+    "component-bind-1.0.0" = {
+      name = "component-bind";
+      packageName = "component-bind";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
-        sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+        url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
+        sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
       };
     };
-    "xmlhttprequest-ssl-1.5.1" = {
-      name = "xmlhttprequest-ssl";
-      packageName = "xmlhttprequest-ssl";
-      version = "1.5.1";
+    "component-emitter-1.2.1" = {
+      name = "component-emitter";
+      packageName = "component-emitter";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz";
-        sha1 = "3b7741fea4a86675976e908d296d4445961faa67";
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
       };
     };
-    "parsejson-0.0.1" = {
-      name = "parsejson";
-      packageName = "parsejson";
-      version = "0.0.1";
+    "engine.io-client-1.8.2" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
-        sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc";
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.2.tgz";
+        sha1 = "c38767547f2a7d184f5752f6f0ad501006703766";
       };
     };
-    "parseqs-0.0.2" = {
-      name = "parseqs";
-      packageName = "parseqs";
-      version = "0.0.2";
+    "object-component-0.0.3" = {
+      name = "object-component";
+      packageName = "object-component";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
-        sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7";
+        url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
+        sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
+      };
+    };
+    "parseuri-0.0.5" = {
+      name = "parseuri";
+      packageName = "parseuri";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
+        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+      };
+    };
+    "to-array-0.1.4" = {
+      name = "to-array";
+      packageName = "to-array";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
+        sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
       };
     };
     "component-inherit-0.0.3" = {
@@ -11871,6 +11907,42 @@ let
         sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
       };
     };
+    "has-cors-1.1.0" = {
+      name = "has-cors";
+      packageName = "has-cors";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
+        sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+      };
+    };
+    "parsejson-0.0.3" = {
+      name = "parsejson";
+      packageName = "parsejson";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
+        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
+      };
+    };
+    "parseqs-0.0.5" = {
+      name = "parseqs";
+      packageName = "parseqs";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
+        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
+      };
+    };
+    "xmlhttprequest-ssl-1.5.3" = {
+      name = "xmlhttprequest-ssl";
+      packageName = "xmlhttprequest-ssl";
+      version = "1.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
+        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
+      };
+    };
     "yeast-0.1.2" = {
       name = "yeast";
       packageName = "yeast";
@@ -11898,22 +11970,13 @@ let
         sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
       };
     };
-    "socket.io-parser-2.2.2" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz";
-        sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417";
-      };
-    };
-    "json3-3.2.6" = {
+    "json3-3.3.2" = {
       name = "json3";
       packageName = "json3";
-      version = "3.2.6";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
-        sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
+        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
+        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
       };
     };
     "lru-cache-2.2.4" = {
@@ -12222,6 +12285,15 @@ let
         sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
       };
     };
+    "base64-url-1.3.3" = {
+      name = "base64-url";
+      packageName = "base64-url";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
+        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
+      };
+    };
     "rndm-1.2.0" = {
       name = "rndm";
       packageName = "rndm";
@@ -12366,22 +12438,22 @@ let
         sha1 = "a7de988a211f9cf4687377130ea74df32730c918";
       };
     };
-    "oauth-0.9.14" = {
+    "oauth-0.9.15" = {
       name = "oauth";
       packageName = "oauth";
-      version = "0.9.14";
+      version = "0.9.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
-        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz";
+        sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1";
       };
     };
-    "passport-oauth2-1.3.0" = {
+    "passport-oauth2-1.4.0" = {
       name = "passport-oauth2";
       packageName = "passport-oauth2";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.3.0.tgz";
-        sha1 = "d72b4bd62eeb807a4089ff3071a22c26c382dc0c";
+        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz";
+        sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad";
       };
     };
     "uid2-0.0.3" = {
@@ -12447,22 +12519,22 @@ let
         sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
       };
     };
-    "lodash.isequal-4.4.0" = {
+    "lodash.isequal-4.5.0" = {
       name = "lodash.isequal";
       packageName = "lodash.isequal";
-      version = "4.4.0";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.4.0.tgz";
-        sha1 = "6295768e98e14dc15ce8d362ef6340db82852031";
+        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
+        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
       };
     };
-    "merge-stream-1.0.0" = {
+    "merge-stream-1.0.1" = {
       name = "merge-stream";
       packageName = "merge-stream";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz";
-        sha1 = "9cfd156fef35421e2b5403ce11dc6eb1962b026e";
+        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz";
+        sha1 = "4041202d508a342ba00174008df0c251b8c135e1";
       };
     };
     "strip-bom-stream-1.0.0" = {
@@ -12492,13 +12564,13 @@ let
         sha1 = "1b904a59609fb328ef078138420934f6b86709a6";
       };
     };
-    "glob-parent-3.0.1" = {
+    "glob-parent-3.1.0" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "3.0.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.1.tgz";
-        sha1 = "60021327cc963ddc3b5f085764f500479ecd82ff";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
+        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     };
     "ordered-read-streams-0.3.0" = {
@@ -12546,13 +12618,13 @@ let
         sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
       };
     };
-    "is-extglob-2.1.0" = {
+    "is-extglob-2.1.1" = {
       name = "is-extglob";
       packageName = "is-extglob";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.0.tgz";
-        sha1 = "33411a482b046bf95e6b0cb27ee2711af4cf15ad";
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
       };
     };
     "extend-shallow-2.0.1" = {
@@ -12942,15 +13014,6 @@ let
         sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103";
       };
     };
-    "after-0.8.2" = {
-      name = "after";
-      packageName = "after";
-      version = "0.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
-        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
-      };
-    };
     "yargs-1.3.3" = {
       name = "yargs";
       packageName = "yargs";
@@ -13023,13 +13086,13 @@ let
         sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
       };
     };
-    "wrap-ansi-2.0.0" = {
+    "wrap-ansi-2.1.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz";
-        sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f";
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
       };
     };
     "lcid-1.0.0" = {
@@ -13158,22 +13221,22 @@ let
         sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     };
-    "write-file-atomic-1.2.0" = {
+    "write-file-atomic-1.3.1" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
-      version = "1.2.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
-        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.1.tgz";
+        sha1 = "7d45ba32316328dd1ec7d90f60ebc0d845bb759a";
       };
     };
-    "bcryptjs-2.3.0" = {
+    "bcryptjs-2.4.0" = {
       name = "bcryptjs";
       packageName = "bcryptjs";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz";
-        sha1 = "5826900cfef7abaf3425c72e4d464de509b8c2ec";
+        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.0.tgz";
+        sha1 = "fb7f4a0b133854503fe1b2da3f25db834cf0e678";
       };
     };
     "cheerio-0.22.0" = {
@@ -13185,15 +13248,6 @@ let
         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" = {
       name = "cookie-parser";
       packageName = "cookie-parser";
@@ -13203,31 +13257,31 @@ let
         sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
       };
     };
-    "cron-1.1.1" = {
+    "cron-1.2.1" = {
       name = "cron";
       packageName = "cron";
-      version = "1.1.1";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.1.1.tgz";
-        sha1 = "02719d4ef480dfc8ee24d81a3603460ba39013ce";
+        url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz";
+        sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2";
       };
     };
-    "follow-redirects-0.2.0" = {
+    "follow-redirects-1.2.1" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "0.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.2.0.tgz";
-        sha1 = "e0229d7a388bb5ff7b29f44fc1e1b62e921272df";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.1.tgz";
+        sha1 = "796c716970df4fb0096165393545040f61b00f59";
       };
     };
-    "fs-extra-0.30.0" = {
+    "fs-extra-1.0.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
-      version = "0.30.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz";
-        sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
+        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
       };
     };
     "fs.notify-0.0.4" = {
@@ -13248,31 +13302,40 @@ let
         sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
-    "mqtt-1.14.1" = {
+    "jsonata-1.0.10" = {
+      name = "jsonata";
+      packageName = "jsonata";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.0.10.tgz";
+        sha1 = "5177b5aa3ec66e7b5894412b2f9ad170c6107b96";
+      };
+    };
+    "mqtt-2.2.1" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-1.14.1.tgz";
-        sha1 = "7e376987153d01793e946d26d46122ebf0c03554";
-      };
-    };
-    "mustache-2.2.1" = {
-      name = "mustache";
-      packageName = "mustache";
       version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-2.2.1.tgz";
-        sha1 = "2c40ca21c278f53150682bcf9090e41a3339b876";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.2.1.tgz";
+        sha1 = "b3efff8adff78dee07e09cfe89e2d2fb364a1852";
       };
     };
-    "oauth2orize-1.5.0" = {
+    "mustache-2.3.0" = {
+      name = "mustache";
+      packageName = "mustache";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz";
+        sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0";
+      };
+    };
+    "oauth2orize-1.7.0" = {
       name = "oauth2orize";
       packageName = "oauth2orize";
-      version = "1.5.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.5.0.tgz";
-        sha1 = "e352ff4f1b5bf08f0ee94a09757f8f640eb8e0a6";
+        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.7.0.tgz";
+        sha1 = "94c2a511cd0b58bde548548ffcde14fd81f257cc";
       };
     };
     "passport-http-bearer-1.0.1" = {
@@ -13293,22 +13356,22 @@ let
         sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba";
       };
     };
-    "sentiment-1.0.6" = {
-      name = "sentiment";
-      packageName = "sentiment";
-      version = "1.0.6";
+    "raw-body-2.2.0" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sentiment/-/sentiment-1.0.6.tgz";
-        sha1 = "f6096c6271f020f490d58b54a8afd598db8acbb1";
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz";
+        sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96";
       };
     };
-    "uglify-js-2.7.3" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.7.3";
+    "sentiment-2.1.0" = {
+      name = "sentiment";
+      packageName = "sentiment";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
-        sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
+        url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz";
+        sha1 = "33279100c35c38519ca5e435245186c512fe0fdc";
       };
     };
     "when-3.7.7" = {
@@ -13320,15 +13383,6 @@ let
         sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
       };
     };
-    "ws-0.8.1" = {
-      name = "ws";
-      packageName = "ws";
-      version = "0.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-0.8.1.tgz";
-        sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759";
-      };
-    };
     "node-red-node-feedparser-0.1.7" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
@@ -13338,13 +13392,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.12" = {
+    "node-red-node-email-0.1.15" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.12";
+      version = "0.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz";
-        sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz";
+        sha1 = "7a528596d3b693a077b1ee293300299855537142";
       };
     };
     "node-red-node-twitter-0.1.9" = {
@@ -13365,22 +13419,13 @@ let
         sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539";
       };
     };
-    "node-red-node-serialport-0.4.1" = {
-      name = "node-red-node-serialport";
-      packageName = "node-red-node-serialport";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz";
-        sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c";
-      };
-    };
-    "bcrypt-0.8.7" = {
+    "bcrypt-1.0.2" = {
       name = "bcrypt";
       packageName = "bcrypt";
-      version = "0.8.7";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz";
-        sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093";
+        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.2.tgz";
+        sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736";
       };
     };
     "css-select-1.2.0" = {
@@ -13527,13 +13572,13 @@ let
         sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
       };
     };
-    "moment-timezone-0.5.9" = {
+    "moment-timezone-0.5.11" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.9";
+      version = "0.5.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz";
-        sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz";
+        sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f";
       };
     };
     "retry-0.6.1" = {
@@ -13599,22 +13644,13 @@ let
         sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a";
       };
     };
-    "mqtt-connection-2.1.1" = {
-      name = "mqtt-connection";
-      packageName = "mqtt-connection";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-connection/-/mqtt-connection-2.1.1.tgz";
-        sha1 = "7b2e985a74e196619430bebd35da162c34c4e56a";
-      };
-    };
-    "mqtt-packet-3.4.7" = {
+    "mqtt-packet-5.2.1" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "3.4.7";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-3.4.7.tgz";
-        sha1 = "be8c267be7f0bf6a2a2d4f6de28307b6e0940e5f";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.1.tgz";
+        sha1 = "876e35ed616a8e348ac0283b4922039872458b58";
       };
     };
     "reinterval-1.1.0" = {
@@ -13626,15 +13662,6 @@ let
         sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
       };
     };
-    "split2-2.1.0" = {
-      name = "split2";
-      packageName = "split2";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split2/-/split2-2.1.0.tgz";
-        sha1 = "7382c148cb622c4b28af7c727f9673730b73f474";
-      };
-    };
     "websocket-stream-3.3.3" = {
       name = "websocket-stream";
       packageName = "websocket-stream";
@@ -13662,58 +13689,13 @@ let
         sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
       };
     };
-    "reduplexer-1.1.0" = {
-      name = "reduplexer";
-      packageName = "reduplexer";
-      version = "1.1.0";
+    "iconv-lite-0.4.15" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/reduplexer/-/reduplexer-1.1.0.tgz";
-        sha1 = "7dfed18a679e749c1d7ad36de01acb515f08e140";
-      };
-    };
-    "lodash.assign-4.0.1" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.0.1.tgz";
-        sha1 = "8e7ff0206897a99dca32fc8123309f5c4c2c731e";
-      };
-    };
-    "lodash.keys-4.2.0" = {
-      name = "lodash.keys";
-      packageName = "lodash.keys";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz";
-        sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205";
-      };
-    };
-    "lodash.rest-4.0.5" = {
-      name = "lodash.rest";
-      packageName = "lodash.rest";
-      version = "4.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.5.tgz";
-        sha1 = "954ef75049262038c96d1fc98b28fdaf9f0772aa";
-      };
-    };
-    "bufferutil-1.2.1" = {
-      name = "bufferutil";
-      packageName = "bufferutil";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz";
-        sha1 = "37be5d36e1e06492221e68d474b1ac58e510cbd7";
-      };
-    };
-    "utf-8-validate-1.2.1" = {
-      name = "utf-8-validate";
-      packageName = "utf-8-validate";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz";
-        sha1 = "44cb7c6eead73d6b40448f71f745904357b9f72c";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
+        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
       };
     };
     "feedparser-1.1.3" = {
@@ -13779,13 +13761,13 @@ let
         sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3";
       };
     };
-    "imap-0.8.18" = {
+    "imap-0.8.19" = {
       name = "imap";
       packageName = "imap";
-      version = "0.8.18";
+      version = "0.8.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/imap/-/imap-0.8.18.tgz";
-        sha1 = "4a7cdd0ff276efa0298708bb2c6d0db0b77f7a3f";
+        url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz";
+        sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5";
       };
     };
     "libmime-1.2.0" = {
@@ -13941,58 +13923,13 @@ let
         sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
       };
     };
-    "serialport-4.0.6" = {
-      name = "serialport";
-      packageName = "serialport";
-      version = "4.0.6";
+    "oauth-0.9.14" = {
+      name = "oauth";
+      packageName = "oauth";
+      version = "0.9.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz";
-        sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae";
-      };
-    };
-    "lie-3.1.0" = {
-      name = "lie";
-      packageName = "lie";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lie/-/lie-3.1.0.tgz";
-        sha1 = "65e0139eaef9ae791a1f5c8c53692c8d3b4718f4";
-      };
-    };
-    "object.assign-4.0.4" = {
-      name = "object.assign";
-      packageName = "object.assign";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz";
-        sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
-      };
-    };
-    "immediate-3.0.6" = {
-      name = "immediate";
-      packageName = "immediate";
-      version = "3.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz";
-        sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b";
-      };
-    };
-    "define-properties-1.1.2" = {
-      name = "define-properties";
-      packageName = "define-properties";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
-        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
-      };
-    };
-    "nan-2.3.5" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
-        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
+        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
       };
     };
     "mongoose-3.6.7" = {
@@ -14373,6 +14310,15 @@ let
         sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d";
       };
     };
+    "base64id-0.1.0" = {
+      name = "base64id";
+      packageName = "base64id";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+      };
+    };
     "redis-0.7.3" = {
       name = "redis";
       packageName = "redis";
@@ -14454,13 +14400,13 @@ let
         sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
       };
     };
-    "mailcomposer-3.12.0" = {
+    "mailcomposer-4.0.1" = {
       name = "mailcomposer";
       packageName = "mailcomposer";
-      version = "3.12.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz";
-        sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9";
+        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz";
+        sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4";
       };
     };
     "simplesmtp-0.3.35" = {
@@ -14472,22 +14418,22 @@ let
         sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03";
       };
     };
-    "buildmail-3.10.0" = {
+    "buildmail-4.0.1" = {
       name = "buildmail";
       packageName = "buildmail";
-      version = "3.10.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz";
-        sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159";
+        url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz";
+        sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72";
       };
     };
-    "libmime-2.1.0" = {
+    "libmime-3.0.0" = {
       name = "libmime";
       packageName = "libmime";
-      version = "2.1.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz";
-        sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd";
+        url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz";
+        sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6";
       };
     };
     "addressparser-1.0.1" = {
@@ -14544,6 +14490,15 @@ let
         sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528";
       };
     };
+    "nan-2.3.5" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
+        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
+      };
+    };
     "argparse-0.1.16" = {
       name = "argparse";
       packageName = "argparse";
@@ -14571,6 +14526,15 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
+    "JSONStream-1.2.1" = {
+      name = "JSONStream";
+      packageName = "JSONStream";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
+        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
+      };
+    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14634,6 +14598,15 @@ let
         sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
       };
     };
+    "nopt-4.0.1" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
+        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+      };
+    };
     "npm-install-checks-3.0.0" = {
       name = "npm-install-checks";
       packageName = "npm-install-checks";
@@ -14643,13 +14616,13 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-registry-client-7.3.0" = {
+    "npm-registry-client-7.4.5" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "7.3.0";
+      version = "7.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz";
-        sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.5.tgz";
+        sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df";
       };
     };
     "opener-1.4.2" = {
@@ -14679,15 +14652,6 @@ let
         sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
       };
     };
-    "request-2.78.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.78.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
-        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
-      };
-    };
     "sorted-union-stream-2.1.3" = {
       name = "sorted-union-stream";
       packageName = "sorted-union-stream";
@@ -14706,6 +14670,15 @@ let
         sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
+    "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";
+      };
+    };
     "lodash._baseindexof-3.1.0" = {
       name = "lodash._baseindexof";
       packageName = "lodash._baseindexof";
@@ -15048,13 +15021,13 @@ let
         sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d";
       };
     };
-    "update-notifier-1.0.2" = {
+    "update-notifier-1.0.3" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.2.tgz";
-        sha1 = "27c90519196dc15015be02a34ea52986feab8877";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz";
+        sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a";
       };
     };
     "request-2.75.0" = {
@@ -15201,6 +15174,15 @@ let
         sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
       };
     };
+    "timed-out-3.1.3" = {
+      name = "timed-out";
+      packageName = "timed-out";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
+        sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217";
+      };
+    };
     "unzip-response-1.0.2" = {
       name = "unzip-response";
       packageName = "unzip-response";
@@ -15321,13 +15303,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.1.11" = {
+    "service-runner-2.1.13" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.1.11";
+      version = "2.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz";
-        sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz";
+        sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb";
       };
     };
     "simplediff-0.1.1" = {
@@ -15384,6 +15366,24 @@ let
         sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
       };
     };
+    "object.assign-4.0.4" = {
+      name = "object.assign";
+      packageName = "object.assign";
+      version = "4.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz";
+        sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
+      };
+    };
+    "define-properties-1.1.2" = {
+      name = "define-properties";
+      packageName = "define-properties";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
+        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
+      };
+    };
     "gelfling-0.2.0" = {
       name = "gelfling";
       packageName = "gelfling";
@@ -15808,13 +15808,13 @@ let
         sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364";
       };
     };
-    "array-flatten-2.1.0" = {
+    "array-flatten-2.1.1" = {
       name = "array-flatten";
       packageName = "array-flatten";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.0.tgz";
-        sha1 = "26a692c83881fc68dac3ec5d1f0c1b49bf2304d9";
+        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz";
+        sha1 = "426bb9da84090c1838d812c8150af20a8331e296";
       };
     };
     "dns-equal-1.0.0" = {
@@ -15871,13 +15871,22 @@ let
         sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
       };
     };
-    "run-async-2.2.0" = {
+    "mute-stream-0.0.6" = {
+      name = "mute-stream";
+      packageName = "mute-stream";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
+        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
+      };
+    };
+    "run-async-2.3.0" = {
       name = "run-async";
       packageName = "run-async";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.2.0.tgz";
-        sha1 = "8783abd83c7bb86f41ee0602fc82404b3bd6e8b9";
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
+        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
       };
     };
     "rx-4.1.0" = {
@@ -15934,15 +15943,6 @@ let
         sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
       };
     };
-    "socket.io-1.6.0" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz";
-        sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1";
-      };
-    };
     "torrent-stream-0.18.1" = {
       name = "torrent-stream";
       packageName = "torrent-stream";
@@ -16312,123 +16312,6 @@ let
         sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
       };
     };
-    "engine.io-1.8.0" = {
-      name = "engine.io";
-      packageName = "engine.io";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz";
-        sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa";
-      };
-    };
-    "socket.io-adapter-0.5.0" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
-        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
-      };
-    };
-    "socket.io-client-1.6.0" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz";
-        sha1 = "5b668f4f771304dfeed179064708386fa6717853";
-      };
-    };
-    "socket.io-parser-2.3.1" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
-        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
-      };
-    };
-    "engine.io-parser-1.3.1" = {
-      name = "engine.io-parser";
-      packageName = "engine.io-parser";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz";
-        sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf";
-      };
-    };
-    "base64-arraybuffer-0.1.5" = {
-      name = "base64-arraybuffer";
-      packageName = "base64-arraybuffer";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
-        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
-      };
-    };
-    "wtf-8-1.0.0" = {
-      name = "wtf-8";
-      packageName = "wtf-8";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
-        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
-      };
-    };
-    "component-emitter-1.2.1" = {
-      name = "component-emitter";
-      packageName = "component-emitter";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
-        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
-      };
-    };
-    "engine.io-client-1.8.0" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz";
-        sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c";
-      };
-    };
-    "parseuri-0.0.5" = {
-      name = "parseuri";
-      packageName = "parseuri";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
-        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
-      };
-    };
-    "parsejson-0.0.3" = {
-      name = "parsejson";
-      packageName = "parsejson";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
-        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
-      };
-    };
-    "parseqs-0.0.5" = {
-      name = "parseqs";
-      packageName = "parseqs";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
-        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
-      };
-    };
-    "xmlhttprequest-ssl-1.5.3" = {
-      name = "xmlhttprequest-ssl";
-      packageName = "xmlhttprequest-ssl";
-      version = "1.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
-        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
-      };
-    };
     "bittorrent-dht-3.2.6" = {
       name = "bittorrent-dht";
       packageName = "bittorrent-dht";
@@ -16699,15 +16582,6 @@ let
         sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
       };
     };
-    "iconv-lite-0.4.15" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
-        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
-      };
-    };
     "private-0.1.6" = {
       name = "private";
       packageName = "private";
@@ -16717,13 +16591,13 @@ let
         sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
       };
     };
-    "recast-0.11.17" = {
+    "recast-0.11.18" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.17";
+      version = "0.11.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.17.tgz";
-        sha1 = "67e829df49ef8ea822381cc516d305411e60bad8";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.18.tgz";
+        sha1 = "07af6257ca769868815209401d4d60eef1b5b947";
       };
     };
     "ast-types-0.9.2" = {
@@ -16735,13 +16609,13 @@ let
         sha1 = "2cc19979d15c655108bf565323b8e7ee38751f6b";
       };
     };
-    "esprima-3.1.1" = {
+    "esprima-3.1.3" = {
       name = "esprima";
       packageName = "esprima";
-      version = "3.1.1";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.1.tgz";
-        sha1 = "02dbcc5ac3ece81070377f99158ec742ab5dda06";
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
       };
     };
     "base62-0.1.1" = {
@@ -16927,11 +16801,11 @@ let
     "oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" = {
       name = "oauth";
       packageName = "oauth";
-      version = "0.9.14";
+      version = "0.9.15";
       src = fetchurl {
-        name = "oauth-0.9.14.tar.gz";
+        name = "oauth-0.9.15.tar.gz";
         url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master;
-        sha256 = "abd0d7be4fb10804e5a38ee66a4db5fc36d2ed045be52e7c8b7e19e4c9e16bd8";
+        sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947";
       };
     };
     "connect-2.3.9" = {
@@ -17213,13 +17087,13 @@ let
         sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414";
       };
     };
-    "sanitize-html-1.13.0" = {
+    "sanitize-html-1.14.1" = {
       name = "sanitize-html";
       packageName = "sanitize-html";
-      version = "1.13.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz";
-        sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631";
+        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz";
+        sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8";
       };
     };
     "linkify-it-1.2.4" = {
@@ -17438,13 +17312,13 @@ let
         sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
       };
     };
-    "csv-parse-1.1.7" = {
+    "csv-parse-1.1.9" = {
       name = "csv-parse";
       packageName = "csv-parse";
-      version = "1.1.7";
+      version = "1.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.7.tgz";
-        sha1 = "6e4678f7967013ac823929a4303a3ce177115abc";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.9.tgz";
+        sha1 = "5010f93e052578fcab67e30e9b59129c6248ad81";
       };
     };
     "stream-transform-0.1.1" = {
@@ -17636,13 +17510,13 @@ let
         sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2";
       };
     };
-    "clap-1.1.1" = {
+    "clap-1.1.2" = {
       name = "clap";
       packageName = "clap";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clap/-/clap-1.1.1.tgz";
-        sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d";
+        url = "https://registry.npmjs.org/clap/-/clap-1.1.2.tgz";
+        sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed";
       };
     };
     "async-2.1.2" = {
@@ -17699,6 +17573,15 @@ let
         sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4";
       };
     };
+    "request-2.78.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.78.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
+        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+      };
+    };
     "sprintf-0.1.5" = {
       name = "sprintf";
       packageName = "sprintf";
@@ -17798,6 +17681,15 @@ let
         sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
       };
     };
+    "xmldom-0.1.22" = {
+      name = "xmldom";
+      packageName = "xmldom";
+      version = "0.1.22";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
+        sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
+      };
+    };
     "qs-6.0.2" = {
       name = "qs";
       packageName = "qs";
@@ -17807,31 +17699,22 @@ let
         sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
       };
     };
-    "bluebird-3.3.5" = {
-      name = "bluebird";
-      packageName = "bluebird";
-      version = "3.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.3.5.tgz";
-        sha1 = "5ee747f1c7bd967658b683936430aee753955a34";
-      };
-    };
-    "blueimp-md5-2.3.1" = {
+    "blueimp-md5-2.6.0" = {
       name = "blueimp-md5";
       packageName = "blueimp-md5";
-      version = "2.3.1";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz";
-        sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a";
+        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.6.0.tgz";
+        sha1 = "c96dd67f57db522da9a0c49b464ca44e20c04e0f";
       };
     };
-    "color-0.11.4" = {
+    "color-1.0.3" = {
       name = "color";
       packageName = "color";
-      version = "0.11.4";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz";
-        sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764";
+        url = "https://registry.npmjs.org/color/-/color-1.0.3.tgz";
+        sha1 = "e48e832d85f14ef694fb468811c2d5cfe729b55d";
       };
     };
     "crossroads-0.12.2" = {
@@ -17843,31 +17726,22 @@ let
         sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2";
       };
     };
-    "diff2html-1.2.0" = {
+    "diff2html-2.0.11" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "1.2.0";
+      version = "2.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-1.2.0.tgz";
-        sha1 = "8b54af41c180befd9cb1caa130a3d76081ae4a07";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.0.11.tgz";
+        sha1 = "b0ccb1d8da49702fdc191737c4b1f5e6fa8affc6";
       };
     };
-    "express-4.13.4" = {
-      name = "express";
-      packageName = "express";
-      version = "4.13.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.13.4.tgz";
-        sha1 = "3c0b76f3c77590c8345739061ec0bd3ba067ec24";
-      };
-    };
-    "express-session-1.13.0" = {
+    "express-session-1.14.2" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.13.0";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.13.0.tgz";
-        sha1 = "8ac3b5c0188b48382851d88207b8e7746efb4011";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz";
+        sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275";
       };
     };
     "forever-monitor-1.1.0" = {
@@ -17915,31 +17789,13 @@ let
         sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
       };
     };
-    "lodash-4.12.0" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz";
-        sha1 = "2bd6dc46a040f59e686c972ed21d93dc59053258";
-      };
-    };
-    "moment-2.13.0" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.13.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.13.0.tgz";
-        sha1 = "24162d99521e6d40f99ae6939e806d2139eaac52";
-      };
-    };
-    "npm-3.9.6" = {
+    "npm-4.1.2" = {
       name = "npm";
       packageName = "npm";
-      version = "3.9.6";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-3.9.6.tgz";
-        sha1 = "0ef1d272a069ad95bdca8b2dfe6fcd82f4b461d7";
+        url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
+        sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
       };
     };
     "octicons-3.5.0" = {
@@ -17960,13 +17816,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-0.11.0" = {
+    "raven-1.1.1" = {
       name = "raven";
       packageName = "raven";
-      version = "0.11.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-0.11.0.tgz";
-        sha1 = "32981138a93e4c8ad08cfc17e46b85b453dc107b";
+        url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz";
+        sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42";
       };
     };
     "signals-1.0.0" = {
@@ -17987,31 +17843,22 @@ let
         sha1 = "e0767014167825957de7e125c29b0fa89796ea03";
       };
     };
-    "socket.io-1.4.8" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "1.4.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.8.tgz";
-        sha1 = "e576f330cd0bed64e55b3fd26df991141884867b";
-      };
-    };
-    "winston-2.2.0" = {
+    "winston-2.3.0" = {
       name = "winston";
       packageName = "winston";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.2.0.tgz";
-        sha1 = "2c853dd87ab552a8e8485d72cbbf9a2286f029b7";
+        url = "https://registry.npmjs.org/winston/-/winston-2.3.0.tgz";
+        sha1 = "207faaab6fccf3fe493743dd2b03dbafc7ceb78c";
       };
     };
-    "yargs-4.7.1" = {
+    "yargs-6.6.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "4.7.1";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-4.7.1.tgz";
-        sha1 = "e60432658a3387ff269c028eacde4a512e438dff";
+        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
       };
     };
     "color-convert-1.8.2" = {
@@ -18023,13 +17870,13 @@ let
         sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339";
       };
     };
-    "color-string-0.3.0" = {
+    "color-string-1.4.0" = {
       name = "color-string";
       packageName = "color-string";
-      version = "0.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz";
-        sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991";
+        url = "https://registry.npmjs.org/color-string/-/color-string-1.4.0.tgz";
+        sha1 = "2b47f8565fb0eb52f9f77c801992b8ca55d6e898";
       };
     };
     "color-name-1.1.1" = {
@@ -18041,58 +17888,58 @@ let
         sha1 = "4b1415304cf50028ea81643643bd82ea05803689";
       };
     };
-    "diff-2.2.3" = {
+    "simple-swizzle-0.2.2" = {
+      name = "simple-swizzle";
+      packageName = "simple-swizzle";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz";
+        sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a";
+      };
+    };
+    "is-arrayish-0.3.1" = {
+      name = "is-arrayish";
+      packageName = "is-arrayish";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz";
+        sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd";
+      };
+    };
+    "diff-3.2.0" = {
       name = "diff";
       packageName = "diff";
-      version = "2.2.3";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
-        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
+        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
+        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
       };
     };
-    "cookie-0.1.5" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.1.5";
+    "hogan.js-3.0.2" = {
+      name = "hogan.js";
+      packageName = "hogan.js";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.5.tgz";
-        sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c";
+        url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz";
+        sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd";
       };
     };
-    "finalhandler-0.4.1" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.4.1";
+    "whatwg-fetch-1.1.1" = {
+      name = "whatwg-fetch";
+      packageName = "whatwg-fetch";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
-        sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
+        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz";
+        sha1 = "ac3c9d39f320c6dce5339969d054ef43dd333319";
       };
     };
-    "send-0.13.1" = {
-      name = "send";
-      packageName = "send";
-      version = "0.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.13.1.tgz";
-        sha1 = "a30d5f4c82c8a9bae9ad00a1d9b1bdbe6f199ed7";
-      };
-    };
-    "cookie-0.2.3" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.2.3.tgz";
-        sha1 = "1a59536af68537a21178a01346f87cb059d2ae5c";
-      };
-    };
-    "crc-3.4.0" = {
+    "crc-3.4.1" = {
       name = "crc";
       packageName = "crc";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz";
-        sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f";
+        url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz";
+        sha1 = "65d5830b1a2569557cfb324c0e679998521473ee";
       };
     };
     "broadway-0.2.10" = {
@@ -18221,103 +18068,13 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "lodash.clonedeep-4.3.2" = {
-      name = "lodash.clonedeep";
-      packageName = "lodash.clonedeep";
-      version = "4.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz";
-        sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de";
-      };
-    };
-    "lodash.union-4.4.0" = {
-      name = "lodash.union";
-      packageName = "lodash.union";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz";
-        sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38";
-      };
-    };
-    "lodash.uniq-4.3.0" = {
-      name = "lodash.uniq";
-      packageName = "lodash.uniq";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz";
-        sha1 = "dcad810876841447d8f3ec662323c86a6d938227";
-      };
-    };
-    "lodash.without-4.2.0" = {
-      name = "lodash.without";
-      packageName = "lodash.without";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz";
-        sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6";
-      };
-    };
-    "node-gyp-3.3.1" = {
+    "node-gyp-3.5.0" = {
       name = "node-gyp";
       packageName = "node-gyp";
-      version = "3.3.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz";
-        sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0";
-      };
-    };
-    "request-2.72.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.72.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz";
-        sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1";
-      };
-    };
-    "retry-0.9.0" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz";
-        sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d";
-      };
-    };
-    "lodash._baseclone-4.5.7" = {
-      name = "lodash._baseclone";
-      packageName = "lodash._baseclone";
-      version = "4.5.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz";
-        sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
-      };
-    };
-    "lodash._baseflatten-4.2.1" = {
-      name = "lodash._baseflatten";
-      packageName = "lodash._baseflatten";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz";
-        sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208";
-      };
-    };
-    "lodash._basedifference-4.5.0" = {
-      name = "lodash._basedifference";
-      packageName = "lodash._basedifference";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz";
-        sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938";
-      };
-    };
-    "qs-6.1.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz";
-        sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26";
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
+        sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
       };
     };
     "lsmod-1.0.0" = {
@@ -18329,13 +18086,13 @@ let
         sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b";
       };
     };
-    "stack-trace-0.0.7" = {
-      name = "stack-trace";
-      packageName = "stack-trace";
-      version = "0.0.7";
+    "uuid-3.0.0" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
-        sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
+        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
       };
     };
     "eve-0.4.2" = {
@@ -18347,67 +18104,13 @@ let
         sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
       };
     };
-    "engine.io-1.6.11" = {
-      name = "engine.io";
-      packageName = "engine.io";
-      version = "1.6.11";
+    "yargs-parser-4.2.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.11.tgz";
-        sha1 = "2533a97a65876c40ffcf95397b7ef9b495c423fe";
-      };
-    };
-    "socket.io-client-1.4.8" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.4.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.8.tgz";
-        sha1 = "481b241e73df140ea1a4fb03486a85ad097f5558";
-      };
-    };
-    "ws-1.1.0" = {
-      name = "ws";
-      packageName = "ws";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.1.0.tgz";
-        sha1 = "c1d6fd1515d3ceff1f0ae2759bf5fd77030aad1d";
-      };
-    };
-    "engine.io-client-1.6.11" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.6.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.11.tgz";
-        sha1 = "7d250d8fa1c218119ecde51390458a57d5171376";
-      };
-    };
-    "pkg-conf-1.1.3" = {
-      name = "pkg-conf";
-      packageName = "pkg-conf";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-1.1.3.tgz";
-        sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b";
-      };
-    };
-    "set-blocking-1.0.0" = {
-      name = "set-blocking";
-      packageName = "set-blocking";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-1.0.0.tgz";
-        sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5";
-      };
-    };
-    "symbol-0.2.3" = {
-      name = "symbol";
-      packageName = "symbol";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/symbol/-/symbol-0.2.3.tgz";
-        sha1 = "3b9873b8a901e47c6efe21526a3ac372ef28bbc7";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
       };
     };
     "kew-0.1.7" = {
@@ -18491,13 +18194,13 @@ let
         sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
       };
     };
-    "node-libs-browser-0.6.0" = {
+    "node-libs-browser-0.7.0" = {
       name = "node-libs-browser";
       packageName = "node-libs-browser";
-      version = "0.6.0";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.6.0.tgz";
-        sha1 = "244806d44d319e048bc8607b5cc4eaf9a29d2e3c";
+        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz";
+        sha1 = "3e272c0819e308935e26674408d7af0e1491b83b";
       };
     };
     "tapable-0.1.10" = {
@@ -18518,13 +18221,13 @@ let
         sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b";
       };
     };
-    "webpack-core-0.6.8" = {
+    "webpack-core-0.6.9" = {
       name = "webpack-core";
       packageName = "webpack-core";
-      version = "0.6.8";
+      version = "0.6.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz";
-        sha1 = "edf9135de00a6a3c26dd0f14b208af0aa4af8d0a";
+        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz";
+        sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2";
       };
     };
     "memory-fs-0.2.0" = {
@@ -18554,76 +18257,40 @@ let
         sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
-    "json5-0.5.0" = {
+    "json5-0.5.1" = {
       name = "json5";
       packageName = "json5";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz";
-        sha1 = "9b20715b026cbe3778fd769edccd822d8332a5b2";
+        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
+        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
       };
     };
-    "assert-1.4.1" = {
-      name = "assert";
-      packageName = "assert";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
-        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" = {
+    "crypto-browserify-3.3.0" = {
       name = "crypto-browserify";
       packageName = "crypto-browserify";
-      version = "3.2.8";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz";
-        sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189";
+        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz";
+        sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c";
       };
     };
-    "http-browserify-1.7.0" = {
-      name = "http-browserify";
-      packageName = "http-browserify";
-      version = "1.7.0";
+    "os-browserify-0.2.1" = {
+      name = "os-browserify";
+      packageName = "os-browserify";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
-        sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
+        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz";
+        sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f";
       };
     };
-    "https-browserify-0.0.0" = {
-      name = "https-browserify";
-      packageName = "https-browserify";
-      version = "0.0.0";
+    "timers-browserify-2.0.2" = {
+      name = "timers-browserify";
+      packageName = "timers-browserify";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
-        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";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz";
+        sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86";
       };
     };
     "pbkdf2-compat-2.0.1" = {
@@ -18653,166 +18320,31 @@ let
         sha1 = "17ddeddc5f722fb66501658895461977867315ba";
       };
     };
-    "Base64-0.2.1" = {
-      name = "Base64";
-      packageName = "Base64";
-      version = "0.2.1";
+    "browserify-aes-0.4.0" = {
+      name = "browserify-aes";
+      packageName = "browserify-aes";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
-        sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
+        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz";
+        sha1 = "067149b668df31c4b58533e02d01e806d8608e2c";
       };
     };
-    "source-list-map-0.1.6" = {
+    "setimmediate-1.0.5" = {
+      name = "setimmediate";
+      packageName = "setimmediate";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz";
+        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
+      };
+    };
+    "source-list-map-0.1.8" = {
       name = "source-list-map";
       packageName = "source-list-map";
-      version = "0.1.6";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.6.tgz";
-        sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f";
-      };
-    };
-    "babel-runtime-6.18.0" = {
-      name = "babel-runtime";
-      packageName = "babel-runtime";
-      version = "6.18.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz";
-        sha1 = "0f4177ffd98492ef13b9f823e9994a02584c9078";
-      };
-    };
-    "death-1.0.0" = {
-      name = "death";
-      packageName = "death";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/death/-/death-1.0.0.tgz";
-        sha1 = "4d46e15488d4b636b699f0671b04632d752fd2de";
-      };
-    };
-    "detect-indent-4.0.0" = {
-      name = "detect-indent";
-      packageName = "detect-indent";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz";
-        sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
-      };
-    };
-    "invariant-2.2.2" = {
-      name = "invariant";
-      packageName = "invariant";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz";
-        sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360";
-      };
-    };
-    "is-ci-1.0.10" = {
-      name = "is-ci";
-      packageName = "is-ci";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz";
-        sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
-      };
-    };
-    "leven-2.0.0" = {
-      name = "leven";
-      packageName = "leven";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/leven/-/leven-2.0.0.tgz";
-        sha1 = "74c45744439550da185801912829f61d22071bc1";
-      };
-    };
-    "node-emoji-1.4.1" = {
-      name = "node-emoji";
-      packageName = "node-emoji";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.4.1.tgz";
-        sha1 = "c9fa0cf91094335bcb967a6f42b2305c15af2ebc";
-      };
-    };
-    "object-path-0.11.3" = {
-      name = "object-path";
-      packageName = "object-path";
-      version = "0.11.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-path/-/object-path-0.11.3.tgz";
-        sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554";
-      };
-    };
-    "proper-lockfile-1.2.0" = {
-      name = "proper-lockfile";
-      packageName = "proper-lockfile";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz";
-        sha1 = "ceff5dd89d3e5f10fb75e1e8e76bc75801a59c34";
-      };
-    };
-    "request-capture-har-1.1.4" = {
-      name = "request-capture-har";
-      packageName = "request-capture-har";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.1.4.tgz";
-        sha1 = "e6ad76eb8e7a1714553fdbeef32cd4518e4e2013";
-      };
-    };
-    "roadrunner-1.1.0" = {
-      name = "roadrunner";
-      packageName = "roadrunner";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz";
-        sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
-      };
-    };
-    "regenerator-runtime-0.9.6" = {
-      name = "regenerator-runtime";
-      packageName = "regenerator-runtime";
-      version = "0.9.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz";
-        sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029";
-      };
-    };
-    "loose-envify-1.3.0" = {
-      name = "loose-envify";
-      packageName = "loose-envify";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz";
-        sha1 = "6b26248c42f6d4fa4b0d8542f78edfcde35642a8";
-      };
-    };
-    "ci-info-1.0.0" = {
-      name = "ci-info";
-      packageName = "ci-info";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz";
-        sha1 = "dc5285f2b4e251821683681c381c3388f46ec534";
-      };
-    };
-    "string.prototype.codepointat-0.2.0" = {
-      name = "string.prototype.codepointat";
-      packageName = "string.prototype.codepointat";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz";
-        sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78";
-      };
-    };
-    "err-code-1.1.1" = {
-      name = "err-code";
-      packageName = "err-code";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.1.tgz";
-        sha1 = "739d71b6851f24d050ea18c79a5b722420771d59";
+        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz";
+        sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106";
       };
     };
   };
@@ -18821,10 +18353,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.4";
+    version = "1.9.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.4.tgz";
-      sha1 = "8f85b28758ed0e7a251a635cd2e6a73ce92e9dde";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz";
+      sha1 = "78be031931f4b9012f6085e1544069c56dcba233";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -18839,7 +18371,7 @@ in
           sources."source-map-0.1.34"
         ];
       })
-      sources."resolve-1.1.7"
+      sources."resolve-1.2.0"
       sources."global-paths-0.1.2"
       sources."source-map-0.1.9"
       sources."xml2tss-0.0.5"
@@ -18864,16 +18396,15 @@ in
         ];
       })
       sources."is-windows-0.1.1"
-      (sources."global-prefix-0.1.4" // {
+      (sources."global-prefix-0.1.5" // {
         dependencies = [
           sources."is-windows-0.2.0"
         ];
       })
+      sources."homedir-polyfill-1.0.1"
       sources."ini-1.3.4"
-      sources."osenv-0.1.3"
       sources."which-1.2.12"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
+      sources."parse-passwd-1.0.0"
       sources."isexe-1.1.2"
       sources."xml2js-0.2.8"
       sources."sax-0.5.8"
@@ -18890,17 +18421,13 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.7";
+    version = "0.10.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.7.tgz";
-      sha1 = "48e59f6be202122c0d71153efab4f924065da586";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz";
+      sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc";
     };
     dependencies = [
-      (sources."adal-node-0.1.21" // {
-        dependencies = [
-          sources."node-uuid-1.4.7"
-        ];
-      })
+      sources."adal-node-0.1.21"
       sources."async-1.4.2"
       (sources."azure-common-0.9.18" // {
         dependencies = [
@@ -18909,9 +18436,11 @@ in
         ];
       })
       sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-cdn-0.2.1"
+      sources."azure-arm-cdn-1.0.0"
       sources."azure-arm-commerce-0.2.0"
-      sources."azure-arm-compute-0.19.0"
+      sources."azure-arm-compute-0.19.1"
+      sources."azure-arm-datalake-analytics-1.0.1-preview"
+      sources."azure-arm-datalake-store-1.0.1-preview"
       sources."azure-arm-hdinsight-0.2.2"
       sources."azure-arm-hdinsight-jobs-0.1.0"
       sources."azure-arm-insights-0.11.3"
@@ -18923,8 +18452,6 @@ in
       sources."azure-arm-dns-0.11.1"
       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"
@@ -18939,7 +18466,7 @@ in
         ];
       })
       sources."azure-asm-network-0.13.0"
-      sources."azure-arm-resource-1.4.5-preview"
+      sources."azure-arm-resource-1.6.1-preview"
       sources."azure-arm-storage-0.13.1-preview"
       sources."azure-asm-sb-0.10.1"
       sources."azure-asm-sql-0.10.1"
@@ -18952,7 +18479,6 @@ in
       })
       (sources."azure-storage-1.3.0" // {
         dependencies = [
-          sources."node-uuid-1.4.7"
           sources."readable-stream-2.0.6"
           sources."validator-3.22.2"
           sources."xml2js-0.2.7"
@@ -18961,7 +18487,7 @@ in
       sources."azure-arm-batch-0.3.0"
       sources."azure-batch-0.5.2"
       sources."azure-servicefabric-0.1.4"
-      sources."applicationinsights-0.15.12"
+      sources."applicationinsights-0.16.0"
       sources."caller-id-0.1.0"
       sources."colors-1.1.2"
       sources."commander-1.0.4"
@@ -18980,16 +18506,16 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.17.0"
+      sources."moment-2.17.1"
       sources."ms-rest-1.15.2"
       (sources."ms-rest-azure-1.15.2" // {
         dependencies = [
           sources."async-0.2.7"
+          sources."uuid-2.0.1"
           sources."azure-arm-resource-1.4.4-preview"
         ];
       })
       sources."node-forge-0.6.23"
-      sources."node-uuid-1.2.0"
       sources."omelette-0.1.0"
       sources."openssl-wrapper-0.2.1"
       sources."progress-1.1.8"
@@ -19012,7 +18538,6 @@ in
       (sources."request-2.74.0" // {
         dependencies = [
           sources."extend-3.0.0"
-          sources."node-uuid-1.4.7"
         ];
       })
       (sources."ssh-key-to-pem-0.11.0" // {
@@ -19027,6 +18552,7 @@ in
       sources."tunnel-0.0.2"
       sources."underscore-1.4.4"
       sources."user-home-2.0.0"
+      sources."uuid-3.0.1"
       sources."validator-5.2.0"
       (sources."winston-2.1.1" // {
         dependencies = [
@@ -19041,14 +18567,14 @@ in
       sources."read-1.0.7"
       sources."date-utils-1.2.21"
       sources."jws-3.1.4"
-      sources."xmldom-0.1.22"
+      sources."node-uuid-1.4.7"
+      sources."xmldom-0.1.27"
       sources."xpath.js-1.0.7"
       sources."base64url-2.0.0"
-      sources."jwa-1.1.4"
+      sources."jwa-1.1.5"
       sources."safe-buffer-5.0.1"
       sources."buffer-equal-constant-time-1.0.1"
-      sources."ecdsa-sig-formatter-1.0.7"
-      sources."base64-url-1.3.3"
+      sources."ecdsa-sig-formatter-1.0.9"
       sources."dateformat-1.0.2-1.2.3"
       sources."envconf-0.0.4"
       sources."duplexer-0.1.1"
@@ -19080,7 +18606,6 @@ in
       sources."has-color-0.1.7"
       sources."ansi-styles-1.0.0"
       sources."strip-ansi-0.1.1"
-      sources."uuid-2.0.1"
       sources."debug-0.7.4"
       sources."q-0.9.7"
       sources."pkginfo-0.4.0"
@@ -19135,24 +18660,24 @@ in
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.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"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -19162,7 +18687,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -19171,7 +18696,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -19182,30 +18707,31 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."ctype-0.5.2"
       sources."source-map-0.1.43"
       sources."fibers-1.0.15"
       sources."galaxy-0.1.12"
       sources."amdefine-1.0.1"
-      (sources."concat-stream-1.5.2" // {
+      (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.0.6"
+          sources."readable-stream-2.2.2"
         ];
       })
       sources."http-response-object-1.1.0"
       sources."then-request-2.2.0"
       sources."typedarray-0.0.6"
+      sources."buffer-shims-1.0.0"
       sources."http-basic-2.5.1"
       sources."promise-7.1.1"
       sources."asap-2.0.5"
       sources."os-homedir-1.0.2"
-      sources."mute-stream-0.0.6"
+      sources."mute-stream-0.0.7"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -19306,7 +18832,7 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -19368,7 +18894,7 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."q-1.4.1"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -19388,16 +18914,20 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "13.1.1";
+    version = "13.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-13.1.1.tgz";
-      sha1 = "72a2310e2f706ed87db929cf0ee73a5e195d9bb0";
+      url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
+      sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
     };
     dependencies = [
-      sources."JSONStream-1.2.1"
-      sources."assert-1.3.0"
+      sources."JSONStream-1.3.0"
+      sources."assert-1.4.1"
       sources."browser-pack-6.0.2"
-      sources."browser-resolve-1.11.2"
+      (sources."browser-resolve-1.11.2" // {
+        dependencies = [
+          sources."resolve-1.1.7"
+        ];
+      })
       sources."browserify-zlib-0.1.4"
       sources."buffer-4.9.1"
       sources."cached-path-relative-1.0.0"
@@ -19414,7 +18944,7 @@ in
       sources."domain-browser-1.1.7"
       sources."duplexer2-0.1.4"
       sources."events-1.1.1"
-      sources."glob-5.0.15"
+      sources."glob-7.1.1"
       sources."has-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-0.0.1"
@@ -19434,11 +18964,11 @@ in
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
       sources."readable-stream-2.2.2"
-      sources."resolve-1.1.7"
+      sources."resolve-1.2.0"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.5.0"
+      sources."stream-http-2.6.1"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       (sources."syntax-error-1.1.6" // {
@@ -19446,11 +18976,7 @@ in
           sources."acorn-2.7.0"
         ];
       })
-      (sources."through2-2.0.1" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
       sources."tty-browserify-0.0.0"
       (sources."url-0.11.0" // {
@@ -19504,10 +19030,11 @@ in
       sources."parse-asn1-5.0.0"
       sources."brorand-1.0.6"
       sources."hash.js-1.0.3"
-      sources."asn1.js-4.9.0"
+      sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
       sources."sha.js-2.4.8"
       sources."miller-rabin-4.0.0"
+      sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
@@ -19535,7 +19062,7 @@ in
       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."builtin-status-codes-3.0.0"
       sources."to-arraybuffer-1.0.1"
       sources."minimist-1.2.0"
       sources."querystring-0.2.0"
@@ -19559,11 +19086,11 @@ in
     };
     dependencies = [
       sources."array-loop-1.0.0"
-      sources."castv2-client-1.1.2"
+      sources."castv2-client-1.2.0"
       sources."chalk-1.0.0"
       sources."chromecast-player-0.2.3"
       sources."debounced-seeker-1.0.0"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       sources."fs-extended-0.2.1"
       sources."got-1.2.2"
       sources."internal-ip-1.2.0"
@@ -19602,7 +19129,7 @@ in
       (sources."xml2js-0.4.17" // {
         dependencies = [
           sources."xmlbuilder-4.2.1"
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
         ];
       })
       sources."xtend-4.0.1"
@@ -19648,7 +19175,7 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -19681,7 +19208,7 @@ in
       sources."clivas-0.1.4"
       sources."inquirer-0.8.5"
       sources."network-address-0.0.5"
-      sources."numeral-1.5.5"
+      sources."numeral-1.5.6"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
         dependencies = [
@@ -19715,7 +19242,7 @@ in
         ];
       })
       sources."windows-no-runnable-0.0.6"
-      (sources."mdns-js-0.5.1" // {
+      (sources."mdns-js-0.5.3" // {
         dependencies = [
           sources."semver-5.1.1"
         ];
@@ -19725,7 +19252,7 @@ in
       sources."qap-3.1.3"
       sources."base64-js-1.1.2"
       sources."xmlbuilder-8.2.2"
-      sources."xmldom-0.1.22"
+      sources."xmldom-0.1.27"
       sources."cli-width-1.1.1"
       (sources."figures-1.7.0" // {
         dependencies = [
@@ -19741,12 +19268,12 @@ in
       sources."blob-to-buffer-1.2.6"
       sources."magnet-uri-5.1.5"
       sources."parse-torrent-file-4.0.0"
-      sources."simple-get-2.3.0"
+      sources."simple-get-2.4.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."simple-sha1-2.1.0"
+      sources."rusha-0.8.5"
       sources."once-1.4.0"
       sources."simple-concat-1.0.0"
       sources."unzip-response-2.0.1"
@@ -19776,7 +19303,7 @@ in
       sources."rimraf-2.5.4"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.0"
-      (sources."random-access-file-1.3.1" // {
+      (sources."random-access-file-1.4.0" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.1"
@@ -19834,7 +19361,7 @@ in
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      (sources."simple-peer-6.0.7" // {
+      (sources."simple-peer-6.1.3" // {
         dependencies = [
           sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
@@ -19887,13 +19414,13 @@ in
       sources."codepage-1.4.0"
       sources."utfx-1.0.1"
       sources."voc-0.5.0"
-      (sources."concat-stream-1.5.2" // {
+      (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.0.6"
+          sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
-      sources."exit-on-epipe-0.1.0"
+      sources."exit-on-epipe-1.0.0"
       sources."commander-2.9.0"
       sources."typedarray-0.0.6"
       sources."graceful-readlink-1.0.1"
@@ -19910,10 +19437,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.11.1";
+    version = "1.12.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
-      sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
+      sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -19946,7 +19473,7 @@ in
           sources."unorm-1.3.3"
         ];
       })
-      (sources."insight-0.8.3" // {
+      (sources."insight-0.8.4" // {
         dependencies = [
           sources."async-1.5.2"
           sources."request-2.79.0"
@@ -19963,7 +19490,7 @@ in
       sources."elementtree-0.1.6"
       sources."glob-5.0.15"
       sources."minimatch-3.0.3"
-      sources."osenv-0.1.3"
+      sources."osenv-0.1.4"
       sources."plist-1.2.0"
       sources."semver-5.3.0"
       sources."shelljs-0.5.3"
@@ -19982,14 +19509,14 @@ in
       sources."os-tmpdir-1.0.2"
       sources."base64-js-0.0.8"
       sources."xmlbuilder-4.0.0"
-      sources."xmldom-0.1.22"
+      sources."xmldom-0.1.27"
       sources."util-deprecate-1.0.2"
       sources."lodash-3.10.1"
       sources."aliasify-1.9.0"
       (sources."cordova-fetch-1.0.1" // {
         dependencies = [
           sources."q-1.4.1"
-          sources."shelljs-0.7.5"
+          sources."shelljs-0.7.6"
           sources."glob-7.1.1"
         ];
       })
@@ -19999,7 +19526,7 @@ in
         ];
       })
       sources."cordova-js-4.2.0"
-      (sources."cordova-serve-1.0.0" // {
+      (sources."cordova-serve-1.0.1" // {
         dependencies = [
           sources."q-1.4.1"
         ];
@@ -20073,13 +19600,17 @@ in
       sources."interpret-1.0.1"
       sources."rechoir-0.6.2"
       sources."fs.realpath-1.0.0"
-      sources."resolve-1.1.7"
+      sources."resolve-1.2.0"
       sources."cordova-app-hello-world-3.11.0"
       sources."browserify-13.1.0"
-      sources."JSONStream-1.2.1"
+      sources."JSONStream-1.3.0"
       sources."assert-1.3.0"
       sources."browser-pack-6.0.2"
-      sources."browser-resolve-1.11.2"
+      (sources."browser-resolve-1.11.2" // {
+        dependencies = [
+          sources."resolve-1.1.7"
+        ];
+      })
       sources."browserify-zlib-0.1.4"
       (sources."buffer-4.9.1" // {
         dependencies = [
@@ -20122,7 +19653,7 @@ in
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.5.0"
+      sources."stream-http-2.6.1"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       (sources."syntax-error-1.1.6" // {
@@ -20130,12 +19661,7 @@ in
           sources."acorn-2.7.0"
         ];
       })
-      (sources."through2-2.0.1" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-          sources."isarray-1.0.0"
-        ];
-      })
+      sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
       sources."tty-browserify-0.0.0"
       (sources."url-0.11.0" // {
@@ -20185,7 +19711,7 @@ in
       sources."parse-asn1-5.0.0"
       sources."brorand-1.0.6"
       sources."hash.js-1.0.3"
-      sources."asn1.js-4.9.0"
+      sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
       sources."sha.js-2.4.8"
       sources."miller-rabin-4.0.0"
@@ -20208,7 +19734,7 @@ in
       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."builtin-status-codes-3.0.0"
       sources."to-arraybuffer-1.0.1"
       sources."minimist-1.2.0"
       sources."querystring-0.2.0"
@@ -20221,16 +19747,16 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."accepts-1.3.3"
       sources."bytes-2.3.0"
       sources."compressible-2.0.9"
       sources."debug-2.2.0"
       sources."on-headers-1.0.1"
       sources."vary-1.1.0"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."ms-0.7.1"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
@@ -20248,7 +19774,7 @@ in
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.2"
+      sources."proxy-addr-1.1.3"
       sources."qs-6.2.0"
       sources."range-parser-1.2.0"
       sources."send-0.14.1"
@@ -20259,7 +19785,7 @@ in
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.1.1"
+      sources."ipaddr.js-1.2.0"
       sources."destroy-1.0.4"
       sources."http-errors-1.5.1"
       sources."mime-1.3.4"
@@ -20276,7 +19802,7 @@ in
       sources."validate-npm-package-license-3.0.1"
       sources."validate-npm-package-name-2.2.2"
       sources."hosted-git-info-2.1.5"
-      sources."mute-stream-0.0.6"
+      sources."mute-stream-0.0.7"
       sources."json-parse-helpfulerror-1.0.3"
       sources."normalize-package-data-2.3.5"
       sources."graceful-fs-4.1.11"
@@ -20308,8 +19834,8 @@ in
       sources."github-url-from-git-1.4.0"
       sources."github-url-from-username-repo-1.0.2"
       sources."ini-1.3.4"
-      sources."lockfile-1.0.2"
-      sources."lru-cache-4.0.1"
+      sources."lockfile-1.0.3"
+      sources."lru-cache-4.0.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -20335,7 +19861,7 @@ in
       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."retry-0.10.1"
       (sources."rimraf-2.5.4" // {
         dependencies = [
           sources."glob-7.1.1"
@@ -20382,7 +19908,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."commander-2.9.0"
@@ -20391,7 +19917,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -20400,7 +19926,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20409,7 +19935,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20420,7 +19946,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -20443,7 +19969,7 @@ in
       sources."node-uuid-1.4.7"
       (sources."async-2.1.4" // {
         dependencies = [
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
         ];
       })
       sources."isexe-1.1.2"
@@ -20528,14 +20054,14 @@ in
   csslint = nodeEnv.buildNodePackage {
     name = "csslint";
     packageName = "csslint";
-    version = "1.0.4";
+    version = "1.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.4.tgz";
-      sha1 = "0d3907933cc3f04b56960496d573387fbe9bb1e7";
+      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz";
+      sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9";
     };
     dependencies = [
-      sources."clone-1.0.2"
-      sources."parserlib-1.0.0"
+      sources."clone-2.1.0"
+      sources."parserlib-1.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -20624,9 +20150,9 @@ in
       sources."cookie-0.1.2"
       sources."merge-descriptors-0.0.2"
       sources."utils-merge-1.0.0"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."ms-0.7.0"
       sources."crc-3.2.1"
       sources."ee-first-1.1.0"
@@ -20635,7 +20161,7 @@ in
       sources."destroy-1.0.3"
       sources."mime-1.2.11"
       sources."bindings-1.2.1"
-      sources."nan-2.4.0"
+      sources."nan-2.5.0"
       sources."jsonparse-0.0.6"
       sources."es5class-2.3.1"
       sources."faye-websocket-0.11.0"
@@ -20733,12 +20259,16 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."ndjson-1.4.3" // {
+      (sources."ndjson-1.5.0" // {
         dependencies = [
           sources."minimist-1.2.0"
+          sources."split2-2.1.1"
+          sources."through2-2.0.3"
+          sources."readable-stream-2.2.2"
+          sources."isarray-1.0.0"
         ];
       })
-      sources."pump-1.0.1"
+      sources."pump-1.0.2"
       sources."pumpify-1.3.5"
       sources."relative-date-1.1.3"
       sources."root-2.0.0"
@@ -20747,11 +20277,7 @@ in
       sources."stream-collector-1.0.1"
       (sources."tar-stream-1.5.2" // {
         dependencies = [
-          (sources."bl-1.1.2" // {
-            dependencies = [
-              sources."readable-stream-2.0.6"
-            ];
-          })
+          sources."bl-1.2.0"
           sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
@@ -20821,6 +20347,7 @@ in
       sources."looper-2.0.0"
       sources."bindings-1.2.1"
       sources."nan-2.1.0"
+      sources."json-stringify-safe-5.0.1"
       sources."murl-0.4.1"
       sources."protein-0.5.0"
       sources."network-address-0.0.5"
@@ -20836,20 +20363,21 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "2.4.2";
+    version = "3.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-2.4.2.tgz";
-      sha1 = "757c98aea05ee8714f0de2a33224c4136414633e";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.0.2.tgz";
+      sha1 = "0f010dbd6e26db0270abd88e3e5403062eb4f7a4";
     };
     dependencies = [
-      sources."JSONStream-1.1.4"
-      sources."async-2.0.1"
+      sources."JSONStream-1.3.0"
+      sources."async-2.1.4"
       sources."aws4-1.5.0"
+      sources."awscred-1.2.0"
       sources."optimist-0.6.1"
       sources."request-2.79.0"
       sources."jsonparse-1.2.0"
       sources."through-2.3.8"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
       sources."aws-sign2-0.6.0"
@@ -20864,13 +20392,13 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -20882,11 +20410,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -20896,7 +20424,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20905,7 +20433,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20916,11 +20444,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
     ];
     buildInputs = globalBuildInputs;
@@ -20934,45 +20462,63 @@ in
   emoj = nodeEnv.buildNodePackage {
     name = "emoj";
     packageName = "emoj";
-    version = "0.3.0";
+    version = "1.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz";
-      sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c";
+      url = "https://registry.npmjs.org/emoj/-/emoj-1.0.0.tgz";
+      sha1 = "3cccbeec420e2b45f73b923e880c220392c055bd";
     };
     dependencies = [
       sources."chalk-1.1.3"
-      sources."got-6.6.3"
+      sources."clipboardy-0.1.2"
+      (sources."got-6.7.1" // {
+        dependencies = [
+          sources."get-stream-3.0.0"
+        ];
+      })
       sources."has-ansi-2.0.0"
       sources."lodash.debounce-4.0.8"
       sources."log-update-1.0.2"
-      sources."mem-0.1.1"
+      sources."mem-1.1.0"
       sources."meow-3.7.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
-      sources."create-error-class-3.0.2"
-      sources."duplexer3-0.1.4"
+      sources."ansi-regex-2.1.1"
+      sources."execa-0.5.1"
+      sources."cross-spawn-4.0.2"
       sources."get-stream-2.3.1"
-      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."node-status-codes-2.0.1"
-      sources."timed-out-3.0.0"
-      sources."unzip-response-2.0.1"
-      sources."url-parse-lax-1.0.0"
-      sources."capture-stack-trace-1.0.0"
+      sources."npm-run-path-2.0.2"
+      sources."p-finally-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."strip-eof-1.0.0"
+      sources."lru-cache-4.0.2"
+      sources."which-1.2.12"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.0.0"
+      sources."isexe-1.1.2"
       sources."object-assign-4.1.0"
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
+      sources."path-key-2.0.1"
+      sources."create-error-class-3.0.2"
+      sources."duplexer3-0.1.4"
+      sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
+      sources."lowercase-keys-1.0.0"
+      sources."safe-buffer-5.0.1"
+      sources."timed-out-4.0.0"
+      sources."unzip-response-2.0.1"
+      sources."url-parse-lax-1.0.0"
+      sources."capture-stack-trace-1.0.0"
       sources."prepend-http-1.0.4"
       sources."ansi-escapes-1.4.0"
       sources."cli-cursor-1.0.2"
       sources."restore-cursor-1.0.1"
       sources."exit-hook-1.1.1"
       sources."onetime-1.1.0"
+      sources."mimic-fn-1.1.0"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
@@ -20984,7 +20530,6 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -21024,16 +20569,16 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.10.2";
+    version = "3.13.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz";
-      sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz";
+      sha1 = "564d2646b5efded85df96985332edd91a23bff25";
     };
     dependencies = [
-      sources."babel-code-frame-6.16.0"
+      sources."babel-code-frame-6.20.0"
       sources."chalk-1.1.3"
-      sources."concat-stream-1.5.2"
-      sources."debug-2.3.3"
+      sources."concat-stream-1.6.0"
+      sources."debug-2.6.0"
       sources."doctrine-1.5.0"
       sources."escope-3.6.0"
       sources."espree-3.3.2"
@@ -21050,7 +20595,7 @@ in
       sources."js-yaml-3.7.0"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       sources."mkdirp-0.5.1"
       sources."natural-compare-1.4.0"
       sources."optionator-0.8.2"
@@ -21058,9 +20603,9 @@ in
       sources."pluralize-1.2.1"
       sources."progress-1.1.8"
       sources."require-uncached-1.0.3"
-      sources."shelljs-0.7.5"
+      sources."shelljs-0.7.6"
       sources."strip-bom-3.0.0"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       (sources."table-3.8.3" // {
         dependencies = [
           sources."string-width-2.0.0"
@@ -21075,10 +20620,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.0.6"
+      sources."readable-stream-2.2.2"
+      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"
@@ -21099,13 +20645,13 @@ in
       sources."es6-symbol-3.1.0"
       sources."event-emitter-0.3.4"
       sources."object-assign-4.1.0"
-      sources."acorn-4.0.3"
+      sources."acorn-4.0.4"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
           sources."acorn-3.3.0"
         ];
       })
-      sources."flat-cache-1.2.1"
+      sources."flat-cache-1.2.2"
       sources."circular-json-0.3.1"
       sources."del-2.2.2"
       sources."graceful-fs-4.1.11"
@@ -21148,7 +20694,7 @@ in
       sources."number-is-nan-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."tryit-1.0.3"
@@ -21161,15 +20707,15 @@ in
       sources."minimist-0.0.8"
       sources."deep-is-0.1.3"
       sources."wordwrap-1.0.0"
-      sources."fast-levenshtein-2.0.5"
+      sources."fast-levenshtein-2.0.6"
       sources."caller-path-0.1.0"
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
       sources."interpret-1.0.1"
       sources."rechoir-0.6.2"
-      sources."resolve-1.1.7"
-      sources."ajv-4.9.0"
-      sources."ajv-keywords-1.1.1"
+      sources."resolve-1.2.0"
+      sources."ajv-4.10.4"
+      sources."ajv-keywords-1.5.0"
       sources."slice-ansi-0.0.4"
       sources."co-4.6.0"
       sources."os-homedir-1.0.2"
@@ -21185,10 +20731,10 @@ in
   emojione = nodeEnv.buildNodePackage {
     name = "emojione";
     packageName = "emojione";
-    version = "2.2.6";
+    version = "2.2.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-2.2.6.tgz";
-      sha1 = "67dec452937d5b14ee669207ea41cdb1f69fb8f6";
+      url = "https://registry.npmjs.org/emojione/-/emojione-2.2.7.tgz";
+      sha1 = "46457cf6b9b2f8da13ae8a2e4e547de06ee15e96";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -21254,7 +20800,7 @@ in
       sources."object-assign-3.0.0"
       sources."optimist-0.6.1"
       sources."path-is-absolute-1.0.1"
-      (sources."prettyjson-1.2.0" // {
+      (sources."prettyjson-1.2.1" // {
         dependencies = [
           sources."colors-1.1.2"
           sources."minimist-1.2.0"
@@ -21286,7 +20832,7 @@ in
       sources."minimist-0.0.10"
       sources."read-1.0.7"
       sources."revalidator-0.1.8"
-      sources."mute-stream-0.0.6"
+      sources."mute-stream-0.0.7"
       sources."chokidar-1.6.1"
       sources."minimatch-3.0.3"
       sources."ps-tree-0.0.3"
@@ -21297,7 +20843,7 @@ in
       sources."is-binary-path-1.0.1"
       sources."is-glob-2.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.15"
+      sources."fsevents-1.0.17"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -21307,7 +20853,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."normalize-path-2.0.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
@@ -21319,7 +20865,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
@@ -21331,7 +20877,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.7.0"
+      sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
       sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
@@ -21340,15 +20886,15 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.4.0"
-      sources."node-pre-gyp-0.6.31"
+      sources."nan-2.5.0"
+      sources."node-pre-gyp-0.6.32"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -21367,7 +20913,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.1" // {
+      (sources."gauge-2.7.2" // {
         dependencies = [
           sources."object-assign-4.1.0"
         ];
@@ -21375,16 +20921,16 @@ in
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
+      sources."supports-color-0.2.0"
       sources."has-unicode-2.0.1"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -21401,27 +20947,30 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -21431,7 +20980,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -21440,7 +20989,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -21451,11 +21000,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -21498,10 +21047,10 @@ in
   git-run = nodeEnv.buildNodePackage {
     name = "git-run";
     packageName = "git-run";
-    version = "0.5.2";
+    version = "0.5.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.2.tgz";
-      sha1 = "1edbc7163389067dd9f2c46ab3acff07889f8333";
+      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.3.tgz";
+      sha1 = "92005049d5514753d53c4f90fd6f2b2b29a8e08c";
     };
     dependencies = [
       sources."minilog-2.0.8"
@@ -21559,7 +21108,7 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.11.1"
+      sources."coffee-script-1.12.2"
       sources."jade-1.11.0"
       (sources."q-2.0.3" // {
         dependencies = [
@@ -21569,7 +21118,7 @@ in
       sources."xml2js-0.4.17"
       sources."msgpack-1.0.2"
       sources."character-parser-1.2.1"
-      (sources."clean-css-3.4.21" // {
+      (sources."clean-css-3.4.23" // {
         dependencies = [
           sources."commander-2.8.1"
         ];
@@ -21586,7 +21135,7 @@ in
           sources."source-map-0.1.43"
         ];
       })
-      (sources."uglify-js-2.7.4" // {
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
@@ -21625,7 +21174,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -21634,8 +21183,8 @@ in
       sources."weak-map-1.0.5"
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
-      sources."lodash-4.17.2"
-      sources."nan-2.4.0"
+      sources."lodash-4.17.4"
+      sources."nan-2.5.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -21656,7 +21205,7 @@ in
       sources."archy-1.0.0"
       sources."chalk-1.1.3"
       sources."deprecated-0.0.1"
-      sources."gulp-util-3.0.7"
+      sources."gulp-util-3.0.8"
       sources."interpret-1.0.1"
       sources."liftoff-2.3.0"
       sources."minimist-1.2.0"
@@ -21667,8 +21216,6 @@ in
       sources."v8flags-2.0.11"
       (sources."vinyl-fs-0.3.14" // {
         dependencies = [
-          sources."graceful-fs-3.0.11"
-          sources."strip-bom-1.0.0"
           sources."through2-0.6.5"
           sources."vinyl-0.4.6"
           sources."readable-stream-1.0.34"
@@ -21680,12 +21227,12 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."array-differ-1.0.0"
       sources."array-uniq-1.0.3"
       sources."beeper-1.1.1"
-      sources."dateformat-1.0.12"
-      sources."fancy-log-1.2.0"
+      sources."dateformat-2.0.0"
+      sources."fancy-log-1.3.0"
       sources."gulplog-1.0.0"
       sources."has-gulplog-0.1.0"
       sources."lodash._reescape-3.0.0"
@@ -21695,57 +21242,13 @@ in
       sources."multipipe-0.1.2"
       sources."object-assign-3.0.0"
       sources."replace-ext-0.0.1"
-      (sources."through2-2.0.1" // {
+      (sources."through2-2.0.3" // {
         dependencies = [
-          sources."readable-stream-2.0.6"
+          sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
       sources."vinyl-0.5.3"
-      sources."get-stdin-4.0.1"
-      (sources."meow-3.7.0" // {
-        dependencies = [
-          sources."object-assign-4.1.0"
-        ];
-      })
-      sources."camelcase-keys-2.1.0"
-      sources."decamelize-1.2.0"
-      sources."loud-rejection-1.6.0"
-      sources."map-obj-1.0.1"
-      sources."normalize-package-data-2.3.5"
-      sources."read-pkg-up-1.0.1"
-      sources."redent-1.0.0"
-      sources."trim-newlines-1.0.0"
-      sources."camelcase-2.1.1"
-      sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
-      sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.1.5"
-      sources."is-builtin-module-1.0.0"
-      sources."validate-npm-package-license-3.0.1"
-      sources."builtin-modules-1.1.1"
-      sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.4"
-      sources."spdx-license-ids-1.2.2"
-      sources."find-up-1.1.2"
-      sources."read-pkg-1.1.0"
-      sources."path-exists-2.1.0"
-      sources."pinkie-promise-2.0.1"
-      sources."pinkie-2.0.4"
-      sources."load-json-file-1.1.0"
-      sources."path-type-1.1.0"
-      sources."graceful-fs-4.1.11"
-      sources."parse-json-2.2.0"
-      sources."pify-2.3.0"
-      sources."strip-bom-2.0.0"
-      sources."error-ex-1.3.0"
-      sources."is-arrayish-0.2.1"
-      sources."is-utf8-0.2.1"
-      sources."indent-string-2.1.0"
-      sources."strip-indent-1.0.1"
-      sources."repeating-2.0.1"
-      sources."is-finite-1.0.2"
-      sources."number-is-nan-1.0.1"
       sources."time-stamp-1.0.1"
       sources."glogg-1.0.0"
       sources."sparkles-1.0.0"
@@ -21768,6 +21271,7 @@ in
       sources."string_decoder-0.10.31"
       sources."inherits-2.0.3"
       sources."xtend-4.0.1"
+      sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
       sources."clone-1.0.2"
@@ -21780,7 +21284,7 @@ in
       sources."lodash.isstring-4.0.1"
       sources."lodash.mapvalues-4.6.0"
       sources."rechoir-0.6.2"
-      sources."resolve-1.1.7"
+      sources."resolve-1.2.0"
       sources."detect-file-0.1.0"
       sources."is-glob-2.0.1"
       sources."micromatch-2.3.11"
@@ -21793,7 +21297,7 @@ in
       sources."expand-brackets-0.1.5"
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."normalize-path-2.0.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
@@ -21809,7 +21313,7 @@ in
           sources."isarray-1.0.0"
         ];
       })
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
@@ -21824,12 +21328,12 @@ in
       sources."expand-tilde-1.2.2"
       sources."global-modules-0.2.3"
       sources."os-homedir-1.0.2"
-      sources."global-prefix-0.1.4"
+      sources."global-prefix-0.1.5"
       sources."is-windows-0.2.0"
+      sources."homedir-polyfill-1.0.1"
       sources."ini-1.3.4"
-      sources."osenv-0.1.3"
       sources."which-1.2.12"
-      sources."os-tmpdir-1.0.2"
+      sources."parse-passwd-1.0.0"
       sources."isexe-1.1.2"
       sources."lodash.assignwith-4.2.0"
       sources."lodash.isempty-4.4.0"
@@ -21839,7 +21343,7 @@ in
       sources."map-cache-0.2.2"
       sources."path-root-0.1.1"
       sources."is-relative-0.2.1"
-      sources."is-unc-path-0.1.1"
+      sources."is-unc-path-0.1.2"
       sources."unc-path-regex-0.1.2"
       sources."path-root-regex-0.1.2"
       sources."end-of-stream-0.1.5"
@@ -21856,11 +21360,13 @@ in
         ];
       })
       sources."glob-watcher-0.0.6"
+      sources."graceful-fs-3.0.11"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
+      sources."strip-bom-1.0.0"
       sources."glob-4.5.3"
       sources."minimatch-2.0.10"
       sources."ordered-read-streams-0.1.0"
@@ -21885,6 +21391,7 @@ in
       sources."sigmund-1.0.1"
       sources."natives-1.1.0"
       sources."first-chunk-stream-1.0.0"
+      sources."is-utf8-0.2.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22030,7 +21537,7 @@ in
       sources."deep-is-0.1.3"
       sources."type-check-0.3.2"
       sources."levn-0.3.0"
-      sources."fast-levenshtein-2.0.5"
+      sources."fast-levenshtein-2.0.6"
       sources."amdefine-1.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -22045,7 +21552,7 @@ in
           sources."wordwrap-0.0.3"
         ];
       })
-      (sources."uglify-js-2.7.4" // {
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -22066,7 +21573,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -22207,19 +21714,19 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.3.0";
+    version = "1.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz";
-      sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f";
+      url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz";
+      sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b";
     };
     dependencies = [
-      sources."bluebird-3.4.6"
+      sources."bluebird-3.4.7"
       sources."body-parser-1.15.2"
       sources."chokidar-1.6.1"
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
         dependencies = [
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
         ];
       })
       sources."connect-3.5.0"
@@ -22236,8 +21743,8 @@ in
       })
       sources."glob-7.1.1"
       sources."graceful-fs-4.1.11"
-      sources."http-proxy-1.15.2"
-      sources."isbinaryfile-3.0.1"
+      sources."http-proxy-1.16.2"
+      sources."isbinaryfile-3.0.2"
       sources."lodash-3.10.1"
       (sources."log4js-0.6.38" // {
         dependencies = [
@@ -22252,10 +21759,16 @@ in
       sources."qjobs-1.1.5"
       sources."range-parser-1.2.0"
       sources."rimraf-2.5.4"
-      sources."socket.io-1.4.7"
+      sources."safe-buffer-5.0.1"
+      (sources."socket.io-1.7.2" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
       sources."source-map-0.5.6"
       sources."tmp-0.0.28"
-      sources."useragent-2.1.9"
+      sources."useragent-2.1.10"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.2.0"
@@ -22273,8 +21786,8 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.13"
-      sources."mime-db-1.25.0"
+      sources."mime-types-2.1.14"
+      sources."mime-db-1.26.0"
       sources."anymatch-1.3.0"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
@@ -22282,7 +21795,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.15"
+      sources."fsevents-1.0.17"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -22292,7 +21805,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."normalize-path-2.0.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
@@ -22304,7 +21817,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
@@ -22316,7 +21829,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.7.0"
+      sources."binary-extensions-1.8.0"
       sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
@@ -22324,11 +21837,11 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.4.0"
-      sources."node-pre-gyp-0.6.31"
+      sources."nan-2.5.0"
+      sources."node-pre-gyp-0.6.32"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -22350,21 +21863,21 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      sources."gauge-2.7.2"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
+      sources."supports-color-0.2.0"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -22385,21 +21898,24 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -22409,7 +21925,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22418,7 +21934,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22429,7 +21945,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -22456,26 +21972,10 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."wordwrap-0.0.3"
-      sources."engine.io-1.6.10"
-      (sources."socket.io-parser-2.2.6" // {
+      (sources."engine.io-1.8.2" // {
         dependencies = [
-          sources."isarray-0.0.1"
-        ];
-      })
-      (sources."socket.io-client-1.4.6" // {
-        dependencies = [
-          sources."component-emitter-1.2.0"
-        ];
-      })
-      (sources."socket.io-adapter-0.4.0" // {
-        dependencies = [
-          (sources."socket.io-parser-2.2.2" // {
-            dependencies = [
-              sources."debug-0.7.4"
-            ];
-          })
-          sources."json3-3.2.6"
-          sources."isarray-0.0.1"
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
       (sources."has-binary-0.1.7" // {
@@ -22483,46 +21983,59 @@ in
           sources."isarray-0.0.1"
         ];
       })
-      sources."base64id-0.1.0"
-      sources."ws-1.0.1"
-      (sources."engine.io-parser-1.2.4" // {
+      (sources."socket.io-adapter-0.5.0" // {
         dependencies = [
-          sources."has-binary-0.1.6"
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
+      (sources."socket.io-client-1.7.2" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
+      (sources."socket.io-parser-2.3.1" // {
+        dependencies = [
+          sources."component-emitter-1.1.2"
           sources."isarray-0.0.1"
         ];
       })
-      (sources."accepts-1.1.4" // {
-        dependencies = [
-          sources."mime-types-2.0.14"
-          sources."mime-db-1.12.0"
-        ];
-      })
+      sources."accepts-1.3.3"
+      sources."base64id-1.0.0"
+      sources."engine.io-parser-1.3.2"
+      sources."ws-1.1.1"
+      sources."cookie-0.3.1"
+      sources."negotiator-0.6.1"
+      sources."after-0.8.2"
+      sources."arraybuffer.slice-0.0.6"
+      sources."base64-arraybuffer-0.1.5"
+      sources."blob-0.0.4"
+      sources."wtf-8-1.0.0"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
-      sources."after-0.8.1"
-      sources."arraybuffer.slice-0.0.6"
-      sources."base64-arraybuffer-0.1.2"
-      sources."blob-0.0.4"
-      sources."utf8-2.1.0"
-      sources."negotiator-0.4.9"
-      sources."json3-3.3.2"
-      sources."component-emitter-1.1.2"
-      sources."benchmark-1.0.0"
-      sources."engine.io-client-1.6.9"
-      sources."component-bind-1.0.0"
-      sources."object-component-0.0.3"
-      sources."indexof-0.0.1"
-      sources."parseuri-0.0.4"
-      sources."to-array-0.1.4"
       sources."backo2-1.0.2"
-      sources."has-cors-1.1.0"
-      sources."xmlhttprequest-ssl-1.5.1"
-      sources."parsejson-0.0.1"
-      sources."parseqs-0.0.2"
+      sources."component-bind-1.0.0"
+      sources."component-emitter-1.2.1"
+      (sources."engine.io-client-1.8.2" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
+      sources."indexof-0.0.1"
+      sources."object-component-0.0.3"
+      sources."parseuri-0.0.5"
+      sources."to-array-0.1.4"
       sources."component-inherit-0.0.3"
+      sources."has-cors-1.1.0"
+      sources."parsejson-0.0.3"
+      sources."parseqs-0.0.5"
+      sources."xmlhttprequest-ssl-1.5.3"
       sources."yeast-0.1.2"
       sources."better-assert-1.0.2"
       sources."callsite-1.0.0"
+      sources."json3-3.3.2"
       sources."os-tmpdir-1.0.2"
       sources."lru-cache-2.2.4"
     ];
@@ -22650,9 +22163,9 @@ in
       sources."unpipe-1.0.0"
       sources."accepts-1.2.13"
       sources."compressible-2.0.9"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."ms-0.7.1"
       sources."csrf-3.0.4"
       sources."base64-url-1.3.3"
@@ -22679,12 +22192,12 @@ in
       sources."passport-google-oauth1-1.0.0"
       sources."passport-google-oauth20-1.0.0"
       sources."passport-oauth1-1.1.0"
-      sources."oauth-0.9.14"
-      sources."passport-oauth2-1.3.0"
+      sources."oauth-0.9.15"
+      sources."passport-oauth2-1.4.0"
       sources."uid2-0.0.3"
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22702,14 +22215,15 @@ in
       sha1 = "5de1e6426f885929b77357f014de5fee1dad0553";
     };
     dependencies = [
-      sources."through2-2.0.1"
+      sources."through2-2.0.3"
       sources."vinyl-1.2.0"
       sources."vinyl-fs-2.4.4"
-      sources."readable-stream-2.0.6"
+      sources."readable-stream-2.2.2"
       sources."xtend-4.0.1"
+      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
-      sources."inherits-2.0.3"
       sources."isarray-1.0.0"
+      sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
@@ -22728,8 +22242,8 @@ in
       sources."gulp-sourcemaps-1.6.0"
       sources."is-valid-glob-0.3.0"
       sources."lazystream-1.0.0"
-      sources."lodash.isequal-4.4.0"
-      sources."merge-stream-1.0.0"
+      sources."lodash.isequal-4.5.0"
+      sources."merge-stream-1.0.1"
       sources."mkdirp-0.5.1"
       sources."object-assign-4.1.0"
       sources."strip-bom-2.0.0"
@@ -22742,7 +22256,7 @@ in
       sources."wrappy-1.0.2"
       sources."extend-3.0.0"
       sources."glob-5.0.15"
-      sources."glob-parent-3.0.1"
+      sources."glob-parent-3.1.0"
       (sources."micromatch-2.3.11" // {
         dependencies = [
           sources."is-extglob-1.0.0"
@@ -22760,7 +22274,7 @@ in
       sources."concat-map-0.0.1"
       sources."is-glob-3.1.0"
       sources."path-dirname-1.0.2"
-      sources."is-extglob-2.1.0"
+      sources."is-extglob-2.1.1"
       sources."arr-diff-2.0.0"
       sources."array-unique-0.2.1"
       sources."braces-1.8.5"
@@ -22771,7 +22285,7 @@ in
         ];
       })
       sources."filename-regex-2.0.0"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."normalize-path-2.0.1"
       sources."object.omit-2.0.1"
       (sources."parse-glob-3.0.4" // {
@@ -22788,7 +22302,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
@@ -22910,7 +22424,7 @@ in
       sources."slasp-0.0.4"
       sources."nijs-0.0.23"
       sources."chownr-1.0.1"
-      sources."concat-stream-1.5.2"
+      sources."concat-stream-1.6.0"
       sources."graceful-fs-4.1.11"
       sources."mkdirp-0.5.1"
       sources."normalize-package-data-2.3.5"
@@ -22927,7 +22441,8 @@ in
       sources."npmlog-3.1.2"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.0.6"
+      sources."readable-stream-2.2.2"
+      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"
@@ -22955,13 +22470,13 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -22973,11 +22488,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -22987,7 +22502,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22996,7 +22511,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23007,11 +22522,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -23030,7 +22545,7 @@ in
       sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
@@ -23039,7 +22554,7 @@ in
       sources."config-chain-1.1.11"
       sources."ini-1.3.4"
       sources."nopt-3.0.6"
-      sources."osenv-0.1.3"
+      sources."osenv-0.1.4"
       sources."uid-number-0.0.5"
       sources."proto-list-1.2.4"
       sources."abbrev-1.0.9"
@@ -23069,10 +22584,10 @@ in
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
     packageName = "node-gyp";
-    version = "3.4.0";
+    version = "3.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz";
-      sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
+      sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
     };
     dependencies = [
       sources."fstream-1.0.10"
@@ -23081,9 +22596,8 @@ in
       sources."minimatch-3.0.3"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-3.1.2"
-      sources."osenv-0.1.3"
-      sources."path-array-1.0.1"
+      sources."npmlog-4.0.2"
+      sources."osenv-0.1.4"
       sources."request-2.79.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
@@ -23102,7 +22616,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
+      sources."gauge-2.7.2"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -23113,26 +22627,19 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
+      sources."supports-color-0.2.0"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."array-index-1.0.0"
-      sources."debug-2.3.3"
-      sources."es6-symbol-3.1.0"
-      sources."ms-0.7.2"
-      sources."d-0.1.1"
-      sources."es5-ext-0.10.12"
-      sources."es6-iterator-2.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       sources."caseless-0.11.0"
@@ -23146,27 +22653,30 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -23176,7 +22686,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23185,7 +22695,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23196,11 +22706,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."isexe-1.1.2"
@@ -23224,7 +22734,7 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."biased-opener-0.2.8"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       (sources."express-4.14.0" // {
         dependencies = [
           sources."debug-2.2.0"
@@ -23252,7 +22762,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."osenv-0.1.3"
+      sources."osenv-0.1.4"
       sources."plist-1.2.0"
       (sources."win-detect-browsers-1.0.2" // {
         dependencies = [
@@ -23269,7 +22779,7 @@ in
           sources."lodash-3.10.1"
         ];
       })
-      sources."xmldom-0.1.22"
+      sources."xmldom-0.1.27"
       sources."util-deprecate-1.0.2"
       sources."after-0.8.2"
       sources."xtend-4.0.1"
@@ -23289,7 +22799,7 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -23341,7 +22851,7 @@ in
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.2"
+      sources."proxy-addr-1.1.3"
       sources."qs-6.2.0"
       sources."range-parser-1.2.0"
       (sources."send-0.14.1" // {
@@ -23354,14 +22864,14 @@ in
       sources."type-is-1.6.14"
       sources."utils-merge-1.0.0"
       sources."vary-1.1.0"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."statuses-1.3.1"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.1.1"
+      sources."ipaddr.js-1.2.0"
       sources."destroy-1.0.4"
       sources."http-errors-1.5.1"
       sources."mime-1.3.4"
@@ -23379,8 +22889,8 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."truncate-1.0.5"
-      sources."nan-2.4.0"
-      (sources."node-pre-gyp-0.6.31" // {
+      sources."nan-2.5.0"
+      (sources."node-pre-gyp-0.6.32" // {
         dependencies = [
           sources."rimraf-2.5.4"
           sources."semver-5.3.0"
@@ -23388,7 +22898,7 @@ in
         ];
       })
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       (sources."request-2.79.0" // {
         dependencies = [
           sources."qs-6.3.0"
@@ -23408,7 +22918,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      sources."gauge-2.7.2"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -23418,14 +22928,14 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
+      sources."supports-color-0.2.0"
       sources."has-unicode-2.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       sources."caseless-0.11.0"
@@ -23443,20 +22953,23 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.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"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
@@ -23464,7 +22977,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23473,7 +22986,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23484,7 +22997,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -23501,7 +23014,7 @@ in
       sources."os-locale-1.4.0"
       sources."window-size-0.1.4"
       sources."y18n-3.2.1"
-      sources."wrap-ansi-2.0.0"
+      sources."wrap-ansi-2.1.0"
       sources."lcid-1.0.0"
       sources."invert-kv-1.0.0"
     ];
@@ -23515,15 +23028,15 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.31";
+    version = "0.6.32";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
-      sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
+      sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
     };
     dependencies = [
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -23543,7 +23056,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      sources."gauge-2.7.2"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -23555,17 +23068,17 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
+      sources."supports-color-0.2.0"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -23582,27 +23095,30 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -23612,7 +23128,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23621,7 +23137,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23632,11 +23148,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -23674,7 +23190,7 @@ in
     };
     dependencies = [
       sources."chokidar-1.6.1"
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -23699,7 +23215,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.15"
+      sources."fsevents-1.0.17"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -23709,7 +23225,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."normalize-path-2.0.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
@@ -23721,7 +23237,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
@@ -23733,7 +23249,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.7.0"
+      sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
       sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
@@ -23742,11 +23258,11 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.4.0"
-      sources."node-pre-gyp-0.6.31"
+      sources."nan-2.5.0"
+      sources."node-pre-gyp-0.6.32"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -23767,21 +23283,21 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      sources."gauge-2.7.2"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
+      sources."supports-color-0.2.0"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -23798,27 +23314,30 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -23828,7 +23347,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23837,7 +23356,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23848,11 +23367,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -23897,8 +23416,8 @@ in
       sources."semver-diff-2.1.0"
       sources."string-length-1.0.1"
       sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.3"
-      sources."write-file-atomic-1.2.0"
+      sources."osenv-0.1.4"
+      sources."write-file-atomic-1.3.1"
       sources."xdg-basedir-2.0.0"
       sources."os-homedir-1.0.2"
       sources."imurmurhash-0.1.4"
@@ -23938,53 +23457,64 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.15.2";
+    version = "0.16.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.15.2.tgz";
-      sha1 = "4533dd93f63828f8e749f0c132a793fbeb636ea6";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.16.0.tgz";
+      sha1 = "5b8e180a7cf211b5450a11deed0aa91e43932661";
     };
     dependencies = [
-      sources."basic-auth-1.0.4"
-      sources."bcryptjs-2.3.0"
-      sources."body-parser-1.15.2"
+      sources."basic-auth-1.1.0"
+      sources."bcryptjs-2.4.0"
+      (sources."body-parser-1.15.2" // {
+        dependencies = [
+          sources."raw-body-2.1.7"
+        ];
+      })
       sources."cheerio-0.22.0"
-      sources."clone-2.0.0"
+      sources."clone-2.1.0"
       sources."cookie-parser-1.4.3"
       sources."cors-2.8.1"
-      sources."cron-1.1.1"
+      sources."cron-1.2.1"
       sources."express-4.14.0"
-      sources."follow-redirects-0.2.0"
-      sources."fs-extra-0.30.0"
+      (sources."follow-redirects-1.2.1" // {
+        dependencies = [
+          sources."debug-2.6.0"
+          sources."ms-0.7.2"
+        ];
+      })
+      sources."fs-extra-1.0.0"
       sources."fs.notify-0.0.4"
       sources."i18next-1.10.6"
       sources."is-utf8-0.2.1"
+      sources."js-yaml-3.7.0"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonata-1.0.10"
       sources."media-typer-0.3.0"
-      (sources."mqtt-1.14.1" // {
-        dependencies = [
-          sources."readable-stream-1.0.34"
-          sources."isarray-0.0.1"
-        ];
-      })
-      sources."mustache-2.2.1"
+      sources."mqtt-2.2.1"
+      sources."mustache-2.3.0"
       sources."nopt-3.0.6"
-      sources."oauth2orize-1.5.0"
+      sources."oauth2orize-1.7.0"
       sources."on-headers-1.0.1"
       sources."passport-0.3.2"
       sources."passport-http-bearer-1.0.1"
       sources."passport-oauth2-client-password-0.1.2"
-      sources."raw-body-2.1.7"
+      (sources."raw-body-2.2.0" // {
+        dependencies = [
+          sources."iconv-lite-0.4.15"
+        ];
+      })
       sources."semver-5.3.0"
-      sources."sentiment-1.0.6"
-      (sources."uglify-js-2.7.3" // {
+      sources."sentiment-2.1.0"
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
         ];
       })
       sources."when-3.7.7"
-      sources."ws-0.8.1"
+      sources."ws-1.1.1"
       sources."xml2js-0.4.17"
       sources."node-red-node-feedparser-0.1.7"
-      sources."node-red-node-email-0.1.12"
+      sources."node-red-node-email-0.1.15"
       (sources."node-red-node-twitter-0.1.9" // {
         dependencies = [
           sources."request-2.79.0"
@@ -23993,12 +23523,7 @@ in
         ];
       })
       sources."node-red-node-rbe-0.1.6"
-      sources."node-red-node-serialport-0.4.1"
-      (sources."bcrypt-0.8.7" // {
-        dependencies = [
-          sources."nan-2.3.5"
-        ];
-      })
+      sources."bcrypt-1.0.2"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.2.0"
@@ -24013,8 +23538,9 @@ in
       sources."setprototypeof-1.0.2"
       sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
-      sources."mime-types-2.1.13"
-      sources."mime-db-1.25.0"
+      sources."unpipe-1.0.0"
+      sources."mime-types-2.1.14"
+      sources."mime-db-1.26.0"
       sources."css-select-1.2.0"
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
@@ -24051,8 +23577,8 @@ in
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."vary-1.1.0"
-      sources."moment-timezone-0.5.9"
-      sources."moment-2.17.0"
+      sources."moment-timezone-0.5.11"
+      sources."moment-2.17.1"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
@@ -24065,86 +23591,55 @@ in
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.2"
+      sources."proxy-addr-1.1.3"
       sources."range-parser-1.2.0"
       sources."send-0.14.1"
       sources."serve-static-1.11.1"
       sources."utils-merge-1.0.0"
       sources."negotiator-0.6.1"
-      sources."unpipe-1.0.0"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.1.1"
+      sources."ipaddr.js-1.2.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
-      sources."stream-consume-0.1.0"
       sources."graceful-fs-4.1.11"
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
-      sources."path-is-absolute-1.0.1"
-      sources."rimraf-2.5.4"
-      sources."glob-7.1.1"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
-      sources."once-1.4.0"
-      sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
-      sources."balanced-match-0.4.2"
-      sources."concat-map-0.0.1"
       sources."async-0.1.22"
       sources."retry-0.6.1"
       sources."cookies-0.6.2"
       sources."i18next-client-1.10.3"
       sources."json5-0.2.0"
       sources."keygrip-1.0.1"
+      sources."argparse-1.0.9"
+      sources."esprima-2.7.3"
+      sources."sprintf-js-1.0.3"
       sources."commist-1.0.0"
-      (sources."concat-stream-1.5.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
-      (sources."end-of-stream-1.1.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
+      sources."concat-stream-1.6.0"
+      sources."end-of-stream-1.1.0"
       sources."help-me-1.0.1"
       sources."minimist-1.2.0"
-      (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."mqtt-packet-5.2.1"
+      sources."pump-1.0.2"
       sources."reinterval-1.1.0"
-      sources."split2-2.1.0"
-      (sources."websocket-stream-3.3.3" // {
-        dependencies = [
-          sources."ws-1.1.1"
-        ];
-      })
+      sources."split2-2.1.1"
+      sources."websocket-stream-3.3.3"
       sources."xtend-4.0.1"
       sources."leven-1.0.2"
       sources."typedarray-0.0.6"
+      sources."once-1.3.3"
+      sources."wrappy-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."through2-2.0.3"
       sources."extend-3.0.0"
-      sources."glob-parent-3.0.1"
+      sources."glob-5.0.15"
+      sources."glob-parent-3.1.0"
       (sources."micromatch-2.3.11" // {
         dependencies = [
           sources."is-extglob-1.0.0"
@@ -24154,9 +23649,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.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.1.0"
       sources."path-dirname-1.0.2"
-      sources."is-extglob-2.1.0"
+      sources."is-extglob-2.1.1"
       sources."arr-diff-2.0.0"
       sources."array-unique-0.2.1"
       sources."braces-1.8.5"
@@ -24167,7 +23668,7 @@ in
         ];
       })
       sources."filename-regex-2.0.0"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."normalize-path-2.0.1"
       sources."object.omit-2.0.1"
       (sources."parse-glob-3.0.4" // {
@@ -24184,7 +23685,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
@@ -24206,34 +23707,17 @@ in
       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."isarray-0.0.1"
-        ];
-      })
-      (sources."bl-0.9.5" // {
-        dependencies = [
-          sources."readable-stream-1.0.34"
-          sources."isarray-0.0.1"
-        ];
-      })
+      sources."bl-1.2.0"
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
-          sources."once-1.3.3"
         ];
       })
       sources."stream-shift-1.0.0"
-      sources."options-0.0.6"
-      sources."ultron-1.0.2"
       sources."abbrev-1.0.9"
       sources."uid2-0.0.3"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
-      sources."lodash.assign-4.0.1"
-      sources."lodash.keys-4.2.0"
-      sources."lodash.rest-4.0.5"
       sources."source-map-0.5.6"
       sources."uglify-to-browserify-1.0.2"
       sources."yargs-3.10.0"
@@ -24247,13 +23731,11 @@ in
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
       sources."longest-1.0.1"
-      sources."bufferutil-1.2.1"
-      sources."utf-8-validate-1.2.1"
-      sources."bindings-1.2.1"
-      sources."nan-2.4.0"
+      sources."options-0.0.6"
+      sources."ultron-1.0.2"
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       (sources."feedparser-1.1.3" // {
         dependencies = [
           sources."sax-0.6.1"
@@ -24284,7 +23766,6 @@ in
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
-      sources."json-stringify-safe-5.0.1"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
@@ -24300,11 +23781,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -24313,7 +23794,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24322,7 +23803,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24333,7 +23814,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -24341,7 +23822,7 @@ in
       sources."nodemailer-1.11.0"
       sources."poplib-0.1.7"
       sources."mailparser-0.6.1"
-      (sources."imap-0.8.18" // {
+      (sources."imap-0.8.19" // {
         dependencies = [
           sources."readable-stream-1.1.14"
           sources."isarray-0.0.1"
@@ -24381,48 +23862,48 @@ in
       sources."utf7-1.0.2"
       sources."twitter-ng-0.6.2"
       sources."oauth-0.9.14"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."asynckit-0.4.0"
-      (sources."serialport-4.0.6" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      sources."lie-3.1.0"
-      (sources."node-pre-gyp-0.6.31" // {
+      sources."bindings-1.2.1"
+      sources."nan-2.5.0"
+      (sources."node-pre-gyp-0.6.32" // {
         dependencies = [
           sources."request-2.79.0"
           sources."form-data-2.1.2"
           sources."qs-6.3.0"
         ];
       })
-      sources."object.assign-4.0.4"
-      sources."immediate-3.0.6"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       sources."rc-1.1.6"
+      (sources."rimraf-2.5.4" // {
+        dependencies = [
+          sources."glob-7.1.1"
+        ];
+      })
       sources."tar-2.2.1"
       (sources."tar-pack-3.3.0" // {
         dependencies = [
-          sources."once-1.3.3"
           sources."readable-stream-2.1.5"
         ];
       })
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      (sources."gauge-2.7.2" // {
+        dependencies = [
+          sources."supports-color-0.2.0"
+        ];
+      })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
@@ -24431,14 +23912,11 @@ in
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
+      sources."fs.realpath-1.0.0"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.10"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
-      sources."function-bind-1.1.0"
-      sources."object-keys-1.0.11"
-      sources."define-properties-1.1.2"
-      sources."foreach-2.0.5"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -24502,7 +23980,7 @@ in
       sources."methods-0.0.1"
       sources."send-0.1.0"
       sources."cookie-signature-1.0.1"
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -24512,7 +23990,7 @@ in
       sources."bytes-0.2.0"
       sources."pause-0.0.1"
       sources."mime-1.2.6"
-      sources."coffee-script-1.11.1"
+      sources."coffee-script-1.12.2"
       sources."vows-0.8.1"
       sources."eyes-0.1.8"
       sources."diff-1.0.8"
@@ -24541,17 +24019,18 @@ in
       sources."tinycolor-0.0.1"
       sources."options-0.0.6"
       sources."zeparser-0.0.5"
-      sources."mailcomposer-3.12.0"
+      sources."mailcomposer-4.0.1"
       sources."simplesmtp-0.3.35"
       sources."optimist-0.6.1"
-      sources."buildmail-3.10.0"
-      sources."libmime-2.1.0"
+      sources."buildmail-4.0.1"
+      sources."libmime-3.0.0"
       sources."addressparser-1.0.1"
       sources."libbase64-0.1.0"
       sources."libqp-1.1.0"
       sources."nodemailer-fetch-1.6.0"
       sources."nodemailer-shared-1.1.0"
-      sources."iconv-lite-0.4.13"
+      sources."punycode-1.4.1"
+      sources."iconv-lite-0.4.15"
       sources."rai-0.1.12"
       sources."xoauth2-0.1.8"
       sources."wordwrap-0.0.3"
@@ -24576,10 +24055,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.0.2";
+    version = "4.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz";
-      sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae";
+      url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz";
+      sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4";
     };
     dependencies = [
       sources."JSONStream-1.2.1"
@@ -24612,7 +24091,7 @@ in
           sources."glob-6.0.4"
         ];
       })
-      sources."lockfile-1.0.2"
+      sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.union-4.6.0"
@@ -24622,29 +24101,26 @@ in
       sources."mkdirp-0.5.1"
       (sources."node-gyp-3.4.0" // {
         dependencies = [
+          sources."nopt-3.0.6"
           sources."npmlog-3.1.2"
         ];
       })
-      sources."nopt-3.0.6"
+      sources."nopt-4.0.1"
       sources."normalize-git-url-3.0.2"
       sources."normalize-package-data-2.3.5"
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
       sources."npm-package-arg-4.2.0"
-      (sources."npm-registry-client-7.3.0" // {
-        dependencies = [
-          sources."npmlog-3.1.2"
-        ];
-      })
+      sources."npm-registry-client-7.4.5"
       sources."npm-user-validate-0.1.5"
-      (sources."npmlog-4.0.1" // {
+      (sources."npmlog-4.0.2" // {
         dependencies = [
-          sources."gauge-2.7.1"
+          sources."gauge-2.7.2"
         ];
       })
       sources."once-1.4.0"
       sources."opener-1.4.2"
-      sources."osenv-0.1.3"
+      sources."osenv-0.1.4"
       sources."path-is-inside-1.0.2"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
@@ -24655,10 +24131,10 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."realize-package-specifier-3.0.3"
-      sources."request-2.78.0"
-      sources."retry-0.10.0"
+      sources."request-2.79.0"
+      sources."retry-0.10.1"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
@@ -24678,11 +24154,12 @@ in
       sources."umask-1.1.0"
       sources."unique-filename-1.1.0"
       sources."unpipe-1.0.0"
+      sources."uuid-3.0.1"
       sources."validate-npm-package-name-2.2.2"
       sources."which-1.2.12"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.2.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -24709,11 +24186,7 @@ in
       sources."promzard-0.3.0"
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
-      (sources."concat-stream-1.5.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."concat-stream-1.6.0"
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
@@ -24727,20 +24200,11 @@ in
       })
       sources."flush-write-stream-1.0.2"
       sources."from2-2.3.0"
-      sources."pump-1.0.1"
+      sources."pump-1.0.2"
       sources."pumpify-1.3.5"
       sources."stream-each-1.2.0"
-      (sources."through2-2.0.1" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."through2-2.0.3"
       sources."typedarray-0.0.6"
-      sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
-      sources."util-deprecate-1.0.2"
       sources."stream-shift-1.0.0"
       sources."xtend-4.0.1"
       sources."minimist-0.0.8"
@@ -24752,14 +24216,14 @@ in
       sources."delegates-1.0.0"
       sources."has-color-0.1.7"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-index-1.0.0"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       sources."es6-symbol-3.1.0"
       sources."ms-0.7.2"
       sources."d-0.1.1"
@@ -24767,13 +24231,19 @@ in
       sources."es6-iterator-2.0.0"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
+      sources."supports-color-0.2.0"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."mute-stream-0.0.6"
+      sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
       sources."json-parse-helpfulerror-1.0.3"
       sources."jju-1.3.0"
       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."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       sources."caseless-0.11.0"
@@ -24787,8 +24257,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
-      sources."node-uuid-1.4.7"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
@@ -24796,18 +24265,21 @@ in
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -24816,7 +24288,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24825,7 +24297,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24836,11 +24308,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
@@ -24896,7 +24368,7 @@ in
       })
       sources."fs.extra-1.3.2"
       sources."findit-1.2.0"
-      sources."coffee-script-1.11.1"
+      sources."coffee-script-1.12.2"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
       sources."request-2.79.0"
@@ -24907,7 +24379,7 @@ in
       sources."rimraf-2.5.4"
       sources."retry-0.6.0"
       sources."couch-login-0.1.20"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       sources."caseless-0.11.0"
@@ -24921,13 +24393,13 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -24939,11 +24411,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -24953,7 +24425,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24962,7 +24434,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24973,11 +24445,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -24992,7 +24464,11 @@ in
       sources."concat-map-0.0.1"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      (sources."gauge-2.7.2" // {
+        dependencies = [
+          sources."supports-color-0.2.0"
+        ];
+      })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -25003,10 +24479,9 @@ in
       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"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
@@ -25051,13 +24526,13 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.6";
+    version = "2.8.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.6.tgz";
-      sha1 = "9e3a0865b29dfc9af8c3d53d95b43f4bc6b1f212";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.9.tgz";
+      sha1 = "c084b087a08ecf9292352e2cd591de903f8129c3";
     };
     dependencies = [
-      sources."bluebird-3.4.6"
+      sources."bluebird-3.4.7"
       sources."chalk-1.1.3"
       sources."cint-8.2.1"
       sources."cli-table-0.3.1"
@@ -25066,7 +24541,7 @@ in
       sources."find-up-1.1.2"
       sources."get-stdin-5.0.1"
       sources."json-parse-helpfulerror-1.0.3"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       sources."node-alias-1.0.4"
       sources."npm-3.10.10"
       (sources."npmi-2.0.1" // {
@@ -25078,13 +24553,13 @@ in
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
       sources."spawn-please-0.2.0"
-      sources."update-notifier-1.0.2"
+      sources."update-notifier-1.0.3"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."colors-1.0.3"
       sources."graceful-readlink-1.0.1"
       sources."path-exists-2.1.0"
@@ -25120,7 +24595,7 @@ in
           sources."glob-6.0.4"
         ];
       })
-      sources."lockfile-1.0.2"
+      sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.union-4.6.0"
@@ -25144,14 +24619,15 @@ in
         ];
       })
       sources."npm-user-validate-0.1.5"
-      (sources."npmlog-4.0.1" // {
+      (sources."npmlog-4.0.2" // {
         dependencies = [
-          sources."gauge-2.7.1"
+          sources."gauge-2.7.2"
+          sources."supports-color-0.2.0"
         ];
       })
       sources."once-1.4.0"
       sources."opener-1.4.2"
-      sources."osenv-0.1.3"
+      sources."osenv-0.1.4"
       sources."path-is-inside-1.0.2"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
@@ -25165,7 +24641,7 @@ in
       sources."readable-stream-2.1.5"
       sources."realize-package-specifier-3.0.3"
       sources."request-2.75.0"
-      sources."retry-0.10.0"
+      sources."retry-0.10.1"
       sources."rimraf-2.5.4"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
@@ -25213,14 +24689,14 @@ in
       sources."delegates-1.0.0"
       sources."has-color-0.1.7"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-index-1.0.0"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       sources."es6-symbol-3.1.0"
       sources."ms-0.7.2"
       sources."d-0.1.1"
@@ -25228,12 +24704,13 @@ in
       sources."es6-iterator-2.0.0"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
-      (sources."concat-stream-1.5.2" // {
+      (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.0.6"
+          sources."readable-stream-2.2.2"
         ];
       })
       sources."typedarray-0.0.6"
+      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"
@@ -25241,9 +24718,8 @@ in
       sources."util-deprecate-1.0.2"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."mute-stream-0.0.6"
+      sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
-      sources."buffer-shims-1.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       (sources."bl-1.1.2" // {
@@ -25262,7 +24738,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.1"
@@ -25274,7 +24750,7 @@ in
       sources."is-my-json-valid-2.15.0"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."hoek-2.16.3"
@@ -25283,7 +24759,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25292,7 +24768,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25303,11 +24779,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
@@ -25346,7 +24822,7 @@ in
       sources."node-status-codes-1.0.0"
       sources."parse-json-2.2.0"
       sources."read-all-stream-3.1.0"
-      sources."timed-out-3.0.0"
+      sources."timed-out-3.1.3"
       sources."unzip-response-1.0.2"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
@@ -25365,7 +24841,7 @@ in
     meta = {
       description = "Find newer versions of dependencies than what your package.json or bower.json allows";
       homepage = https://github.com/tjunnone/npm-check-updates;
-      license = "MIT";
+      license = "Apache-2.0";
     };
     production = true;
   };
@@ -25422,7 +24898,7 @@ in
           sources."ms-0.7.2"
         ];
       })
-      (sources."service-runner-2.1.11" // {
+      (sources."service-runner-2.1.13" // {
         dependencies = [
           sources."gelf-stream-1.1.1"
           sources."yargs-5.0.0"
@@ -25458,8 +24934,8 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.13"
-      sources."mime-db-1.25.0"
+      sources."mime-types-2.1.14"
+      sources."mime-db-1.26.0"
       sources."accepts-1.3.3"
       sources."compressible-2.0.9"
       sources."on-headers-1.0.1"
@@ -25483,13 +24959,13 @@ in
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.2"
+      sources."proxy-addr-1.1.3"
       sources."range-parser-1.2.0"
       sources."send-0.14.1"
       sources."serve-static-1.11.1"
       sources."utils-merge-1.0.0"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.1.1"
+      sources."ipaddr.js-1.2.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."glob-6.0.4"
@@ -25511,7 +24987,7 @@ in
       sources."concat-map-0.0.1"
       sources."optimist-0.6.1"
       sources."source-map-0.4.4"
-      (sources."uglify-js-2.7.4" // {
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -25534,7 +25010,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -25563,7 +25039,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -25575,11 +25051,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -25589,7 +25065,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25598,7 +25074,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25609,12 +25085,12 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."punycode-1.4.1"
-      sources."bluebird-3.4.6"
+      sources."bluebird-3.4.7"
       sources."bunyan-1.8.5"
       sources."bunyan-syslog-udp-0.1.0"
       sources."hot-shots-4.3.1"
@@ -25627,8 +25103,8 @@ in
       sources."dtrace-provider-0.8.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
-      sources."moment-2.17.0"
-      sources."nan-2.4.0"
+      sources."moment-2.17.1"
+      sources."nan-2.5.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -25665,9 +25141,9 @@ in
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
       sources."dom-storage-2.0.2"
-      (sources."bl-1.1.2" // {
+      (sources."bl-1.2.0" // {
         dependencies = [
-          sources."readable-stream-2.0.6"
+          sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
@@ -25686,7 +25162,7 @@ in
           sources."camelcase-3.0.0"
         ];
       })
-      sources."wrap-ansi-2.0.0"
+      sources."wrap-ansi-2.1.0"
       sources."lcid-1.0.0"
       sources."invert-kv-1.0.0"
       sources."find-up-1.1.2"
@@ -25723,23 +25199,23 @@ in
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.36.0";
+    version = "0.36.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.0.tgz";
-      sha1 = "fe3b087f07389ca1c2fd3d71e38a7971d5508924";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.1.tgz";
+      sha1 = "7d2009b814b5b3a2ca573cabea1f2873a4be4a14";
     };
     dependencies = [
       sources."airplayer-2.0.0"
       sources."clivas-0.2.0"
       (sources."inquirer-1.2.3" // {
         dependencies = [
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
         ];
       })
       sources."keypress-0.2.1"
       sources."mime-1.3.4"
       sources."network-address-1.1.0"
-      sources."numeral-1.5.5"
+      sources."numeral-1.5.6"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
         dependencies = [
@@ -25751,7 +25227,7 @@ in
           sources."get-stdin-5.0.1"
         ];
       })
-      sources."pump-1.0.1"
+      sources."pump-1.0.2"
       sources."range-parser-1.2.0"
       sources."rc-1.1.6"
       (sources."torrent-stream-1.0.3" // {
@@ -25775,14 +25251,15 @@ in
       sources."server-destroy-1.0.1"
       sources."bplist-creator-0.0.6"
       sources."bplist-parser-0.1.1"
-      sources."concat-stream-1.5.2"
+      sources."concat-stream-1.6.0"
       sources."plist-1.2.0"
       sources."reverse-http-1.2.0"
       sources."stream-buffers-2.2.0"
       sources."big-integer-1.6.17"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.0.6"
+      sources."readable-stream-2.2.2"
+      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"
@@ -25790,7 +25267,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."base64-js-0.0.8"
       sources."xmlbuilder-4.0.0"
-      sources."xmldom-0.1.22"
+      sources."xmldom-0.1.27"
       sources."lodash-3.10.1"
       sources."consume-http-header-1.0.0"
       sources."once-1.4.0"
@@ -25806,12 +25283,12 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."string-width-1.0.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."array-flatten-2.1.0"
+      sources."array-flatten-2.1.1"
       sources."deep-equal-1.0.1"
       sources."dns-equal-1.0.0"
       sources."dns-txt-2.0.2"
@@ -25833,7 +25310,7 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -25868,7 +25345,7 @@ in
       sources."external-editor-1.1.1"
       sources."figures-1.7.0"
       sources."mute-stream-0.0.6"
-      sources."run-async-2.2.0"
+      sources."run-async-2.3.0"
       sources."rx-4.1.0"
       sources."through-2.3.8"
       sources."restore-cursor-1.0.1"
@@ -25884,12 +25361,12 @@ in
       sources."blob-to-buffer-1.2.6"
       sources."magnet-uri-5.1.5"
       sources."parse-torrent-file-4.0.0"
-      sources."simple-get-2.3.0"
+      sources."simple-get-2.4.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."simple-sha1-2.1.0"
+      sources."rusha-0.8.5"
       sources."simple-concat-1.0.0"
       sources."unzip-response-2.0.1"
       (sources."end-of-stream-1.1.0" // {
@@ -25917,7 +25394,7 @@ in
       sources."rimraf-2.5.4"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.0"
-      (sources."random-access-file-1.3.1" // {
+      (sources."random-access-file-1.4.0" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.1"
@@ -25926,6 +25403,8 @@ in
       })
       sources."randombytes-2.0.3"
       sources."run-parallel-1.1.6"
+      sources."debug-2.6.0"
+      sources."ms-0.7.2"
       sources."flatten-0.0.1"
       sources."fifo-0.1.4"
       (sources."peer-wire-protocol-0.7.0" // {
@@ -25956,7 +25435,6 @@ in
           sources."bencode-0.8.0"
         ];
       })
-      sources."debug-2.3.3"
       sources."re-emitter-1.1.3"
       sources."buffer-equals-1.0.4"
       sources."k-bucket-0.6.0"
@@ -25972,7 +25450,7 @@ in
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      sources."simple-peer-6.0.7"
+      sources."simple-peer-6.1.3"
       sources."simple-websocket-4.1.0"
       sources."string2compact-1.2.2"
       sources."ws-1.1.1"
@@ -25981,7 +25459,6 @@ in
       sources."addr-to-ip-port-1.4.2"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
-      sources."ms-0.7.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -25994,10 +25471,10 @@ in
   peerflix-server = nodeEnv.buildNodePackage {
     name = "peerflix-server";
     packageName = "peerflix-server";
-    version = "0.1.1";
+    version = "0.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz";
-      sha1 = "683d54067d44699b2eff8bfc793e780df2912666";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz";
+      sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6";
     };
     dependencies = [
       sources."connect-multiparty-1.2.5"
@@ -26009,10 +25486,10 @@ in
       })
       sources."lodash-2.4.2"
       sources."mkdirp-0.5.1"
-      sources."pump-1.0.1"
+      sources."pump-1.0.2"
       sources."range-parser-1.2.0"
       sources."read-torrent-1.3.0"
-      (sources."socket.io-1.6.0" // {
+      (sources."socket.io-1.7.2" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -26131,8 +25608,8 @@ in
       sources."parse-torrent-file-2.1.4"
       sources."flatten-0.0.1"
       sources."bencode-0.7.0"
-      sources."simple-sha1-2.0.8"
-      sources."rusha-0.8.4"
+      sources."simple-sha1-2.1.0"
+      sources."rusha-0.8.5"
       sources."form-data-0.0.10"
       sources."hawk-0.10.2"
       sources."node-uuid-1.4.7"
@@ -26149,7 +25626,7 @@ in
       sources."boom-0.3.8"
       sources."cryptiles-0.1.3"
       sources."sntp-0.1.4"
-      (sources."engine.io-1.8.0" // {
+      (sources."engine.io-1.8.2" // {
         dependencies = [
           sources."debug-2.3.3"
           sources."cookie-0.3.1"
@@ -26162,7 +25639,7 @@ in
           sources."debug-2.3.3"
         ];
       })
-      (sources."socket.io-client-1.6.0" // {
+      (sources."socket.io-client-1.7.2" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -26177,19 +25654,15 @@ in
       sources."ms-0.7.2"
       (sources."accepts-1.3.3" // {
         dependencies = [
-          sources."mime-types-2.1.13"
+          sources."mime-types-2.1.14"
           sources."negotiator-0.6.1"
-          sources."mime-db-1.25.0"
-        ];
-      })
-      sources."base64id-0.1.0"
-      (sources."engine.io-parser-1.3.1" // {
-        dependencies = [
-          sources."has-binary-0.1.6"
+          sources."mime-db-1.26.0"
         ];
       })
+      sources."base64id-1.0.0"
+      sources."engine.io-parser-1.3.2"
       sources."ws-1.1.1"
-      sources."after-0.8.1"
+      sources."after-0.8.2"
       sources."arraybuffer.slice-0.0.6"
       sources."base64-arraybuffer-0.1.5"
       sources."blob-0.0.4"
@@ -26199,7 +25672,7 @@ in
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
-      (sources."engine.io-client-1.8.0" // {
+      (sources."engine.io-client-1.8.2" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -26220,13 +25693,13 @@ in
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-3.2.6" // {
         dependencies = [
-          sources."debug-2.3.3"
+          sources."debug-2.6.0"
         ];
       })
       (sources."bittorrent-tracker-2.12.1" // {
         dependencies = [
           sources."bencode-0.6.0"
-          sources."debug-2.3.3"
+          sources."debug-2.6.0"
         ];
       })
       sources."bncode-0.5.3"
@@ -26342,7 +25815,7 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."node-uuid-1.4.7"
       sources."qs-5.2.1"
       sources."tunnel-agent-0.4.3"
@@ -26357,11 +25830,11 @@ in
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
       sources."async-2.1.4"
-      sources."lodash-4.17.2"
-      sources."mime-db-1.25.0"
+      sources."lodash-4.17.4"
+      sources."mime-db-1.26.0"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26370,7 +25843,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26381,7 +25854,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -26398,11 +25871,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."throttleit-1.0.0"
@@ -26439,7 +25912,7 @@ in
       sources."mkdirp-0.5.1"
       sources."private-0.1.6"
       sources."q-1.4.1"
-      sources."recast-0.11.17"
+      sources."recast-0.11.18"
       sources."graceful-readlink-1.0.1"
       sources."acorn-3.3.0"
       sources."defined-1.0.0"
@@ -26454,7 +25927,7 @@ in
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
       sources."ast-types-0.9.2"
-      sources."esprima-3.1.1"
+      sources."esprima-3.1.3"
       sources."source-map-0.5.6"
       sources."base62-0.1.1"
       sources."esprima-fb-13001.1001.0-dev-harmony-fb"
@@ -26518,7 +25991,7 @@ in
       sources."methods-0.1.0"
       sources."send-0.1.4"
       sources."cookie-signature-1.0.1"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       sources."qs-0.6.5"
       sources."bytes-0.2.1"
       sources."pause-0.0.1"
@@ -26564,12 +26037,12 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -26580,11 +26053,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -26594,7 +26067,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26603,7 +26076,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26614,11 +26087,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."events.node-0.4.9"
     ];
@@ -26693,7 +26166,7 @@ in
       sources."lunr-0.7.2"
       sources."render-readme-1.3.1"
       sources."jju-1.3.0"
-      sources."JSONStream-1.2.1"
+      sources."JSONStream-1.3.0"
       sources."mkdirp-0.5.1"
       sources."sinopia-htpasswd-0.4.5"
       (sources."http-errors-1.5.1" // {
@@ -26753,9 +26226,9 @@ in
       sources."type-is-1.6.14"
       sources."vary-1.0.1"
       sources."utils-merge-1.0.0"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."ms-0.7.1"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
@@ -26794,7 +26267,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -26805,10 +26278,10 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -26818,7 +26291,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26827,7 +26300,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26838,7 +26311,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -26848,8 +26321,8 @@ in
       sources."dtrace-provider-0.8.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
-      sources."moment-2.17.0"
-      sources."nan-2.4.0"
+      sources."moment-2.17.1"
+      sources."nan-2.5.0"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
       (sources."glob-6.0.4" // {
@@ -26873,7 +26346,7 @@ in
       sources."source-map-0.1.43"
       sources."amdefine-1.0.1"
       sources."markdown-it-4.4.0"
-      sources."sanitize-html-1.13.0"
+      sources."sanitize-html-1.14.1"
       sources."entities-1.1.1"
       sources."linkify-it-1.2.4"
       sources."mdurl-1.0.1"
@@ -27031,7 +26504,7 @@ in
       sources."dtrace-provider-0.6.0"
       sources."precond-0.2.3"
       sources."csv-generate-0.0.6"
-      sources."csv-parse-1.1.7"
+      sources."csv-parse-1.1.9"
       sources."stream-transform-0.1.1"
       sources."csv-stringify-0.0.8"
       sources."asn1-0.1.11"
@@ -27039,7 +26512,7 @@ in
       sources."wrappy-1.0.2"
       sources."extsprintf-1.2.0"
       sources."core-util-is-1.0.2"
-      sources."nan-2.4.0"
+      sources."nan-2.5.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
       sources."mkdirp-0.5.1"
@@ -27059,7 +26532,7 @@ in
         dependencies = [
           sources."asn1-0.2.3"
           sources."assert-plus-0.2.0"
-          (sources."dashdash-1.14.0" // {
+          (sources."dashdash-1.14.1" // {
             dependencies = [
               sources."assert-plus-1.0.0"
             ];
@@ -27080,7 +26553,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
     ];
@@ -27102,7 +26575,7 @@ in
     dependencies = [
       sources."css-parse-1.7.0"
       sources."mkdirp-0.5.1"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       sources."sax-0.5.8"
       sources."glob-7.0.6"
       sources."source-map-0.1.43"
@@ -27149,7 +26622,7 @@ in
       sources."esprima-2.7.3"
       sources."sprintf-js-1.0.3"
       sources."minimist-0.0.8"
-      sources."clap-1.1.1"
+      sources."clap-1.1.2"
       sources."source-map-0.5.6"
       sources."chalk-1.1.3"
       sources."ansi-styles-2.2.1"
@@ -27157,7 +26630,7 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -27211,7 +26684,7 @@ in
         ];
       })
       sources."wrench-1.5.9"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       sources."keypress-0.2.1"
       sources."source-map-support-0.3.2"
       sources."source-map-0.1.32"
@@ -27243,7 +26716,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.0.2"
       sources."stringstream-0.0.5"
@@ -27266,11 +26739,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -27280,7 +26753,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27289,7 +26762,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27300,11 +26773,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."uglify-to-browserify-1.0.2"
       sources."yargs-3.10.0"
       sources."camelcase-1.2.1"
@@ -27319,7 +26792,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -27343,10 +26816,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.0.10";
+    version = "2.1.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz";
-      sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz";
+      sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -27359,10 +26832,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.7.4";
+    version = "2.7.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
-      sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
+      sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
     };
     dependencies = [
       sources."async-0.2.10"
@@ -27378,7 +26851,7 @@ 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."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -27394,53 +26867,46 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "0.10.3";
+    version = "1.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-0.10.3.tgz";
-      sha1 = "7d4635b9a359c8db06c313374544f27a3890f63c";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz";
+      sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418";
     };
     dependencies = [
-      sources."async-2.0.1"
-      sources."bluebird-3.3.5"
-      sources."blueimp-md5-2.3.1"
+      sources."async-2.1.4"
+      sources."bluebird-3.4.7"
+      sources."blueimp-md5-2.6.0"
       sources."body-parser-1.15.2"
-      sources."color-0.11.4"
+      sources."color-1.0.3"
       sources."cookie-parser-1.4.3"
       sources."crossroads-0.12.2"
-      sources."diff2html-1.2.0"
-      (sources."express-4.13.4" // {
-        dependencies = [
-          sources."cookie-0.1.5"
-          sources."qs-4.0.0"
-        ];
-      })
-      (sources."express-session-1.13.0" // {
-        dependencies = [
-          sources."cookie-0.2.3"
-        ];
-      })
+      sources."diff2html-2.0.11"
+      sources."express-4.14.0"
+      sources."express-session-1.14.2"
       sources."forever-monitor-1.1.0"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
+      sources."ignore-3.2.0"
       sources."keen.io-0.1.3"
       sources."knockout-3.4.1"
-      sources."lodash-4.12.0"
+      sources."lodash-4.17.4"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.13.0"
-      (sources."npm-3.9.6" // {
+      sources."moment-2.17.1"
+      (sources."npm-4.1.2" // {
         dependencies = [
-          sources."request-2.72.0"
+          sources."nopt-4.0.1"
+          sources."request-2.79.0"
           sources."combined-stream-1.0.5"
           sources."forever-agent-0.6.1"
-          sources."form-data-1.0.1"
+          sources."form-data-2.1.2"
           sources."hawk-3.1.3"
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.1.0"
+          sources."qs-6.3.0"
           sources."tunnel-agent-0.4.3"
           sources."delayed-stream-1.0.0"
           sources."hoek-2.16.3"
@@ -27449,10 +26915,9 @@ in
           sources."sntp-1.0.9"
         ];
       })
-      (sources."npm-registry-client-7.1.2" // {
+      (sources."npm-registry-client-7.4.5" // {
         dependencies = [
           sources."request-2.79.0"
-          sources."retry-0.8.0"
           sources."combined-stream-1.0.5"
           sources."forever-agent-0.6.1"
           sources."form-data-2.1.2"
@@ -27460,7 +26925,6 @@ in
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
           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"
@@ -27474,10 +26938,10 @@ in
       sources."os-homedir-1.0.2"
       sources."passport-0.3.2"
       sources."passport-local-1.0.0"
-      (sources."raven-0.11.0" // {
+      (sources."raven-1.1.1" // {
         dependencies = [
-          sources."cookie-0.1.0"
-          sources."stack-trace-0.0.7"
+          sources."json-stringify-safe-5.0.1"
+          sources."uuid-3.0.0"
         ];
       })
       (sources."rc-1.1.6" // {
@@ -27486,21 +26950,21 @@ in
         ];
       })
       sources."rimraf-2.5.4"
-      sources."semver-5.1.1"
-      (sources."serve-static-1.10.3" // {
-        dependencies = [
-          sources."send-0.13.2"
-          sources."http-errors-1.3.1"
-          sources."statuses-1.2.1"
-        ];
-      })
+      sources."semver-5.3.0"
+      sources."serve-static-1.11.1"
       sources."signals-1.0.0"
       sources."snapsvg-0.4.0"
-      sources."socket.io-1.4.8"
+      (sources."socket.io-1.7.2" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
       (sources."superagent-0.21.0" // {
         dependencies = [
           sources."qs-1.2.0"
           sources."mime-1.2.11"
+          sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."extend-1.2.1"
           sources."form-data-0.1.3"
@@ -27514,14 +26978,13 @@ in
           sources."rimraf-2.2.8"
         ];
       })
-      (sources."winston-2.2.0" // {
+      (sources."winston-2.3.0" // {
         dependencies = [
           sources."async-1.0.0"
           sources."colors-1.0.3"
-          sources."pkginfo-0.3.1"
         ];
       })
-      sources."yargs-4.7.1"
+      sources."yargs-6.6.0"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.2.0"
@@ -27539,45 +27002,51 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.13"
-      sources."mime-db-1.25.0"
-      sources."clone-1.0.2"
+      sources."mime-types-2.1.14"
+      sources."mime-db-1.26.0"
       sources."color-convert-1.8.2"
-      sources."color-string-0.3.0"
+      sources."color-string-1.4.0"
       sources."color-name-1.1.1"
+      sources."simple-swizzle-0.2.2"
+      sources."is-arrayish-0.3.1"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."diff-2.2.3"
-      sources."accepts-1.2.13"
+      sources."diff-3.2.0"
+      (sources."hogan.js-3.0.2" // {
+        dependencies = [
+          sources."mkdirp-0.3.0"
+        ];
+      })
+      sources."whatwg-fetch-1.1.1"
+      sources."nopt-1.0.10"
+      sources."abbrev-1.0.9"
+      sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
+      sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.7.0"
-      sources."finalhandler-0.4.1"
+      sources."finalhandler-0.5.0"
       sources."fresh-0.3.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.0.10"
-      sources."range-parser-1.0.3"
-      (sources."send-0.13.1" // {
-        dependencies = [
-          sources."http-errors-1.3.1"
-          sources."statuses-1.2.1"
-        ];
-      })
+      sources."proxy-addr-1.1.3"
+      sources."range-parser-1.2.0"
+      sources."send-0.14.1"
       sources."utils-merge-1.0.0"
-      sources."vary-1.0.1"
-      sources."negotiator-0.5.3"
+      sources."vary-1.1.0"
+      sources."negotiator-0.6.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.0.5"
+      sources."ipaddr.js-1.2.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
-      sources."crc-3.4.0"
+      sources."crc-3.4.1"
       sources."on-headers-1.0.1"
-      sources."uid-safe-2.0.0"
-      sources."base64-url-1.2.1"
+      sources."uid-safe-2.1.3"
+      sources."base64-url-1.3.3"
+      sources."random-bytes-1.0.0"
       (sources."broadway-0.2.10" // {
         dependencies = [
           sources."winston-0.7.2"
@@ -27656,11 +27125,12 @@ in
       sources."editions-1.3.3"
       sources."typechecker-4.4.0"
       sources."underscore-1.5.2"
-      sources."abbrev-1.0.9"
+      sources."JSONStream-1.3.0"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."aproba-1.0.4"
       sources."archy-1.0.0"
+      sources."asap-2.0.5"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
@@ -27670,8 +27140,8 @@ in
       sources."fs-vacuum-1.2.9"
       sources."fs-write-stream-atomic-1.0.8"
       sources."fstream-1.0.10"
-      sources."fstream-npm-1.1.1"
-      (sources."glob-7.0.6" // {
+      sources."fstream-npm-1.2.0"
+      (sources."glob-7.1.1" // {
         dependencies = [
           sources."minimatch-3.0.3"
         ];
@@ -27687,34 +27157,29 @@ in
           sources."minimatch-3.0.3"
         ];
       })
-      sources."lockfile-1.0.2"
+      sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
-      sources."lodash.clonedeep-4.3.2"
-      sources."lodash.union-4.4.0"
-      sources."lodash.uniq-4.3.0"
-      sources."lodash.without-4.2.0"
-      (sources."node-gyp-3.3.1" // {
+      sources."lodash.clonedeep-4.5.0"
+      sources."lodash.union-4.6.0"
+      sources."lodash.uniq-4.5.0"
+      sources."lodash.without-4.4.0"
+      sources."mississippi-1.2.0"
+      (sources."node-gyp-3.5.0" // {
         dependencies = [
-          (sources."glob-4.5.3" // {
-            dependencies = [
-              sources."minimatch-2.0.10"
-            ];
-          })
-          sources."minimatch-1.0.0"
-          sources."lru-cache-2.7.3"
+          sources."minimatch-3.0.3"
+          sources."nopt-3.0.6"
         ];
       })
-      sources."nopt-3.0.6"
       sources."normalize-git-url-3.0.2"
       sources."normalize-package-data-2.3.5"
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
-      sources."npm-package-arg-4.1.1"
+      sources."npm-package-arg-4.2.0"
       sources."npm-user-validate-0.1.5"
-      sources."npmlog-2.0.4"
-      sources."once-1.3.3"
+      sources."npmlog-4.0.2"
+      sources."once-1.4.0"
       sources."opener-1.4.2"
-      sources."osenv-0.1.3"
+      sources."osenv-0.1.4"
       sources."path-is-inside-1.0.2"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
@@ -27726,23 +27191,31 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."realize-package-specifier-3.0.3"
-      sources."retry-0.9.0"
+      sources."retry-0.10.1"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
       sources."sorted-object-2.0.1"
+      (sources."sorted-union-stream-2.1.3" // {
+        dependencies = [
+          sources."from2-1.3.0"
+          sources."readable-stream-1.1.14"
+          sources."isarray-0.0.1"
+        ];
+      })
       sources."strip-ansi-3.0.1"
       sources."tar-2.2.1"
       sources."text-table-0.2.0"
       sources."uid-number-0.0.6"
       sources."umask-1.1.0"
       sources."unique-filename-1.1.0"
+      sources."uuid-3.0.1"
       sources."validate-npm-package-name-2.2.2"
       sources."which-1.2.12"
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-1.1.4"
-      sources."ansi-regex-2.0.0"
+      sources."write-file-atomic-1.3.1"
+      sources."ansi-regex-2.1.1"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -27753,10 +27226,12 @@ in
       sources."lodash.restparam-3.6.1"
       sources."readdir-scoped-modules-1.0.2"
       sources."validate-npm-package-license-3.0.1"
+      sources."jsonparse-1.2.0"
+      sources."through-2.3.8"
       sources."wcwidth-1.0.1"
       sources."defaults-1.0.3"
+      sources."clone-1.0.2"
       sources."proto-list-1.2.4"
-      sources."asap-2.0.5"
       (sources."fstream-ignore-1.0.5" // {
         dependencies = [
           sources."minimatch-3.0.3"
@@ -27770,28 +27245,44 @@ in
       sources."promzard-0.3.0"
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
-      sources."lodash._baseclone-4.5.7"
-      sources."lodash._baseflatten-4.2.1"
-      sources."lodash.rest-4.0.5"
-      sources."lodash._basedifference-4.5.0"
-      sources."path-array-1.0.1"
-      sources."sigmund-1.0.1"
-      sources."array-index-1.0.0"
-      sources."es6-symbol-3.1.0"
-      sources."d-0.1.1"
-      sources."es5-ext-0.10.12"
-      sources."es6-iterator-2.0.0"
+      sources."concat-stream-1.6.0"
+      (sources."duplexify-3.5.0" // {
+        dependencies = [
+          sources."end-of-stream-1.0.0"
+          sources."once-1.3.3"
+        ];
+      })
+      (sources."end-of-stream-1.1.0" // {
+        dependencies = [
+          sources."once-1.3.3"
+        ];
+      })
+      sources."flush-write-stream-1.0.2"
+      sources."from2-2.3.0"
+      sources."pump-1.0.2"
+      sources."pumpify-1.3.5"
+      sources."stream-each-1.2.0"
+      sources."through2-2.0.3"
+      sources."typedarray-0.0.6"
+      sources."stream-shift-1.0.0"
+      sources."xtend-4.0.1"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
-      sources."ansi-0.3.1"
       sources."are-we-there-yet-1.1.2"
-      sources."gauge-1.2.7"
+      sources."console-control-strings-1.1.0"
+      sources."gauge-2.7.2"
+      sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."lodash.pad-4.5.1"
-      sources."lodash.padend-4.6.1"
-      sources."lodash.padstart-4.6.1"
+      sources."supports-color-0.2.0"
+      sources."object-assign-4.1.0"
+      sources."signal-exit-3.0.2"
+      sources."string-width-1.0.2"
+      sources."wide-align-1.1.0"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."number-is-nan-1.0.1"
       sources."os-tmpdir-1.0.2"
-      sources."mute-stream-0.0.6"
+      sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
       sources."json-parse-helpfulerror-1.0.3"
       sources."jju-1.3.0"
@@ -27803,11 +27294,6 @@ in
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
       sources."caseless-0.11.0"
       sources."extend-3.0.0"
       sources."har-validator-2.0.6"
@@ -27815,25 +27301,28 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.2.2"
-      sources."chalk-1.1.3"
+      sources."tough-cookie-2.3.2"
+      sources."asynckit-0.4.0"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
-      sources."xtend-4.0.1"
+      sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27842,7 +27331,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27853,10 +27342,12 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
+      sources."punycode-1.4.1"
+      sources."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
       sources."builtins-0.0.7"
@@ -27864,48 +27355,16 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      (sources."concat-stream-1.5.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
-      sources."typedarray-0.0.6"
-      sources."uuid-3.0.0"
-      sources."asynckit-0.4.0"
-      sources."punycode-1.4.1"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
       sources."lsmod-1.0.0"
       sources."deep-extend-0.4.1"
       sources."strip-json-comments-1.0.4"
       sources."eve-0.4.2"
-      (sources."engine.io-1.6.11" // {
+      (sources."engine.io-1.8.2" // {
         dependencies = [
-          sources."accepts-1.1.4"
-          sources."mime-types-2.0.14"
-          sources."negotiator-0.4.9"
-          sources."mime-db-1.12.0"
-        ];
-      })
-      (sources."socket.io-parser-2.2.6" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-        ];
-      })
-      (sources."socket.io-client-1.4.8" // {
-        dependencies = [
-          sources."component-emitter-1.2.0"
-        ];
-      })
-      (sources."socket.io-adapter-0.4.0" // {
-        dependencies = [
-          (sources."socket.io-parser-2.2.2" // {
-            dependencies = [
-              sources."debug-0.7.4"
-            ];
-          })
-          sources."json3-3.2.6"
-          sources."isarray-0.0.1"
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
       (sources."has-binary-0.1.7" // {
@@ -27913,78 +27372,87 @@ in
           sources."isarray-0.0.1"
         ];
       })
-      sources."base64id-0.1.0"
-      sources."ws-1.1.0"
-      (sources."engine.io-parser-1.2.4" // {
+      (sources."socket.io-adapter-0.5.0" // {
         dependencies = [
-          sources."has-binary-0.1.6"
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
+      (sources."socket.io-client-1.7.2" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
+      (sources."socket.io-parser-2.3.1" // {
+        dependencies = [
+          sources."component-emitter-1.1.2"
           sources."isarray-0.0.1"
         ];
       })
+      sources."base64id-1.0.0"
+      sources."engine.io-parser-1.3.2"
+      sources."ws-1.1.1"
+      sources."after-0.8.2"
+      sources."arraybuffer.slice-0.0.6"
+      sources."base64-arraybuffer-0.1.5"
+      sources."blob-0.0.4"
+      sources."wtf-8-1.0.0"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
-      sources."after-0.8.1"
-      sources."arraybuffer.slice-0.0.6"
-      sources."base64-arraybuffer-0.1.2"
-      sources."blob-0.0.4"
-      sources."utf8-2.1.0"
-      sources."json3-3.3.2"
-      sources."component-emitter-1.1.2"
-      sources."benchmark-1.0.0"
-      (sources."engine.io-client-1.6.11" // {
+      sources."backo2-1.0.2"
+      sources."component-bind-1.0.0"
+      sources."component-emitter-1.2.1"
+      (sources."engine.io-client-1.8.2" // {
         dependencies = [
-          sources."ws-1.0.1"
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
-      sources."component-bind-1.0.0"
-      sources."object-component-0.0.3"
       sources."indexof-0.0.1"
-      sources."parseuri-0.0.4"
+      sources."object-component-0.0.3"
+      sources."parseuri-0.0.5"
       sources."to-array-0.1.4"
-      sources."backo2-1.0.2"
-      sources."has-cors-1.1.0"
-      sources."xmlhttprequest-ssl-1.5.1"
-      sources."parsejson-0.0.1"
-      sources."parseqs-0.0.2"
       sources."component-inherit-0.0.3"
+      sources."has-cors-1.1.0"
+      sources."parsejson-0.0.3"
+      sources."parseqs-0.0.5"
+      sources."xmlhttprequest-ssl-1.5.3"
       sources."yeast-0.1.2"
       sources."better-assert-1.0.2"
       sources."callsite-1.0.0"
+      sources."json3-3.3.2"
       sources."formidable-1.0.14"
       sources."cookiejar-2.0.1"
       sources."reduce-component-1.0.1"
       sources."camelcase-3.0.0"
       sources."cliui-3.2.0"
       sources."decamelize-1.2.0"
-      sources."lodash.assign-4.2.0"
+      sources."get-caller-file-1.0.2"
       sources."os-locale-1.4.0"
-      sources."pkg-conf-1.1.3"
       sources."read-pkg-up-1.0.1"
+      sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."set-blocking-1.0.0"
-      sources."string-width-1.0.2"
-      sources."window-size-0.2.0"
+      sources."which-module-1.0.0"
       sources."y18n-3.2.1"
-      sources."yargs-parser-2.4.1"
-      sources."wrap-ansi-2.0.0"
+      sources."yargs-parser-4.2.1"
+      sources."wrap-ansi-2.1.0"
       sources."lcid-1.0.0"
       sources."invert-kv-1.0.0"
       sources."find-up-1.1.2"
-      sources."load-json-file-1.1.0"
-      sources."object-assign-4.1.0"
-      sources."symbol-0.2.3"
+      sources."read-pkg-1.1.0"
       sources."path-exists-2.1.0"
+      sources."load-json-file-1.1.0"
+      sources."path-type-1.1.0"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
-      sources."error-ex-1.3.0"
-      sources."is-arrayish-0.2.1"
+      (sources."error-ex-1.3.0" // {
+        dependencies = [
+          sources."is-arrayish-0.2.1"
+        ];
+      })
       sources."is-utf8-0.2.1"
-      sources."read-pkg-1.1.0"
-      sources."path-type-1.1.0"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -28073,7 +27541,7 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."node-uuid-1.4.7"
       sources."qs-5.2.1"
       sources."tunnel-agent-0.4.3"
@@ -28088,11 +27556,11 @@ in
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
       sources."async-2.1.4"
-      sources."lodash-4.17.2"
-      sources."mime-db-1.25.0"
+      sources."lodash-4.17.4"
+      sources."mime-db-1.26.0"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28101,7 +27569,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28112,7 +27580,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -28129,11 +27597,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."throttleit-1.0.0"
@@ -28152,12 +27620,13 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "1.13.3";
+    version = "1.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-1.13.3.tgz";
-      sha1 = "e79c46fe5a37c5ca70084ba0894c595cdcb42815";
+      url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz";
+      sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823";
     };
     dependencies = [
+      sources."acorn-3.3.0"
       sources."async-1.5.2"
       sources."clone-1.0.2"
       (sources."enhanced-resolve-0.9.1" // {
@@ -28165,21 +27634,15 @@ in
           sources."memory-fs-0.2.0"
         ];
       })
-      sources."acorn-3.3.0"
       sources."interpret-0.6.6"
       sources."loader-utils-0.2.16"
       sources."memory-fs-0.3.0"
       sources."mkdirp-0.5.1"
-      (sources."node-libs-browser-0.6.0" // {
-        dependencies = [
-          sources."readable-stream-1.1.14"
-          sources."isarray-0.0.1"
-        ];
-      })
+      sources."node-libs-browser-0.7.0"
       sources."optimist-0.6.1"
       sources."supports-color-3.1.2"
       sources."tapable-0.1.10"
-      (sources."uglify-js-2.7.4" // {
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
         ];
@@ -28189,7 +27652,7 @@ in
           sources."async-0.9.2"
         ];
       })
-      (sources."webpack-core-0.6.8" // {
+      (sources."webpack-core-0.6.9" // {
         dependencies = [
           sources."source-map-0.4.4"
         ];
@@ -28197,7 +27660,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."big.js-3.1.3"
       sources."emojis-list-2.1.0"
-      sources."json5-0.5.0"
+      sources."json5-0.5.1"
       sources."object-assign-4.1.0"
       sources."errno-0.1.4"
       sources."readable-stream-2.2.2"
@@ -28214,26 +27677,21 @@ in
       sources."browserify-zlib-0.1.4"
       sources."buffer-4.9.1"
       sources."console-browserify-1.1.0"
-      sources."constants-browserify-0.0.1"
-      sources."crypto-browserify-3.2.8"
+      sources."constants-browserify-1.0.0"
+      sources."crypto-browserify-3.3.0"
       sources."domain-browser-1.1.7"
       sources."events-1.1.1"
-      sources."http-browserify-1.7.0"
-      sources."https-browserify-0.0.0"
-      sources."os-browserify-0.1.2"
+      sources."https-browserify-0.0.1"
+      sources."os-browserify-0.2.1"
       sources."path-browserify-0.0.0"
       sources."process-0.11.9"
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
-      (sources."stream-browserify-1.0.0" // {
-        dependencies = [
-          sources."readable-stream-1.1.14"
-          sources."isarray-0.0.1"
-        ];
-      })
-      sources."timers-browserify-1.4.2"
+      sources."stream-browserify-2.0.1"
+      sources."stream-http-2.6.1"
+      sources."timers-browserify-2.0.2"
       sources."tty-browserify-0.0.0"
-      (sources."url-0.10.3" // {
+      (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
         ];
@@ -28251,7 +27709,11 @@ in
       sources."pbkdf2-compat-2.0.1"
       sources."ripemd160-0.2.0"
       sources."sha.js-2.2.6"
-      sources."Base64-0.2.1"
+      sources."browserify-aes-0.4.0"
+      sources."builtin-status-codes-3.0.0"
+      sources."to-arraybuffer-1.0.1"
+      sources."xtend-4.0.1"
+      sources."setimmediate-1.0.5"
       sources."querystring-0.2.0"
       sources."indexof-0.0.1"
       sources."wordwrap-0.0.3"
@@ -28271,7 +27733,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -28283,7 +27745,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.15"
+      sources."fsevents-1.0.17"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -28304,7 +27766,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.4"
       sources."is-extendable-0.1.1"
@@ -28313,16 +27775,16 @@ in
       sources."is-dotfile-1.0.2"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."binary-extensions-1.7.0"
+      sources."binary-extensions-1.8.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.31"
+      sources."nan-2.5.0"
+      sources."node-pre-gyp-0.6.32"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -28341,20 +27803,23 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      (sources."gauge-2.7.2" // {
+        dependencies = [
+          sources."supports-color-0.2.0"
+        ];
+      })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -28371,13 +27836,13 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       (sources."chalk-1.1.3" // {
@@ -28394,8 +27859,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
-      sources."xtend-4.0.1"
+      sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -28404,7 +27868,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28413,7 +27877,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28424,11 +27888,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -28440,7 +27904,7 @@ in
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
       sources."ms-0.7.1"
-      sources."source-list-map-0.1.6"
+      sources."source-list-map-0.1.8"
       sources."amdefine-1.0.1"
     ];
     buildInputs = globalBuildInputs;
@@ -28467,219 +27931,4 @@ in
     };
     production = true;
   };
-  yarn = nodeEnv.buildNodePackage {
-    name = "yarn";
-    packageName = "yarn";
-    version = "0.17.8";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-0.17.8.tgz";
-      sha1 = "6a95d19aaeb891810618937db98a2080683cbbb4";
-    };
-    dependencies = [
-      sources."babel-runtime-6.18.0"
-      sources."bytes-2.4.0"
-      sources."camelcase-3.0.0"
-      sources."chalk-1.1.3"
-      sources."cmd-shim-2.0.2"
-      sources."commander-2.9.0"
-      sources."death-1.0.0"
-      sources."debug-2.3.3"
-      sources."defaults-1.0.3"
-      sources."detect-indent-4.0.0"
-      sources."diff-2.2.3"
-      sources."ini-1.3.4"
-      sources."inquirer-1.2.3"
-      sources."invariant-2.2.2"
-      sources."is-builtin-module-1.0.0"
-      sources."is-ci-1.0.10"
-      sources."leven-2.0.0"
-      sources."loud-rejection-1.6.0"
-      sources."minimatch-3.0.3"
-      sources."mkdirp-0.5.1"
-      sources."node-emoji-1.4.1"
-      sources."node-gyp-3.4.0"
-      sources."object-path-0.11.3"
-      sources."proper-lockfile-1.2.0"
-      sources."read-1.0.7"
-      sources."repeating-2.0.1"
-      sources."request-2.79.0"
-      sources."request-capture-har-1.1.4"
-      sources."rimraf-2.5.4"
-      sources."roadrunner-1.1.0"
-      sources."semver-5.3.0"
-      sources."strip-bom-2.0.0"
-      sources."tar-2.2.1"
-      sources."tar-stream-1.5.2"
-      sources."user-home-2.0.0"
-      sources."validate-npm-package-license-3.0.1"
-      sources."core-js-2.4.1"
-      sources."regenerator-runtime-0.9.6"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
-      sources."graceful-fs-4.1.11"
-      sources."graceful-readlink-1.0.1"
-      sources."ms-0.7.2"
-      sources."clone-1.0.2"
-      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."lodash-4.17.2"
-      sources."mute-stream-0.0.6"
-      sources."pinkie-promise-2.0.1"
-      sources."run-async-2.2.0"
-      sources."rx-4.1.0"
-      sources."string-width-1.0.2"
-      sources."through-2.3.8"
-      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."concat-stream-1.5.2"
-      sources."os-shim-0.1.3"
-      sources."inherits-2.0.3"
-      sources."typedarray-0.0.6"
-      sources."readable-stream-2.0.6"
-      sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
-      sources."util-deprecate-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."object-assign-4.1.0"
-      sources."pinkie-2.0.4"
-      sources."is-promise-2.1.0"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."loose-envify-1.3.0"
-      sources."js-tokens-2.0.0"
-      sources."builtin-modules-1.1.1"
-      sources."ci-info-1.0.0"
-      sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
-      sources."array-find-index-1.0.2"
-      sources."brace-expansion-1.1.6"
-      sources."balanced-match-0.4.2"
-      sources."concat-map-0.0.1"
-      sources."minimist-0.0.8"
-      sources."string.prototype.codepointat-0.2.0"
-      sources."fstream-1.0.10"
-      sources."glob-7.1.1"
-      sources."nopt-3.0.6"
-      sources."npmlog-3.1.2"
-      sources."osenv-0.1.3"
-      sources."path-array-1.0.1"
-      sources."which-1.2.12"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."wrappy-1.0.2"
-      sources."abbrev-1.0.9"
-      sources."are-we-there-yet-1.1.2"
-      sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
-      sources."set-blocking-2.0.0"
-      sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
-      sources."has-unicode-2.0.1"
-      sources."wide-align-1.1.0"
-      sources."os-homedir-1.0.2"
-      sources."array-index-1.0.0"
-      sources."es6-symbol-3.1.0"
-      sources."d-0.1.1"
-      sources."es5-ext-0.10.12"
-      sources."es6-iterator-2.0.0"
-      sources."isexe-1.1.2"
-      sources."err-code-1.1.1"
-      sources."retry-0.10.0"
-      sources."is-finite-1.0.2"
-      sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
-      sources."caseless-0.11.0"
-      sources."combined-stream-1.0.5"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.1.2"
-      sources."har-validator-2.0.6"
-      sources."hawk-3.1.3"
-      sources."http-signature-1.1.1"
-      sources."is-typedarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
-      sources."oauth-sign-0.8.2"
-      sources."qs-6.3.0"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
-      sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."is-my-json-valid-2.15.0"
-      sources."generate-function-2.0.0"
-      sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
-      sources."xtend-4.0.1"
-      sources."is-property-1.0.2"
-      sources."hoek-2.16.3"
-      sources."boom-2.10.1"
-      sources."cryptiles-2.0.5"
-      sources."sntp-1.0.9"
-      sources."assert-plus-0.2.0"
-      sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."extsprintf-1.0.2"
-      sources."json-schema-0.2.3"
-      sources."verror-1.3.6"
-      sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."getpass-0.1.6" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
-      sources."jodid25519-1.0.2"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
-      sources."punycode-1.4.1"
-      sources."is-utf8-0.2.1"
-      sources."block-stream-0.0.9"
-      sources."bl-1.1.2"
-      (sources."end-of-stream-1.1.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
-      sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.4"
-      sources."spdx-license-ids-1.2.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "<p align=\"center\">   <a href=\"https://yarnpkg.com/\">     <img alt=\"Yarn\" src=\"https://github.com/yarnpkg/assets/blob/master/yarn-kitten-full.png?raw=true\" width=\"546\">   </a> </p>";
-      homepage = "https://github.com/yarnpkg/yarn#readme";
-      license = "BSD-2-Clause";
-    };
-    production = true;
-  };
 }
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 8c1c9515926..9fc9dcf2d7b 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -62,5 +62,4 @@
 , "webdrvr"
 , "webpack"
 , "wring"
-, "yarn"
 ]

From 12b283044612c5336638fd3a825e15799c7394aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 15 Jan 2017 16:12:42 +0100
Subject: [PATCH 191/727] wireguard: 0.0.20170105 -> 0.0.20170115

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

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 489d6ac8bc6..12c5eedcb96 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170105";
+  version = "0.0.20170115";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "15iqb1a85aygbf3myw6r79i5h3vpjam1rs6xrnf5kgvgmvp91n8v";
+    sha256 = "1s7zypgbwyf3mkh9any413p0awpny0dxix8d1plsrm52k539ypvy";
   };
 
   meta = with stdenv.lib; {

From 1158eda66a7646ca8b8204ffbb3d1c55a73d0374 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 14 Jan 2017 14:36:33 +0300
Subject: [PATCH 192/727] dhcpd service: add DHCPv6 support

---
 nixos/modules/rename.nix                    |   3 +
 nixos/modules/services/networking/dhcpd.nix | 262 ++++++++++++--------
 2 files changed, 158 insertions(+), 107 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 758f229d59d..ad1ba86980d 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -164,6 +164,9 @@ with lib;
         else { addr = value inetAddr; port = value inetPort; }
     ))
 
+    # dhcpd
+    (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ])
+
     # Options that are obsolete and have no replacement.
     (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
     (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")
diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix
index d2cd00e74a1..86bcaa96f34 100644
--- a/nixos/modules/services/networking/dhcpd.nix
+++ b/nixos/modules/services/networking/dhcpd.nix
@@ -4,11 +4,10 @@ with lib;
 
 let
 
-  cfg = config.services.dhcpd;
+  cfg4 = config.services.dhcpd4;
+  cfg6 = config.services.dhcpd6;
 
-  stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
-
-  configFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "dhcpd.conf"
+  writeConfig = cfg: pkgs.writeText "dhcpd.conf"
     ''
       default-lease-time 600;
       max-lease-time 7200;
@@ -29,6 +28,154 @@ let
       }
     '';
 
+  dhcpdService = postfix: cfg: optionalAttrs cfg.enable {
+    "dhcpd${postfix}" = {
+      description = "DHCPv${postfix} server";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      preStart = ''
+        mkdir -m 755 -p ${cfg.stateDir}
+        touch ${cfg.stateDir}/dhcpd.leases
+      '';
+
+      serviceConfig =
+        let
+          configFile = if cfg.configFile != null then cfg.configFile else writeConfig cfg;
+          args = [ "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}"
+                   "-pf" "/run/dhcpd${postfix}/dhcpd.pid"
+                   "-cf" "${configFile}"
+                   "-lf" "${cfg.stateDir}/dhcpd.leases"
+                   "-user" "dhcpd" "-group" "nogroup"
+                 ] ++ cfg.extraFlags
+                   ++ cfg.interfaces;
+
+        in {
+          ExecStart = concatMapStringsSep " " escapeShellArg args;
+          Type = "forking";
+          Restart = "always";
+          RuntimeDirectory = [ "dhcpd${postfix}" ];
+          PIDFile = "/run/dhcpd${postfix}/dhcpd.pid";
+        };
+    };
+  };
+
+  machineOpts = {...}: {
+    config = {
+
+      hostName = mkOption {
+        type = types.str;
+        example = "foo";
+        description = ''
+          Hostname which is assigned statically to the machine.
+        '';
+      };
+
+      ethernetAddress = mkOption {
+        type = types.str;
+        example = "00:16:76:9a:32:1d";
+        description = ''
+          MAC address of the machine.
+        '';
+      };
+
+      ipAddress = mkOption {
+        type = types.str;
+        example = "192.168.1.10";
+        description = ''
+          IP address of the machine.
+        '';
+      };
+
+    };
+  };
+
+  dhcpConfig = postfix: {
+
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to enable the DHCPv${postfix} server.
+      '';
+    };
+
+    stateDir = mkOption {
+      type = types.path;
+      # We use /var/lib/dhcp for DHCPv4 to save backwards compatibility.
+      default = "/var/lib/dhcp${if postfix == "4" then "" else postfix}";
+      description = ''
+        State directory for the DHCP server.
+      '';
+    };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      example = ''
+        option subnet-mask 255.255.255.0;
+        option broadcast-address 192.168.1.255;
+        option routers 192.168.1.5;
+        option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1;
+        option domain-name "example.org";
+        subnet 192.168.1.0 netmask 255.255.255.0 {
+          range 192.168.1.100 192.168.1.200;
+        }
+      '';
+      description = ''
+        Extra text to be appended to the DHCP server configuration
+        file. Currently, you almost certainly need to specify something
+        there, such as the options specifying the subnet mask, DNS servers,
+        etc.
+      '';
+    };
+
+    extraFlags = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Additional command line flags to be passed to the dhcpd daemon.
+      '';
+    };
+
+    configFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        The path of the DHCP server configuration file.  If no file
+        is specified, a file is generated using the other options.
+      '';
+    };
+
+    interfaces = mkOption {
+      type = types.listOf types.str;
+      default = ["eth0"];
+      description = ''
+        The interfaces on which the DHCP server should listen.
+      '';
+    };
+
+    machines = mkOption {
+      type = types.listOf (types.submodule machineOpts);
+      default = [];
+      example = [
+        { hostName = "foo";
+          ethernetAddress = "00:16:76:9a:32:1d";
+          ipAddress = "192.168.1.10";
+        }
+        { hostName = "bar";
+          ethernetAddress = "00:19:d1:1d:c4:9a";
+          ipAddress = "192.168.1.11";
+        }
+      ];
+      description = ''
+        A list mapping Ethernet addresses to IPv${postfix} addresses for the
+        DHCP server.
+      '';
+    };
+
+  };
+
 in
 
 {
@@ -37,85 +184,15 @@ in
 
   options = {
 
-    services.dhcpd = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable the DHCP server.
-        ";
-      };
-
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        example = ''
-          option subnet-mask 255.255.255.0;
-          option broadcast-address 192.168.1.255;
-          option routers 192.168.1.5;
-          option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1;
-          option domain-name "example.org";
-          subnet 192.168.1.0 netmask 255.255.255.0 {
-            range 192.168.1.100 192.168.1.200;
-          }
-        '';
-        description = "
-          Extra text to be appended to the DHCP server configuration
-          file.  Currently, you almost certainly need to specify
-          something here, such as the options specifying the subnet
-          mask, DNS servers, etc.
-        ";
-      };
-
-      extraFlags = mkOption {
-        default = "";
-        example = "-6";
-        description = "
-          Additional command line flags to be passed to the dhcpd daemon.
-        ";
-      };
-
-      configFile = mkOption {
-        default = null;
-        description = "
-          The path of the DHCP server configuration file.  If no file
-          is specified, a file is generated using the other options.
-        ";
-      };
-
-      interfaces = mkOption {
-        default = ["eth0"];
-        description = "
-          The interfaces on which the DHCP server should listen.
-        ";
-      };
-
-      machines = mkOption {
-        default = [];
-        example = [
-          { hostName = "foo";
-            ethernetAddress = "00:16:76:9a:32:1d";
-            ipAddress = "192.168.1.10";
-          }
-          { hostName = "bar";
-            ethernetAddress = "00:19:d1:1d:c4:9a";
-            ipAddress = "192.168.1.11";
-          }
-        ];
-        description = "
-          A list mapping ethernet addresses to IP addresses for the
-          DHCP server.
-        ";
-      };
-
-    };
+    services.dhcpd4 = dhcpConfig "4";
+    services.dhcpd6 = dhcpConfig "6";
 
   };
 
 
   ###### implementation
 
-  config = mkIf config.services.dhcpd.enable {
+  config = mkIf (cfg4.enable || cfg6.enable) {
 
     users = {
       extraUsers.dhcpd = {
@@ -124,36 +201,7 @@ in
       };
     };
 
-    systemd.services.dhcpd =
-      { description = "DHCP server";
-
-        wantedBy = [ "multi-user.target" ];
-
-        after = [ "network.target" ];
-
-        path = [ pkgs.dhcp ];
-
-        preStart =
-          ''
-            mkdir -m 755 -p ${stateDir}
-
-            touch ${stateDir}/dhcpd.leases
-
-            mkdir -m 755 -p /run/dhcpd
-            chown dhcpd /run/dhcpd
-          '';
-
-        serviceConfig =
-          { ExecStart = "@${pkgs.dhcp}/sbin/dhcpd dhcpd"
-              + " -pf /run/dhcpd/dhcpd.pid -cf ${configFile}"
-              + " -lf ${stateDir}/dhcpd.leases -user dhcpd -group nogroup"
-              + " ${cfg.extraFlags}"
-              + " ${toString cfg.interfaces}";
-            Restart = "always";
-            Type = "forking";
-            PIDFile = "/run/dhcpd/dhcpd.pid";
-          };
-      };
+    systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6;
 
   };
 

From cb418318a046abc282ab14d98f469d3e2d264a58 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 14 Jan 2017 16:18:08 +0300
Subject: [PATCH 193/727] radvd: 2.13 -> 2.15

---
 pkgs/tools/networking/radvd/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix
index 1c8ef67a783..6c74b52b45f 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/pkgs/tools/networking/radvd/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }:
 
 stdenv.mkDerivation rec {
-  name = "radvd-2.13";
+  name = "radvd-${version}";
+  version = "2.15";
 
   src = fetchurl {
     url = "http://www.litech.org/radvd/dist/${name}.tar.xz";
-    sha256 = "1lzgg6zpizcldb78n5gkykjnpr7sqm4r1xy9bm4ig0chbrink4ka";
+    sha256 = "09spyj4f05rjx21v8vmyqmmj0fz1wx810s63md1vf05hyzd0v8dk";
   };
 
-  buildInputs = [ pkgconfig libdaemon bison flex check ];
-
-  hardeningEnable = [ "pie" ];
+  nativeBuildInputs = [ pkgconfig bison flex check ];
+  buildInputs = [ libdaemon ];
 
   meta = with stdenv.lib; {
     homepage = http://www.litech.org/radvd/;

From 820b4cd067c3965f219b135adf773e3ea334774d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 14 Jan 2017 19:01:19 +0300
Subject: [PATCH 194/727] firewall service: allow DHCPv6 client traffic

---
 nixos/modules/services/networking/firewall.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 1c0ea5034df..ea406864fd3 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -172,13 +172,16 @@ let
       }-j nixos-fw-accept
     ''}
 
-    # Accept all ICMPv6 messages except redirects and node
-    # information queries (type 139).  See RFC 4890, section
-    # 4.4.
     ${optionalString config.networking.enableIPv6 ''
+      # Accept all ICMPv6 messages except redirects and node
+      # information queries (type 139).  See RFC 4890, section
+      # 4.4.
       ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP
       ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP
       ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept
+
+      # Allow this host to act as a DHCPv6 client
+      ip6tables -A nixos-fw -d fe80::/64 -p udp --dport 546 -j nixos-fw-accept
     ''}
 
     ${cfg.extraCommands}

From 86755d923b201e2e450cf08af0ec8260d00b39a9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 14 Jan 2017 19:01:46 +0300
Subject: [PATCH 195/727] networking test: test IPv6 with RA and DHCPv6

---
 nixos/tests/networking.nix | 58 ++++++++++++++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 17d4a878d3a..83103f35d48 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -10,29 +10,61 @@ let
       vlanIfs = range 1 (length config.virtualisation.vlans);
     in {
       virtualisation.vlans = [ 1 2 3 ];
+      boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true;
       networking = {
         useDHCP = false;
         useNetworkd = networkd;
         firewall.allowPing = true;
+        firewall.checkReversePath = true;
+        firewall.allowedUDPPorts = [ 547 ];
         interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n:
           nameValuePair "eth${toString n}" {
             ipAddress = "192.168.${toString n}.1";
             prefixLength = 24;
+            ipv6Address = "fd00:1234:5678:${toString n}::1";
+            ipv6PrefixLength = 64;
           })));
       };
-      services.dhcpd = {
+      services.dhcpd4 = {
         enable = true;
         interfaces = map (n: "eth${toString n}") vlanIfs;
         extraConfig = ''
-          option subnet-mask 255.255.255.0;
+          authoritative;
         '' + flip concatMapStrings vlanIfs (n: ''
           subnet 192.168.${toString n}.0 netmask 255.255.255.0 {
-            option broadcast-address 192.168.${toString n}.255;
             option routers 192.168.${toString n}.1;
+            # XXX: technically it's _not guaranteed_ that IP addresses will be
+            # issued from the first item in range onwards! We assume that in
+            # our tests however.
             range 192.168.${toString n}.2 192.168.${toString n}.254;
           }
         '');
       };
+      services.radvd = {
+        enable = true;
+        config = flip concatMapStrings vlanIfs (n: ''
+          interface eth${toString n} {
+            AdvSendAdvert on;
+            AdvManagedFlag on;
+            AdvOtherConfigFlag on;
+
+            prefix fd00:1234:5678:${toString n}::/64 {
+              AdvAutonomous off;
+            };
+          };
+        '');
+      };
+      services.dhcpd6 = {
+        enable = true;
+        interfaces = map (n: "eth${toString n}") vlanIfs;
+        extraConfig = ''
+          authoritative;
+        '' + flip concatMapStrings vlanIfs (n: ''
+          subnet6 fd00:1234:5678:${toString n}::/64 {
+            range6 fd00:1234:5678:${toString n}::2 fd00:1234:5678:${toString n}::2;
+          }
+        '');
+      };
     };
 
   testCases = {
@@ -108,8 +140,14 @@ let
           useNetworkd = networkd;
           firewall.allowPing = true;
           useDHCP = true;
-          interfaces.eth1.ip4 = mkOverride 0 [ ];
-          interfaces.eth2.ip4 = mkOverride 0 [ ];
+          interfaces.eth1 = {
+            ip4 = mkOverride 0 [ ];
+            ip6 = mkOverride 0 [ ];
+          };
+          interfaces.eth2 = {
+            ip4 = mkOverride 0 [ ];
+            ip6 = mkOverride 0 [ ];
+          };
         };
       };
       testScript = { nodes, ... }:
@@ -121,21 +159,31 @@ let
 
           # Wait until we have an ip address on each interface
           $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
+          $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'");
           $client->waitUntilSucceeds("ip addr show dev eth2 | grep -q '192.168.2'");
+          $client->waitUntilSucceeds("ip addr show dev eth2 | grep -q 'fd00:1234:5678:2:'");
 
           # Test vlan 1
           $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
           $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1");
+          $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2");
 
           $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
           $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1");
+          $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2");
 
           # Test vlan 2
           $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
           $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
+          $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1");
+          $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2");
 
           $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
           $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
+          $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1");
+          $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2");
         '';
     };
     dhcpOneIf = {

From 5d89ad044789ebbad7d5242169fee287a8fdf8a9 Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <loskutov@google.com>
Date: Sun, 15 Jan 2017 20:07:21 +0300
Subject: [PATCH 196/727] datagrip: 2016.3 -> 2016.3.2

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index cef1ab8e19b..204fd60d2bc 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -340,12 +340,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2016.3";
+    version = "2016.3.2";
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "10nah7v330qrrczzz5jldnr0k7w2xzljiny32gm9pqmjbl0i70il";
+      sha256 = "19njb6i7nl6szql7cy99jmig59b304c6im3988p1dd8dj2j6csv3";
     };
     wmClass = "jetbrains-datagrip";
   };

From a848207c161419b89b1e6f079f2edd6b0163d9bf Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 15 Jan 2017 17:42:25 +0100
Subject: [PATCH 197/727] libav_0_8: 0.8.17 -> 0.8.19

---
 pkgs/development/libraries/libav/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 60535edfea6..37ebf972e02 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -26,7 +26,7 @@ with { inherit (stdenv.lib) optional optionals hasPrefix; };
 
 let
   result = {
-    libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714";
+    libav_0_8 = libavFun "0.8.19" "c79350d6fa071fcd66448ffc713fe3b9754876a8";
     libav_11  = libavFun  "11.8"  "y18hmrzy7jqq7h9ys54nrr4s49mkzsfh";
   };
 

From 8afb65ff6601e837b190423b0cdbbd18f3fa94b8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 15 Jan 2017 17:43:00 +0100
Subject: [PATCH 198/727] libav_12: init at 12

---
 pkgs/development/libraries/libav/default.nix | 1 +
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 37ebf972e02..7bf969b78da 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -28,6 +28,7 @@ let
   result = {
     libav_0_8 = libavFun "0.8.19" "c79350d6fa071fcd66448ffc713fe3b9754876a8";
     libav_11  = libavFun  "11.8"  "y18hmrzy7jqq7h9ys54nrr4s49mkzsfh";
+    libav_12  = libavFun "12"     "4ecde7274621c82a6882b7614d907b28de25cc4e";
   };
 
   libavFun = version : sha1 : stdenv.mkDerivation rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4bcbf0260d7..90be53fc3a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7802,7 +7802,7 @@ in
 
   libav = libav_11; # branch 11 is API-compatible with branch 10
   libav_all = callPackage ../development/libraries/libav { };
-  inherit (libav_all) libav_0_8 libav_11;
+  inherit (libav_all) libav_0_8 libav_11 libav_12;
 
   libavc1394 = callPackage ../development/libraries/libavc1394 { };
 

From e14a04aa3b24fcca602f6108215ea1bd51e56350 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 15 Jan 2017 17:43:25 +0100
Subject: [PATCH 199/727] atlassian-jira: 7.2.4 -> 7.3.0

---
 pkgs/servers/atlassian/jira.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index d2b3cc1c419..d0a278d2ef0 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.4";
+  version = "7.3.0";
 
   src = fetchurl {
     url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "0admsji5wsclrjdaqyibdk74fmazhz35d4fgbrm173fgqm6p2mqa";
+    sha256 = "0i2r60gzs382i6b9r9cx60j6d1xnr4hrj773d4mbbf8r7sg1n8r0";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

From 749fa3d775ea746ac2c5bd63a3b5e1c47e26469f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 15 Jan 2017 18:23:13 +0100
Subject: [PATCH 200/727] atlassian-confluence: 6.0.1 -> 6.0.3

---
 pkgs/servers/atlassian/confluence.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index 5a1c473a43d..579cd9f4a0e 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 = "6.0.1";
+  version = "6.0.3";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
-    sha256 = "15af05h0h92z4zw546s7wwglvl0argzrj9w588gb96j5dni9lka4";
+    sha256 = "0dg5sb2qv2xskvhlrxmidl25kyg1w0dp31a3k8f3las72fhmkpb7";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" ];

From 7a4b15020a1cbe4a51a3f4c9e96590bcda57c01c Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 13 Jan 2017 11:53:56 +0100
Subject: [PATCH 201/727] ed: 1.13 -> 1.14.1

See http://lists.gnu.org/archive/html/info-gnu/2017-01/msg00004.html
for full release announcement.
---
 pkgs/applications/editors/ed/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 9cb644cc931..ec56667a4ba 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -1,7 +1,8 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "ed-1.13";
+  name = "ed-${version}";
+  version = "1.14.1";
 
   src = fetchurl {
     # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
@@ -9,13 +10,13 @@ stdenv.mkDerivation rec {
     # When updating, please make sure the sources pulled match those upstream by
     # Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum`
     # in the resulting directory
-    urls = let file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror
+    urls = let file_sha512 = "84396fe4e4f0bf0b591037277ff8679a08b2883207628aaa387644ad83ca5fbdaa74a581f33310e28222d2fea32a0b8ba37e579597cc7d6145df6eb956ea75db";
       in [
         ("http://pkgs.fedoraproject.org/repo/extras/ed"
-          + "/${name}.tar.bz2/${file_md5}/${name}.tar.bz2")
+          + "/${name}.tar.bz2/sha512/${file_sha512}/${name}.tar.bz2")
         "http://fossies.org/linux/privat/${name}.tar.bz2"
       ];
-    sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j";
+    sha256 = "1pk6qa4sr7qc6vgm34hjx44hsh8x2bwaxhdi78jhsacnn4zwi7bw";
   };
 
   /* FIXME: Tests currently fail on Darwin:

From 9c45e208239d618355d4f8e092dcd626c8b3d263 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 15 Jan 2017 19:34:16 +0200
Subject: [PATCH 202/727] dtc: Fix build after flex upgrade

http://hydra.nixos.org/build/46059338
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90be53fc3a0..589e8d8085f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1487,7 +1487,7 @@ in
 
   dtach = callPackage ../tools/misc/dtach { };
 
-  dtc = callPackage ../development/compilers/dtc { };
+  dtc = callPackage ../development/compilers/dtc { flex = flex_2_6_1; };
 
   dub = callPackage ../development/tools/build-managers/dub { };
 

From 99ca11810a037d18dc1990f4003b0d1d6c275e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Thu, 12 Jan 2017 16:28:17 +0100
Subject: [PATCH 203/727] vim plugins: added vim-speeddating

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 6a4105c7323..b1dc056bd12 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1322,6 +1322,17 @@ rec {
 
   };
 
+  vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-speeddating-2015-01-24";
+    src = fetchgit {
+      url = "git://github.com/tpope/vim-speeddating";
+      rev = "426c792e479f6e1650a6996c683943a09344c21e";
+      sha256 = "1i8pndds1lk5afxl6nwsnl4vzszh0qxgqx7x11fp3vqw27c5bwn8";
+    };
+    dependencies = [];
+
+  };
+
   hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "hasksyn-2014-09-03";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 3809ea8fc01..a2128acd287 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -100,6 +100,7 @@
 "github:tomasr/molokai"
 "github:tpope/vim-eunuch"
 "github:tpope/vim-repeat"
+"github:tpope/vim-speeddating"
 "github:travitch/hasksyn"
 "github:twinside/vim-haskellconceal"
 "github:valloric/youcompleteme"

From f9a9ea920a3bf225a932220e6bce0ba0f947542d Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 15 Jan 2017 18:34:00 +0000
Subject: [PATCH 204/727] Revert "nodePackages.yarn: remove package"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 986dba716f8244304e5e9afb92924eb543fc5596.

Fixes:

    error: anonymous function at /home/travis/build/NixOS/nixpkgs/pkgs/development/node-packages/node-env.nix:3:1 called with unexpected argument ‘python’, at /home/travis/build/NixOS/nixpkgs/pkgs/development/node-packages/composition-v6.nix:8:13

This commit is doing a lot more than removing the yarn package, it also
upgrades a ton of other packages.
---
 .../node-packages/composition-v4.nix          |    4 +-
 .../node-packages/composition-v6.nix          |    4 +-
 .../node-packages/node-packages-v4.nix        | 6600 ++++++++++-------
 .../node-packages/node-packages-v6.nix        | 4891 ++++++------
 .../node-packages/node-packages.json          |    1 +
 5 files changed, 6789 insertions(+), 4711 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index 1c0f5f0626e..ad8c76b4e6e 100644
--- a/pkgs/development/node-packages/composition-v4.nix
+++ b/pkgs/development/node-packages/composition-v4.nix
@@ -6,11 +6,11 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv python utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in
 import ./node-packages-v4.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index 289a8ab1201..57bd88bd2a1 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -6,11 +6,11 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv python utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in
 import ./node-packages-v6.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 356228cca0b..20197d1833e 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -76,13 +76,13 @@ let
         sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3";
       };
     };
-    "resolve-1.2.0" = {
+    "resolve-1.1.7" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.2.0";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz";
-        sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
     "global-paths-0.1.2" = {
@@ -274,13 +274,13 @@ let
         sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe";
       };
     };
-    "global-prefix-0.1.5" = {
+    "global-prefix-0.1.4" = {
       name = "global-prefix";
       packageName = "global-prefix";
-      version = "0.1.5";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz";
-        sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f";
+        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.4.tgz";
+        sha1 = "05158db1cde2dd491b455e290eb3ab8bfc45c6e1";
       };
     };
     "is-windows-0.2.0" = {
@@ -292,15 +292,6 @@ let
         sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c";
       };
     };
-    "homedir-polyfill-1.0.1" = {
-      name = "homedir-polyfill";
-      packageName = "homedir-polyfill";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz";
-        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
-      };
-    };
     "ini-1.3.4" = {
       name = "ini";
       packageName = "ini";
@@ -310,6 +301,15 @@ let
         sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
       };
     };
+    "osenv-0.1.3" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz";
+        sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217";
+      };
+    };
     "which-1.2.12" = {
       name = "which";
       packageName = "which";
@@ -319,13 +319,22 @@ let
         sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
       };
     };
-    "parse-passwd-1.0.0" = {
-      name = "parse-passwd";
-      packageName = "parse-passwd";
-      version = "1.0.0";
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz";
-        sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+      };
+    };
+    "os-tmpdir-1.0.2" = {
+      name = "os-tmpdir";
+      packageName = "os-tmpdir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
       };
     };
     "isexe-1.1.2" = {
@@ -400,13 +409,13 @@ let
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-arm-cdn-1.0.0" = {
+    "azure-arm-cdn-0.2.1" = {
       name = "azure-arm-cdn";
       packageName = "azure-arm-cdn";
-      version = "1.0.0";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz";
-        sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-0.2.1.tgz";
+        sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a";
       };
     };
     "azure-arm-commerce-0.2.0" = {
@@ -418,31 +427,13 @@ let
         sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
-    "azure-arm-compute-0.19.1" = {
+    "azure-arm-compute-0.19.0" = {
       name = "azure-arm-compute";
       packageName = "azure-arm-compute";
-      version = "0.19.1";
+      version = "0.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz";
-        sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd";
-      };
-    };
-    "azure-arm-datalake-analytics-1.0.1-preview" = {
-      name = "azure-arm-datalake-analytics";
-      packageName = "azure-arm-datalake-analytics";
-      version = "1.0.1-preview";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.1-preview.tgz";
-        sha1 = "75461904000427e12ce11d634d74c052c86de994";
-      };
-    };
-    "azure-arm-datalake-store-1.0.1-preview" = {
-      name = "azure-arm-datalake-store";
-      packageName = "azure-arm-datalake-store";
-      version = "1.0.1-preview";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.1-preview.tgz";
-        sha1 = "bd07cbeb5eb355a00b7bed69e198a1a968115dd5";
+        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.0.tgz";
+        sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e";
       };
     };
     "azure-arm-hdinsight-0.2.2" = {
@@ -544,6 +535,24 @@ let
         sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02";
       };
     };
+    "azure-arm-datalake-analytics-0.4.3" = {
+      name = "azure-arm-datalake-analytics";
+      packageName = "azure-arm-datalake-analytics";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-0.4.3.tgz";
+        sha1 = "10c81e59d3064289a42ab37fea805a334333ed91";
+      };
+    };
+    "azure-arm-datalake-store-0.4.2" = {
+      name = "azure-arm-datalake-store";
+      packageName = "azure-arm-datalake-store";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-0.4.2.tgz";
+        sha1 = "479f4a28986c9737b8fef14090c0c7ccc33cb123";
+      };
+    };
     "azure-arm-devtestlabs-0.1.0" = {
       name = "azure-arm-devtestlabs";
       packageName = "azure-arm-devtestlabs";
@@ -634,13 +643,13 @@ let
         sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54";
       };
     };
-    "azure-arm-resource-1.6.1-preview" = {
+    "azure-arm-resource-1.4.5-preview" = {
       name = "azure-arm-resource";
       packageName = "azure-arm-resource";
-      version = "1.6.1-preview";
+      version = "1.4.5-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz";
-        sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
+        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.5-preview.tgz";
+        sha1 = "166934783752607e9a4128ea0ad715b9b7a9015f";
       };
     };
     "azure-arm-storage-0.13.1-preview" = {
@@ -733,13 +742,13 @@ let
         sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e";
       };
     };
-    "applicationinsights-0.16.0" = {
+    "applicationinsights-0.15.12" = {
       name = "applicationinsights";
       packageName = "applicationinsights";
-      version = "0.16.0";
+      version = "0.15.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
-        sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3";
+        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.15.12.tgz";
+        sha1 = "d03f282da9424f33729eb7da8279e8e8a20dc7fc";
       };
     };
     "caller-id-0.1.0" = {
@@ -859,13 +868,13 @@ let
         sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
       };
     };
-    "moment-2.17.1" = {
+    "moment-2.17.0" = {
       name = "moment";
       packageName = "moment";
-      version = "2.17.1";
+      version = "2.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
-        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
+        url = "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz";
+        sha1 = "a4c292e02aac5ddefb29a6eed24f51938dd3b74f";
       };
     };
     "ms-rest-1.15.2" = {
@@ -895,6 +904,15 @@ let
         sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
       };
     };
+    "node-uuid-1.2.0" = {
+      name = "node-uuid";
+      packageName = "node-uuid";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz";
+        sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b";
+      };
+    };
     "omelette-0.1.0" = {
       name = "omelette";
       packageName = "omelette";
@@ -1021,15 +1039,6 @@ let
         sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
       };
     };
-    "uuid-3.0.1" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
-        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
-      };
-    };
     "validator-5.2.0" = {
       name = "validator";
       packageName = "validator";
@@ -1111,13 +1120,13 @@ let
         sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
       };
     };
-    "xmldom-0.1.27" = {
+    "xmldom-0.1.22" = {
       name = "xmldom";
       packageName = "xmldom";
-      version = "0.1.27";
+      version = "0.1.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz";
-        sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
+        sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
       };
     };
     "xpath.js-1.0.7" = {
@@ -1138,13 +1147,13 @@ let
         sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb";
       };
     };
-    "jwa-1.1.5" = {
+    "jwa-1.1.4" = {
       name = "jwa";
       packageName = "jwa";
-      version = "1.1.5";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz";
-        sha1 = "a0552ce0220742cd52e153774a32905c30e756e5";
+        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz";
+        sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e";
       };
     };
     "safe-buffer-5.0.1" = {
@@ -1165,13 +1174,22 @@ let
         sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
       };
     };
-    "ecdsa-sig-formatter-1.0.9" = {
+    "ecdsa-sig-formatter-1.0.7" = {
       name = "ecdsa-sig-formatter";
       packageName = "ecdsa-sig-formatter";
-      version = "1.0.9";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz";
-        sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1";
+        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.7.tgz";
+        sha1 = "3137e976a1d6232517e2513e04e32f79bcbdf126";
+      };
+    };
+    "base64-url-1.3.3" = {
+      name = "base64-url";
+      packageName = "base64-url";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
+        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
       };
     };
     "xml2js-0.2.7" = {
@@ -1813,13 +1831,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.14" = {
+    "mime-types-2.1.13" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.14";
+      version = "2.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
-        sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz";
+        sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -1885,13 +1903,13 @@ let
         sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
       };
     };
-    "lodash-4.17.4" = {
+    "lodash-4.17.2" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.4";
+      version = "4.17.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
-        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz";
+        sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42";
       };
     };
     "chalk-1.1.3" = {
@@ -1975,13 +1993,13 @@ let
         sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
       };
     };
-    "ansi-regex-2.1.1" = {
+    "ansi-regex-2.0.0" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
-      version = "2.1.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
-        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
+        sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
       };
     };
     "graceful-readlink-1.0.1" = {
@@ -2011,13 +2029,13 @@ let
         sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
       };
     };
-    "jsonpointer-4.0.1" = {
+    "jsonpointer-4.0.0" = {
       name = "jsonpointer";
       packageName = "jsonpointer";
-      version = "4.0.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
-        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz";
+        sha1 = "6661e161d2fc445f19f98430231343722e1fcbd5";
       };
     };
     "xtend-4.0.1" = {
@@ -2101,13 +2119,13 @@ let
         sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252";
       };
     };
-    "sshpk-1.10.2" = {
+    "sshpk-1.10.1" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.10.2";
+      version = "1.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz";
-        sha1 = "d5a804ce22695515638e798dbe23273de070a5fa";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz";
+        sha1 = "30e1a5d329244974a1af61511339d595af6638b0";
       };
     };
     "extsprintf-1.0.2" = {
@@ -2155,13 +2173,13 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "dashdash-1.14.1" = {
+    "dashdash-1.14.0" = {
       name = "dashdash";
       packageName = "dashdash";
-      version = "1.14.1";
+      version = "1.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
-        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz";
+        sha1 = "29e486c5418bf0f356034a993d51686a33e84141";
       };
     };
     "getpass-0.1.6" = {
@@ -2182,13 +2200,13 @@ let
         sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
       };
     };
-    "tweetnacl-0.14.5" = {
+    "tweetnacl-0.14.3" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
-      version = "0.14.5";
+      version = "0.14.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
-        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz";
+        sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d";
       };
     };
     "jodid25519-1.0.2" = {
@@ -2218,13 +2236,13 @@ let
         sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
       };
     };
-    "mime-db-1.26.0" = {
+    "mime-db-1.25.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.26.0";
+      version = "1.25.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
-        sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz";
+        sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392";
       };
     };
     "punycode-1.4.1" = {
@@ -2281,13 +2299,13 @@ let
         sha1 = "0c989774f2870c69378aa665648cdc60f343aa53";
       };
     };
-    "concat-stream-1.6.0" = {
+    "concat-stream-1.5.2" = {
       name = "concat-stream";
       packageName = "concat-stream";
-      version = "1.6.0";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz";
-        sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
+        sha1 = "708978624d856af41a5a741defdd261da752c266";
       };
     };
     "http-response-object-1.1.0" = {
@@ -2317,24 +2335,6 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "readable-stream-2.2.2" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
-        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
-      };
-    };
-    "buffer-shims-1.0.0" = {
-      name = "buffer-shims";
-      packageName = "buffer-shims";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
-        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
-      };
-    };
     "http-basic-2.5.1" = {
       name = "http-basic";
       packageName = "http-basic";
@@ -2371,15 +2371,6 @@ let
         sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
       };
     };
-    "os-homedir-1.0.2" = {
-      name = "os-homedir";
-      packageName = "os-homedir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
-        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
-      };
-    };
     "async-1.0.0" = {
       name = "async";
       packageName = "async";
@@ -2407,13 +2398,13 @@ let
         sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
       };
     };
-    "mute-stream-0.0.7" = {
+    "mute-stream-0.0.6" = {
       name = "mute-stream";
       packageName = "mute-stream";
-      version = "0.0.7";
+      version = "0.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz";
-        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
+        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
       };
     };
     "argparse-1.0.4" = {
@@ -2704,6 +2695,15 @@ let
         sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
       };
     };
+    "readable-stream-2.2.2" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
+        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
+      };
+    };
     "stream-shift-1.0.0" = {
       name = "stream-shift";
       packageName = "stream-shift";
@@ -2722,6 +2722,15 @@ let
         sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
       };
     };
+    "buffer-shims-1.0.0" = {
+      name = "buffer-shims";
+      packageName = "buffer-shims";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
+        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
+      };
+    };
     "camelcase-keys-2.1.0" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -2830,13 +2839,13 @@ let
         sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
       };
     };
-    "signal-exit-3.0.2" = {
+    "signal-exit-3.0.1" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.2";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz";
+        sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81";
       };
     };
     "array-find-index-1.0.2" = {
@@ -3127,13 +3136,13 @@ let
         sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
       };
     };
-    "debug-2.6.0" = {
+    "debug-2.3.3" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.0";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
-        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
+        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
+        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
       };
     };
     "ms-0.7.2" = {
@@ -3145,15 +3154,6 @@ let
         sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
       };
     };
-    "os-tmpdir-1.0.2" = {
-      name = "os-tmpdir";
-      packageName = "os-tmpdir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
-        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
-      };
-    };
     "rimraf-2.2.8" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -3163,22 +3163,22 @@ let
         sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
       };
     };
-    "JSONStream-1.3.0" = {
+    "JSONStream-1.2.1" = {
       name = "JSONStream";
       packageName = "JSONStream";
-      version = "1.3.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz";
-        sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
+        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
       };
     };
-    "assert-1.4.1" = {
+    "assert-1.3.0" = {
       name = "assert";
       packageName = "assert";
-      version = "1.4.1";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
-        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
+        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
+        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
       };
     };
     "browser-pack-6.0.2" = {
@@ -3226,15 +3226,6 @@ let
         sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4";
       };
     };
-    "concat-stream-1.5.2" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
-        sha1 = "708978624d856af41a5a741defdd261da752c266";
-      };
-    };
     "console-browserify-1.1.0" = {
       name = "console-browserify";
       packageName = "console-browserify";
@@ -3307,6 +3298,15 @@ let
         sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
       };
     };
+    "glob-5.0.15" = {
+      name = "glob";
+      packageName = "glob";
+      version = "5.0.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
+        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
+      };
+    };
     "has-1.0.1" = {
       name = "has";
       packageName = "has";
@@ -3442,13 +3442,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.6.1" = {
+    "stream-http-2.5.0" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.6.1";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.1.tgz";
-        sha1 = "7d20fcdfebc16b16e4174e31dd94cd9c70f10e89";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz";
+        sha1 = "585eee513217ed98fe199817e7313b6f772a6802";
       };
     };
     "subarg-1.0.0" = {
@@ -3469,13 +3469,13 @@ let
         sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710";
       };
     };
-    "through2-2.0.3" = {
+    "through2-2.0.1" = {
       name = "through2";
       packageName = "through2";
-      version = "2.0.3";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz";
-        sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be";
+        url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz";
+        sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9";
       };
     };
     "timers-browserify-1.4.2" = {
@@ -3586,15 +3586,6 @@ let
         sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
       };
     };
-    "resolve-1.1.7" = {
-      name = "resolve";
-      packageName = "resolve";
-      version = "1.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
-        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
-      };
-    };
     "pako-0.2.9" = {
       name = "pako";
       packageName = "pako";
@@ -3829,13 +3820,13 @@ let
         sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
       };
     };
-    "asn1.js-4.9.1" = {
+    "asn1.js-4.9.0" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "4.9.1";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz";
-        sha1 = "48ba240b45a9280e94748990ba597d216617fd40";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz";
+        sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a";
       };
     };
     "ripemd160-1.0.1" = {
@@ -4000,13 +3991,13 @@ let
         sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
       };
     };
-    "builtin-status-codes-3.0.0" = {
+    "builtin-status-codes-2.0.0" = {
       name = "builtin-status-codes";
       packageName = "builtin-status-codes";
-      version = "3.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
-        sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
+        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz";
+        sha1 = "6f22003baacf003ccd287afe6872151fddc58579";
       };
     };
     "to-arraybuffer-1.0.1" = {
@@ -4072,13 +4063,13 @@ let
         sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395";
       };
     };
-    "castv2-client-1.2.0" = {
+    "castv2-client-1.1.2" = {
       name = "castv2-client";
       packageName = "castv2-client";
-      version = "1.2.0";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.2.0.tgz";
-        sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544";
+        url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.1.2.tgz";
+        sha1 = "7865eac9181cd1f419fdcee448b5793706f853ad";
       };
     };
     "chalk-1.0.0" = {
@@ -4477,13 +4468,13 @@ let
         sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc";
       };
     };
-    "numeral-1.5.6" = {
+    "numeral-1.5.5" = {
       name = "numeral";
       packageName = "numeral";
-      version = "1.5.6";
+      version = "1.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz";
-        sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f";
+        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.5.tgz";
+        sha1 = "b7515d64533626124e9196cfc68c8fd5b2dee208";
       };
     };
     "open-0.0.5" = {
@@ -4549,13 +4540,13 @@ let
         sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
       };
     };
-    "mdns-js-0.5.3" = {
+    "mdns-js-0.5.1" = {
       name = "mdns-js";
       packageName = "mdns-js";
-      version = "0.5.3";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.3.tgz";
-        sha1 = "add2958d399319b6d8f2dde29bebac5e845e8b6d";
+        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz";
+        sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec";
       };
     };
     "plist-2.0.1" = {
@@ -4711,13 +4702,13 @@ let
         sha1 = "106df57e0e509bafa6756e544d88205e52be33a6";
       };
     };
-    "simple-get-2.4.0" = {
+    "simple-get-2.3.0" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "2.4.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz";
-        sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.3.0.tgz";
+        sha1 = "c5fdfcce1e516ad4b2ce7b7c2bd2d710502d8ac9";
       };
     };
     "thirty-two-1.0.2" = {
@@ -4747,22 +4738,22 @@ let
         sha1 = "717b36fc61c4e9cb3755f0a9f90996ee5b46f0d0";
       };
     };
-    "simple-sha1-2.1.0" = {
+    "simple-sha1-2.0.8" = {
       name = "simple-sha1";
       packageName = "simple-sha1";
-      version = "2.1.0";
+      version = "2.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz";
-        sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3";
+        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.0.8.tgz";
+        sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f";
       };
     };
-    "rusha-0.8.5" = {
+    "rusha-0.8.4" = {
       name = "rusha";
       packageName = "rusha";
-      version = "0.8.5";
+      version = "0.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rusha/-/rusha-0.8.5.tgz";
-        sha1 = "a30ae9bd5a4e80fbc96fbe7a13232b944be24f84";
+        url = "https://registry.npmjs.org/rusha/-/rusha-0.8.4.tgz";
+        sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b";
       };
     };
     "simple-concat-1.0.0" = {
@@ -4927,13 +4918,13 @@ let
         sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854";
       };
     };
-    "random-access-file-1.4.0" = {
+    "random-access-file-1.3.1" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.4.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz";
-        sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.3.1.tgz";
+        sha1 = "5302a65a7ff2b83c50e18d79bf4cd619b520ac8d";
       };
     };
     "run-parallel-1.1.6" = {
@@ -5197,13 +5188,13 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.1.3" = {
+    "simple-peer-6.0.7" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.1.3";
+      version = "6.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.1.3.tgz";
-        sha1 = "c9a8baf72a36a4d4f05eab3df0db50d78a953583";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.0.7.tgz";
+        sha1 = "ccc5133b7e75e154ab17b9ccdbec91e970cc2278";
       };
     };
     "simple-websocket-4.1.0" = {
@@ -5539,13 +5530,13 @@ let
         sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c";
       };
     };
-    "exit-on-epipe-1.0.0" = {
+    "exit-on-epipe-0.1.0" = {
       name = "exit-on-epipe";
       packageName = "exit-on-epipe";
-      version = "1.0.0";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.0.tgz";
-        sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc";
+        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.1.0.tgz";
+        sha1 = "aa2f0155b78b34fe60dd2b462e84637ba5ed0697";
       };
     };
     "xmlbuilder-4.2.1" = {
@@ -5575,13 +5566,13 @@ let
         sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33";
       };
     };
-    "insight-0.8.4" = {
+    "insight-0.8.3" = {
       name = "insight";
       packageName = "insight";
-      version = "0.8.4";
+      version = "0.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz";
-        sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884";
+        url = "https://registry.npmjs.org/insight/-/insight-0.8.3.tgz";
+        sha1 = "72d1e1b4da6c8b405db25043f9d86900f8cbf59d";
       };
     };
     "nopt-3.0.1" = {
@@ -5656,24 +5647,6 @@ let
         sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
       };
     };
-    "glob-5.0.15" = {
-      name = "glob";
-      packageName = "glob";
-      version = "5.0.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
-        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
-      };
-    };
-    "osenv-0.1.4" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz";
-        sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644";
-      };
-    };
     "plist-1.2.0" = {
       name = "plist";
       packageName = "plist";
@@ -5782,13 +5755,13 @@ let
         sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980";
       };
     };
-    "cordova-serve-1.0.1" = {
+    "cordova-serve-1.0.0" = {
       name = "cordova-serve";
       packageName = "cordova-serve";
-      version = "1.0.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.1.tgz";
-        sha1 = "895c7fb4bbe630fa1c89feaf6d74779cbff66da7";
+        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.0.tgz";
+        sha1 = "7fa1c40183d2b82adb792f9cb9e0d554a23eed85";
       };
     };
     "dep-graph-1.1.0" = {
@@ -5962,13 +5935,13 @@ let
         sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26";
       };
     };
-    "shelljs-0.7.6" = {
+    "shelljs-0.7.5" = {
       name = "shelljs";
       packageName = "shelljs";
-      version = "0.7.6";
+      version = "0.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz";
-        sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad";
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz";
+        sha1 = "2eef7a50a21e1ccf37da00df767ec69e30ad0675";
       };
     };
     "interpret-1.0.1" = {
@@ -6007,15 +5980,6 @@ let
         sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae";
       };
     };
-    "assert-1.3.0" = {
-      name = "assert";
-      packageName = "assert";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
-        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
-      };
-    };
     "compression-1.6.2" = {
       name = "compression";
       packageName = "compression";
@@ -6250,13 +6214,13 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "proxy-addr-1.1.3" = {
+    "proxy-addr-1.1.2" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "1.1.3";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.3.tgz";
-        sha1 = "dc97502f5722e888467b3fa2297a7b1ff47df074";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz";
+        sha1 = "b4cc5f22610d9535824c123aef9d3cf73c40ba37";
       };
     };
     "qs-6.2.0" = {
@@ -6331,6 +6295,15 @@ let
         sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
       };
     };
+    "ipaddr.js-1.1.1" = {
+      name = "ipaddr.js";
+      packageName = "ipaddr.js";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz";
+        sha1 = "c791d95f52b29c1247d5df80ada39b8a73647230";
+      };
+    };
     "destroy-1.0.4" = {
       name = "destroy";
       packageName = "destroy";
@@ -6628,22 +6601,22 @@ let
         sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
       };
     };
-    "lockfile-1.0.3" = {
+    "lockfile-1.0.2" = {
       name = "lockfile";
       packageName = "lockfile";
-      version = "1.0.3";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz";
-        sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79";
+        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz";
+        sha1 = "97e1990174f696cbe0a3acd58a43b84aa30c7c83";
       };
     };
-    "lru-cache-4.0.2" = {
+    "lru-cache-4.0.1" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "4.0.2";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz";
-        sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz";
+        sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be";
       };
     };
     "node-gyp-3.4.0" = {
@@ -6754,13 +6727,13 @@ let
         sha1 = "d0def882952b8de3f67eba5e91199661271f41f4";
       };
     };
-    "retry-0.10.1" = {
+    "retry-0.10.0" = {
       name = "retry";
       packageName = "retry";
-      version = "0.10.1";
+      version = "0.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
-        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
+        url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz";
+        sha1 = "649e15ca408422d98318161935e7f7d652d435dd";
       };
     };
     "sha-2.0.1" = {
@@ -7321,13 +7294,13 @@ let
         sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
       };
     };
-    "write-file-atomic-1.3.1" = {
+    "write-file-atomic-1.2.0" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
-      version = "1.3.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.1.tgz";
-        sha1 = "7d45ba32316328dd1ec7d90f60ebc0d845bb759a";
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
+        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
       };
     };
     "xdg-basedir-2.0.0" = {
@@ -7474,6 +7447,15 @@ let
         sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
       };
     };
+    "uuid-3.0.0" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
+        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
+      };
+    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -7600,22 +7582,13 @@ let
         sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
       };
     };
-    "clone-2.1.0" = {
-      name = "clone";
-      packageName = "clone";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz";
-        sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6";
-      };
-    };
-    "parserlib-1.1.1" = {
+    "parserlib-1.0.0" = {
       name = "parserlib";
       packageName = "parserlib";
-      version = "1.1.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz";
-        sha1 = "a64cfa724062434fdfc351c9a4ec2d92b94c06f4";
+        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.0.0.tgz";
+        sha1 = "88340e7e8d95bac9e09236742eef53bec1e4b30f";
       };
     };
     "bluebird-2.9.9" = {
@@ -8015,13 +7988,13 @@ let
         sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       };
     };
-    "nan-2.5.0" = {
+    "nan-2.4.0" = {
       name = "nan";
       packageName = "nan";
-      version = "2.5.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
-        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
+        url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz";
+        sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232";
       };
     };
     "jsonparse-0.0.6" = {
@@ -8378,22 +8351,22 @@ let
         sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
       };
     };
-    "ndjson-1.5.0" = {
+    "ndjson-1.4.3" = {
       name = "ndjson";
       packageName = "ndjson";
-      version = "1.5.0";
+      version = "1.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz";
-        sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8";
+        url = "https://registry.npmjs.org/ndjson/-/ndjson-1.4.3.tgz";
+        sha1 = "7aa026fe3ab38a7da1a2b4ad07b1008e733eb239";
       };
     };
-    "pump-1.0.2" = {
+    "pump-1.0.1" = {
       name = "pump";
       packageName = "pump";
-      version = "1.0.2";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz";
-        sha1 = "3b3ee6512f94f0e575538c17995f9f16990a5d51";
+        url = "https://registry.npmjs.org/pump/-/pump-1.0.1.tgz";
+        sha1 = "f1f1409fb9bd1085bbdb576b43b84ec4b5eadc1a";
       };
     };
     "pumpify-1.3.5" = {
@@ -8729,15 +8702,6 @@ let
         sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3";
       };
     };
-    "split2-2.1.1" = {
-      name = "split2";
-      packageName = "split2";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz";
-        sha1 = "7a1f551e176a90ecd3345f7246a0cfe175ef4fd0";
-      };
-    };
     "murl-0.4.1" = {
       name = "murl";
       packageName = "murl";
@@ -8756,40 +8720,31 @@ let
         sha1 = "80ab4e919749351263ef14500d684e57c4202840";
       };
     };
-    "bl-1.2.0" = {
-      name = "bl";
-      packageName = "bl";
-      version = "1.2.0";
+    "JSONStream-1.1.4" = {
+      name = "JSONStream";
+      packageName = "JSONStream";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-1.2.0.tgz";
-        sha1 = "1397e7ec42c5f5dc387470c500e34a9f6be9ea98";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz";
+        sha1 = "be11a495938e882d277773d11986f3974a8ba37a";
       };
     };
-    "awscred-1.2.0" = {
-      name = "awscred";
-      packageName = "awscred";
-      version = "1.2.0";
+    "async-2.0.1" = {
+      name = "async";
+      packageName = "async";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/awscred/-/awscred-1.2.0.tgz";
-        sha1 = "9ba714a0d2feb625b848f15c62746c07aebdc3b5";
+        url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz";
+        sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
       };
     };
-    "clipboardy-0.1.2" = {
-      name = "clipboardy";
-      packageName = "clipboardy";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clipboardy/-/clipboardy-0.1.2.tgz";
-        sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc";
-      };
-    };
-    "got-6.7.1" = {
+    "got-6.6.3" = {
       name = "got";
       packageName = "got";
-      version = "6.7.1";
+      version = "6.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
-        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
+        url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz";
+        sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec";
       };
     };
     "lodash.debounce-4.0.8" = {
@@ -8810,76 +8765,13 @@ let
         sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1";
       };
     };
-    "mem-1.1.0" = {
+    "mem-0.1.1" = {
       name = "mem";
       packageName = "mem";
-      version = "1.1.0";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz";
-        sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
-      };
-    };
-    "execa-0.5.1" = {
-      name = "execa";
-      packageName = "execa";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz";
-        sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36";
-      };
-    };
-    "cross-spawn-4.0.2" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz";
-        sha1 = "7b9247621c23adfdd3856004a823cbe397424d41";
-      };
-    };
-    "get-stream-2.3.1" = {
-      name = "get-stream";
-      packageName = "get-stream";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
-        sha1 = "5f38f93f346009666ee0150a054167f91bdd95de";
-      };
-    };
-    "npm-run-path-2.0.2" = {
-      name = "npm-run-path";
-      packageName = "npm-run-path";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
-        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
-      };
-    };
-    "p-finally-1.0.0" = {
-      name = "p-finally";
-      packageName = "p-finally";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
-        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
-      };
-    };
-    "strip-eof-1.0.0" = {
-      name = "strip-eof";
-      packageName = "strip-eof";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
-        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
-      };
-    };
-    "path-key-2.0.1" = {
-      name = "path-key";
-      packageName = "path-key";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
-        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
+        url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz";
+        sha1 = "24df988c3102b03c074c1b296239c5b2e6647825";
       };
     };
     "create-error-class-3.0.2" = {
@@ -8900,13 +8792,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "get-stream-3.0.0" = {
+    "get-stream-2.3.1" = {
       name = "get-stream";
       packageName = "get-stream";
-      version = "3.0.0";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
-        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
+        sha1 = "5f38f93f346009666ee0150a054167f91bdd95de";
       };
     };
     "is-retry-allowed-1.1.0" = {
@@ -8918,13 +8810,22 @@ let
         sha1 = "11a060568b67339444033d0125a61a20d564fb34";
       };
     };
-    "timed-out-4.0.0" = {
+    "node-status-codes-2.0.1" = {
+      name = "node-status-codes";
+      packageName = "node-status-codes";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz";
+        sha1 = "298067659cb68a2b4670abbefde02a3819981f5b";
+      };
+    };
+    "timed-out-3.0.0" = {
       name = "timed-out";
       packageName = "timed-out";
-      version = "4.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.0.tgz";
-        sha1 = "b0fb98d7fed4f36b028698122769c07ef87a8690";
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.0.0.tgz";
+        sha1 = "ff88de96030ce960eabd42487db61d3add229273";
       };
     };
     "url-parse-lax-1.0.0" = {
@@ -8945,22 +8846,13 @@ let
         sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
       };
     };
-    "mimic-fn-1.1.0" = {
-      name = "mimic-fn";
-      packageName = "mimic-fn";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz";
-        sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18";
-      };
-    };
-    "babel-code-frame-6.20.0" = {
+    "babel-code-frame-6.16.0" = {
       name = "babel-code-frame";
       packageName = "babel-code-frame";
-      version = "6.20.0";
+      version = "6.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.20.0.tgz";
-        sha1 = "b968f839090f9a8bc6d41938fb96cb84f7387b26";
+        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz";
+        sha1 = "f90e60da0862909d3ce098733b5d3987c97cb8de";
       };
     };
     "doctrine-1.5.0" = {
@@ -9125,15 +9017,6 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
-    "strip-json-comments-2.0.1" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
-        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
-      };
-    };
     "table-3.8.3" = {
       name = "table";
       packageName = "table";
@@ -9206,13 +9089,13 @@ let
         sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
       };
     };
-    "acorn-4.0.4" = {
+    "acorn-4.0.3" = {
       name = "acorn";
       packageName = "acorn";
-      version = "4.0.4";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz";
-        sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a";
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz";
+        sha1 = "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1";
       };
     };
     "acorn-jsx-3.0.1" = {
@@ -9224,13 +9107,13 @@ let
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
-    "flat-cache-1.2.2" = {
+    "flat-cache-1.2.1" = {
       name = "flat-cache";
       packageName = "flat-cache";
-      version = "1.2.2";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz";
-        sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96";
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.1.tgz";
+        sha1 = "6c837d6225a7de5659323740b36d5361f71691ff";
       };
     };
     "circular-json-0.3.1" = {
@@ -9404,13 +9287,13 @@ let
         sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
       };
     };
-    "fast-levenshtein-2.0.6" = {
+    "fast-levenshtein-2.0.5" = {
       name = "fast-levenshtein";
       packageName = "fast-levenshtein";
-      version = "2.0.6";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
-        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz";
+        sha1 = "bd33145744519ab1c36c3ee9f31f08e9079b67f2";
       };
     };
     "caller-path-0.1.0" = {
@@ -9440,22 +9323,22 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.10.4" = {
+    "ajv-4.9.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.10.4";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz";
-        sha1 = "c0974dd00b3464984892d6010aa9c2c945933254";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz";
+        sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c";
       };
     };
-    "ajv-keywords-1.5.0" = {
+    "ajv-keywords-1.1.1" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "1.5.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz";
-        sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz";
+        sha1 = "02550bc605a3e576041565628af972e06c549d50";
       };
     };
     "slice-ansi-0.0.4" = {
@@ -9566,13 +9449,13 @@ let
         sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d";
       };
     };
-    "prettyjson-1.2.1" = {
+    "prettyjson-1.2.0" = {
       name = "prettyjson";
       packageName = "prettyjson";
-      version = "1.2.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz";
-        sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289";
+        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.0.tgz";
+        sha1 = "2a109cdf14c957896bbad8b77ef5de5db2c691bf";
       };
     };
     "shush-1.0.0" = {
@@ -9710,13 +9593,13 @@ let
         sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
       };
     };
-    "fsevents-1.0.17" = {
+    "fsevents-1.0.15" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.0.17";
+      version = "1.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.17.tgz";
-        sha1 = "8537f3f12272678765b4fd6528c0f1f66f8f4558";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz";
+        sha1 = "fa63f590f3c2ad91275e4972a6cea545fb0aae44";
       };
     };
     "micromatch-2.3.11" = {
@@ -9782,13 +9665,13 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
-    "kind-of-3.1.0" = {
+    "kind-of-3.0.4" = {
       name = "kind-of";
       packageName = "kind-of";
-      version = "3.1.0";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz";
-        sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47";
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz";
+        sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74";
       };
     };
     "normalize-path-2.0.1" = {
@@ -9890,13 +9773,13 @@ let
         sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
       };
     };
-    "randomatic-1.1.6" = {
+    "randomatic-1.1.5" = {
       name = "randomatic";
       packageName = "randomatic";
-      version = "1.1.6";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz";
-        sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb";
+        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz";
+        sha1 = "5e9ef5f2d573c67bd2b8124ae90b5156e457840b";
       };
     };
     "repeat-string-1.6.1" = {
@@ -9980,13 +9863,13 @@ let
         sha1 = "207bab91638499c07b2adf240a41a87210034575";
       };
     };
-    "binary-extensions-1.8.0" = {
+    "binary-extensions-1.7.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.8.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz";
-        sha1 = "48ec8d16df4377eae5fa5884682480af4d95c774";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz";
+        sha1 = "6c1610db163abfb34edfe42fa423343a1e01185d";
       };
     };
     "set-immediate-shim-1.0.1" = {
@@ -9998,22 +9881,22 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.32" = {
+    "node-pre-gyp-0.6.31" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.32";
+      version = "0.6.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
-        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
+        sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
       };
     };
-    "npmlog-4.0.2" = {
+    "npmlog-4.0.1" = {
       name = "npmlog";
       packageName = "npmlog";
-      version = "4.0.2";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
-        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz";
+        sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8";
       };
     };
     "tar-pack-3.3.0" = {
@@ -10034,13 +9917,13 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
-    "gauge-2.7.2" = {
+    "gauge-2.7.1" = {
       name = "gauge";
       packageName = "gauge";
-      version = "2.7.2";
+      version = "2.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz";
-        sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774";
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz";
+        sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7";
       };
     };
     "set-blocking-2.0.0" = {
@@ -10197,13 +10080,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.12.2" = {
+    "coffee-script-1.11.1" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.12.2";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
-        sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
+        sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
       };
     };
     "jade-1.11.0" = {
@@ -10242,13 +10125,13 @@ let
         sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
       };
     };
-    "clean-css-3.4.23" = {
+    "clean-css-3.4.21" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "3.4.23";
+      version = "3.4.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.23.tgz";
-        sha1 = "604fbbca24c12feb59b02f00b84f1fb7ded6d001";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz";
+        sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b";
       };
     };
     "commander-2.6.0" = {
@@ -10287,13 +10170,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.7.5" = {
+    "uglify-js-2.7.4" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.5";
+      version = "2.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
-        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
+        sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
       };
     };
     "void-elements-2.0.1" = {
@@ -10530,13 +10413,13 @@ let
         sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19";
       };
     };
-    "gulp-util-3.0.8" = {
+    "gulp-util-3.0.7" = {
       name = "gulp-util";
       packageName = "gulp-util";
-      version = "3.0.8";
+      version = "3.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz";
-        sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f";
+        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz";
+        sha1 = "78925c4b8f8b49005ac01a011c557e6218941cbb";
       };
     };
     "liftoff-2.3.0" = {
@@ -10611,22 +10494,22 @@ let
         sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809";
       };
     };
-    "dateformat-2.0.0" = {
+    "dateformat-1.0.12" = {
       name = "dateformat";
       packageName = "dateformat";
-      version = "2.0.0";
+      version = "1.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz";
-        sha1 = "2743e3abb5c3fc2462e527dca445e04e9f4dee17";
+        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz";
+        sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9";
       };
     };
-    "fancy-log-1.3.0" = {
+    "fancy-log-1.2.0" = {
       name = "fancy-log";
       packageName = "fancy-log";
-      version = "1.3.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz";
-        sha1 = "45be17d02bb9917d60ccffd4995c999e6c8c9948";
+        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.2.0.tgz";
+        sha1 = "d5a51b53e9ab22ca07d558f2b67ae55fdb5fcbd8";
       };
     };
     "gulplog-1.0.0" = {
@@ -11016,13 +10899,13 @@ let
         sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5";
       };
     };
-    "is-unc-path-0.1.2" = {
+    "is-unc-path-0.1.1" = {
       name = "is-unc-path";
       packageName = "is-unc-path";
-      version = "0.1.2";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz";
-        sha1 = "6ab053a72573c10250ff416a3814c35178af39b9";
+        url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.1.tgz";
+        sha1 = "ab2533d77ad733561124c3dc0f5cd8b90054c86b";
       };
     };
     "unc-path-regex-0.1.2" = {
@@ -11484,13 +11367,13 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "bluebird-3.4.7" = {
+    "bluebird-3.4.6" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.4.7";
+      version = "3.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz";
-        sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz";
+        sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f";
       };
     };
     "body-parser-1.15.2" = {
@@ -11556,22 +11439,22 @@ let
         sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea";
       };
     };
-    "http-proxy-1.16.2" = {
+    "http-proxy-1.15.2" = {
       name = "http-proxy";
       packageName = "http-proxy";
-      version = "1.16.2";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz";
-        sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742";
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz";
+        sha1 = "642fdcaffe52d3448d2bda3b0079e9409064da31";
       };
     };
-    "isbinaryfile-3.0.2" = {
+    "isbinaryfile-3.0.1" = {
       name = "isbinaryfile";
       packageName = "isbinaryfile";
-      version = "3.0.2";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz";
-        sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621";
+        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.1.tgz";
+        sha1 = "6e99573675372e841a0520c036b41513d783e79e";
       };
     };
     "log4js-0.6.38" = {
@@ -11592,13 +11475,13 @@ let
         sha1 = "659de9f2cf8dcc27a1481276f205377272382e73";
       };
     };
-    "socket.io-1.7.2" = {
+    "socket.io-1.4.7" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "1.7.2";
+      version = "1.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.2.tgz";
-        sha1 = "83bbbdf2e79263b378900da403e7843e05dc3b71";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.7.tgz";
+        sha1 = "92b7f7cb88c5797d4daee279fe8075dbe6d3fa1c";
       };
     };
     "tmp-0.0.28" = {
@@ -11610,13 +11493,13 @@ let
         sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120";
       };
     };
-    "useragent-2.1.10" = {
+    "useragent-2.1.9" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.1.10";
+      version = "2.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.10.tgz";
-        sha1 = "2456c5c2b722b47f3d8321ed257b490a3d9bb2af";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.9.tgz";
+        sha1 = "4dba2bc4dad1875777ab15de3ff8098b475000b7";
       };
     };
     "bytes-2.4.0" = {
@@ -11727,22 +11610,40 @@ let
         sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
       };
     };
-    "debug-2.3.3" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
-        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
-      };
-    };
-    "engine.io-1.8.2" = {
+    "engine.io-1.6.10" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "1.8.2";
+      version = "1.6.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.2.tgz";
-        sha1 = "6b59be730b348c0125b0a4589de1c355abcf7a7e";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.10.tgz";
+        sha1 = "f87d84e1bd21d1a2ec7f8deef0c62054acdfb27a";
+      };
+    };
+    "socket.io-parser-2.2.6" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "2.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz";
+        sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99";
+      };
+    };
+    "socket.io-client-1.4.6" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "1.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz";
+        sha1 = "49b0ba537efd15b8297c84016e642e1c7c752c3d";
+      };
+    };
+    "socket.io-adapter-0.4.0" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz";
+        sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f";
       };
     };
     "has-binary-0.1.7" = {
@@ -11754,58 +11655,49 @@ let
         sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
       };
     };
-    "socket.io-adapter-0.5.0" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
-        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
-      };
-    };
-    "socket.io-client-1.7.2" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.2.tgz";
-        sha1 = "39fdb0c3dd450e321b7e40cfd83612ec533dd644";
-      };
-    };
-    "socket.io-parser-2.3.1" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
-        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
-      };
-    };
-    "base64id-1.0.0" = {
+    "base64id-0.1.0" = {
       name = "base64id";
       packageName = "base64id";
-      version = "1.0.0";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz";
-        sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
+        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
       };
     };
-    "engine.io-parser-1.3.2" = {
+    "ws-1.0.1" = {
+      name = "ws";
+      packageName = "ws";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz";
+        sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9";
+      };
+    };
+    "engine.io-parser-1.2.4" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
-      version = "1.3.2";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz";
-        sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a";
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz";
+        sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42";
       };
     };
-    "after-0.8.2" = {
+    "accepts-1.1.4" = {
+      name = "accepts";
+      packageName = "accepts";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
+        sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
+      };
+    };
+    "after-0.8.1" = {
       name = "after";
       packageName = "after";
-      version = "0.8.2";
+      version = "0.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
-        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
+        url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz";
+        sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627";
       };
     };
     "arraybuffer.slice-0.0.6" = {
@@ -11817,13 +11709,13 @@ let
         sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
       };
     };
-    "base64-arraybuffer-0.1.5" = {
+    "base64-arraybuffer-0.1.2" = {
       name = "base64-arraybuffer";
       packageName = "base64-arraybuffer";
-      version = "0.1.5";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
-        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
+        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
+        sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154";
       };
     };
     "blob-0.0.4" = {
@@ -11835,22 +11727,58 @@ let
         sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
       };
     };
-    "wtf-8-1.0.0" = {
-      name = "wtf-8";
-      packageName = "wtf-8";
-      version = "1.0.0";
+    "has-binary-0.1.6" = {
+      name = "has-binary";
+      packageName = "has-binary";
+      version = "0.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
-        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
+        url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz";
+        sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10";
       };
     };
-    "backo2-1.0.2" = {
-      name = "backo2";
-      packageName = "backo2";
-      version = "1.0.2";
+    "utf8-2.1.0" = {
+      name = "utf8";
+      packageName = "utf8";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
-        sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
+        url = "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz";
+        sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5";
+      };
+    };
+    "negotiator-0.4.9" = {
+      name = "negotiator";
+      packageName = "negotiator";
+      version = "0.4.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
+        sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f";
+      };
+    };
+    "json3-3.3.2" = {
+      name = "json3";
+      packageName = "json3";
+      version = "3.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
+        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
+      };
+    };
+    "benchmark-1.0.0" = {
+      name = "benchmark";
+      packageName = "benchmark";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
+        sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73";
+      };
+    };
+    "engine.io-client-1.6.9" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.6.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz";
+        sha1 = "1d6ad48048a5083c95096943b29d36efdb212401";
       };
     };
     "component-bind-1.0.0" = {
@@ -11862,22 +11790,13 @@ let
         sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
       };
     };
-    "component-emitter-1.2.1" = {
+    "component-emitter-1.2.0" = {
       name = "component-emitter";
       packageName = "component-emitter";
-      version = "1.2.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
-        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
-      };
-    };
-    "engine.io-client-1.8.2" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.2.tgz";
-        sha1 = "c38767547f2a7d184f5752f6f0ad501006703766";
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz";
+        sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe";
       };
     };
     "object-component-0.0.3" = {
@@ -11889,13 +11808,13 @@ let
         sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
       };
     };
-    "parseuri-0.0.5" = {
+    "parseuri-0.0.4" = {
       name = "parseuri";
       packageName = "parseuri";
-      version = "0.0.5";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
-        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz";
+        sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350";
       };
     };
     "to-array-0.1.4" = {
@@ -11907,13 +11826,13 @@ let
         sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
       };
     };
-    "component-inherit-0.0.3" = {
-      name = "component-inherit";
-      packageName = "component-inherit";
-      version = "0.0.3";
+    "backo2-1.0.2" = {
+      name = "backo2";
+      packageName = "backo2";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
-        sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
+        url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
+        sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
       };
     };
     "has-cors-1.1.0" = {
@@ -11925,31 +11844,40 @@ let
         sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
       };
     };
-    "parsejson-0.0.3" = {
-      name = "parsejson";
-      packageName = "parsejson";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
-        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
-      };
-    };
-    "parseqs-0.0.5" = {
-      name = "parseqs";
-      packageName = "parseqs";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
-        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
-      };
-    };
-    "xmlhttprequest-ssl-1.5.3" = {
+    "xmlhttprequest-ssl-1.5.1" = {
       name = "xmlhttprequest-ssl";
       packageName = "xmlhttprequest-ssl";
-      version = "1.5.3";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
-        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
+        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz";
+        sha1 = "3b7741fea4a86675976e908d296d4445961faa67";
+      };
+    };
+    "parsejson-0.0.1" = {
+      name = "parsejson";
+      packageName = "parsejson";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
+        sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc";
+      };
+    };
+    "parseqs-0.0.2" = {
+      name = "parseqs";
+      packageName = "parseqs";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
+        sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7";
+      };
+    };
+    "component-inherit-0.0.3" = {
+      name = "component-inherit";
+      packageName = "component-inherit";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
+        sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
       };
     };
     "yeast-0.1.2" = {
@@ -11979,13 +11907,22 @@ let
         sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
       };
     };
-    "json3-3.3.2" = {
+    "socket.io-parser-2.2.2" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz";
+        sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417";
+      };
+    };
+    "json3-3.2.6" = {
       name = "json3";
       packageName = "json3";
-      version = "3.3.2";
+      version = "3.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
-        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
+        url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
+        sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
       };
     };
     "lru-cache-2.2.4" = {
@@ -12294,15 +12231,6 @@ let
         sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
       };
     };
-    "base64-url-1.3.3" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
-        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
-      };
-    };
     "rndm-1.2.0" = {
       name = "rndm";
       packageName = "rndm";
@@ -12447,22 +12375,22 @@ let
         sha1 = "a7de988a211f9cf4687377130ea74df32730c918";
       };
     };
-    "oauth-0.9.15" = {
+    "oauth-0.9.14" = {
       name = "oauth";
       packageName = "oauth";
-      version = "0.9.15";
+      version = "0.9.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz";
-        sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1";
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
+        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
       };
     };
-    "passport-oauth2-1.4.0" = {
+    "passport-oauth2-1.3.0" = {
       name = "passport-oauth2";
       packageName = "passport-oauth2";
-      version = "1.4.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz";
-        sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad";
+        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.3.0.tgz";
+        sha1 = "d72b4bd62eeb807a4089ff3071a22c26c382dc0c";
       };
     };
     "uid2-0.0.3" = {
@@ -12528,22 +12456,22 @@ let
         sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
       };
     };
-    "lodash.isequal-4.5.0" = {
+    "lodash.isequal-4.4.0" = {
       name = "lodash.isequal";
       packageName = "lodash.isequal";
-      version = "4.5.0";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
-        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
+        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.4.0.tgz";
+        sha1 = "6295768e98e14dc15ce8d362ef6340db82852031";
       };
     };
-    "merge-stream-1.0.1" = {
+    "merge-stream-1.0.0" = {
       name = "merge-stream";
       packageName = "merge-stream";
-      version = "1.0.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz";
-        sha1 = "4041202d508a342ba00174008df0c251b8c135e1";
+        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz";
+        sha1 = "9cfd156fef35421e2b5403ce11dc6eb1962b026e";
       };
     };
     "strip-bom-stream-1.0.0" = {
@@ -12573,13 +12501,13 @@ let
         sha1 = "1b904a59609fb328ef078138420934f6b86709a6";
       };
     };
-    "glob-parent-3.1.0" = {
+    "glob-parent-3.0.1" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "3.1.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
-        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.1.tgz";
+        sha1 = "60021327cc963ddc3b5f085764f500479ecd82ff";
       };
     };
     "ordered-read-streams-0.3.0" = {
@@ -12627,13 +12555,13 @@ let
         sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
       };
     };
-    "is-extglob-2.1.1" = {
+    "is-extglob-2.1.0" = {
       name = "is-extglob";
       packageName = "is-extglob";
-      version = "2.1.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
-        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.0.tgz";
+        sha1 = "33411a482b046bf95e6b0cb27ee2711af4cf15ad";
       };
     };
     "extend-shallow-2.0.1" = {
@@ -13023,6 +12951,15 @@ let
         sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103";
       };
     };
+    "after-0.8.2" = {
+      name = "after";
+      packageName = "after";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
+        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
+      };
+    };
     "yargs-1.3.3" = {
       name = "yargs";
       packageName = "yargs";
@@ -13095,13 +13032,13 @@ let
         sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
       };
     };
-    "wrap-ansi-2.1.0" = {
+    "wrap-ansi-2.0.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
-      version = "2.1.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
-        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz";
+        sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f";
       };
     };
     "lcid-1.0.0" = {
@@ -13230,13 +13167,13 @@ let
         sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     };
-    "bcryptjs-2.4.0" = {
+    "bcryptjs-2.3.0" = {
       name = "bcryptjs";
       packageName = "bcryptjs";
-      version = "2.4.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.0.tgz";
-        sha1 = "fb7f4a0b133854503fe1b2da3f25db834cf0e678";
+        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz";
+        sha1 = "5826900cfef7abaf3425c72e4d464de509b8c2ec";
       };
     };
     "cheerio-0.22.0" = {
@@ -13248,6 +13185,15 @@ let
         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" = {
       name = "cookie-parser";
       packageName = "cookie-parser";
@@ -13257,31 +13203,31 @@ let
         sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
       };
     };
-    "cron-1.2.1" = {
+    "cron-1.1.1" = {
       name = "cron";
       packageName = "cron";
-      version = "1.2.1";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz";
-        sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2";
+        url = "https://registry.npmjs.org/cron/-/cron-1.1.1.tgz";
+        sha1 = "02719d4ef480dfc8ee24d81a3603460ba39013ce";
       };
     };
-    "follow-redirects-1.2.1" = {
+    "follow-redirects-0.2.0" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.2.1";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.1.tgz";
-        sha1 = "796c716970df4fb0096165393545040f61b00f59";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.2.0.tgz";
+        sha1 = "e0229d7a388bb5ff7b29f44fc1e1b62e921272df";
       };
     };
-    "fs-extra-1.0.0" = {
+    "fs-extra-0.30.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
-      version = "1.0.0";
+      version = "0.30.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
-        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz";
+        sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0";
       };
     };
     "fs.notify-0.0.4" = {
@@ -13302,40 +13248,31 @@ let
         sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
-    "jsonata-1.0.10" = {
-      name = "jsonata";
-      packageName = "jsonata";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.0.10.tgz";
-        sha1 = "5177b5aa3ec66e7b5894412b2f9ad170c6107b96";
-      };
-    };
-    "mqtt-2.2.1" = {
+    "mqtt-1.14.1" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "2.2.1";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.2.1.tgz";
-        sha1 = "b3efff8adff78dee07e09cfe89e2d2fb364a1852";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-1.14.1.tgz";
+        sha1 = "7e376987153d01793e946d26d46122ebf0c03554";
       };
     };
-    "mustache-2.3.0" = {
+    "mustache-2.2.1" = {
       name = "mustache";
       packageName = "mustache";
-      version = "2.3.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz";
-        sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0";
+        url = "https://registry.npmjs.org/mustache/-/mustache-2.2.1.tgz";
+        sha1 = "2c40ca21c278f53150682bcf9090e41a3339b876";
       };
     };
-    "oauth2orize-1.7.0" = {
+    "oauth2orize-1.5.0" = {
       name = "oauth2orize";
       packageName = "oauth2orize";
-      version = "1.7.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.7.0.tgz";
-        sha1 = "94c2a511cd0b58bde548548ffcde14fd81f257cc";
+        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.5.0.tgz";
+        sha1 = "e352ff4f1b5bf08f0ee94a09757f8f640eb8e0a6";
       };
     };
     "passport-http-bearer-1.0.1" = {
@@ -13356,22 +13293,22 @@ let
         sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba";
       };
     };
-    "raw-body-2.2.0" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz";
-        sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96";
-      };
-    };
-    "sentiment-2.1.0" = {
+    "sentiment-1.0.6" = {
       name = "sentiment";
       packageName = "sentiment";
-      version = "2.1.0";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz";
-        sha1 = "33279100c35c38519ca5e435245186c512fe0fdc";
+        url = "https://registry.npmjs.org/sentiment/-/sentiment-1.0.6.tgz";
+        sha1 = "f6096c6271f020f490d58b54a8afd598db8acbb1";
+      };
+    };
+    "uglify-js-2.7.3" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
+        sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
       };
     };
     "when-3.7.7" = {
@@ -13383,6 +13320,15 @@ let
         sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
       };
     };
+    "ws-0.8.1" = {
+      name = "ws";
+      packageName = "ws";
+      version = "0.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-0.8.1.tgz";
+        sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759";
+      };
+    };
     "node-red-node-feedparser-0.1.7" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
@@ -13392,13 +13338,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.15" = {
+    "node-red-node-email-0.1.12" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.15";
+      version = "0.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz";
-        sha1 = "7a528596d3b693a077b1ee293300299855537142";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz";
+        sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5";
       };
     };
     "node-red-node-twitter-0.1.9" = {
@@ -13419,13 +13365,22 @@ let
         sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539";
       };
     };
-    "bcrypt-1.0.2" = {
+    "node-red-node-serialport-0.4.1" = {
+      name = "node-red-node-serialport";
+      packageName = "node-red-node-serialport";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz";
+        sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c";
+      };
+    };
+    "bcrypt-0.8.7" = {
       name = "bcrypt";
       packageName = "bcrypt";
-      version = "1.0.2";
+      version = "0.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.2.tgz";
-        sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736";
+        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz";
+        sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093";
       };
     };
     "css-select-1.2.0" = {
@@ -13572,13 +13527,13 @@ let
         sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
       };
     };
-    "moment-timezone-0.5.11" = {
+    "moment-timezone-0.5.9" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.11";
+      version = "0.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz";
-        sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz";
+        sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd";
       };
     };
     "retry-0.6.1" = {
@@ -13644,13 +13599,22 @@ let
         sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a";
       };
     };
-    "mqtt-packet-5.2.1" = {
+    "mqtt-connection-2.1.1" = {
+      name = "mqtt-connection";
+      packageName = "mqtt-connection";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mqtt-connection/-/mqtt-connection-2.1.1.tgz";
+        sha1 = "7b2e985a74e196619430bebd35da162c34c4e56a";
+      };
+    };
+    "mqtt-packet-3.4.7" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "5.2.1";
+      version = "3.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.1.tgz";
-        sha1 = "876e35ed616a8e348ac0283b4922039872458b58";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-3.4.7.tgz";
+        sha1 = "be8c267be7f0bf6a2a2d4f6de28307b6e0940e5f";
       };
     };
     "reinterval-1.1.0" = {
@@ -13662,6 +13626,15 @@ let
         sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
       };
     };
+    "split2-2.1.0" = {
+      name = "split2";
+      packageName = "split2";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split2/-/split2-2.1.0.tgz";
+        sha1 = "7382c148cb622c4b28af7c727f9673730b73f474";
+      };
+    };
     "websocket-stream-3.3.3" = {
       name = "websocket-stream";
       packageName = "websocket-stream";
@@ -13689,13 +13662,58 @@ let
         sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
       };
     };
-    "iconv-lite-0.4.15" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.15";
+    "reduplexer-1.1.0" = {
+      name = "reduplexer";
+      packageName = "reduplexer";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
-        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
+        url = "https://registry.npmjs.org/reduplexer/-/reduplexer-1.1.0.tgz";
+        sha1 = "7dfed18a679e749c1d7ad36de01acb515f08e140";
+      };
+    };
+    "lodash.assign-4.0.1" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.0.1.tgz";
+        sha1 = "8e7ff0206897a99dca32fc8123309f5c4c2c731e";
+      };
+    };
+    "lodash.keys-4.2.0" = {
+      name = "lodash.keys";
+      packageName = "lodash.keys";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz";
+        sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205";
+      };
+    };
+    "lodash.rest-4.0.5" = {
+      name = "lodash.rest";
+      packageName = "lodash.rest";
+      version = "4.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.5.tgz";
+        sha1 = "954ef75049262038c96d1fc98b28fdaf9f0772aa";
+      };
+    };
+    "bufferutil-1.2.1" = {
+      name = "bufferutil";
+      packageName = "bufferutil";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz";
+        sha1 = "37be5d36e1e06492221e68d474b1ac58e510cbd7";
+      };
+    };
+    "utf-8-validate-1.2.1" = {
+      name = "utf-8-validate";
+      packageName = "utf-8-validate";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz";
+        sha1 = "44cb7c6eead73d6b40448f71f745904357b9f72c";
       };
     };
     "feedparser-1.1.3" = {
@@ -13761,13 +13779,13 @@ let
         sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3";
       };
     };
-    "imap-0.8.19" = {
+    "imap-0.8.18" = {
       name = "imap";
       packageName = "imap";
-      version = "0.8.19";
+      version = "0.8.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz";
-        sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5";
+        url = "https://registry.npmjs.org/imap/-/imap-0.8.18.tgz";
+        sha1 = "4a7cdd0ff276efa0298708bb2c6d0db0b77f7a3f";
       };
     };
     "libmime-1.2.0" = {
@@ -13815,6 +13833,15 @@ let
         sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398";
       };
     };
+    "iconv-lite-0.4.15" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
+        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
+      };
+    };
     "libbase64-0.1.0" = {
       name = "libbase64";
       packageName = "libbase64";
@@ -13923,13 +13950,58 @@ let
         sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
       };
     };
-    "oauth-0.9.14" = {
-      name = "oauth";
-      packageName = "oauth";
-      version = "0.9.14";
+    "serialport-4.0.6" = {
+      name = "serialport";
+      packageName = "serialport";
+      version = "4.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
-        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
+        url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz";
+        sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae";
+      };
+    };
+    "lie-3.1.0" = {
+      name = "lie";
+      packageName = "lie";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lie/-/lie-3.1.0.tgz";
+        sha1 = "65e0139eaef9ae791a1f5c8c53692c8d3b4718f4";
+      };
+    };
+    "object.assign-4.0.4" = {
+      name = "object.assign";
+      packageName = "object.assign";
+      version = "4.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz";
+        sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
+      };
+    };
+    "immediate-3.0.6" = {
+      name = "immediate";
+      packageName = "immediate";
+      version = "3.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz";
+        sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b";
+      };
+    };
+    "define-properties-1.1.2" = {
+      name = "define-properties";
+      packageName = "define-properties";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
+        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
+      };
+    };
+    "nan-2.3.5" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
+        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
       };
     };
     "mongoose-3.6.7" = {
@@ -14310,15 +14382,6 @@ let
         sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d";
       };
     };
-    "base64id-0.1.0" = {
-      name = "base64id";
-      packageName = "base64id";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
-        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
-      };
-    };
     "redis-0.7.3" = {
       name = "redis";
       packageName = "redis";
@@ -14400,13 +14463,13 @@ let
         sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
       };
     };
-    "mailcomposer-4.0.1" = {
+    "mailcomposer-3.12.0" = {
       name = "mailcomposer";
       packageName = "mailcomposer";
-      version = "4.0.1";
+      version = "3.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz";
-        sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4";
+        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz";
+        sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9";
       };
     };
     "simplesmtp-0.3.35" = {
@@ -14418,22 +14481,22 @@ let
         sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03";
       };
     };
-    "buildmail-4.0.1" = {
+    "buildmail-3.10.0" = {
       name = "buildmail";
       packageName = "buildmail";
-      version = "4.0.1";
+      version = "3.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz";
-        sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72";
+        url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz";
+        sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159";
       };
     };
-    "libmime-3.0.0" = {
+    "libmime-2.1.0" = {
       name = "libmime";
       packageName = "libmime";
-      version = "3.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz";
-        sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6";
+        url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz";
+        sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd";
       };
     };
     "addressparser-1.0.1" = {
@@ -14490,15 +14553,6 @@ let
         sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528";
       };
     };
-    "nan-2.3.5" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
-        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
-      };
-    };
     "argparse-0.1.16" = {
       name = "argparse";
       packageName = "argparse";
@@ -14526,15 +14580,6 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
-    "JSONStream-1.2.1" = {
-      name = "JSONStream";
-      packageName = "JSONStream";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
-        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
-      };
-    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14598,15 +14643,6 @@ let
         sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
       };
     };
-    "nopt-4.0.1" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
-        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
-      };
-    };
     "npm-install-checks-3.0.0" = {
       name = "npm-install-checks";
       packageName = "npm-install-checks";
@@ -14616,13 +14652,13 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-registry-client-7.4.5" = {
+    "npm-registry-client-7.3.0" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "7.4.5";
+      version = "7.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.5.tgz";
-        sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz";
+        sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50";
       };
     };
     "opener-1.4.2" = {
@@ -14652,6 +14688,15 @@ let
         sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
       };
     };
+    "request-2.78.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.78.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
+        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+      };
+    };
     "sorted-union-stream-2.1.3" = {
       name = "sorted-union-stream";
       packageName = "sorted-union-stream";
@@ -14670,15 +14715,6 @@ let
         sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
-    "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";
-      };
-    };
     "lodash._baseindexof-3.1.0" = {
       name = "lodash._baseindexof";
       packageName = "lodash._baseindexof";
@@ -15021,13 +15057,13 @@ let
         sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d";
       };
     };
-    "update-notifier-1.0.3" = {
+    "update-notifier-1.0.2" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "1.0.3";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz";
-        sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.2.tgz";
+        sha1 = "27c90519196dc15015be02a34ea52986feab8877";
       };
     };
     "request-2.75.0" = {
@@ -15174,15 +15210,6 @@ let
         sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
       };
     };
-    "timed-out-3.1.3" = {
-      name = "timed-out";
-      packageName = "timed-out";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
-        sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217";
-      };
-    };
     "unzip-response-1.0.2" = {
       name = "unzip-response";
       packageName = "unzip-response";
@@ -15303,13 +15330,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.1.13" = {
+    "service-runner-2.1.11" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.1.13";
+      version = "2.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz";
-        sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz";
+        sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb";
       };
     };
     "simplediff-0.1.1" = {
@@ -15366,24 +15393,6 @@ let
         sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
       };
     };
-    "object.assign-4.0.4" = {
-      name = "object.assign";
-      packageName = "object.assign";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz";
-        sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
-      };
-    };
-    "define-properties-1.1.2" = {
-      name = "define-properties";
-      packageName = "define-properties";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
-        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
-      };
-    };
     "gelfling-0.2.0" = {
       name = "gelfling";
       packageName = "gelfling";
@@ -15808,13 +15817,13 @@ let
         sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364";
       };
     };
-    "array-flatten-2.1.1" = {
+    "array-flatten-2.1.0" = {
       name = "array-flatten";
       packageName = "array-flatten";
-      version = "2.1.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz";
-        sha1 = "426bb9da84090c1838d812c8150af20a8331e296";
+        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.0.tgz";
+        sha1 = "26a692c83881fc68dac3ec5d1f0c1b49bf2304d9";
       };
     };
     "dns-equal-1.0.0" = {
@@ -15871,22 +15880,13 @@ let
         sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
       };
     };
-    "mute-stream-0.0.6" = {
-      name = "mute-stream";
-      packageName = "mute-stream";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
-        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
-      };
-    };
-    "run-async-2.3.0" = {
+    "run-async-2.2.0" = {
       name = "run-async";
       packageName = "run-async";
-      version = "2.3.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
-        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.2.0.tgz";
+        sha1 = "8783abd83c7bb86f41ee0602fc82404b3bd6e8b9";
       };
     };
     "rx-4.1.0" = {
@@ -15943,6 +15943,15 @@ let
         sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
       };
     };
+    "socket.io-1.6.0" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz";
+        sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1";
+      };
+    };
     "torrent-stream-0.18.1" = {
       name = "torrent-stream";
       packageName = "torrent-stream";
@@ -16312,6 +16321,123 @@ let
         sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
       };
     };
+    "engine.io-1.8.0" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz";
+        sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa";
+      };
+    };
+    "socket.io-adapter-0.5.0" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
+        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
+      };
+    };
+    "socket.io-client-1.6.0" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz";
+        sha1 = "5b668f4f771304dfeed179064708386fa6717853";
+      };
+    };
+    "socket.io-parser-2.3.1" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
+        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
+      };
+    };
+    "engine.io-parser-1.3.1" = {
+      name = "engine.io-parser";
+      packageName = "engine.io-parser";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz";
+        sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf";
+      };
+    };
+    "base64-arraybuffer-0.1.5" = {
+      name = "base64-arraybuffer";
+      packageName = "base64-arraybuffer";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
+        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
+      };
+    };
+    "wtf-8-1.0.0" = {
+      name = "wtf-8";
+      packageName = "wtf-8";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
+        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
+      };
+    };
+    "component-emitter-1.2.1" = {
+      name = "component-emitter";
+      packageName = "component-emitter";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+      };
+    };
+    "engine.io-client-1.8.0" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz";
+        sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c";
+      };
+    };
+    "parseuri-0.0.5" = {
+      name = "parseuri";
+      packageName = "parseuri";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
+        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+      };
+    };
+    "parsejson-0.0.3" = {
+      name = "parsejson";
+      packageName = "parsejson";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
+        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
+      };
+    };
+    "parseqs-0.0.5" = {
+      name = "parseqs";
+      packageName = "parseqs";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
+        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
+      };
+    };
+    "xmlhttprequest-ssl-1.5.3" = {
+      name = "xmlhttprequest-ssl";
+      packageName = "xmlhttprequest-ssl";
+      version = "1.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
+        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
+      };
+    };
     "bittorrent-dht-3.2.6" = {
       name = "bittorrent-dht";
       packageName = "bittorrent-dht";
@@ -16591,13 +16717,13 @@ let
         sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
       };
     };
-    "recast-0.11.18" = {
+    "recast-0.11.17" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.18";
+      version = "0.11.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.18.tgz";
-        sha1 = "07af6257ca769868815209401d4d60eef1b5b947";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.17.tgz";
+        sha1 = "67e829df49ef8ea822381cc516d305411e60bad8";
       };
     };
     "ast-types-0.9.2" = {
@@ -16609,13 +16735,13 @@ let
         sha1 = "2cc19979d15c655108bf565323b8e7ee38751f6b";
       };
     };
-    "esprima-3.1.3" = {
+    "esprima-3.1.1" = {
       name = "esprima";
       packageName = "esprima";
-      version = "3.1.3";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.1.tgz";
+        sha1 = "02dbcc5ac3ece81070377f99158ec742ab5dda06";
       };
     };
     "base62-0.1.1" = {
@@ -16801,11 +16927,11 @@ let
     "oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" = {
       name = "oauth";
       packageName = "oauth";
-      version = "0.9.15";
+      version = "0.9.14";
       src = fetchurl {
-        name = "oauth-0.9.15.tar.gz";
+        name = "oauth-0.9.14.tar.gz";
         url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master;
-        sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947";
+        sha256 = "abd0d7be4fb10804e5a38ee66a4db5fc36d2ed045be52e7c8b7e19e4c9e16bd8";
       };
     };
     "connect-2.3.9" = {
@@ -17087,13 +17213,13 @@ let
         sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414";
       };
     };
-    "sanitize-html-1.14.1" = {
+    "sanitize-html-1.13.0" = {
       name = "sanitize-html";
       packageName = "sanitize-html";
-      version = "1.14.1";
+      version = "1.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz";
-        sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8";
+        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz";
+        sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631";
       };
     };
     "linkify-it-1.2.4" = {
@@ -17312,13 +17438,13 @@ let
         sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
       };
     };
-    "csv-parse-1.1.9" = {
+    "csv-parse-1.1.7" = {
       name = "csv-parse";
       packageName = "csv-parse";
-      version = "1.1.9";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.9.tgz";
-        sha1 = "5010f93e052578fcab67e30e9b59129c6248ad81";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.7.tgz";
+        sha1 = "6e4678f7967013ac823929a4303a3ce177115abc";
       };
     };
     "stream-transform-0.1.1" = {
@@ -17510,13 +17636,13 @@ let
         sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2";
       };
     };
-    "clap-1.1.2" = {
+    "clap-1.1.1" = {
       name = "clap";
       packageName = "clap";
-      version = "1.1.2";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clap/-/clap-1.1.2.tgz";
-        sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed";
+        url = "https://registry.npmjs.org/clap/-/clap-1.1.1.tgz";
+        sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d";
       };
     };
     "async-2.1.2" = {
@@ -17573,15 +17699,6 @@ let
         sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4";
       };
     };
-    "request-2.78.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.78.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
-        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
-      };
-    };
     "sprintf-0.1.5" = {
       name = "sprintf";
       packageName = "sprintf";
@@ -17681,15 +17798,6 @@ let
         sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
       };
     };
-    "xmldom-0.1.22" = {
-      name = "xmldom";
-      packageName = "xmldom";
-      version = "0.1.22";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
-        sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
-      };
-    };
     "qs-6.0.2" = {
       name = "qs";
       packageName = "qs";
@@ -17699,22 +17807,31 @@ let
         sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
       };
     };
-    "blueimp-md5-2.6.0" = {
-      name = "blueimp-md5";
-      packageName = "blueimp-md5";
-      version = "2.6.0";
+    "bluebird-3.3.5" = {
+      name = "bluebird";
+      packageName = "bluebird";
+      version = "3.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.6.0.tgz";
-        sha1 = "c96dd67f57db522da9a0c49b464ca44e20c04e0f";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.3.5.tgz";
+        sha1 = "5ee747f1c7bd967658b683936430aee753955a34";
       };
     };
-    "color-1.0.3" = {
+    "blueimp-md5-2.3.1" = {
+      name = "blueimp-md5";
+      packageName = "blueimp-md5";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz";
+        sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a";
+      };
+    };
+    "color-0.11.4" = {
       name = "color";
       packageName = "color";
-      version = "1.0.3";
+      version = "0.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color/-/color-1.0.3.tgz";
-        sha1 = "e48e832d85f14ef694fb468811c2d5cfe729b55d";
+        url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz";
+        sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764";
       };
     };
     "crossroads-0.12.2" = {
@@ -17726,22 +17843,31 @@ let
         sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2";
       };
     };
-    "diff2html-2.0.11" = {
+    "diff2html-1.2.0" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "2.0.11";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.0.11.tgz";
-        sha1 = "b0ccb1d8da49702fdc191737c4b1f5e6fa8affc6";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-1.2.0.tgz";
+        sha1 = "8b54af41c180befd9cb1caa130a3d76081ae4a07";
       };
     };
-    "express-session-1.14.2" = {
+    "express-4.13.4" = {
+      name = "express";
+      packageName = "express";
+      version = "4.13.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express/-/express-4.13.4.tgz";
+        sha1 = "3c0b76f3c77590c8345739061ec0bd3ba067ec24";
+      };
+    };
+    "express-session-1.13.0" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.14.2";
+      version = "1.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz";
-        sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.13.0.tgz";
+        sha1 = "8ac3b5c0188b48382851d88207b8e7746efb4011";
       };
     };
     "forever-monitor-1.1.0" = {
@@ -17789,13 +17915,31 @@ let
         sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
       };
     };
-    "npm-4.1.2" = {
+    "lodash-4.12.0" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz";
+        sha1 = "2bd6dc46a040f59e686c972ed21d93dc59053258";
+      };
+    };
+    "moment-2.13.0" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.13.0.tgz";
+        sha1 = "24162d99521e6d40f99ae6939e806d2139eaac52";
+      };
+    };
+    "npm-3.9.6" = {
       name = "npm";
       packageName = "npm";
-      version = "4.1.2";
+      version = "3.9.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
-        sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
+        url = "https://registry.npmjs.org/npm/-/npm-3.9.6.tgz";
+        sha1 = "0ef1d272a069ad95bdca8b2dfe6fcd82f4b461d7";
       };
     };
     "octicons-3.5.0" = {
@@ -17816,13 +17960,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-1.1.1" = {
+    "raven-0.11.0" = {
       name = "raven";
       packageName = "raven";
-      version = "1.1.1";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz";
-        sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42";
+        url = "https://registry.npmjs.org/raven/-/raven-0.11.0.tgz";
+        sha1 = "32981138a93e4c8ad08cfc17e46b85b453dc107b";
       };
     };
     "signals-1.0.0" = {
@@ -17843,22 +17987,31 @@ let
         sha1 = "e0767014167825957de7e125c29b0fa89796ea03";
       };
     };
-    "winston-2.3.0" = {
-      name = "winston";
-      packageName = "winston";
-      version = "2.3.0";
+    "socket.io-1.4.8" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "1.4.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.3.0.tgz";
-        sha1 = "207faaab6fccf3fe493743dd2b03dbafc7ceb78c";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.8.tgz";
+        sha1 = "e576f330cd0bed64e55b3fd26df991141884867b";
       };
     };
-    "yargs-6.6.0" = {
+    "winston-2.2.0" = {
+      name = "winston";
+      packageName = "winston";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winston/-/winston-2.2.0.tgz";
+        sha1 = "2c853dd87ab552a8e8485d72cbbf9a2286f029b7";
+      };
+    };
+    "yargs-4.7.1" = {
       name = "yargs";
       packageName = "yargs";
-      version = "6.6.0";
+      version = "4.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
-        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
+        url = "https://registry.npmjs.org/yargs/-/yargs-4.7.1.tgz";
+        sha1 = "e60432658a3387ff269c028eacde4a512e438dff";
       };
     };
     "color-convert-1.8.2" = {
@@ -17870,13 +18023,13 @@ let
         sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339";
       };
     };
-    "color-string-1.4.0" = {
+    "color-string-0.3.0" = {
       name = "color-string";
       packageName = "color-string";
-      version = "1.4.0";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-1.4.0.tgz";
-        sha1 = "2b47f8565fb0eb52f9f77c801992b8ca55d6e898";
+        url = "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz";
+        sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991";
       };
     };
     "color-name-1.1.1" = {
@@ -17888,58 +18041,58 @@ let
         sha1 = "4b1415304cf50028ea81643643bd82ea05803689";
       };
     };
-    "simple-swizzle-0.2.2" = {
-      name = "simple-swizzle";
-      packageName = "simple-swizzle";
-      version = "0.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz";
-        sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a";
-      };
-    };
-    "is-arrayish-0.3.1" = {
-      name = "is-arrayish";
-      packageName = "is-arrayish";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz";
-        sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd";
-      };
-    };
-    "diff-3.2.0" = {
+    "diff-2.2.3" = {
       name = "diff";
       packageName = "diff";
-      version = "3.2.0";
+      version = "2.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
-        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
+        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
+        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
       };
     };
-    "hogan.js-3.0.2" = {
-      name = "hogan.js";
-      packageName = "hogan.js";
-      version = "3.0.2";
+    "cookie-0.1.5" = {
+      name = "cookie";
+      packageName = "cookie";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz";
-        sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd";
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.5.tgz";
+        sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c";
       };
     };
-    "whatwg-fetch-1.1.1" = {
-      name = "whatwg-fetch";
-      packageName = "whatwg-fetch";
-      version = "1.1.1";
+    "finalhandler-0.4.1" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz";
-        sha1 = "ac3c9d39f320c6dce5339969d054ef43dd333319";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
+        sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
       };
     };
-    "crc-3.4.1" = {
+    "send-0.13.1" = {
+      name = "send";
+      packageName = "send";
+      version = "0.13.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.13.1.tgz";
+        sha1 = "a30d5f4c82c8a9bae9ad00a1d9b1bdbe6f199ed7";
+      };
+    };
+    "cookie-0.2.3" = {
+      name = "cookie";
+      packageName = "cookie";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.2.3.tgz";
+        sha1 = "1a59536af68537a21178a01346f87cb059d2ae5c";
+      };
+    };
+    "crc-3.4.0" = {
       name = "crc";
       packageName = "crc";
-      version = "3.4.1";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz";
-        sha1 = "65d5830b1a2569557cfb324c0e679998521473ee";
+        url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz";
+        sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f";
       };
     };
     "broadway-0.2.10" = {
@@ -18068,13 +18221,103 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "node-gyp-3.5.0" = {
+    "lodash.clonedeep-4.3.2" = {
+      name = "lodash.clonedeep";
+      packageName = "lodash.clonedeep";
+      version = "4.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz";
+        sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de";
+      };
+    };
+    "lodash.union-4.4.0" = {
+      name = "lodash.union";
+      packageName = "lodash.union";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz";
+        sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38";
+      };
+    };
+    "lodash.uniq-4.3.0" = {
+      name = "lodash.uniq";
+      packageName = "lodash.uniq";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz";
+        sha1 = "dcad810876841447d8f3ec662323c86a6d938227";
+      };
+    };
+    "lodash.without-4.2.0" = {
+      name = "lodash.without";
+      packageName = "lodash.without";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz";
+        sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6";
+      };
+    };
+    "node-gyp-3.3.1" = {
       name = "node-gyp";
       packageName = "node-gyp";
-      version = "3.5.0";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
-        sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz";
+        sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0";
+      };
+    };
+    "request-2.72.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.72.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz";
+        sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1";
+      };
+    };
+    "retry-0.9.0" = {
+      name = "retry";
+      packageName = "retry";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz";
+        sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d";
+      };
+    };
+    "lodash._baseclone-4.5.7" = {
+      name = "lodash._baseclone";
+      packageName = "lodash._baseclone";
+      version = "4.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz";
+        sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
+      };
+    };
+    "lodash._baseflatten-4.2.1" = {
+      name = "lodash._baseflatten";
+      packageName = "lodash._baseflatten";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz";
+        sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208";
+      };
+    };
+    "lodash._basedifference-4.5.0" = {
+      name = "lodash._basedifference";
+      packageName = "lodash._basedifference";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz";
+        sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938";
+      };
+    };
+    "qs-6.1.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz";
+        sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26";
       };
     };
     "lsmod-1.0.0" = {
@@ -18086,13 +18329,13 @@ let
         sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b";
       };
     };
-    "uuid-3.0.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.0";
+    "stack-trace-0.0.7" = {
+      name = "stack-trace";
+      packageName = "stack-trace";
+      version = "0.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
-        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
+        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
+        sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff";
       };
     };
     "eve-0.4.2" = {
@@ -18104,13 +18347,67 @@ let
         sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
       };
     };
-    "yargs-parser-4.2.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "4.2.1";
+    "engine.io-1.6.11" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "1.6.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
-        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.11.tgz";
+        sha1 = "2533a97a65876c40ffcf95397b7ef9b495c423fe";
+      };
+    };
+    "socket.io-client-1.4.8" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "1.4.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.8.tgz";
+        sha1 = "481b241e73df140ea1a4fb03486a85ad097f5558";
+      };
+    };
+    "ws-1.1.0" = {
+      name = "ws";
+      packageName = "ws";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-1.1.0.tgz";
+        sha1 = "c1d6fd1515d3ceff1f0ae2759bf5fd77030aad1d";
+      };
+    };
+    "engine.io-client-1.6.11" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.6.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.11.tgz";
+        sha1 = "7d250d8fa1c218119ecde51390458a57d5171376";
+      };
+    };
+    "pkg-conf-1.1.3" = {
+      name = "pkg-conf";
+      packageName = "pkg-conf";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-1.1.3.tgz";
+        sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b";
+      };
+    };
+    "set-blocking-1.0.0" = {
+      name = "set-blocking";
+      packageName = "set-blocking";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-1.0.0.tgz";
+        sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5";
+      };
+    };
+    "symbol-0.2.3" = {
+      name = "symbol";
+      packageName = "symbol";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/symbol/-/symbol-0.2.3.tgz";
+        sha1 = "3b9873b8a901e47c6efe21526a3ac372ef28bbc7";
       };
     };
     "kew-0.1.7" = {
@@ -18194,13 +18491,13 @@ let
         sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
       };
     };
-    "node-libs-browser-0.7.0" = {
+    "node-libs-browser-0.6.0" = {
       name = "node-libs-browser";
       packageName = "node-libs-browser";
-      version = "0.7.0";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz";
-        sha1 = "3e272c0819e308935e26674408d7af0e1491b83b";
+        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.6.0.tgz";
+        sha1 = "244806d44d319e048bc8607b5cc4eaf9a29d2e3c";
       };
     };
     "tapable-0.1.10" = {
@@ -18221,13 +18518,13 @@ let
         sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b";
       };
     };
-    "webpack-core-0.6.9" = {
+    "webpack-core-0.6.8" = {
       name = "webpack-core";
       packageName = "webpack-core";
-      version = "0.6.9";
+      version = "0.6.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz";
-        sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2";
+        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz";
+        sha1 = "edf9135de00a6a3c26dd0f14b208af0aa4af8d0a";
       };
     };
     "memory-fs-0.2.0" = {
@@ -18257,40 +18554,76 @@ let
         sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
-    "json5-0.5.1" = {
+    "json5-0.5.0" = {
       name = "json5";
       packageName = "json5";
-      version = "0.5.1";
+      version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
-        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
+        url = "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz";
+        sha1 = "9b20715b026cbe3778fd769edccd822d8332a5b2";
       };
     };
-    "crypto-browserify-3.3.0" = {
+    "assert-1.4.1" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
+        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";
-      version = "3.3.0";
+      version = "3.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz";
-        sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c";
+        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz";
+        sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189";
       };
     };
-    "os-browserify-0.2.1" = {
-      name = "os-browserify";
-      packageName = "os-browserify";
-      version = "0.2.1";
+    "http-browserify-1.7.0" = {
+      name = "http-browserify";
+      packageName = "http-browserify";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz";
-        sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f";
+        url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
+        sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
       };
     };
-    "timers-browserify-2.0.2" = {
-      name = "timers-browserify";
-      packageName = "timers-browserify";
-      version = "2.0.2";
+    "https-browserify-0.0.0" = {
+      name = "https-browserify";
+      packageName = "https-browserify";
+      version = "0.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz";
-        sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86";
+        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
+        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" = {
@@ -18320,31 +18653,166 @@ let
         sha1 = "17ddeddc5f722fb66501658895461977867315ba";
       };
     };
-    "browserify-aes-0.4.0" = {
-      name = "browserify-aes";
-      packageName = "browserify-aes";
-      version = "0.4.0";
+    "Base64-0.2.1" = {
+      name = "Base64";
+      packageName = "Base64";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz";
-        sha1 = "067149b668df31c4b58533e02d01e806d8608e2c";
+        url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
+        sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
       };
     };
-    "setimmediate-1.0.5" = {
-      name = "setimmediate";
-      packageName = "setimmediate";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz";
-        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
-      };
-    };
-    "source-list-map-0.1.8" = {
+    "source-list-map-0.1.6" = {
       name = "source-list-map";
       packageName = "source-list-map";
-      version = "0.1.8";
+      version = "0.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz";
-        sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106";
+        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.6.tgz";
+        sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f";
+      };
+    };
+    "babel-runtime-6.18.0" = {
+      name = "babel-runtime";
+      packageName = "babel-runtime";
+      version = "6.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz";
+        sha1 = "0f4177ffd98492ef13b9f823e9994a02584c9078";
+      };
+    };
+    "death-1.0.0" = {
+      name = "death";
+      packageName = "death";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/death/-/death-1.0.0.tgz";
+        sha1 = "4d46e15488d4b636b699f0671b04632d752fd2de";
+      };
+    };
+    "detect-indent-4.0.0" = {
+      name = "detect-indent";
+      packageName = "detect-indent";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz";
+        sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
+      };
+    };
+    "invariant-2.2.2" = {
+      name = "invariant";
+      packageName = "invariant";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz";
+        sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360";
+      };
+    };
+    "is-ci-1.0.10" = {
+      name = "is-ci";
+      packageName = "is-ci";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz";
+        sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
+      };
+    };
+    "leven-2.0.0" = {
+      name = "leven";
+      packageName = "leven";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/leven/-/leven-2.0.0.tgz";
+        sha1 = "74c45744439550da185801912829f61d22071bc1";
+      };
+    };
+    "node-emoji-1.4.1" = {
+      name = "node-emoji";
+      packageName = "node-emoji";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.4.1.tgz";
+        sha1 = "c9fa0cf91094335bcb967a6f42b2305c15af2ebc";
+      };
+    };
+    "object-path-0.11.3" = {
+      name = "object-path";
+      packageName = "object-path";
+      version = "0.11.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-path/-/object-path-0.11.3.tgz";
+        sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554";
+      };
+    };
+    "proper-lockfile-1.2.0" = {
+      name = "proper-lockfile";
+      packageName = "proper-lockfile";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz";
+        sha1 = "ceff5dd89d3e5f10fb75e1e8e76bc75801a59c34";
+      };
+    };
+    "request-capture-har-1.1.4" = {
+      name = "request-capture-har";
+      packageName = "request-capture-har";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.1.4.tgz";
+        sha1 = "e6ad76eb8e7a1714553fdbeef32cd4518e4e2013";
+      };
+    };
+    "roadrunner-1.1.0" = {
+      name = "roadrunner";
+      packageName = "roadrunner";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz";
+        sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
+      };
+    };
+    "regenerator-runtime-0.9.6" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.9.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz";
+        sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029";
+      };
+    };
+    "loose-envify-1.3.0" = {
+      name = "loose-envify";
+      packageName = "loose-envify";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz";
+        sha1 = "6b26248c42f6d4fa4b0d8542f78edfcde35642a8";
+      };
+    };
+    "ci-info-1.0.0" = {
+      name = "ci-info";
+      packageName = "ci-info";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz";
+        sha1 = "dc5285f2b4e251821683681c381c3388f46ec534";
+      };
+    };
+    "string.prototype.codepointat-0.2.0" = {
+      name = "string.prototype.codepointat";
+      packageName = "string.prototype.codepointat";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz";
+        sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78";
+      };
+    };
+    "err-code-1.1.1" = {
+      name = "err-code";
+      packageName = "err-code";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.1.tgz";
+        sha1 = "739d71b6851f24d050ea18c79a5b722420771d59";
       };
     };
   };
@@ -18353,10 +18821,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.5";
+    version = "1.9.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz";
-      sha1 = "78be031931f4b9012f6085e1544069c56dcba233";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.4.tgz";
+      sha1 = "8f85b28758ed0e7a251a635cd2e6a73ce92e9dde";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -18398,20 +18866,21 @@ in
           sources."uglify-to-browserify-1.0.2"
         ];
       })
-      sources."resolve-1.2.0"
+      sources."resolve-1.1.7"
       (sources."global-paths-0.1.2" // {
         dependencies = [
           sources."array-unique-0.2.1"
           (sources."global-modules-0.2.3" // {
             dependencies = [
-              (sources."global-prefix-0.1.5" // {
+              (sources."global-prefix-0.1.4" // {
                 dependencies = [
-                  (sources."homedir-polyfill-1.0.1" // {
+                  sources."ini-1.3.4"
+                  (sources."osenv-0.1.3" // {
                     dependencies = [
-                      sources."parse-passwd-1.0.0"
+                      sources."os-homedir-1.0.2"
+                      sources."os-tmpdir-1.0.2"
                     ];
                   })
-                  sources."ini-1.3.4"
                   (sources."which-1.2.12" // {
                     dependencies = [
                       sources."isexe-1.1.2"
@@ -18457,10 +18926,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.8";
+    version = "0.10.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz";
-      sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.7.tgz";
+      sha1 = "48e59f6be202122c0d71153efab4f924065da586";
     };
     dependencies = [
       (sources."adal-node-0.1.21" // {
@@ -18469,17 +18938,21 @@ in
           (sources."jws-3.1.4" // {
             dependencies = [
               sources."base64url-2.0.0"
-              (sources."jwa-1.1.5" // {
+              (sources."jwa-1.1.4" // {
                 dependencies = [
                   sources."buffer-equal-constant-time-1.0.1"
-                  sources."ecdsa-sig-formatter-1.0.9"
+                  (sources."ecdsa-sig-formatter-1.0.7" // {
+                    dependencies = [
+                      sources."base64-url-1.3.3"
+                    ];
+                  })
                 ];
               })
               sources."safe-buffer-5.0.1"
             ];
           })
           sources."node-uuid-1.4.7"
-          sources."xmldom-0.1.27"
+          sources."xmldom-0.1.22"
           sources."xpath.js-1.0.7"
         ];
       })
@@ -18498,11 +18971,9 @@ in
         ];
       })
       sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-cdn-1.0.0"
+      sources."azure-arm-cdn-0.2.1"
       sources."azure-arm-commerce-0.2.0"
-      sources."azure-arm-compute-0.19.1"
-      sources."azure-arm-datalake-analytics-1.0.1-preview"
-      sources."azure-arm-datalake-store-1.0.1-preview"
+      sources."azure-arm-compute-0.19.0"
       sources."azure-arm-hdinsight-0.2.2"
       sources."azure-arm-hdinsight-jobs-0.1.0"
       sources."azure-arm-insights-0.11.3"
@@ -18514,6 +18985,8 @@ in
       sources."azure-arm-dns-0.11.1"
       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"
@@ -18528,7 +19001,7 @@ in
         ];
       })
       sources."azure-asm-network-0.13.0"
-      sources."azure-arm-resource-1.6.1-preview"
+      sources."azure-arm-resource-1.4.5-preview"
       sources."azure-arm-storage-0.13.1-preview"
       sources."azure-asm-sb-0.10.1"
       sources."azure-asm-sql-0.10.1"
@@ -18570,7 +19043,7 @@ in
       sources."azure-arm-batch-0.3.0"
       sources."azure-batch-0.5.2"
       sources."azure-servicefabric-0.1.4"
-      sources."applicationinsights-0.16.0"
+      sources."applicationinsights-0.15.12"
       (sources."caller-id-0.1.0" // {
         dependencies = [
           sources."stack-trace-0.0.9"
@@ -18626,7 +19099,7 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.17.1"
+      sources."moment-2.17.0"
       (sources."ms-rest-1.15.2" // {
         dependencies = [
           sources."duplexer-0.1.1"
@@ -18640,6 +19113,7 @@ in
         ];
       })
       sources."node-forge-0.6.23"
+      sources."node-uuid-1.2.0"
       sources."omelette-0.1.0"
       (sources."openssl-wrapper-0.2.1" // {
         dependencies = [
@@ -18746,7 +19220,7 @@ in
             dependencies = [
               (sources."async-2.1.4" // {
                 dependencies = [
-                  sources."lodash-4.17.4"
+                  sources."lodash-4.17.2"
                 ];
               })
             ];
@@ -18759,12 +19233,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -18783,7 +19257,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.1"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -18812,14 +19286,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.2" // {
+              (sources."sshpk-1.10.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.1"
+                  sources."dashdash-1.14.0"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.5"
+                  sources."tweetnacl-0.14.3"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -18830,9 +19304,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.25.0"
             ];
           })
           sources."node-uuid-1.4.7"
@@ -18867,13 +19341,12 @@ in
       sources."streamline-streams-0.1.5"
       (sources."sync-request-3.0.0" // {
         dependencies = [
-          (sources."concat-stream-1.6.0" // {
+          (sources."concat-stream-1.5.2" // {
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.0.6" // {
                 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"
@@ -18906,7 +19379,6 @@ in
           sources."os-homedir-1.0.2"
         ];
       })
-      sources."uuid-3.0.1"
       sources."validator-5.2.0"
       (sources."winston-2.1.1" // {
         dependencies = [
@@ -18927,7 +19399,7 @@ in
       sources."xmlbuilder-0.4.3"
       (sources."read-1.0.7" // {
         dependencies = [
-          sources."mute-stream-0.0.7"
+          sources."mute-stream-0.0.6"
         ];
       })
     ];
@@ -19052,7 +19524,7 @@ in
                           sources."array-find-index-1.0.2"
                         ];
                       })
-                      sources."signal-exit-3.0.2"
+                      sources."signal-exit-3.0.1"
                     ];
                   })
                   sources."map-obj-1.0.1"
@@ -19219,7 +19691,7 @@ in
       (sources."promised-temp-0.1.0" // {
         dependencies = [
           sources."q-1.4.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -19276,19 +19748,19 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "13.3.0";
+    version = "13.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
-      sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
+      url = "https://registry.npmjs.org/browserify/-/browserify-13.1.1.tgz";
+      sha1 = "72a2310e2f706ed87db929cf0ee73a5e195d9bb0";
     };
     dependencies = [
-      (sources."JSONStream-1.3.0" // {
+      (sources."JSONStream-1.2.1" // {
         dependencies = [
           sources."jsonparse-1.2.0"
           sources."through-2.3.8"
         ];
       })
-      sources."assert-1.4.1"
+      sources."assert-1.3.0"
       (sources."browser-pack-6.0.2" // {
         dependencies = [
           (sources."combine-source-map-0.7.2" // {
@@ -19302,11 +19774,7 @@ in
           sources."umd-3.0.1"
         ];
       })
-      (sources."browser-resolve-1.11.2" // {
-        dependencies = [
-          sources."resolve-1.1.7"
-        ];
-      })
+      sources."browser-resolve-1.11.2"
       (sources."browserify-zlib-0.1.4" // {
         dependencies = [
           sources."pako-0.2.9"
@@ -19374,7 +19842,7 @@ in
               })
               (sources."parse-asn1-5.0.0" // {
                 dependencies = [
-                  (sources."asn1.js-4.9.1" // {
+                  (sources."asn1.js-4.9.0" // {
                     dependencies = [
                       sources."minimalistic-assert-1.0.0"
                     ];
@@ -19426,7 +19894,7 @@ in
               sources."browserify-rsa-4.0.1"
               (sources."parse-asn1-5.0.0" // {
                 dependencies = [
-                  (sources."asn1.js-4.9.1" // {
+                  (sources."asn1.js-4.9.0" // {
                     dependencies = [
                       sources."minimalistic-assert-1.0.0"
                     ];
@@ -19450,9 +19918,8 @@ in
       sources."domain-browser-1.1.7"
       sources."duplexer2-0.1.4"
       sources."events-1.1.1"
-      (sources."glob-7.1.1" // {
+      (sources."glob-5.0.15" // {
         dependencies = [
-          sources."fs.realpath-1.0.0"
           (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
@@ -19542,7 +20009,7 @@ in
           sources."util-deprecate-1.0.2"
         ];
       })
-      sources."resolve-1.2.0"
+      sources."resolve-1.1.7"
       (sources."shasum-1.0.2" // {
         dependencies = [
           (sources."json-stable-stringify-0.0.1" // {
@@ -19562,9 +20029,9 @@ in
         ];
       })
       sources."stream-browserify-2.0.1"
-      (sources."stream-http-2.6.1" // {
+      (sources."stream-http-2.5.0" // {
         dependencies = [
-          sources."builtin-status-codes-3.0.0"
+          sources."builtin-status-codes-2.0.0"
           sources."to-arraybuffer-1.0.1"
         ];
       })
@@ -19579,7 +20046,18 @@ in
           sources."acorn-2.7.0"
         ];
       })
-      sources."through2-2.0.3"
+      (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.11.0" // {
@@ -19618,7 +20096,7 @@ in
     };
     dependencies = [
       sources."array-loop-1.0.0"
-      (sources."castv2-client-1.2.0" // {
+      (sources."castv2-client-1.1.2" // {
         dependencies = [
           (sources."castv2-0.1.9" // {
             dependencies = [
@@ -19687,7 +20165,7 @@ in
         ];
       })
       sources."debounced-seeker-1.0.0"
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.3.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -19715,7 +20193,7 @@ in
                       sources."array-find-index-1.0.2"
                     ];
                   })
-                  sources."signal-exit-3.0.2"
+                  sources."signal-exit-3.0.1"
                 ];
               })
               sources."map-obj-1.0.1"
@@ -19829,7 +20307,7 @@ in
         dependencies = [
           (sources."airplay-js-0.2.16" // {
             dependencies = [
-              (sources."mdns-js-0.5.3" // {
+              (sources."mdns-js-0.5.1" // {
                 dependencies = [
                   (sources."dns-js-0.2.1" // {
                     dependencies = [
@@ -19843,7 +20321,7 @@ in
                 dependencies = [
                   sources."base64-js-1.1.2"
                   sources."xmlbuilder-8.2.2"
-                  sources."xmldom-0.1.27"
+                  sources."xmldom-0.1.22"
                 ];
               })
             ];
@@ -19871,7 +20349,7 @@ in
             ];
           })
           sources."network-address-0.0.5"
-          sources."numeral-1.5.6"
+          sources."numeral-1.5.5"
           sources."open-0.0.5"
           (sources."optimist-0.6.1" // {
             dependencies = [
@@ -19892,15 +20370,15 @@ in
               (sources."parse-torrent-file-4.0.0" // {
                 dependencies = [
                   sources."bencode-0.10.0"
-                  (sources."simple-sha1-2.1.0" // {
+                  (sources."simple-sha1-2.0.8" // {
                     dependencies = [
-                      sources."rusha-0.8.5"
+                      sources."rusha-0.8.4"
                     ];
                   })
                   sources."uniq-1.0.1"
                 ];
               })
-              (sources."simple-get-2.4.0" // {
+              (sources."simple-get-2.3.0" // {
                 dependencies = [
                   (sources."once-1.4.0" // {
                     dependencies = [
@@ -19955,7 +20433,7 @@ in
                       sources."minimist-0.0.8"
                     ];
                   })
-                  (sources."random-access-file-1.4.0" // {
+                  (sources."random-access-file-1.3.1" // {
                     dependencies = [
                       sources."inherits-2.0.3"
                     ];
@@ -19984,9 +20462,9 @@ in
                   (sources."parse-torrent-file-2.1.4" // {
                     dependencies = [
                       sources."bencode-0.7.0"
-                      (sources."simple-sha1-2.1.0" // {
+                      (sources."simple-sha1-2.0.8" // {
                         dependencies = [
-                          sources."rusha-0.8.5"
+                          sources."rusha-0.8.4"
                         ];
                       })
                     ];
@@ -20099,13 +20577,13 @@ in
                       })
                       sources."random-iterate-1.0.1"
                       sources."run-series-1.1.4"
-                      (sources."simple-get-2.4.0" // {
+                      (sources."simple-get-2.3.0" // {
                         dependencies = [
                           sources."simple-concat-1.0.0"
                           sources."unzip-response-2.0.1"
                         ];
                       })
-                      (sources."simple-peer-6.1.3" // {
+                      (sources."simple-peer-6.0.7" // {
                         dependencies = [
                           sources."get-browser-rtc-1.0.2"
                           sources."randombytes-2.0.3"
@@ -20204,9 +20682,9 @@ in
               (sources."parse-torrent-file-2.1.4" // {
                 dependencies = [
                   sources."bencode-0.7.0"
-                  (sources."simple-sha1-2.1.0" // {
+                  (sources."simple-sha1-2.0.8" // {
                     dependencies = [
-                      sources."rusha-0.8.5"
+                      sources."rusha-0.8.4"
                     ];
                   })
                 ];
@@ -20252,13 +20730,12 @@ in
           (sources."codepage-1.4.0" // {
             dependencies = [
               sources."voc-0.5.0"
-              (sources."concat-stream-1.6.0" // {
+              (sources."concat-stream-1.5.2" // {
                 dependencies = [
                   sources."inherits-2.0.3"
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.2.2" // {
+                  (sources."readable-stream-2.0.6" // {
                     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"
@@ -20268,7 +20745,7 @@ in
                   })
                 ];
               })
-              sources."exit-on-epipe-1.0.0"
+              sources."exit-on-epipe-0.1.0"
               (sources."commander-2.9.0" // {
                 dependencies = [
                   sources."graceful-readlink-1.0.1"
@@ -20285,7 +20762,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.17.4"
+              sources."lodash-4.17.2"
             ];
           })
         ];
@@ -20303,10 +20780,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.12.2";
+    version = "1.11.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
-      sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
+      sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -20365,7 +20842,7 @@ in
               })
             ];
           })
-          (sources."osenv-0.1.4" // {
+          (sources."osenv-0.1.3" // {
             dependencies = [
               sources."os-homedir-1.0.2"
               sources."os-tmpdir-1.0.2"
@@ -20379,7 +20856,7 @@ in
                   sources."lodash-3.10.1"
                 ];
               })
-              sources."xmldom-0.1.27"
+              sources."xmldom-0.1.22"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -20414,7 +20891,7 @@ in
               sources."dependency-ls-1.0.0"
               sources."is-url-1.2.2"
               sources."q-1.4.1"
-              (sources."shelljs-0.7.6" // {
+              (sources."shelljs-0.7.5" // {
                 dependencies = [
                   (sources."glob-7.1.1" // {
                     dependencies = [
@@ -20446,7 +20923,7 @@ in
                   sources."interpret-1.0.1"
                   (sources."rechoir-0.6.2" // {
                     dependencies = [
-                      sources."resolve-1.2.0"
+                      sources."resolve-1.1.7"
                     ];
                   })
                 ];
@@ -20462,7 +20939,7 @@ in
             dependencies = [
               (sources."browserify-13.1.0" // {
                 dependencies = [
-                  (sources."JSONStream-1.3.0" // {
+                  (sources."JSONStream-1.2.1" // {
                     dependencies = [
                       sources."jsonparse-1.2.0"
                       sources."through-2.3.8"
@@ -20482,11 +20959,7 @@ in
                       sources."umd-3.0.1"
                     ];
                   })
-                  (sources."browser-resolve-1.11.2" // {
-                    dependencies = [
-                      sources."resolve-1.1.7"
-                    ];
-                  })
+                  sources."browser-resolve-1.11.2"
                   (sources."browserify-zlib-0.1.4" // {
                     dependencies = [
                       sources."pako-0.2.9"
@@ -20553,7 +21026,7 @@ in
                           })
                           (sources."parse-asn1-5.0.0" // {
                             dependencies = [
-                              (sources."asn1.js-4.9.1" // {
+                              (sources."asn1.js-4.9.0" // {
                                 dependencies = [
                                   sources."minimalistic-assert-1.0.0"
                                 ];
@@ -20605,7 +21078,7 @@ in
                           sources."browserify-rsa-4.0.1"
                           (sources."parse-asn1-5.0.0" // {
                             dependencies = [
-                              (sources."asn1.js-4.9.1" // {
+                              (sources."asn1.js-4.9.0" // {
                                 dependencies = [
                                   sources."minimalistic-assert-1.0.0"
                                 ];
@@ -20696,7 +21169,7 @@ in
                       sources."util-deprecate-1.0.2"
                     ];
                   })
-                  sources."resolve-1.2.0"
+                  sources."resolve-1.1.7"
                   (sources."shasum-1.0.2" // {
                     dependencies = [
                       (sources."json-stable-stringify-0.0.1" // {
@@ -20716,9 +21189,9 @@ in
                     ];
                   })
                   sources."stream-browserify-2.0.1"
-                  (sources."stream-http-2.6.1" // {
+                  (sources."stream-http-2.5.0" // {
                     dependencies = [
-                      sources."builtin-status-codes-3.0.0"
+                      sources."builtin-status-codes-2.0.0"
                       sources."to-arraybuffer-1.0.1"
                     ];
                   })
@@ -20733,7 +21206,18 @@ in
                       sources."acorn-2.7.0"
                     ];
                   })
-                  sources."through2-2.0.3"
+                  (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.11.0" // {
@@ -20758,7 +21242,7 @@ in
             ];
           })
           sources."cordova-registry-mapper-1.1.15"
-          (sources."cordova-serve-1.0.1" // {
+          (sources."cordova-serve-1.0.0" // {
             dependencies = [
               (sources."chalk-1.1.3" // {
                 dependencies = [
@@ -20766,12 +21250,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -20781,9 +21265,9 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -20792,7 +21276,7 @@ in
                   sources."bytes-2.3.0"
                   (sources."compressible-2.0.9" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                   (sources."debug-2.2.0" // {
@@ -20808,9 +21292,9 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -20846,10 +21330,10 @@ in
                   })
                   sources."parseurl-1.3.1"
                   sources."path-to-regexp-0.1.7"
-                  (sources."proxy-addr-1.1.3" // {
+                  (sources."proxy-addr-1.1.2" // {
                     dependencies = [
                       sources."forwarded-0.1.0"
-                      sources."ipaddr.js-1.2.0"
+                      sources."ipaddr.js-1.1.1"
                     ];
                   })
                   sources."qs-6.2.0"
@@ -20872,9 +21356,9 @@ in
                   (sources."type-is-1.6.14" // {
                     dependencies = [
                       sources."media-typer-0.3.0"
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
                     ];
@@ -20959,7 +21443,7 @@ in
               sources."promzard-0.3.0"
               (sources."read-1.0.7" // {
                 dependencies = [
-                  sources."mute-stream-0.0.7"
+                  sources."mute-stream-0.0.6"
                 ];
               })
               (sources."read-package-json-2.0.4" // {
@@ -21066,8 +21550,8 @@ in
               sources."inflight-1.0.6"
               sources."inherits-2.0.3"
               sources."ini-1.3.4"
-              sources."lockfile-1.0.3"
-              (sources."lru-cache-4.0.2" // {
+              sources."lockfile-1.0.2"
+              (sources."lru-cache-4.0.1" // {
                 dependencies = [
                   sources."pseudomap-1.0.2"
                   sources."yallist-2.0.0"
@@ -21094,7 +21578,7 @@ in
                     dependencies = [
                       (sources."array-index-1.0.0" // {
                         dependencies = [
-                          (sources."debug-2.6.0" // {
+                          (sources."debug-2.3.3" // {
                             dependencies = [
                               sources."ms-0.7.2"
                             ];
@@ -21130,12 +21614,11 @@ in
               sources."npm-package-arg-4.1.1"
               (sources."npm-registry-client-7.2.1" // {
                 dependencies = [
-                  (sources."concat-stream-1.6.0" // {
+                  (sources."concat-stream-1.5.2" // {
                     dependencies = [
                       sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.2.2" // {
+                      (sources."readable-stream-2.0.6" // {
                         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"
@@ -21166,7 +21649,7 @@ in
                 ];
               })
               sources."once-1.4.0"
-              (sources."osenv-0.1.4" // {
+              (sources."osenv-0.1.3" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                   sources."os-tmpdir-1.0.2"
@@ -21175,7 +21658,7 @@ in
               sources."path-is-inside-1.0.2"
               (sources."read-1.0.7" // {
                 dependencies = [
-                  sources."mute-stream-0.0.7"
+                  sources."mute-stream-0.0.6"
                 ];
               })
               (sources."read-installed-4.0.3" // {
@@ -21239,7 +21722,7 @@ in
                     dependencies = [
                       (sources."async-2.1.4" // {
                         dependencies = [
-                          sources."lodash-4.17.4"
+                          sources."lodash-4.17.2"
                         ];
                       })
                     ];
@@ -21267,7 +21750,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-4.0.1"
+                          sources."jsonpointer-4.0.0"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -21296,14 +21779,14 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.10.2" // {
+                      (sources."sshpk-1.10.1" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.1"
+                          sources."dashdash-1.14.0"
                           sources."getpass-0.1.6"
                           sources."jsbn-0.1.0"
-                          sources."tweetnacl-0.14.5"
+                          sources."tweetnacl-0.14.3"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.0"
@@ -21314,9 +21797,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.13" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                   sources."node-uuid-1.4.7"
@@ -21331,7 +21814,7 @@ in
                   sources."tunnel-agent-0.4.3"
                 ];
               })
-              sources."retry-0.10.1"
+              sources."retry-0.10.0"
               sources."rimraf-2.5.4"
               sources."semver-5.1.1"
               sources."sha-2.0.1"
@@ -21361,7 +21844,7 @@ in
               })
               sources."wrappy-1.0.2"
               sources."write-file-atomic-1.1.4"
-              sources."ansi-regex-2.1.1"
+              sources."ansi-regex-2.0.0"
               sources."imurmurhash-0.1.4"
             ];
           })
@@ -21374,7 +21857,7 @@ in
                   sources."lodash-3.10.1"
                 ];
               })
-              sources."xmldom-0.1.27"
+              sources."xmldom-0.1.22"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -21504,7 +21987,7 @@ in
           })
         ];
       })
-      (sources."insight-0.8.4" // {
+      (sources."insight-0.8.3" // {
         dependencies = [
           sources."async-1.5.2"
           (sources."chalk-1.1.3" // {
@@ -21513,12 +21996,12 @@ in
               sources."escape-string-regexp-1.0.5"
               (sources."has-ansi-2.0.0" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
               sources."supports-color-2.0.0"
@@ -21533,13 +22016,13 @@ in
                 ];
               })
               sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.4" // {
+              (sources."osenv-0.1.3" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                 ];
               })
               sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.3.1" // {
+              (sources."write-file-atomic-1.2.0" // {
                 dependencies = [
                   sources."imurmurhash-0.1.4"
                   sources."slide-1.1.6"
@@ -21555,7 +22038,7 @@ in
           (sources."inquirer-0.10.1" // {
             dependencies = [
               sources."ansi-escapes-1.4.0"
-              sources."ansi-regex-2.1.1"
+              sources."ansi-regex-2.0.0"
               (sources."cli-cursor-1.0.2" // {
                 dependencies = [
                   (sources."restore-cursor-1.0.1" // {
@@ -21603,6 +22086,7 @@ in
               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 = [
@@ -21650,7 +22134,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.1"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -21679,14 +22163,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.2" // {
+                  (sources."sshpk-1.10.1" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.1"
+                      sources."dashdash-1.14.0"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.5"
+                      sources."tweetnacl-0.14.3"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -21697,15 +22181,16 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
               sources."qs-6.3.0"
               sources."stringstream-0.0.5"
               sources."tunnel-agent-0.4.3"
+              sources."uuid-3.0.0"
             ];
           })
           (sources."tough-cookie-2.3.2" // {
@@ -21713,7 +22198,6 @@ in
               sources."punycode-1.4.1"
             ];
           })
-          sources."uuid-3.0.1"
         ];
       })
       (sources."nopt-3.0.1" // {
@@ -21731,12 +22215,12 @@ in
               sources."escape-string-regexp-1.0.5"
               (sources."has-ansi-2.0.0" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
               sources."supports-color-2.0.0"
@@ -21752,13 +22236,13 @@ in
               })
               sources."object-assign-4.1.0"
               sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.4" // {
+              (sources."osenv-0.1.3" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                 ];
               })
               sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.3.1" // {
+              (sources."write-file-atomic-1.2.0" // {
                 dependencies = [
                   sources."imurmurhash-0.1.4"
                   sources."slide-1.1.6"
@@ -21871,7 +22355,7 @@ in
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
             ];
@@ -21889,14 +22373,14 @@ in
   csslint = nodeEnv.buildNodePackage {
     name = "csslint";
     packageName = "csslint";
-    version = "1.0.5";
+    version = "1.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz";
-      sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9";
+      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.4.tgz";
+      sha1 = "0d3907933cc3f04b56960496d573387fbe9bb1e7";
     };
     dependencies = [
-      sources."clone-2.1.0"
-      sources."parserlib-1.1.1"
+      sources."clone-1.0.2"
+      sources."parserlib-1.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -21932,9 +22416,9 @@ in
         dependencies = [
           (sources."accepts-1.2.13" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."negotiator-0.5.3"
@@ -21999,7 +22483,7 @@ in
       (sources."hiredis-0.4.1" // {
         dependencies = [
           sources."bindings-1.2.1"
-          sources."nan-2.5.0"
+          sources."nan-2.4.0"
         ];
       })
       (sources."json-rpc2-0.8.1" // {
@@ -22118,7 +22602,7 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -22340,29 +22824,12 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."ndjson-1.5.0" // {
+      (sources."ndjson-1.4.3" // {
         dependencies = [
-          sources."json-stringify-safe-5.0.1"
           sources."minimist-1.2.0"
-          sources."split2-2.1.1"
-          (sources."through2-2.0.3" // {
-            dependencies = [
-              (sources."readable-stream-2.2.2" // {
-                dependencies = [
-                  sources."buffer-shims-1.0.0"
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
-                  sources."inherits-2.0.3"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
-            ];
-          })
         ];
       })
-      (sources."pump-1.0.2" // {
+      (sources."pump-1.0.1" // {
         dependencies = [
           (sources."once-1.4.0" // {
             dependencies = [
@@ -22432,7 +22899,20 @@ in
       })
       (sources."tar-stream-1.5.2" // {
         dependencies = [
-          sources."bl-1.2.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."readable-stream-2.2.2" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
@@ -22472,25 +22952,24 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "3.0.2";
+    version = "2.4.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.0.2.tgz";
-      sha1 = "0f010dbd6e26db0270abd88e3e5403062eb4f7a4";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-2.4.2.tgz";
+      sha1 = "757c98aea05ee8714f0de2a33224c4136414633e";
     };
     dependencies = [
-      (sources."JSONStream-1.3.0" // {
+      (sources."JSONStream-1.1.4" // {
         dependencies = [
           sources."jsonparse-1.2.0"
           sources."through-2.3.8"
         ];
       })
-      (sources."async-2.1.4" // {
+      (sources."async-2.0.1" // {
         dependencies = [
-          sources."lodash-4.17.4"
+          sources."lodash-4.17.2"
         ];
       })
       sources."aws4-1.5.0"
-      sources."awscred-1.2.0"
       (sources."optimist-0.6.1" // {
         dependencies = [
           sources."wordwrap-0.0.3"
@@ -22521,12 +23000,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -22545,7 +23024,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.1"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -22574,14 +23053,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.2" // {
+              (sources."sshpk-1.10.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.1"
+                  sources."dashdash-1.14.0"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.5"
+                  sources."tweetnacl-0.14.3"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -22592,9 +23071,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.25.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -22606,7 +23085,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.1"
+          sources."uuid-3.0.0"
         ];
       })
     ];
@@ -22621,10 +23100,10 @@ in
   emoj = nodeEnv.buildNodePackage {
     name = "emoj";
     packageName = "emoj";
-    version = "1.0.0";
+    version = "0.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emoj/-/emoj-1.0.0.tgz";
-      sha1 = "3cccbeec420e2b45f73b923e880c220392c055bd";
+      url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz";
+      sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c";
     };
     dependencies = [
       (sources."chalk-1.1.3" // {
@@ -22633,55 +23112,13 @@ in
           sources."escape-string-regexp-1.0.5"
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.1.1"
+              sources."ansi-regex-2.0.0"
             ];
           })
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."clipboardy-0.1.2" // {
-        dependencies = [
-          (sources."execa-0.5.1" // {
-            dependencies = [
-              (sources."cross-spawn-4.0.2" // {
-                dependencies = [
-                  (sources."lru-cache-4.0.2" // {
-                    dependencies = [
-                      sources."pseudomap-1.0.2"
-                      sources."yallist-2.0.0"
-                    ];
-                  })
-                  (sources."which-1.2.12" // {
-                    dependencies = [
-                      sources."isexe-1.1.2"
-                    ];
-                  })
-                ];
-              })
-              (sources."get-stream-2.3.1" // {
-                dependencies = [
-                  sources."object-assign-4.1.0"
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
-                    ];
-                  })
-                ];
-              })
-              sources."is-stream-1.1.0"
-              (sources."npm-run-path-2.0.2" // {
-                dependencies = [
-                  sources."path-key-2.0.1"
-                ];
-              })
-              sources."p-finally-1.0.0"
-              sources."signal-exit-3.0.2"
-              sources."strip-eof-1.0.0"
-            ];
-          })
-        ];
-      })
-      (sources."got-6.7.1" // {
+      (sources."got-6.6.3" // {
         dependencies = [
           (sources."create-error-class-3.0.2" // {
             dependencies = [
@@ -22689,13 +23126,22 @@ in
             ];
           })
           sources."duplexer3-0.1.4"
-          sources."get-stream-3.0.0"
+          (sources."get-stream-2.3.1" // {
+            dependencies = [
+              sources."object-assign-4.1.0"
+              (sources."pinkie-promise-2.0.1" // {
+                dependencies = [
+                  sources."pinkie-2.0.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."safe-buffer-5.0.1"
-          sources."timed-out-4.0.0"
+          sources."node-status-codes-2.0.1"
+          sources."timed-out-3.0.0"
           sources."unzip-response-2.0.1"
           (sources."url-parse-lax-1.0.0" // {
             dependencies = [
@@ -22706,7 +23152,7 @@ in
       })
       (sources."has-ansi-2.0.0" // {
         dependencies = [
-          sources."ansi-regex-2.1.1"
+          sources."ansi-regex-2.0.0"
         ];
       })
       sources."lodash.debounce-4.0.8"
@@ -22725,11 +23171,7 @@ in
           })
         ];
       })
-      (sources."mem-1.1.0" // {
-        dependencies = [
-          sources."mimic-fn-1.1.0"
-        ];
-      })
+      sources."mem-0.1.1"
       (sources."meow-3.7.0" // {
         dependencies = [
           (sources."camelcase-keys-2.1.0" // {
@@ -22745,7 +23187,7 @@ in
                   sources."array-find-index-1.0.2"
                 ];
               })
-              sources."signal-exit-3.0.2"
+              sources."signal-exit-3.0.1"
             ];
           })
           sources."map-obj-1.0.1"
@@ -22863,13 +23305,13 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.13.1";
+    version = "3.10.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz";
-      sha1 = "564d2646b5efded85df96985332edd91a23bff25";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz";
+      sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7";
     };
     dependencies = [
-      (sources."babel-code-frame-6.20.0" // {
+      (sources."babel-code-frame-6.16.0" // {
         dependencies = [
           sources."js-tokens-2.0.0"
         ];
@@ -22880,24 +23322,23 @@ in
           sources."escape-string-regexp-1.0.5"
           (sources."has-ansi-2.0.0" // {
             dependencies = [
-              sources."ansi-regex-2.1.1"
+              sources."ansi-regex-2.0.0"
             ];
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.1.1"
+              sources."ansi-regex-2.0.0"
             ];
           })
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."concat-stream-1.6.0" // {
+      (sources."concat-stream-1.5.2" // {
         dependencies = [
           sources."inherits-2.0.3"
           sources."typedarray-0.0.6"
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-2.0.6" // {
             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"
@@ -22907,7 +23348,7 @@ in
           })
         ];
       })
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.3.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -22947,7 +23388,7 @@ in
       })
       (sources."espree-3.3.2" // {
         dependencies = [
-          sources."acorn-4.0.4"
+          sources."acorn-4.0.3"
           (sources."acorn-jsx-3.0.1" // {
             dependencies = [
               sources."acorn-3.3.0"
@@ -22959,7 +23400,7 @@ in
       sources."esutils-2.0.2"
       (sources."file-entry-cache-2.0.0" // {
         dependencies = [
-          (sources."flat-cache-1.2.2" // {
+          (sources."flat-cache-1.2.1" // {
             dependencies = [
               sources."circular-json-0.3.1"
               (sources."del-2.2.2" // {
@@ -23029,7 +23470,7 @@ in
       (sources."inquirer-0.12.0" // {
         dependencies = [
           sources."ansi-escapes-1.4.0"
-          sources."ansi-regex-2.1.1"
+          sources."ansi-regex-2.0.0"
           (sources."cli-cursor-1.0.2" // {
             dependencies = [
               (sources."restore-cursor-1.0.1" // {
@@ -23090,7 +23531,7 @@ in
               sources."is-property-1.0.2"
             ];
           })
-          sources."jsonpointer-4.0.1"
+          sources."jsonpointer-4.0.0"
           sources."xtend-4.0.1"
         ];
       })
@@ -23120,7 +23561,7 @@ in
           sources."type-check-0.3.2"
         ];
       })
-      sources."lodash-4.17.4"
+      sources."lodash-4.17.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -23133,7 +23574,7 @@ in
           sources."deep-is-0.1.3"
           sources."wordwrap-1.0.0"
           sources."type-check-0.3.2"
-          sources."fast-levenshtein-2.0.6"
+          sources."fast-levenshtein-2.0.5"
         ];
       })
       sources."path-is-inside-1.0.2"
@@ -23149,33 +23590,33 @@ in
           sources."resolve-from-1.0.1"
         ];
       })
-      (sources."shelljs-0.7.6" // {
+      (sources."shelljs-0.7.5" // {
         dependencies = [
           sources."interpret-1.0.1"
           (sources."rechoir-0.6.2" // {
             dependencies = [
-              sources."resolve-1.2.0"
+              sources."resolve-1.1.7"
             ];
           })
         ];
       })
       sources."strip-bom-3.0.0"
-      sources."strip-json-comments-2.0.1"
+      sources."strip-json-comments-1.0.4"
       (sources."table-3.8.3" // {
         dependencies = [
-          (sources."ajv-4.10.4" // {
+          (sources."ajv-4.9.0" // {
             dependencies = [
               sources."co-4.6.0"
             ];
           })
-          sources."ajv-keywords-1.5.0"
+          sources."ajv-keywords-1.1.1"
           sources."slice-ansi-0.0.4"
           (sources."string-width-2.0.0" // {
             dependencies = [
               sources."is-fullwidth-code-point-2.0.0"
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
             ];
@@ -23200,10 +23641,10 @@ in
   emojione = nodeEnv.buildNodePackage {
     name = "emojione";
     packageName = "emojione";
-    version = "2.2.7";
+    version = "2.2.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-2.2.7.tgz";
-      sha1 = "46457cf6b9b2f8da13ae8a2e4e547de06ee15e96";
+      url = "https://registry.npmjs.org/emojione/-/emojione-2.2.6.tgz";
+      sha1 = "67dec452937d5b14ee669207ea41cdb1f69fb8f6";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -23292,7 +23733,7 @@ in
               sources."pkginfo-0.4.0"
               (sources."read-1.0.7" // {
                 dependencies = [
-                  sources."mute-stream-0.0.7"
+                  sources."mute-stream-0.0.6"
                 ];
               })
               sources."revalidator-0.1.8"
@@ -23347,7 +23788,7 @@ in
                                       sources."isarray-1.0.0"
                                     ];
                                   })
-                                  sources."randomatic-1.1.6"
+                                  sources."randomatic-1.1.5"
                                   sources."repeat-string-1.6.1"
                                 ];
                               })
@@ -23365,7 +23806,7 @@ in
                       sources."extglob-0.3.2"
                       sources."filename-regex-2.0.0"
                       sources."is-extglob-1.0.0"
-                      (sources."kind-of-3.1.0" // {
+                      (sources."kind-of-3.0.4" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -23402,7 +23843,7 @@ in
               sources."inherits-2.0.3"
               (sources."is-binary-path-1.0.1" // {
                 dependencies = [
-                  sources."binary-extensions-1.8.0"
+                  sources."binary-extensions-1.7.0"
                 ];
               })
               (sources."is-glob-2.0.1" // {
@@ -23426,10 +23867,10 @@ in
                   sources."set-immediate-shim-1.0.1"
                 ];
               })
-              (sources."fsevents-1.0.17" // {
+              (sources."fsevents-1.0.15" // {
                 dependencies = [
-                  sources."nan-2.5.0"
-                  (sources."node-pre-gyp-0.6.32" // {
+                  sources."nan-2.4.0"
+                  (sources."node-pre-gyp-0.6.31" // {
                     dependencies = [
                       (sources."mkdirp-0.5.1" // {
                         dependencies = [
@@ -23441,7 +23882,7 @@ in
                           sources."abbrev-1.0.9"
                         ];
                       })
-                      (sources."npmlog-4.0.2" // {
+                      (sources."npmlog-4.0.1" // {
                         dependencies = [
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
@@ -23459,13 +23900,13 @@ in
                             ];
                           })
                           sources."console-control-strings-1.1.0"
-                          (sources."gauge-2.7.2" // {
+                          (sources."gauge-2.7.1" // {
                             dependencies = [
                               sources."aproba-1.0.4"
-                              sources."supports-color-0.2.0"
+                              sources."has-color-0.1.7"
                               sources."has-unicode-2.0.1"
                               sources."object-assign-4.1.0"
-                              sources."signal-exit-3.0.2"
+                              sources."signal-exit-3.0.1"
                               (sources."string-width-1.0.2" // {
                                 dependencies = [
                                   sources."code-point-at-1.1.0"
@@ -23478,7 +23919,7 @@ in
                               })
                               (sources."strip-ansi-3.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.1.1"
+                                  sources."ansi-regex-2.0.0"
                                 ];
                               })
                               sources."wide-align-1.1.0"
@@ -23520,12 +23961,12 @@ in
                                   sources."escape-string-regexp-1.0.5"
                                   (sources."has-ansi-2.0.0" // {
                                     dependencies = [
-                                      sources."ansi-regex-2.1.1"
+                                      sources."ansi-regex-2.0.0"
                                     ];
                                   })
                                   (sources."strip-ansi-3.0.1" // {
                                     dependencies = [
-                                      sources."ansi-regex-2.1.1"
+                                      sources."ansi-regex-2.0.0"
                                     ];
                                   })
                                   sources."supports-color-2.0.0"
@@ -23544,7 +23985,7 @@ in
                                       sources."is-property-1.0.2"
                                     ];
                                   })
-                                  sources."jsonpointer-4.0.1"
+                                  sources."jsonpointer-4.0.0"
                                   sources."xtend-4.0.1"
                                 ];
                               })
@@ -23573,14 +24014,14 @@ in
                                   sources."verror-1.3.6"
                                 ];
                               })
-                              (sources."sshpk-1.10.2" // {
+                              (sources."sshpk-1.10.1" // {
                                 dependencies = [
                                   sources."asn1-0.2.3"
                                   sources."assert-plus-1.0.0"
-                                  sources."dashdash-1.14.1"
+                                  sources."dashdash-1.14.0"
                                   sources."getpass-0.1.6"
                                   sources."jsbn-0.1.0"
-                                  sources."tweetnacl-0.14.5"
+                                  sources."tweetnacl-0.14.3"
                                   sources."jodid25519-1.0.2"
                                   sources."ecc-jsbn-0.1.1"
                                   sources."bcrypt-pbkdf-1.0.0"
@@ -23591,9 +24032,9 @@ in
                           sources."is-typedarray-1.0.0"
                           sources."isstream-0.1.2"
                           sources."json-stringify-safe-5.0.1"
-                          (sources."mime-types-2.1.14" // {
+                          (sources."mime-types-2.1.13" // {
                             dependencies = [
-                              sources."mime-db-1.26.0"
+                              sources."mime-db-1.25.0"
                             ];
                           })
                           sources."oauth-sign-0.8.2"
@@ -23605,7 +24046,7 @@ in
                             ];
                           })
                           sources."tunnel-agent-0.4.3"
-                          sources."uuid-3.0.1"
+                          sources."uuid-3.0.0"
                         ];
                       })
                       (sources."rimraf-2.5.4" // {
@@ -23726,7 +24167,7 @@ in
         ];
       })
       sources."path-is-absolute-1.0.1"
-      (sources."prettyjson-1.2.1" // {
+      (sources."prettyjson-1.2.0" // {
         dependencies = [
           sources."colors-1.1.2"
           sources."minimist-1.2.0"
@@ -23817,10 +24258,10 @@ in
   git-run = nodeEnv.buildNodePackage {
     name = "git-run";
     packageName = "git-run";
-    version = "0.5.3";
+    version = "0.5.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.3.tgz";
-      sha1 = "92005049d5514753d53c4f90fd6f2b2b29a8e08c";
+      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.2.tgz";
+      sha1 = "1edbc7163389067dd9f2c46ab3acff07889f8333";
     };
     dependencies = [
       (sources."minilog-2.0.8" // {
@@ -23903,11 +24344,11 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.12.2"
+      sources."coffee-script-1.11.1"
       (sources."jade-1.11.0" // {
         dependencies = [
           sources."character-parser-1.2.1"
-          (sources."clean-css-3.4.23" // {
+          (sources."clean-css-3.4.21" // {
             dependencies = [
               (sources."commander-2.8.1" // {
                 dependencies = [
@@ -23971,7 +24412,7 @@ in
               })
             ];
           })
-          (sources."uglify-js-2.7.5" // {
+          (sources."uglify-js-2.7.4" // {
             dependencies = [
               sources."async-0.2.10"
               sources."source-map-0.5.6"
@@ -23985,7 +24426,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.1.0" // {
+                              (sources."kind-of-3.0.4" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -24001,7 +24442,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.1.0" // {
+                              (sources."kind-of-3.0.4" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -24046,14 +24487,14 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.17.4"
+              sources."lodash-4.17.2"
             ];
           })
         ];
       })
       (sources."msgpack-1.0.2" // {
         dependencies = [
-          sources."nan-2.5.0"
+          sources."nan-2.4.0"
         ];
       })
     ];
@@ -24080,25 +24521,144 @@ in
           sources."escape-string-regexp-1.0.5"
           (sources."has-ansi-2.0.0" // {
             dependencies = [
-              sources."ansi-regex-2.1.1"
+              sources."ansi-regex-2.0.0"
             ];
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.1.1"
+              sources."ansi-regex-2.0.0"
             ];
           })
           sources."supports-color-2.0.0"
         ];
       })
       sources."deprecated-0.0.1"
-      (sources."gulp-util-3.0.8" // {
+      (sources."gulp-util-3.0.7" // {
         dependencies = [
           sources."array-differ-1.0.0"
           sources."array-uniq-1.0.3"
           sources."beeper-1.1.1"
-          sources."dateformat-2.0.0"
-          (sources."fancy-log-1.3.0" // {
+          (sources."dateformat-1.0.12" // {
+            dependencies = [
+              sources."get-stdin-4.0.1"
+              (sources."meow-3.7.0" // {
+                dependencies = [
+                  (sources."camelcase-keys-2.1.0" // {
+                    dependencies = [
+                      sources."camelcase-2.1.1"
+                    ];
+                  })
+                  sources."decamelize-1.2.0"
+                  (sources."loud-rejection-1.6.0" // {
+                    dependencies = [
+                      (sources."currently-unhandled-0.4.1" // {
+                        dependencies = [
+                          sources."array-find-index-1.0.2"
+                        ];
+                      })
+                      sources."signal-exit-3.0.1"
+                    ];
+                  })
+                  sources."map-obj-1.0.1"
+                  (sources."normalize-package-data-2.3.5" // {
+                    dependencies = [
+                      sources."hosted-git-info-2.1.5"
+                      (sources."is-builtin-module-1.0.0" // {
+                        dependencies = [
+                          sources."builtin-modules-1.1.1"
+                        ];
+                      })
+                      (sources."validate-npm-package-license-3.0.1" // {
+                        dependencies = [
+                          (sources."spdx-correct-1.0.2" // {
+                            dependencies = [
+                              sources."spdx-license-ids-1.2.2"
+                            ];
+                          })
+                          sources."spdx-expression-parse-1.0.4"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."object-assign-4.1.0"
+                  (sources."read-pkg-up-1.0.1" // {
+                    dependencies = [
+                      (sources."find-up-1.1.2" // {
+                        dependencies = [
+                          sources."path-exists-2.1.0"
+                          (sources."pinkie-promise-2.0.1" // {
+                            dependencies = [
+                              sources."pinkie-2.0.4"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."read-pkg-1.1.0" // {
+                        dependencies = [
+                          (sources."load-json-file-1.1.0" // {
+                            dependencies = [
+                              sources."graceful-fs-4.1.11"
+                              (sources."parse-json-2.2.0" // {
+                                dependencies = [
+                                  (sources."error-ex-1.3.0" // {
+                                    dependencies = [
+                                      sources."is-arrayish-0.2.1"
+                                    ];
+                                  })
+                                ];
+                              })
+                              sources."pify-2.3.0"
+                              (sources."pinkie-promise-2.0.1" // {
+                                dependencies = [
+                                  sources."pinkie-2.0.4"
+                                ];
+                              })
+                              (sources."strip-bom-2.0.0" // {
+                                dependencies = [
+                                  sources."is-utf8-0.2.1"
+                                ];
+                              })
+                            ];
+                          })
+                          (sources."path-type-1.1.0" // {
+                            dependencies = [
+                              sources."graceful-fs-4.1.11"
+                              sources."pify-2.3.0"
+                              (sources."pinkie-promise-2.0.1" // {
+                                dependencies = [
+                                  sources."pinkie-2.0.4"
+                                ];
+                              })
+                            ];
+                          })
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."redent-1.0.0" // {
+                    dependencies = [
+                      (sources."indent-string-2.1.0" // {
+                        dependencies = [
+                          (sources."repeating-2.0.1" // {
+                            dependencies = [
+                              (sources."is-finite-1.0.2" // {
+                                dependencies = [
+                                  sources."number-is-nan-1.0.1"
+                                ];
+                              })
+                            ];
+                          })
+                        ];
+                      })
+                      sources."strip-indent-1.0.1"
+                    ];
+                  })
+                  sources."trim-newlines-1.0.0"
+                ];
+              })
+            ];
+          })
+          (sources."fancy-log-1.2.0" // {
             dependencies = [
               sources."time-stamp-1.0.1"
             ];
@@ -24160,14 +24720,13 @@ in
           })
           sources."object-assign-3.0.0"
           sources."replace-ext-0.0.1"
-          (sources."through2-2.0.3" // {
+          (sources."through2-2.0.1" // {
             dependencies = [
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.0.6" // {
                 dependencies = [
-                  sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
+                  sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
                   sources."string_decoder-0.10.31"
                   sources."util-deprecate-1.0.2"
@@ -24220,7 +24779,7 @@ in
                                   sources."isarray-1.0.0"
                                 ];
                               })
-                              sources."randomatic-1.1.6"
+                              sources."randomatic-1.1.5"
                               sources."repeat-string-1.6.1"
                             ];
                           })
@@ -24238,7 +24797,7 @@ in
                   sources."extglob-0.3.2"
                   sources."filename-regex-2.0.0"
                   sources."is-extglob-1.0.0"
-                  (sources."kind-of-3.1.0" // {
+                  (sources."kind-of-3.0.4" // {
                     dependencies = [
                       sources."is-buffer-1.1.4"
                     ];
@@ -24281,14 +24840,15 @@ in
                   })
                   (sources."global-modules-0.2.3" // {
                     dependencies = [
-                      (sources."global-prefix-0.1.5" // {
+                      (sources."global-prefix-0.1.4" // {
                         dependencies = [
-                          (sources."homedir-polyfill-1.0.1" // {
+                          sources."ini-1.3.4"
+                          (sources."osenv-0.1.3" // {
                             dependencies = [
-                              sources."parse-passwd-1.0.0"
+                              sources."os-homedir-1.0.2"
+                              sources."os-tmpdir-1.0.2"
                             ];
                           })
-                          sources."ini-1.3.4"
                           (sources."which-1.2.12" // {
                             dependencies = [
                               sources."isexe-1.1.2"
@@ -24319,7 +24879,7 @@ in
                     dependencies = [
                       (sources."is-relative-0.2.1" // {
                         dependencies = [
-                          (sources."is-unc-path-0.1.2" // {
+                          (sources."is-unc-path-0.1.1" // {
                             dependencies = [
                               sources."unc-path-regex-0.1.2"
                             ];
@@ -24344,7 +24904,7 @@ in
           sources."lodash.isstring-4.0.1"
           sources."lodash.mapvalues-4.6.0"
           sources."rechoir-0.6.2"
-          sources."resolve-1.2.0"
+          sources."resolve-1.1.7"
         ];
       })
       sources."minimist-1.2.0"
@@ -24664,7 +25224,7 @@ in
               sources."deep-is-0.1.3"
               sources."type-check-0.3.2"
               sources."levn-0.3.0"
-              sources."fast-levenshtein-2.0.6"
+              sources."fast-levenshtein-2.0.5"
             ];
           })
           (sources."source-map-0.2.0" // {
@@ -24709,7 +25269,7 @@ in
               sources."amdefine-1.0.1"
             ];
           })
-          (sources."uglify-js-2.7.5" // {
+          (sources."uglify-js-2.7.4" // {
             dependencies = [
               sources."async-0.2.10"
               sources."source-map-0.5.6"
@@ -24723,7 +25283,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.1.0" // {
+                              (sources."kind-of-3.0.4" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -24739,7 +25299,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.1.0" // {
+                              (sources."kind-of-3.0.4" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -24961,13 +25521,13 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.4.0";
+    version = "1.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz";
-      sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b";
+      url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz";
+      sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f";
     };
     dependencies = [
-      sources."bluebird-3.4.7"
+      sources."bluebird-3.4.6"
       (sources."body-parser-1.15.2" // {
         dependencies = [
           sources."bytes-2.4.0"
@@ -25000,9 +25560,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -25034,7 +25594,7 @@ in
                                   sources."isarray-1.0.0"
                                 ];
                               })
-                              sources."randomatic-1.1.6"
+                              sources."randomatic-1.1.5"
                               sources."repeat-string-1.6.1"
                             ];
                           })
@@ -25052,7 +25612,7 @@ in
                   sources."extglob-0.3.2"
                   sources."filename-regex-2.0.0"
                   sources."is-extglob-1.0.0"
-                  (sources."kind-of-3.1.0" // {
+                  (sources."kind-of-3.0.4" // {
                     dependencies = [
                       sources."is-buffer-1.1.4"
                     ];
@@ -25089,7 +25649,7 @@ in
           sources."inherits-2.0.3"
           (sources."is-binary-path-1.0.1" // {
             dependencies = [
-              sources."binary-extensions-1.8.0"
+              sources."binary-extensions-1.7.0"
             ];
           })
           (sources."is-glob-2.0.1" // {
@@ -25113,10 +25673,10 @@ in
               sources."set-immediate-shim-1.0.1"
             ];
           })
-          (sources."fsevents-1.0.17" // {
+          (sources."fsevents-1.0.15" // {
             dependencies = [
-              sources."nan-2.5.0"
-              (sources."node-pre-gyp-0.6.32" // {
+              sources."nan-2.4.0"
+              (sources."node-pre-gyp-0.6.31" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
@@ -25128,7 +25688,7 @@ in
                       sources."abbrev-1.0.9"
                     ];
                   })
-                  (sources."npmlog-4.0.2" // {
+                  (sources."npmlog-4.0.1" // {
                     dependencies = [
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
@@ -25146,13 +25706,13 @@ in
                         ];
                       })
                       sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.7.2" // {
+                      (sources."gauge-2.7.1" // {
                         dependencies = [
                           sources."aproba-1.0.4"
-                          sources."supports-color-0.2.0"
+                          sources."has-color-0.1.7"
                           sources."has-unicode-2.0.1"
                           sources."object-assign-4.1.0"
-                          sources."signal-exit-3.0.2"
+                          sources."signal-exit-3.0.1"
                           (sources."string-width-1.0.2" // {
                             dependencies = [
                               sources."code-point-at-1.1.0"
@@ -25165,7 +25725,7 @@ in
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.1.1"
+                              sources."ansi-regex-2.0.0"
                             ];
                           })
                           sources."wide-align-1.1.0"
@@ -25207,12 +25767,12 @@ in
                               sources."escape-string-regexp-1.0.5"
                               (sources."has-ansi-2.0.0" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.1.1"
+                                  sources."ansi-regex-2.0.0"
                                 ];
                               })
                               (sources."strip-ansi-3.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.1.1"
+                                  sources."ansi-regex-2.0.0"
                                 ];
                               })
                               sources."supports-color-2.0.0"
@@ -25231,7 +25791,7 @@ in
                                   sources."is-property-1.0.2"
                                 ];
                               })
-                              sources."jsonpointer-4.0.1"
+                              sources."jsonpointer-4.0.0"
                               sources."xtend-4.0.1"
                             ];
                           })
@@ -25260,14 +25820,14 @@ in
                               sources."verror-1.3.6"
                             ];
                           })
-                          (sources."sshpk-1.10.2" // {
+                          (sources."sshpk-1.10.1" // {
                             dependencies = [
                               sources."asn1-0.2.3"
                               sources."assert-plus-1.0.0"
-                              sources."dashdash-1.14.1"
+                              sources."dashdash-1.14.0"
                               sources."getpass-0.1.6"
                               sources."jsbn-0.1.0"
-                              sources."tweetnacl-0.14.5"
+                              sources."tweetnacl-0.14.3"
                               sources."jodid25519-1.0.2"
                               sources."ecc-jsbn-0.1.1"
                               sources."bcrypt-pbkdf-1.0.0"
@@ -25278,9 +25838,9 @@ in
                       sources."is-typedarray-1.0.0"
                       sources."isstream-0.1.2"
                       sources."json-stringify-safe-5.0.1"
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
                       sources."oauth-sign-0.8.2"
@@ -25292,7 +25852,7 @@ in
                         ];
                       })
                       sources."tunnel-agent-0.4.3"
-                      sources."uuid-3.0.1"
+                      sources."uuid-3.0.0"
                     ];
                   })
                   sources."semver-5.3.0"
@@ -25338,7 +25898,7 @@ in
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
         dependencies = [
-          sources."lodash-4.17.4"
+          sources."lodash-4.17.2"
         ];
       })
       (sources."connect-3.5.0" // {
@@ -25408,13 +25968,13 @@ in
         ];
       })
       sources."graceful-fs-4.1.11"
-      (sources."http-proxy-1.16.2" // {
+      (sources."http-proxy-1.15.2" // {
         dependencies = [
           sources."eventemitter3-1.2.0"
           sources."requires-port-1.0.0"
         ];
       })
-      sources."isbinaryfile-3.0.2"
+      sources."isbinaryfile-3.0.1"
       sources."lodash-3.10.1"
       (sources."log4js-0.6.38" // {
         dependencies = [
@@ -25449,101 +26009,105 @@ in
       sources."qjobs-1.1.5"
       sources."range-parser-1.2.0"
       sources."rimraf-2.5.4"
-      sources."safe-buffer-5.0.1"
-      (sources."socket.io-1.7.2" // {
+      (sources."socket.io-1.4.7" // {
         dependencies = [
-          (sources."debug-2.3.3" // {
+          (sources."engine.io-1.6.10" // {
             dependencies = [
-              sources."ms-0.7.2"
-            ];
-          })
-          (sources."engine.io-1.8.2" // {
-            dependencies = [
-              (sources."accepts-1.3.3" // {
-                dependencies = [
-                  (sources."mime-types-2.1.14" // {
-                    dependencies = [
-                      sources."mime-db-1.26.0"
-                    ];
-                  })
-                  sources."negotiator-0.6.1"
-                ];
-              })
-              sources."base64id-1.0.0"
-              (sources."engine.io-parser-1.3.2" // {
-                dependencies = [
-                  sources."after-0.8.2"
-                  sources."arraybuffer.slice-0.0.6"
-                  sources."base64-arraybuffer-0.1.5"
-                  sources."blob-0.0.4"
-                  sources."wtf-8-1.0.0"
-                ];
-              })
-              (sources."ws-1.1.1" // {
+              sources."base64id-0.1.0"
+              (sources."ws-1.0.1" // {
                 dependencies = [
                   sources."options-0.0.6"
                   sources."ultron-1.0.2"
                 ];
               })
-              sources."cookie-0.3.1"
-            ];
-          })
-          (sources."has-binary-0.1.7" // {
-            dependencies = [
-              sources."isarray-0.0.1"
-            ];
-          })
-          sources."object-assign-4.1.0"
-          sources."socket.io-adapter-0.5.0"
-          (sources."socket.io-client-1.7.2" // {
-            dependencies = [
-              sources."backo2-1.0.2"
-              sources."component-bind-1.0.0"
-              sources."component-emitter-1.2.1"
-              (sources."engine.io-client-1.8.2" // {
+              (sources."engine.io-parser-1.2.4" // {
                 dependencies = [
-                  sources."component-inherit-0.0.3"
-                  (sources."engine.io-parser-1.3.2" // {
+                  sources."after-0.8.1"
+                  sources."arraybuffer.slice-0.0.6"
+                  sources."base64-arraybuffer-0.1.2"
+                  sources."blob-0.0.4"
+                  (sources."has-binary-0.1.6" // {
                     dependencies = [
-                      sources."after-0.8.2"
-                      sources."arraybuffer.slice-0.0.6"
-                      sources."base64-arraybuffer-0.1.5"
-                      sources."blob-0.0.4"
-                      sources."wtf-8-1.0.0"
+                      sources."isarray-0.0.1"
                     ];
                   })
+                  sources."utf8-2.1.0"
+                ];
+              })
+              (sources."accepts-1.1.4" // {
+                dependencies = [
+                  (sources."mime-types-2.0.14" // {
+                    dependencies = [
+                      sources."mime-db-1.12.0"
+                    ];
+                  })
+                  sources."negotiator-0.4.9"
+                ];
+              })
+            ];
+          })
+          (sources."socket.io-parser-2.2.6" // {
+            dependencies = [
+              sources."json3-3.3.2"
+              sources."component-emitter-1.1.2"
+              sources."isarray-0.0.1"
+              sources."benchmark-1.0.0"
+            ];
+          })
+          (sources."socket.io-client-1.4.6" // {
+            dependencies = [
+              (sources."engine.io-client-1.6.9" // {
+                dependencies = [
                   sources."has-cors-1.1.0"
-                  (sources."parsejson-0.0.3" // {
-                    dependencies = [
-                      (sources."better-assert-1.0.2" // {
-                        dependencies = [
-                          sources."callsite-1.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."parseqs-0.0.5" // {
-                    dependencies = [
-                      (sources."better-assert-1.0.2" // {
-                        dependencies = [
-                          sources."callsite-1.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."ws-1.1.1" // {
+                  (sources."ws-1.0.1" // {
                     dependencies = [
                       sources."options-0.0.6"
                       sources."ultron-1.0.2"
                     ];
                   })
-                  sources."xmlhttprequest-ssl-1.5.3"
+                  sources."xmlhttprequest-ssl-1.5.1"
+                  sources."component-emitter-1.1.2"
+                  (sources."engine.io-parser-1.2.4" // {
+                    dependencies = [
+                      sources."after-0.8.1"
+                      sources."arraybuffer.slice-0.0.6"
+                      sources."base64-arraybuffer-0.1.2"
+                      sources."blob-0.0.4"
+                      (sources."has-binary-0.1.6" // {
+                        dependencies = [
+                          sources."isarray-0.0.1"
+                        ];
+                      })
+                      sources."utf8-2.1.0"
+                    ];
+                  })
+                  (sources."parsejson-0.0.1" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."parseqs-0.0.2" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."component-inherit-0.0.3"
                   sources."yeast-0.1.2"
                 ];
               })
-              sources."indexof-0.0.1"
+              sources."component-bind-1.0.0"
+              sources."component-emitter-1.2.0"
               sources."object-component-0.0.3"
-              (sources."parseuri-0.0.5" // {
+              sources."indexof-0.0.1"
+              (sources."parseuri-0.0.4" // {
                 dependencies = [
                   (sources."better-assert-1.0.2" // {
                     dependencies = [
@@ -25553,20 +26117,32 @@ in
                 ];
               })
               sources."to-array-0.1.4"
+              sources."backo2-1.0.2"
             ];
           })
-          (sources."socket.io-parser-2.3.1" // {
+          (sources."socket.io-adapter-0.4.0" // {
             dependencies = [
-              (sources."debug-2.2.0" // {
+              (sources."socket.io-parser-2.2.2" // {
                 dependencies = [
-                  sources."ms-0.7.1"
+                  sources."debug-0.7.4"
+                  sources."json3-3.2.6"
+                  sources."component-emitter-1.1.2"
+                  sources."isarray-0.0.1"
+                  sources."benchmark-1.0.0"
                 ];
               })
-              sources."json3-3.3.2"
-              sources."component-emitter-1.1.2"
+            ];
+          })
+          (sources."has-binary-0.1.7" // {
+            dependencies = [
               sources."isarray-0.0.1"
             ];
           })
+          (sources."debug-2.2.0" // {
+            dependencies = [
+              sources."ms-0.7.1"
+            ];
+          })
         ];
       })
       sources."source-map-0.5.6"
@@ -25575,7 +26151,7 @@ in
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."useragent-2.1.10" // {
+      (sources."useragent-2.1.9" // {
         dependencies = [
           sources."lru-cache-2.2.4"
         ];
@@ -25628,9 +26204,9 @@ in
                 dependencies = [
                   (sources."accepts-1.2.13" // {
                     dependencies = [
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
                       sources."negotiator-0.5.3"
@@ -25638,7 +26214,7 @@ in
                   })
                   (sources."compressible-2.0.9" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                 ];
@@ -25668,9 +26244,9 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -25759,9 +26335,9 @@ in
                   })
                   sources."batch-0.5.3"
                   sources."escape-html-1.0.3"
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.13" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                 ];
@@ -25788,9 +26364,9 @@ in
               (sources."type-is-1.6.14" // {
                 dependencies = [
                   sources."media-typer-0.3.0"
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.13" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                 ];
@@ -25862,7 +26438,7 @@ in
               (sources."passport-oauth1-1.1.0" // {
                 dependencies = [
                   sources."passport-strategy-1.0.0"
-                  sources."oauth-0.9.15"
+                  sources."oauth-0.9.14"
                   sources."utils-merge-1.0.0"
                 ];
               })
@@ -25870,12 +26446,11 @@ in
           })
           (sources."passport-google-oauth20-1.0.0" // {
             dependencies = [
-              (sources."passport-oauth2-1.4.0" // {
+              (sources."passport-oauth2-1.3.0" // {
                 dependencies = [
-                  sources."oauth-0.9.15"
                   sources."passport-strategy-1.0.0"
+                  sources."oauth-0.9.14"
                   sources."uid2-0.0.3"
-                  sources."utils-merge-1.0.0"
                 ];
               })
             ];
@@ -25888,7 +26463,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.17.4"
+              sources."lodash-4.17.2"
             ];
           })
         ];
@@ -25910,14 +26485,13 @@ in
       sha1 = "5de1e6426f885929b77357f014de5fee1dad0553";
     };
     dependencies = [
-      (sources."through2-2.0.3" // {
+      (sources."through2-2.0.1" // {
         dependencies = [
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-2.0.6" // {
             dependencies = [
-              sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
-              sources."isarray-1.0.0"
               sources."inherits-2.0.3"
+              sources."isarray-1.0.0"
               sources."process-nextick-args-1.0.7"
               sources."string_decoder-0.10.31"
               sources."util-deprecate-1.0.2"
@@ -25979,11 +26553,11 @@ in
                   sources."path-is-absolute-1.0.1"
                 ];
               })
-              (sources."glob-parent-3.1.0" // {
+              (sources."glob-parent-3.0.1" // {
                 dependencies = [
                   (sources."is-glob-3.1.0" // {
                     dependencies = [
-                      sources."is-extglob-2.1.1"
+                      sources."is-extglob-2.1.0"
                     ];
                   })
                   sources."path-dirname-1.0.2"
@@ -26009,7 +26583,7 @@ in
                                   sources."isarray-1.0.0"
                                 ];
                               })
-                              sources."randomatic-1.1.6"
+                              sources."randomatic-1.1.5"
                               sources."repeat-string-1.6.1"
                             ];
                           })
@@ -26028,7 +26602,7 @@ in
                   sources."filename-regex-2.0.0"
                   sources."is-extglob-1.0.0"
                   sources."is-glob-2.0.1"
-                  (sources."kind-of-3.1.0" // {
+                  (sources."kind-of-3.0.4" // {
                     dependencies = [
                       sources."is-buffer-1.1.4"
                     ];
@@ -26108,8 +26682,8 @@ in
           })
           sources."is-valid-glob-0.3.0"
           sources."lazystream-1.0.0"
-          sources."lodash.isequal-4.5.0"
-          sources."merge-stream-1.0.1"
+          sources."lodash.isequal-4.4.0"
+          sources."merge-stream-1.0.0"
           (sources."mkdirp-0.5.1" // {
             dependencies = [
               sources."minimist-0.0.8"
@@ -26235,13 +26809,12 @@ in
       (sources."npm-registry-client-7.1.2" // {
         dependencies = [
           sources."chownr-1.0.1"
-          (sources."concat-stream-1.6.0" // {
+          (sources."concat-stream-1.5.2" // {
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.0.6" // {
                 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"
@@ -26313,12 +26886,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -26337,7 +26910,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.1"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -26366,14 +26939,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.2" // {
+                  (sources."sshpk-1.10.1" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.1"
+                      sources."dashdash-1.14.0"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.5"
+                      sources."tweetnacl-0.14.3"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -26384,9 +26957,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -26398,7 +26971,7 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.1"
+              sources."uuid-3.0.0"
             ];
           })
           sources."retry-0.8.0"
@@ -26454,7 +27027,7 @@ in
                   sources."has-color-0.1.7"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.2"
+                  sources."signal-exit-3.0.1"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -26467,7 +27040,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."wide-align-1.1.0"
@@ -26502,7 +27075,7 @@ in
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."osenv-0.1.4" // {
+          (sources."osenv-0.1.3" // {
             dependencies = [
               sources."os-homedir-1.0.2"
               sources."os-tmpdir-1.0.2"
@@ -26599,10 +27172,10 @@ in
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
     packageName = "node-gyp";
-    version = "3.5.0";
+    version = "3.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
-      sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz";
+      sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
     };
     dependencies = [
       (sources."fstream-1.0.10" // {
@@ -26648,7 +27221,7 @@ in
           sources."abbrev-1.0.9"
         ];
       })
-      (sources."npmlog-4.0.2" // {
+      (sources."npmlog-3.1.2" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
@@ -26667,13 +27240,13 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.2" // {
+          (sources."gauge-2.6.0" // {
             dependencies = [
               sources."aproba-1.0.4"
-              sources."supports-color-0.2.0"
+              sources."has-color-0.1.7"
               sources."has-unicode-2.0.1"
               sources."object-assign-4.1.0"
-              sources."signal-exit-3.0.2"
+              sources."signal-exit-3.0.1"
               (sources."string-width-1.0.2" // {
                 dependencies = [
                   sources."code-point-at-1.1.0"
@@ -26686,7 +27259,7 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
               sources."wide-align-1.1.0"
@@ -26695,12 +27268,35 @@ in
           sources."set-blocking-2.0.0"
         ];
       })
-      (sources."osenv-0.1.4" // {
+      (sources."osenv-0.1.3" // {
         dependencies = [
           sources."os-homedir-1.0.2"
           sources."os-tmpdir-1.0.2"
         ];
       })
+      (sources."path-array-1.0.1" // {
+        dependencies = [
+          (sources."array-index-1.0.0" // {
+            dependencies = [
+              (sources."debug-2.3.3" // {
+                dependencies = [
+                  sources."ms-0.7.2"
+                ];
+              })
+              (sources."es6-symbol-3.1.0" // {
+                dependencies = [
+                  sources."d-0.1.1"
+                  (sources."es5-ext-0.10.12" // {
+                    dependencies = [
+                      sources."es6-iterator-2.0.0"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+        ];
+      })
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
@@ -26726,12 +27322,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -26750,7 +27346,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.1"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -26779,14 +27375,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.2" // {
+              (sources."sshpk-1.10.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.1"
+                  sources."dashdash-1.14.0"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.5"
+                  sources."tweetnacl-0.14.3"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -26797,9 +27393,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.25.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -26811,7 +27407,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.1"
+          sources."uuid-3.0.0"
         ];
       })
       sources."rimraf-2.5.4"
@@ -26857,7 +27453,7 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."osenv-0.1.4" // {
+              (sources."osenv-0.1.3" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                   sources."os-tmpdir-1.0.2"
@@ -26871,7 +27467,7 @@ in
                       sources."lodash-3.10.1"
                     ];
                   })
-                  sources."xmldom-0.1.27"
+                  sources."xmldom-0.1.22"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -26911,7 +27507,7 @@ in
                               sources."array-find-index-1.0.2"
                             ];
                           })
-                          sources."signal-exit-3.0.2"
+                          sources."signal-exit-3.0.1"
                         ];
                       })
                       sources."map-obj-1.0.1"
@@ -27026,7 +27622,7 @@ in
           })
         ];
       })
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.3.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -27035,9 +27631,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -27073,10 +27669,10 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.3" // {
+          (sources."proxy-addr-1.1.2" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.2.0"
+              sources."ipaddr.js-1.1.1"
             ];
           })
           sources."qs-6.2.0"
@@ -27099,9 +27695,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -27160,8 +27756,8 @@ in
       })
       (sources."v8-debug-0.7.7" // {
         dependencies = [
-          sources."nan-2.5.0"
-          (sources."node-pre-gyp-0.6.32" // {
+          sources."nan-2.4.0"
+          (sources."node-pre-gyp-0.6.31" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -27173,7 +27769,7 @@ in
                   sources."abbrev-1.0.9"
                 ];
               })
-              (sources."npmlog-4.0.2" // {
+              (sources."npmlog-4.0.1" // {
                 dependencies = [
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
@@ -27192,13 +27788,13 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.2" // {
+                  (sources."gauge-2.7.1" // {
                     dependencies = [
                       sources."aproba-1.0.4"
-                      sources."supports-color-0.2.0"
+                      sources."has-color-0.1.7"
                       sources."has-unicode-2.0.1"
                       sources."object-assign-4.1.0"
-                      sources."signal-exit-3.0.2"
+                      sources."signal-exit-3.0.1"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
                           sources."code-point-at-1.1.0"
@@ -27211,7 +27807,7 @@ in
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       sources."wide-align-1.1.0"
@@ -27245,12 +27841,12 @@ in
                           sources."escape-string-regexp-1.0.5"
                           (sources."has-ansi-2.0.0" // {
                             dependencies = [
-                              sources."ansi-regex-2.1.1"
+                              sources."ansi-regex-2.0.0"
                             ];
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.1.1"
+                              sources."ansi-regex-2.0.0"
                             ];
                           })
                           sources."supports-color-2.0.0"
@@ -27269,7 +27865,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-4.0.1"
+                          sources."jsonpointer-4.0.0"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -27298,14 +27894,14 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.10.2" // {
+                      (sources."sshpk-1.10.1" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.1"
+                          sources."dashdash-1.14.0"
                           sources."getpass-0.1.6"
                           sources."jsbn-0.1.0"
-                          sources."tweetnacl-0.14.5"
+                          sources."tweetnacl-0.14.3"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.0"
@@ -27316,9 +27912,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.13" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
@@ -27330,7 +27926,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.4.3"
-                  sources."uuid-3.0.1"
+                  sources."uuid-3.0.0"
                 ];
               })
               (sources."rimraf-2.5.4" // {
@@ -27428,8 +28024,8 @@ in
       })
       (sources."v8-profiler-5.6.5" // {
         dependencies = [
-          sources."nan-2.5.0"
-          (sources."node-pre-gyp-0.6.32" // {
+          sources."nan-2.4.0"
+          (sources."node-pre-gyp-0.6.31" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -27441,7 +28037,7 @@ in
                   sources."abbrev-1.0.9"
                 ];
               })
-              (sources."npmlog-4.0.2" // {
+              (sources."npmlog-4.0.1" // {
                 dependencies = [
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
@@ -27460,13 +28056,13 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.2" // {
+                  (sources."gauge-2.7.1" // {
                     dependencies = [
                       sources."aproba-1.0.4"
-                      sources."supports-color-0.2.0"
+                      sources."has-color-0.1.7"
                       sources."has-unicode-2.0.1"
                       sources."object-assign-4.1.0"
-                      sources."signal-exit-3.0.2"
+                      sources."signal-exit-3.0.1"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
                           sources."code-point-at-1.1.0"
@@ -27479,7 +28075,7 @@ in
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       sources."wide-align-1.1.0"
@@ -27513,12 +28109,12 @@ in
                           sources."escape-string-regexp-1.0.5"
                           (sources."has-ansi-2.0.0" // {
                             dependencies = [
-                              sources."ansi-regex-2.1.1"
+                              sources."ansi-regex-2.0.0"
                             ];
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.1.1"
+                              sources."ansi-regex-2.0.0"
                             ];
                           })
                           sources."supports-color-2.0.0"
@@ -27537,7 +28133,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-4.0.1"
+                          sources."jsonpointer-4.0.0"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -27566,14 +28162,14 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.10.2" // {
+                      (sources."sshpk-1.10.1" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.1"
+                          sources."dashdash-1.14.0"
                           sources."getpass-0.1.6"
                           sources."jsbn-0.1.0"
-                          sources."tweetnacl-0.14.5"
+                          sources."tweetnacl-0.14.3"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.0"
@@ -27584,9 +28180,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.13" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
@@ -27598,7 +28194,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.4.3"
-                  sources."uuid-3.0.1"
+                  sources."uuid-3.0.0"
                 ];
               })
               (sources."rimraf-2.5.4" // {
@@ -27712,10 +28308,10 @@ in
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
-              sources."wrap-ansi-2.1.0"
+              sources."wrap-ansi-2.0.0"
             ];
           })
           sources."decamelize-1.2.0"
@@ -27738,7 +28334,7 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
             ];
@@ -27758,10 +28354,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.32";
+    version = "0.6.31";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
-      sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
+      sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
     };
     dependencies = [
       (sources."mkdirp-0.5.1" // {
@@ -27774,7 +28370,7 @@ in
           sources."abbrev-1.0.9"
         ];
       })
-      (sources."npmlog-4.0.2" // {
+      (sources."npmlog-4.0.1" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
@@ -27793,13 +28389,13 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.2" // {
+          (sources."gauge-2.7.1" // {
             dependencies = [
               sources."aproba-1.0.4"
-              sources."supports-color-0.2.0"
+              sources."has-color-0.1.7"
               sources."has-unicode-2.0.1"
               sources."object-assign-4.1.0"
-              sources."signal-exit-3.0.2"
+              sources."signal-exit-3.0.1"
               (sources."string-width-1.0.2" // {
                 dependencies = [
                   sources."code-point-at-1.1.0"
@@ -27812,7 +28408,7 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
               sources."wide-align-1.1.0"
@@ -27854,12 +28450,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -27878,7 +28474,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.1"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -27907,14 +28503,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.2" // {
+              (sources."sshpk-1.10.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.1"
+                  sources."dashdash-1.14.0"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.5"
+                  sources."tweetnacl-0.14.3"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -27925,9 +28521,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.25.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -27939,7 +28535,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.1"
+          sources."uuid-3.0.0"
         ];
       })
       (sources."rimraf-2.5.4" // {
@@ -28075,7 +28671,7 @@ in
                                   sources."isarray-1.0.0"
                                 ];
                               })
-                              sources."randomatic-1.1.6"
+                              sources."randomatic-1.1.5"
                               sources."repeat-string-1.6.1"
                             ];
                           })
@@ -28093,7 +28689,7 @@ in
                   sources."extglob-0.3.2"
                   sources."filename-regex-2.0.0"
                   sources."is-extglob-1.0.0"
-                  (sources."kind-of-3.1.0" // {
+                  (sources."kind-of-3.0.4" // {
                     dependencies = [
                       sources."is-buffer-1.1.4"
                     ];
@@ -28130,7 +28726,7 @@ in
           sources."inherits-2.0.3"
           (sources."is-binary-path-1.0.1" // {
             dependencies = [
-              sources."binary-extensions-1.8.0"
+              sources."binary-extensions-1.7.0"
             ];
           })
           (sources."is-glob-2.0.1" // {
@@ -28155,10 +28751,10 @@ in
               sources."set-immediate-shim-1.0.1"
             ];
           })
-          (sources."fsevents-1.0.17" // {
+          (sources."fsevents-1.0.15" // {
             dependencies = [
-              sources."nan-2.5.0"
-              (sources."node-pre-gyp-0.6.32" // {
+              sources."nan-2.4.0"
+              (sources."node-pre-gyp-0.6.31" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
@@ -28170,7 +28766,7 @@ in
                       sources."abbrev-1.0.9"
                     ];
                   })
-                  (sources."npmlog-4.0.2" // {
+                  (sources."npmlog-4.0.1" // {
                     dependencies = [
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
@@ -28188,13 +28784,13 @@ in
                         ];
                       })
                       sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.7.2" // {
+                      (sources."gauge-2.7.1" // {
                         dependencies = [
                           sources."aproba-1.0.4"
-                          sources."supports-color-0.2.0"
+                          sources."has-color-0.1.7"
                           sources."has-unicode-2.0.1"
                           sources."object-assign-4.1.0"
-                          sources."signal-exit-3.0.2"
+                          sources."signal-exit-3.0.1"
                           (sources."string-width-1.0.2" // {
                             dependencies = [
                               sources."code-point-at-1.1.0"
@@ -28207,7 +28803,7 @@ in
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.1.1"
+                              sources."ansi-regex-2.0.0"
                             ];
                           })
                           sources."wide-align-1.1.0"
@@ -28249,12 +28845,12 @@ in
                               sources."escape-string-regexp-1.0.5"
                               (sources."has-ansi-2.0.0" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.1.1"
+                                  sources."ansi-regex-2.0.0"
                                 ];
                               })
                               (sources."strip-ansi-3.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.1.1"
+                                  sources."ansi-regex-2.0.0"
                                 ];
                               })
                               sources."supports-color-2.0.0"
@@ -28273,7 +28869,7 @@ in
                                   sources."is-property-1.0.2"
                                 ];
                               })
-                              sources."jsonpointer-4.0.1"
+                              sources."jsonpointer-4.0.0"
                               sources."xtend-4.0.1"
                             ];
                           })
@@ -28302,14 +28898,14 @@ in
                               sources."verror-1.3.6"
                             ];
                           })
-                          (sources."sshpk-1.10.2" // {
+                          (sources."sshpk-1.10.1" // {
                             dependencies = [
                               sources."asn1-0.2.3"
                               sources."assert-plus-1.0.0"
-                              sources."dashdash-1.14.1"
+                              sources."dashdash-1.14.0"
                               sources."getpass-0.1.6"
                               sources."jsbn-0.1.0"
-                              sources."tweetnacl-0.14.5"
+                              sources."tweetnacl-0.14.3"
                               sources."jodid25519-1.0.2"
                               sources."ecc-jsbn-0.1.1"
                               sources."bcrypt-pbkdf-1.0.0"
@@ -28320,9 +28916,9 @@ in
                       sources."is-typedarray-1.0.0"
                       sources."isstream-0.1.2"
                       sources."json-stringify-safe-5.0.1"
-                      (sources."mime-types-2.1.14" // {
+                      (sources."mime-types-2.1.13" // {
                         dependencies = [
-                          sources."mime-db-1.26.0"
+                          sources."mime-db-1.25.0"
                         ];
                       })
                       sources."oauth-sign-0.8.2"
@@ -28334,7 +28930,7 @@ in
                         ];
                       })
                       sources."tunnel-agent-0.4.3"
-                      sources."uuid-3.0.1"
+                      sources."uuid-3.0.0"
                     ];
                   })
                   (sources."rimraf-2.5.4" // {
@@ -28404,7 +29000,7 @@ in
           })
         ];
       })
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.3.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -28481,12 +29077,12 @@ in
               sources."escape-string-regexp-1.0.5"
               (sources."has-ansi-2.0.0" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
               sources."supports-color-2.0.0"
@@ -28502,13 +29098,13 @@ in
               })
               sources."object-assign-4.1.0"
               sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.4" // {
+              (sources."osenv-0.1.3" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                 ];
               })
               sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.3.1" // {
+              (sources."write-file-atomic-1.2.0" // {
                 dependencies = [
                   sources."imurmurhash-0.1.4"
                   sources."slide-1.1.6"
@@ -28621,7 +29217,7 @@ in
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
             ];
@@ -28640,14 +29236,14 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.16.0";
+    version = "0.15.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.16.0.tgz";
-      sha1 = "5b8e180a7cf211b5450a11deed0aa91e43932661";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.15.2.tgz";
+      sha1 = "4533dd93f63828f8e749f0c132a793fbeb636ea6";
     };
     dependencies = [
-      sources."basic-auth-1.1.0"
-      sources."bcryptjs-2.4.0"
+      sources."basic-auth-1.0.4"
+      sources."bcryptjs-2.3.0"
       (sources."body-parser-1.15.2" // {
         dependencies = [
           sources."bytes-2.4.0"
@@ -28672,16 +29268,11 @@ in
             ];
           })
           sources."qs-6.2.0"
-          (sources."raw-body-2.1.7" // {
-            dependencies = [
-              sources."unpipe-1.0.0"
-            ];
-          })
           (sources."type-is-1.6.14" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -28740,7 +29331,7 @@ in
           sources."lodash.some-4.6.0"
         ];
       })
-      sources."clone-2.1.0"
+      sources."clone-2.0.0"
       (sources."cookie-parser-1.4.3" // {
         dependencies = [
           sources."cookie-0.3.1"
@@ -28752,11 +29343,11 @@ in
           sources."vary-1.1.0"
         ];
       })
-      (sources."cron-1.2.1" // {
+      (sources."cron-1.1.1" // {
         dependencies = [
-          (sources."moment-timezone-0.5.11" // {
+          (sources."moment-timezone-0.5.9" // {
             dependencies = [
-              sources."moment-2.17.1"
+              sources."moment-2.17.0"
             ];
           })
         ];
@@ -28765,9 +29356,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -28803,10 +29394,10 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.3" // {
+          (sources."proxy-addr-1.1.2" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.2.0"
+              sources."ipaddr.js-1.1.1"
             ];
           })
           sources."qs-6.2.0"
@@ -28828,9 +29419,9 @@ in
           sources."serve-static-1.11.1"
           (sources."type-is-1.6.14" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -28839,20 +29430,52 @@ in
           sources."vary-1.1.0"
         ];
       })
-      (sources."follow-redirects-1.2.1" // {
+      (sources."follow-redirects-0.2.0" // {
         dependencies = [
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
           })
+          sources."stream-consume-0.1.0"
         ];
       })
-      (sources."fs-extra-1.0.0" // {
+      (sources."fs-extra-0.30.0" // {
         dependencies = [
           sources."graceful-fs-4.1.11"
           sources."jsonfile-2.4.0"
           sources."klaw-1.3.1"
+          sources."path-is-absolute-1.0.1"
+          (sources."rimraf-2.5.4" // {
+            dependencies = [
+              (sources."glob-7.1.1" // {
+                dependencies = [
+                  sources."fs.realpath-1.0.0"
+                  (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."fs.notify-0.0.4" // {
@@ -28874,29 +29497,26 @@ in
         ];
       })
       sources."is-utf8-0.2.1"
-      (sources."js-yaml-3.7.0" // {
-        dependencies = [
-          (sources."argparse-1.0.9" // {
-            dependencies = [
-              sources."sprintf-js-1.0.3"
-            ];
-          })
-          sources."esprima-2.7.3"
-        ];
-      })
-      sources."json-stringify-safe-5.0.1"
-      sources."jsonata-1.0.10"
       sources."media-typer-0.3.0"
-      (sources."mqtt-2.2.1" // {
+      (sources."mqtt-1.14.1" // {
         dependencies = [
           (sources."commist-1.0.0" // {
             dependencies = [
               sources."leven-1.0.2"
             ];
           })
-          (sources."concat-stream-1.6.0" // {
+          (sources."concat-stream-1.5.2" // {
             dependencies = [
               sources."typedarray-0.0.6"
+              (sources."readable-stream-2.0.6" // {
+                dependencies = [
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-1.0.0"
+                  sources."process-nextick-args-1.0.7"
+                  sources."string_decoder-0.10.31"
+                  sources."util-deprecate-1.0.2"
+                ];
+              })
             ];
           })
           (sources."end-of-stream-1.1.0" // {
@@ -28939,11 +29559,11 @@ in
                       sources."path-is-absolute-1.0.1"
                     ];
                   })
-                  (sources."glob-parent-3.1.0" // {
+                  (sources."glob-parent-3.0.1" // {
                     dependencies = [
                       (sources."is-glob-3.1.0" // {
                         dependencies = [
-                          sources."is-extglob-2.1.1"
+                          sources."is-extglob-2.1.0"
                         ];
                       })
                       sources."path-dirname-1.0.2"
@@ -28969,7 +29589,7 @@ in
                                       sources."isarray-1.0.0"
                                     ];
                                   })
-                                  sources."randomatic-1.1.6"
+                                  sources."randomatic-1.1.5"
                                   sources."repeat-string-1.6.1"
                                 ];
                               })
@@ -28988,7 +29608,7 @@ in
                       sources."filename-regex-2.0.0"
                       sources."is-extglob-1.0.0"
                       sources."is-glob-2.0.1"
-                      (sources."kind-of-3.1.0" // {
+                      (sources."kind-of-3.0.4" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -29025,19 +29645,19 @@ in
                   (sources."ordered-read-streams-0.3.0" // {
                     dependencies = [
                       sources."is-stream-1.1.0"
-                    ];
-                  })
-                  (sources."through2-0.6.5" // {
-                    dependencies = [
-                      (sources."readable-stream-1.0.34" // {
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
+                          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."through2-0.6.5"
                   (sources."to-absolute-glob-0.1.1" // {
                     dependencies = [
                       (sources."extend-shallow-2.0.1" // {
@@ -29056,35 +29676,54 @@ in
                       })
                       (sources."through2-filter-2.0.0" // {
                         dependencies = [
-                          sources."through2-2.0.3"
+                          (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.3"
+              (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-packet-5.2.1" // {
+          (sources."mqtt-connection-2.1.1" // {
             dependencies = [
-              sources."bl-1.2.0"
-              sources."process-nextick-args-1.0.7"
+              sources."reduplexer-1.1.0"
+              sources."through2-0.6.5"
             ];
           })
-          (sources."readable-stream-2.2.2" // {
+          (sources."mqtt-packet-3.4.7" // {
             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."bl-0.9.5"
             ];
           })
-          (sources."pump-1.0.2" // {
+          (sources."pump-1.0.1" // {
             dependencies = [
               (sources."once-1.4.0" // {
                 dependencies = [
@@ -29093,10 +29732,29 @@ in
               })
             ];
           })
-          sources."reinterval-1.1.0"
-          (sources."split2-2.1.1" // {
+          (sources."readable-stream-1.0.34" // {
             dependencies = [
-              sources."through2-2.0.3"
+              sources."core-util-is-1.0.2"
+              sources."isarray-0.0.1"
+              sources."string_decoder-0.10.31"
+            ];
+          })
+          sources."reinterval-1.1.0"
+          (sources."split2-2.1.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."websocket-stream-3.3.3" // {
@@ -29112,26 +29770,54 @@ in
                       })
                     ];
                   })
+                  (sources."readable-stream-2.2.2" // {
+                    dependencies = [
+                      sources."buffer-shims-1.0.0"
+                      sources."core-util-is-1.0.2"
+                      sources."isarray-1.0.0"
+                      sources."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."through2-2.0.3"
+              (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."ws-1.1.1" // {
+                dependencies = [
+                  sources."options-0.0.6"
+                  sources."ultron-1.0.2"
+                ];
+              })
             ];
           })
           sources."xtend-4.0.1"
         ];
       })
-      sources."mustache-2.3.0"
+      sources."mustache-2.2.1"
       (sources."nopt-3.0.6" // {
         dependencies = [
           sources."abbrev-1.0.9"
         ];
       })
-      (sources."oauth2orize-1.7.0" // {
+      (sources."oauth2orize-1.5.0" // {
         dependencies = [
           sources."uid2-0.0.3"
           sources."utils-merge-1.0.0"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -29155,16 +29841,25 @@ in
           sources."passport-strategy-1.0.0"
         ];
       })
-      (sources."raw-body-2.2.0" // {
+      (sources."raw-body-2.1.7" // {
         dependencies = [
           sources."bytes-2.4.0"
-          sources."iconv-lite-0.4.15"
+          sources."iconv-lite-0.4.13"
           sources."unpipe-1.0.0"
         ];
       })
       sources."semver-5.3.0"
-      sources."sentiment-2.1.0"
-      (sources."uglify-js-2.7.5" // {
+      (sources."sentiment-1.0.6" // {
+        dependencies = [
+          (sources."lodash.assign-4.0.1" // {
+            dependencies = [
+              sources."lodash.keys-4.2.0"
+              sources."lodash.rest-4.0.5"
+            ];
+          })
+        ];
+      })
+      (sources."uglify-js-2.7.3" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -29178,7 +29873,7 @@ in
                     dependencies = [
                       (sources."align-text-0.1.4" // {
                         dependencies = [
-                          (sources."kind-of-3.1.0" // {
+                          (sources."kind-of-3.0.4" // {
                             dependencies = [
                               sources."is-buffer-1.1.4"
                             ];
@@ -29194,7 +29889,7 @@ in
                     dependencies = [
                       (sources."align-text-0.1.4" // {
                         dependencies = [
-                          (sources."kind-of-3.1.0" // {
+                          (sources."kind-of-3.0.4" // {
                             dependencies = [
                               sources."is-buffer-1.1.4"
                             ];
@@ -29215,10 +29910,22 @@ in
         ];
       })
       sources."when-3.7.7"
-      (sources."ws-1.1.1" // {
+      (sources."ws-0.8.1" // {
         dependencies = [
           sources."options-0.0.6"
           sources."ultron-1.0.2"
+          (sources."bufferutil-1.2.1" // {
+            dependencies = [
+              sources."bindings-1.2.1"
+              sources."nan-2.4.0"
+            ];
+          })
+          (sources."utf-8-validate-1.2.1" // {
+            dependencies = [
+              sources."bindings-1.2.1"
+              sources."nan-2.4.0"
+            ];
+          })
         ];
       })
       (sources."xml2js-0.4.17" // {
@@ -29226,7 +29933,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.17.4"
+              sources."lodash-4.17.2"
             ];
           })
         ];
@@ -29278,7 +29985,7 @@ in
                 dependencies = [
                   (sources."async-2.1.4" // {
                     dependencies = [
-                      sources."lodash-4.17.4"
+                      sources."lodash-4.17.2"
                     ];
                   })
                 ];
@@ -29291,12 +29998,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -29315,7 +30022,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.1"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -29344,14 +30051,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.2" // {
+                  (sources."sshpk-1.10.1" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.1"
+                      sources."dashdash-1.14.0"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.5"
+                      sources."tweetnacl-0.14.3"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -29361,9 +30068,10 @@ in
               })
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
-              (sources."mime-types-2.1.14" // {
+              sources."json-stringify-safe-5.0.1"
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."node-uuid-1.4.7"
@@ -29380,7 +30088,7 @@ in
           })
         ];
       })
-      (sources."node-red-node-email-0.1.15" // {
+      (sources."node-red-node-email-0.1.12" // {
         dependencies = [
           (sources."nodemailer-1.11.0" // {
             dependencies = [
@@ -29400,7 +30108,7 @@ in
                       sources."libqp-1.1.0"
                       (sources."needle-0.10.0" // {
                         dependencies = [
-                          (sources."debug-2.6.0" // {
+                          (sources."debug-2.3.3" // {
                             dependencies = [
                               sources."ms-0.7.2"
                             ];
@@ -29414,7 +30122,7 @@ in
               })
               (sources."needle-0.11.0" // {
                 dependencies = [
-                  (sources."debug-2.6.0" // {
+                  (sources."debug-2.3.3" // {
                     dependencies = [
                       sources."ms-0.7.2"
                     ];
@@ -29466,7 +30174,7 @@ in
               })
             ];
           })
-          (sources."imap-0.8.19" // {
+          (sources."imap-0.8.18" // {
             dependencies = [
               sources."utf7-1.0.2"
               (sources."readable-stream-1.1.14" // {
@@ -29510,12 +30218,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -29534,7 +30242,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.1"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -29563,14 +30271,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.2" // {
+                  (sources."sshpk-1.10.1" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.1"
+                      sources."dashdash-1.14.0"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.5"
+                      sources."tweetnacl-0.14.3"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -29580,9 +30288,10 @@ in
               })
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
-              (sources."mime-types-2.1.14" // {
+              sources."json-stringify-safe-5.0.1"
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -29594,283 +30303,315 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.1"
+              sources."uuid-3.0.0"
             ];
           })
         ];
       })
       sources."node-red-node-rbe-0.1.6"
-      (sources."bcrypt-1.0.2" // {
+      (sources."node-red-node-serialport-0.4.1" // {
         dependencies = [
-          sources."bindings-1.2.1"
-          sources."nan-2.5.0"
-          (sources."node-pre-gyp-0.6.32" // {
+          (sources."serialport-4.0.6" // {
             dependencies = [
-              (sources."mkdirp-0.5.1" // {
+              sources."bindings-1.2.1"
+              (sources."commander-2.9.0" // {
                 dependencies = [
-                  sources."minimist-0.0.8"
+                  sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."npmlog-4.0.2" // {
+              (sources."debug-2.3.3" // {
                 dependencies = [
-                  (sources."are-we-there-yet-1.1.2" // {
+                  sources."ms-0.7.2"
+                ];
+              })
+              (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 = [
-                      sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.2" // {
+                      sources."minimist-0.0.8"
+                    ];
+                  })
+                  (sources."npmlog-4.0.1" // {
+                    dependencies = [
+                      (sources."are-we-there-yet-1.1.2" // {
+                        dependencies = [
+                          sources."delegates-1.0.0"
+                          (sources."readable-stream-2.2.2" // {
+                            dependencies = [
+                              sources."buffer-shims-1.0.0"
+                              sources."core-util-is-1.0.2"
+                              sources."isarray-1.0.0"
+                              sources."inherits-2.0.3"
+                              sources."process-nextick-args-1.0.7"
+                              sources."string_decoder-0.10.31"
+                              sources."util-deprecate-1.0.2"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."console-control-strings-1.1.0"
+                      (sources."gauge-2.7.1" // {
+                        dependencies = [
+                          sources."aproba-1.0.4"
+                          sources."has-color-0.1.7"
+                          sources."has-unicode-2.0.1"
+                          sources."object-assign-4.1.0"
+                          sources."signal-exit-3.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."wide-align-1.1.0"
+                        ];
+                      })
+                      sources."set-blocking-2.0.0"
+                    ];
+                  })
+                  (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."request-2.79.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.2" // {
+                        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."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.13" // {
+                        dependencies = [
+                          sources."mime-db-1.25.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."uuid-3.0.0"
+                    ];
+                  })
+                  (sources."rimraf-2.5.4" // {
+                    dependencies = [
+                      (sources."glob-7.1.1" // {
+                        dependencies = [
+                          sources."fs.realpath-1.0.0"
+                          (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."tar-2.2.1" // {
+                    dependencies = [
+                      sources."block-stream-0.0.9"
+                      (sources."fstream-1.0.10" // {
+                        dependencies = [
+                          sources."graceful-fs-4.1.11"
+                        ];
+                      })
+                      sources."inherits-2.0.3"
+                    ];
+                  })
+                  (sources."tar-pack-3.3.0" // {
+                    dependencies = [
+                      (sources."debug-2.2.0" // {
+                        dependencies = [
+                          sources."ms-0.7.1"
+                        ];
+                      })
+                      (sources."fstream-1.0.10" // {
+                        dependencies = [
+                          sources."graceful-fs-4.1.11"
+                          sources."inherits-2.0.3"
+                        ];
+                      })
+                      (sources."fstream-ignore-1.0.5" // {
+                        dependencies = [
+                          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.3.3" // {
+                        dependencies = [
+                          sources."wrappy-1.0.2"
+                        ];
+                      })
+                      (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."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."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.2" // {
-                    dependencies = [
-                      sources."aproba-1.0.4"
-                      sources."supports-color-0.2.0"
-                      sources."has-unicode-2.0.1"
-                      sources."object-assign-4.1.0"
-                      sources."signal-exit-3.0.2"
-                      (sources."string-width-1.0.2" // {
-                        dependencies = [
-                          sources."code-point-at-1.1.0"
-                          (sources."is-fullwidth-code-point-1.0.0" // {
-                            dependencies = [
-                              sources."number-is-nan-1.0.1"
-                            ];
-                          })
-                        ];
-                      })
-                      (sources."strip-ansi-3.0.1" // {
-                        dependencies = [
-                          sources."ansi-regex-2.1.1"
-                        ];
-                      })
-                      sources."wide-align-1.1.0"
-                    ];
-                  })
-                  sources."set-blocking-2.0.0"
-                ];
-              })
-              (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."request-2.79.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.2" // {
-                    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.1.1"
-                            ];
-                          })
-                          (sources."strip-ansi-3.0.1" // {
-                            dependencies = [
-                              sources."ansi-regex-2.1.1"
-                            ];
-                          })
-                          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.1"
-                          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.2" // {
-                        dependencies = [
-                          sources."asn1-0.2.3"
-                          sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.1"
-                          sources."getpass-0.1.6"
-                          sources."jsbn-0.1.0"
-                          sources."tweetnacl-0.14.5"
-                          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."mime-types-2.1.14" // {
-                    dependencies = [
-                      sources."mime-db-1.26.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."uuid-3.0.1"
-                ];
-              })
-              (sources."rimraf-2.5.4" // {
-                dependencies = [
-                  (sources."glob-7.1.1" // {
-                    dependencies = [
-                      sources."fs.realpath-1.0.0"
-                      (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."uid-number-0.0.6"
                     ];
                   })
                 ];
               })
-              (sources."tar-2.2.1" // {
+              (sources."object.assign-4.0.4" // {
                 dependencies = [
-                  sources."block-stream-0.0.9"
-                  (sources."fstream-1.0.10" // {
+                  sources."function-bind-1.1.0"
+                  sources."object-keys-1.0.11"
+                  (sources."define-properties-1.1.2" // {
                     dependencies = [
-                      sources."graceful-fs-4.1.11"
+                      sources."foreach-2.0.5"
                     ];
                   })
-                  sources."inherits-2.0.3"
-                ];
-              })
-              (sources."tar-pack-3.3.0" // {
-                dependencies = [
-                  (sources."debug-2.2.0" // {
-                    dependencies = [
-                      sources."ms-0.7.1"
-                    ];
-                  })
-                  (sources."fstream-1.0.10" // {
-                    dependencies = [
-                      sources."graceful-fs-4.1.11"
-                      sources."inherits-2.0.3"
-                    ];
-                  })
-                  (sources."fstream-ignore-1.0.5" // {
-                    dependencies = [
-                      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.3.3" // {
-                    dependencies = [
-                      sources."wrappy-1.0.2"
-                    ];
-                  })
-                  (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."uid-number-0.0.6"
                 ];
               })
             ];
           })
         ];
       })
+      (sources."bcrypt-0.8.7" // {
+        dependencies = [
+          sources."bindings-1.2.1"
+          sources."nan-2.3.5"
+        ];
+      })
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -29934,7 +30675,7 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -29947,7 +30688,7 @@ in
       (sources."config-0.4.15" // {
         dependencies = [
           sources."js-yaml-0.3.7"
-          sources."coffee-script-1.12.2"
+          sources."coffee-script-1.11.1"
           (sources."vows-0.8.1" // {
             dependencies = [
               sources."eyes-0.1.8"
@@ -30008,21 +30749,20 @@ in
       sources."moment-2.1.0"
       (sources."nodemailer-0.3.35" // {
         dependencies = [
-          (sources."mailcomposer-4.0.1" // {
+          (sources."mailcomposer-3.12.0" // {
             dependencies = [
-              (sources."buildmail-4.0.1" // {
+              (sources."buildmail-3.10.0" // {
                 dependencies = [
                   sources."addressparser-1.0.1"
                   sources."libbase64-0.1.0"
                   sources."libqp-1.1.0"
                   sources."nodemailer-fetch-1.6.0"
                   sources."nodemailer-shared-1.1.0"
-                  sources."punycode-1.4.1"
                 ];
               })
-              (sources."libmime-3.0.0" // {
+              (sources."libmime-2.1.0" // {
                 dependencies = [
-                  sources."iconv-lite-0.4.15"
+                  sources."iconv-lite-0.4.13"
                   sources."libbase64-0.1.0"
                   sources."libqp-1.1.0"
                 ];
@@ -30074,10 +30814,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.1.1";
+    version = "4.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz";
-      sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4";
+      url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz";
+      sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae";
     };
     dependencies = [
       (sources."JSONStream-1.2.1" // {
@@ -30178,7 +30918,7 @@ in
           sources."promzard-0.3.0"
         ];
       })
-      sources."lockfile-1.0.3"
+      sources."lockfile-1.0.2"
       (sources."lodash._baseuniq-4.6.0" // {
         dependencies = [
           sources."lodash._createset-4.0.3"
@@ -30191,9 +30931,18 @@ in
       sources."lodash.without-4.4.0"
       (sources."mississippi-1.2.0" // {
         dependencies = [
-          (sources."concat-stream-1.6.0" // {
+          (sources."concat-stream-1.5.2" // {
             dependencies = [
               sources."typedarray-0.0.6"
+              (sources."readable-stream-2.0.6" // {
+                dependencies = [
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-1.0.0"
+                  sources."process-nextick-args-1.0.7"
+                  sources."string_decoder-0.10.31"
+                  sources."util-deprecate-1.0.2"
+                ];
+              })
             ];
           })
           (sources."duplexify-3.5.0" // {
@@ -30213,15 +30962,24 @@ in
           })
           sources."flush-write-stream-1.0.2"
           sources."from2-2.3.0"
-          sources."pump-1.0.2"
+          sources."pump-1.0.1"
           sources."pumpify-1.3.5"
           (sources."stream-each-1.2.0" // {
             dependencies = [
               sources."stream-shift-1.0.0"
             ];
           })
-          (sources."through2-2.0.3" // {
+          (sources."through2-2.0.1" // {
             dependencies = [
+              (sources."readable-stream-2.0.6" // {
+                dependencies = [
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-1.0.0"
+                  sources."process-nextick-args-1.0.7"
+                  sources."string_decoder-0.10.31"
+                  sources."util-deprecate-1.0.2"
+                ];
+              })
               sources."xtend-4.0.1"
             ];
           })
@@ -30244,7 +31002,6 @@ in
               })
             ];
           })
-          sources."nopt-3.0.6"
           (sources."npmlog-3.1.2" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
@@ -30257,7 +31014,7 @@ in
                 dependencies = [
                   sources."has-color-0.1.7"
                   sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.2"
+                  sources."signal-exit-3.0.1"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -30278,7 +31035,7 @@ in
             dependencies = [
               (sources."array-index-1.0.0" // {
                 dependencies = [
-                  (sources."debug-2.6.0" // {
+                  (sources."debug-2.3.3" // {
                     dependencies = [
                       sources."ms-0.7.2"
                     ];
@@ -30299,7 +31056,7 @@ in
           })
         ];
       })
-      sources."nopt-4.0.1"
+      sources."nopt-3.0.6"
       sources."normalize-git-url-3.0.2"
       (sources."normalize-package-data-2.3.5" // {
         dependencies = [
@@ -30313,17 +31070,55 @@ in
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
       sources."npm-package-arg-4.2.0"
-      (sources."npm-registry-client-7.4.5" // {
+      (sources."npm-registry-client-7.3.0" // {
         dependencies = [
-          (sources."concat-stream-1.6.0" // {
+          (sources."concat-stream-1.5.2" // {
             dependencies = [
               sources."typedarray-0.0.6"
+              (sources."readable-stream-2.0.6" // {
+                dependencies = [
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-1.0.0"
+                  sources."process-nextick-args-1.0.7"
+                  sources."string_decoder-0.10.31"
+                  sources."util-deprecate-1.0.2"
+                ];
+              })
+            ];
+          })
+          (sources."npmlog-3.1.2" // {
+            dependencies = [
+              (sources."are-we-there-yet-1.1.2" // {
+                dependencies = [
+                  sources."delegates-1.0.0"
+                ];
+              })
+              sources."console-control-strings-1.1.0"
+              (sources."gauge-2.6.0" // {
+                dependencies = [
+                  sources."has-color-0.1.7"
+                  sources."object-assign-4.1.0"
+                  sources."signal-exit-3.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."wide-align-1.1.0"
+                ];
+              })
+              sources."set-blocking-2.0.0"
             ];
           })
         ];
       })
       sources."npm-user-validate-0.1.5"
-      (sources."npmlog-4.0.2" // {
+      (sources."npmlog-4.0.1" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
@@ -30331,11 +31126,11 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.2" // {
+          (sources."gauge-2.7.1" // {
             dependencies = [
-              sources."supports-color-0.2.0"
+              sources."has-color-0.1.7"
               sources."object-assign-4.1.0"
-              sources."signal-exit-3.0.2"
+              sources."signal-exit-3.0.1"
               (sources."string-width-1.0.2" // {
                 dependencies = [
                   sources."code-point-at-1.1.0"
@@ -30354,7 +31149,7 @@ in
       })
       sources."once-1.4.0"
       sources."opener-1.4.2"
-      (sources."osenv-0.1.4" // {
+      (sources."osenv-0.1.3" // {
         dependencies = [
           sources."os-homedir-1.0.2"
           sources."os-tmpdir-1.0.2"
@@ -30363,7 +31158,7 @@ in
       sources."path-is-inside-1.0.2"
       (sources."read-1.0.7" // {
         dependencies = [
-          sources."mute-stream-0.0.7"
+          sources."mute-stream-0.0.6"
         ];
       })
       sources."read-cmd-shim-1.0.1"
@@ -30397,7 +31192,7 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      (sources."readable-stream-2.2.2" // {
+      (sources."readable-stream-2.1.5" // {
         dependencies = [
           sources."buffer-shims-1.0.0"
           sources."core-util-is-1.0.2"
@@ -30408,7 +31203,7 @@ in
         ];
       })
       sources."realize-package-specifier-3.0.3"
-      (sources."request-2.79.0" // {
+      (sources."request-2.78.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.5.0"
@@ -30448,7 +31243,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.1"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -30477,14 +31272,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.2" // {
+              (sources."sshpk-1.10.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.1"
+                  sources."dashdash-1.14.0"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.5"
+                  sources."tweetnacl-0.14.3"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -30495,11 +31290,12 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.25.0"
             ];
           })
+          sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
           sources."qs-6.3.0"
           sources."stringstream-0.0.5"
@@ -30511,7 +31307,7 @@ in
           sources."tunnel-agent-0.4.3"
         ];
       })
-      sources."retry-0.10.1"
+      sources."retry-0.10.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
@@ -30552,7 +31348,6 @@ in
         ];
       })
       sources."unpipe-1.0.0"
-      sources."uuid-3.0.1"
       (sources."validate-npm-package-name-2.2.2" // {
         dependencies = [
           sources."builtins-0.0.7"
@@ -30565,7 +31360,7 @@ in
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.2.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -30638,12 +31433,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -30662,7 +31457,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.1"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -30691,14 +31486,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.2" // {
+                  (sources."sshpk-1.10.1" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.1"
+                      sources."dashdash-1.14.0"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.5"
+                      sources."tweetnacl-0.14.3"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -30709,9 +31504,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -30723,7 +31518,7 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.1"
+              sources."uuid-3.0.0"
             ];
           })
           sources."graceful-fs-2.0.3"
@@ -30764,7 +31559,7 @@ in
           })
           sources."retry-0.6.0"
           sources."couch-login-0.1.20"
-          (sources."npmlog-4.0.2" // {
+          (sources."npmlog-4.0.1" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
@@ -30783,13 +31578,13 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-2.7.1" // {
                 dependencies = [
                   sources."aproba-1.0.4"
-                  sources."supports-color-0.2.0"
+                  sources."has-color-0.1.7"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.2"
+                  sources."signal-exit-3.0.1"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -30802,7 +31597,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."wide-align-1.1.0"
@@ -30917,7 +31712,7 @@ in
         ];
       })
       sources."findit-1.2.0"
-      sources."coffee-script-1.12.2"
+      sources."coffee-script-1.11.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -30929,25 +31724,25 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.9";
+    version = "2.8.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.9.tgz";
-      sha1 = "c084b087a08ecf9292352e2cd591de903f8129c3";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.6.tgz";
+      sha1 = "9e3a0865b29dfc9af8c3d53d95b43f4bc6b1f212";
     };
     dependencies = [
-      sources."bluebird-3.4.7"
+      sources."bluebird-3.4.6"
       (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.1.1"
+              sources."ansi-regex-2.0.0"
             ];
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.1.1"
+              sources."ansi-regex-2.0.0"
             ];
           })
           sources."supports-color-2.0.0"
@@ -30981,7 +31776,7 @@ in
           sources."jju-1.3.0"
         ];
       })
-      sources."lodash-4.17.4"
+      sources."lodash-4.17.2"
       sources."node-alias-1.0.4"
       (sources."npm-3.10.10" // {
         dependencies = [
@@ -31077,7 +31872,7 @@ in
               sources."promzard-0.3.0"
             ];
           })
-          sources."lockfile-1.0.3"
+          sources."lockfile-1.0.2"
           (sources."lodash._baseuniq-4.6.0" // {
             dependencies = [
               sources."lodash._createset-4.0.3"
@@ -31117,7 +31912,7 @@ in
                     dependencies = [
                       sources."has-color-0.1.7"
                       sources."object-assign-4.1.0"
-                      sources."signal-exit-3.0.2"
+                      sources."signal-exit-3.0.1"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
                           sources."code-point-at-1.1.0"
@@ -31138,7 +31933,7 @@ in
                 dependencies = [
                   (sources."array-index-1.0.0" // {
                     dependencies = [
-                      (sources."debug-2.6.0" // {
+                      (sources."debug-2.3.3" // {
                         dependencies = [
                           sources."ms-0.7.2"
                         ];
@@ -31175,12 +31970,11 @@ in
           sources."npm-package-arg-4.2.0"
           (sources."npm-registry-client-7.2.1" // {
             dependencies = [
-              (sources."concat-stream-1.6.0" // {
+              (sources."concat-stream-1.5.2" // {
                 dependencies = [
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.2.2" // {
+                  (sources."readable-stream-2.0.6" // {
                     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"
@@ -31202,7 +31996,7 @@ in
                     dependencies = [
                       sources."has-color-0.1.7"
                       sources."object-assign-4.1.0"
-                      sources."signal-exit-3.0.2"
+                      sources."signal-exit-3.0.1"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
                           sources."code-point-at-1.1.0"
@@ -31222,7 +32016,7 @@ in
             ];
           })
           sources."npm-user-validate-0.1.5"
-          (sources."npmlog-4.0.2" // {
+          (sources."npmlog-4.0.1" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
@@ -31230,11 +32024,11 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-2.7.1" // {
                 dependencies = [
-                  sources."supports-color-0.2.0"
+                  sources."has-color-0.1.7"
                   sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.2"
+                  sources."signal-exit-3.0.1"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -31253,7 +32047,7 @@ in
           })
           sources."once-1.4.0"
           sources."opener-1.4.2"
-          (sources."osenv-0.1.4" // {
+          (sources."osenv-0.1.3" // {
             dependencies = [
               sources."os-homedir-1.0.2"
               sources."os-tmpdir-1.0.2"
@@ -31262,7 +32056,7 @@ in
           sources."path-is-inside-1.0.2"
           (sources."read-1.0.7" // {
             dependencies = [
-              sources."mute-stream-0.0.7"
+              sources."mute-stream-0.0.6"
             ];
           })
           sources."read-cmd-shim-1.0.1"
@@ -31342,7 +32136,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.1"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -31371,14 +32165,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.2" // {
+                  (sources."sshpk-1.10.1" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.1"
+                      sources."dashdash-1.14.0"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.5"
+                      sources."tweetnacl-0.14.3"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -31389,9 +32183,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."node-uuid-1.4.7"
@@ -31406,7 +32200,7 @@ in
               sources."tunnel-agent-0.4.3"
             ];
           })
-          sources."retry-0.10.1"
+          sources."retry-0.10.0"
           sources."rimraf-2.5.4"
           sources."sha-2.0.1"
           sources."slide-1.1.6"
@@ -31438,7 +32232,7 @@ in
           })
           sources."wrappy-1.0.2"
           sources."write-file-atomic-1.2.0"
-          sources."ansi-regex-2.1.1"
+          sources."ansi-regex-2.0.0"
           sources."debuglog-1.0.1"
           sources."imurmurhash-0.1.4"
           sources."lodash._baseindexof-3.1.0"
@@ -31469,7 +32263,7 @@ in
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
       sources."spawn-please-0.2.0"
-      (sources."update-notifier-1.0.3" // {
+      (sources."update-notifier-1.0.2" // {
         dependencies = [
           (sources."boxen-0.6.0" // {
             dependencies = [
@@ -31497,7 +32291,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                 ];
@@ -31520,13 +32314,13 @@ in
               })
               sources."object-assign-4.1.0"
               sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.4" // {
+              (sources."osenv-0.1.3" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                 ];
               })
               sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.3.1" // {
+              (sources."write-file-atomic-1.2.0" // {
                 dependencies = [
                   sources."imurmurhash-0.1.4"
                   sources."slide-1.1.6"
@@ -31579,7 +32373,7 @@ in
                           sources."util-deprecate-1.0.2"
                         ];
                       })
-                      sources."timed-out-3.1.3"
+                      sources."timed-out-3.0.0"
                       sources."unzip-response-1.0.2"
                       (sources."url-parse-lax-1.0.0" // {
                         dependencies = [
@@ -31630,7 +32424,7 @@ in
     meta = {
       description = "Find newer versions of dependencies than what your package.json or bower.json allows";
       homepage = https://github.com/tjunnone/npm-check-updates;
-      license = "Apache-2.0";
+      license = "MIT";
     };
     production = true;
   };
@@ -31682,9 +32476,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -31695,9 +32489,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -31705,7 +32499,7 @@ in
           sources."bytes-2.3.0"
           (sources."compressible-2.0.9" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.25.0"
             ];
           })
           (sources."debug-2.2.0" // {
@@ -31747,9 +32541,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -31784,10 +32578,10 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.3" // {
+          (sources."proxy-addr-1.1.2" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.2.0"
+              sources."ipaddr.js-1.1.1"
             ];
           })
           sources."qs-6.2.0"
@@ -31810,9 +32604,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -31864,7 +32658,7 @@ in
                   sources."amdefine-1.0.1"
                 ];
               })
-              (sources."uglify-js-2.7.5" // {
+              (sources."uglify-js-2.7.4" // {
                 dependencies = [
                   sources."async-0.2.10"
                   sources."source-map-0.5.6"
@@ -31878,7 +32672,7 @@ in
                             dependencies = [
                               (sources."align-text-0.1.4" // {
                                 dependencies = [
-                                  (sources."kind-of-3.1.0" // {
+                                  (sources."kind-of-3.0.4" // {
                                     dependencies = [
                                       sources."is-buffer-1.1.4"
                                     ];
@@ -31894,7 +32688,7 @@ in
                             dependencies = [
                               (sources."align-text-0.1.4" // {
                                 dependencies = [
-                                  (sources."kind-of-3.1.0" // {
+                                  (sources."kind-of-3.0.4" // {
                                     dependencies = [
                                       sources."is-buffer-1.1.4"
                                     ];
@@ -31996,12 +32790,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -32020,7 +32814,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.1"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -32049,14 +32843,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.2" // {
+              (sources."sshpk-1.10.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.1"
+                  sources."dashdash-1.14.0"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.5"
+                  sources."tweetnacl-0.14.3"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -32067,9 +32861,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.25.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -32081,7 +32875,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.1"
+          sources."uuid-3.0.0"
         ];
       })
       sources."semver-5.3.0"
@@ -32093,14 +32887,14 @@ in
           sources."parseurl-1.3.1"
         ];
       })
-      (sources."service-runner-2.1.13" // {
+      (sources."service-runner-2.1.11" // {
         dependencies = [
-          sources."bluebird-3.4.7"
+          sources."bluebird-3.4.6"
           (sources."bunyan-1.8.5" // {
             dependencies = [
               (sources."dtrace-provider-0.8.0" // {
                 dependencies = [
-                  sources."nan-2.5.0"
+                  sources."nan-2.4.0"
                 ];
               })
               (sources."mv-2.1.1" // {
@@ -32144,7 +32938,7 @@ in
                 ];
               })
               sources."safe-json-stringify-1.0.3"
-              sources."moment-2.17.1"
+              sources."moment-2.17.0"
             ];
           })
           sources."bunyan-syslog-udp-0.1.0"
@@ -32174,7 +32968,19 @@ in
                   sources."ms-0.7.2"
                   (sources."msgpack5-3.4.1" // {
                     dependencies = [
-                      sources."bl-1.2.0"
+                      (sources."bl-1.1.2" // {
+                        dependencies = [
+                          (sources."readable-stream-2.0.6" // {
+                            dependencies = [
+                              sources."core-util-is-1.0.2"
+                              sources."isarray-1.0.0"
+                              sources."process-nextick-args-1.0.7"
+                              sources."string_decoder-0.10.31"
+                              sources."util-deprecate-1.0.2"
+                            ];
+                          })
+                        ];
+                      })
                       sources."inherits-2.0.3"
                     ];
                   })
@@ -32199,10 +33005,10 @@ in
                 dependencies = [
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
-                  sources."wrap-ansi-2.1.0"
+                  sources."wrap-ansi-2.0.0"
                 ];
               })
               sources."decamelize-1.2.0"
@@ -32304,7 +33110,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                 ];
@@ -32328,10 +33134,10 @@ in
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
-              sources."wrap-ansi-2.1.0"
+              sources."wrap-ansi-2.0.0"
             ];
           })
           sources."decamelize-1.2.0"
@@ -32433,7 +33239,7 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
             ];
@@ -32460,10 +33266,10 @@ in
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.36.1";
+    version = "0.36.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.1.tgz";
-      sha1 = "7d2009b814b5b3a2ca573cabea1f2873a4be4a14";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.0.tgz";
+      sha1 = "fe3b087f07389ca1c2fd3d71e38a7971d5508924";
     };
     dependencies = [
       (sources."airplayer-2.0.0" // {
@@ -32480,13 +33286,12 @@ in
                   sources."big-integer-1.6.17"
                 ];
               })
-              (sources."concat-stream-1.6.0" // {
+              (sources."concat-stream-1.5.2" // {
                 dependencies = [
                   sources."inherits-2.0.3"
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.2.2" // {
+                  (sources."readable-stream-2.0.6" // {
                     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"
@@ -32504,7 +33309,7 @@ in
                       sources."lodash-3.10.1"
                     ];
                   })
-                  sources."xmldom-0.1.27"
+                  sources."xmldom-0.1.22"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -32541,12 +33346,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -32564,7 +33369,7 @@ in
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                     ];
@@ -32575,7 +33380,7 @@ in
           })
           (sources."bonjour-3.5.0" // {
             dependencies = [
-              sources."array-flatten-2.1.1"
+              sources."array-flatten-2.1.0"
               sources."deep-equal-1.0.1"
               sources."dns-equal-1.0.0"
               (sources."dns-txt-2.0.2" // {
@@ -32614,7 +33419,7 @@ in
                           sources."array-find-index-1.0.2"
                         ];
                       })
-                      sources."signal-exit-3.0.2"
+                      sources."signal-exit-3.0.1"
                     ];
                   })
                   sources."map-obj-1.0.1"
@@ -32735,7 +33540,7 @@ in
               sources."escape-string-regexp-1.0.5"
               (sources."has-ansi-2.0.0" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
               sources."supports-color-2.0.0"
@@ -32757,13 +33562,12 @@ in
               sources."extend-3.0.0"
               (sources."spawn-sync-1.0.15" // {
                 dependencies = [
-                  (sources."concat-stream-1.6.0" // {
+                  (sources."concat-stream-1.5.2" // {
                     dependencies = [
                       sources."inherits-2.0.3"
                       sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.2.2" // {
+                      (sources."readable-stream-2.0.6" // {
                         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"
@@ -32789,14 +33593,14 @@ in
               sources."object-assign-4.1.0"
             ];
           })
-          sources."lodash-4.17.4"
+          sources."lodash-4.17.2"
           sources."mute-stream-0.0.6"
           (sources."pinkie-promise-2.0.1" // {
             dependencies = [
               sources."pinkie-2.0.4"
             ];
           })
-          (sources."run-async-2.3.0" // {
+          (sources."run-async-2.2.0" // {
             dependencies = [
               sources."is-promise-2.1.0"
             ];
@@ -32814,7 +33618,7 @@ in
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.1.1"
+              sources."ansi-regex-2.0.0"
             ];
           })
           sources."through-2.3.8"
@@ -32823,7 +33627,7 @@ in
       sources."keypress-0.2.1"
       sources."mime-1.3.4"
       sources."network-address-1.1.0"
-      sources."numeral-1.5.6"
+      sources."numeral-1.5.5"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
         dependencies = [
@@ -32844,15 +33648,15 @@ in
           (sources."parse-torrent-file-4.0.0" // {
             dependencies = [
               sources."bencode-0.10.0"
-              (sources."simple-sha1-2.1.0" // {
+              (sources."simple-sha1-2.0.8" // {
                 dependencies = [
-                  sources."rusha-0.8.5"
+                  sources."rusha-0.8.4"
                 ];
               })
               sources."uniq-1.0.1"
             ];
           })
-          (sources."simple-get-2.4.0" // {
+          (sources."simple-get-2.3.0" // {
             dependencies = [
               (sources."once-1.4.0" // {
                 dependencies = [
@@ -32865,7 +33669,7 @@ in
           })
         ];
       })
-      (sources."pump-1.0.2" // {
+      (sources."pump-1.0.1" // {
         dependencies = [
           (sources."end-of-stream-1.1.0" // {
             dependencies = [
@@ -32912,13 +33716,8 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."random-access-file-1.4.0" // {
+              (sources."random-access-file-1.3.1" // {
                 dependencies = [
-                  (sources."debug-2.6.0" // {
-                    dependencies = [
-                      sources."ms-0.7.2"
-                    ];
-                  })
                   sources."inherits-2.0.3"
                 ];
               })
@@ -32946,9 +33745,9 @@ in
               (sources."parse-torrent-file-2.1.4" // {
                 dependencies = [
                   sources."bencode-0.7.0"
-                  (sources."simple-sha1-2.1.0" // {
+                  (sources."simple-sha1-2.0.8" // {
                     dependencies = [
-                      sources."rusha-0.8.5"
+                      sources."rusha-0.8.4"
                     ];
                   })
                 ];
@@ -33062,13 +33861,13 @@ in
                   })
                   sources."random-iterate-1.0.1"
                   sources."run-series-1.1.4"
-                  (sources."simple-get-2.4.0" // {
+                  (sources."simple-get-2.3.0" // {
                     dependencies = [
                       sources."simple-concat-1.0.0"
                       sources."unzip-response-2.0.1"
                     ];
                   })
-                  (sources."simple-peer-6.1.3" // {
+                  (sources."simple-peer-6.0.7" // {
                     dependencies = [
                       sources."get-browser-rtc-1.0.2"
                       sources."randombytes-2.0.3"
@@ -33113,7 +33912,7 @@ in
                   })
                 ];
               })
-              (sources."debug-2.6.0" // {
+              (sources."debug-2.3.3" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -33140,10 +33939,10 @@ in
   peerflix-server = nodeEnv.buildNodePackage {
     name = "peerflix-server";
     packageName = "peerflix-server";
-    version = "0.1.2";
+    version = "0.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz";
-      sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz";
+      sha1 = "683d54067d44699b2eff8bfc793e780df2912666";
     };
     dependencies = [
       (sources."connect-multiparty-1.2.5" // {
@@ -33280,7 +34079,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."pump-1.0.2" // {
+      (sources."pump-1.0.1" // {
         dependencies = [
           (sources."end-of-stream-1.1.0" // {
             dependencies = [
@@ -33317,9 +34116,9 @@ in
               (sources."parse-torrent-file-2.1.4" // {
                 dependencies = [
                   sources."bencode-0.7.0"
-                  (sources."simple-sha1-2.1.0" // {
+                  (sources."simple-sha1-2.0.8" // {
                     dependencies = [
-                      sources."rusha-0.8.5"
+                      sources."rusha-0.8.4"
                     ];
                   })
                 ];
@@ -33360,32 +34159,37 @@ in
           sources."xtend-4.0.1"
         ];
       })
-      (sources."socket.io-1.7.2" // {
+      (sources."socket.io-1.6.0" // {
         dependencies = [
           (sources."debug-2.3.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
           })
-          (sources."engine.io-1.8.2" // {
+          (sources."engine.io-1.8.0" // {
             dependencies = [
               (sources."accepts-1.3.3" // {
                 dependencies = [
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.13" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                   sources."negotiator-0.6.1"
                 ];
               })
-              sources."base64id-1.0.0"
-              (sources."engine.io-parser-1.3.2" // {
+              sources."base64id-0.1.0"
+              (sources."engine.io-parser-1.3.1" // {
                 dependencies = [
-                  sources."after-0.8.2"
+                  sources."after-0.8.1"
                   sources."arraybuffer.slice-0.0.6"
                   sources."base64-arraybuffer-0.1.5"
                   sources."blob-0.0.4"
+                  (sources."has-binary-0.1.6" // {
+                    dependencies = [
+                      sources."isarray-0.0.1"
+                    ];
+                  })
                   sources."wtf-8-1.0.0"
                 ];
               })
@@ -33405,20 +34209,25 @@ in
           })
           sources."object-assign-4.1.0"
           sources."socket.io-adapter-0.5.0"
-          (sources."socket.io-client-1.7.2" // {
+          (sources."socket.io-client-1.6.0" // {
             dependencies = [
               sources."backo2-1.0.2"
               sources."component-bind-1.0.0"
               sources."component-emitter-1.2.1"
-              (sources."engine.io-client-1.8.2" // {
+              (sources."engine.io-client-1.8.0" // {
                 dependencies = [
                   sources."component-inherit-0.0.3"
-                  (sources."engine.io-parser-1.3.2" // {
+                  (sources."engine.io-parser-1.3.1" // {
                     dependencies = [
-                      sources."after-0.8.2"
+                      sources."after-0.8.1"
                       sources."arraybuffer.slice-0.0.6"
                       sources."base64-arraybuffer-0.1.5"
                       sources."blob-0.0.4"
+                      (sources."has-binary-0.1.6" // {
+                        dependencies = [
+                          sources."isarray-0.0.1"
+                        ];
+                      })
                       sources."wtf-8-1.0.0"
                     ];
                   })
@@ -33487,7 +34296,7 @@ in
               sources."addr-to-ip-port-1.4.2"
               sources."bencode-0.7.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.6.0" // {
+              (sources."debug-2.3.3" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -33524,7 +34333,7 @@ in
               sources."bencode-0.6.0"
               sources."bn.js-1.3.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.6.0" // {
+              (sources."debug-2.3.3" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -33596,9 +34405,9 @@ in
               (sources."parse-torrent-file-2.1.4" // {
                 dependencies = [
                   sources."bencode-0.7.0"
-                  (sources."simple-sha1-2.1.0" // {
+                  (sources."simple-sha1-2.0.8" // {
                     dependencies = [
-                      sources."rusha-0.8.5"
+                      sources."rusha-0.8.4"
                     ];
                   })
                 ];
@@ -33668,7 +34477,7 @@ in
         dependencies = [
           (sources."async-2.1.4" // {
             dependencies = [
-              sources."lodash-4.17.4"
+              sources."lodash-4.17.2"
             ];
           })
           (sources."which-1.2.12" // {
@@ -33803,15 +34612,15 @@ in
             dependencies = [
               (sources."async-2.1.4" // {
                 dependencies = [
-                  sources."lodash-4.17.4"
+                  sources."lodash-4.17.2"
                 ];
               })
             ];
           })
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.25.0"
             ];
           })
           sources."node-uuid-1.4.7"
@@ -33828,14 +34637,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.2" // {
+              (sources."sshpk-1.10.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.1"
+                  sources."dashdash-1.14.0"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.5"
+                  sources."tweetnacl-0.14.3"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -33869,12 +34678,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -33893,7 +34702,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.1"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -33982,10 +34791,10 @@ in
           })
           sources."private-0.1.6"
           sources."q-1.4.1"
-          (sources."recast-0.11.18" // {
+          (sources."recast-0.11.17" // {
             dependencies = [
               sources."ast-types-0.9.2"
-              sources."esprima-3.1.3"
+              sources."esprima-3.1.1"
               sources."source-map-0.5.6"
             ];
           })
@@ -34080,7 +34889,7 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -34134,12 +34943,12 @@ in
                           sources."escape-string-regexp-1.0.5"
                           (sources."has-ansi-2.0.0" // {
                             dependencies = [
-                              sources."ansi-regex-2.1.1"
+                              sources."ansi-regex-2.0.0"
                             ];
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.1.1"
+                              sources."ansi-regex-2.0.0"
                             ];
                           })
                           sources."supports-color-2.0.0"
@@ -34158,7 +34967,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-4.0.1"
+                          sources."jsonpointer-4.0.0"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -34187,14 +34996,14 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.10.2" // {
+                      (sources."sshpk-1.10.1" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.1"
+                          sources."dashdash-1.14.0"
                           sources."getpass-0.1.6"
                           sources."jsbn-0.1.0"
-                          sources."tweetnacl-0.14.5"
+                          sources."tweetnacl-0.14.3"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.0"
@@ -34205,9 +35014,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.14" // {
+                  (sources."mime-types-2.1.13" // {
                     dependencies = [
-                      sources."mime-db-1.26.0"
+                      sources."mime-db-1.25.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
@@ -34219,7 +35028,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.4.3"
-                  sources."uuid-3.0.1"
+                  sources."uuid-3.0.0"
                 ];
               })
             ];
@@ -34229,7 +35038,7 @@ in
               sources."sax-1.2.1"
               (sources."xmlbuilder-4.2.1" // {
                 dependencies = [
-                  sources."lodash-4.17.4"
+                  sources."lodash-4.17.2"
                 ];
               })
             ];
@@ -34281,9 +35090,9 @@ in
         dependencies = [
           (sources."accepts-1.2.13" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."negotiator-0.5.3"
@@ -34368,9 +35177,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -34414,9 +35223,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
@@ -34427,9 +35236,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -34438,7 +35247,7 @@ in
           sources."bytes-2.3.0"
           (sources."compressible-2.0.9" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.25.0"
             ];
           })
           (sources."debug-2.2.0" // {
@@ -34496,12 +35305,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -34515,7 +35324,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.1"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -34544,14 +35353,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.2" // {
+              (sources."sshpk-1.10.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.1"
+                  sources."dashdash-1.14.0"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.5"
+                  sources."tweetnacl-0.14.3"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -34562,9 +35371,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.25.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -34576,7 +35385,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.1"
+          sources."uuid-3.0.0"
         ];
       })
       sources."async-0.9.2"
@@ -34592,7 +35401,7 @@ in
         dependencies = [
           (sources."dtrace-provider-0.8.0" // {
             dependencies = [
-              sources."nan-2.5.0"
+              sources."nan-2.4.0"
             ];
           })
           (sources."mv-2.1.1" // {
@@ -34631,7 +35440,7 @@ in
             ];
           })
           sources."safe-json-stringify-1.0.3"
-          sources."moment-2.17.1"
+          sources."moment-2.17.0"
         ];
       })
       (sources."handlebars-2.0.0" // {
@@ -34670,7 +35479,7 @@ in
               sources."uc.micro-1.0.3"
             ];
           })
-          (sources."sanitize-html-1.14.1" // {
+          (sources."sanitize-html-1.13.0" // {
             dependencies = [
               (sources."htmlparser2-3.9.2" // {
                 dependencies = [
@@ -34706,7 +35515,7 @@ in
         ];
       })
       sources."jju-1.3.0"
-      (sources."JSONStream-1.3.0" // {
+      (sources."JSONStream-1.2.1" // {
         dependencies = [
           sources."jsonparse-1.2.0"
           sources."through-2.3.8"
@@ -34735,12 +35544,12 @@ in
       })
       (sources."fs-ext-0.5.0" // {
         dependencies = [
-          sources."nan-2.5.0"
+          sources."nan-2.4.0"
         ];
       })
       (sources."crypt3-0.2.0" // {
         dependencies = [
-          sources."nan-2.5.0"
+          sources."nan-2.4.0"
         ];
       })
     ];
@@ -34837,7 +35646,7 @@ in
           (sources."csv-0.4.6" // {
             dependencies = [
               sources."csv-generate-0.0.6"
-              sources."csv-parse-1.1.9"
+              sources."csv-parse-1.1.7"
               sources."stream-transform-0.1.1"
               sources."csv-stringify-0.0.8"
             ];
@@ -34882,7 +35691,7 @@ in
           })
           (sources."dtrace-provider-0.6.0" // {
             dependencies = [
-              sources."nan-2.5.0"
+              sources."nan-2.4.0"
             ];
           })
         ];
@@ -34891,7 +35700,7 @@ in
         dependencies = [
           (sources."dtrace-provider-0.6.0" // {
             dependencies = [
-              sources."nan-2.5.0"
+              sources."nan-2.4.0"
             ];
           })
           (sources."mv-2.1.1" // {
@@ -34977,7 +35786,7 @@ in
               sources."asn1-0.2.3"
               sources."assert-plus-0.2.0"
               sources."jsbn-0.1.0"
-              sources."tweetnacl-0.14.5"
+              sources."tweetnacl-0.14.3"
               sources."jodid25519-1.0.2"
               sources."ecc-jsbn-0.1.1"
             ];
@@ -35044,7 +35853,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.3.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -35125,7 +35934,7 @@ in
       })
       (sources."csso-2.2.1" // {
         dependencies = [
-          (sources."clap-1.1.2" // {
+          (sources."clap-1.1.1" // {
             dependencies = [
               (sources."chalk-1.1.3" // {
                 dependencies = [
@@ -35133,12 +35942,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -35169,7 +35978,7 @@ in
     dependencies = [
       (sources."async-2.1.2" // {
         dependencies = [
-          sources."lodash-4.17.4"
+          sources."lodash-4.17.2"
         ];
       })
       sources."colors-1.1.2"
@@ -35236,7 +36045,7 @@ in
                 dependencies = [
                   (sources."async-2.1.4" // {
                     dependencies = [
-                      sources."lodash-4.17.4"
+                      sources."lodash-4.17.2"
                     ];
                   })
                 ];
@@ -35249,12 +36058,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -35273,7 +36082,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.1"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -35302,14 +36111,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.2" // {
+                  (sources."sshpk-1.10.1" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.1"
+                      sources."dashdash-1.14.0"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.5"
+                      sources."tweetnacl-0.14.3"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -35320,9 +36129,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -35348,7 +36157,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.1.0" // {
+                              (sources."kind-of-3.0.4" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -35364,7 +36173,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.1.0" // {
+                              (sources."kind-of-3.0.4" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -35412,12 +36221,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -35436,7 +36245,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.1"
+                  sources."jsonpointer-4.0.0"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -35465,14 +36274,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.2" // {
+              (sources."sshpk-1.10.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.1"
+                  sources."dashdash-1.14.0"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.5"
+                  sources."tweetnacl-0.14.3"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -35483,9 +36292,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.14" // {
+          (sources."mime-types-2.1.13" // {
             dependencies = [
-              sources."mime-db-1.26.0"
+              sources."mime-db-1.25.0"
             ];
           })
           sources."node-uuid-1.4.7"
@@ -35532,10 +36341,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.1.5";
+    version = "2.0.10";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz";
-      sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz";
+      sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -35548,10 +36357,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.7.5";
+    version = "2.7.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
-      sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
+      sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
     };
     dependencies = [
       sources."async-0.2.10"
@@ -35566,7 +36375,7 @@ in
                 dependencies = [
                   (sources."align-text-0.1.4" // {
                     dependencies = [
-                      (sources."kind-of-3.1.0" // {
+                      (sources."kind-of-3.0.4" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -35582,7 +36391,7 @@ in
                 dependencies = [
                   (sources."align-text-0.1.4" // {
                     dependencies = [
-                      (sources."kind-of-3.1.0" // {
+                      (sources."kind-of-3.0.4" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -35612,15 +36421,15 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.0.1";
+    version = "0.10.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz";
-      sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418";
+      url = "https://registry.npmjs.org/ungit/-/ungit-0.10.3.tgz";
+      sha1 = "7d4635b9a359c8db06c313374544f27a3890f63c";
     };
     dependencies = [
-      sources."async-2.1.4"
-      sources."bluebird-3.4.7"
-      sources."blueimp-md5-2.6.0"
+      sources."async-2.0.1"
+      sources."bluebird-3.3.5"
+      sources."blueimp-md5-2.3.1"
       (sources."body-parser-1.15.2" // {
         dependencies = [
           sources."bytes-2.4.0"
@@ -35653,30 +36462,26 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
           })
         ];
       })
-      (sources."color-1.0.3" // {
+      (sources."color-0.11.4" // {
         dependencies = [
+          sources."clone-1.0.2"
           (sources."color-convert-1.8.2" // {
             dependencies = [
               sources."color-name-1.1.1"
             ];
           })
-          (sources."color-string-1.4.0" // {
+          (sources."color-string-0.3.0" // {
             dependencies = [
               sources."color-name-1.1.1"
-              (sources."simple-swizzle-0.2.2" // {
-                dependencies = [
-                  sources."is-arrayish-0.3.1"
-                ];
-              })
             ];
           })
         ];
@@ -35688,38 +36493,27 @@ in
         ];
       })
       sources."crossroads-0.12.2"
-      (sources."diff2html-2.0.11" // {
+      (sources."diff2html-1.2.0" // {
         dependencies = [
-          sources."diff-3.2.0"
-          (sources."hogan.js-3.0.2" // {
-            dependencies = [
-              (sources."nopt-1.0.10" // {
-                dependencies = [
-                  sources."abbrev-1.0.9"
-                ];
-              })
-              sources."mkdirp-0.3.0"
-            ];
-          })
-          sources."whatwg-fetch-1.1.1"
+          sources."diff-2.2.3"
         ];
       })
-      (sources."express-4.14.0" // {
+      (sources."express-4.13.4" // {
         dependencies = [
-          (sources."accepts-1.3.3" // {
+          (sources."accepts-1.2.13" // {
             dependencies = [
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
-              sources."negotiator-0.6.1"
+              sources."negotiator-0.5.3"
             ];
           })
           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-0.1.5"
           sources."cookie-signature-1.0.6"
           (sources."debug-2.2.0" // {
             dependencies = [
@@ -35727,12 +36521,10 @@ in
             ];
           })
           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" // {
+          (sources."finalhandler-0.4.1" // {
             dependencies = [
-              sources."statuses-1.3.1"
               sources."unpipe-1.0.0"
             ];
           })
@@ -35746,47 +36538,46 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.3" // {
+          (sources."proxy-addr-1.0.10" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.2.0"
+              sources."ipaddr.js-1.0.5"
             ];
           })
-          sources."qs-6.2.0"
-          sources."range-parser-1.2.0"
-          (sources."send-0.14.1" // {
+          sources."qs-4.0.0"
+          sources."range-parser-1.0.3"
+          (sources."send-0.13.1" // {
             dependencies = [
               sources."destroy-1.0.4"
-              (sources."http-errors-1.5.1" // {
+              (sources."http-errors-1.3.1" // {
                 dependencies = [
                   sources."inherits-2.0.3"
-                  sources."setprototypeof-1.0.2"
                 ];
               })
               sources."mime-1.3.4"
               sources."ms-0.7.1"
-              sources."statuses-1.3.1"
+              sources."statuses-1.2.1"
             ];
           })
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
             ];
           })
           sources."utils-merge-1.0.0"
-          sources."vary-1.1.0"
+          sources."vary-1.0.1"
         ];
       })
-      (sources."express-session-1.14.2" // {
+      (sources."express-session-1.13.0" // {
         dependencies = [
-          sources."cookie-0.3.1"
+          sources."cookie-0.2.3"
           sources."cookie-signature-1.0.6"
-          sources."crc-3.4.1"
+          sources."crc-3.4.0"
           (sources."debug-2.2.0" // {
             dependencies = [
               sources."ms-0.7.1"
@@ -35795,10 +36586,9 @@ in
           sources."depd-1.1.0"
           sources."on-headers-1.0.1"
           sources."parseurl-1.3.1"
-          (sources."uid-safe-2.1.3" // {
+          (sources."uid-safe-2.0.0" // {
             dependencies = [
-              sources."base64-url-1.3.3"
-              sources."random-bytes-1.0.0"
+              sources."base64-url-1.2.1"
             ];
           })
           sources."utils-merge-1.0.0"
@@ -35929,34 +36719,26 @@ in
         ];
       })
       sources."hasher-1.2.0"
-      sources."ignore-3.2.0"
       (sources."keen.io-0.1.3" // {
         dependencies = [
           sources."underscore-1.5.2"
         ];
       })
       sources."knockout-3.4.1"
-      sources."lodash-4.17.4"
+      sources."lodash-4.12.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.17.1"
-      (sources."npm-4.1.2" // {
+      sources."moment-2.13.0"
+      (sources."npm-3.9.6" // {
         dependencies = [
-          (sources."JSONStream-1.3.0" // {
-            dependencies = [
-              sources."jsonparse-1.2.0"
-              sources."through-2.3.8"
-            ];
-          })
           sources."abbrev-1.0.9"
           sources."ansicolors-0.3.2"
           sources."ansistyles-0.1.3"
           sources."aproba-1.0.4"
           sources."archy-1.0.0"
-          sources."asap-2.0.5"
           sources."chownr-1.0.1"
           sources."cmd-shim-2.0.2"
           (sources."columnify-1.5.4" // {
@@ -35977,12 +36759,16 @@ in
               sources."proto-list-1.2.4"
             ];
           })
-          sources."dezalgo-1.0.3"
+          (sources."dezalgo-1.0.3" // {
+            dependencies = [
+              sources."asap-2.0.5"
+            ];
+          })
           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."fstream-npm-1.1.1" // {
             dependencies = [
               (sources."fstream-ignore-1.0.5" // {
                 dependencies = [
@@ -36000,7 +36786,7 @@ in
               })
             ];
           })
-          (sources."glob-7.1.1" // {
+          (sources."glob-7.0.6" // {
             dependencies = [
               sources."fs.realpath-1.0.0"
               (sources."minimatch-3.0.3" // {
@@ -36043,71 +36829,83 @@ in
               sources."promzard-0.3.0"
             ];
           })
-          sources."lockfile-1.0.3"
+          sources."lockfile-1.0.2"
           (sources."lodash._baseuniq-4.6.0" // {
             dependencies = [
               sources."lodash._createset-4.0.3"
               sources."lodash._root-3.0.1"
             ];
           })
-          sources."lodash.clonedeep-4.5.0"
-          sources."lodash.union-4.6.0"
-          sources."lodash.uniq-4.5.0"
-          sources."lodash.without-4.4.0"
-          (sources."mississippi-1.2.0" // {
+          (sources."lodash.clonedeep-4.3.2" // {
             dependencies = [
-              (sources."concat-stream-1.6.0" // {
-                dependencies = [
-                  sources."typedarray-0.0.6"
-                ];
-              })
-              (sources."duplexify-3.5.0" // {
-                dependencies = [
-                  (sources."end-of-stream-1.0.0" // {
-                    dependencies = [
-                      sources."once-1.3.3"
-                    ];
-                  })
-                  sources."stream-shift-1.0.0"
-                ];
-              })
-              (sources."end-of-stream-1.1.0" // {
-                dependencies = [
-                  sources."once-1.3.3"
-                ];
-              })
-              sources."flush-write-stream-1.0.2"
-              sources."from2-2.3.0"
-              sources."pump-1.0.2"
-              sources."pumpify-1.3.5"
-              (sources."stream-each-1.2.0" // {
-                dependencies = [
-                  sources."stream-shift-1.0.0"
-                ];
-              })
-              (sources."through2-2.0.3" // {
-                dependencies = [
-                  sources."xtend-4.0.1"
-                ];
-              })
+              sources."lodash._baseclone-4.5.7"
             ];
           })
-          (sources."node-gyp-3.5.0" // {
+          (sources."lodash.union-4.4.0" // {
             dependencies = [
-              (sources."minimatch-3.0.3" // {
+              sources."lodash._baseflatten-4.2.1"
+              sources."lodash.rest-4.0.5"
+            ];
+          })
+          sources."lodash.uniq-4.3.0"
+          (sources."lodash.without-4.2.0" // {
+            dependencies = [
+              (sources."lodash._basedifference-4.5.0" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.6" // {
+                  sources."lodash._root-3.0.1"
+                ];
+              })
+              sources."lodash.rest-4.0.5"
+            ];
+          })
+          (sources."node-gyp-3.3.1" // {
+            dependencies = [
+              (sources."glob-4.5.3" // {
+                dependencies = [
+                  (sources."minimatch-2.0.10" // {
                     dependencies = [
-                      sources."balanced-match-0.4.2"
-                      sources."concat-map-0.0.1"
+                      (sources."brace-expansion-1.1.6" // {
+                        dependencies = [
+                          sources."balanced-match-0.4.2"
+                          sources."concat-map-0.0.1"
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+              (sources."minimatch-1.0.0" // {
+                dependencies = [
+                  sources."lru-cache-2.7.3"
+                  sources."sigmund-1.0.1"
+                ];
+              })
+              (sources."path-array-1.0.1" // {
+                dependencies = [
+                  (sources."array-index-1.0.0" // {
+                    dependencies = [
+                      (sources."debug-2.3.3" // {
+                        dependencies = [
+                          sources."ms-0.7.2"
+                        ];
+                      })
+                      (sources."es6-symbol-3.1.0" // {
+                        dependencies = [
+                          sources."d-0.1.1"
+                          (sources."es5-ext-0.10.12" // {
+                            dependencies = [
+                              sources."es6-iterator-2.0.0"
+                            ];
+                          })
+                        ];
+                      })
                     ];
                   })
                 ];
               })
-              sources."nopt-3.0.6"
             ];
           })
-          sources."nopt-4.0.1"
+          sources."nopt-3.0.6"
           sources."normalize-git-url-3.0.2"
           (sources."normalize-package-data-2.3.5" // {
             dependencies = [
@@ -36120,40 +36918,28 @@ in
           })
           sources."npm-cache-filename-1.0.2"
           sources."npm-install-checks-3.0.0"
-          sources."npm-package-arg-4.2.0"
+          sources."npm-package-arg-4.1.1"
           sources."npm-user-validate-0.1.5"
-          (sources."npmlog-4.0.2" // {
+          (sources."npmlog-2.0.4" // {
             dependencies = [
+              sources."ansi-0.3.1"
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
                 ];
               })
-              sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-1.2.7" // {
                 dependencies = [
-                  sources."supports-color-0.2.0"
-                  sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.2"
-                  (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."wide-align-1.1.0"
+                  sources."lodash.pad-4.5.1"
+                  sources."lodash.padend-4.6.1"
+                  sources."lodash.padstart-4.6.1"
                 ];
               })
-              sources."set-blocking-2.0.0"
             ];
           })
-          sources."once-1.4.0"
+          sources."once-1.3.3"
           sources."opener-1.4.2"
-          (sources."osenv-0.1.4" // {
+          (sources."osenv-0.1.3" // {
             dependencies = [
               sources."os-tmpdir-1.0.2"
             ];
@@ -36161,7 +36947,7 @@ in
           sources."path-is-inside-1.0.2"
           (sources."read-1.0.7" // {
             dependencies = [
-              sources."mute-stream-0.0.7"
+              sources."mute-stream-0.0.6"
             ];
           })
           sources."read-cmd-shim-1.0.1"
@@ -36195,7 +36981,7 @@ in
             ];
           })
           sources."read-package-tree-5.1.5"
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-2.1.5" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -36206,10 +36992,23 @@ in
             ];
           })
           sources."realize-package-specifier-3.0.3"
-          (sources."request-2.79.0" // {
+          (sources."request-2.72.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.5.0"
+              (sources."bl-1.1.2" // {
+                dependencies = [
+                  (sources."readable-stream-2.0.6" // {
+                    dependencies = [
+                      sources."core-util-is-1.0.2"
+                      sources."isarray-1.0.0"
+                      sources."process-nextick-args-1.0.7"
+                      sources."string_decoder-0.10.31"
+                      sources."util-deprecate-1.0.2"
+                    ];
+                  })
+                ];
+              })
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -36218,11 +37017,7 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-2.1.2" // {
-                dependencies = [
-                  sources."asynckit-0.4.0"
-                ];
-              })
+              sources."form-data-1.0.1"
               (sources."har-validator-2.0.6" // {
                 dependencies = [
                   (sources."chalk-1.1.3" // {
@@ -36246,7 +37041,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.1"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -36275,14 +37070,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.2" // {
+                  (sources."sshpk-1.10.1" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.1"
+                      sources."dashdash-1.14.0"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.5"
+                      sources."tweetnacl-0.14.3"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -36293,46 +37088,23 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
+              sources."node-uuid-1.4.7"
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.0"
+              sources."qs-6.1.0"
               sources."stringstream-0.0.5"
-              (sources."tough-cookie-2.3.2" // {
-                dependencies = [
-                  sources."punycode-1.4.1"
-                ];
-              })
+              sources."tough-cookie-2.2.2"
               sources."tunnel-agent-0.4.3"
             ];
           })
-          sources."retry-0.10.1"
+          sources."retry-0.9.0"
           sources."sha-2.0.1"
           sources."slide-1.1.6"
           sources."sorted-object-2.0.1"
-          (sources."sorted-union-stream-2.1.3" // {
-            dependencies = [
-              (sources."from2-1.3.0" // {
-                dependencies = [
-                  (sources."readable-stream-1.1.14" // {
-                    dependencies = [
-                      sources."core-util-is-1.0.2"
-                      sources."isarray-0.0.1"
-                      sources."string_decoder-0.10.31"
-                    ];
-                  })
-                ];
-              })
-              (sources."stream-iterate-1.2.0" // {
-                dependencies = [
-                  sources."stream-shift-1.0.0"
-                ];
-              })
-            ];
-          })
           sources."strip-ansi-3.0.1"
           (sources."tar-2.2.1" // {
             dependencies = [
@@ -36348,7 +37120,6 @@ in
             ];
           })
           sources."unpipe-1.0.0"
-          sources."uuid-3.0.1"
           (sources."validate-npm-package-name-2.2.2" // {
             dependencies = [
               sources."builtins-0.0.7"
@@ -36360,8 +37131,8 @@ in
             ];
           })
           sources."wrappy-1.0.2"
-          sources."write-file-atomic-1.3.1"
-          sources."ansi-regex-2.1.1"
+          sources."write-file-atomic-1.1.4"
+          sources."ansi-regex-2.0.0"
           sources."debuglog-1.0.1"
           sources."imurmurhash-0.1.4"
           sources."lodash._baseindexof-3.1.0"
@@ -36383,15 +37154,15 @@ in
           })
         ];
       })
-      (sources."npm-registry-client-7.4.5" // {
+      (sources."npm-registry-client-7.1.2" // {
         dependencies = [
-          (sources."concat-stream-1.6.0" // {
+          sources."chownr-1.0.1"
+          (sources."concat-stream-1.5.2" // {
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.0.6" // {
                 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"
@@ -36457,12 +37228,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -36481,7 +37252,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.1"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -36510,14 +37281,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.2" // {
+                  (sources."sshpk-1.10.1" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.1"
+                      sources."dashdash-1.14.0"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.5"
+                      sources."tweetnacl-0.14.3"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -36528,9 +37299,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -36542,12 +37313,12 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.1"
+              sources."uuid-3.0.0"
             ];
           })
-          sources."retry-0.10.1"
+          sources."retry-0.8.0"
           sources."slide-1.1.6"
-          (sources."npmlog-4.0.2" // {
+          (sources."npmlog-3.1.2" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
@@ -36566,13 +37337,13 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-2.6.0" // {
                 dependencies = [
                   sources."aproba-1.0.4"
-                  sources."supports-color-0.2.0"
+                  sources."has-color-0.1.7"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.2"
+                  sources."signal-exit-3.0.1"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -36585,7 +37356,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.1.1"
+                      sources."ansi-regex-2.0.0"
                     ];
                   })
                   sources."wide-align-1.1.0"
@@ -36610,13 +37381,12 @@ in
           sources."passport-strategy-1.0.0"
         ];
       })
-      (sources."raven-1.1.1" // {
+      (sources."raven-0.11.0" // {
         dependencies = [
-          sources."cookie-0.3.1"
-          sources."json-stringify-safe-5.0.1"
+          sources."cookie-0.1.0"
           sources."lsmod-1.0.0"
-          sources."uuid-3.0.0"
-          sources."stack-trace-0.0.9"
+          sources."node-uuid-1.4.7"
+          sources."stack-trace-0.0.7"
         ];
       })
       (sources."rc-1.1.6" // {
@@ -36658,23 +37428,21 @@ in
           })
         ];
       })
-      sources."semver-5.3.0"
-      (sources."serve-static-1.11.1" // {
+      sources."semver-5.1.1"
+      (sources."serve-static-1.10.3" // {
         dependencies = [
-          sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."parseurl-1.3.1"
-          (sources."send-0.14.1" // {
+          (sources."send-0.13.2" // {
             dependencies = [
               sources."debug-2.2.0"
               sources."depd-1.1.0"
               sources."destroy-1.0.4"
               sources."etag-1.7.0"
               sources."fresh-0.3.0"
-              (sources."http-errors-1.5.1" // {
+              (sources."http-errors-1.3.1" // {
                 dependencies = [
                   sources."inherits-2.0.3"
-                  sources."setprototypeof-1.0.2"
                 ];
               })
               sources."mime-1.3.4"
@@ -36684,8 +37452,8 @@ in
                   sources."ee-first-1.1.1"
                 ];
               })
-              sources."range-parser-1.2.0"
-              sources."statuses-1.3.1"
+              sources."range-parser-1.0.3"
+              sources."statuses-1.2.1"
             ];
           })
         ];
@@ -36696,100 +37464,105 @@ in
           sources."eve-0.4.2"
         ];
       })
-      (sources."socket.io-1.7.2" // {
+      (sources."socket.io-1.4.8" // {
         dependencies = [
-          (sources."debug-2.3.3" // {
+          (sources."engine.io-1.6.11" // {
             dependencies = [
-              sources."ms-0.7.2"
-            ];
-          })
-          (sources."engine.io-1.8.2" // {
-            dependencies = [
-              (sources."accepts-1.3.3" // {
-                dependencies = [
-                  (sources."mime-types-2.1.14" // {
-                    dependencies = [
-                      sources."mime-db-1.26.0"
-                    ];
-                  })
-                  sources."negotiator-0.6.1"
-                ];
-              })
-              sources."base64id-1.0.0"
-              (sources."engine.io-parser-1.3.2" // {
-                dependencies = [
-                  sources."after-0.8.2"
-                  sources."arraybuffer.slice-0.0.6"
-                  sources."base64-arraybuffer-0.1.5"
-                  sources."blob-0.0.4"
-                  sources."wtf-8-1.0.0"
-                ];
-              })
-              (sources."ws-1.1.1" // {
+              sources."base64id-0.1.0"
+              (sources."ws-1.1.0" // {
                 dependencies = [
                   sources."options-0.0.6"
                   sources."ultron-1.0.2"
                 ];
               })
-              sources."cookie-0.3.1"
-            ];
-          })
-          (sources."has-binary-0.1.7" // {
-            dependencies = [
-              sources."isarray-0.0.1"
-            ];
-          })
-          sources."object-assign-4.1.0"
-          sources."socket.io-adapter-0.5.0"
-          (sources."socket.io-client-1.7.2" // {
-            dependencies = [
-              sources."backo2-1.0.2"
-              sources."component-bind-1.0.0"
-              sources."component-emitter-1.2.1"
-              (sources."engine.io-client-1.8.2" // {
+              (sources."engine.io-parser-1.2.4" // {
                 dependencies = [
-                  sources."component-inherit-0.0.3"
-                  (sources."engine.io-parser-1.3.2" // {
+                  sources."after-0.8.1"
+                  sources."arraybuffer.slice-0.0.6"
+                  sources."base64-arraybuffer-0.1.2"
+                  sources."blob-0.0.4"
+                  (sources."has-binary-0.1.6" // {
                     dependencies = [
-                      sources."after-0.8.2"
-                      sources."arraybuffer.slice-0.0.6"
-                      sources."base64-arraybuffer-0.1.5"
-                      sources."blob-0.0.4"
-                      sources."wtf-8-1.0.0"
+                      sources."isarray-0.0.1"
                     ];
                   })
+                  sources."utf8-2.1.0"
+                ];
+              })
+              (sources."accepts-1.1.4" // {
+                dependencies = [
+                  (sources."mime-types-2.0.14" // {
+                    dependencies = [
+                      sources."mime-db-1.12.0"
+                    ];
+                  })
+                  sources."negotiator-0.4.9"
+                ];
+              })
+            ];
+          })
+          (sources."socket.io-parser-2.2.6" // {
+            dependencies = [
+              sources."json3-3.3.2"
+              sources."component-emitter-1.1.2"
+              sources."isarray-0.0.1"
+              sources."benchmark-1.0.0"
+            ];
+          })
+          (sources."socket.io-client-1.4.8" // {
+            dependencies = [
+              (sources."engine.io-client-1.6.11" // {
+                dependencies = [
                   sources."has-cors-1.1.0"
-                  (sources."parsejson-0.0.3" // {
-                    dependencies = [
-                      (sources."better-assert-1.0.2" // {
-                        dependencies = [
-                          sources."callsite-1.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."parseqs-0.0.5" // {
-                    dependencies = [
-                      (sources."better-assert-1.0.2" // {
-                        dependencies = [
-                          sources."callsite-1.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."ws-1.1.1" // {
+                  (sources."ws-1.0.1" // {
                     dependencies = [
                       sources."options-0.0.6"
                       sources."ultron-1.0.2"
                     ];
                   })
-                  sources."xmlhttprequest-ssl-1.5.3"
+                  sources."xmlhttprequest-ssl-1.5.1"
+                  sources."component-emitter-1.1.2"
+                  (sources."engine.io-parser-1.2.4" // {
+                    dependencies = [
+                      sources."after-0.8.1"
+                      sources."arraybuffer.slice-0.0.6"
+                      sources."base64-arraybuffer-0.1.2"
+                      sources."blob-0.0.4"
+                      (sources."has-binary-0.1.6" // {
+                        dependencies = [
+                          sources."isarray-0.0.1"
+                        ];
+                      })
+                      sources."utf8-2.1.0"
+                    ];
+                  })
+                  (sources."parsejson-0.0.1" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."parseqs-0.0.2" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."component-inherit-0.0.3"
                   sources."yeast-0.1.2"
                 ];
               })
-              sources."indexof-0.0.1"
+              sources."component-bind-1.0.0"
+              sources."component-emitter-1.2.0"
               sources."object-component-0.0.3"
-              (sources."parseuri-0.0.5" // {
+              sources."indexof-0.0.1"
+              (sources."parseuri-0.0.4" // {
                 dependencies = [
                   (sources."better-assert-1.0.2" // {
                     dependencies = [
@@ -36799,20 +37572,32 @@ in
                 ];
               })
               sources."to-array-0.1.4"
+              sources."backo2-1.0.2"
             ];
           })
-          (sources."socket.io-parser-2.3.1" // {
+          (sources."socket.io-adapter-0.4.0" // {
             dependencies = [
-              (sources."debug-2.2.0" // {
+              (sources."socket.io-parser-2.2.2" // {
                 dependencies = [
-                  sources."ms-0.7.1"
+                  sources."debug-0.7.4"
+                  sources."json3-3.2.6"
+                  sources."component-emitter-1.1.2"
+                  sources."isarray-0.0.1"
+                  sources."benchmark-1.0.0"
                 ];
               })
-              sources."json3-3.3.2"
-              sources."component-emitter-1.1.2"
+            ];
+          })
+          (sources."has-binary-0.1.7" // {
+            dependencies = [
               sources."isarray-0.0.1"
             ];
           })
+          (sources."debug-2.2.0" // {
+            dependencies = [
+              sources."ms-0.7.1"
+            ];
+          })
         ];
       })
       (sources."superagent-0.21.0" // {
@@ -36823,7 +37608,7 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -36856,31 +37641,32 @@ in
           sources."rimraf-2.2.8"
         ];
       })
-      (sources."winston-2.3.0" // {
+      (sources."winston-2.2.0" // {
         dependencies = [
           sources."async-1.0.0"
           sources."colors-1.0.3"
           sources."cycle-1.0.3"
           sources."eyes-0.1.8"
           sources."isstream-0.1.2"
+          sources."pkginfo-0.3.1"
           sources."stack-trace-0.0.9"
         ];
       })
-      (sources."yargs-6.6.0" // {
+      (sources."yargs-4.7.1" // {
         dependencies = [
           sources."camelcase-3.0.0"
           (sources."cliui-3.2.0" // {
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
-              sources."wrap-ansi-2.1.0"
+              sources."wrap-ansi-2.0.0"
             ];
           })
           sources."decamelize-1.2.0"
-          sources."get-caller-file-1.0.2"
+          sources."lodash.assign-4.2.0"
           (sources."os-locale-1.4.0" // {
             dependencies = [
               (sources."lcid-1.0.0" // {
@@ -36890,6 +37676,47 @@ in
               })
             ];
           })
+          (sources."pkg-conf-1.1.3" // {
+            dependencies = [
+              (sources."find-up-1.1.2" // {
+                dependencies = [
+                  sources."path-exists-2.1.0"
+                  (sources."pinkie-promise-2.0.1" // {
+                    dependencies = [
+                      sources."pinkie-2.0.4"
+                    ];
+                  })
+                ];
+              })
+              (sources."load-json-file-1.1.0" // {
+                dependencies = [
+                  sources."graceful-fs-4.1.11"
+                  (sources."parse-json-2.2.0" // {
+                    dependencies = [
+                      (sources."error-ex-1.3.0" // {
+                        dependencies = [
+                          sources."is-arrayish-0.2.1"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."pify-2.3.0"
+                  (sources."pinkie-promise-2.0.1" // {
+                    dependencies = [
+                      sources."pinkie-2.0.4"
+                    ];
+                  })
+                  (sources."strip-bom-2.0.0" // {
+                    dependencies = [
+                      sources."is-utf8-0.2.1"
+                    ];
+                  })
+                ];
+              })
+              sources."object-assign-4.1.0"
+              sources."symbol-0.2.3"
+            ];
+          })
           (sources."read-pkg-up-1.0.1" // {
             dependencies = [
               (sources."find-up-1.1.2" // {
@@ -36964,9 +37791,8 @@ in
               })
             ];
           })
-          sources."require-directory-2.1.1"
           sources."require-main-filename-1.0.1"
-          sources."set-blocking-2.0.0"
+          sources."set-blocking-1.0.0"
           (sources."string-width-1.0.2" // {
             dependencies = [
               sources."code-point-at-1.1.0"
@@ -36977,14 +37803,14 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.1.1"
+                  sources."ansi-regex-2.0.0"
                 ];
               })
             ];
           })
-          sources."which-module-1.0.0"
+          sources."window-size-0.2.0"
           sources."y18n-3.2.1"
-          sources."yargs-parser-4.2.1"
+          sources."yargs-parser-2.4.1"
         ];
       })
     ];
@@ -37141,15 +37967,15 @@ in
                 dependencies = [
                   (sources."async-2.1.4" // {
                     dependencies = [
-                      sources."lodash-4.17.4"
+                      sources."lodash-4.17.2"
                     ];
                   })
                 ];
               })
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.14" // {
+              (sources."mime-types-2.1.13" // {
                 dependencies = [
-                  sources."mime-db-1.26.0"
+                  sources."mime-db-1.25.0"
                 ];
               })
               sources."node-uuid-1.4.7"
@@ -37166,14 +37992,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.2" // {
+                  (sources."sshpk-1.10.1" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.1"
+                      sources."dashdash-1.14.0"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.5"
+                      sources."tweetnacl-0.14.3"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -37207,12 +38033,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.1.1"
+                          sources."ansi-regex-2.0.0"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -37231,7 +38057,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.1"
+                      sources."jsonpointer-4.0.0"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -37278,13 +38104,12 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "1.14.0";
+    version = "1.13.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz";
-      sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823";
+      url = "https://registry.npmjs.org/webpack/-/webpack-1.13.3.tgz";
+      sha1 = "e79c46fe5a37c5ca70084ba0894c595cdcb42815";
     };
     dependencies = [
-      sources."acorn-3.3.0"
       sources."async-1.5.2"
       sources."clone-1.0.2"
       (sources."enhanced-resolve-0.9.1" // {
@@ -37293,12 +38118,13 @@ in
           sources."graceful-fs-4.1.11"
         ];
       })
+      sources."acorn-3.3.0"
       sources."interpret-0.6.6"
       (sources."loader-utils-0.2.16" // {
         dependencies = [
           sources."big.js-3.1.3"
           sources."emojis-list-2.1.0"
-          sources."json5-0.5.1"
+          sources."json5-0.5.0"
           sources."object-assign-4.1.0"
         ];
       })
@@ -37327,7 +38153,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."node-libs-browser-0.7.0" // {
+      (sources."node-libs-browser-0.6.0" // {
         dependencies = [
           sources."assert-1.4.1"
           (sources."browserify-zlib-0.1.4" // {
@@ -37347,58 +38173,44 @@ in
               sources."date-now-0.1.4"
             ];
           })
-          sources."constants-browserify-1.0.0"
-          (sources."crypto-browserify-3.3.0" // {
+          sources."constants-browserify-0.0.1"
+          (sources."crypto-browserify-3.2.8" // {
             dependencies = [
               sources."pbkdf2-compat-2.0.1"
               sources."ripemd160-0.2.0"
               sources."sha.js-2.2.6"
-              (sources."browserify-aes-0.4.0" // {
-                dependencies = [
-                  sources."inherits-2.0.3"
-                ];
-              })
             ];
           })
           sources."domain-browser-1.1.7"
           sources."events-1.1.1"
-          sources."https-browserify-0.0.1"
-          sources."os-browserify-0.2.1"
+          (sources."http-browserify-1.7.0" // {
+            dependencies = [
+              sources."Base64-0.2.1"
+              sources."inherits-2.0.3"
+            ];
+          })
+          sources."https-browserify-0.0.0"
+          sources."os-browserify-0.1.2"
           sources."path-browserify-0.0.0"
           sources."process-0.11.9"
           sources."punycode-1.4.1"
           sources."querystring-es3-0.2.1"
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-1.1.14" // {
             dependencies = [
-              sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
-              sources."isarray-1.0.0"
-              sources."inherits-2.0.3"
-              sources."process-nextick-args-1.0.7"
-              sources."util-deprecate-1.0.2"
-            ];
-          })
-          (sources."stream-browserify-2.0.1" // {
-            dependencies = [
+              sources."isarray-0.0.1"
               sources."inherits-2.0.3"
             ];
           })
-          (sources."stream-http-2.6.1" // {
+          (sources."stream-browserify-1.0.0" // {
             dependencies = [
-              sources."builtin-status-codes-3.0.0"
               sources."inherits-2.0.3"
-              sources."to-arraybuffer-1.0.1"
-              sources."xtend-4.0.1"
             ];
           })
           sources."string_decoder-0.10.31"
-          (sources."timers-browserify-2.0.2" // {
-            dependencies = [
-              sources."setimmediate-1.0.5"
-            ];
-          })
+          sources."timers-browserify-1.4.2"
           sources."tty-browserify-0.0.0"
-          (sources."url-0.11.0" // {
+          (sources."url-0.10.3" // {
             dependencies = [
               sources."punycode-1.3.2"
               sources."querystring-0.2.0"
@@ -37428,7 +38240,7 @@ in
         ];
       })
       sources."tapable-0.1.10"
-      (sources."uglify-js-2.7.5" // {
+      (sources."uglify-js-2.7.4" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -37442,7 +38254,7 @@ in
                     dependencies = [
                       (sources."align-text-0.1.4" // {
                         dependencies = [
-                          (sources."kind-of-3.1.0" // {
+                          (sources."kind-of-3.0.4" // {
                             dependencies = [
                               sources."is-buffer-1.1.4"
                             ];
@@ -37458,7 +38270,7 @@ in
                     dependencies = [
                       (sources."align-text-0.1.4" // {
                         dependencies = [
-                          (sources."kind-of-3.1.0" // {
+                          (sources."kind-of-3.0.4" // {
                             dependencies = [
                               sources."is-buffer-1.1.4"
                             ];
@@ -37506,7 +38318,7 @@ in
                                       sources."isarray-1.0.0"
                                     ];
                                   })
-                                  sources."randomatic-1.1.6"
+                                  sources."randomatic-1.1.5"
                                   sources."repeat-string-1.6.1"
                                 ];
                               })
@@ -37524,7 +38336,7 @@ in
                       sources."extglob-0.3.2"
                       sources."filename-regex-2.0.0"
                       sources."is-extglob-1.0.0"
-                      (sources."kind-of-3.1.0" // {
+                      (sources."kind-of-3.0.4" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -37561,7 +38373,7 @@ in
               sources."inherits-2.0.3"
               (sources."is-binary-path-1.0.1" // {
                 dependencies = [
-                  sources."binary-extensions-1.8.0"
+                  sources."binary-extensions-1.7.0"
                 ];
               })
               (sources."is-glob-2.0.1" // {
@@ -37595,17 +38407,17 @@ in
                   sources."set-immediate-shim-1.0.1"
                 ];
               })
-              (sources."fsevents-1.0.17" // {
+              (sources."fsevents-1.0.15" // {
                 dependencies = [
-                  sources."nan-2.5.0"
-                  (sources."node-pre-gyp-0.6.32" // {
+                  sources."nan-2.4.0"
+                  (sources."node-pre-gyp-0.6.31" // {
                     dependencies = [
                       (sources."nopt-3.0.6" // {
                         dependencies = [
                           sources."abbrev-1.0.9"
                         ];
                       })
-                      (sources."npmlog-4.0.2" // {
+                      (sources."npmlog-4.0.1" // {
                         dependencies = [
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
@@ -37623,13 +38435,13 @@ in
                             ];
                           })
                           sources."console-control-strings-1.1.0"
-                          (sources."gauge-2.7.2" // {
+                          (sources."gauge-2.7.1" // {
                             dependencies = [
                               sources."aproba-1.0.4"
-                              sources."supports-color-0.2.0"
+                              sources."has-color-0.1.7"
                               sources."has-unicode-2.0.1"
                               sources."object-assign-4.1.0"
-                              sources."signal-exit-3.0.2"
+                              sources."signal-exit-3.0.1"
                               (sources."string-width-1.0.2" // {
                                 dependencies = [
                                   sources."code-point-at-1.1.0"
@@ -37642,7 +38454,7 @@ in
                               })
                               (sources."strip-ansi-3.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.1.1"
+                                  sources."ansi-regex-2.0.0"
                                 ];
                               })
                               sources."wide-align-1.1.0"
@@ -37684,12 +38496,12 @@ in
                                   sources."escape-string-regexp-1.0.5"
                                   (sources."has-ansi-2.0.0" // {
                                     dependencies = [
-                                      sources."ansi-regex-2.1.1"
+                                      sources."ansi-regex-2.0.0"
                                     ];
                                   })
                                   (sources."strip-ansi-3.0.1" // {
                                     dependencies = [
-                                      sources."ansi-regex-2.1.1"
+                                      sources."ansi-regex-2.0.0"
                                     ];
                                   })
                                   sources."supports-color-2.0.0"
@@ -37708,7 +38520,7 @@ in
                                       sources."is-property-1.0.2"
                                     ];
                                   })
-                                  sources."jsonpointer-4.0.1"
+                                  sources."jsonpointer-4.0.0"
                                   sources."xtend-4.0.1"
                                 ];
                               })
@@ -37737,14 +38549,14 @@ in
                                   sources."verror-1.3.6"
                                 ];
                               })
-                              (sources."sshpk-1.10.2" // {
+                              (sources."sshpk-1.10.1" // {
                                 dependencies = [
                                   sources."asn1-0.2.3"
                                   sources."assert-plus-1.0.0"
-                                  sources."dashdash-1.14.1"
+                                  sources."dashdash-1.14.0"
                                   sources."getpass-0.1.6"
                                   sources."jsbn-0.1.0"
-                                  sources."tweetnacl-0.14.5"
+                                  sources."tweetnacl-0.14.3"
                                   sources."jodid25519-1.0.2"
                                   sources."ecc-jsbn-0.1.1"
                                   sources."bcrypt-pbkdf-1.0.0"
@@ -37755,9 +38567,9 @@ in
                           sources."is-typedarray-1.0.0"
                           sources."isstream-0.1.2"
                           sources."json-stringify-safe-5.0.1"
-                          (sources."mime-types-2.1.14" // {
+                          (sources."mime-types-2.1.13" // {
                             dependencies = [
-                              sources."mime-db-1.26.0"
+                              sources."mime-db-1.25.0"
                             ];
                           })
                           sources."oauth-sign-0.8.2"
@@ -37769,7 +38581,7 @@ in
                             ];
                           })
                           sources."tunnel-agent-0.4.3"
-                          sources."uuid-3.0.1"
+                          sources."uuid-3.0.0"
                         ];
                       })
                       (sources."rimraf-2.5.4" // {
@@ -37857,14 +38669,14 @@ in
           sources."graceful-fs-4.1.11"
         ];
       })
-      (sources."webpack-core-0.6.9" // {
+      (sources."webpack-core-0.6.8" // {
         dependencies = [
           (sources."source-map-0.4.4" // {
             dependencies = [
               sources."amdefine-1.0.1"
             ];
           })
-          sources."source-list-map-0.1.8"
+          sources."source-list-map-0.1.6"
         ];
       })
     ];
@@ -37892,4 +38704,518 @@ in
     };
     production = true;
   };
+  yarn = nodeEnv.buildNodePackage {
+    name = "yarn";
+    packageName = "yarn";
+    version = "0.17.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.17.8.tgz";
+      sha1 = "6a95d19aaeb891810618937db98a2080683cbbb4";
+    };
+    dependencies = [
+      (sources."babel-runtime-6.18.0" // {
+        dependencies = [
+          sources."core-js-2.4.1"
+          sources."regenerator-runtime-0.9.6"
+        ];
+      })
+      sources."bytes-2.4.0"
+      sources."camelcase-3.0.0"
+      (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."cmd-shim-2.0.2" // {
+        dependencies = [
+          sources."graceful-fs-4.1.11"
+        ];
+      })
+      (sources."commander-2.9.0" // {
+        dependencies = [
+          sources."graceful-readlink-1.0.1"
+        ];
+      })
+      sources."death-1.0.0"
+      (sources."debug-2.3.3" // {
+        dependencies = [
+          sources."ms-0.7.2"
+        ];
+      })
+      (sources."defaults-1.0.3" // {
+        dependencies = [
+          sources."clone-1.0.2"
+        ];
+      })
+      sources."detect-indent-4.0.0"
+      sources."diff-2.2.3"
+      sources."ini-1.3.4"
+      (sources."inquirer-1.2.3" // {
+        dependencies = [
+          sources."ansi-escapes-1.4.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-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-4.17.2"
+          sources."mute-stream-0.0.6"
+          (sources."pinkie-promise-2.0.1" // {
+            dependencies = [
+              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."through-2.3.8"
+        ];
+      })
+      (sources."invariant-2.2.2" // {
+        dependencies = [
+          (sources."loose-envify-1.3.0" // {
+            dependencies = [
+              sources."js-tokens-2.0.0"
+            ];
+          })
+        ];
+      })
+      (sources."is-builtin-module-1.0.0" // {
+        dependencies = [
+          sources."builtin-modules-1.1.1"
+        ];
+      })
+      (sources."is-ci-1.0.10" // {
+        dependencies = [
+          sources."ci-info-1.0.0"
+        ];
+      })
+      sources."leven-2.0.0"
+      (sources."loud-rejection-1.6.0" // {
+        dependencies = [
+          (sources."currently-unhandled-0.4.1" // {
+            dependencies = [
+              sources."array-find-index-1.0.2"
+            ];
+          })
+          sources."signal-exit-3.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."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      (sources."node-emoji-1.4.1" // {
+        dependencies = [
+          sources."string.prototype.codepointat-0.2.0"
+        ];
+      })
+      (sources."node-gyp-3.4.0" // {
+        dependencies = [
+          (sources."fstream-1.0.10" // {
+            dependencies = [
+              sources."inherits-2.0.3"
+            ];
+          })
+          (sources."glob-7.1.1" // {
+            dependencies = [
+              sources."fs.realpath-1.0.0"
+              (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."graceful-fs-4.1.11"
+          (sources."nopt-3.0.6" // {
+            dependencies = [
+              sources."abbrev-1.0.9"
+            ];
+          })
+          (sources."npmlog-3.1.2" // {
+            dependencies = [
+              (sources."are-we-there-yet-1.1.2" // {
+                dependencies = [
+                  sources."delegates-1.0.0"
+                  (sources."readable-stream-2.2.2" // {
+                    dependencies = [
+                      sources."buffer-shims-1.0.0"
+                      sources."core-util-is-1.0.2"
+                      sources."isarray-1.0.0"
+                      sources."inherits-2.0.3"
+                      sources."process-nextick-args-1.0.7"
+                      sources."string_decoder-0.10.31"
+                      sources."util-deprecate-1.0.2"
+                    ];
+                  })
+                ];
+              })
+              sources."console-control-strings-1.1.0"
+              (sources."gauge-2.6.0" // {
+                dependencies = [
+                  sources."aproba-1.0.4"
+                  sources."has-color-0.1.7"
+                  sources."has-unicode-2.0.1"
+                  sources."object-assign-4.1.0"
+                  sources."signal-exit-3.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."wide-align-1.1.0"
+                ];
+              })
+              sources."set-blocking-2.0.0"
+            ];
+          })
+          (sources."osenv-0.1.3" // {
+            dependencies = [
+              sources."os-homedir-1.0.2"
+              sources."os-tmpdir-1.0.2"
+            ];
+          })
+          (sources."path-array-1.0.1" // {
+            dependencies = [
+              (sources."array-index-1.0.0" // {
+                dependencies = [
+                  (sources."es6-symbol-3.1.0" // {
+                    dependencies = [
+                      sources."d-0.1.1"
+                      (sources."es5-ext-0.10.12" // {
+                        dependencies = [
+                          sources."es6-iterator-2.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+          (sources."which-1.2.12" // {
+            dependencies = [
+              sources."isexe-1.1.2"
+            ];
+          })
+        ];
+      })
+      sources."object-path-0.11.3"
+      (sources."proper-lockfile-1.2.0" // {
+        dependencies = [
+          sources."err-code-1.1.1"
+          sources."extend-3.0.0"
+          sources."graceful-fs-4.1.11"
+          sources."retry-0.10.0"
+        ];
+      })
+      (sources."read-1.0.7" // {
+        dependencies = [
+          sources."mute-stream-0.0.6"
+        ];
+      })
+      (sources."repeating-2.0.1" // {
+        dependencies = [
+          (sources."is-finite-1.0.2" // {
+            dependencies = [
+              sources."number-is-nan-1.0.1"
+            ];
+          })
+        ];
+      })
+      (sources."request-2.79.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.2" // {
+            dependencies = [
+              sources."asynckit-0.4.0"
+            ];
+          })
+          (sources."har-validator-2.0.6" // {
+            dependencies = [
+              (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.13" // {
+            dependencies = [
+              sources."mime-db-1.25.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."uuid-3.0.0"
+        ];
+      })
+      sources."request-capture-har-1.1.4"
+      (sources."rimraf-2.5.4" // {
+        dependencies = [
+          (sources."glob-7.1.1" // {
+            dependencies = [
+              sources."fs.realpath-1.0.0"
+              (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."roadrunner-1.1.0"
+      sources."semver-5.3.0"
+      (sources."strip-bom-2.0.0" // {
+        dependencies = [
+          sources."is-utf8-0.2.1"
+        ];
+      })
+      (sources."tar-2.2.1" // {
+        dependencies = [
+          sources."block-stream-0.0.9"
+          (sources."fstream-1.0.10" // {
+            dependencies = [
+              sources."graceful-fs-4.1.11"
+            ];
+          })
+          sources."inherits-2.0.3"
+        ];
+      })
+      (sources."tar-stream-1.5.2" // {
+        dependencies = [
+          (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."end-of-stream-1.1.0" // {
+            dependencies = [
+              (sources."once-1.3.3" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+            ];
+          })
+          (sources."readable-stream-2.2.2" // {
+            dependencies = [
+              sources."buffer-shims-1.0.0"
+              sources."core-util-is-1.0.2"
+              sources."isarray-1.0.0"
+              sources."inherits-2.0.3"
+              sources."process-nextick-args-1.0.7"
+              sources."string_decoder-0.10.31"
+              sources."util-deprecate-1.0.2"
+            ];
+          })
+          sources."xtend-4.0.1"
+        ];
+      })
+      (sources."user-home-2.0.0" // {
+        dependencies = [
+          sources."os-homedir-1.0.2"
+        ];
+      })
+      (sources."validate-npm-package-license-3.0.1" // {
+        dependencies = [
+          (sources."spdx-correct-1.0.2" // {
+            dependencies = [
+              sources."spdx-license-ids-1.2.2"
+            ];
+          })
+          sources."spdx-expression-parse-1.0.4"
+        ];
+      })
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "<p align=\"center\">   <a href=\"https://yarnpkg.com/\">     <img alt=\"Yarn\" src=\"https://github.com/yarnpkg/assets/blob/master/yarn-kitten-full.png?raw=true\" width=\"546\">   </a> </p>";
+      homepage = "https://github.com/yarnpkg/yarn#readme";
+      license = "BSD-2-Clause";
+    };
+    production = true;
+  };
 }
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 1f1d9fb7539..2132aff9dd0 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -76,13 +76,13 @@ let
         sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3";
       };
     };
-    "resolve-1.2.0" = {
+    "resolve-1.1.7" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.2.0";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz";
-        sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
     "global-paths-0.1.2" = {
@@ -274,13 +274,13 @@ let
         sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe";
       };
     };
-    "global-prefix-0.1.5" = {
+    "global-prefix-0.1.4" = {
       name = "global-prefix";
       packageName = "global-prefix";
-      version = "0.1.5";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz";
-        sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f";
+        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.4.tgz";
+        sha1 = "05158db1cde2dd491b455e290eb3ab8bfc45c6e1";
       };
     };
     "is-windows-0.2.0" = {
@@ -292,15 +292,6 @@ let
         sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c";
       };
     };
-    "homedir-polyfill-1.0.1" = {
-      name = "homedir-polyfill";
-      packageName = "homedir-polyfill";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz";
-        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
-      };
-    };
     "ini-1.3.4" = {
       name = "ini";
       packageName = "ini";
@@ -310,6 +301,15 @@ let
         sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
       };
     };
+    "osenv-0.1.3" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz";
+        sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217";
+      };
+    };
     "which-1.2.12" = {
       name = "which";
       packageName = "which";
@@ -319,13 +319,22 @@ let
         sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
       };
     };
-    "parse-passwd-1.0.0" = {
-      name = "parse-passwd";
-      packageName = "parse-passwd";
-      version = "1.0.0";
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz";
-        sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+      };
+    };
+    "os-tmpdir-1.0.2" = {
+      name = "os-tmpdir";
+      packageName = "os-tmpdir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
       };
     };
     "isexe-1.1.2" = {
@@ -400,13 +409,13 @@ let
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-arm-cdn-1.0.0" = {
+    "azure-arm-cdn-0.2.1" = {
       name = "azure-arm-cdn";
       packageName = "azure-arm-cdn";
-      version = "1.0.0";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz";
-        sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-0.2.1.tgz";
+        sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a";
       };
     };
     "azure-arm-commerce-0.2.0" = {
@@ -418,31 +427,13 @@ let
         sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
-    "azure-arm-compute-0.19.1" = {
+    "azure-arm-compute-0.19.0" = {
       name = "azure-arm-compute";
       packageName = "azure-arm-compute";
-      version = "0.19.1";
+      version = "0.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz";
-        sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd";
-      };
-    };
-    "azure-arm-datalake-analytics-1.0.1-preview" = {
-      name = "azure-arm-datalake-analytics";
-      packageName = "azure-arm-datalake-analytics";
-      version = "1.0.1-preview";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.1-preview.tgz";
-        sha1 = "75461904000427e12ce11d634d74c052c86de994";
-      };
-    };
-    "azure-arm-datalake-store-1.0.1-preview" = {
-      name = "azure-arm-datalake-store";
-      packageName = "azure-arm-datalake-store";
-      version = "1.0.1-preview";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.1-preview.tgz";
-        sha1 = "bd07cbeb5eb355a00b7bed69e198a1a968115dd5";
+        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.0.tgz";
+        sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e";
       };
     };
     "azure-arm-hdinsight-0.2.2" = {
@@ -544,6 +535,24 @@ let
         sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02";
       };
     };
+    "azure-arm-datalake-analytics-0.4.3" = {
+      name = "azure-arm-datalake-analytics";
+      packageName = "azure-arm-datalake-analytics";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-0.4.3.tgz";
+        sha1 = "10c81e59d3064289a42ab37fea805a334333ed91";
+      };
+    };
+    "azure-arm-datalake-store-0.4.2" = {
+      name = "azure-arm-datalake-store";
+      packageName = "azure-arm-datalake-store";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-0.4.2.tgz";
+        sha1 = "479f4a28986c9737b8fef14090c0c7ccc33cb123";
+      };
+    };
     "azure-arm-devtestlabs-0.1.0" = {
       name = "azure-arm-devtestlabs";
       packageName = "azure-arm-devtestlabs";
@@ -634,13 +643,13 @@ let
         sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54";
       };
     };
-    "azure-arm-resource-1.6.1-preview" = {
+    "azure-arm-resource-1.4.5-preview" = {
       name = "azure-arm-resource";
       packageName = "azure-arm-resource";
-      version = "1.6.1-preview";
+      version = "1.4.5-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz";
-        sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
+        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.5-preview.tgz";
+        sha1 = "166934783752607e9a4128ea0ad715b9b7a9015f";
       };
     };
     "azure-arm-storage-0.13.1-preview" = {
@@ -733,13 +742,13 @@ let
         sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e";
       };
     };
-    "applicationinsights-0.16.0" = {
+    "applicationinsights-0.15.12" = {
       name = "applicationinsights";
       packageName = "applicationinsights";
-      version = "0.16.0";
+      version = "0.15.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
-        sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3";
+        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.15.12.tgz";
+        sha1 = "d03f282da9424f33729eb7da8279e8e8a20dc7fc";
       };
     };
     "caller-id-0.1.0" = {
@@ -859,13 +868,13 @@ let
         sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
       };
     };
-    "moment-2.17.1" = {
+    "moment-2.17.0" = {
       name = "moment";
       packageName = "moment";
-      version = "2.17.1";
+      version = "2.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
-        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
+        url = "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz";
+        sha1 = "a4c292e02aac5ddefb29a6eed24f51938dd3b74f";
       };
     };
     "ms-rest-1.15.2" = {
@@ -895,6 +904,15 @@ let
         sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
       };
     };
+    "node-uuid-1.2.0" = {
+      name = "node-uuid";
+      packageName = "node-uuid";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz";
+        sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b";
+      };
+    };
     "omelette-0.1.0" = {
       name = "omelette";
       packageName = "omelette";
@@ -1021,15 +1039,6 @@ let
         sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
       };
     };
-    "uuid-3.0.1" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
-        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
-      };
-    };
     "validator-5.2.0" = {
       name = "validator";
       packageName = "validator";
@@ -1111,13 +1120,13 @@ let
         sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
       };
     };
-    "xmldom-0.1.27" = {
+    "xmldom-0.1.22" = {
       name = "xmldom";
       packageName = "xmldom";
-      version = "0.1.27";
+      version = "0.1.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz";
-        sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
+        sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
       };
     };
     "xpath.js-1.0.7" = {
@@ -1138,13 +1147,13 @@ let
         sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb";
       };
     };
-    "jwa-1.1.5" = {
+    "jwa-1.1.4" = {
       name = "jwa";
       packageName = "jwa";
-      version = "1.1.5";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz";
-        sha1 = "a0552ce0220742cd52e153774a32905c30e756e5";
+        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz";
+        sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e";
       };
     };
     "safe-buffer-5.0.1" = {
@@ -1165,13 +1174,22 @@ let
         sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
       };
     };
-    "ecdsa-sig-formatter-1.0.9" = {
+    "ecdsa-sig-formatter-1.0.7" = {
       name = "ecdsa-sig-formatter";
       packageName = "ecdsa-sig-formatter";
-      version = "1.0.9";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz";
-        sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1";
+        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.7.tgz";
+        sha1 = "3137e976a1d6232517e2513e04e32f79bcbdf126";
+      };
+    };
+    "base64-url-1.3.3" = {
+      name = "base64-url";
+      packageName = "base64-url";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
+        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
       };
     };
     "xml2js-0.2.7" = {
@@ -1813,13 +1831,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.14" = {
+    "mime-types-2.1.13" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.14";
+      version = "2.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
-        sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz";
+        sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -1885,13 +1903,13 @@ let
         sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
       };
     };
-    "lodash-4.17.4" = {
+    "lodash-4.17.2" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.4";
+      version = "4.17.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
-        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz";
+        sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42";
       };
     };
     "chalk-1.1.3" = {
@@ -1975,13 +1993,13 @@ let
         sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
       };
     };
-    "ansi-regex-2.1.1" = {
+    "ansi-regex-2.0.0" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
-      version = "2.1.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
-        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
+        sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
       };
     };
     "graceful-readlink-1.0.1" = {
@@ -2011,13 +2029,13 @@ let
         sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
       };
     };
-    "jsonpointer-4.0.1" = {
+    "jsonpointer-4.0.0" = {
       name = "jsonpointer";
       packageName = "jsonpointer";
-      version = "4.0.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
-        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz";
+        sha1 = "6661e161d2fc445f19f98430231343722e1fcbd5";
       };
     };
     "xtend-4.0.1" = {
@@ -2101,13 +2119,13 @@ let
         sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252";
       };
     };
-    "sshpk-1.10.2" = {
+    "sshpk-1.10.1" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.10.2";
+      version = "1.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz";
-        sha1 = "d5a804ce22695515638e798dbe23273de070a5fa";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz";
+        sha1 = "30e1a5d329244974a1af61511339d595af6638b0";
       };
     };
     "extsprintf-1.0.2" = {
@@ -2155,13 +2173,13 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "dashdash-1.14.1" = {
+    "dashdash-1.14.0" = {
       name = "dashdash";
       packageName = "dashdash";
-      version = "1.14.1";
+      version = "1.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
-        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz";
+        sha1 = "29e486c5418bf0f356034a993d51686a33e84141";
       };
     };
     "getpass-0.1.6" = {
@@ -2182,13 +2200,13 @@ let
         sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
       };
     };
-    "tweetnacl-0.14.5" = {
+    "tweetnacl-0.14.3" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
-      version = "0.14.5";
+      version = "0.14.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
-        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz";
+        sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d";
       };
     };
     "jodid25519-1.0.2" = {
@@ -2218,13 +2236,13 @@ let
         sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
       };
     };
-    "mime-db-1.26.0" = {
+    "mime-db-1.25.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.26.0";
+      version = "1.25.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
-        sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz";
+        sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392";
       };
     };
     "punycode-1.4.1" = {
@@ -2281,13 +2299,13 @@ let
         sha1 = "0c989774f2870c69378aa665648cdc60f343aa53";
       };
     };
-    "concat-stream-1.6.0" = {
+    "concat-stream-1.5.2" = {
       name = "concat-stream";
       packageName = "concat-stream";
-      version = "1.6.0";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz";
-        sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
+        sha1 = "708978624d856af41a5a741defdd261da752c266";
       };
     };
     "http-response-object-1.1.0" = {
@@ -2317,24 +2335,6 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "readable-stream-2.2.2" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
-        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
-      };
-    };
-    "buffer-shims-1.0.0" = {
-      name = "buffer-shims";
-      packageName = "buffer-shims";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
-        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
-      };
-    };
     "http-basic-2.5.1" = {
       name = "http-basic";
       packageName = "http-basic";
@@ -2362,15 +2362,6 @@ let
         sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
       };
     };
-    "os-homedir-1.0.2" = {
-      name = "os-homedir";
-      packageName = "os-homedir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
-        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
-      };
-    };
     "async-1.0.0" = {
       name = "async";
       packageName = "async";
@@ -2389,13 +2380,13 @@ let
         sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
       };
     };
-    "mute-stream-0.0.7" = {
+    "mute-stream-0.0.6" = {
       name = "mute-stream";
       packageName = "mute-stream";
-      version = "0.0.7";
+      version = "0.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz";
-        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
+        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
       };
     };
     "argparse-1.0.4" = {
@@ -2686,6 +2677,15 @@ let
         sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
       };
     };
+    "readable-stream-2.2.2" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
+        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
+      };
+    };
     "stream-shift-1.0.0" = {
       name = "stream-shift";
       packageName = "stream-shift";
@@ -2704,6 +2704,15 @@ let
         sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
       };
     };
+    "buffer-shims-1.0.0" = {
+      name = "buffer-shims";
+      packageName = "buffer-shims";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
+        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
+      };
+    };
     "camelcase-keys-2.1.0" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -2812,13 +2821,13 @@ let
         sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
       };
     };
-    "signal-exit-3.0.2" = {
+    "signal-exit-3.0.1" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.2";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz";
+        sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81";
       };
     };
     "array-find-index-1.0.2" = {
@@ -3109,13 +3118,13 @@ let
         sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
       };
     };
-    "debug-2.6.0" = {
+    "debug-2.3.3" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.0";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
-        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
+        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
+        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
       };
     };
     "ms-0.7.2" = {
@@ -3127,15 +3136,6 @@ let
         sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
       };
     };
-    "os-tmpdir-1.0.2" = {
-      name = "os-tmpdir";
-      packageName = "os-tmpdir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
-        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
-      };
-    };
     "rimraf-2.2.8" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -3145,22 +3145,22 @@ let
         sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
       };
     };
-    "JSONStream-1.3.0" = {
+    "JSONStream-1.2.1" = {
       name = "JSONStream";
       packageName = "JSONStream";
-      version = "1.3.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz";
-        sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
+        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
       };
     };
-    "assert-1.4.1" = {
+    "assert-1.3.0" = {
       name = "assert";
       packageName = "assert";
-      version = "1.4.1";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
-        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
+        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
+        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
       };
     };
     "browser-pack-6.0.2" = {
@@ -3208,15 +3208,6 @@ let
         sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4";
       };
     };
-    "concat-stream-1.5.2" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
-        sha1 = "708978624d856af41a5a741defdd261da752c266";
-      };
-    };
     "console-browserify-1.1.0" = {
       name = "console-browserify";
       packageName = "console-browserify";
@@ -3289,6 +3280,15 @@ let
         sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
       };
     };
+    "glob-5.0.15" = {
+      name = "glob";
+      packageName = "glob";
+      version = "5.0.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
+        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
+      };
+    };
     "has-1.0.1" = {
       name = "has";
       packageName = "has";
@@ -3424,13 +3424,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.6.1" = {
+    "stream-http-2.5.0" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.6.1";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.1.tgz";
-        sha1 = "7d20fcdfebc16b16e4174e31dd94cd9c70f10e89";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz";
+        sha1 = "585eee513217ed98fe199817e7313b6f772a6802";
       };
     };
     "subarg-1.0.0" = {
@@ -3451,13 +3451,13 @@ let
         sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710";
       };
     };
-    "through2-2.0.3" = {
+    "through2-2.0.1" = {
       name = "through2";
       packageName = "through2";
-      version = "2.0.3";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz";
-        sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be";
+        url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz";
+        sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9";
       };
     };
     "timers-browserify-1.4.2" = {
@@ -3568,15 +3568,6 @@ let
         sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
       };
     };
-    "resolve-1.1.7" = {
-      name = "resolve";
-      packageName = "resolve";
-      version = "1.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
-        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
-      };
-    };
     "pako-0.2.9" = {
       name = "pako";
       packageName = "pako";
@@ -3811,13 +3802,13 @@ let
         sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
       };
     };
-    "asn1.js-4.9.1" = {
+    "asn1.js-4.9.0" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "4.9.1";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz";
-        sha1 = "48ba240b45a9280e94748990ba597d216617fd40";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz";
+        sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a";
       };
     };
     "ripemd160-1.0.1" = {
@@ -3982,13 +3973,13 @@ let
         sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
       };
     };
-    "builtin-status-codes-3.0.0" = {
+    "builtin-status-codes-2.0.0" = {
       name = "builtin-status-codes";
       packageName = "builtin-status-codes";
-      version = "3.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
-        sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
+        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz";
+        sha1 = "6f22003baacf003ccd287afe6872151fddc58579";
       };
     };
     "to-arraybuffer-1.0.1" = {
@@ -4054,13 +4045,13 @@ let
         sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395";
       };
     };
-    "castv2-client-1.2.0" = {
+    "castv2-client-1.1.2" = {
       name = "castv2-client";
       packageName = "castv2-client";
-      version = "1.2.0";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.2.0.tgz";
-        sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544";
+        url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.1.2.tgz";
+        sha1 = "7865eac9181cd1f419fdcee448b5793706f853ad";
       };
     };
     "chalk-1.0.0" = {
@@ -4459,13 +4450,13 @@ let
         sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc";
       };
     };
-    "numeral-1.5.6" = {
+    "numeral-1.5.5" = {
       name = "numeral";
       packageName = "numeral";
-      version = "1.5.6";
+      version = "1.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz";
-        sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f";
+        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.5.tgz";
+        sha1 = "b7515d64533626124e9196cfc68c8fd5b2dee208";
       };
     };
     "open-0.0.5" = {
@@ -4531,13 +4522,13 @@ let
         sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
       };
     };
-    "mdns-js-0.5.3" = {
+    "mdns-js-0.5.1" = {
       name = "mdns-js";
       packageName = "mdns-js";
-      version = "0.5.3";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.3.tgz";
-        sha1 = "add2958d399319b6d8f2dde29bebac5e845e8b6d";
+        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz";
+        sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec";
       };
     };
     "plist-2.0.1" = {
@@ -4693,13 +4684,13 @@ let
         sha1 = "106df57e0e509bafa6756e544d88205e52be33a6";
       };
     };
-    "simple-get-2.4.0" = {
+    "simple-get-2.3.0" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "2.4.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz";
-        sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.3.0.tgz";
+        sha1 = "c5fdfcce1e516ad4b2ce7b7c2bd2d710502d8ac9";
       };
     };
     "thirty-two-1.0.2" = {
@@ -4729,22 +4720,22 @@ let
         sha1 = "717b36fc61c4e9cb3755f0a9f90996ee5b46f0d0";
       };
     };
-    "simple-sha1-2.1.0" = {
+    "simple-sha1-2.0.8" = {
       name = "simple-sha1";
       packageName = "simple-sha1";
-      version = "2.1.0";
+      version = "2.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz";
-        sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3";
+        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.0.8.tgz";
+        sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f";
       };
     };
-    "rusha-0.8.5" = {
+    "rusha-0.8.4" = {
       name = "rusha";
       packageName = "rusha";
-      version = "0.8.5";
+      version = "0.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rusha/-/rusha-0.8.5.tgz";
-        sha1 = "a30ae9bd5a4e80fbc96fbe7a13232b944be24f84";
+        url = "https://registry.npmjs.org/rusha/-/rusha-0.8.4.tgz";
+        sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b";
       };
     };
     "simple-concat-1.0.0" = {
@@ -4909,13 +4900,13 @@ let
         sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854";
       };
     };
-    "random-access-file-1.4.0" = {
+    "random-access-file-1.3.1" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.4.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz";
-        sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.3.1.tgz";
+        sha1 = "5302a65a7ff2b83c50e18d79bf4cd619b520ac8d";
       };
     };
     "run-parallel-1.1.6" = {
@@ -5179,13 +5170,13 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.1.3" = {
+    "simple-peer-6.0.7" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.1.3";
+      version = "6.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.1.3.tgz";
-        sha1 = "c9a8baf72a36a4d4f05eab3df0db50d78a953583";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.0.7.tgz";
+        sha1 = "ccc5133b7e75e154ab17b9ccdbec91e970cc2278";
       };
     };
     "simple-websocket-4.1.0" = {
@@ -5521,13 +5512,13 @@ let
         sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c";
       };
     };
-    "exit-on-epipe-1.0.0" = {
+    "exit-on-epipe-0.1.0" = {
       name = "exit-on-epipe";
       packageName = "exit-on-epipe";
-      version = "1.0.0";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.0.tgz";
-        sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc";
+        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.1.0.tgz";
+        sha1 = "aa2f0155b78b34fe60dd2b462e84637ba5ed0697";
       };
     };
     "sax-1.2.1" = {
@@ -5566,13 +5557,13 @@ let
         sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33";
       };
     };
-    "insight-0.8.4" = {
+    "insight-0.8.3" = {
       name = "insight";
       packageName = "insight";
-      version = "0.8.4";
+      version = "0.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz";
-        sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884";
+        url = "https://registry.npmjs.org/insight/-/insight-0.8.3.tgz";
+        sha1 = "72d1e1b4da6c8b405db25043f9d86900f8cbf59d";
       };
     };
     "nopt-3.0.1" = {
@@ -5647,24 +5638,6 @@ let
         sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
       };
     };
-    "glob-5.0.15" = {
-      name = "glob";
-      packageName = "glob";
-      version = "5.0.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
-        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
-      };
-    };
-    "osenv-0.1.4" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz";
-        sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644";
-      };
-    };
     "plist-1.2.0" = {
       name = "plist";
       packageName = "plist";
@@ -5773,13 +5746,13 @@ let
         sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980";
       };
     };
-    "cordova-serve-1.0.1" = {
+    "cordova-serve-1.0.0" = {
       name = "cordova-serve";
       packageName = "cordova-serve";
-      version = "1.0.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.1.tgz";
-        sha1 = "895c7fb4bbe630fa1c89feaf6d74779cbff66da7";
+        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.0.tgz";
+        sha1 = "7fa1c40183d2b82adb792f9cb9e0d554a23eed85";
       };
     };
     "dep-graph-1.1.0" = {
@@ -5953,13 +5926,13 @@ let
         sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26";
       };
     };
-    "shelljs-0.7.6" = {
+    "shelljs-0.7.5" = {
       name = "shelljs";
       packageName = "shelljs";
-      version = "0.7.6";
+      version = "0.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz";
-        sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad";
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz";
+        sha1 = "2eef7a50a21e1ccf37da00df767ec69e30ad0675";
       };
     };
     "interpret-1.0.1" = {
@@ -5998,15 +5971,6 @@ let
         sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae";
       };
     };
-    "assert-1.3.0" = {
-      name = "assert";
-      packageName = "assert";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
-        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
-      };
-    };
     "compression-1.6.2" = {
       name = "compression";
       packageName = "compression";
@@ -6241,13 +6205,13 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "proxy-addr-1.1.3" = {
+    "proxy-addr-1.1.2" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "1.1.3";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.3.tgz";
-        sha1 = "dc97502f5722e888467b3fa2297a7b1ff47df074";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz";
+        sha1 = "b4cc5f22610d9535824c123aef9d3cf73c40ba37";
       };
     };
     "qs-6.2.0" = {
@@ -6322,6 +6286,15 @@ let
         sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
       };
     };
+    "ipaddr.js-1.1.1" = {
+      name = "ipaddr.js";
+      packageName = "ipaddr.js";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz";
+        sha1 = "c791d95f52b29c1247d5df80ada39b8a73647230";
+      };
+    };
     "destroy-1.0.4" = {
       name = "destroy";
       packageName = "destroy";
@@ -6619,22 +6592,22 @@ let
         sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
       };
     };
-    "lockfile-1.0.3" = {
+    "lockfile-1.0.2" = {
       name = "lockfile";
       packageName = "lockfile";
-      version = "1.0.3";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz";
-        sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79";
+        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz";
+        sha1 = "97e1990174f696cbe0a3acd58a43b84aa30c7c83";
       };
     };
-    "lru-cache-4.0.2" = {
+    "lru-cache-4.0.1" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "4.0.2";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz";
-        sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz";
+        sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be";
       };
     };
     "node-gyp-3.4.0" = {
@@ -6745,13 +6718,13 @@ let
         sha1 = "d0def882952b8de3f67eba5e91199661271f41f4";
       };
     };
-    "retry-0.10.1" = {
+    "retry-0.10.0" = {
       name = "retry";
       packageName = "retry";
-      version = "0.10.1";
+      version = "0.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
-        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
+        url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz";
+        sha1 = "649e15ca408422d98318161935e7f7d652d435dd";
       };
     };
     "sha-2.0.1" = {
@@ -6988,6 +6961,15 @@ let
         sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442";
       };
     };
+    "uuid-3.0.0" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
+        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
+      };
+    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -7591,22 +7573,13 @@ let
         sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
       };
     };
-    "clone-2.1.0" = {
-      name = "clone";
-      packageName = "clone";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz";
-        sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6";
-      };
-    };
-    "parserlib-1.1.1" = {
+    "parserlib-1.0.0" = {
       name = "parserlib";
       packageName = "parserlib";
-      version = "1.1.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz";
-        sha1 = "a64cfa724062434fdfc351c9a4ec2d92b94c06f4";
+        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.0.0.tgz";
+        sha1 = "88340e7e8d95bac9e09236742eef53bec1e4b30f";
       };
     };
     "bluebird-2.9.9" = {
@@ -8006,13 +7979,13 @@ let
         sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       };
     };
-    "nan-2.5.0" = {
+    "nan-2.4.0" = {
       name = "nan";
       packageName = "nan";
-      version = "2.5.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
-        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
+        url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz";
+        sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232";
       };
     };
     "jsonparse-0.0.6" = {
@@ -8369,22 +8342,22 @@ let
         sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
       };
     };
-    "ndjson-1.5.0" = {
+    "ndjson-1.4.3" = {
       name = "ndjson";
       packageName = "ndjson";
-      version = "1.5.0";
+      version = "1.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz";
-        sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8";
+        url = "https://registry.npmjs.org/ndjson/-/ndjson-1.4.3.tgz";
+        sha1 = "7aa026fe3ab38a7da1a2b4ad07b1008e733eb239";
       };
     };
-    "pump-1.0.2" = {
+    "pump-1.0.1" = {
       name = "pump";
       packageName = "pump";
-      version = "1.0.2";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz";
-        sha1 = "3b3ee6512f94f0e575538c17995f9f16990a5d51";
+        url = "https://registry.npmjs.org/pump/-/pump-1.0.1.tgz";
+        sha1 = "f1f1409fb9bd1085bbdb576b43b84ec4b5eadc1a";
       };
     };
     "pumpify-1.3.5" = {
@@ -8720,15 +8693,6 @@ let
         sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3";
       };
     };
-    "split2-2.1.1" = {
-      name = "split2";
-      packageName = "split2";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz";
-        sha1 = "7a1f551e176a90ecd3345f7246a0cfe175ef4fd0";
-      };
-    };
     "murl-0.4.1" = {
       name = "murl";
       packageName = "murl";
@@ -8747,40 +8711,31 @@ let
         sha1 = "80ab4e919749351263ef14500d684e57c4202840";
       };
     };
-    "bl-1.2.0" = {
-      name = "bl";
-      packageName = "bl";
-      version = "1.2.0";
+    "JSONStream-1.1.4" = {
+      name = "JSONStream";
+      packageName = "JSONStream";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-1.2.0.tgz";
-        sha1 = "1397e7ec42c5f5dc387470c500e34a9f6be9ea98";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz";
+        sha1 = "be11a495938e882d277773d11986f3974a8ba37a";
       };
     };
-    "awscred-1.2.0" = {
-      name = "awscred";
-      packageName = "awscred";
-      version = "1.2.0";
+    "async-2.0.1" = {
+      name = "async";
+      packageName = "async";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/awscred/-/awscred-1.2.0.tgz";
-        sha1 = "9ba714a0d2feb625b848f15c62746c07aebdc3b5";
+        url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz";
+        sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
       };
     };
-    "clipboardy-0.1.2" = {
-      name = "clipboardy";
-      packageName = "clipboardy";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clipboardy/-/clipboardy-0.1.2.tgz";
-        sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc";
-      };
-    };
-    "got-6.7.1" = {
+    "got-6.6.3" = {
       name = "got";
       packageName = "got";
-      version = "6.7.1";
+      version = "6.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
-        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
+        url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz";
+        sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec";
       };
     };
     "lodash.debounce-4.0.8" = {
@@ -8801,76 +8756,13 @@ let
         sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1";
       };
     };
-    "mem-1.1.0" = {
+    "mem-0.1.1" = {
       name = "mem";
       packageName = "mem";
-      version = "1.1.0";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz";
-        sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
-      };
-    };
-    "execa-0.5.1" = {
-      name = "execa";
-      packageName = "execa";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz";
-        sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36";
-      };
-    };
-    "cross-spawn-4.0.2" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz";
-        sha1 = "7b9247621c23adfdd3856004a823cbe397424d41";
-      };
-    };
-    "get-stream-2.3.1" = {
-      name = "get-stream";
-      packageName = "get-stream";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
-        sha1 = "5f38f93f346009666ee0150a054167f91bdd95de";
-      };
-    };
-    "npm-run-path-2.0.2" = {
-      name = "npm-run-path";
-      packageName = "npm-run-path";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
-        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
-      };
-    };
-    "p-finally-1.0.0" = {
-      name = "p-finally";
-      packageName = "p-finally";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
-        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
-      };
-    };
-    "strip-eof-1.0.0" = {
-      name = "strip-eof";
-      packageName = "strip-eof";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
-        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
-      };
-    };
-    "path-key-2.0.1" = {
-      name = "path-key";
-      packageName = "path-key";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
-        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
+        url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz";
+        sha1 = "24df988c3102b03c074c1b296239c5b2e6647825";
       };
     };
     "create-error-class-3.0.2" = {
@@ -8891,13 +8783,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "get-stream-3.0.0" = {
+    "get-stream-2.3.1" = {
       name = "get-stream";
       packageName = "get-stream";
-      version = "3.0.0";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
-        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
+        sha1 = "5f38f93f346009666ee0150a054167f91bdd95de";
       };
     };
     "is-retry-allowed-1.1.0" = {
@@ -8909,13 +8801,22 @@ let
         sha1 = "11a060568b67339444033d0125a61a20d564fb34";
       };
     };
-    "timed-out-4.0.0" = {
+    "node-status-codes-2.0.1" = {
+      name = "node-status-codes";
+      packageName = "node-status-codes";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz";
+        sha1 = "298067659cb68a2b4670abbefde02a3819981f5b";
+      };
+    };
+    "timed-out-3.0.0" = {
       name = "timed-out";
       packageName = "timed-out";
-      version = "4.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.0.tgz";
-        sha1 = "b0fb98d7fed4f36b028698122769c07ef87a8690";
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.0.0.tgz";
+        sha1 = "ff88de96030ce960eabd42487db61d3add229273";
       };
     };
     "url-parse-lax-1.0.0" = {
@@ -8936,22 +8837,13 @@ let
         sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
       };
     };
-    "mimic-fn-1.1.0" = {
-      name = "mimic-fn";
-      packageName = "mimic-fn";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz";
-        sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18";
-      };
-    };
-    "babel-code-frame-6.20.0" = {
+    "babel-code-frame-6.16.0" = {
       name = "babel-code-frame";
       packageName = "babel-code-frame";
-      version = "6.20.0";
+      version = "6.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.20.0.tgz";
-        sha1 = "b968f839090f9a8bc6d41938fb96cb84f7387b26";
+        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz";
+        sha1 = "f90e60da0862909d3ce098733b5d3987c97cb8de";
       };
     };
     "doctrine-1.5.0" = {
@@ -9116,15 +9008,6 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
-    "strip-json-comments-2.0.1" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
-        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
-      };
-    };
     "table-3.8.3" = {
       name = "table";
       packageName = "table";
@@ -9197,13 +9080,13 @@ let
         sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
       };
     };
-    "acorn-4.0.4" = {
+    "acorn-4.0.3" = {
       name = "acorn";
       packageName = "acorn";
-      version = "4.0.4";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz";
-        sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a";
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz";
+        sha1 = "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1";
       };
     };
     "acorn-jsx-3.0.1" = {
@@ -9215,13 +9098,13 @@ let
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
-    "flat-cache-1.2.2" = {
+    "flat-cache-1.2.1" = {
       name = "flat-cache";
       packageName = "flat-cache";
-      version = "1.2.2";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz";
-        sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96";
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.1.tgz";
+        sha1 = "6c837d6225a7de5659323740b36d5361f71691ff";
       };
     };
     "circular-json-0.3.1" = {
@@ -9395,13 +9278,13 @@ let
         sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
       };
     };
-    "fast-levenshtein-2.0.6" = {
+    "fast-levenshtein-2.0.5" = {
       name = "fast-levenshtein";
       packageName = "fast-levenshtein";
-      version = "2.0.6";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
-        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz";
+        sha1 = "bd33145744519ab1c36c3ee9f31f08e9079b67f2";
       };
     };
     "caller-path-0.1.0" = {
@@ -9431,22 +9314,22 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.10.4" = {
+    "ajv-4.9.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.10.4";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz";
-        sha1 = "c0974dd00b3464984892d6010aa9c2c945933254";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz";
+        sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c";
       };
     };
-    "ajv-keywords-1.5.0" = {
+    "ajv-keywords-1.1.1" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "1.5.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz";
-        sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz";
+        sha1 = "02550bc605a3e576041565628af972e06c549d50";
       };
     };
     "slice-ansi-0.0.4" = {
@@ -9557,13 +9440,13 @@ let
         sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d";
       };
     };
-    "prettyjson-1.2.1" = {
+    "prettyjson-1.2.0" = {
       name = "prettyjson";
       packageName = "prettyjson";
-      version = "1.2.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz";
-        sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289";
+        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.0.tgz";
+        sha1 = "2a109cdf14c957896bbad8b77ef5de5db2c691bf";
       };
     };
     "shush-1.0.0" = {
@@ -9701,13 +9584,13 @@ let
         sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
       };
     };
-    "fsevents-1.0.17" = {
+    "fsevents-1.0.15" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.0.17";
+      version = "1.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.17.tgz";
-        sha1 = "8537f3f12272678765b4fd6528c0f1f66f8f4558";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz";
+        sha1 = "fa63f590f3c2ad91275e4972a6cea545fb0aae44";
       };
     };
     "micromatch-2.3.11" = {
@@ -9773,13 +9656,13 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
-    "kind-of-3.1.0" = {
+    "kind-of-3.0.4" = {
       name = "kind-of";
       packageName = "kind-of";
-      version = "3.1.0";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz";
-        sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47";
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz";
+        sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74";
       };
     };
     "normalize-path-2.0.1" = {
@@ -9881,13 +9764,13 @@ let
         sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
       };
     };
-    "randomatic-1.1.6" = {
+    "randomatic-1.1.5" = {
       name = "randomatic";
       packageName = "randomatic";
-      version = "1.1.6";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz";
-        sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb";
+        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz";
+        sha1 = "5e9ef5f2d573c67bd2b8124ae90b5156e457840b";
       };
     };
     "repeat-string-1.6.1" = {
@@ -9971,13 +9854,13 @@ let
         sha1 = "207bab91638499c07b2adf240a41a87210034575";
       };
     };
-    "binary-extensions-1.8.0" = {
+    "binary-extensions-1.7.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.8.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz";
-        sha1 = "48ec8d16df4377eae5fa5884682480af4d95c774";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz";
+        sha1 = "6c1610db163abfb34edfe42fa423343a1e01185d";
       };
     };
     "set-immediate-shim-1.0.1" = {
@@ -9989,22 +9872,22 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.32" = {
+    "node-pre-gyp-0.6.31" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.32";
+      version = "0.6.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
-        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
+        sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
       };
     };
-    "npmlog-4.0.2" = {
+    "npmlog-4.0.1" = {
       name = "npmlog";
       packageName = "npmlog";
-      version = "4.0.2";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
-        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz";
+        sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8";
       };
     };
     "tar-pack-3.3.0" = {
@@ -10025,13 +9908,13 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
-    "gauge-2.7.2" = {
+    "gauge-2.7.1" = {
       name = "gauge";
       packageName = "gauge";
-      version = "2.7.2";
+      version = "2.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz";
-        sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774";
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz";
+        sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7";
       };
     };
     "set-blocking-2.0.0" = {
@@ -10188,13 +10071,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.12.2" = {
+    "coffee-script-1.11.1" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.12.2";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
-        sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
+        sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
       };
     };
     "jade-1.11.0" = {
@@ -10233,13 +10116,13 @@ let
         sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
       };
     };
-    "clean-css-3.4.23" = {
+    "clean-css-3.4.21" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "3.4.23";
+      version = "3.4.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.23.tgz";
-        sha1 = "604fbbca24c12feb59b02f00b84f1fb7ded6d001";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz";
+        sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b";
       };
     };
     "commander-2.6.0" = {
@@ -10278,13 +10161,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.7.5" = {
+    "uglify-js-2.7.4" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.5";
+      version = "2.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
-        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
+        sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
       };
     };
     "void-elements-2.0.1" = {
@@ -10521,13 +10404,13 @@ let
         sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19";
       };
     };
-    "gulp-util-3.0.8" = {
+    "gulp-util-3.0.7" = {
       name = "gulp-util";
       packageName = "gulp-util";
-      version = "3.0.8";
+      version = "3.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz";
-        sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f";
+        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz";
+        sha1 = "78925c4b8f8b49005ac01a011c557e6218941cbb";
       };
     };
     "liftoff-2.3.0" = {
@@ -10602,22 +10485,22 @@ let
         sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809";
       };
     };
-    "dateformat-2.0.0" = {
+    "dateformat-1.0.12" = {
       name = "dateformat";
       packageName = "dateformat";
-      version = "2.0.0";
+      version = "1.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz";
-        sha1 = "2743e3abb5c3fc2462e527dca445e04e9f4dee17";
+        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz";
+        sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9";
       };
     };
-    "fancy-log-1.3.0" = {
+    "fancy-log-1.2.0" = {
       name = "fancy-log";
       packageName = "fancy-log";
-      version = "1.3.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz";
-        sha1 = "45be17d02bb9917d60ccffd4995c999e6c8c9948";
+        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.2.0.tgz";
+        sha1 = "d5a51b53e9ab22ca07d558f2b67ae55fdb5fcbd8";
       };
     };
     "gulplog-1.0.0" = {
@@ -11007,13 +10890,13 @@ let
         sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5";
       };
     };
-    "is-unc-path-0.1.2" = {
+    "is-unc-path-0.1.1" = {
       name = "is-unc-path";
       packageName = "is-unc-path";
-      version = "0.1.2";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz";
-        sha1 = "6ab053a72573c10250ff416a3814c35178af39b9";
+        url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.1.tgz";
+        sha1 = "ab2533d77ad733561124c3dc0f5cd8b90054c86b";
       };
     };
     "unc-path-regex-0.1.2" = {
@@ -11475,13 +11358,13 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "bluebird-3.4.7" = {
+    "bluebird-3.4.6" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.4.7";
+      version = "3.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz";
-        sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz";
+        sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f";
       };
     };
     "body-parser-1.15.2" = {
@@ -11547,22 +11430,22 @@ let
         sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea";
       };
     };
-    "http-proxy-1.16.2" = {
+    "http-proxy-1.15.2" = {
       name = "http-proxy";
       packageName = "http-proxy";
-      version = "1.16.2";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz";
-        sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742";
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz";
+        sha1 = "642fdcaffe52d3448d2bda3b0079e9409064da31";
       };
     };
-    "isbinaryfile-3.0.2" = {
+    "isbinaryfile-3.0.1" = {
       name = "isbinaryfile";
       packageName = "isbinaryfile";
-      version = "3.0.2";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz";
-        sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621";
+        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.1.tgz";
+        sha1 = "6e99573675372e841a0520c036b41513d783e79e";
       };
     };
     "log4js-0.6.38" = {
@@ -11583,13 +11466,13 @@ let
         sha1 = "659de9f2cf8dcc27a1481276f205377272382e73";
       };
     };
-    "socket.io-1.7.2" = {
+    "socket.io-1.4.7" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "1.7.2";
+      version = "1.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.2.tgz";
-        sha1 = "83bbbdf2e79263b378900da403e7843e05dc3b71";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.7.tgz";
+        sha1 = "92b7f7cb88c5797d4daee279fe8075dbe6d3fa1c";
       };
     };
     "tmp-0.0.28" = {
@@ -11601,13 +11484,13 @@ let
         sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120";
       };
     };
-    "useragent-2.1.10" = {
+    "useragent-2.1.9" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.1.10";
+      version = "2.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.10.tgz";
-        sha1 = "2456c5c2b722b47f3d8321ed257b490a3d9bb2af";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.9.tgz";
+        sha1 = "4dba2bc4dad1875777ab15de3ff8098b475000b7";
       };
     };
     "bytes-2.4.0" = {
@@ -11718,22 +11601,40 @@ let
         sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
       };
     };
-    "debug-2.3.3" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
-        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
-      };
-    };
-    "engine.io-1.8.2" = {
+    "engine.io-1.6.10" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "1.8.2";
+      version = "1.6.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.2.tgz";
-        sha1 = "6b59be730b348c0125b0a4589de1c355abcf7a7e";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.10.tgz";
+        sha1 = "f87d84e1bd21d1a2ec7f8deef0c62054acdfb27a";
+      };
+    };
+    "socket.io-parser-2.2.6" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "2.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz";
+        sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99";
+      };
+    };
+    "socket.io-client-1.4.6" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "1.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz";
+        sha1 = "49b0ba537efd15b8297c84016e642e1c7c752c3d";
+      };
+    };
+    "socket.io-adapter-0.4.0" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz";
+        sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f";
       };
     };
     "has-binary-0.1.7" = {
@@ -11745,58 +11646,49 @@ let
         sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
       };
     };
-    "socket.io-adapter-0.5.0" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
-        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
-      };
-    };
-    "socket.io-client-1.7.2" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.2.tgz";
-        sha1 = "39fdb0c3dd450e321b7e40cfd83612ec533dd644";
-      };
-    };
-    "socket.io-parser-2.3.1" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
-        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
-      };
-    };
-    "base64id-1.0.0" = {
+    "base64id-0.1.0" = {
       name = "base64id";
       packageName = "base64id";
-      version = "1.0.0";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz";
-        sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
+        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
       };
     };
-    "engine.io-parser-1.3.2" = {
+    "ws-1.0.1" = {
+      name = "ws";
+      packageName = "ws";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz";
+        sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9";
+      };
+    };
+    "engine.io-parser-1.2.4" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
-      version = "1.3.2";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz";
-        sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a";
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz";
+        sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42";
       };
     };
-    "after-0.8.2" = {
+    "accepts-1.1.4" = {
+      name = "accepts";
+      packageName = "accepts";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
+        sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
+      };
+    };
+    "after-0.8.1" = {
       name = "after";
       packageName = "after";
-      version = "0.8.2";
+      version = "0.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
-        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
+        url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz";
+        sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627";
       };
     };
     "arraybuffer.slice-0.0.6" = {
@@ -11808,13 +11700,13 @@ let
         sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
       };
     };
-    "base64-arraybuffer-0.1.5" = {
+    "base64-arraybuffer-0.1.2" = {
       name = "base64-arraybuffer";
       packageName = "base64-arraybuffer";
-      version = "0.1.5";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
-        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
+        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
+        sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154";
       };
     };
     "blob-0.0.4" = {
@@ -11826,22 +11718,58 @@ let
         sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
       };
     };
-    "wtf-8-1.0.0" = {
-      name = "wtf-8";
-      packageName = "wtf-8";
-      version = "1.0.0";
+    "has-binary-0.1.6" = {
+      name = "has-binary";
+      packageName = "has-binary";
+      version = "0.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
-        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
+        url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz";
+        sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10";
       };
     };
-    "backo2-1.0.2" = {
-      name = "backo2";
-      packageName = "backo2";
-      version = "1.0.2";
+    "utf8-2.1.0" = {
+      name = "utf8";
+      packageName = "utf8";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
-        sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
+        url = "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz";
+        sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5";
+      };
+    };
+    "negotiator-0.4.9" = {
+      name = "negotiator";
+      packageName = "negotiator";
+      version = "0.4.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
+        sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f";
+      };
+    };
+    "json3-3.3.2" = {
+      name = "json3";
+      packageName = "json3";
+      version = "3.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
+        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
+      };
+    };
+    "benchmark-1.0.0" = {
+      name = "benchmark";
+      packageName = "benchmark";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
+        sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73";
+      };
+    };
+    "engine.io-client-1.6.9" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.6.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz";
+        sha1 = "1d6ad48048a5083c95096943b29d36efdb212401";
       };
     };
     "component-bind-1.0.0" = {
@@ -11853,22 +11781,13 @@ let
         sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
       };
     };
-    "component-emitter-1.2.1" = {
+    "component-emitter-1.2.0" = {
       name = "component-emitter";
       packageName = "component-emitter";
-      version = "1.2.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
-        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
-      };
-    };
-    "engine.io-client-1.8.2" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.2.tgz";
-        sha1 = "c38767547f2a7d184f5752f6f0ad501006703766";
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz";
+        sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe";
       };
     };
     "object-component-0.0.3" = {
@@ -11880,13 +11799,13 @@ let
         sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
       };
     };
-    "parseuri-0.0.5" = {
+    "parseuri-0.0.4" = {
       name = "parseuri";
       packageName = "parseuri";
-      version = "0.0.5";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
-        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz";
+        sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350";
       };
     };
     "to-array-0.1.4" = {
@@ -11898,13 +11817,13 @@ let
         sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
       };
     };
-    "component-inherit-0.0.3" = {
-      name = "component-inherit";
-      packageName = "component-inherit";
-      version = "0.0.3";
+    "backo2-1.0.2" = {
+      name = "backo2";
+      packageName = "backo2";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
-        sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
+        url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
+        sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
       };
     };
     "has-cors-1.1.0" = {
@@ -11916,31 +11835,40 @@ let
         sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
       };
     };
-    "parsejson-0.0.3" = {
-      name = "parsejson";
-      packageName = "parsejson";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
-        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
-      };
-    };
-    "parseqs-0.0.5" = {
-      name = "parseqs";
-      packageName = "parseqs";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
-        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
-      };
-    };
-    "xmlhttprequest-ssl-1.5.3" = {
+    "xmlhttprequest-ssl-1.5.1" = {
       name = "xmlhttprequest-ssl";
       packageName = "xmlhttprequest-ssl";
-      version = "1.5.3";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
-        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
+        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz";
+        sha1 = "3b7741fea4a86675976e908d296d4445961faa67";
+      };
+    };
+    "parsejson-0.0.1" = {
+      name = "parsejson";
+      packageName = "parsejson";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
+        sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc";
+      };
+    };
+    "parseqs-0.0.2" = {
+      name = "parseqs";
+      packageName = "parseqs";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
+        sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7";
+      };
+    };
+    "component-inherit-0.0.3" = {
+      name = "component-inherit";
+      packageName = "component-inherit";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
+        sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
       };
     };
     "yeast-0.1.2" = {
@@ -11970,13 +11898,22 @@ let
         sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
       };
     };
-    "json3-3.3.2" = {
+    "socket.io-parser-2.2.2" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz";
+        sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417";
+      };
+    };
+    "json3-3.2.6" = {
       name = "json3";
       packageName = "json3";
-      version = "3.3.2";
+      version = "3.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
-        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
+        url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
+        sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
       };
     };
     "lru-cache-2.2.4" = {
@@ -12285,15 +12222,6 @@ let
         sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
       };
     };
-    "base64-url-1.3.3" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
-        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
-      };
-    };
     "rndm-1.2.0" = {
       name = "rndm";
       packageName = "rndm";
@@ -12438,22 +12366,22 @@ let
         sha1 = "a7de988a211f9cf4687377130ea74df32730c918";
       };
     };
-    "oauth-0.9.15" = {
+    "oauth-0.9.14" = {
       name = "oauth";
       packageName = "oauth";
-      version = "0.9.15";
+      version = "0.9.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz";
-        sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1";
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
+        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
       };
     };
-    "passport-oauth2-1.4.0" = {
+    "passport-oauth2-1.3.0" = {
       name = "passport-oauth2";
       packageName = "passport-oauth2";
-      version = "1.4.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz";
-        sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad";
+        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.3.0.tgz";
+        sha1 = "d72b4bd62eeb807a4089ff3071a22c26c382dc0c";
       };
     };
     "uid2-0.0.3" = {
@@ -12519,22 +12447,22 @@ let
         sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
       };
     };
-    "lodash.isequal-4.5.0" = {
+    "lodash.isequal-4.4.0" = {
       name = "lodash.isequal";
       packageName = "lodash.isequal";
-      version = "4.5.0";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
-        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
+        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.4.0.tgz";
+        sha1 = "6295768e98e14dc15ce8d362ef6340db82852031";
       };
     };
-    "merge-stream-1.0.1" = {
+    "merge-stream-1.0.0" = {
       name = "merge-stream";
       packageName = "merge-stream";
-      version = "1.0.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz";
-        sha1 = "4041202d508a342ba00174008df0c251b8c135e1";
+        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz";
+        sha1 = "9cfd156fef35421e2b5403ce11dc6eb1962b026e";
       };
     };
     "strip-bom-stream-1.0.0" = {
@@ -12564,13 +12492,13 @@ let
         sha1 = "1b904a59609fb328ef078138420934f6b86709a6";
       };
     };
-    "glob-parent-3.1.0" = {
+    "glob-parent-3.0.1" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "3.1.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
-        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.1.tgz";
+        sha1 = "60021327cc963ddc3b5f085764f500479ecd82ff";
       };
     };
     "ordered-read-streams-0.3.0" = {
@@ -12618,13 +12546,13 @@ let
         sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
       };
     };
-    "is-extglob-2.1.1" = {
+    "is-extglob-2.1.0" = {
       name = "is-extglob";
       packageName = "is-extglob";
-      version = "2.1.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
-        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.0.tgz";
+        sha1 = "33411a482b046bf95e6b0cb27ee2711af4cf15ad";
       };
     };
     "extend-shallow-2.0.1" = {
@@ -13014,6 +12942,15 @@ let
         sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103";
       };
     };
+    "after-0.8.2" = {
+      name = "after";
+      packageName = "after";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
+        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
+      };
+    };
     "yargs-1.3.3" = {
       name = "yargs";
       packageName = "yargs";
@@ -13086,13 +13023,13 @@ let
         sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
       };
     };
-    "wrap-ansi-2.1.0" = {
+    "wrap-ansi-2.0.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
-      version = "2.1.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
-        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz";
+        sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f";
       };
     };
     "lcid-1.0.0" = {
@@ -13221,22 +13158,22 @@ let
         sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     };
-    "write-file-atomic-1.3.1" = {
+    "write-file-atomic-1.2.0" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
-      version = "1.3.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.1.tgz";
-        sha1 = "7d45ba32316328dd1ec7d90f60ebc0d845bb759a";
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
+        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
       };
     };
-    "bcryptjs-2.4.0" = {
+    "bcryptjs-2.3.0" = {
       name = "bcryptjs";
       packageName = "bcryptjs";
-      version = "2.4.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.0.tgz";
-        sha1 = "fb7f4a0b133854503fe1b2da3f25db834cf0e678";
+        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz";
+        sha1 = "5826900cfef7abaf3425c72e4d464de509b8c2ec";
       };
     };
     "cheerio-0.22.0" = {
@@ -13248,6 +13185,15 @@ let
         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" = {
       name = "cookie-parser";
       packageName = "cookie-parser";
@@ -13257,31 +13203,31 @@ let
         sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
       };
     };
-    "cron-1.2.1" = {
+    "cron-1.1.1" = {
       name = "cron";
       packageName = "cron";
-      version = "1.2.1";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz";
-        sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2";
+        url = "https://registry.npmjs.org/cron/-/cron-1.1.1.tgz";
+        sha1 = "02719d4ef480dfc8ee24d81a3603460ba39013ce";
       };
     };
-    "follow-redirects-1.2.1" = {
+    "follow-redirects-0.2.0" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.2.1";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.1.tgz";
-        sha1 = "796c716970df4fb0096165393545040f61b00f59";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.2.0.tgz";
+        sha1 = "e0229d7a388bb5ff7b29f44fc1e1b62e921272df";
       };
     };
-    "fs-extra-1.0.0" = {
+    "fs-extra-0.30.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
-      version = "1.0.0";
+      version = "0.30.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
-        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz";
+        sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0";
       };
     };
     "fs.notify-0.0.4" = {
@@ -13302,40 +13248,31 @@ let
         sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
-    "jsonata-1.0.10" = {
-      name = "jsonata";
-      packageName = "jsonata";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.0.10.tgz";
-        sha1 = "5177b5aa3ec66e7b5894412b2f9ad170c6107b96";
-      };
-    };
-    "mqtt-2.2.1" = {
+    "mqtt-1.14.1" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "2.2.1";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.2.1.tgz";
-        sha1 = "b3efff8adff78dee07e09cfe89e2d2fb364a1852";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-1.14.1.tgz";
+        sha1 = "7e376987153d01793e946d26d46122ebf0c03554";
       };
     };
-    "mustache-2.3.0" = {
+    "mustache-2.2.1" = {
       name = "mustache";
       packageName = "mustache";
-      version = "2.3.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz";
-        sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0";
+        url = "https://registry.npmjs.org/mustache/-/mustache-2.2.1.tgz";
+        sha1 = "2c40ca21c278f53150682bcf9090e41a3339b876";
       };
     };
-    "oauth2orize-1.7.0" = {
+    "oauth2orize-1.5.0" = {
       name = "oauth2orize";
       packageName = "oauth2orize";
-      version = "1.7.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.7.0.tgz";
-        sha1 = "94c2a511cd0b58bde548548ffcde14fd81f257cc";
+        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.5.0.tgz";
+        sha1 = "e352ff4f1b5bf08f0ee94a09757f8f640eb8e0a6";
       };
     };
     "passport-http-bearer-1.0.1" = {
@@ -13356,22 +13293,22 @@ let
         sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba";
       };
     };
-    "raw-body-2.2.0" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz";
-        sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96";
-      };
-    };
-    "sentiment-2.1.0" = {
+    "sentiment-1.0.6" = {
       name = "sentiment";
       packageName = "sentiment";
-      version = "2.1.0";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz";
-        sha1 = "33279100c35c38519ca5e435245186c512fe0fdc";
+        url = "https://registry.npmjs.org/sentiment/-/sentiment-1.0.6.tgz";
+        sha1 = "f6096c6271f020f490d58b54a8afd598db8acbb1";
+      };
+    };
+    "uglify-js-2.7.3" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
+        sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
       };
     };
     "when-3.7.7" = {
@@ -13383,6 +13320,15 @@ let
         sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
       };
     };
+    "ws-0.8.1" = {
+      name = "ws";
+      packageName = "ws";
+      version = "0.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-0.8.1.tgz";
+        sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759";
+      };
+    };
     "node-red-node-feedparser-0.1.7" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
@@ -13392,13 +13338,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.15" = {
+    "node-red-node-email-0.1.12" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.15";
+      version = "0.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz";
-        sha1 = "7a528596d3b693a077b1ee293300299855537142";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz";
+        sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5";
       };
     };
     "node-red-node-twitter-0.1.9" = {
@@ -13419,13 +13365,22 @@ let
         sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539";
       };
     };
-    "bcrypt-1.0.2" = {
+    "node-red-node-serialport-0.4.1" = {
+      name = "node-red-node-serialport";
+      packageName = "node-red-node-serialport";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz";
+        sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c";
+      };
+    };
+    "bcrypt-0.8.7" = {
       name = "bcrypt";
       packageName = "bcrypt";
-      version = "1.0.2";
+      version = "0.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.2.tgz";
-        sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736";
+        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz";
+        sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093";
       };
     };
     "css-select-1.2.0" = {
@@ -13572,13 +13527,13 @@ let
         sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
       };
     };
-    "moment-timezone-0.5.11" = {
+    "moment-timezone-0.5.9" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.11";
+      version = "0.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz";
-        sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz";
+        sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd";
       };
     };
     "retry-0.6.1" = {
@@ -13644,13 +13599,22 @@ let
         sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a";
       };
     };
-    "mqtt-packet-5.2.1" = {
+    "mqtt-connection-2.1.1" = {
+      name = "mqtt-connection";
+      packageName = "mqtt-connection";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mqtt-connection/-/mqtt-connection-2.1.1.tgz";
+        sha1 = "7b2e985a74e196619430bebd35da162c34c4e56a";
+      };
+    };
+    "mqtt-packet-3.4.7" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "5.2.1";
+      version = "3.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.1.tgz";
-        sha1 = "876e35ed616a8e348ac0283b4922039872458b58";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-3.4.7.tgz";
+        sha1 = "be8c267be7f0bf6a2a2d4f6de28307b6e0940e5f";
       };
     };
     "reinterval-1.1.0" = {
@@ -13662,6 +13626,15 @@ let
         sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
       };
     };
+    "split2-2.1.0" = {
+      name = "split2";
+      packageName = "split2";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split2/-/split2-2.1.0.tgz";
+        sha1 = "7382c148cb622c4b28af7c727f9673730b73f474";
+      };
+    };
     "websocket-stream-3.3.3" = {
       name = "websocket-stream";
       packageName = "websocket-stream";
@@ -13689,13 +13662,58 @@ let
         sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
       };
     };
-    "iconv-lite-0.4.15" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.15";
+    "reduplexer-1.1.0" = {
+      name = "reduplexer";
+      packageName = "reduplexer";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
-        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
+        url = "https://registry.npmjs.org/reduplexer/-/reduplexer-1.1.0.tgz";
+        sha1 = "7dfed18a679e749c1d7ad36de01acb515f08e140";
+      };
+    };
+    "lodash.assign-4.0.1" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.0.1.tgz";
+        sha1 = "8e7ff0206897a99dca32fc8123309f5c4c2c731e";
+      };
+    };
+    "lodash.keys-4.2.0" = {
+      name = "lodash.keys";
+      packageName = "lodash.keys";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz";
+        sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205";
+      };
+    };
+    "lodash.rest-4.0.5" = {
+      name = "lodash.rest";
+      packageName = "lodash.rest";
+      version = "4.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.5.tgz";
+        sha1 = "954ef75049262038c96d1fc98b28fdaf9f0772aa";
+      };
+    };
+    "bufferutil-1.2.1" = {
+      name = "bufferutil";
+      packageName = "bufferutil";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz";
+        sha1 = "37be5d36e1e06492221e68d474b1ac58e510cbd7";
+      };
+    };
+    "utf-8-validate-1.2.1" = {
+      name = "utf-8-validate";
+      packageName = "utf-8-validate";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz";
+        sha1 = "44cb7c6eead73d6b40448f71f745904357b9f72c";
       };
     };
     "feedparser-1.1.3" = {
@@ -13761,13 +13779,13 @@ let
         sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3";
       };
     };
-    "imap-0.8.19" = {
+    "imap-0.8.18" = {
       name = "imap";
       packageName = "imap";
-      version = "0.8.19";
+      version = "0.8.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz";
-        sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5";
+        url = "https://registry.npmjs.org/imap/-/imap-0.8.18.tgz";
+        sha1 = "4a7cdd0ff276efa0298708bb2c6d0db0b77f7a3f";
       };
     };
     "libmime-1.2.0" = {
@@ -13923,13 +13941,58 @@ let
         sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
       };
     };
-    "oauth-0.9.14" = {
-      name = "oauth";
-      packageName = "oauth";
-      version = "0.9.14";
+    "serialport-4.0.6" = {
+      name = "serialport";
+      packageName = "serialport";
+      version = "4.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
-        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
+        url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz";
+        sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae";
+      };
+    };
+    "lie-3.1.0" = {
+      name = "lie";
+      packageName = "lie";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lie/-/lie-3.1.0.tgz";
+        sha1 = "65e0139eaef9ae791a1f5c8c53692c8d3b4718f4";
+      };
+    };
+    "object.assign-4.0.4" = {
+      name = "object.assign";
+      packageName = "object.assign";
+      version = "4.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz";
+        sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
+      };
+    };
+    "immediate-3.0.6" = {
+      name = "immediate";
+      packageName = "immediate";
+      version = "3.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz";
+        sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b";
+      };
+    };
+    "define-properties-1.1.2" = {
+      name = "define-properties";
+      packageName = "define-properties";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
+        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
+      };
+    };
+    "nan-2.3.5" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
+        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
       };
     };
     "mongoose-3.6.7" = {
@@ -14310,15 +14373,6 @@ let
         sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d";
       };
     };
-    "base64id-0.1.0" = {
-      name = "base64id";
-      packageName = "base64id";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
-        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
-      };
-    };
     "redis-0.7.3" = {
       name = "redis";
       packageName = "redis";
@@ -14400,13 +14454,13 @@ let
         sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
       };
     };
-    "mailcomposer-4.0.1" = {
+    "mailcomposer-3.12.0" = {
       name = "mailcomposer";
       packageName = "mailcomposer";
-      version = "4.0.1";
+      version = "3.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz";
-        sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4";
+        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz";
+        sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9";
       };
     };
     "simplesmtp-0.3.35" = {
@@ -14418,22 +14472,22 @@ let
         sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03";
       };
     };
-    "buildmail-4.0.1" = {
+    "buildmail-3.10.0" = {
       name = "buildmail";
       packageName = "buildmail";
-      version = "4.0.1";
+      version = "3.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz";
-        sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72";
+        url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz";
+        sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159";
       };
     };
-    "libmime-3.0.0" = {
+    "libmime-2.1.0" = {
       name = "libmime";
       packageName = "libmime";
-      version = "3.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz";
-        sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6";
+        url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz";
+        sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd";
       };
     };
     "addressparser-1.0.1" = {
@@ -14490,15 +14544,6 @@ let
         sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528";
       };
     };
-    "nan-2.3.5" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
-        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
-      };
-    };
     "argparse-0.1.16" = {
       name = "argparse";
       packageName = "argparse";
@@ -14526,15 +14571,6 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
-    "JSONStream-1.2.1" = {
-      name = "JSONStream";
-      packageName = "JSONStream";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
-        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
-      };
-    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14598,15 +14634,6 @@ let
         sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
       };
     };
-    "nopt-4.0.1" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
-        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
-      };
-    };
     "npm-install-checks-3.0.0" = {
       name = "npm-install-checks";
       packageName = "npm-install-checks";
@@ -14616,13 +14643,13 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-registry-client-7.4.5" = {
+    "npm-registry-client-7.3.0" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "7.4.5";
+      version = "7.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.5.tgz";
-        sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz";
+        sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50";
       };
     };
     "opener-1.4.2" = {
@@ -14652,6 +14679,15 @@ let
         sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
       };
     };
+    "request-2.78.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.78.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
+        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+      };
+    };
     "sorted-union-stream-2.1.3" = {
       name = "sorted-union-stream";
       packageName = "sorted-union-stream";
@@ -14670,15 +14706,6 @@ let
         sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
-    "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";
-      };
-    };
     "lodash._baseindexof-3.1.0" = {
       name = "lodash._baseindexof";
       packageName = "lodash._baseindexof";
@@ -15021,13 +15048,13 @@ let
         sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d";
       };
     };
-    "update-notifier-1.0.3" = {
+    "update-notifier-1.0.2" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "1.0.3";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz";
-        sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.2.tgz";
+        sha1 = "27c90519196dc15015be02a34ea52986feab8877";
       };
     };
     "request-2.75.0" = {
@@ -15174,15 +15201,6 @@ let
         sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
       };
     };
-    "timed-out-3.1.3" = {
-      name = "timed-out";
-      packageName = "timed-out";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
-        sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217";
-      };
-    };
     "unzip-response-1.0.2" = {
       name = "unzip-response";
       packageName = "unzip-response";
@@ -15303,13 +15321,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.1.13" = {
+    "service-runner-2.1.11" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.1.13";
+      version = "2.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz";
-        sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz";
+        sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb";
       };
     };
     "simplediff-0.1.1" = {
@@ -15366,24 +15384,6 @@ let
         sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
       };
     };
-    "object.assign-4.0.4" = {
-      name = "object.assign";
-      packageName = "object.assign";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz";
-        sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
-      };
-    };
-    "define-properties-1.1.2" = {
-      name = "define-properties";
-      packageName = "define-properties";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
-        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
-      };
-    };
     "gelfling-0.2.0" = {
       name = "gelfling";
       packageName = "gelfling";
@@ -15808,13 +15808,13 @@ let
         sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364";
       };
     };
-    "array-flatten-2.1.1" = {
+    "array-flatten-2.1.0" = {
       name = "array-flatten";
       packageName = "array-flatten";
-      version = "2.1.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz";
-        sha1 = "426bb9da84090c1838d812c8150af20a8331e296";
+        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.0.tgz";
+        sha1 = "26a692c83881fc68dac3ec5d1f0c1b49bf2304d9";
       };
     };
     "dns-equal-1.0.0" = {
@@ -15871,22 +15871,13 @@ let
         sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
       };
     };
-    "mute-stream-0.0.6" = {
-      name = "mute-stream";
-      packageName = "mute-stream";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
-        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
-      };
-    };
-    "run-async-2.3.0" = {
+    "run-async-2.2.0" = {
       name = "run-async";
       packageName = "run-async";
-      version = "2.3.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
-        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.2.0.tgz";
+        sha1 = "8783abd83c7bb86f41ee0602fc82404b3bd6e8b9";
       };
     };
     "rx-4.1.0" = {
@@ -15943,6 +15934,15 @@ let
         sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
       };
     };
+    "socket.io-1.6.0" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz";
+        sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1";
+      };
+    };
     "torrent-stream-0.18.1" = {
       name = "torrent-stream";
       packageName = "torrent-stream";
@@ -16312,6 +16312,123 @@ let
         sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
       };
     };
+    "engine.io-1.8.0" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz";
+        sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa";
+      };
+    };
+    "socket.io-adapter-0.5.0" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
+        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
+      };
+    };
+    "socket.io-client-1.6.0" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz";
+        sha1 = "5b668f4f771304dfeed179064708386fa6717853";
+      };
+    };
+    "socket.io-parser-2.3.1" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
+        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
+      };
+    };
+    "engine.io-parser-1.3.1" = {
+      name = "engine.io-parser";
+      packageName = "engine.io-parser";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz";
+        sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf";
+      };
+    };
+    "base64-arraybuffer-0.1.5" = {
+      name = "base64-arraybuffer";
+      packageName = "base64-arraybuffer";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
+        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
+      };
+    };
+    "wtf-8-1.0.0" = {
+      name = "wtf-8";
+      packageName = "wtf-8";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
+        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
+      };
+    };
+    "component-emitter-1.2.1" = {
+      name = "component-emitter";
+      packageName = "component-emitter";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+      };
+    };
+    "engine.io-client-1.8.0" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz";
+        sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c";
+      };
+    };
+    "parseuri-0.0.5" = {
+      name = "parseuri";
+      packageName = "parseuri";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
+        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+      };
+    };
+    "parsejson-0.0.3" = {
+      name = "parsejson";
+      packageName = "parsejson";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
+        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
+      };
+    };
+    "parseqs-0.0.5" = {
+      name = "parseqs";
+      packageName = "parseqs";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
+        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
+      };
+    };
+    "xmlhttprequest-ssl-1.5.3" = {
+      name = "xmlhttprequest-ssl";
+      packageName = "xmlhttprequest-ssl";
+      version = "1.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
+        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
+      };
+    };
     "bittorrent-dht-3.2.6" = {
       name = "bittorrent-dht";
       packageName = "bittorrent-dht";
@@ -16582,6 +16699,15 @@ let
         sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
       };
     };
+    "iconv-lite-0.4.15" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
+        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
+      };
+    };
     "private-0.1.6" = {
       name = "private";
       packageName = "private";
@@ -16591,13 +16717,13 @@ let
         sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
       };
     };
-    "recast-0.11.18" = {
+    "recast-0.11.17" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.18";
+      version = "0.11.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.18.tgz";
-        sha1 = "07af6257ca769868815209401d4d60eef1b5b947";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.17.tgz";
+        sha1 = "67e829df49ef8ea822381cc516d305411e60bad8";
       };
     };
     "ast-types-0.9.2" = {
@@ -16609,13 +16735,13 @@ let
         sha1 = "2cc19979d15c655108bf565323b8e7ee38751f6b";
       };
     };
-    "esprima-3.1.3" = {
+    "esprima-3.1.1" = {
       name = "esprima";
       packageName = "esprima";
-      version = "3.1.3";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.1.tgz";
+        sha1 = "02dbcc5ac3ece81070377f99158ec742ab5dda06";
       };
     };
     "base62-0.1.1" = {
@@ -16801,11 +16927,11 @@ let
     "oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" = {
       name = "oauth";
       packageName = "oauth";
-      version = "0.9.15";
+      version = "0.9.14";
       src = fetchurl {
-        name = "oauth-0.9.15.tar.gz";
+        name = "oauth-0.9.14.tar.gz";
         url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master;
-        sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947";
+        sha256 = "abd0d7be4fb10804e5a38ee66a4db5fc36d2ed045be52e7c8b7e19e4c9e16bd8";
       };
     };
     "connect-2.3.9" = {
@@ -17087,13 +17213,13 @@ let
         sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414";
       };
     };
-    "sanitize-html-1.14.1" = {
+    "sanitize-html-1.13.0" = {
       name = "sanitize-html";
       packageName = "sanitize-html";
-      version = "1.14.1";
+      version = "1.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz";
-        sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8";
+        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz";
+        sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631";
       };
     };
     "linkify-it-1.2.4" = {
@@ -17312,13 +17438,13 @@ let
         sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
       };
     };
-    "csv-parse-1.1.9" = {
+    "csv-parse-1.1.7" = {
       name = "csv-parse";
       packageName = "csv-parse";
-      version = "1.1.9";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.9.tgz";
-        sha1 = "5010f93e052578fcab67e30e9b59129c6248ad81";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.7.tgz";
+        sha1 = "6e4678f7967013ac823929a4303a3ce177115abc";
       };
     };
     "stream-transform-0.1.1" = {
@@ -17510,13 +17636,13 @@ let
         sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2";
       };
     };
-    "clap-1.1.2" = {
+    "clap-1.1.1" = {
       name = "clap";
       packageName = "clap";
-      version = "1.1.2";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clap/-/clap-1.1.2.tgz";
-        sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed";
+        url = "https://registry.npmjs.org/clap/-/clap-1.1.1.tgz";
+        sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d";
       };
     };
     "async-2.1.2" = {
@@ -17573,15 +17699,6 @@ let
         sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4";
       };
     };
-    "request-2.78.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.78.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
-        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
-      };
-    };
     "sprintf-0.1.5" = {
       name = "sprintf";
       packageName = "sprintf";
@@ -17681,15 +17798,6 @@ let
         sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
       };
     };
-    "xmldom-0.1.22" = {
-      name = "xmldom";
-      packageName = "xmldom";
-      version = "0.1.22";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
-        sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
-      };
-    };
     "qs-6.0.2" = {
       name = "qs";
       packageName = "qs";
@@ -17699,22 +17807,31 @@ let
         sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
       };
     };
-    "blueimp-md5-2.6.0" = {
-      name = "blueimp-md5";
-      packageName = "blueimp-md5";
-      version = "2.6.0";
+    "bluebird-3.3.5" = {
+      name = "bluebird";
+      packageName = "bluebird";
+      version = "3.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.6.0.tgz";
-        sha1 = "c96dd67f57db522da9a0c49b464ca44e20c04e0f";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.3.5.tgz";
+        sha1 = "5ee747f1c7bd967658b683936430aee753955a34";
       };
     };
-    "color-1.0.3" = {
+    "blueimp-md5-2.3.1" = {
+      name = "blueimp-md5";
+      packageName = "blueimp-md5";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz";
+        sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a";
+      };
+    };
+    "color-0.11.4" = {
       name = "color";
       packageName = "color";
-      version = "1.0.3";
+      version = "0.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color/-/color-1.0.3.tgz";
-        sha1 = "e48e832d85f14ef694fb468811c2d5cfe729b55d";
+        url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz";
+        sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764";
       };
     };
     "crossroads-0.12.2" = {
@@ -17726,22 +17843,31 @@ let
         sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2";
       };
     };
-    "diff2html-2.0.11" = {
+    "diff2html-1.2.0" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "2.0.11";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.0.11.tgz";
-        sha1 = "b0ccb1d8da49702fdc191737c4b1f5e6fa8affc6";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-1.2.0.tgz";
+        sha1 = "8b54af41c180befd9cb1caa130a3d76081ae4a07";
       };
     };
-    "express-session-1.14.2" = {
+    "express-4.13.4" = {
+      name = "express";
+      packageName = "express";
+      version = "4.13.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express/-/express-4.13.4.tgz";
+        sha1 = "3c0b76f3c77590c8345739061ec0bd3ba067ec24";
+      };
+    };
+    "express-session-1.13.0" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.14.2";
+      version = "1.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz";
-        sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.13.0.tgz";
+        sha1 = "8ac3b5c0188b48382851d88207b8e7746efb4011";
       };
     };
     "forever-monitor-1.1.0" = {
@@ -17789,13 +17915,31 @@ let
         sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
       };
     };
-    "npm-4.1.2" = {
+    "lodash-4.12.0" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz";
+        sha1 = "2bd6dc46a040f59e686c972ed21d93dc59053258";
+      };
+    };
+    "moment-2.13.0" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.13.0.tgz";
+        sha1 = "24162d99521e6d40f99ae6939e806d2139eaac52";
+      };
+    };
+    "npm-3.9.6" = {
       name = "npm";
       packageName = "npm";
-      version = "4.1.2";
+      version = "3.9.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
-        sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
+        url = "https://registry.npmjs.org/npm/-/npm-3.9.6.tgz";
+        sha1 = "0ef1d272a069ad95bdca8b2dfe6fcd82f4b461d7";
       };
     };
     "octicons-3.5.0" = {
@@ -17816,13 +17960,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-1.1.1" = {
+    "raven-0.11.0" = {
       name = "raven";
       packageName = "raven";
-      version = "1.1.1";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz";
-        sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42";
+        url = "https://registry.npmjs.org/raven/-/raven-0.11.0.tgz";
+        sha1 = "32981138a93e4c8ad08cfc17e46b85b453dc107b";
       };
     };
     "signals-1.0.0" = {
@@ -17843,22 +17987,31 @@ let
         sha1 = "e0767014167825957de7e125c29b0fa89796ea03";
       };
     };
-    "winston-2.3.0" = {
-      name = "winston";
-      packageName = "winston";
-      version = "2.3.0";
+    "socket.io-1.4.8" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "1.4.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.3.0.tgz";
-        sha1 = "207faaab6fccf3fe493743dd2b03dbafc7ceb78c";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.8.tgz";
+        sha1 = "e576f330cd0bed64e55b3fd26df991141884867b";
       };
     };
-    "yargs-6.6.0" = {
+    "winston-2.2.0" = {
+      name = "winston";
+      packageName = "winston";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winston/-/winston-2.2.0.tgz";
+        sha1 = "2c853dd87ab552a8e8485d72cbbf9a2286f029b7";
+      };
+    };
+    "yargs-4.7.1" = {
       name = "yargs";
       packageName = "yargs";
-      version = "6.6.0";
+      version = "4.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
-        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
+        url = "https://registry.npmjs.org/yargs/-/yargs-4.7.1.tgz";
+        sha1 = "e60432658a3387ff269c028eacde4a512e438dff";
       };
     };
     "color-convert-1.8.2" = {
@@ -17870,13 +18023,13 @@ let
         sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339";
       };
     };
-    "color-string-1.4.0" = {
+    "color-string-0.3.0" = {
       name = "color-string";
       packageName = "color-string";
-      version = "1.4.0";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-1.4.0.tgz";
-        sha1 = "2b47f8565fb0eb52f9f77c801992b8ca55d6e898";
+        url = "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz";
+        sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991";
       };
     };
     "color-name-1.1.1" = {
@@ -17888,58 +18041,58 @@ let
         sha1 = "4b1415304cf50028ea81643643bd82ea05803689";
       };
     };
-    "simple-swizzle-0.2.2" = {
-      name = "simple-swizzle";
-      packageName = "simple-swizzle";
-      version = "0.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz";
-        sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a";
-      };
-    };
-    "is-arrayish-0.3.1" = {
-      name = "is-arrayish";
-      packageName = "is-arrayish";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz";
-        sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd";
-      };
-    };
-    "diff-3.2.0" = {
+    "diff-2.2.3" = {
       name = "diff";
       packageName = "diff";
-      version = "3.2.0";
+      version = "2.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
-        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
+        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
+        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
       };
     };
-    "hogan.js-3.0.2" = {
-      name = "hogan.js";
-      packageName = "hogan.js";
-      version = "3.0.2";
+    "cookie-0.1.5" = {
+      name = "cookie";
+      packageName = "cookie";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz";
-        sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd";
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.5.tgz";
+        sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c";
       };
     };
-    "whatwg-fetch-1.1.1" = {
-      name = "whatwg-fetch";
-      packageName = "whatwg-fetch";
-      version = "1.1.1";
+    "finalhandler-0.4.1" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz";
-        sha1 = "ac3c9d39f320c6dce5339969d054ef43dd333319";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
+        sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
       };
     };
-    "crc-3.4.1" = {
+    "send-0.13.1" = {
+      name = "send";
+      packageName = "send";
+      version = "0.13.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.13.1.tgz";
+        sha1 = "a30d5f4c82c8a9bae9ad00a1d9b1bdbe6f199ed7";
+      };
+    };
+    "cookie-0.2.3" = {
+      name = "cookie";
+      packageName = "cookie";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.2.3.tgz";
+        sha1 = "1a59536af68537a21178a01346f87cb059d2ae5c";
+      };
+    };
+    "crc-3.4.0" = {
       name = "crc";
       packageName = "crc";
-      version = "3.4.1";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz";
-        sha1 = "65d5830b1a2569557cfb324c0e679998521473ee";
+        url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz";
+        sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f";
       };
     };
     "broadway-0.2.10" = {
@@ -18068,13 +18221,103 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "node-gyp-3.5.0" = {
+    "lodash.clonedeep-4.3.2" = {
+      name = "lodash.clonedeep";
+      packageName = "lodash.clonedeep";
+      version = "4.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz";
+        sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de";
+      };
+    };
+    "lodash.union-4.4.0" = {
+      name = "lodash.union";
+      packageName = "lodash.union";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz";
+        sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38";
+      };
+    };
+    "lodash.uniq-4.3.0" = {
+      name = "lodash.uniq";
+      packageName = "lodash.uniq";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz";
+        sha1 = "dcad810876841447d8f3ec662323c86a6d938227";
+      };
+    };
+    "lodash.without-4.2.0" = {
+      name = "lodash.without";
+      packageName = "lodash.without";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz";
+        sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6";
+      };
+    };
+    "node-gyp-3.3.1" = {
       name = "node-gyp";
       packageName = "node-gyp";
-      version = "3.5.0";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
-        sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz";
+        sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0";
+      };
+    };
+    "request-2.72.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.72.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz";
+        sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1";
+      };
+    };
+    "retry-0.9.0" = {
+      name = "retry";
+      packageName = "retry";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz";
+        sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d";
+      };
+    };
+    "lodash._baseclone-4.5.7" = {
+      name = "lodash._baseclone";
+      packageName = "lodash._baseclone";
+      version = "4.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz";
+        sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
+      };
+    };
+    "lodash._baseflatten-4.2.1" = {
+      name = "lodash._baseflatten";
+      packageName = "lodash._baseflatten";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz";
+        sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208";
+      };
+    };
+    "lodash._basedifference-4.5.0" = {
+      name = "lodash._basedifference";
+      packageName = "lodash._basedifference";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz";
+        sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938";
+      };
+    };
+    "qs-6.1.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz";
+        sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26";
       };
     };
     "lsmod-1.0.0" = {
@@ -18086,13 +18329,13 @@ let
         sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b";
       };
     };
-    "uuid-3.0.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.0";
+    "stack-trace-0.0.7" = {
+      name = "stack-trace";
+      packageName = "stack-trace";
+      version = "0.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
-        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
+        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
+        sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff";
       };
     };
     "eve-0.4.2" = {
@@ -18104,13 +18347,67 @@ let
         sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
       };
     };
-    "yargs-parser-4.2.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "4.2.1";
+    "engine.io-1.6.11" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "1.6.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
-        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.11.tgz";
+        sha1 = "2533a97a65876c40ffcf95397b7ef9b495c423fe";
+      };
+    };
+    "socket.io-client-1.4.8" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "1.4.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.8.tgz";
+        sha1 = "481b241e73df140ea1a4fb03486a85ad097f5558";
+      };
+    };
+    "ws-1.1.0" = {
+      name = "ws";
+      packageName = "ws";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-1.1.0.tgz";
+        sha1 = "c1d6fd1515d3ceff1f0ae2759bf5fd77030aad1d";
+      };
+    };
+    "engine.io-client-1.6.11" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.6.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.11.tgz";
+        sha1 = "7d250d8fa1c218119ecde51390458a57d5171376";
+      };
+    };
+    "pkg-conf-1.1.3" = {
+      name = "pkg-conf";
+      packageName = "pkg-conf";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-1.1.3.tgz";
+        sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b";
+      };
+    };
+    "set-blocking-1.0.0" = {
+      name = "set-blocking";
+      packageName = "set-blocking";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-1.0.0.tgz";
+        sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5";
+      };
+    };
+    "symbol-0.2.3" = {
+      name = "symbol";
+      packageName = "symbol";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/symbol/-/symbol-0.2.3.tgz";
+        sha1 = "3b9873b8a901e47c6efe21526a3ac372ef28bbc7";
       };
     };
     "kew-0.1.7" = {
@@ -18194,13 +18491,13 @@ let
         sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
       };
     };
-    "node-libs-browser-0.7.0" = {
+    "node-libs-browser-0.6.0" = {
       name = "node-libs-browser";
       packageName = "node-libs-browser";
-      version = "0.7.0";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz";
-        sha1 = "3e272c0819e308935e26674408d7af0e1491b83b";
+        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.6.0.tgz";
+        sha1 = "244806d44d319e048bc8607b5cc4eaf9a29d2e3c";
       };
     };
     "tapable-0.1.10" = {
@@ -18221,13 +18518,13 @@ let
         sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b";
       };
     };
-    "webpack-core-0.6.9" = {
+    "webpack-core-0.6.8" = {
       name = "webpack-core";
       packageName = "webpack-core";
-      version = "0.6.9";
+      version = "0.6.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz";
-        sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2";
+        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz";
+        sha1 = "edf9135de00a6a3c26dd0f14b208af0aa4af8d0a";
       };
     };
     "memory-fs-0.2.0" = {
@@ -18257,40 +18554,76 @@ let
         sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
-    "json5-0.5.1" = {
+    "json5-0.5.0" = {
       name = "json5";
       packageName = "json5";
-      version = "0.5.1";
+      version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
-        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
+        url = "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz";
+        sha1 = "9b20715b026cbe3778fd769edccd822d8332a5b2";
       };
     };
-    "crypto-browserify-3.3.0" = {
+    "assert-1.4.1" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
+        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";
-      version = "3.3.0";
+      version = "3.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz";
-        sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c";
+        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz";
+        sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189";
       };
     };
-    "os-browserify-0.2.1" = {
-      name = "os-browserify";
-      packageName = "os-browserify";
-      version = "0.2.1";
+    "http-browserify-1.7.0" = {
+      name = "http-browserify";
+      packageName = "http-browserify";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz";
-        sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f";
+        url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
+        sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
       };
     };
-    "timers-browserify-2.0.2" = {
-      name = "timers-browserify";
-      packageName = "timers-browserify";
-      version = "2.0.2";
+    "https-browserify-0.0.0" = {
+      name = "https-browserify";
+      packageName = "https-browserify";
+      version = "0.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz";
-        sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86";
+        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
+        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" = {
@@ -18320,31 +18653,166 @@ let
         sha1 = "17ddeddc5f722fb66501658895461977867315ba";
       };
     };
-    "browserify-aes-0.4.0" = {
-      name = "browserify-aes";
-      packageName = "browserify-aes";
-      version = "0.4.0";
+    "Base64-0.2.1" = {
+      name = "Base64";
+      packageName = "Base64";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz";
-        sha1 = "067149b668df31c4b58533e02d01e806d8608e2c";
+        url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
+        sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
       };
     };
-    "setimmediate-1.0.5" = {
-      name = "setimmediate";
-      packageName = "setimmediate";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz";
-        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
-      };
-    };
-    "source-list-map-0.1.8" = {
+    "source-list-map-0.1.6" = {
       name = "source-list-map";
       packageName = "source-list-map";
-      version = "0.1.8";
+      version = "0.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz";
-        sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106";
+        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.6.tgz";
+        sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f";
+      };
+    };
+    "babel-runtime-6.18.0" = {
+      name = "babel-runtime";
+      packageName = "babel-runtime";
+      version = "6.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz";
+        sha1 = "0f4177ffd98492ef13b9f823e9994a02584c9078";
+      };
+    };
+    "death-1.0.0" = {
+      name = "death";
+      packageName = "death";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/death/-/death-1.0.0.tgz";
+        sha1 = "4d46e15488d4b636b699f0671b04632d752fd2de";
+      };
+    };
+    "detect-indent-4.0.0" = {
+      name = "detect-indent";
+      packageName = "detect-indent";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz";
+        sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
+      };
+    };
+    "invariant-2.2.2" = {
+      name = "invariant";
+      packageName = "invariant";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz";
+        sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360";
+      };
+    };
+    "is-ci-1.0.10" = {
+      name = "is-ci";
+      packageName = "is-ci";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz";
+        sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
+      };
+    };
+    "leven-2.0.0" = {
+      name = "leven";
+      packageName = "leven";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/leven/-/leven-2.0.0.tgz";
+        sha1 = "74c45744439550da185801912829f61d22071bc1";
+      };
+    };
+    "node-emoji-1.4.1" = {
+      name = "node-emoji";
+      packageName = "node-emoji";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.4.1.tgz";
+        sha1 = "c9fa0cf91094335bcb967a6f42b2305c15af2ebc";
+      };
+    };
+    "object-path-0.11.3" = {
+      name = "object-path";
+      packageName = "object-path";
+      version = "0.11.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-path/-/object-path-0.11.3.tgz";
+        sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554";
+      };
+    };
+    "proper-lockfile-1.2.0" = {
+      name = "proper-lockfile";
+      packageName = "proper-lockfile";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz";
+        sha1 = "ceff5dd89d3e5f10fb75e1e8e76bc75801a59c34";
+      };
+    };
+    "request-capture-har-1.1.4" = {
+      name = "request-capture-har";
+      packageName = "request-capture-har";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.1.4.tgz";
+        sha1 = "e6ad76eb8e7a1714553fdbeef32cd4518e4e2013";
+      };
+    };
+    "roadrunner-1.1.0" = {
+      name = "roadrunner";
+      packageName = "roadrunner";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz";
+        sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
+      };
+    };
+    "regenerator-runtime-0.9.6" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.9.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz";
+        sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029";
+      };
+    };
+    "loose-envify-1.3.0" = {
+      name = "loose-envify";
+      packageName = "loose-envify";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz";
+        sha1 = "6b26248c42f6d4fa4b0d8542f78edfcde35642a8";
+      };
+    };
+    "ci-info-1.0.0" = {
+      name = "ci-info";
+      packageName = "ci-info";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz";
+        sha1 = "dc5285f2b4e251821683681c381c3388f46ec534";
+      };
+    };
+    "string.prototype.codepointat-0.2.0" = {
+      name = "string.prototype.codepointat";
+      packageName = "string.prototype.codepointat";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz";
+        sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78";
+      };
+    };
+    "err-code-1.1.1" = {
+      name = "err-code";
+      packageName = "err-code";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.1.tgz";
+        sha1 = "739d71b6851f24d050ea18c79a5b722420771d59";
       };
     };
   };
@@ -18353,10 +18821,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.5";
+    version = "1.9.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz";
-      sha1 = "78be031931f4b9012f6085e1544069c56dcba233";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.4.tgz";
+      sha1 = "8f85b28758ed0e7a251a635cd2e6a73ce92e9dde";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -18371,7 +18839,7 @@ in
           sources."source-map-0.1.34"
         ];
       })
-      sources."resolve-1.2.0"
+      sources."resolve-1.1.7"
       sources."global-paths-0.1.2"
       sources."source-map-0.1.9"
       sources."xml2tss-0.0.5"
@@ -18396,15 +18864,16 @@ in
         ];
       })
       sources."is-windows-0.1.1"
-      (sources."global-prefix-0.1.5" // {
+      (sources."global-prefix-0.1.4" // {
         dependencies = [
           sources."is-windows-0.2.0"
         ];
       })
-      sources."homedir-polyfill-1.0.1"
       sources."ini-1.3.4"
+      sources."osenv-0.1.3"
       sources."which-1.2.12"
-      sources."parse-passwd-1.0.0"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
       sources."isexe-1.1.2"
       sources."xml2js-0.2.8"
       sources."sax-0.5.8"
@@ -18421,13 +18890,17 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.8";
+    version = "0.10.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz";
-      sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.7.tgz";
+      sha1 = "48e59f6be202122c0d71153efab4f924065da586";
     };
     dependencies = [
-      sources."adal-node-0.1.21"
+      (sources."adal-node-0.1.21" // {
+        dependencies = [
+          sources."node-uuid-1.4.7"
+        ];
+      })
       sources."async-1.4.2"
       (sources."azure-common-0.9.18" // {
         dependencies = [
@@ -18436,11 +18909,9 @@ in
         ];
       })
       sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-cdn-1.0.0"
+      sources."azure-arm-cdn-0.2.1"
       sources."azure-arm-commerce-0.2.0"
-      sources."azure-arm-compute-0.19.1"
-      sources."azure-arm-datalake-analytics-1.0.1-preview"
-      sources."azure-arm-datalake-store-1.0.1-preview"
+      sources."azure-arm-compute-0.19.0"
       sources."azure-arm-hdinsight-0.2.2"
       sources."azure-arm-hdinsight-jobs-0.1.0"
       sources."azure-arm-insights-0.11.3"
@@ -18452,6 +18923,8 @@ in
       sources."azure-arm-dns-0.11.1"
       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"
@@ -18466,7 +18939,7 @@ in
         ];
       })
       sources."azure-asm-network-0.13.0"
-      sources."azure-arm-resource-1.6.1-preview"
+      sources."azure-arm-resource-1.4.5-preview"
       sources."azure-arm-storage-0.13.1-preview"
       sources."azure-asm-sb-0.10.1"
       sources."azure-asm-sql-0.10.1"
@@ -18479,6 +18952,7 @@ in
       })
       (sources."azure-storage-1.3.0" // {
         dependencies = [
+          sources."node-uuid-1.4.7"
           sources."readable-stream-2.0.6"
           sources."validator-3.22.2"
           sources."xml2js-0.2.7"
@@ -18487,7 +18961,7 @@ in
       sources."azure-arm-batch-0.3.0"
       sources."azure-batch-0.5.2"
       sources."azure-servicefabric-0.1.4"
-      sources."applicationinsights-0.16.0"
+      sources."applicationinsights-0.15.12"
       sources."caller-id-0.1.0"
       sources."colors-1.1.2"
       sources."commander-1.0.4"
@@ -18506,16 +18980,16 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.17.1"
+      sources."moment-2.17.0"
       sources."ms-rest-1.15.2"
       (sources."ms-rest-azure-1.15.2" // {
         dependencies = [
           sources."async-0.2.7"
-          sources."uuid-2.0.1"
           sources."azure-arm-resource-1.4.4-preview"
         ];
       })
       sources."node-forge-0.6.23"
+      sources."node-uuid-1.2.0"
       sources."omelette-0.1.0"
       sources."openssl-wrapper-0.2.1"
       sources."progress-1.1.8"
@@ -18538,6 +19012,7 @@ in
       (sources."request-2.74.0" // {
         dependencies = [
           sources."extend-3.0.0"
+          sources."node-uuid-1.4.7"
         ];
       })
       (sources."ssh-key-to-pem-0.11.0" // {
@@ -18552,7 +19027,6 @@ in
       sources."tunnel-0.0.2"
       sources."underscore-1.4.4"
       sources."user-home-2.0.0"
-      sources."uuid-3.0.1"
       sources."validator-5.2.0"
       (sources."winston-2.1.1" // {
         dependencies = [
@@ -18567,14 +19041,14 @@ in
       sources."read-1.0.7"
       sources."date-utils-1.2.21"
       sources."jws-3.1.4"
-      sources."node-uuid-1.4.7"
-      sources."xmldom-0.1.27"
+      sources."xmldom-0.1.22"
       sources."xpath.js-1.0.7"
       sources."base64url-2.0.0"
-      sources."jwa-1.1.5"
+      sources."jwa-1.1.4"
       sources."safe-buffer-5.0.1"
       sources."buffer-equal-constant-time-1.0.1"
-      sources."ecdsa-sig-formatter-1.0.9"
+      sources."ecdsa-sig-formatter-1.0.7"
+      sources."base64-url-1.3.3"
       sources."dateformat-1.0.2-1.2.3"
       sources."envconf-0.0.4"
       sources."duplexer-0.1.1"
@@ -18606,6 +19080,7 @@ in
       sources."has-color-0.1.7"
       sources."ansi-styles-1.0.0"
       sources."strip-ansi-0.1.1"
+      sources."uuid-2.0.1"
       sources."debug-0.7.4"
       sources."q-0.9.7"
       sources."pkginfo-0.4.0"
@@ -18660,24 +19135,24 @@ in
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
-      sources."lodash-4.17.4"
+      sources."lodash-4.17.2"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -18687,7 +19162,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -18696,7 +19171,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -18707,31 +19182,30 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."ctype-0.5.2"
       sources."source-map-0.1.43"
       sources."fibers-1.0.15"
       sources."galaxy-0.1.12"
       sources."amdefine-1.0.1"
-      (sources."concat-stream-1.6.0" // {
+      (sources."concat-stream-1.5.2" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.0.6"
         ];
       })
       sources."http-response-object-1.1.0"
       sources."then-request-2.2.0"
       sources."typedarray-0.0.6"
-      sources."buffer-shims-1.0.0"
       sources."http-basic-2.5.1"
       sources."promise-7.1.1"
       sources."asap-2.0.5"
       sources."os-homedir-1.0.2"
-      sources."mute-stream-0.0.7"
+      sources."mute-stream-0.0.6"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -18832,7 +19306,7 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -18894,7 +19368,7 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."q-1.4.1"
-      sources."debug-2.6.0"
+      sources."debug-2.3.3"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -18914,20 +19388,16 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "13.3.0";
+    version = "13.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
-      sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
+      url = "https://registry.npmjs.org/browserify/-/browserify-13.1.1.tgz";
+      sha1 = "72a2310e2f706ed87db929cf0ee73a5e195d9bb0";
     };
     dependencies = [
-      sources."JSONStream-1.3.0"
-      sources."assert-1.4.1"
+      sources."JSONStream-1.2.1"
+      sources."assert-1.3.0"
       sources."browser-pack-6.0.2"
-      (sources."browser-resolve-1.11.2" // {
-        dependencies = [
-          sources."resolve-1.1.7"
-        ];
-      })
+      sources."browser-resolve-1.11.2"
       sources."browserify-zlib-0.1.4"
       sources."buffer-4.9.1"
       sources."cached-path-relative-1.0.0"
@@ -18944,7 +19414,7 @@ in
       sources."domain-browser-1.1.7"
       sources."duplexer2-0.1.4"
       sources."events-1.1.1"
-      sources."glob-7.1.1"
+      sources."glob-5.0.15"
       sources."has-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-0.0.1"
@@ -18964,11 +19434,11 @@ in
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
       sources."readable-stream-2.2.2"
-      sources."resolve-1.2.0"
+      sources."resolve-1.1.7"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.6.1"
+      sources."stream-http-2.5.0"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       (sources."syntax-error-1.1.6" // {
@@ -18976,7 +19446,11 @@ in
           sources."acorn-2.7.0"
         ];
       })
-      sources."through2-2.0.3"
+      (sources."through2-2.0.1" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+        ];
+      })
       sources."timers-browserify-1.4.2"
       sources."tty-browserify-0.0.0"
       (sources."url-0.11.0" // {
@@ -19030,11 +19504,10 @@ in
       sources."parse-asn1-5.0.0"
       sources."brorand-1.0.6"
       sources."hash.js-1.0.3"
-      sources."asn1.js-4.9.1"
+      sources."asn1.js-4.9.0"
       sources."ripemd160-1.0.1"
       sources."sha.js-2.4.8"
       sources."miller-rabin-4.0.0"
-      sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
@@ -19062,7 +19535,7 @@ in
       sources."array-filter-0.0.1"
       sources."array-reduce-0.0.0"
       sources."array-map-0.0.0"
-      sources."builtin-status-codes-3.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"
@@ -19086,11 +19559,11 @@ in
     };
     dependencies = [
       sources."array-loop-1.0.0"
-      sources."castv2-client-1.2.0"
+      sources."castv2-client-1.1.2"
       sources."chalk-1.0.0"
       sources."chromecast-player-0.2.3"
       sources."debounced-seeker-1.0.0"
-      sources."debug-2.6.0"
+      sources."debug-2.3.3"
       sources."fs-extended-0.2.1"
       sources."got-1.2.2"
       sources."internal-ip-1.2.0"
@@ -19129,7 +19602,7 @@ in
       (sources."xml2js-0.4.17" // {
         dependencies = [
           sources."xmlbuilder-4.2.1"
-          sources."lodash-4.17.4"
+          sources."lodash-4.17.2"
         ];
       })
       sources."xtend-4.0.1"
@@ -19175,7 +19648,7 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -19208,7 +19681,7 @@ in
       sources."clivas-0.1.4"
       sources."inquirer-0.8.5"
       sources."network-address-0.0.5"
-      sources."numeral-1.5.6"
+      sources."numeral-1.5.5"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
         dependencies = [
@@ -19242,7 +19715,7 @@ in
         ];
       })
       sources."windows-no-runnable-0.0.6"
-      (sources."mdns-js-0.5.3" // {
+      (sources."mdns-js-0.5.1" // {
         dependencies = [
           sources."semver-5.1.1"
         ];
@@ -19252,7 +19725,7 @@ in
       sources."qap-3.1.3"
       sources."base64-js-1.1.2"
       sources."xmlbuilder-8.2.2"
-      sources."xmldom-0.1.27"
+      sources."xmldom-0.1.22"
       sources."cli-width-1.1.1"
       (sources."figures-1.7.0" // {
         dependencies = [
@@ -19268,12 +19741,12 @@ in
       sources."blob-to-buffer-1.2.6"
       sources."magnet-uri-5.1.5"
       sources."parse-torrent-file-4.0.0"
-      sources."simple-get-2.4.0"
+      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.1.0"
-      sources."rusha-0.8.5"
+      sources."simple-sha1-2.0.8"
+      sources."rusha-0.8.4"
       sources."once-1.4.0"
       sources."simple-concat-1.0.0"
       sources."unzip-response-2.0.1"
@@ -19303,7 +19776,7 @@ in
       sources."rimraf-2.5.4"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.0"
-      (sources."random-access-file-1.4.0" // {
+      (sources."random-access-file-1.3.1" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.1"
@@ -19361,7 +19834,7 @@ in
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      (sources."simple-peer-6.1.3" // {
+      (sources."simple-peer-6.0.7" // {
         dependencies = [
           sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
@@ -19414,13 +19887,13 @@ in
       sources."codepage-1.4.0"
       sources."utfx-1.0.1"
       sources."voc-0.5.0"
-      (sources."concat-stream-1.6.0" // {
+      (sources."concat-stream-1.5.2" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.0.6"
           sources."isarray-1.0.0"
         ];
       })
-      sources."exit-on-epipe-1.0.0"
+      sources."exit-on-epipe-0.1.0"
       sources."commander-2.9.0"
       sources."typedarray-0.0.6"
       sources."graceful-readlink-1.0.1"
@@ -19437,10 +19910,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.12.2";
+    version = "1.11.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
-      sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
+      sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -19473,7 +19946,7 @@ in
           sources."unorm-1.3.3"
         ];
       })
-      (sources."insight-0.8.4" // {
+      (sources."insight-0.8.3" // {
         dependencies = [
           sources."async-1.5.2"
           sources."request-2.79.0"
@@ -19490,7 +19963,7 @@ in
       sources."elementtree-0.1.6"
       sources."glob-5.0.15"
       sources."minimatch-3.0.3"
-      sources."osenv-0.1.4"
+      sources."osenv-0.1.3"
       sources."plist-1.2.0"
       sources."semver-5.3.0"
       sources."shelljs-0.5.3"
@@ -19509,14 +19982,14 @@ in
       sources."os-tmpdir-1.0.2"
       sources."base64-js-0.0.8"
       sources."xmlbuilder-4.0.0"
-      sources."xmldom-0.1.27"
+      sources."xmldom-0.1.22"
       sources."util-deprecate-1.0.2"
       sources."lodash-3.10.1"
       sources."aliasify-1.9.0"
       (sources."cordova-fetch-1.0.1" // {
         dependencies = [
           sources."q-1.4.1"
-          sources."shelljs-0.7.6"
+          sources."shelljs-0.7.5"
           sources."glob-7.1.1"
         ];
       })
@@ -19526,7 +19999,7 @@ in
         ];
       })
       sources."cordova-js-4.2.0"
-      (sources."cordova-serve-1.0.1" // {
+      (sources."cordova-serve-1.0.0" // {
         dependencies = [
           sources."q-1.4.1"
         ];
@@ -19600,17 +20073,13 @@ in
       sources."interpret-1.0.1"
       sources."rechoir-0.6.2"
       sources."fs.realpath-1.0.0"
-      sources."resolve-1.2.0"
+      sources."resolve-1.1.7"
       sources."cordova-app-hello-world-3.11.0"
       sources."browserify-13.1.0"
-      sources."JSONStream-1.3.0"
+      sources."JSONStream-1.2.1"
       sources."assert-1.3.0"
       sources."browser-pack-6.0.2"
-      (sources."browser-resolve-1.11.2" // {
-        dependencies = [
-          sources."resolve-1.1.7"
-        ];
-      })
+      sources."browser-resolve-1.11.2"
       sources."browserify-zlib-0.1.4"
       (sources."buffer-4.9.1" // {
         dependencies = [
@@ -19653,7 +20122,7 @@ in
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.6.1"
+      sources."stream-http-2.5.0"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       (sources."syntax-error-1.1.6" // {
@@ -19661,7 +20130,12 @@ in
           sources."acorn-2.7.0"
         ];
       })
-      sources."through2-2.0.3"
+      (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.11.0" // {
@@ -19711,7 +20185,7 @@ in
       sources."parse-asn1-5.0.0"
       sources."brorand-1.0.6"
       sources."hash.js-1.0.3"
-      sources."asn1.js-4.9.1"
+      sources."asn1.js-4.9.0"
       sources."ripemd160-1.0.1"
       sources."sha.js-2.4.8"
       sources."miller-rabin-4.0.0"
@@ -19734,7 +20208,7 @@ in
       sources."array-filter-0.0.1"
       sources."array-reduce-0.0.0"
       sources."array-map-0.0.0"
-      sources."builtin-status-codes-3.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"
@@ -19747,16 +20221,16 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."accepts-1.3.3"
       sources."bytes-2.3.0"
       sources."compressible-2.0.9"
       sources."debug-2.2.0"
       sources."on-headers-1.0.1"
       sources."vary-1.1.0"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."ms-0.7.1"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
@@ -19774,7 +20248,7 @@ in
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.3"
+      sources."proxy-addr-1.1.2"
       sources."qs-6.2.0"
       sources."range-parser-1.2.0"
       sources."send-0.14.1"
@@ -19785,7 +20259,7 @@ in
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.2.0"
+      sources."ipaddr.js-1.1.1"
       sources."destroy-1.0.4"
       sources."http-errors-1.5.1"
       sources."mime-1.3.4"
@@ -19802,7 +20276,7 @@ in
       sources."validate-npm-package-license-3.0.1"
       sources."validate-npm-package-name-2.2.2"
       sources."hosted-git-info-2.1.5"
-      sources."mute-stream-0.0.7"
+      sources."mute-stream-0.0.6"
       sources."json-parse-helpfulerror-1.0.3"
       sources."normalize-package-data-2.3.5"
       sources."graceful-fs-4.1.11"
@@ -19834,8 +20308,8 @@ in
       sources."github-url-from-git-1.4.0"
       sources."github-url-from-username-repo-1.0.2"
       sources."ini-1.3.4"
-      sources."lockfile-1.0.3"
-      sources."lru-cache-4.0.2"
+      sources."lockfile-1.0.2"
+      sources."lru-cache-4.0.1"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -19861,7 +20335,7 @@ in
       sources."path-is-inside-1.0.2"
       sources."read-installed-4.0.3"
       sources."realize-package-specifier-3.0.3"
-      sources."retry-0.10.1"
+      sources."retry-0.10.0"
       (sources."rimraf-2.5.4" // {
         dependencies = [
           sources."glob-7.1.1"
@@ -19908,7 +20382,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."commander-2.9.0"
@@ -19917,7 +20391,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -19926,7 +20400,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -19935,7 +20409,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -19946,7 +20420,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -19969,7 +20443,7 @@ in
       sources."node-uuid-1.4.7"
       (sources."async-2.1.4" // {
         dependencies = [
-          sources."lodash-4.17.4"
+          sources."lodash-4.17.2"
         ];
       })
       sources."isexe-1.1.2"
@@ -20054,14 +20528,14 @@ in
   csslint = nodeEnv.buildNodePackage {
     name = "csslint";
     packageName = "csslint";
-    version = "1.0.5";
+    version = "1.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz";
-      sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9";
+      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.4.tgz";
+      sha1 = "0d3907933cc3f04b56960496d573387fbe9bb1e7";
     };
     dependencies = [
-      sources."clone-2.1.0"
-      sources."parserlib-1.1.1"
+      sources."clone-1.0.2"
+      sources."parserlib-1.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -20150,9 +20624,9 @@ in
       sources."cookie-0.1.2"
       sources."merge-descriptors-0.0.2"
       sources."utils-merge-1.0.0"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."ms-0.7.0"
       sources."crc-3.2.1"
       sources."ee-first-1.1.0"
@@ -20161,7 +20635,7 @@ in
       sources."destroy-1.0.3"
       sources."mime-1.2.11"
       sources."bindings-1.2.1"
-      sources."nan-2.5.0"
+      sources."nan-2.4.0"
       sources."jsonparse-0.0.6"
       sources."es5class-2.3.1"
       sources."faye-websocket-0.11.0"
@@ -20259,16 +20733,12 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."ndjson-1.5.0" // {
+      (sources."ndjson-1.4.3" // {
         dependencies = [
           sources."minimist-1.2.0"
-          sources."split2-2.1.1"
-          sources."through2-2.0.3"
-          sources."readable-stream-2.2.2"
-          sources."isarray-1.0.0"
         ];
       })
-      sources."pump-1.0.2"
+      sources."pump-1.0.1"
       sources."pumpify-1.3.5"
       sources."relative-date-1.1.3"
       sources."root-2.0.0"
@@ -20277,7 +20747,11 @@ in
       sources."stream-collector-1.0.1"
       (sources."tar-stream-1.5.2" // {
         dependencies = [
-          sources."bl-1.2.0"
+          (sources."bl-1.1.2" // {
+            dependencies = [
+              sources."readable-stream-2.0.6"
+            ];
+          })
           sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
@@ -20347,7 +20821,6 @@ in
       sources."looper-2.0.0"
       sources."bindings-1.2.1"
       sources."nan-2.1.0"
-      sources."json-stringify-safe-5.0.1"
       sources."murl-0.4.1"
       sources."protein-0.5.0"
       sources."network-address-0.0.5"
@@ -20363,21 +20836,20 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "3.0.2";
+    version = "2.4.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.0.2.tgz";
-      sha1 = "0f010dbd6e26db0270abd88e3e5403062eb4f7a4";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-2.4.2.tgz";
+      sha1 = "757c98aea05ee8714f0de2a33224c4136414633e";
     };
     dependencies = [
-      sources."JSONStream-1.3.0"
-      sources."async-2.1.4"
+      sources."JSONStream-1.1.4"
+      sources."async-2.0.1"
       sources."aws4-1.5.0"
-      sources."awscred-1.2.0"
       sources."optimist-0.6.1"
       sources."request-2.79.0"
       sources."jsonparse-1.2.0"
       sources."through-2.3.8"
-      sources."lodash-4.17.4"
+      sources."lodash-4.17.2"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
       sources."aws-sign2-0.6.0"
@@ -20392,13 +20864,13 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -20410,11 +20882,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -20424,7 +20896,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20433,7 +20905,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20444,11 +20916,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
     ];
     buildInputs = globalBuildInputs;
@@ -20462,63 +20934,45 @@ in
   emoj = nodeEnv.buildNodePackage {
     name = "emoj";
     packageName = "emoj";
-    version = "1.0.0";
+    version = "0.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emoj/-/emoj-1.0.0.tgz";
-      sha1 = "3cccbeec420e2b45f73b923e880c220392c055bd";
+      url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz";
+      sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c";
     };
     dependencies = [
       sources."chalk-1.1.3"
-      sources."clipboardy-0.1.2"
-      (sources."got-6.7.1" // {
-        dependencies = [
-          sources."get-stream-3.0.0"
-        ];
-      })
+      sources."got-6.6.3"
       sources."has-ansi-2.0.0"
       sources."lodash.debounce-4.0.8"
       sources."log-update-1.0.2"
-      sources."mem-1.1.0"
+      sources."mem-0.1.1"
       sources."meow-3.7.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
-      sources."execa-0.5.1"
-      sources."cross-spawn-4.0.2"
-      sources."get-stream-2.3.1"
-      sources."is-stream-1.1.0"
-      sources."npm-run-path-2.0.2"
-      sources."p-finally-1.0.0"
-      sources."signal-exit-3.0.2"
-      sources."strip-eof-1.0.0"
-      sources."lru-cache-4.0.2"
-      sources."which-1.2.12"
-      sources."pseudomap-1.0.2"
-      sources."yallist-2.0.0"
-      sources."isexe-1.1.2"
-      sources."object-assign-4.1.0"
-      sources."pinkie-promise-2.0.1"
-      sources."pinkie-2.0.4"
-      sources."path-key-2.0.1"
+      sources."ansi-regex-2.0.0"
       sources."create-error-class-3.0.2"
       sources."duplexer3-0.1.4"
+      sources."get-stream-2.3.1"
       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."safe-buffer-5.0.1"
-      sources."timed-out-4.0.0"
+      sources."node-status-codes-2.0.1"
+      sources."timed-out-3.0.0"
       sources."unzip-response-2.0.1"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
+      sources."object-assign-4.1.0"
+      sources."pinkie-promise-2.0.1"
+      sources."pinkie-2.0.4"
       sources."prepend-http-1.0.4"
       sources."ansi-escapes-1.4.0"
       sources."cli-cursor-1.0.2"
       sources."restore-cursor-1.0.1"
       sources."exit-hook-1.1.1"
       sources."onetime-1.1.0"
-      sources."mimic-fn-1.1.0"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
@@ -20530,6 +20984,7 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
+      sources."signal-exit-3.0.1"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -20569,16 +21024,16 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.13.1";
+    version = "3.10.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz";
-      sha1 = "564d2646b5efded85df96985332edd91a23bff25";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz";
+      sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7";
     };
     dependencies = [
-      sources."babel-code-frame-6.20.0"
+      sources."babel-code-frame-6.16.0"
       sources."chalk-1.1.3"
-      sources."concat-stream-1.6.0"
-      sources."debug-2.6.0"
+      sources."concat-stream-1.5.2"
+      sources."debug-2.3.3"
       sources."doctrine-1.5.0"
       sources."escope-3.6.0"
       sources."espree-3.3.2"
@@ -20595,7 +21050,7 @@ in
       sources."js-yaml-3.7.0"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
-      sources."lodash-4.17.4"
+      sources."lodash-4.17.2"
       sources."mkdirp-0.5.1"
       sources."natural-compare-1.4.0"
       sources."optionator-0.8.2"
@@ -20603,9 +21058,9 @@ in
       sources."pluralize-1.2.1"
       sources."progress-1.1.8"
       sources."require-uncached-1.0.3"
-      sources."shelljs-0.7.6"
+      sources."shelljs-0.7.5"
       sources."strip-bom-3.0.0"
-      sources."strip-json-comments-2.0.1"
+      sources."strip-json-comments-1.0.4"
       (sources."table-3.8.3" // {
         dependencies = [
           sources."string-width-2.0.0"
@@ -20620,11 +21075,10 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.2"
-      sources."buffer-shims-1.0.0"
+      sources."readable-stream-2.0.6"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
@@ -20645,13 +21099,13 @@ in
       sources."es6-symbol-3.1.0"
       sources."event-emitter-0.3.4"
       sources."object-assign-4.1.0"
-      sources."acorn-4.0.4"
+      sources."acorn-4.0.3"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
           sources."acorn-3.3.0"
         ];
       })
-      sources."flat-cache-1.2.2"
+      sources."flat-cache-1.2.1"
       sources."circular-json-0.3.1"
       sources."del-2.2.2"
       sources."graceful-fs-4.1.11"
@@ -20694,7 +21148,7 @@ in
       sources."number-is-nan-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."tryit-1.0.3"
@@ -20707,15 +21161,15 @@ in
       sources."minimist-0.0.8"
       sources."deep-is-0.1.3"
       sources."wordwrap-1.0.0"
-      sources."fast-levenshtein-2.0.6"
+      sources."fast-levenshtein-2.0.5"
       sources."caller-path-0.1.0"
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
       sources."interpret-1.0.1"
       sources."rechoir-0.6.2"
-      sources."resolve-1.2.0"
-      sources."ajv-4.10.4"
-      sources."ajv-keywords-1.5.0"
+      sources."resolve-1.1.7"
+      sources."ajv-4.9.0"
+      sources."ajv-keywords-1.1.1"
       sources."slice-ansi-0.0.4"
       sources."co-4.6.0"
       sources."os-homedir-1.0.2"
@@ -20731,10 +21185,10 @@ in
   emojione = nodeEnv.buildNodePackage {
     name = "emojione";
     packageName = "emojione";
-    version = "2.2.7";
+    version = "2.2.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-2.2.7.tgz";
-      sha1 = "46457cf6b9b2f8da13ae8a2e4e547de06ee15e96";
+      url = "https://registry.npmjs.org/emojione/-/emojione-2.2.6.tgz";
+      sha1 = "67dec452937d5b14ee669207ea41cdb1f69fb8f6";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -20800,7 +21254,7 @@ in
       sources."object-assign-3.0.0"
       sources."optimist-0.6.1"
       sources."path-is-absolute-1.0.1"
-      (sources."prettyjson-1.2.1" // {
+      (sources."prettyjson-1.2.0" // {
         dependencies = [
           sources."colors-1.1.2"
           sources."minimist-1.2.0"
@@ -20832,7 +21286,7 @@ in
       sources."minimist-0.0.10"
       sources."read-1.0.7"
       sources."revalidator-0.1.8"
-      sources."mute-stream-0.0.7"
+      sources."mute-stream-0.0.6"
       sources."chokidar-1.6.1"
       sources."minimatch-3.0.3"
       sources."ps-tree-0.0.3"
@@ -20843,7 +21297,7 @@ in
       sources."is-binary-path-1.0.1"
       sources."is-glob-2.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.17"
+      sources."fsevents-1.0.15"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -20853,7 +21307,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
-      sources."kind-of-3.1.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"
@@ -20865,7 +21319,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.6"
+      sources."randomatic-1.1.5"
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
@@ -20877,7 +21331,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.8.0"
+      sources."binary-extensions-1.7.0"
       sources."graceful-fs-4.1.11"
       sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
@@ -20886,15 +21340,15 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.5.0"
-      sources."node-pre-gyp-0.6.32"
+      sources."nan-2.4.0"
+      sources."node-pre-gyp-0.6.31"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.0.1"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -20913,7 +21367,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
+      (sources."gauge-2.7.1" // {
         dependencies = [
           sources."object-assign-4.1.0"
         ];
@@ -20921,16 +21375,16 @@ in
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -20947,30 +21401,27 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -20980,7 +21431,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20989,7 +21440,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -21000,11 +21451,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -21047,10 +21498,10 @@ in
   git-run = nodeEnv.buildNodePackage {
     name = "git-run";
     packageName = "git-run";
-    version = "0.5.3";
+    version = "0.5.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.3.tgz";
-      sha1 = "92005049d5514753d53c4f90fd6f2b2b29a8e08c";
+      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.2.tgz";
+      sha1 = "1edbc7163389067dd9f2c46ab3acff07889f8333";
     };
     dependencies = [
       sources."minilog-2.0.8"
@@ -21108,7 +21559,7 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.12.2"
+      sources."coffee-script-1.11.1"
       sources."jade-1.11.0"
       (sources."q-2.0.3" // {
         dependencies = [
@@ -21118,7 +21569,7 @@ in
       sources."xml2js-0.4.17"
       sources."msgpack-1.0.2"
       sources."character-parser-1.2.1"
-      (sources."clean-css-3.4.23" // {
+      (sources."clean-css-3.4.21" // {
         dependencies = [
           sources."commander-2.8.1"
         ];
@@ -21135,7 +21586,7 @@ in
           sources."source-map-0.1.43"
         ];
       })
-      (sources."uglify-js-2.7.5" // {
+      (sources."uglify-js-2.7.4" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
@@ -21174,7 +21625,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.1.0"
+      sources."kind-of-3.0.4"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -21183,8 +21634,8 @@ in
       sources."weak-map-1.0.5"
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
-      sources."lodash-4.17.4"
-      sources."nan-2.5.0"
+      sources."lodash-4.17.2"
+      sources."nan-2.4.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -21205,7 +21656,7 @@ in
       sources."archy-1.0.0"
       sources."chalk-1.1.3"
       sources."deprecated-0.0.1"
-      sources."gulp-util-3.0.8"
+      sources."gulp-util-3.0.7"
       sources."interpret-1.0.1"
       sources."liftoff-2.3.0"
       sources."minimist-1.2.0"
@@ -21216,6 +21667,8 @@ in
       sources."v8flags-2.0.11"
       (sources."vinyl-fs-0.3.14" // {
         dependencies = [
+          sources."graceful-fs-3.0.11"
+          sources."strip-bom-1.0.0"
           sources."through2-0.6.5"
           sources."vinyl-0.4.6"
           sources."readable-stream-1.0.34"
@@ -21227,12 +21680,12 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."array-differ-1.0.0"
       sources."array-uniq-1.0.3"
       sources."beeper-1.1.1"
-      sources."dateformat-2.0.0"
-      sources."fancy-log-1.3.0"
+      sources."dateformat-1.0.12"
+      sources."fancy-log-1.2.0"
       sources."gulplog-1.0.0"
       sources."has-gulplog-0.1.0"
       sources."lodash._reescape-3.0.0"
@@ -21242,13 +21695,57 @@ in
       sources."multipipe-0.1.2"
       sources."object-assign-3.0.0"
       sources."replace-ext-0.0.1"
-      (sources."through2-2.0.3" // {
+      (sources."through2-2.0.1" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.0.6"
           sources."isarray-1.0.0"
         ];
       })
       sources."vinyl-0.5.3"
+      sources."get-stdin-4.0.1"
+      (sources."meow-3.7.0" // {
+        dependencies = [
+          sources."object-assign-4.1.0"
+        ];
+      })
+      sources."camelcase-keys-2.1.0"
+      sources."decamelize-1.2.0"
+      sources."loud-rejection-1.6.0"
+      sources."map-obj-1.0.1"
+      sources."normalize-package-data-2.3.5"
+      sources."read-pkg-up-1.0.1"
+      sources."redent-1.0.0"
+      sources."trim-newlines-1.0.0"
+      sources."camelcase-2.1.1"
+      sources."currently-unhandled-0.4.1"
+      sources."signal-exit-3.0.1"
+      sources."array-find-index-1.0.2"
+      sources."hosted-git-info-2.1.5"
+      sources."is-builtin-module-1.0.0"
+      sources."validate-npm-package-license-3.0.1"
+      sources."builtin-modules-1.1.1"
+      sources."spdx-correct-1.0.2"
+      sources."spdx-expression-parse-1.0.4"
+      sources."spdx-license-ids-1.2.2"
+      sources."find-up-1.1.2"
+      sources."read-pkg-1.1.0"
+      sources."path-exists-2.1.0"
+      sources."pinkie-promise-2.0.1"
+      sources."pinkie-2.0.4"
+      sources."load-json-file-1.1.0"
+      sources."path-type-1.1.0"
+      sources."graceful-fs-4.1.11"
+      sources."parse-json-2.2.0"
+      sources."pify-2.3.0"
+      sources."strip-bom-2.0.0"
+      sources."error-ex-1.3.0"
+      sources."is-arrayish-0.2.1"
+      sources."is-utf8-0.2.1"
+      sources."indent-string-2.1.0"
+      sources."strip-indent-1.0.1"
+      sources."repeating-2.0.1"
+      sources."is-finite-1.0.2"
+      sources."number-is-nan-1.0.1"
       sources."time-stamp-1.0.1"
       sources."glogg-1.0.0"
       sources."sparkles-1.0.0"
@@ -21271,7 +21768,6 @@ in
       sources."string_decoder-0.10.31"
       sources."inherits-2.0.3"
       sources."xtend-4.0.1"
-      sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
       sources."clone-1.0.2"
@@ -21284,7 +21780,7 @@ in
       sources."lodash.isstring-4.0.1"
       sources."lodash.mapvalues-4.6.0"
       sources."rechoir-0.6.2"
-      sources."resolve-1.2.0"
+      sources."resolve-1.1.7"
       sources."detect-file-0.1.0"
       sources."is-glob-2.0.1"
       sources."micromatch-2.3.11"
@@ -21297,7 +21793,7 @@ in
       sources."expand-brackets-0.1.5"
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
-      sources."kind-of-3.1.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"
@@ -21313,7 +21809,7 @@ in
           sources."isarray-1.0.0"
         ];
       })
-      sources."randomatic-1.1.6"
+      sources."randomatic-1.1.5"
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
@@ -21328,12 +21824,12 @@ in
       sources."expand-tilde-1.2.2"
       sources."global-modules-0.2.3"
       sources."os-homedir-1.0.2"
-      sources."global-prefix-0.1.5"
+      sources."global-prefix-0.1.4"
       sources."is-windows-0.2.0"
-      sources."homedir-polyfill-1.0.1"
       sources."ini-1.3.4"
+      sources."osenv-0.1.3"
       sources."which-1.2.12"
-      sources."parse-passwd-1.0.0"
+      sources."os-tmpdir-1.0.2"
       sources."isexe-1.1.2"
       sources."lodash.assignwith-4.2.0"
       sources."lodash.isempty-4.4.0"
@@ -21343,7 +21839,7 @@ in
       sources."map-cache-0.2.2"
       sources."path-root-0.1.1"
       sources."is-relative-0.2.1"
-      sources."is-unc-path-0.1.2"
+      sources."is-unc-path-0.1.1"
       sources."unc-path-regex-0.1.2"
       sources."path-root-regex-0.1.2"
       sources."end-of-stream-0.1.5"
@@ -21360,13 +21856,11 @@ in
         ];
       })
       sources."glob-watcher-0.0.6"
-      sources."graceful-fs-3.0.11"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."strip-bom-1.0.0"
       sources."glob-4.5.3"
       sources."minimatch-2.0.10"
       sources."ordered-read-streams-0.1.0"
@@ -21391,7 +21885,6 @@ in
       sources."sigmund-1.0.1"
       sources."natives-1.1.0"
       sources."first-chunk-stream-1.0.0"
-      sources."is-utf8-0.2.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -21537,7 +22030,7 @@ in
       sources."deep-is-0.1.3"
       sources."type-check-0.3.2"
       sources."levn-0.3.0"
-      sources."fast-levenshtein-2.0.6"
+      sources."fast-levenshtein-2.0.5"
       sources."amdefine-1.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -21552,7 +22045,7 @@ in
           sources."wordwrap-0.0.3"
         ];
       })
-      (sources."uglify-js-2.7.5" // {
+      (sources."uglify-js-2.7.4" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -21573,7 +22066,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.1.0"
+      sources."kind-of-3.0.4"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -21714,19 +22207,19 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.4.0";
+    version = "1.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz";
-      sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b";
+      url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz";
+      sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f";
     };
     dependencies = [
-      sources."bluebird-3.4.7"
+      sources."bluebird-3.4.6"
       sources."body-parser-1.15.2"
       sources."chokidar-1.6.1"
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
         dependencies = [
-          sources."lodash-4.17.4"
+          sources."lodash-4.17.2"
         ];
       })
       sources."connect-3.5.0"
@@ -21743,8 +22236,8 @@ in
       })
       sources."glob-7.1.1"
       sources."graceful-fs-4.1.11"
-      sources."http-proxy-1.16.2"
-      sources."isbinaryfile-3.0.2"
+      sources."http-proxy-1.15.2"
+      sources."isbinaryfile-3.0.1"
       sources."lodash-3.10.1"
       (sources."log4js-0.6.38" // {
         dependencies = [
@@ -21759,16 +22252,10 @@ in
       sources."qjobs-1.1.5"
       sources."range-parser-1.2.0"
       sources."rimraf-2.5.4"
-      sources."safe-buffer-5.0.1"
-      (sources."socket.io-1.7.2" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
+      sources."socket.io-1.4.7"
       sources."source-map-0.5.6"
       sources."tmp-0.0.28"
-      sources."useragent-2.1.10"
+      sources."useragent-2.1.9"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.2.0"
@@ -21786,8 +22273,8 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.14"
-      sources."mime-db-1.26.0"
+      sources."mime-types-2.1.13"
+      sources."mime-db-1.25.0"
       sources."anymatch-1.3.0"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
@@ -21795,7 +22282,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.17"
+      sources."fsevents-1.0.15"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -21805,7 +22292,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
-      sources."kind-of-3.1.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"
@@ -21817,7 +22304,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.6"
+      sources."randomatic-1.1.5"
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
@@ -21829,7 +22316,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.8.0"
+      sources."binary-extensions-1.7.0"
       sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
@@ -21837,11 +22324,11 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.5.0"
-      sources."node-pre-gyp-0.6.32"
+      sources."nan-2.4.0"
+      sources."node-pre-gyp-0.6.31"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.0.1"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -21863,21 +22350,21 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -21898,24 +22385,21 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -21925,7 +22409,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -21934,7 +22418,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -21945,7 +22429,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -21972,10 +22456,26 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."wordwrap-0.0.3"
-      (sources."engine.io-1.8.2" // {
+      sources."engine.io-1.6.10"
+      (sources."socket.io-parser-2.2.6" // {
         dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
+          sources."isarray-0.0.1"
+        ];
+      })
+      (sources."socket.io-client-1.4.6" // {
+        dependencies = [
+          sources."component-emitter-1.2.0"
+        ];
+      })
+      (sources."socket.io-adapter-0.4.0" // {
+        dependencies = [
+          (sources."socket.io-parser-2.2.2" // {
+            dependencies = [
+              sources."debug-0.7.4"
+            ];
+          })
+          sources."json3-3.2.6"
+          sources."isarray-0.0.1"
         ];
       })
       (sources."has-binary-0.1.7" // {
@@ -21983,59 +22483,46 @@ in
           sources."isarray-0.0.1"
         ];
       })
-      (sources."socket.io-adapter-0.5.0" // {
+      sources."base64id-0.1.0"
+      sources."ws-1.0.1"
+      (sources."engine.io-parser-1.2.4" // {
         dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."socket.io-client-1.7.2" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."socket.io-parser-2.3.1" // {
-        dependencies = [
-          sources."component-emitter-1.1.2"
+          sources."has-binary-0.1.6"
           sources."isarray-0.0.1"
         ];
       })
-      sources."accepts-1.3.3"
-      sources."base64id-1.0.0"
-      sources."engine.io-parser-1.3.2"
-      sources."ws-1.1.1"
-      sources."cookie-0.3.1"
-      sources."negotiator-0.6.1"
-      sources."after-0.8.2"
-      sources."arraybuffer.slice-0.0.6"
-      sources."base64-arraybuffer-0.1.5"
-      sources."blob-0.0.4"
-      sources."wtf-8-1.0.0"
-      sources."options-0.0.6"
-      sources."ultron-1.0.2"
-      sources."backo2-1.0.2"
-      sources."component-bind-1.0.0"
-      sources."component-emitter-1.2.1"
-      (sources."engine.io-client-1.8.2" // {
+      (sources."accepts-1.1.4" // {
         dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
+          sources."mime-types-2.0.14"
+          sources."mime-db-1.12.0"
         ];
       })
-      sources."indexof-0.0.1"
+      sources."options-0.0.6"
+      sources."ultron-1.0.2"
+      sources."after-0.8.1"
+      sources."arraybuffer.slice-0.0.6"
+      sources."base64-arraybuffer-0.1.2"
+      sources."blob-0.0.4"
+      sources."utf8-2.1.0"
+      sources."negotiator-0.4.9"
+      sources."json3-3.3.2"
+      sources."component-emitter-1.1.2"
+      sources."benchmark-1.0.0"
+      sources."engine.io-client-1.6.9"
+      sources."component-bind-1.0.0"
       sources."object-component-0.0.3"
-      sources."parseuri-0.0.5"
+      sources."indexof-0.0.1"
+      sources."parseuri-0.0.4"
       sources."to-array-0.1.4"
-      sources."component-inherit-0.0.3"
+      sources."backo2-1.0.2"
       sources."has-cors-1.1.0"
-      sources."parsejson-0.0.3"
-      sources."parseqs-0.0.5"
-      sources."xmlhttprequest-ssl-1.5.3"
+      sources."xmlhttprequest-ssl-1.5.1"
+      sources."parsejson-0.0.1"
+      sources."parseqs-0.0.2"
+      sources."component-inherit-0.0.3"
       sources."yeast-0.1.2"
       sources."better-assert-1.0.2"
       sources."callsite-1.0.0"
-      sources."json3-3.3.2"
       sources."os-tmpdir-1.0.2"
       sources."lru-cache-2.2.4"
     ];
@@ -22163,9 +22650,9 @@ in
       sources."unpipe-1.0.0"
       sources."accepts-1.2.13"
       sources."compressible-2.0.9"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."ms-0.7.1"
       sources."csrf-3.0.4"
       sources."base64-url-1.3.3"
@@ -22192,12 +22679,12 @@ in
       sources."passport-google-oauth1-1.0.0"
       sources."passport-google-oauth20-1.0.0"
       sources."passport-oauth1-1.1.0"
-      sources."oauth-0.9.15"
-      sources."passport-oauth2-1.4.0"
+      sources."oauth-0.9.14"
+      sources."passport-oauth2-1.3.0"
       sources."uid2-0.0.3"
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
-      sources."lodash-4.17.4"
+      sources."lodash-4.17.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22215,15 +22702,14 @@ in
       sha1 = "5de1e6426f885929b77357f014de5fee1dad0553";
     };
     dependencies = [
-      sources."through2-2.0.3"
+      sources."through2-2.0.1"
       sources."vinyl-1.2.0"
       sources."vinyl-fs-2.4.4"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.0.6"
       sources."xtend-4.0.1"
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
       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"
@@ -22242,8 +22728,8 @@ in
       sources."gulp-sourcemaps-1.6.0"
       sources."is-valid-glob-0.3.0"
       sources."lazystream-1.0.0"
-      sources."lodash.isequal-4.5.0"
-      sources."merge-stream-1.0.1"
+      sources."lodash.isequal-4.4.0"
+      sources."merge-stream-1.0.0"
       sources."mkdirp-0.5.1"
       sources."object-assign-4.1.0"
       sources."strip-bom-2.0.0"
@@ -22256,7 +22742,7 @@ in
       sources."wrappy-1.0.2"
       sources."extend-3.0.0"
       sources."glob-5.0.15"
-      sources."glob-parent-3.1.0"
+      sources."glob-parent-3.0.1"
       (sources."micromatch-2.3.11" // {
         dependencies = [
           sources."is-extglob-1.0.0"
@@ -22274,7 +22760,7 @@ in
       sources."concat-map-0.0.1"
       sources."is-glob-3.1.0"
       sources."path-dirname-1.0.2"
-      sources."is-extglob-2.1.1"
+      sources."is-extglob-2.1.0"
       sources."arr-diff-2.0.0"
       sources."array-unique-0.2.1"
       sources."braces-1.8.5"
@@ -22285,7 +22771,7 @@ in
         ];
       })
       sources."filename-regex-2.0.0"
-      sources."kind-of-3.1.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" // {
@@ -22302,7 +22788,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.6"
+      sources."randomatic-1.1.5"
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
@@ -22424,7 +22910,7 @@ in
       sources."slasp-0.0.4"
       sources."nijs-0.0.23"
       sources."chownr-1.0.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.5.2"
       sources."graceful-fs-4.1.11"
       sources."mkdirp-0.5.1"
       sources."normalize-package-data-2.3.5"
@@ -22441,8 +22927,7 @@ in
       sources."npmlog-3.1.2"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.2"
-      sources."buffer-shims-1.0.0"
+      sources."readable-stream-2.0.6"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
@@ -22470,13 +22955,13 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -22488,11 +22973,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -22502,7 +22987,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22511,7 +22996,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22522,11 +23007,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -22545,7 +23030,7 @@ in
       sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
@@ -22554,7 +23039,7 @@ in
       sources."config-chain-1.1.11"
       sources."ini-1.3.4"
       sources."nopt-3.0.6"
-      sources."osenv-0.1.4"
+      sources."osenv-0.1.3"
       sources."uid-number-0.0.5"
       sources."proto-list-1.2.4"
       sources."abbrev-1.0.9"
@@ -22584,10 +23069,10 @@ in
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
     packageName = "node-gyp";
-    version = "3.5.0";
+    version = "3.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
-      sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz";
+      sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
     };
     dependencies = [
       sources."fstream-1.0.10"
@@ -22596,8 +23081,9 @@ in
       sources."minimatch-3.0.3"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.2"
-      sources."osenv-0.1.4"
+      sources."npmlog-3.1.2"
+      sources."osenv-0.1.3"
+      sources."path-array-1.0.1"
       sources."request-2.79.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
@@ -22616,7 +23102,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.6.0"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -22627,19 +23113,26 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
+      sources."array-index-1.0.0"
+      sources."debug-2.3.3"
+      sources."es6-symbol-3.1.0"
+      sources."ms-0.7.2"
+      sources."d-0.1.1"
+      sources."es5-ext-0.10.12"
+      sources."es6-iterator-2.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       sources."caseless-0.11.0"
@@ -22653,30 +23146,27 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -22686,7 +23176,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22695,7 +23185,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22706,11 +23196,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."isexe-1.1.2"
@@ -22734,7 +23224,7 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."biased-opener-0.2.8"
-      sources."debug-2.6.0"
+      sources."debug-2.3.3"
       (sources."express-4.14.0" // {
         dependencies = [
           sources."debug-2.2.0"
@@ -22762,7 +23252,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."osenv-0.1.4"
+      sources."osenv-0.1.3"
       sources."plist-1.2.0"
       (sources."win-detect-browsers-1.0.2" // {
         dependencies = [
@@ -22779,7 +23269,7 @@ in
           sources."lodash-3.10.1"
         ];
       })
-      sources."xmldom-0.1.27"
+      sources."xmldom-0.1.22"
       sources."util-deprecate-1.0.2"
       sources."after-0.8.2"
       sources."xtend-4.0.1"
@@ -22799,7 +23289,7 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -22851,7 +23341,7 @@ in
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.3"
+      sources."proxy-addr-1.1.2"
       sources."qs-6.2.0"
       sources."range-parser-1.2.0"
       (sources."send-0.14.1" // {
@@ -22864,14 +23354,14 @@ in
       sources."type-is-1.6.14"
       sources."utils-merge-1.0.0"
       sources."vary-1.1.0"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."statuses-1.3.1"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.2.0"
+      sources."ipaddr.js-1.1.1"
       sources."destroy-1.0.4"
       sources."http-errors-1.5.1"
       sources."mime-1.3.4"
@@ -22889,8 +23379,8 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."truncate-1.0.5"
-      sources."nan-2.5.0"
-      (sources."node-pre-gyp-0.6.32" // {
+      sources."nan-2.4.0"
+      (sources."node-pre-gyp-0.6.31" // {
         dependencies = [
           sources."rimraf-2.5.4"
           sources."semver-5.3.0"
@@ -22898,7 +23388,7 @@ in
         ];
       })
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.0.1"
       (sources."request-2.79.0" // {
         dependencies = [
           sources."qs-6.3.0"
@@ -22918,7 +23408,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -22928,14 +23418,14 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       sources."caseless-0.11.0"
@@ -22953,23 +23443,20 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.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"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."is-property-1.0.2"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
@@ -22977,7 +23464,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22986,7 +23473,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22997,7 +23484,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -23014,7 +23501,7 @@ in
       sources."os-locale-1.4.0"
       sources."window-size-0.1.4"
       sources."y18n-3.2.1"
-      sources."wrap-ansi-2.1.0"
+      sources."wrap-ansi-2.0.0"
       sources."lcid-1.0.0"
       sources."invert-kv-1.0.0"
     ];
@@ -23028,15 +23515,15 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.32";
+    version = "0.6.31";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
-      sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
+      sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
     };
     dependencies = [
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.0.1"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -23056,7 +23543,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -23068,17 +23555,17 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -23095,30 +23582,27 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -23128,7 +23612,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23137,7 +23621,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23148,11 +23632,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -23190,7 +23674,7 @@ in
     };
     dependencies = [
       sources."chokidar-1.6.1"
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.3.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -23215,7 +23699,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.17"
+      sources."fsevents-1.0.15"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -23225,7 +23709,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
-      sources."kind-of-3.1.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"
@@ -23237,7 +23721,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.6"
+      sources."randomatic-1.1.5"
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
@@ -23249,7 +23733,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.8.0"
+      sources."binary-extensions-1.7.0"
       sources."graceful-fs-4.1.11"
       sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
@@ -23258,11 +23742,11 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.5.0"
-      sources."node-pre-gyp-0.6.32"
+      sources."nan-2.4.0"
+      sources."node-pre-gyp-0.6.31"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.0.1"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -23283,21 +23767,21 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -23314,30 +23798,27 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -23347,7 +23828,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23356,7 +23837,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23367,11 +23848,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -23416,8 +23897,8 @@ in
       sources."semver-diff-2.1.0"
       sources."string-length-1.0.1"
       sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.4"
-      sources."write-file-atomic-1.3.1"
+      sources."osenv-0.1.3"
+      sources."write-file-atomic-1.2.0"
       sources."xdg-basedir-2.0.0"
       sources."os-homedir-1.0.2"
       sources."imurmurhash-0.1.4"
@@ -23457,64 +23938,53 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.16.0";
+    version = "0.15.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.16.0.tgz";
-      sha1 = "5b8e180a7cf211b5450a11deed0aa91e43932661";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.15.2.tgz";
+      sha1 = "4533dd93f63828f8e749f0c132a793fbeb636ea6";
     };
     dependencies = [
-      sources."basic-auth-1.1.0"
-      sources."bcryptjs-2.4.0"
-      (sources."body-parser-1.15.2" // {
-        dependencies = [
-          sources."raw-body-2.1.7"
-        ];
-      })
+      sources."basic-auth-1.0.4"
+      sources."bcryptjs-2.3.0"
+      sources."body-parser-1.15.2"
       sources."cheerio-0.22.0"
-      sources."clone-2.1.0"
+      sources."clone-2.0.0"
       sources."cookie-parser-1.4.3"
       sources."cors-2.8.1"
-      sources."cron-1.2.1"
+      sources."cron-1.1.1"
       sources."express-4.14.0"
-      (sources."follow-redirects-1.2.1" // {
-        dependencies = [
-          sources."debug-2.6.0"
-          sources."ms-0.7.2"
-        ];
-      })
-      sources."fs-extra-1.0.0"
+      sources."follow-redirects-0.2.0"
+      sources."fs-extra-0.30.0"
       sources."fs.notify-0.0.4"
       sources."i18next-1.10.6"
       sources."is-utf8-0.2.1"
-      sources."js-yaml-3.7.0"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsonata-1.0.10"
       sources."media-typer-0.3.0"
-      sources."mqtt-2.2.1"
-      sources."mustache-2.3.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.7.0"
+      sources."oauth2orize-1.5.0"
       sources."on-headers-1.0.1"
       sources."passport-0.3.2"
       sources."passport-http-bearer-1.0.1"
       sources."passport-oauth2-client-password-0.1.2"
-      (sources."raw-body-2.2.0" // {
-        dependencies = [
-          sources."iconv-lite-0.4.15"
-        ];
-      })
+      sources."raw-body-2.1.7"
       sources."semver-5.3.0"
-      sources."sentiment-2.1.0"
-      (sources."uglify-js-2.7.5" // {
+      sources."sentiment-1.0.6"
+      (sources."uglify-js-2.7.3" // {
         dependencies = [
           sources."async-0.2.10"
         ];
       })
       sources."when-3.7.7"
-      sources."ws-1.1.1"
+      sources."ws-0.8.1"
       sources."xml2js-0.4.17"
       sources."node-red-node-feedparser-0.1.7"
-      sources."node-red-node-email-0.1.15"
+      sources."node-red-node-email-0.1.12"
       (sources."node-red-node-twitter-0.1.9" // {
         dependencies = [
           sources."request-2.79.0"
@@ -23523,7 +23993,12 @@ in
         ];
       })
       sources."node-red-node-rbe-0.1.6"
-      sources."bcrypt-1.0.2"
+      sources."node-red-node-serialport-0.4.1"
+      (sources."bcrypt-0.8.7" // {
+        dependencies = [
+          sources."nan-2.3.5"
+        ];
+      })
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.2.0"
@@ -23538,9 +24013,8 @@ in
       sources."setprototypeof-1.0.2"
       sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
-      sources."unpipe-1.0.0"
-      sources."mime-types-2.1.14"
-      sources."mime-db-1.26.0"
+      sources."mime-types-2.1.13"
+      sources."mime-db-1.25.0"
       sources."css-select-1.2.0"
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
@@ -23577,8 +24051,8 @@ in
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."vary-1.1.0"
-      sources."moment-timezone-0.5.11"
-      sources."moment-2.17.1"
+      sources."moment-timezone-0.5.9"
+      sources."moment-2.17.0"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
@@ -23591,55 +24065,86 @@ in
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.3"
+      sources."proxy-addr-1.1.2"
       sources."range-parser-1.2.0"
       sources."send-0.14.1"
       sources."serve-static-1.11.1"
       sources."utils-merge-1.0.0"
       sources."negotiator-0.6.1"
+      sources."unpipe-1.0.0"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.2.0"
+      sources."ipaddr.js-1.1.1"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
+      sources."stream-consume-0.1.0"
       sources."graceful-fs-4.1.11"
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
+      sources."path-is-absolute-1.0.1"
+      sources."rimraf-2.5.4"
+      sources."glob-7.1.1"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."minimatch-3.0.3"
+      sources."once-1.4.0"
+      sources."wrappy-1.0.2"
+      sources."brace-expansion-1.1.6"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
       sources."async-0.1.22"
       sources."retry-0.6.1"
       sources."cookies-0.6.2"
       sources."i18next-client-1.10.3"
       sources."json5-0.2.0"
       sources."keygrip-1.0.1"
-      sources."argparse-1.0.9"
-      sources."esprima-2.7.3"
-      sources."sprintf-js-1.0.3"
       sources."commist-1.0.0"
-      sources."concat-stream-1.6.0"
-      sources."end-of-stream-1.1.0"
+      (sources."concat-stream-1.5.2" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+        ];
+      })
+      (sources."end-of-stream-1.1.0" // {
+        dependencies = [
+          sources."once-1.3.3"
+        ];
+      })
       sources."help-me-1.0.1"
       sources."minimist-1.2.0"
-      sources."mqtt-packet-5.2.1"
-      sources."pump-1.0.2"
-      sources."reinterval-1.1.0"
-      sources."split2-2.1.1"
-      sources."websocket-stream-3.3.3"
-      sources."xtend-4.0.1"
-      sources."leven-1.0.2"
-      sources."typedarray-0.0.6"
-      sources."once-1.3.3"
-      sources."wrappy-1.0.2"
-      sources."callback-stream-1.1.0"
-      (sources."glob-stream-5.3.5" // {
+      (sources."mqtt-connection-2.1.1" // {
         dependencies = [
           sources."through2-0.6.5"
           sources."readable-stream-1.0.34"
           sources."isarray-0.0.1"
         ];
       })
-      sources."through2-2.0.3"
+      sources."mqtt-packet-3.4.7"
+      sources."pump-1.0.1"
+      sources."reinterval-1.1.0"
+      sources."split2-2.1.0"
+      (sources."websocket-stream-3.3.3" // {
+        dependencies = [
+          sources."ws-1.1.1"
+        ];
+      })
+      sources."xtend-4.0.1"
+      sources."leven-1.0.2"
+      sources."typedarray-0.0.6"
+      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-5.0.15"
-      sources."glob-parent-3.1.0"
+      sources."glob-parent-3.0.1"
       (sources."micromatch-2.3.11" // {
         dependencies = [
           sources."is-extglob-1.0.0"
@@ -23649,15 +24154,9 @@ 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.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.1.0"
       sources."path-dirname-1.0.2"
-      sources."is-extglob-2.1.1"
+      sources."is-extglob-2.1.0"
       sources."arr-diff-2.0.0"
       sources."array-unique-0.2.1"
       sources."braces-1.8.5"
@@ -23668,7 +24167,7 @@ in
         ];
       })
       sources."filename-regex-2.0.0"
-      sources."kind-of-3.1.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" // {
@@ -23685,7 +24184,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.6"
+      sources."randomatic-1.1.5"
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
@@ -23707,17 +24206,34 @@ in
       sources."json-stable-stringify-1.0.1"
       sources."through2-filter-2.0.0"
       sources."jsonify-0.0.0"
-      sources."bl-1.2.0"
+      (sources."reduplexer-1.1.0" // {
+        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.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
+          sources."once-1.3.3"
         ];
       })
       sources."stream-shift-1.0.0"
+      sources."options-0.0.6"
+      sources."ultron-1.0.2"
       sources."abbrev-1.0.9"
       sources."uid2-0.0.3"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
+      sources."lodash.assign-4.0.1"
+      sources."lodash.keys-4.2.0"
+      sources."lodash.rest-4.0.5"
       sources."source-map-0.5.6"
       sources."uglify-to-browserify-1.0.2"
       sources."yargs-3.10.0"
@@ -23731,11 +24247,13 @@ in
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
       sources."longest-1.0.1"
-      sources."options-0.0.6"
-      sources."ultron-1.0.2"
+      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"
-      sources."lodash-4.17.4"
+      sources."lodash-4.17.2"
       (sources."feedparser-1.1.3" // {
         dependencies = [
           sources."sax-0.6.1"
@@ -23766,6 +24284,7 @@ in
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
+      sources."json-stringify-safe-5.0.1"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
@@ -23781,11 +24300,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -23794,7 +24313,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23803,7 +24322,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23814,7 +24333,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -23822,7 +24341,7 @@ in
       sources."nodemailer-1.11.0"
       sources."poplib-0.1.7"
       sources."mailparser-0.6.1"
-      (sources."imap-0.8.19" // {
+      (sources."imap-0.8.18" // {
         dependencies = [
           sources."readable-stream-1.1.14"
           sources."isarray-0.0.1"
@@ -23862,48 +24381,48 @@ in
       sources."utf7-1.0.2"
       sources."twitter-ng-0.6.2"
       sources."oauth-0.9.14"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."asynckit-0.4.0"
-      sources."bindings-1.2.1"
-      sources."nan-2.5.0"
-      (sources."node-pre-gyp-0.6.32" // {
+      (sources."serialport-4.0.6" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
+      sources."lie-3.1.0"
+      (sources."node-pre-gyp-0.6.31" // {
         dependencies = [
           sources."request-2.79.0"
           sources."form-data-2.1.2"
           sources."qs-6.3.0"
         ];
       })
+      sources."object.assign-4.0.4"
+      sources."immediate-3.0.6"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.0.1"
       sources."rc-1.1.6"
-      (sources."rimraf-2.5.4" // {
-        dependencies = [
-          sources."glob-7.1.1"
-        ];
-      })
       sources."tar-2.2.1"
       (sources."tar-pack-3.3.0" // {
         dependencies = [
+          sources."once-1.3.3"
           sources."readable-stream-2.1.5"
         ];
       })
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
-        dependencies = [
-          sources."supports-color-0.2.0"
-        ];
-      })
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
+      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
@@ -23912,11 +24431,14 @@ in
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
-      sources."fs.realpath-1.0.0"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.10"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
+      sources."function-bind-1.1.0"
+      sources."object-keys-1.0.11"
+      sources."define-properties-1.1.2"
+      sources."foreach-2.0.5"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -23980,7 +24502,7 @@ in
       sources."methods-0.0.1"
       sources."send-0.1.0"
       sources."cookie-signature-1.0.1"
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.3.3" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -23990,7 +24512,7 @@ in
       sources."bytes-0.2.0"
       sources."pause-0.0.1"
       sources."mime-1.2.6"
-      sources."coffee-script-1.12.2"
+      sources."coffee-script-1.11.1"
       sources."vows-0.8.1"
       sources."eyes-0.1.8"
       sources."diff-1.0.8"
@@ -24019,18 +24541,17 @@ in
       sources."tinycolor-0.0.1"
       sources."options-0.0.6"
       sources."zeparser-0.0.5"
-      sources."mailcomposer-4.0.1"
+      sources."mailcomposer-3.12.0"
       sources."simplesmtp-0.3.35"
       sources."optimist-0.6.1"
-      sources."buildmail-4.0.1"
-      sources."libmime-3.0.0"
+      sources."buildmail-3.10.0"
+      sources."libmime-2.1.0"
       sources."addressparser-1.0.1"
       sources."libbase64-0.1.0"
       sources."libqp-1.1.0"
       sources."nodemailer-fetch-1.6.0"
       sources."nodemailer-shared-1.1.0"
-      sources."punycode-1.4.1"
-      sources."iconv-lite-0.4.15"
+      sources."iconv-lite-0.4.13"
       sources."rai-0.1.12"
       sources."xoauth2-0.1.8"
       sources."wordwrap-0.0.3"
@@ -24055,10 +24576,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.1.1";
+    version = "4.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz";
-      sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4";
+      url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz";
+      sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae";
     };
     dependencies = [
       sources."JSONStream-1.2.1"
@@ -24091,7 +24612,7 @@ in
           sources."glob-6.0.4"
         ];
       })
-      sources."lockfile-1.0.3"
+      sources."lockfile-1.0.2"
       sources."lodash._baseuniq-4.6.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.union-4.6.0"
@@ -24101,26 +24622,29 @@ in
       sources."mkdirp-0.5.1"
       (sources."node-gyp-3.4.0" // {
         dependencies = [
-          sources."nopt-3.0.6"
           sources."npmlog-3.1.2"
         ];
       })
-      sources."nopt-4.0.1"
+      sources."nopt-3.0.6"
       sources."normalize-git-url-3.0.2"
       sources."normalize-package-data-2.3.5"
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
       sources."npm-package-arg-4.2.0"
-      sources."npm-registry-client-7.4.5"
-      sources."npm-user-validate-0.1.5"
-      (sources."npmlog-4.0.2" // {
+      (sources."npm-registry-client-7.3.0" // {
         dependencies = [
-          sources."gauge-2.7.2"
+          sources."npmlog-3.1.2"
+        ];
+      })
+      sources."npm-user-validate-0.1.5"
+      (sources."npmlog-4.0.1" // {
+        dependencies = [
+          sources."gauge-2.7.1"
         ];
       })
       sources."once-1.4.0"
       sources."opener-1.4.2"
-      sources."osenv-0.1.4"
+      sources."osenv-0.1.3"
       sources."path-is-inside-1.0.2"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
@@ -24131,10 +24655,10 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.1.5"
       sources."realize-package-specifier-3.0.3"
-      sources."request-2.79.0"
-      sources."retry-0.10.1"
+      sources."request-2.78.0"
+      sources."retry-0.10.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
@@ -24154,12 +24678,11 @@ in
       sources."umask-1.1.0"
       sources."unique-filename-1.1.0"
       sources."unpipe-1.0.0"
-      sources."uuid-3.0.1"
       sources."validate-npm-package-name-2.2.2"
       sources."which-1.2.12"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.2.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -24186,7 +24709,11 @@ in
       sources."promzard-0.3.0"
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
-      sources."concat-stream-1.6.0"
+      (sources."concat-stream-1.5.2" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+        ];
+      })
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
@@ -24200,11 +24727,20 @@ in
       })
       sources."flush-write-stream-1.0.2"
       sources."from2-2.3.0"
-      sources."pump-1.0.2"
+      sources."pump-1.0.1"
       sources."pumpify-1.3.5"
       sources."stream-each-1.2.0"
-      sources."through2-2.0.3"
+      (sources."through2-2.0.1" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+        ];
+      })
       sources."typedarray-0.0.6"
+      sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."string_decoder-0.10.31"
+      sources."util-deprecate-1.0.2"
       sources."stream-shift-1.0.0"
       sources."xtend-4.0.1"
       sources."minimist-0.0.8"
@@ -24216,14 +24752,14 @@ in
       sources."delegates-1.0.0"
       sources."has-color-0.1.7"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-index-1.0.0"
-      sources."debug-2.6.0"
+      sources."debug-2.3.3"
       sources."es6-symbol-3.1.0"
       sources."ms-0.7.2"
       sources."d-0.1.1"
@@ -24231,19 +24767,13 @@ in
       sources."es6-iterator-2.0.0"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
-      sources."supports-color-0.2.0"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."mute-stream-0.0.7"
+      sources."mute-stream-0.0.6"
       sources."util-extend-1.0.3"
       sources."json-parse-helpfulerror-1.0.3"
       sources."jju-1.3.0"
       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."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       sources."caseless-0.11.0"
@@ -24257,7 +24787,8 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
+      sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
@@ -24265,21 +24796,18 @@ in
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -24288,7 +24816,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24297,7 +24825,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24308,11 +24836,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
@@ -24368,7 +24896,7 @@ in
       })
       sources."fs.extra-1.3.2"
       sources."findit-1.2.0"
-      sources."coffee-script-1.12.2"
+      sources."coffee-script-1.11.1"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
       sources."request-2.79.0"
@@ -24379,7 +24907,7 @@ in
       sources."rimraf-2.5.4"
       sources."retry-0.6.0"
       sources."couch-login-0.1.20"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       sources."caseless-0.11.0"
@@ -24393,13 +24921,13 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -24411,11 +24939,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -24425,7 +24953,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24434,7 +24962,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24445,11 +24973,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -24464,11 +24992,7 @@ in
       sources."concat-map-0.0.1"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
-        dependencies = [
-          sources."supports-color-0.2.0"
-        ];
-      })
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -24479,9 +25003,10 @@ in
       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"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
@@ -24526,13 +25051,13 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.9";
+    version = "2.8.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.9.tgz";
-      sha1 = "c084b087a08ecf9292352e2cd591de903f8129c3";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.6.tgz";
+      sha1 = "9e3a0865b29dfc9af8c3d53d95b43f4bc6b1f212";
     };
     dependencies = [
-      sources."bluebird-3.4.7"
+      sources."bluebird-3.4.6"
       sources."chalk-1.1.3"
       sources."cint-8.2.1"
       sources."cli-table-0.3.1"
@@ -24541,7 +25066,7 @@ in
       sources."find-up-1.1.2"
       sources."get-stdin-5.0.1"
       sources."json-parse-helpfulerror-1.0.3"
-      sources."lodash-4.17.4"
+      sources."lodash-4.17.2"
       sources."node-alias-1.0.4"
       sources."npm-3.10.10"
       (sources."npmi-2.0.1" // {
@@ -24553,13 +25078,13 @@ in
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
       sources."spawn-please-0.2.0"
-      sources."update-notifier-1.0.3"
+      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"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."colors-1.0.3"
       sources."graceful-readlink-1.0.1"
       sources."path-exists-2.1.0"
@@ -24595,7 +25120,7 @@ in
           sources."glob-6.0.4"
         ];
       })
-      sources."lockfile-1.0.3"
+      sources."lockfile-1.0.2"
       sources."lodash._baseuniq-4.6.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.union-4.6.0"
@@ -24619,15 +25144,14 @@ in
         ];
       })
       sources."npm-user-validate-0.1.5"
-      (sources."npmlog-4.0.2" // {
+      (sources."npmlog-4.0.1" // {
         dependencies = [
-          sources."gauge-2.7.2"
-          sources."supports-color-0.2.0"
+          sources."gauge-2.7.1"
         ];
       })
       sources."once-1.4.0"
       sources."opener-1.4.2"
-      sources."osenv-0.1.4"
+      sources."osenv-0.1.3"
       sources."path-is-inside-1.0.2"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
@@ -24641,7 +25165,7 @@ in
       sources."readable-stream-2.1.5"
       sources."realize-package-specifier-3.0.3"
       sources."request-2.75.0"
-      sources."retry-0.10.1"
+      sources."retry-0.10.0"
       sources."rimraf-2.5.4"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
@@ -24689,14 +25213,14 @@ in
       sources."delegates-1.0.0"
       sources."has-color-0.1.7"
       sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-index-1.0.0"
-      sources."debug-2.6.0"
+      sources."debug-2.3.3"
       sources."es6-symbol-3.1.0"
       sources."ms-0.7.2"
       sources."d-0.1.1"
@@ -24704,13 +25228,12 @@ in
       sources."es6-iterator-2.0.0"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
-      (sources."concat-stream-1.6.0" // {
+      (sources."concat-stream-1.5.2" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.0.6"
         ];
       })
       sources."typedarray-0.0.6"
-      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"
@@ -24718,8 +25241,9 @@ in
       sources."util-deprecate-1.0.2"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."mute-stream-0.0.7"
+      sources."mute-stream-0.0.6"
       sources."util-extend-1.0.3"
+      sources."buffer-shims-1.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       (sources."bl-1.1.2" // {
@@ -24738,7 +25262,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.1"
@@ -24750,7 +25274,7 @@ in
       sources."is-my-json-valid-2.15.0"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."hoek-2.16.3"
@@ -24759,7 +25283,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24768,7 +25292,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24779,11 +25303,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
@@ -24822,7 +25346,7 @@ in
       sources."node-status-codes-1.0.0"
       sources."parse-json-2.2.0"
       sources."read-all-stream-3.1.0"
-      sources."timed-out-3.1.3"
+      sources."timed-out-3.0.0"
       sources."unzip-response-1.0.2"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
@@ -24841,7 +25365,7 @@ in
     meta = {
       description = "Find newer versions of dependencies than what your package.json or bower.json allows";
       homepage = https://github.com/tjunnone/npm-check-updates;
-      license = "Apache-2.0";
+      license = "MIT";
     };
     production = true;
   };
@@ -24898,7 +25422,7 @@ in
           sources."ms-0.7.2"
         ];
       })
-      (sources."service-runner-2.1.13" // {
+      (sources."service-runner-2.1.11" // {
         dependencies = [
           sources."gelf-stream-1.1.1"
           sources."yargs-5.0.0"
@@ -24934,8 +25458,8 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.14"
-      sources."mime-db-1.26.0"
+      sources."mime-types-2.1.13"
+      sources."mime-db-1.25.0"
       sources."accepts-1.3.3"
       sources."compressible-2.0.9"
       sources."on-headers-1.0.1"
@@ -24959,13 +25483,13 @@ in
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.3"
+      sources."proxy-addr-1.1.2"
       sources."range-parser-1.2.0"
       sources."send-0.14.1"
       sources."serve-static-1.11.1"
       sources."utils-merge-1.0.0"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.2.0"
+      sources."ipaddr.js-1.1.1"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."glob-6.0.4"
@@ -24987,7 +25511,7 @@ in
       sources."concat-map-0.0.1"
       sources."optimist-0.6.1"
       sources."source-map-0.4.4"
-      (sources."uglify-js-2.7.5" // {
+      (sources."uglify-js-2.7.4" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -25010,7 +25534,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.1.0"
+      sources."kind-of-3.0.4"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -25039,7 +25563,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -25051,11 +25575,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -25065,7 +25589,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25074,7 +25598,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25085,12 +25609,12 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."punycode-1.4.1"
-      sources."bluebird-3.4.7"
+      sources."bluebird-3.4.6"
       sources."bunyan-1.8.5"
       sources."bunyan-syslog-udp-0.1.0"
       sources."hot-shots-4.3.1"
@@ -25103,8 +25627,8 @@ in
       sources."dtrace-provider-0.8.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
-      sources."moment-2.17.1"
-      sources."nan-2.5.0"
+      sources."moment-2.17.0"
+      sources."nan-2.4.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -25141,9 +25665,9 @@ in
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
       sources."dom-storage-2.0.2"
-      (sources."bl-1.2.0" // {
+      (sources."bl-1.1.2" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.0.6"
           sources."isarray-1.0.0"
         ];
       })
@@ -25162,7 +25686,7 @@ in
           sources."camelcase-3.0.0"
         ];
       })
-      sources."wrap-ansi-2.1.0"
+      sources."wrap-ansi-2.0.0"
       sources."lcid-1.0.0"
       sources."invert-kv-1.0.0"
       sources."find-up-1.1.2"
@@ -25199,23 +25723,23 @@ in
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.36.1";
+    version = "0.36.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.1.tgz";
-      sha1 = "7d2009b814b5b3a2ca573cabea1f2873a4be4a14";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.0.tgz";
+      sha1 = "fe3b087f07389ca1c2fd3d71e38a7971d5508924";
     };
     dependencies = [
       sources."airplayer-2.0.0"
       sources."clivas-0.2.0"
       (sources."inquirer-1.2.3" // {
         dependencies = [
-          sources."lodash-4.17.4"
+          sources."lodash-4.17.2"
         ];
       })
       sources."keypress-0.2.1"
       sources."mime-1.3.4"
       sources."network-address-1.1.0"
-      sources."numeral-1.5.6"
+      sources."numeral-1.5.5"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
         dependencies = [
@@ -25227,7 +25751,7 @@ in
           sources."get-stdin-5.0.1"
         ];
       })
-      sources."pump-1.0.2"
+      sources."pump-1.0.1"
       sources."range-parser-1.2.0"
       sources."rc-1.1.6"
       (sources."torrent-stream-1.0.3" // {
@@ -25251,15 +25775,14 @@ in
       sources."server-destroy-1.0.1"
       sources."bplist-creator-0.0.6"
       sources."bplist-parser-0.1.1"
-      sources."concat-stream-1.6.0"
+      sources."concat-stream-1.5.2"
       sources."plist-1.2.0"
       sources."reverse-http-1.2.0"
       sources."stream-buffers-2.2.0"
       sources."big-integer-1.6.17"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.2"
-      sources."buffer-shims-1.0.0"
+      sources."readable-stream-2.0.6"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
@@ -25267,7 +25790,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."base64-js-0.0.8"
       sources."xmlbuilder-4.0.0"
-      sources."xmldom-0.1.27"
+      sources."xmldom-0.1.22"
       sources."lodash-3.10.1"
       sources."consume-http-header-1.0.0"
       sources."once-1.4.0"
@@ -25283,12 +25806,12 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."string-width-1.0.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."array-flatten-2.1.1"
+      sources."array-flatten-2.1.0"
       sources."deep-equal-1.0.1"
       sources."dns-equal-1.0.0"
       sources."dns-txt-2.0.2"
@@ -25310,7 +25833,7 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -25345,7 +25868,7 @@ in
       sources."external-editor-1.1.1"
       sources."figures-1.7.0"
       sources."mute-stream-0.0.6"
-      sources."run-async-2.3.0"
+      sources."run-async-2.2.0"
       sources."rx-4.1.0"
       sources."through-2.3.8"
       sources."restore-cursor-1.0.1"
@@ -25361,12 +25884,12 @@ in
       sources."blob-to-buffer-1.2.6"
       sources."magnet-uri-5.1.5"
       sources."parse-torrent-file-4.0.0"
-      sources."simple-get-2.4.0"
+      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.1.0"
-      sources."rusha-0.8.5"
+      sources."simple-sha1-2.0.8"
+      sources."rusha-0.8.4"
       sources."simple-concat-1.0.0"
       sources."unzip-response-2.0.1"
       (sources."end-of-stream-1.1.0" // {
@@ -25394,7 +25917,7 @@ in
       sources."rimraf-2.5.4"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.0"
-      (sources."random-access-file-1.4.0" // {
+      (sources."random-access-file-1.3.1" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.1"
@@ -25403,8 +25926,6 @@ in
       })
       sources."randombytes-2.0.3"
       sources."run-parallel-1.1.6"
-      sources."debug-2.6.0"
-      sources."ms-0.7.2"
       sources."flatten-0.0.1"
       sources."fifo-0.1.4"
       (sources."peer-wire-protocol-0.7.0" // {
@@ -25435,6 +25956,7 @@ in
           sources."bencode-0.8.0"
         ];
       })
+      sources."debug-2.3.3"
       sources."re-emitter-1.1.3"
       sources."buffer-equals-1.0.4"
       sources."k-bucket-0.6.0"
@@ -25450,7 +25972,7 @@ in
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      sources."simple-peer-6.1.3"
+      sources."simple-peer-6.0.7"
       sources."simple-websocket-4.1.0"
       sources."string2compact-1.2.2"
       sources."ws-1.1.1"
@@ -25459,6 +25981,7 @@ in
       sources."addr-to-ip-port-1.4.2"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
+      sources."ms-0.7.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -25471,10 +25994,10 @@ in
   peerflix-server = nodeEnv.buildNodePackage {
     name = "peerflix-server";
     packageName = "peerflix-server";
-    version = "0.1.2";
+    version = "0.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz";
-      sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz";
+      sha1 = "683d54067d44699b2eff8bfc793e780df2912666";
     };
     dependencies = [
       sources."connect-multiparty-1.2.5"
@@ -25486,10 +26009,10 @@ in
       })
       sources."lodash-2.4.2"
       sources."mkdirp-0.5.1"
-      sources."pump-1.0.2"
+      sources."pump-1.0.1"
       sources."range-parser-1.2.0"
       sources."read-torrent-1.3.0"
-      (sources."socket.io-1.7.2" // {
+      (sources."socket.io-1.6.0" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -25608,8 +26131,8 @@ in
       sources."parse-torrent-file-2.1.4"
       sources."flatten-0.0.1"
       sources."bencode-0.7.0"
-      sources."simple-sha1-2.1.0"
-      sources."rusha-0.8.5"
+      sources."simple-sha1-2.0.8"
+      sources."rusha-0.8.4"
       sources."form-data-0.0.10"
       sources."hawk-0.10.2"
       sources."node-uuid-1.4.7"
@@ -25626,7 +26149,7 @@ in
       sources."boom-0.3.8"
       sources."cryptiles-0.1.3"
       sources."sntp-0.1.4"
-      (sources."engine.io-1.8.2" // {
+      (sources."engine.io-1.8.0" // {
         dependencies = [
           sources."debug-2.3.3"
           sources."cookie-0.3.1"
@@ -25639,7 +26162,7 @@ in
           sources."debug-2.3.3"
         ];
       })
-      (sources."socket.io-client-1.7.2" // {
+      (sources."socket.io-client-1.6.0" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -25654,15 +26177,19 @@ in
       sources."ms-0.7.2"
       (sources."accepts-1.3.3" // {
         dependencies = [
-          sources."mime-types-2.1.14"
+          sources."mime-types-2.1.13"
           sources."negotiator-0.6.1"
-          sources."mime-db-1.26.0"
+          sources."mime-db-1.25.0"
+        ];
+      })
+      sources."base64id-0.1.0"
+      (sources."engine.io-parser-1.3.1" // {
+        dependencies = [
+          sources."has-binary-0.1.6"
         ];
       })
-      sources."base64id-1.0.0"
-      sources."engine.io-parser-1.3.2"
       sources."ws-1.1.1"
-      sources."after-0.8.2"
+      sources."after-0.8.1"
       sources."arraybuffer.slice-0.0.6"
       sources."base64-arraybuffer-0.1.5"
       sources."blob-0.0.4"
@@ -25672,7 +26199,7 @@ in
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
-      (sources."engine.io-client-1.8.2" // {
+      (sources."engine.io-client-1.8.0" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -25693,13 +26220,13 @@ in
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-3.2.6" // {
         dependencies = [
-          sources."debug-2.6.0"
+          sources."debug-2.3.3"
         ];
       })
       (sources."bittorrent-tracker-2.12.1" // {
         dependencies = [
           sources."bencode-0.6.0"
-          sources."debug-2.6.0"
+          sources."debug-2.3.3"
         ];
       })
       sources."bncode-0.5.3"
@@ -25815,7 +26342,7 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."node-uuid-1.4.7"
       sources."qs-5.2.1"
       sources."tunnel-agent-0.4.3"
@@ -25830,11 +26357,11 @@ in
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
       sources."async-2.1.4"
-      sources."lodash-4.17.4"
-      sources."mime-db-1.26.0"
+      sources."lodash-4.17.2"
+      sources."mime-db-1.25.0"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25843,7 +26370,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25854,7 +26381,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -25871,11 +26398,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."throttleit-1.0.0"
@@ -25912,7 +26439,7 @@ in
       sources."mkdirp-0.5.1"
       sources."private-0.1.6"
       sources."q-1.4.1"
-      sources."recast-0.11.18"
+      sources."recast-0.11.17"
       sources."graceful-readlink-1.0.1"
       sources."acorn-3.3.0"
       sources."defined-1.0.0"
@@ -25927,7 +26454,7 @@ in
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
       sources."ast-types-0.9.2"
-      sources."esprima-3.1.3"
+      sources."esprima-3.1.1"
       sources."source-map-0.5.6"
       sources."base62-0.1.1"
       sources."esprima-fb-13001.1001.0-dev-harmony-fb"
@@ -25991,7 +26518,7 @@ in
       sources."methods-0.1.0"
       sources."send-0.1.4"
       sources."cookie-signature-1.0.1"
-      sources."debug-2.6.0"
+      sources."debug-2.3.3"
       sources."qs-0.6.5"
       sources."bytes-0.2.1"
       sources."pause-0.0.1"
@@ -26037,12 +26564,12 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -26053,11 +26580,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -26067,7 +26594,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26076,7 +26603,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26087,11 +26614,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."punycode-1.4.1"
       sources."events.node-0.4.9"
     ];
@@ -26166,7 +26693,7 @@ in
       sources."lunr-0.7.2"
       sources."render-readme-1.3.1"
       sources."jju-1.3.0"
-      sources."JSONStream-1.3.0"
+      sources."JSONStream-1.2.1"
       sources."mkdirp-0.5.1"
       sources."sinopia-htpasswd-0.4.5"
       (sources."http-errors-1.5.1" // {
@@ -26226,9 +26753,9 @@ in
       sources."type-is-1.6.14"
       sources."vary-1.0.1"
       sources."utils-merge-1.0.0"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."ms-0.7.1"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
@@ -26267,7 +26794,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -26278,10 +26805,10 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -26291,7 +26818,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26300,7 +26827,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26311,7 +26838,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -26321,8 +26848,8 @@ in
       sources."dtrace-provider-0.8.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
-      sources."moment-2.17.1"
-      sources."nan-2.5.0"
+      sources."moment-2.17.0"
+      sources."nan-2.4.0"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
       (sources."glob-6.0.4" // {
@@ -26346,7 +26873,7 @@ in
       sources."source-map-0.1.43"
       sources."amdefine-1.0.1"
       sources."markdown-it-4.4.0"
-      sources."sanitize-html-1.14.1"
+      sources."sanitize-html-1.13.0"
       sources."entities-1.1.1"
       sources."linkify-it-1.2.4"
       sources."mdurl-1.0.1"
@@ -26504,7 +27031,7 @@ in
       sources."dtrace-provider-0.6.0"
       sources."precond-0.2.3"
       sources."csv-generate-0.0.6"
-      sources."csv-parse-1.1.9"
+      sources."csv-parse-1.1.7"
       sources."stream-transform-0.1.1"
       sources."csv-stringify-0.0.8"
       sources."asn1-0.1.11"
@@ -26512,7 +27039,7 @@ in
       sources."wrappy-1.0.2"
       sources."extsprintf-1.2.0"
       sources."core-util-is-1.0.2"
-      sources."nan-2.5.0"
+      sources."nan-2.4.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
       sources."mkdirp-0.5.1"
@@ -26532,7 +27059,7 @@ in
         dependencies = [
           sources."asn1-0.2.3"
           sources."assert-plus-0.2.0"
-          (sources."dashdash-1.14.1" // {
+          (sources."dashdash-1.14.0" // {
             dependencies = [
               sources."assert-plus-1.0.0"
             ];
@@ -26553,7 +27080,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
     ];
@@ -26575,7 +27102,7 @@ in
     dependencies = [
       sources."css-parse-1.7.0"
       sources."mkdirp-0.5.1"
-      sources."debug-2.6.0"
+      sources."debug-2.3.3"
       sources."sax-0.5.8"
       sources."glob-7.0.6"
       sources."source-map-0.1.43"
@@ -26622,7 +27149,7 @@ in
       sources."esprima-2.7.3"
       sources."sprintf-js-1.0.3"
       sources."minimist-0.0.8"
-      sources."clap-1.1.2"
+      sources."clap-1.1.1"
       sources."source-map-0.5.6"
       sources."chalk-1.1.3"
       sources."ansi-styles-2.2.1"
@@ -26630,7 +27157,7 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -26684,7 +27211,7 @@ in
         ];
       })
       sources."wrench-1.5.9"
-      sources."lodash-4.17.4"
+      sources."lodash-4.17.2"
       sources."keypress-0.2.1"
       sources."source-map-support-0.3.2"
       sources."source-map-0.1.32"
@@ -26716,7 +27243,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.0.2"
       sources."stringstream-0.0.5"
@@ -26739,11 +27266,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -26753,7 +27280,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26762,7 +27289,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26773,11 +27300,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."uglify-to-browserify-1.0.2"
       sources."yargs-3.10.0"
       sources."camelcase-1.2.1"
@@ -26792,7 +27319,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.1.0"
+      sources."kind-of-3.0.4"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -26816,10 +27343,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.1.5";
+    version = "2.0.10";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz";
-      sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz";
+      sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -26832,10 +27359,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.7.5";
+    version = "2.7.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
-      sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
+      sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
     };
     dependencies = [
       sources."async-0.2.10"
@@ -26851,7 +27378,7 @@ in
       sources."wordwrap-0.0.2"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.1.0"
+      sources."kind-of-3.0.4"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -26867,46 +27394,53 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.0.1";
+    version = "0.10.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz";
-      sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418";
+      url = "https://registry.npmjs.org/ungit/-/ungit-0.10.3.tgz";
+      sha1 = "7d4635b9a359c8db06c313374544f27a3890f63c";
     };
     dependencies = [
-      sources."async-2.1.4"
-      sources."bluebird-3.4.7"
-      sources."blueimp-md5-2.6.0"
+      sources."async-2.0.1"
+      sources."bluebird-3.3.5"
+      sources."blueimp-md5-2.3.1"
       sources."body-parser-1.15.2"
-      sources."color-1.0.3"
+      sources."color-0.11.4"
       sources."cookie-parser-1.4.3"
       sources."crossroads-0.12.2"
-      sources."diff2html-2.0.11"
-      sources."express-4.14.0"
-      sources."express-session-1.14.2"
+      sources."diff2html-1.2.0"
+      (sources."express-4.13.4" // {
+        dependencies = [
+          sources."cookie-0.1.5"
+          sources."qs-4.0.0"
+        ];
+      })
+      (sources."express-session-1.13.0" // {
+        dependencies = [
+          sources."cookie-0.2.3"
+        ];
+      })
       sources."forever-monitor-1.1.0"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
-      sources."ignore-3.2.0"
       sources."keen.io-0.1.3"
       sources."knockout-3.4.1"
-      sources."lodash-4.17.4"
+      sources."lodash-4.12.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.17.1"
-      (sources."npm-4.1.2" // {
+      sources."moment-2.13.0"
+      (sources."npm-3.9.6" // {
         dependencies = [
-          sources."nopt-4.0.1"
-          sources."request-2.79.0"
+          sources."request-2.72.0"
           sources."combined-stream-1.0.5"
           sources."forever-agent-0.6.1"
-          sources."form-data-2.1.2"
+          sources."form-data-1.0.1"
           sources."hawk-3.1.3"
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.0"
+          sources."qs-6.1.0"
           sources."tunnel-agent-0.4.3"
           sources."delayed-stream-1.0.0"
           sources."hoek-2.16.3"
@@ -26915,9 +27449,10 @@ in
           sources."sntp-1.0.9"
         ];
       })
-      (sources."npm-registry-client-7.4.5" // {
+      (sources."npm-registry-client-7.1.2" // {
         dependencies = [
           sources."request-2.79.0"
+          sources."retry-0.8.0"
           sources."combined-stream-1.0.5"
           sources."forever-agent-0.6.1"
           sources."form-data-2.1.2"
@@ -26925,6 +27460,7 @@ in
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
           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"
@@ -26938,10 +27474,10 @@ in
       sources."os-homedir-1.0.2"
       sources."passport-0.3.2"
       sources."passport-local-1.0.0"
-      (sources."raven-1.1.1" // {
+      (sources."raven-0.11.0" // {
         dependencies = [
-          sources."json-stringify-safe-5.0.1"
-          sources."uuid-3.0.0"
+          sources."cookie-0.1.0"
+          sources."stack-trace-0.0.7"
         ];
       })
       (sources."rc-1.1.6" // {
@@ -26950,21 +27486,21 @@ in
         ];
       })
       sources."rimraf-2.5.4"
-      sources."semver-5.3.0"
-      sources."serve-static-1.11.1"
-      sources."signals-1.0.0"
-      sources."snapsvg-0.4.0"
-      (sources."socket.io-1.7.2" // {
+      sources."semver-5.1.1"
+      (sources."serve-static-1.10.3" // {
         dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
+          sources."send-0.13.2"
+          sources."http-errors-1.3.1"
+          sources."statuses-1.2.1"
         ];
       })
+      sources."signals-1.0.0"
+      sources."snapsvg-0.4.0"
+      sources."socket.io-1.4.8"
       (sources."superagent-0.21.0" // {
         dependencies = [
           sources."qs-1.2.0"
           sources."mime-1.2.11"
-          sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."extend-1.2.1"
           sources."form-data-0.1.3"
@@ -26978,13 +27514,14 @@ in
           sources."rimraf-2.2.8"
         ];
       })
-      (sources."winston-2.3.0" // {
+      (sources."winston-2.2.0" // {
         dependencies = [
           sources."async-1.0.0"
           sources."colors-1.0.3"
+          sources."pkginfo-0.3.1"
         ];
       })
-      sources."yargs-6.6.0"
+      sources."yargs-4.7.1"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.2.0"
@@ -27002,51 +27539,45 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.14"
-      sources."mime-db-1.26.0"
+      sources."mime-types-2.1.13"
+      sources."mime-db-1.25.0"
+      sources."clone-1.0.2"
       sources."color-convert-1.8.2"
-      sources."color-string-1.4.0"
+      sources."color-string-0.3.0"
       sources."color-name-1.1.1"
-      sources."simple-swizzle-0.2.2"
-      sources."is-arrayish-0.3.1"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."diff-3.2.0"
-      (sources."hogan.js-3.0.2" // {
-        dependencies = [
-          sources."mkdirp-0.3.0"
-        ];
-      })
-      sources."whatwg-fetch-1.1.1"
-      sources."nopt-1.0.10"
-      sources."abbrev-1.0.9"
-      sources."accepts-1.3.3"
+      sources."diff-2.2.3"
+      sources."accepts-1.2.13"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
-      sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.7.0"
-      sources."finalhandler-0.5.0"
+      sources."finalhandler-0.4.1"
       sources."fresh-0.3.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.3"
-      sources."range-parser-1.2.0"
-      sources."send-0.14.1"
+      sources."proxy-addr-1.0.10"
+      sources."range-parser-1.0.3"
+      (sources."send-0.13.1" // {
+        dependencies = [
+          sources."http-errors-1.3.1"
+          sources."statuses-1.2.1"
+        ];
+      })
       sources."utils-merge-1.0.0"
-      sources."vary-1.1.0"
-      sources."negotiator-0.6.1"
+      sources."vary-1.0.1"
+      sources."negotiator-0.5.3"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.2.0"
+      sources."ipaddr.js-1.0.5"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
-      sources."crc-3.4.1"
+      sources."crc-3.4.0"
       sources."on-headers-1.0.1"
-      sources."uid-safe-2.1.3"
-      sources."base64-url-1.3.3"
-      sources."random-bytes-1.0.0"
+      sources."uid-safe-2.0.0"
+      sources."base64-url-1.2.1"
       (sources."broadway-0.2.10" // {
         dependencies = [
           sources."winston-0.7.2"
@@ -27125,12 +27656,11 @@ in
       sources."editions-1.3.3"
       sources."typechecker-4.4.0"
       sources."underscore-1.5.2"
-      sources."JSONStream-1.3.0"
+      sources."abbrev-1.0.9"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."aproba-1.0.4"
       sources."archy-1.0.0"
-      sources."asap-2.0.5"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
@@ -27140,8 +27670,8 @@ in
       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.1.1" // {
+      sources."fstream-npm-1.1.1"
+      (sources."glob-7.0.6" // {
         dependencies = [
           sources."minimatch-3.0.3"
         ];
@@ -27157,29 +27687,34 @@ in
           sources."minimatch-3.0.3"
         ];
       })
-      sources."lockfile-1.0.3"
+      sources."lockfile-1.0.2"
       sources."lodash._baseuniq-4.6.0"
-      sources."lodash.clonedeep-4.5.0"
-      sources."lodash.union-4.6.0"
-      sources."lodash.uniq-4.5.0"
-      sources."lodash.without-4.4.0"
-      sources."mississippi-1.2.0"
-      (sources."node-gyp-3.5.0" // {
+      sources."lodash.clonedeep-4.3.2"
+      sources."lodash.union-4.4.0"
+      sources."lodash.uniq-4.3.0"
+      sources."lodash.without-4.2.0"
+      (sources."node-gyp-3.3.1" // {
         dependencies = [
-          sources."minimatch-3.0.3"
-          sources."nopt-3.0.6"
+          (sources."glob-4.5.3" // {
+            dependencies = [
+              sources."minimatch-2.0.10"
+            ];
+          })
+          sources."minimatch-1.0.0"
+          sources."lru-cache-2.7.3"
         ];
       })
+      sources."nopt-3.0.6"
       sources."normalize-git-url-3.0.2"
       sources."normalize-package-data-2.3.5"
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
-      sources."npm-package-arg-4.2.0"
+      sources."npm-package-arg-4.1.1"
       sources."npm-user-validate-0.1.5"
-      sources."npmlog-4.0.2"
-      sources."once-1.4.0"
+      sources."npmlog-2.0.4"
+      sources."once-1.3.3"
       sources."opener-1.4.2"
-      sources."osenv-0.1.4"
+      sources."osenv-0.1.3"
       sources."path-is-inside-1.0.2"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
@@ -27191,31 +27726,23 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.1.5"
       sources."realize-package-specifier-3.0.3"
-      sources."retry-0.10.1"
+      sources."retry-0.9.0"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
       sources."sorted-object-2.0.1"
-      (sources."sorted-union-stream-2.1.3" // {
-        dependencies = [
-          sources."from2-1.3.0"
-          sources."readable-stream-1.1.14"
-          sources."isarray-0.0.1"
-        ];
-      })
       sources."strip-ansi-3.0.1"
       sources."tar-2.2.1"
       sources."text-table-0.2.0"
       sources."uid-number-0.0.6"
       sources."umask-1.1.0"
       sources."unique-filename-1.1.0"
-      sources."uuid-3.0.1"
       sources."validate-npm-package-name-2.2.2"
       sources."which-1.2.12"
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-1.3.1"
-      sources."ansi-regex-2.1.1"
+      sources."write-file-atomic-1.1.4"
+      sources."ansi-regex-2.0.0"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -27226,12 +27753,10 @@ in
       sources."lodash.restparam-3.6.1"
       sources."readdir-scoped-modules-1.0.2"
       sources."validate-npm-package-license-3.0.1"
-      sources."jsonparse-1.2.0"
-      sources."through-2.3.8"
       sources."wcwidth-1.0.1"
       sources."defaults-1.0.3"
-      sources."clone-1.0.2"
       sources."proto-list-1.2.4"
+      sources."asap-2.0.5"
       (sources."fstream-ignore-1.0.5" // {
         dependencies = [
           sources."minimatch-3.0.3"
@@ -27245,44 +27770,28 @@ in
       sources."promzard-0.3.0"
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
-      sources."concat-stream-1.6.0"
-      (sources."duplexify-3.5.0" // {
-        dependencies = [
-          sources."end-of-stream-1.0.0"
-          sources."once-1.3.3"
-        ];
-      })
-      (sources."end-of-stream-1.1.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
-      sources."flush-write-stream-1.0.2"
-      sources."from2-2.3.0"
-      sources."pump-1.0.2"
-      sources."pumpify-1.3.5"
-      sources."stream-each-1.2.0"
-      sources."through2-2.0.3"
-      sources."typedarray-0.0.6"
-      sources."stream-shift-1.0.0"
-      sources."xtend-4.0.1"
+      sources."lodash._baseclone-4.5.7"
+      sources."lodash._baseflatten-4.2.1"
+      sources."lodash.rest-4.0.5"
+      sources."lodash._basedifference-4.5.0"
+      sources."path-array-1.0.1"
+      sources."sigmund-1.0.1"
+      sources."array-index-1.0.0"
+      sources."es6-symbol-3.1.0"
+      sources."d-0.1.1"
+      sources."es5-ext-0.10.12"
+      sources."es6-iterator-2.0.0"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
+      sources."ansi-0.3.1"
       sources."are-we-there-yet-1.1.2"
-      sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
-      sources."set-blocking-2.0.0"
+      sources."gauge-1.2.7"
       sources."delegates-1.0.0"
-      sources."supports-color-0.2.0"
-      sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.2"
-      sources."string-width-1.0.2"
-      sources."wide-align-1.1.0"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
+      sources."lodash.pad-4.5.1"
+      sources."lodash.padend-4.6.1"
+      sources."lodash.padstart-4.6.1"
       sources."os-tmpdir-1.0.2"
-      sources."mute-stream-0.0.7"
+      sources."mute-stream-0.0.6"
       sources."util-extend-1.0.3"
       sources."json-parse-helpfulerror-1.0.3"
       sources."jju-1.3.0"
@@ -27294,6 +27803,11 @@ in
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
+      (sources."bl-1.1.2" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+        ];
+      })
       sources."caseless-0.11.0"
       sources."extend-3.0.0"
       sources."har-validator-2.0.6"
@@ -27301,28 +27815,25 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
-      sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."tough-cookie-2.2.2"
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
+      sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27331,7 +27842,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27342,12 +27853,10 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      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."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
       sources."builtins-0.0.7"
@@ -27355,16 +27864,48 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
+      (sources."concat-stream-1.5.2" // {
+        dependencies = [
+          sources."readable-stream-2.0.6"
+        ];
+      })
+      sources."typedarray-0.0.6"
+      sources."uuid-3.0.0"
+      sources."asynckit-0.4.0"
+      sources."punycode-1.4.1"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
       sources."lsmod-1.0.0"
       sources."deep-extend-0.4.1"
       sources."strip-json-comments-1.0.4"
       sources."eve-0.4.2"
-      (sources."engine.io-1.8.2" // {
+      (sources."engine.io-1.6.11" // {
         dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
+          sources."accepts-1.1.4"
+          sources."mime-types-2.0.14"
+          sources."negotiator-0.4.9"
+          sources."mime-db-1.12.0"
+        ];
+      })
+      (sources."socket.io-parser-2.2.6" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+        ];
+      })
+      (sources."socket.io-client-1.4.8" // {
+        dependencies = [
+          sources."component-emitter-1.2.0"
+        ];
+      })
+      (sources."socket.io-adapter-0.4.0" // {
+        dependencies = [
+          (sources."socket.io-parser-2.2.2" // {
+            dependencies = [
+              sources."debug-0.7.4"
+            ];
+          })
+          sources."json3-3.2.6"
+          sources."isarray-0.0.1"
         ];
       })
       (sources."has-binary-0.1.7" // {
@@ -27372,87 +27913,78 @@ in
           sources."isarray-0.0.1"
         ];
       })
-      (sources."socket.io-adapter-0.5.0" // {
+      sources."base64id-0.1.0"
+      sources."ws-1.1.0"
+      (sources."engine.io-parser-1.2.4" // {
         dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."socket.io-client-1.7.2" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."socket.io-parser-2.3.1" // {
-        dependencies = [
-          sources."component-emitter-1.1.2"
+          sources."has-binary-0.1.6"
           sources."isarray-0.0.1"
         ];
       })
-      sources."base64id-1.0.0"
-      sources."engine.io-parser-1.3.2"
-      sources."ws-1.1.1"
-      sources."after-0.8.2"
-      sources."arraybuffer.slice-0.0.6"
-      sources."base64-arraybuffer-0.1.5"
-      sources."blob-0.0.4"
-      sources."wtf-8-1.0.0"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
-      sources."backo2-1.0.2"
-      sources."component-bind-1.0.0"
-      sources."component-emitter-1.2.1"
-      (sources."engine.io-client-1.8.2" // {
+      sources."after-0.8.1"
+      sources."arraybuffer.slice-0.0.6"
+      sources."base64-arraybuffer-0.1.2"
+      sources."blob-0.0.4"
+      sources."utf8-2.1.0"
+      sources."json3-3.3.2"
+      sources."component-emitter-1.1.2"
+      sources."benchmark-1.0.0"
+      (sources."engine.io-client-1.6.11" // {
         dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
+          sources."ws-1.0.1"
         ];
       })
-      sources."indexof-0.0.1"
+      sources."component-bind-1.0.0"
       sources."object-component-0.0.3"
-      sources."parseuri-0.0.5"
+      sources."indexof-0.0.1"
+      sources."parseuri-0.0.4"
       sources."to-array-0.1.4"
-      sources."component-inherit-0.0.3"
+      sources."backo2-1.0.2"
       sources."has-cors-1.1.0"
-      sources."parsejson-0.0.3"
-      sources."parseqs-0.0.5"
-      sources."xmlhttprequest-ssl-1.5.3"
+      sources."xmlhttprequest-ssl-1.5.1"
+      sources."parsejson-0.0.1"
+      sources."parseqs-0.0.2"
+      sources."component-inherit-0.0.3"
       sources."yeast-0.1.2"
       sources."better-assert-1.0.2"
       sources."callsite-1.0.0"
-      sources."json3-3.3.2"
       sources."formidable-1.0.14"
       sources."cookiejar-2.0.1"
       sources."reduce-component-1.0.1"
       sources."camelcase-3.0.0"
       sources."cliui-3.2.0"
       sources."decamelize-1.2.0"
-      sources."get-caller-file-1.0.2"
+      sources."lodash.assign-4.2.0"
       sources."os-locale-1.4.0"
+      sources."pkg-conf-1.1.3"
       sources."read-pkg-up-1.0.1"
-      sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."which-module-1.0.0"
+      sources."set-blocking-1.0.0"
+      sources."string-width-1.0.2"
+      sources."window-size-0.2.0"
       sources."y18n-3.2.1"
-      sources."yargs-parser-4.2.1"
-      sources."wrap-ansi-2.1.0"
+      sources."yargs-parser-2.4.1"
+      sources."wrap-ansi-2.0.0"
       sources."lcid-1.0.0"
       sources."invert-kv-1.0.0"
       sources."find-up-1.1.2"
-      sources."read-pkg-1.1.0"
-      sources."path-exists-2.1.0"
       sources."load-json-file-1.1.0"
-      sources."path-type-1.1.0"
+      sources."object-assign-4.1.0"
+      sources."symbol-0.2.3"
+      sources."path-exists-2.1.0"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
-      (sources."error-ex-1.3.0" // {
-        dependencies = [
-          sources."is-arrayish-0.2.1"
-        ];
-      })
+      sources."error-ex-1.3.0"
+      sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
+      sources."read-pkg-1.1.0"
+      sources."path-type-1.1.0"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."number-is-nan-1.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -27541,7 +28073,7 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."node-uuid-1.4.7"
       sources."qs-5.2.1"
       sources."tunnel-agent-0.4.3"
@@ -27556,11 +28088,11 @@ in
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
       sources."async-2.1.4"
-      sources."lodash-4.17.4"
-      sources."mime-db-1.26.0"
+      sources."lodash-4.17.2"
+      sources."mime-db-1.25.0"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27569,7 +28101,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27580,7 +28112,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -27597,11 +28129,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."throttleit-1.0.0"
@@ -27620,13 +28152,12 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "1.14.0";
+    version = "1.13.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz";
-      sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823";
+      url = "https://registry.npmjs.org/webpack/-/webpack-1.13.3.tgz";
+      sha1 = "e79c46fe5a37c5ca70084ba0894c595cdcb42815";
     };
     dependencies = [
-      sources."acorn-3.3.0"
       sources."async-1.5.2"
       sources."clone-1.0.2"
       (sources."enhanced-resolve-0.9.1" // {
@@ -27634,15 +28165,21 @@ in
           sources."memory-fs-0.2.0"
         ];
       })
+      sources."acorn-3.3.0"
       sources."interpret-0.6.6"
       sources."loader-utils-0.2.16"
       sources."memory-fs-0.3.0"
       sources."mkdirp-0.5.1"
-      sources."node-libs-browser-0.7.0"
+      (sources."node-libs-browser-0.6.0" // {
+        dependencies = [
+          sources."readable-stream-1.1.14"
+          sources."isarray-0.0.1"
+        ];
+      })
       sources."optimist-0.6.1"
       sources."supports-color-3.1.2"
       sources."tapable-0.1.10"
-      (sources."uglify-js-2.7.5" // {
+      (sources."uglify-js-2.7.4" // {
         dependencies = [
           sources."async-0.2.10"
         ];
@@ -27652,7 +28189,7 @@ in
           sources."async-0.9.2"
         ];
       })
-      (sources."webpack-core-0.6.9" // {
+      (sources."webpack-core-0.6.8" // {
         dependencies = [
           sources."source-map-0.4.4"
         ];
@@ -27660,7 +28197,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."big.js-3.1.3"
       sources."emojis-list-2.1.0"
-      sources."json5-0.5.1"
+      sources."json5-0.5.0"
       sources."object-assign-4.1.0"
       sources."errno-0.1.4"
       sources."readable-stream-2.2.2"
@@ -27677,21 +28214,26 @@ in
       sources."browserify-zlib-0.1.4"
       sources."buffer-4.9.1"
       sources."console-browserify-1.1.0"
-      sources."constants-browserify-1.0.0"
-      sources."crypto-browserify-3.3.0"
+      sources."constants-browserify-0.0.1"
+      sources."crypto-browserify-3.2.8"
       sources."domain-browser-1.1.7"
       sources."events-1.1.1"
-      sources."https-browserify-0.0.1"
-      sources."os-browserify-0.2.1"
+      sources."http-browserify-1.7.0"
+      sources."https-browserify-0.0.0"
+      sources."os-browserify-0.1.2"
       sources."path-browserify-0.0.0"
       sources."process-0.11.9"
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
-      sources."stream-browserify-2.0.1"
-      sources."stream-http-2.6.1"
-      sources."timers-browserify-2.0.2"
+      (sources."stream-browserify-1.0.0" // {
+        dependencies = [
+          sources."readable-stream-1.1.14"
+          sources."isarray-0.0.1"
+        ];
+      })
+      sources."timers-browserify-1.4.2"
       sources."tty-browserify-0.0.0"
-      (sources."url-0.11.0" // {
+      (sources."url-0.10.3" // {
         dependencies = [
           sources."punycode-1.3.2"
         ];
@@ -27709,11 +28251,7 @@ in
       sources."pbkdf2-compat-2.0.1"
       sources."ripemd160-0.2.0"
       sources."sha.js-2.2.6"
-      sources."browserify-aes-0.4.0"
-      sources."builtin-status-codes-3.0.0"
-      sources."to-arraybuffer-1.0.1"
-      sources."xtend-4.0.1"
-      sources."setimmediate-1.0.5"
+      sources."Base64-0.2.1"
       sources."querystring-0.2.0"
       sources."indexof-0.0.1"
       sources."wordwrap-0.0.3"
@@ -27733,7 +28271,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.1.0"
+      sources."kind-of-3.0.4"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -27745,7 +28283,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.17"
+      sources."fsevents-1.0.15"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -27766,7 +28304,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.6"
+      sources."randomatic-1.1.5"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.4"
       sources."is-extendable-0.1.1"
@@ -27775,16 +28313,16 @@ in
       sources."is-dotfile-1.0.2"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."binary-extensions-1.8.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.5.0"
-      sources."node-pre-gyp-0.6.32"
+      sources."nan-2.4.0"
+      sources."node-pre-gyp-0.6.31"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.0.1"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -27803,23 +28341,20 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
-        dependencies = [
-          sources."supports-color-0.2.0"
-        ];
-      })
+      sources."gauge-2.7.1"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
+      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-2.0.0"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -27836,13 +28371,13 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.14"
+      sources."mime-types-2.1.13"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.1"
+      sources."uuid-3.0.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       (sources."chalk-1.1.3" // {
@@ -27859,7 +28394,8 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.1"
+      sources."jsonpointer-4.0.0"
+      sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -27868,7 +28404,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.2" // {
+      (sources."sshpk-1.10.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27877,7 +28413,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.1" // {
+      (sources."dashdash-1.14.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27888,11 +28424,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-0.14.3"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.26.0"
+      sources."mime-db-1.25.0"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -27904,7 +28440,7 @@ in
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
       sources."ms-0.7.1"
-      sources."source-list-map-0.1.8"
+      sources."source-list-map-0.1.6"
       sources."amdefine-1.0.1"
     ];
     buildInputs = globalBuildInputs;
@@ -27931,4 +28467,219 @@ in
     };
     production = true;
   };
+  yarn = nodeEnv.buildNodePackage {
+    name = "yarn";
+    packageName = "yarn";
+    version = "0.17.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.17.8.tgz";
+      sha1 = "6a95d19aaeb891810618937db98a2080683cbbb4";
+    };
+    dependencies = [
+      sources."babel-runtime-6.18.0"
+      sources."bytes-2.4.0"
+      sources."camelcase-3.0.0"
+      sources."chalk-1.1.3"
+      sources."cmd-shim-2.0.2"
+      sources."commander-2.9.0"
+      sources."death-1.0.0"
+      sources."debug-2.3.3"
+      sources."defaults-1.0.3"
+      sources."detect-indent-4.0.0"
+      sources."diff-2.2.3"
+      sources."ini-1.3.4"
+      sources."inquirer-1.2.3"
+      sources."invariant-2.2.2"
+      sources."is-builtin-module-1.0.0"
+      sources."is-ci-1.0.10"
+      sources."leven-2.0.0"
+      sources."loud-rejection-1.6.0"
+      sources."minimatch-3.0.3"
+      sources."mkdirp-0.5.1"
+      sources."node-emoji-1.4.1"
+      sources."node-gyp-3.4.0"
+      sources."object-path-0.11.3"
+      sources."proper-lockfile-1.2.0"
+      sources."read-1.0.7"
+      sources."repeating-2.0.1"
+      sources."request-2.79.0"
+      sources."request-capture-har-1.1.4"
+      sources."rimraf-2.5.4"
+      sources."roadrunner-1.1.0"
+      sources."semver-5.3.0"
+      sources."strip-bom-2.0.0"
+      sources."tar-2.2.1"
+      sources."tar-stream-1.5.2"
+      sources."user-home-2.0.0"
+      sources."validate-npm-package-license-3.0.1"
+      sources."core-js-2.4.1"
+      sources."regenerator-runtime-0.9.6"
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."has-ansi-2.0.0"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."ansi-regex-2.0.0"
+      sources."graceful-fs-4.1.11"
+      sources."graceful-readlink-1.0.1"
+      sources."ms-0.7.2"
+      sources."clone-1.0.2"
+      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."lodash-4.17.2"
+      sources."mute-stream-0.0.6"
+      sources."pinkie-promise-2.0.1"
+      sources."run-async-2.2.0"
+      sources."rx-4.1.0"
+      sources."string-width-1.0.2"
+      sources."through-2.3.8"
+      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."concat-stream-1.5.2"
+      sources."os-shim-0.1.3"
+      sources."inherits-2.0.3"
+      sources."typedarray-0.0.6"
+      sources."readable-stream-2.0.6"
+      sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."string_decoder-0.10.31"
+      sources."util-deprecate-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."object-assign-4.1.0"
+      sources."pinkie-2.0.4"
+      sources."is-promise-2.1.0"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."number-is-nan-1.0.1"
+      sources."loose-envify-1.3.0"
+      sources."js-tokens-2.0.0"
+      sources."builtin-modules-1.1.1"
+      sources."ci-info-1.0.0"
+      sources."currently-unhandled-0.4.1"
+      sources."signal-exit-3.0.1"
+      sources."array-find-index-1.0.2"
+      sources."brace-expansion-1.1.6"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
+      sources."minimist-0.0.8"
+      sources."string.prototype.codepointat-0.2.0"
+      sources."fstream-1.0.10"
+      sources."glob-7.1.1"
+      sources."nopt-3.0.6"
+      sources."npmlog-3.1.2"
+      sources."osenv-0.1.3"
+      sources."path-array-1.0.1"
+      sources."which-1.2.12"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."abbrev-1.0.9"
+      sources."are-we-there-yet-1.1.2"
+      sources."console-control-strings-1.1.0"
+      sources."gauge-2.6.0"
+      sources."set-blocking-2.0.0"
+      sources."delegates-1.0.0"
+      sources."aproba-1.0.4"
+      sources."has-color-0.1.7"
+      sources."has-unicode-2.0.1"
+      sources."wide-align-1.1.0"
+      sources."os-homedir-1.0.2"
+      sources."array-index-1.0.0"
+      sources."es6-symbol-3.1.0"
+      sources."d-0.1.1"
+      sources."es5-ext-0.10.12"
+      sources."es6-iterator-2.0.0"
+      sources."isexe-1.1.2"
+      sources."err-code-1.1.1"
+      sources."retry-0.10.0"
+      sources."is-finite-1.0.2"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.5.0"
+      sources."caseless-0.11.0"
+      sources."combined-stream-1.0.5"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.1.2"
+      sources."har-validator-2.0.6"
+      sources."hawk-3.1.3"
+      sources."http-signature-1.1.1"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."json-stringify-safe-5.0.1"
+      sources."mime-types-2.1.13"
+      sources."oauth-sign-0.8.2"
+      sources."qs-6.3.0"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.2"
+      sources."tunnel-agent-0.4.3"
+      sources."uuid-3.0.0"
+      sources."delayed-stream-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."is-my-json-valid-2.15.0"
+      sources."generate-function-2.0.0"
+      sources."generate-object-property-1.2.0"
+      sources."jsonpointer-4.0.0"
+      sources."xtend-4.0.1"
+      sources."is-property-1.0.2"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
+      sources."assert-plus-0.2.0"
+      sources."jsprim-1.3.1"
+      (sources."sshpk-1.10.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."extsprintf-1.0.2"
+      sources."json-schema-0.2.3"
+      sources."verror-1.3.6"
+      sources."asn1-0.2.3"
+      (sources."dashdash-1.14.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.6" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."jsbn-0.1.0"
+      sources."tweetnacl-0.14.3"
+      sources."jodid25519-1.0.2"
+      sources."ecc-jsbn-0.1.1"
+      sources."bcrypt-pbkdf-1.0.0"
+      sources."mime-db-1.25.0"
+      sources."punycode-1.4.1"
+      sources."is-utf8-0.2.1"
+      sources."block-stream-0.0.9"
+      sources."bl-1.1.2"
+      (sources."end-of-stream-1.1.0" // {
+        dependencies = [
+          sources."once-1.3.3"
+        ];
+      })
+      sources."spdx-correct-1.0.2"
+      sources."spdx-expression-parse-1.0.4"
+      sources."spdx-license-ids-1.2.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "<p align=\"center\">   <a href=\"https://yarnpkg.com/\">     <img alt=\"Yarn\" src=\"https://github.com/yarnpkg/assets/blob/master/yarn-kitten-full.png?raw=true\" width=\"546\">   </a> </p>";
+      homepage = "https://github.com/yarnpkg/yarn#readme";
+      license = "BSD-2-Clause";
+    };
+    production = true;
+  };
 }
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 9fc9dcf2d7b..8c1c9515926 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -62,4 +62,5 @@
 , "webdrvr"
 , "webpack"
 , "wring"
+, "yarn"
 ]

From a62ee8d45cd6d62ac5a985a386a4280a7c4059a6 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 15 Jan 2017 14:06:35 -0500
Subject: [PATCH 205/727] release-cross: Expose sub-jobs of linux cross stdenv

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

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index ec013816145..f582bcf3b32 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -8,7 +8,7 @@
 with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
 
 let
-  lib = import ../../lib;
+  inherit (pkgs) lib;
 
   nativePlatforms = linux;
 
@@ -192,7 +192,7 @@ in
   /* Cross-built bootstrap tools for every supported platform */
   bootstrapTools = let
     tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; };
-    maintainers = [ pkgs.lib.maintainers.dezgeg ];
-    mkBootstrapToolsJob = bt: hydraJob' (pkgs.lib.addMetaAttrs { inherit maintainers; } bt.dist);
-  in pkgs.lib.mapAttrs (name: mkBootstrapToolsJob) tools;
+    maintainers = [ lib.maintainers.dezgeg ];
+    mkBootstrapToolsJob = drv: hydraJob' (lib.addMetaAttrs { inherit maintainers; } drv);
+  in lib.mapAttrsRecursiveCond (as: !lib.isDerivation as) (name: mkBootstrapToolsJob) tools;
 }

From 0ef29213b59305bb9da8675aee5f54ddc496fccc Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 15 Jan 2017 01:21:36 +0100
Subject: [PATCH 206/727] haskell: add servant sphinx docs to build

---
 .../haskell-modules/configuration-common.nix  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 701410d57e9..44e7e207a98 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1084,6 +1084,31 @@ self: super: {
     servant = self.servant_0_9_1_1;
   });
 
+  # build servant docs from the repository
+  servant =
+    let
+      ver = super.servant.version;
+      docs = pkgs.stdenv.mkDerivation {
+        name = "servant-sphinx-documentation-${ver}";
+        src = "${pkgs.fetchFromGitHub {
+          owner = "haskell-servant";
+          repo = "servant";
+          rev = "v${ver}";
+          sha256 = "0fynv77m7rk79pdp535c2a2bd44csgr32zb4wqavbalr7grpxg4q";
+        }}/doc";
+        buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
+        makeFlags = "html";
+        installPhase = ''
+          mv _build/html $out
+        '';
+      };
+    in overrideCabal super.servant (old: {
+      postInstall = old.postInstall or "" + ''
+        ln -s ${docs} $out/share/doc/servant
+      '';
+    });
+
+
   # https://github.com/plow-technologies/servant-auth/issues/20
   servant-auth = dontCheck super.servant-auth;
 

From 4c803b904e04285cb26444a0f1959004e6c17a44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 15 Jan 2017 19:58:29 +0100
Subject: [PATCH 207/727] nixos/clamav: set "clamav" user's primary group to
 "clamav"

So that the files created by the clamav service is owned by group
"clamav" instead of "nogroup".
---
 nixos/modules/services/security/clamav.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index b045e140546..f71f30fee97 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -81,6 +81,7 @@ in
     users.extraUsers = singleton {
       name = clamavUser;
       uid = config.ids.uids.clamav;
+      group = clamavGroup;
       description = "ClamAV daemon user";
       home = stateDir;
     };

From 04d11637cba98eb1656b0cb9f710ed1ed3d89223 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 15 Jan 2017 16:29:50 -0600
Subject: [PATCH 208/727] linux_4_9: enable support for amdgpu on older
 chipsets

Linux 4.9 includes experimental amdgpu support for AMD Southern Islands
chipsets. (By default, only Sea Islands and newer chipsets are supported.)
Southern Islands chips will still use radeon by default, but daring users may
set `services.xserver.videoDrivers = [ "amdgpu" ];` to try the experimental
driver.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index bd99a7979ee..8727381bb1e 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -186,6 +186,10 @@ with stdenv.lib;
   ${optionalString (versionAtLeast version "4.5" && (versionOlder version "4.9")) ''
     DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support
   ''}
+  ${optionalString (versionAtLeast version "4.9") ''
+    DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets
+    DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets
+  ''}
 
   # Sound.
   SND_DYNAMIC_MINORS y

From 546d0c04608cca449036e987ac0fe401d4cd0135 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 16 Jan 2017 00:13:13 +0100
Subject: [PATCH 209/727] haskell: add doc outputs to with-packages-wrapper.nix

We want to have all doc outputs as well (also e.g. ghc documentation).
Adds a bit of documentation to the postInstall script.
---
 pkgs/development/haskell-modules/with-packages-wrapper.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 7929d99de15..6a459433a45 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -52,10 +52,12 @@ buildEnv {
   # as a dedicated drv attribute, like `compiler-name`
   name = ghc.name + "-with-packages";
   paths = paths ++ [ghc];
+  extraOutputsToInstall = [ "out" "doc" ];
   inherit ignoreCollisions;
   postBuild = ''
     . ${makeWrapper}/nix-support/setup-hook
 
+    # Work around buildEnv sometimes deciding to make bin a symlink
     if test -L "$out/bin"; then
       binTarget="$(readlink -f "$out/bin")"
       rm "$out/bin"
@@ -63,6 +65,8 @@ buildEnv {
       chmod u+w "$out/bin"
     fi
 
+    # wrap compiler executables with correct env variables
+
     for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
       if [[ -x "${ghc}/bin/$prg" ]]; then
         rm -f $out/bin/$prg

From f5dfe78a1eb5ff8dfcc7ab37cfc132c5f31d3cef Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Sat, 17 Dec 2016 18:05:21 +0000
Subject: [PATCH 210/727] Add overlays mechanism to Nixpkgs.

This patch add a new argument to Nixpkgs default expression named "overlays".

By default, the value of the argument is either taken from the environment variable `NIXPKGS_OVERLAYS`,
or from the directory `~/.nixpkgs/overlays/`.  If the environment variable does not name a valid directory
then this mechanism would fallback on the home directory.  If the home directory does not exists it will
fallback on an empty list of overlays.

The overlays directory should contain the list of extra Nixpkgs stages which would be used to extend the
content of Nixpkgs, with additional set of packages.  The overlays, i-e directory, files, symbolic links
are used in alphabetical order.

The simplest overlay which extends Nixpkgs with nothing looks like:

```nix
self: super: {
}
```

More refined overlays can use `super` as the basis for building new packages, and `self` as a way to query
the final result of the fix-point.

An example of overlay which extends Nixpkgs with a small set of packages can be found at:
  https://github.com/nbp/nixpkgs-mozilla/blob/nixpkgs-overlay/moz-overlay.nix

To use this file, checkout the repository and add a symbolic link to
the `moz-overlay.nix` file in `~/.nixpkgs/overlays` directory.
---
 doc/functions.xml                          | 64 +-------------
 doc/languages-frameworks/python.md         |  6 +-
 doc/manual.xml                             |  1 +
 doc/overlays.xml                           | 99 ++++++++++++++++++++++
 nixos/doc/manual/release-notes/rl-1703.xml |  9 +-
 pkgs/stdenv/cross/default.nix              |  8 +-
 pkgs/stdenv/custom/default.nix             |  6 +-
 pkgs/stdenv/darwin/default.nix             |  6 +-
 pkgs/stdenv/default.nix                    |  2 +-
 pkgs/stdenv/freebsd/default.nix            |  4 +-
 pkgs/stdenv/linux/default.nix              |  4 +-
 pkgs/stdenv/native/default.nix             |  6 +-
 pkgs/top-level/default.nix                 |  5 +-
 pkgs/top-level/impure.nix                  | 19 ++++-
 pkgs/top-level/stage.nix                   | 24 ++----
 15 files changed, 160 insertions(+), 103 deletions(-)
 create mode 100644 doc/overlays.xml

diff --git a/doc/functions.xml b/doc/functions.xml
index f6a0a4352f6..6374c15ddf2 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -17,66 +17,6 @@
     derivations or even the whole package set.
   </para>
 
-  <section xml:id="sec-pkgs-overridePackages">
-    <title>pkgs.overridePackages</title>
-
-    <para>
-      This function inside the nixpkgs expression (<varname>pkgs</varname>)
-      can be used to override the set of packages itself.
-    </para>
-    <para>
-      Warning: this function is expensive and must not be used from within
-      the nixpkgs repository.
-    </para>
-    <para>
-      Example usage:
-
-      <programlisting>let
-    pkgs = import &lt;nixpkgs&gt; {};
-    newpkgs = pkgs.overridePackages (self: super: {
-      foo = super.foo.override { ... };
-    });
-  in ...</programlisting>
-    </para>
-
-    <para>
-      The resulting <varname>newpkgs</varname> will have the new <varname>foo</varname>
-      expression, and all other expressions depending on <varname>foo</varname> will also
-      use the new <varname>foo</varname> expression.
-    </para>
-
-    <para>
-      The behavior of this function is similar to <link 
-      linkend="sec-modify-via-packageOverrides">config.packageOverrides</link>.
-    </para>
-
-    <para>
-      The <varname>self</varname> parameter refers to the final package set with the
-      applied overrides. Using this parameter may lead to infinite recursion if not
-      used consciously.
-    </para>
-
-    <para>
-      The <varname>super</varname> parameter refers to the old package set.
-      It's equivalent to <varname>pkgs</varname> in the above example.
-    </para>
-
-    <para>
-      Note that in previous versions of nixpkgs, this method replaced any changes from <link 
-      linkend="sec-modify-via-packageOverrides">config.packageOverrides</link>,
-      along with that from previous calls if this function was called repeatedly.
-      Now those previous changes will be preserved so this function can be "chained" meaningfully.
-      To recover the old behavior, make sure <varname>config.packageOverrides</varname> is unset,
-      and call this only once off a "freshly" imported nixpkgs:
-
-      <programlisting>let
-    pkgs = import &lt;nixpkgs&gt; { config: {}; };
-    newpkgs = pkgs.overridePackages ...;
-  in ...</programlisting>
-    </para>
-
-  </section>
-
   <section xml:id="sec-pkg-override">
     <title>&lt;pkg&gt;.override</title>
 
@@ -91,9 +31,9 @@
       Example usages:
 
       <programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting>
-      <programlisting>pkgs.overridePackages (self: super: {
+      <programlisting>import pkgs.path { overlays = [ (self: super: {
     foo = super.foo.override { barSupport = true ; };
-  })</programlisting>
+  })]};</programlisting>
       <programlisting>mypkg = pkgs.callPackage ./mypkg.nix {
     mydep = pkgs.mydep.override { ... };
   }</programlisting>
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 82aeb112c93..48d9e0a0952 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -737,18 +737,18 @@ in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.bl
 ```
 The requested package `blaze` depends on `pandas` which itself depends on `scipy`.
 
-If you want the whole of Nixpkgs to use your modifications, then you can use `pkgs.overridePackages`
+If you want the whole of Nixpkgs to use your modifications, then you can use `overlays`
 as explained in this manual. In the following example we build a `inkscape` using a different version of `numpy`.
 ```
 let
   pkgs = import <nixpkgs> {};
-  newpkgs = pkgs.overridePackages ( pkgsself: pkgssuper: {
+  newpkgs = import pkgs.path { overlays = [ (pkgsself: pkgssuper: {
     python27 = let
       packageOverrides = self: super: {
         numpy = super.numpy_1_10;
       };
     in pkgssuper.python27.override {inherit packageOverrides;};
-  } );
+  } ) ]; };
 in newpkgs.inkscape
 ```
 
diff --git a/doc/manual.xml b/doc/manual.xml
index 6ad66d48652..1c0dac6e4df 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -18,6 +18,7 @@
   <xi:include href="meta.xml" />
   <xi:include href="languages-frameworks/index.xml" />
   <xi:include href="package-notes.xml" />
+  <xi:include href="overlays.xml" />
   <xi:include href="coding-conventions.xml" />
   <xi:include href="submitting-changes.xml" />
   <xi:include href="reviewing-contributions.xml" />
diff --git a/doc/overlays.xml b/doc/overlays.xml
new file mode 100644
index 00000000000..d194c6bfc89
--- /dev/null
+++ b/doc/overlays.xml
@@ -0,0 +1,99 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-overlays">
+
+<title>Overlays</title>
+
+<para>This chapter describes how to extend and change Nixpkgs content using
+overlays.  Overlays are used to add phases in the fix-point used by Nixpkgs
+to bind the dependencies of all packages.</para>
+
+<!--============================================================-->
+
+<section xml:id="sec-overlays-install">
+<title>Installing Overlays</title>
+
+<para>Overlays are looked for in the following order, the first valid one is
+considered, and all the rest are ignored:
+
+<orderedlist>
+
+  <listitem>
+
+    <para>As argument of the imported attribute set. When importing Nixpkgs,
+    the <varname>overlays</varname> attribute argument can be set to a list of
+    functions, which would be describe in <xref linkend="sec-overlays-layout"/>.</para>
+
+  </listitem>
+
+  <listitem>
+
+    <para>As a directory pointed by the environment variable named
+<varname>NIXPKGS_OVERLAYS</varname>. This directory can contain symbolic
+links to Nix expressions.
+
+  </listitem>
+
+  <listitem>
+
+    <para>As the directory located at
+<filename>~/.nixpkgs/overlays/</filename>. This directory can contain
+symbolic links to Nix expressions.
+
+  </listitem>
+
+</orderedlist>
+</para>
+
+<para>For the second and third option, the directory contains either
+directories providing a default.nix expression, or files, or symbolic links
+to the entry Nix expression of the overlay.  These Nix expressions are
+following the syntax described in <xref
+linkend="sec-overlays-layout"/>.</para>
+
+<para>To install an overlay, using the last option.  Clone the repository of
+the overlay, and add a symbolic link to it in the
+<filename>~/.nixpkgs/overlays/</filename> directory.</para>
+
+</section>
+
+<!--============================================================-->
+
+<section xml:id="sec-overlays-layout">
+<title>Overlays Layout</title>
+
+<para>An overlay is a Nix expression, which is a function which accepts 2
+arguments.</para>
+
+<programlisting>
+self: super:
+
+{
+  foo = super.foo.override { ... };
+  bar = import ./pkgs/bar {
+    inherit (self) stdenv fetchurl;
+    inherit (self) ninja crawl dwarf-fortress;
+  };
+}
+</programlisting>
+
+<para>The first argument, usualy named <varname>self</varname>, corresponds
+to the final package set. You should use this set to inherit all the
+dependencies needed by your package expression.</para>
+
+<para>The second argument, usualy named <varname>super</varname>,
+corresponds to the result of the evaluation of the previous stages of
+Nixpkgs, it does not contain any of the packages added by the current
+overlay nor any of the following overlays.  This set is used in to override
+existing packages, either by changing their dependencies or their
+recipes.</para>
+
+<para>The value returned by this function should be a set similar to
+<filename>pkgs/top-level/all-packages.nix</filename>, which contains either
+extra packages defined by the overlay, or which overwrite Nixpkgs packages
+with other custom defaults. This is similar to <xref
+linkend="sec-modify-via-packageOverrides"/>.</para>
+
+</section>
+
+</chapter>
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 6997155d94d..bbb9c53eaa3 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -11,7 +11,9 @@ has the following highlights: </para>
 
 <itemizedlist>
   <listitem>
-    <para></para>
+    <para>Nixpkgs is now extensible through <link
+    xlink:href="https://github.com/NixOS/nixpkgs/pull/21243">overlays</link>.
+    See the Nixpkgs manual for more information.</para>
   </listitem>
 </itemizedlist>
 
@@ -96,6 +98,11 @@ following incompatible changes:</para>
      <literal>networking.timeServers</literal>.
    </para>
   </listitem>
+
+  <listitem>
+    <para><literal>pkgs.overridePackages</literal> function no longer exists.     Instead import Nixpkgs a second time using <literal>import pkgs.path {
+    overlays = [ <replaceable>...</replaceable> ]; }</literal>.</para>
+  </listitem>
 </itemizedlist>
 
 
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 359d45b78b9..16f41671b76 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -1,10 +1,10 @@
 { lib
-, system, platform, crossSystem, config
+, system, platform, crossSystem, config, overlays
 }:
 
 let
   bootStages = import ../. {
-    inherit lib system platform;
+    inherit lib system platform overlays;
     crossSystem = null;
     # Ignore custom stdenvs when cross compiling for compatability
     config = builtins.removeAttrs config [ "replaceStdenv" ];
@@ -18,7 +18,7 @@ in bootStages ++ [
   # should be used to build compilers and other such tools targeting the cross
   # platform. Then, `forceNativeDrv` can be removed.
   (vanillaPackages: {
-    inherit system platform crossSystem config;
+    inherit system platform crossSystem config overlays;
     # It's OK to change the built-time dependencies
     allowCustomOverrides = true;
     stdenv = vanillaPackages.stdenv // {
@@ -30,7 +30,7 @@ in bootStages ++ [
 
   # Run packages
   (buildPackages: {
-    inherit system platform crossSystem config;
+    inherit system platform crossSystem config overlays;
     stdenv = if crossSystem.useiOSCross or false
       then let
           inherit (buildPackages.darwin.ios-cross {
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix
index 59a6e871cfd..d7e9bf53bed 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/pkgs/stdenv/custom/default.nix
@@ -1,12 +1,12 @@
 { lib
-, system, platform, crossSystem, config
+, system, platform, crossSystem, config, overlays
 }:
 
 assert crossSystem == null;
 
 let
   bootStages = import ../. {
-    inherit lib system platform crossSystem;
+    inherit lib system platform crossSystem overlays;
     # Remove config.replaceStdenv to ensure termination.
     config = builtins.removeAttrs config [ "replaceStdenv" ];
   };
@@ -15,7 +15,7 @@ in bootStages ++ [
 
   # Additional stage, built using custom stdenv
   (vanillaPackages: {
-    inherit system platform crossSystem config;
+    inherit system platform crossSystem config overlays;
     stdenv = config.replaceStdenv { pkgs = vanillaPackages; };
   })
 
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 9c860bfb0f9..e3a87ea078f 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -1,5 +1,5 @@
 { lib
-, system, platform, crossSystem, config
+, system, platform, crossSystem, config, overlays
 
 # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
 , bootstrapFiles ? let
@@ -98,7 +98,7 @@ in rec {
       };
 
     in {
-      inherit system platform crossSystem config;
+      inherit system platform crossSystem config overlays;
       stdenv = thisStdenv;
     };
 
@@ -316,7 +316,7 @@ in rec {
     stage3
     stage4
     (prevStage: {
-      inherit system crossSystem platform config;
+      inherit system crossSystem platform config overlays;
       stdenv = stdenvDarwin prevStage;
     })
   ];
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 0ca03ecdde1..f60ffec4b56 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -7,7 +7,7 @@
 { # Args just for stdenvs' usage
   lib
   # Args to pass on to the pkgset builder, too
-, system, platform, crossSystem, config
+, system, platform, crossSystem, config, overlays
 } @ args:
 
 let
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index e0256e26f5f..2cb059deb34 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -1,5 +1,5 @@
 { lib
-, system, platform, crossSystem, config
+, system, platform, crossSystem, config, overlays
 }:
 
 assert crossSystem == null;
@@ -58,7 +58,7 @@ assert crossSystem == null;
   })
 
   (prevStage: {
-    inherit system crossSystem platform config;
+    inherit system crossSystem platform config overlays;
     stdenv = import ../generic {
       name = "stdenv-freebsd-boot-3";
       inherit system config;
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 430122c36f7..bc8a03a485a 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -4,7 +4,7 @@
 # compiler and linker that do not search in default locations,
 # ensuring purity of components produced by it.
 { lib
-, system, platform, crossSystem, config
+, system, platform, crossSystem, config, overlays
 
 , bootstrapFiles ?
     if system == "i686-linux" then import ./bootstrap-files/i686.nix
@@ -91,7 +91,7 @@ let
       };
 
     in {
-      inherit system platform crossSystem config;
+      inherit system platform crossSystem config overlays;
       stdenv = thisStdenv;
     };
 
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 57182fae523..4028638009e 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -1,5 +1,5 @@
 { lib
-, system, platform, crossSystem, config
+, system, platform, crossSystem, config, overlays
 }:
 
 assert crossSystem == null;
@@ -134,7 +134,7 @@ in
 
   # First build a stdenv based only on tools outside the store.
   (prevStage: {
-    inherit system crossSystem platform config;
+    inherit system crossSystem platform config overlays;
     stdenv = makeStdenv {
       inherit (prevStage) cc fetchurl;
     } // { inherit (prevStage) fetchurl; };
@@ -143,7 +143,7 @@ in
   # Using that, build a stdenv that adds the ‘xz’ command (which most systems
   # don't have, so we mustn't rely on the native environment providing it).
   (prevStage: {
-    inherit system crossSystem platform config;
+    inherit system crossSystem platform config overlays;
     stdenv = makeStdenv {
       inherit (prevStage.stdenv) cc fetchurl;
       extraPath = [ prevStage.xz ];
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 04daf9778ff..a146dad63bc 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -23,6 +23,9 @@
 , # Allow a configuration attribute set to be passed in as an argument.
   config ? {}
 
+, # List of overlays layers used to extend Nixpkgs.
+  overlays ? []
+
 , # A function booting the final package set for a specific standard
   # environment. See below for the arguments given to that function,
   # the type of list it returns.
@@ -80,7 +83,7 @@ in let
   boot = import ../stdenv/booter.nix { inherit lib allPackages; };
 
   stages = stdenvStages {
-    inherit lib system platform crossSystem config;
+    inherit lib system platform crossSystem config overlays;
   };
 
   pkgs = boot stages;
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index e9066815927..1aa55f7293b 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -18,7 +18,24 @@
       else if homeDir != "" && pathExists configFile2 then import configFile2
       else {}
 
+, # Overlays are used to extend Nixpkgs collection with additional
+  # collections of packages.  These collection of packages are part of the
+  # fix-point made by Nixpkgs.
+  overlays ? let
+      inherit (builtins) getEnv pathExists readDir attrNames map sort
+        lessThan;
+      dirEnv = getEnv "NIXPKGS_OVERLAYS";
+      dirHome = (getEnv "HOME") + "/.nixpkgs/overlays";
+      dirCheck = dir: dir != "" && pathExists (dir + "/.");
+      overlays = dir:
+        let content = readDir dir; in
+        map (n: import "${dir}/${n}") (sort lessThan (attrNames content));
+    in
+      if dirCheck dirEnv then overlays dirEnv
+      else if dirCheck dirHome then overlays dirHome
+      else []
+
 , ...
 } @ args:
 
-import ./. (args // { inherit system config; })
+import ./. (args // { inherit system config overlays; })
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index ebc6473e425..cbf65870eb7 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -30,6 +30,8 @@
 , # The configuration attribute set
   config
 
+, overlays # List of overlays to use in the fix-point.
+
 , crossSystem
 , platform
 , lib
@@ -79,7 +81,7 @@ let
       ((config.packageOverrides or (super: {})) super);
 
   # The complete chain of package set builders, applied from top to bottom
-  toFix = lib.foldl' (lib.flip lib.extends) (self: {}) [
+  toFix = lib.foldl' (lib.flip lib.extends) (self: {}) ([
     stdenvBootstappingAndPlatforms
     stdenvAdapters
     trivialBuilders
@@ -87,20 +89,8 @@ let
     aliases
     stdenvOverrides
     configOverrides
-  ];
+  ] ++ overlays);
 
-  # Use `overridePackages` to easily override this package set.
-  # Warning: this function is very expensive and must not be used
-  # from within the nixpkgs repository.
-  #
-  # Example:
-  #  pkgs.overridePackages (self: super: {
-  #    foo = super.foo.override { ... };
-  #  }
-  #
-  # The result is `pkgs' where all the derivations depending on `foo'
-  # will use the new version.
-
-  # Return the complete set of packages. Warning: this function is very
-  # expensive!
-in lib.makeExtensibleWithCustomName "overridePackages" toFix
+in
+  # Return the complete set of packages.
+  lib.fix toFix

From 83f7d5fc0a630ab1c845b13a8cacf7a693469438 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Sun, 25 Dec 2016 18:50:00 +0000
Subject: [PATCH 211/727] Add NixOS option 'nixpkgs.overlays' to set the
 argument of Nixpkgs.

---
 nixos/modules/misc/nixpkgs.nix | 48 +++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 7d50b8025bd..885d56216ed 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -29,11 +29,19 @@ let
     };
 
   configType = mkOptionType {
-    name = "nixpkgs config";
+    name = "nixpkgs-config";
+    description = "nixpkgs config"
     check = traceValIfNot isConfig;
     merge = args: fold (def: mergeConfig def.value) {};
   };
 
+  overlayType = mkOptionType {
+    name = "nixpkgs-overlay";
+    description = "nixpkgs overlay";
+    check = builtins.isFunction;
+    merge = lib.mergeOneOption;
+  };
+
 in
 
 {
@@ -43,23 +51,37 @@ in
       default = {};
       example = literalExample
         ''
-          { firefox.enableGeckoMediaPlayer = true;
-            packageOverrides = pkgs: {
-              firefox60Pkgs = pkgs.firefox60Pkgs.override {
-                enableOfficialBranding = true;
-              };
-            };
-          }
+          { firefox.enableGeckoMediaPlayer = true; }
         '';
       type = configType;
       description = ''
         The configuration of the Nix Packages collection.  (For
         details, see the Nixpkgs documentation.)  It allows you to set
-        package configuration options, and to override packages
-        globally through the <varname>packageOverrides</varname>
-        option.  The latter is a function that takes as an argument
-        the <emphasis>original</emphasis> Nixpkgs, and must evaluate
-        to a set of new or overridden packages.
+        package configuration options.
+      '';
+    };
+
+    nixpkgs.overlays = mkOption {
+      default = [];
+      example = literalExample
+        ''
+          [ (self: super: {
+              openssh = super.openssh.override {
+                hpnSupport = true;
+                withKerberos = true;
+                kerberos = self.libkrb5
+              };
+            };
+          ) ]
+        '';
+      type = lib.listOf overlayType;
+      description = ''
+        List of overlays to use with the Nix Packages collection.
+        (For details, see the Nixpkgs documentation.)  It allows
+        you to override packages globally. This is a function that
+        takes as an argument the <emphasis>original</emphasis> Nixpkgs.
+        The first argument should be used for finding dependencies, and
+        the second should be used for overriding recipes.
       '';
     };
 

From 6a83c315ec1587bfe6527381d5f0f6014b375020 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Mon, 26 Dec 2016 18:29:59 +0000
Subject: [PATCH 212/727] Add missing line break in the release notes.

---
 nixos/doc/manual/release-notes/rl-1703.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index bbb9c53eaa3..3ee38f9a76c 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -100,7 +100,8 @@ following incompatible changes:</para>
   </listitem>
 
   <listitem>
-    <para><literal>pkgs.overridePackages</literal> function no longer exists.     Instead import Nixpkgs a second time using <literal>import pkgs.path {
+    <para><literal>pkgs.overridePackages</literal> function no longer exists.
+     Instead import Nixpkgs a second time using <literal>import pkgs.path {
     overlays = [ <replaceable>...</replaceable> ]; }</literal>.</para>
   </listitem>
 </itemizedlist>

From f9da1fa95715e8bb13c8899b7e1d280e370c5168 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Mon, 26 Dec 2016 19:26:24 +0000
Subject: [PATCH 213/727] Throw an error if NIXPKGS_OVERLAYS is invalid and
 improve documentation.

---
 doc/overlays.xml          | 4 ++--
 pkgs/top-level/impure.nix | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/overlays.xml b/doc/overlays.xml
index d194c6bfc89..abaa264addb 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -13,8 +13,8 @@ to bind the dependencies of all packages.</para>
 <section xml:id="sec-overlays-install">
 <title>Installing Overlays</title>
 
-<para>Overlays are looked for in the following order, the first valid one is
-considered, and all the rest are ignored:
+<para>The set of overlays are looked for in the following order, only the
+first one present is considered, and all the rest are ignored:
 
 <orderedlist>
 
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index 1aa55f7293b..60a55c657c0 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -31,7 +31,9 @@
         let content = readDir dir; in
         map (n: import "${dir}/${n}") (sort lessThan (attrNames content));
     in
-      if dirCheck dirEnv then overlays dirEnv
+      if dirEnv != "" then
+        if dirCheck dirEnv then overlays dirEnv
+        else throw "The environment variable NIXPKGS_OVERLAYS does not name a valid directory."
       else if dirCheck dirHome then overlays dirHome
       else []
 

From 51d3c931e1d6584acefd964a016593ea37ffb804 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Mon, 26 Dec 2016 19:30:51 +0000
Subject: [PATCH 214/727] Replace 'phases' by 'layers' in overlays
 documentation.

---
 doc/overlays.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/overlays.xml b/doc/overlays.xml
index abaa264addb..4ad2764f33f 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -5,7 +5,7 @@
 <title>Overlays</title>
 
 <para>This chapter describes how to extend and change Nixpkgs content using
-overlays.  Overlays are used to add phases in the fix-point used by Nixpkgs
+overlays.  Overlays are used to add layers in the fix-point used by Nixpkgs
 to bind the dependencies of all packages.</para>
 
 <!--============================================================-->

From ae7e893de1c03564b40f8e6d1d9591bbc1082cc9 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Sat, 14 Jan 2017 14:15:55 +0000
Subject: [PATCH 215/727] Improve the realse notes with the upcoming
 documentation links, and a better example of how to convert overridePackages
 usage.

---
 nixos/doc/manual/release-notes/rl-1703.xml | 32 ++++++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 3ee38f9a76c..d6b3aeb9791 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -11,9 +11,9 @@ has the following highlights: </para>
 
 <itemizedlist>
   <listitem>
-    <para>Nixpkgs is now extensible through <link
-    xlink:href="https://github.com/NixOS/nixpkgs/pull/21243">overlays</link>.
-    See the Nixpkgs manual for more information.</para>
+    <para>Nixpkgs is now extensible through overlays. See the <link
+    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs
+    manual</link> for more information.</para>
   </listitem>
 </itemizedlist>
 
@@ -100,9 +100,29 @@ following incompatible changes:</para>
   </listitem>
 
   <listitem>
-    <para><literal>pkgs.overridePackages</literal> function no longer exists.
-     Instead import Nixpkgs a second time using <literal>import pkgs.path {
-    overlays = [ <replaceable>...</replaceable> ]; }</literal>.</para>
+
+    <para><literal>overridePackages</literal> function no longer exists.
+    It is replaced by <link
+    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">
+    overlays</link>.  For example, the following code:
+
+<programlisting>
+  let
+    pkgs = import &lt;nixpkgs&gt {};
+  in
+    pkgs.overridePackages (self: super: ...)
+</programlisting>
+
+    Should be replaced by:
+
+<programlisting>
+  let
+    pkgs = import &lt;nixpkgs&gt {}; in
+  in
+    import pkgs.path { overlays = [(self: super: ...)] }
+</programlisting>
+
+    </para>
   </listitem>
 </itemizedlist>
 

From 2d6532b3302af212e7f3fa09f43844e9984219b4 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Sun, 15 Jan 2017 15:07:29 +0000
Subject: [PATCH 216/727] Update overlay documentation by following nits from
 aneeshusa.

---
 doc/overlays.xml                           | 80 +++++++++++-----------
 nixos/doc/manual/release-notes/rl-1703.xml |  2 +-
 nixos/modules/misc/nixpkgs.nix             |  2 +-
 3 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/doc/overlays.xml b/doc/overlays.xml
index 4ad2764f33f..c921289fd6c 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -4,56 +4,53 @@
 
 <title>Overlays</title>
 
-<para>This chapter describes how to extend and change Nixpkgs content using
-overlays.  Overlays are used to add layers in the fix-point used by Nixpkgs
-to bind the dependencies of all packages.</para>
+<para>This chapter describes how to extend and change Nixpkgs packages using
+overlays. Overlays are used to add layers in the fix-point used by Nixpkgs
+to compose the set of all packages.</para>
 
 <!--============================================================-->
 
 <section xml:id="sec-overlays-install">
 <title>Installing Overlays</title>
 
-<para>The set of overlays are looked for in the following order, only the
+<para>The set of overlays is looked for in the following places. The
 first one present is considered, and all the rest are ignored:
 
 <orderedlist>
 
   <listitem>
 
-    <para>As argument of the imported attribute set. When importing Nixpkgs,
+    <para>As an argument of the imported attribute set. When importing Nixpkgs,
     the <varname>overlays</varname> attribute argument can be set to a list of
-    functions, which would be describe in <xref linkend="sec-overlays-layout"/>.</para>
+    functions, which is described in <xref linkend="sec-overlays-layout"/>.</para>
 
   </listitem>
 
   <listitem>
 
-    <para>As a directory pointed by the environment variable named
-<varname>NIXPKGS_OVERLAYS</varname>. This directory can contain symbolic
-links to Nix expressions.
-
+    <para>In the directory pointed by the environment variable
+<varname>NIXPKGS_OVERLAYS</varname>.
   </listitem>
 
   <listitem>
 
-    <para>As the directory located at
-<filename>~/.nixpkgs/overlays/</filename>. This directory can contain
-symbolic links to Nix expressions.
-
+    <para>In the directory <filename>~/.nixpkgs/overlays/</filename>.
   </listitem>
 
 </orderedlist>
 </para>
 
-<para>For the second and third option, the directory contains either
-directories providing a default.nix expression, or files, or symbolic links
-to the entry Nix expression of the overlay.  These Nix expressions are
-following the syntax described in <xref
-linkend="sec-overlays-layout"/>.</para>
+<para>For the second and third option, the directory should contain Nix expressions defining the
+overlays. Each overlay can be a file, a directory containing a
+<filename>default.nix</filename>, or a symlink to one of those. The expressions should follow
+the syntax described in <xref linkend="sec-overlays-layout"/>.</para>
 
-<para>To install an overlay, using the last option.  Clone the repository of
-the overlay, and add a symbolic link to it in the
-<filename>~/.nixpkgs/overlays/</filename> directory.</para>
+<para>The order of the overlay layers can influence the recipe of packages if multiple layers override
+the same recipe. In the case where overlays are loaded from a directory, these are loaded in
+alphabetical order.</para>
+
+<para>To install an overlay using the last option, you can clone the overlay's repository and add
+a symbolic link to in the <filename>~/.nixpkgs/overlays/</filename> directory.</para>
 
 </section>
 
@@ -62,37 +59,40 @@ the overlay, and add a symbolic link to it in the
 <section xml:id="sec-overlays-layout">
 <title>Overlays Layout</title>
 
-<para>An overlay is a Nix expression, which is a function which accepts 2
-arguments.</para>
+<para>Overlays are expressed as Nix functions which accept 2 arguments and return a set of
+packages</para>
 
 <programlisting>
 self: super:
 
 {
-  foo = super.foo.override { ... };
-  bar = import ./pkgs/bar {
-    inherit (self) stdenv fetchurl;
-    inherit (self) ninja crawl dwarf-fortress;
+  boost = super.boost.override {
+    python = self.python3;
+  };
+  rr = super.callPackage ./pkgs/rr {
+    stdenv = self.stdenv_32bit;
   };
 }
 </programlisting>
 
-<para>The first argument, usualy named <varname>self</varname>, corresponds
-to the final package set. You should use this set to inherit all the
-dependencies needed by your package expression.</para>
+<para>The first argument, usually named <varname>self</varname>, corresponds to the final package
+set. You should use this set for the dependencies of all packages specified in your
+overlay. For example, all the dependencies of <varname>rr</varname> in the example above come
+from <varname>self</varname>, as well as the overriden dependencies used in the
+<varname>boost</varname> override.</para>
 
-<para>The second argument, usualy named <varname>super</varname>,
+<para>The second argument, usually named <varname>super</varname>,
 corresponds to the result of the evaluation of the previous stages of
-Nixpkgs, it does not contain any of the packages added by the current
-overlay nor any of the following overlays.  This set is used in to override
-existing packages, either by changing their dependencies or their
-recipes.</para>
+Nixpkgs. It does not contain any of the packages added by the current
+overlay nor any of the following overlays. This set should be used either
+to refer to packages you wish to override, or to access functions defined
+in Nixpkgs. For example, the original recipe of <varname>boost</varname>
+in the above example, comes from <varname>super</varname>, as well as the
+<varname>callPackage</varname> function.</para>
 
 <para>The value returned by this function should be a set similar to
-<filename>pkgs/top-level/all-packages.nix</filename>, which contains either
-extra packages defined by the overlay, or which overwrite Nixpkgs packages
-with other custom defaults. This is similar to <xref
-linkend="sec-modify-via-packageOverrides"/>.</para>
+<filename>pkgs/top-level/all-packages.nix</filename>, which contains
+overridden and/or new packages.</para>
 
 </section>
 
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index d6b3aeb9791..099fb05c8b4 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -113,7 +113,7 @@ following incompatible changes:</para>
     pkgs.overridePackages (self: super: ...)
 </programlisting>
 
-    Should be replaced by:
+    should be replaced by:
 
 <programlisting>
   let
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 885d56216ed..296a9b4badf 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -69,7 +69,7 @@ in
               openssh = super.openssh.override {
                 hpnSupport = true;
                 withKerberos = true;
-                kerberos = self.libkrb5
+                kerberos = self.libkrb5;
               };
             };
           ) ]

From a0615e2a9fa0b6cc5629268da21ddc149f869f25 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Sun, 15 Jan 2017 18:36:50 +0000
Subject: [PATCH 217/727] Fix typo in nixpkgs.nix module.

---
 nixos/modules/misc/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 296a9b4badf..f13f3e41df7 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -30,7 +30,7 @@ let
 
   configType = mkOptionType {
     name = "nixpkgs-config";
-    description = "nixpkgs config"
+    description = "nixpkgs config";
     check = traceValIfNot isConfig;
     merge = args: fold (def: mergeConfig def.value) {};
   };

From da8cf2662a14d85fb3bf71c7b3a8b11fa977b35e Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Sun, 15 Jan 2017 18:48:13 +0000
Subject: [PATCH 218/727] Fix missing overlays argument in
 stdenv/linux/default.nix

---
 pkgs/stdenv/linux/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index bc8a03a485a..12da007f2a7 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -246,7 +246,7 @@ in
   # dependency (`nix-store -qR') on bootstrapTools or the first
   # binutils built.
   (prevStage: {
-    inherit system crossSystem platform config;
+    inherit system crossSystem platform config overlays;
     stdenv = import ../generic rec {
       inherit system config;
 

From 2ad710e70ebc38d2574652c89320c50931e3df85 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Sun, 15 Jan 2017 18:58:26 +0000
Subject: [PATCH 219/727] Fix extra nits from aneeshusa

---
 doc/overlays.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/overlays.xml b/doc/overlays.xml
index c921289fd6c..c20045b217b 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -40,17 +40,17 @@ first one present is considered, and all the rest are ignored:
 </orderedlist>
 </para>
 
-<para>For the second and third option, the directory should contain Nix expressions defining the
+<para>For the second and third options, the directory should contain Nix expressions defining the
 overlays. Each overlay can be a file, a directory containing a
 <filename>default.nix</filename>, or a symlink to one of those. The expressions should follow
 the syntax described in <xref linkend="sec-overlays-layout"/>.</para>
 
 <para>The order of the overlay layers can influence the recipe of packages if multiple layers override
-the same recipe. In the case where overlays are loaded from a directory, these are loaded in
+the same recipe. In the case where overlays are loaded from a directory, they are loaded in
 alphabetical order.</para>
 
 <para>To install an overlay using the last option, you can clone the overlay's repository and add
-a symbolic link to in the <filename>~/.nixpkgs/overlays/</filename> directory.</para>
+a symbolic link to it in <filename>~/.nixpkgs/overlays/</filename> directory.</para>
 
 </section>
 
@@ -60,7 +60,7 @@ a symbolic link to in the <filename>~/.nixpkgs/overlays/</filename> directory.</
 <title>Overlays Layout</title>
 
 <para>Overlays are expressed as Nix functions which accept 2 arguments and return a set of
-packages</para>
+packages.</para>
 
 <programlisting>
 self: super:

From c4e2dc36f239931681d7185b687bdd0d24b8df06 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Sun, 15 Jan 2017 19:05:22 +0000
Subject: [PATCH 220/727] Fix typo, lib.listOf --> types.listOf

---
 nixos/modules/misc/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index f13f3e41df7..7451888484f 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -74,7 +74,7 @@ in
             };
           ) ]
         '';
-      type = lib.listOf overlayType;
+      type = types.listOf overlayType;
       description = ''
         List of overlays to use with the Nix Packages collection.
         (For details, see the Nixpkgs documentation.)  It allows

From 88ba960a6ddee3b5c47160dcfe71f4f08344c8de Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Sun, 15 Jan 2017 19:07:11 +0000
Subject: [PATCH 221/727] Fix nixpkgs manual generation, missing para closing
 tag.

---
 doc/overlays.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/overlays.xml b/doc/overlays.xml
index c20045b217b..cb54c33cf65 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -29,12 +29,12 @@ first one present is considered, and all the rest are ignored:
   <listitem>
 
     <para>In the directory pointed by the environment variable
-<varname>NIXPKGS_OVERLAYS</varname>.
+    <varname>NIXPKGS_OVERLAYS</varname>.</para>
   </listitem>
 
   <listitem>
 
-    <para>In the directory <filename>~/.nixpkgs/overlays/</filename>.
+    <para>In the directory <filename>~/.nixpkgs/overlays/</filename>.</para>
   </listitem>
 
 </orderedlist>

From 8366525cbf40920f11663e33bcddde1e4787fd89 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Sun, 15 Jan 2017 23:16:37 +0000
Subject: [PATCH 222/727] Fix release-notes compilation.

---
 nixos/doc/manual/release-notes/rl-1703.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 099fb05c8b4..0879417d7c8 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -108,7 +108,7 @@ following incompatible changes:</para>
 
 <programlisting>
   let
-    pkgs = import &lt;nixpkgs&gt {};
+    pkgs = import &lt;nixpkgs&gt; {};
   in
     pkgs.overridePackages (self: super: ...)
 </programlisting>
@@ -117,7 +117,7 @@ following incompatible changes:</para>
 
 <programlisting>
   let
-    pkgs = import &lt;nixpkgs&gt {}; in
+    pkgs = import &lt;nixpkgs&gt; {}; in
   in
     import pkgs.path { overlays = [(self: super: ...)] }
 </programlisting>

From 3f3f0d978b277487a981274e9425aca89183aee7 Mon Sep 17 00:00:00 2001
From: Francis St-Amour <m_psyco2@hotmail.com>
Date: Sun, 15 Jan 2017 21:23:39 -0500
Subject: [PATCH 223/727] stumpwm: 0.9.9 -> 1.0.0

---
 pkgs/applications/window-managers/stumpwm/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index ac577385ad4..6d5e53b7088 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -11,6 +11,12 @@ let
   });
   versionSpec = {
     "latest" = {
+      name = "1.0.0";
+      rev = "refs/tags/1.0.0";
+      sha256 = "16r0lwhxl8g71masmfbjr7s7m7fah4ii4smi1g8zpbpiqjz48ryb";
+      patches = [];
+    };
+    "0.9.9" = {
       name = "0.9.9";
       rev = "refs/tags/0.9.9";
       sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k";
@@ -19,8 +25,8 @@ let
     "git" = {
         name = "git-20160617";
         rev = "7d5b5eb76aa656baf5a8713f514937765f66b10a";
-	sha256 = "1jpj978r54086hypjxqxi0r3zacqpkr61dp6dbi0lykgx7m5bjfb";
-	patches = [];
+        sha256 = "1jpj978r54086hypjxqxi0r3zacqpkr61dp6dbi0lykgx7m5bjfb";
+        patches = [];
     };
   }.${version};
 in

From 0c5966b13f9e55130ab98a8a7d693f2a2daf645c Mon Sep 17 00:00:00 2001
From: Scott Olson <scott@solson.me>
Date: Sun, 15 Jan 2017 19:46:07 -0800
Subject: [PATCH 224/727] kdeWrapper: Fix XDG_{DATA,CONFIG}_DIRS mixup.

`.../share` directories go with `XDG_DATA_DIRS`, and `.../etc/xdg`
directories go with `XDG_CONFIG_DIRS`. These were accidentally reversed.

See https://userbase.kde.org/KDE_System_Administration/Environment_Variables#freedesktop.org_Compliance
---
 pkgs/development/libraries/kde-frameworks/kde-wrapper.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
index f0fa991a38a..f5add12e8ec 100644
--- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
+++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
                 makeWrapper "$drv/$t" "$out/$t" \
                     --argv0 '"$0"' \
                     --suffix PATH : "$env/bin" \
-                    --prefix XDG_CONFIG_DIRS : "$env/share" \
-                    --prefix XDG_DATA_DIRS : "$env/etc/xdg" \
+                    --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \
+                    --prefix XDG_DATA_DIRS : "$env/share" \
                     --set QML_IMPORT_PATH "$env/lib/qt5/imports" \
                     --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \
                     --set QT_PLUGIN_PATH "$env/lib/qt5/plugins"

From 9646a52a24a66aabe6fa1b21f80aea8ec5d67bf3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Mon, 16 Jan 2017 12:40:28 +0800
Subject: [PATCH 225/727] syncthing: 0.14.19

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 48a348b699d..16e3c61bcc1 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -7,14 +7,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.14.18";
+  version = "0.14.19";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "099r1n9awznv17ac1fm4ff6az40bvk6xxwaw8x8fx7ikqi1wv8vp";
+    sha256 = "16wpw9ndx3x37mfnymp2fx9n2az9ibyr61zgq3mh2mszzzl7bkcg";
   };
 
   buildInputs = [ go ];

From 75175a04c329c0660701288b28f3f5cc913f23ab Mon Sep 17 00:00:00 2001
From: Jan Suchomel <jansuchomel@gmx.com>
Date: Mon, 16 Jan 2017 09:51:08 +0100
Subject: [PATCH 226/727] vscode: 1.8.0 -> 1.8.1

---
 pkgs/applications/editors/vscode/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 689a1537b69..a5f030bcc1f 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,22 +2,23 @@
   makeWrapper, libXScrnSaver }:
 
 let
-  version = "1.8.0";
-  rev = "38746938a4ab94f2f57d9e1309c51fd6fb37553d";
+  version = "1.8.1";
+  rev = "ee428b0eead68bf0fb99ab5fdc4439be227b6281";
+  channel = "stable";
 
-  sha256 = if stdenv.system == "i686-linux"    then "0p7r1i71v2ab4dzlwh43hqih958a31cqskf64ds4vgc35x2mfjcq"
-      else if stdenv.system == "x86_64-linux"  then "1k15701jskk7w5kwzlzfri96vvw7fcinyfqqafls8nms8h5csv76"
-      else if stdenv.system == "x86_64-darwin" then "12fqz62gs2wcg2wwx1k6gv2gqil9c54yq254vk3rqdf82q9zyapk"
+  sha256 = if stdenv.system == "i686-linux"    then "f48c2eb302de0742612f6c5e4ec4842fa474a85c1bcf421456526c9472d4641f"
+      else if stdenv.system == "x86_64-linux"  then "99bd463707f3a21bc949eec3e857c80aafef8f66e06a295148c1c23875244760"
+      else if stdenv.system == "x86_64-darwin" then "9202c85669853b07d1cbac9e6bcb01e7c08e13fd2a2b759dd53994e0fa51e7a1"
       else throw "Unsupported system: ${stdenv.system}";
 
-  urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/";
+  urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/";
 
   urlStr = if stdenv.system == "i686-linux" then
-        urlBase + "code-stable-code_${version}-1481650382_i386.tar.gz"
+        urlBase + "code-${channel}-code_${version}-1482159060_i386.tar.gz"
       else if stdenv.system == "x86_64-linux" then
-        urlBase + "code-stable-code_${version}-1481651903_amd64.tar.gz"
+        urlBase + "code-${channel}-code_${version}-1482158209_amd64.tar.gz"
       else if stdenv.system == "x86_64-darwin" then
-        urlBase + "VSCode-darwin-stable.zip"
+        urlBase + "VSCode-darwin-${channel}.zip"
       else throw "Unsupported system: ${stdenv.system}";
 in
   stdenv.mkDerivation rec {

From a6e183b42efa1c70eaca87b47408bc505ec0801d Mon Sep 17 00:00:00 2001
From: Jan Suchomel <jansuchomel@gmx.com>
Date: Mon, 16 Jan 2017 10:03:47 +0100
Subject: [PATCH 227/727] vscode: fix .desktop file

---
 pkgs/applications/editors/vscode/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index a5f030bcc1f..97fc30c237c 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -34,10 +34,7 @@ in
       name = "code";
       exec = "code";
       icon = "code";
-      comment = ''
-        Code editor redefined and optimized for building and debugging modern
-        web and cloud applications
-      '';
+      comment = "Code editor redefined and optimized for building and debugging modern web and cloud applications";
       desktopName = "Visual Studio Code";
       genericName = "Text Editor";
       categories = "GNOME;GTK;Utility;TextEditor;Development;";

From 08ddb16865b6b3ea3e079cd6fa6a990ba554c872 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 16 Jan 2017 11:40:45 +0200
Subject: [PATCH 228/727] linux_testing: 4.10-rc2 -> 4.10-rc4

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index b547240eaf2..8f18febdf0d 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10-rc2";
-  modDirVersion = "4.10.0-rc2";
+  version = "4.10-rc4";
+  modDirVersion = "4.10.0-rc4";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1r3w6mqvmjnsmqrk73xsrqybdvs1czjw5xl1x2wsi2w9nifb47zq";
+    sha256 = "0rsi9iw8ag3lcy4yjrr6ipf7zpm3f206anv5xzkn2mi1r4vfndvp";
   };
 
   features.iwlwifi = true;

From ef0f4e70927bfcf00ed53c2015f84a3c862c320b Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Mon, 16 Jan 2017 12:52:29 +0100
Subject: [PATCH 229/727] couchpotato: init at 3.0.1

---
 pkgs/servers/couchpotato/default.nix | 43 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/servers/couchpotato/default.nix

diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix
new file mode 100644
index 00000000000..a996cec0d5b
--- /dev/null
+++ b/pkgs/servers/couchpotato/default.nix
@@ -0,0 +1,43 @@
+{ fetchurl, pythonPackages, lib }:
+
+with pythonPackages;
+
+buildPythonApplication rec {
+  name = "couchpotato-${version}";
+  version = "3.0.1";
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "https://github.com/CouchPotato/CouchPotatoServer/archive/build/${version}.tar.gz";
+    sha256 = "1xwjis3ijh1rff32mpdsphmsclf0lkpd3phpgxkccrigq1m9r3zh";
+  };
+
+  format = "other";
+
+  postPatch = ''
+    substituteInPlace CouchPotato.py --replace "dirname(os.path.abspath(__file__))" "os.path.join(dirname(os.path.abspath(__file__)), '../${python.sitePackages}')"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin/
+    mkdir -p $out/${python.sitePackages}/
+
+    cp -r libs/* $out/${python.sitePackages}/
+    cp -r couchpotato $out/${python.sitePackages}/
+
+    cp CouchPotato.py $out/bin/couchpotato
+    chmod +x $out/bin/*
+  '';
+
+  fixupPhase = ''
+    wrapProgram "$out/bin/couchpotato" --set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}" \
+                                       --set PATH ${python}/bin
+  '';
+
+  meta = {
+    description = "Automatic movie downloading via NZBs and torrents";
+    license     = lib.licenses.gpl3;
+    homepage    = https://couchpota.to/;
+    maintainers = with lib.maintainers; [ fadenb ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c94bd5234f6..18f663c2d92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10222,6 +10222,8 @@ in
     erlang = erlangR16;
   };
 
+  couchpotato = callPackage ../servers/couchpotato {};
+
   dico = callPackage ../servers/dico { };
 
   dict = callPackage ../servers/dict {

From e5f353d5cdaac4a1ad759c53e9358c0880398822 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Mon, 16 Jan 2017 12:53:53 +0100
Subject: [PATCH 230/727] couchpotato module: init

---
 nixos/modules/misc/ids.nix                  |  2 +
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/services/misc/couchpotato.nix | 50 +++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 nixos/modules/services/misc/couchpotato.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 6ab4b24a349..de69ada5bfe 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -282,6 +282,7 @@
       infinoted = 264;
       keystone = 265;
       glance = 266;
+      couchpotato = 267;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -534,6 +535,7 @@
       infinoted = 264;
       keystone = 265;
       glance = 266;
+      couchpotato = 267;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f76852793d4..395d2ecb93c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -242,6 +242,7 @@
   ./services/misc/cpuminer-cryptonight.nix
   ./services/misc/cgminer.nix
   ./services/misc/confd.nix
+  ./services/misc/couchpotato.nix
   ./services/misc/devmon.nix
   ./services/misc/dictd.nix
   ./services/misc/dysnomia.nix
diff --git a/nixos/modules/services/misc/couchpotato.nix b/nixos/modules/services/misc/couchpotato.nix
new file mode 100644
index 00000000000..49648762235
--- /dev/null
+++ b/nixos/modules/services/misc/couchpotato.nix
@@ -0,0 +1,50 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.couchpotato;
+
+in
+{
+  options = {
+    services.couchpotato = {
+      enable = mkEnableOption "CouchPotato Server";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.couchpotato = {
+      description = "CouchPotato Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      preStart = ''
+        mkdir -p /var/lib/couchpotato
+        chown -R couchpotato:couchpotato /var/lib/couchpotato
+      '';
+
+      serviceConfig = {
+        Type = "simple";
+        User = "couchpotato";
+        Group = "couchpotato";
+        PermissionsStartOnly = "true";
+        ExecStart = "${pkgs.couchpotato}/bin/couchpotato";
+        Restart = "on-failure";
+      };
+    };
+
+    users.extraUsers = singleton
+      { name = "couchpotato";
+        group = "couchpotato";
+        home = "/var/lib/couchpotato/";
+        description = "CouchPotato daemon user";
+        uid = config.ids.uids.couchpotato;
+      };
+
+    users.extraGroups = singleton
+      { name = "couchpotato";
+        gid = config.ids.gids.couchpotato;
+      };
+  };
+}

From 339313cf48bad0534ca21cb470a317d3c7c4ca2e Mon Sep 17 00:00:00 2001
From: Dhananjay Balan <dhananjay@cliqz.com>
Date: Mon, 16 Jan 2017 13:21:34 +0100
Subject: [PATCH 231/727] minio: 20160821 -> 20161213

Signed-off-by: Robin Gloster <mail@glob.in>
---
 pkgs/servers/minio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index fef4d55b36c..e7b6fff1b66 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "minio-${shortVersion}";
 
-  shortVersion = "20160821";
-  longVersion = "2016-08-21T02:44:47Z";
+  shortVersion = "20161213";
+  longVersion = "2016-12-13T17:19:42Z";
 
   src = fetchurl {
     url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz";
-    sha256 = "159196bnb4b7f00jh9gll9kqqxq1ifxv1kg5bd6yjpqf5qca4pkn";
+    sha256 = "1x23arrah54q2zqhgpyag531mimvs0wx6ap0hdrn4mygy5dahrqs";
   };
 
   buildInputs = [ go ];

From 52232a61580ab138ef3ccaf2792fbb03e79baf12 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 16 Jan 2017 08:52:42 -0600
Subject: [PATCH 232/727] startkde: run kbuildsycoca5

Fixes #20776. At some point, the call to rebuild the sycoca database at startup
was removed, but it will not be rebuilt automatically because the timestamps in
the Nix store never change.
---
 pkgs/desktops/kde-5/plasma/startkde/startkde.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh
index 63c62f12321..a403e8e05e6 100755
--- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh
+++ b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh
@@ -6,6 +6,8 @@ export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}@QT_PLUGIN_PATH@"
 export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}@QML_IMPORT_PATH@"
 export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}@QML2_IMPORT_PATH@"
 
+kbuildsycoca5
+
 # Set the default GTK 2 theme
 if ! [ -e $HOME/.gtkrc-2.0 ] \
      && [ -e /run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc ]; then

From 69d6fc8e1bf972131520d94a0fb6e15e650fc462 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 16 Jan 2017 08:55:12 -0600
Subject: [PATCH 233/727] kde5.kcoreaddons: 5.30.0 -> 5.30.1

---
 pkgs/development/libraries/kde-frameworks/srcs.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 3b48537afcb..0783c3bd9ed 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -139,11 +139,11 @@
     };
   };
   kcoreaddons = {
-    version = "5.30.0";
+    version = "5.30.1";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kcoreaddons-5.30.0.tar.xz";
-      sha256 = "0h505lcfnngv3wj9h4klygarz6wxmlsk3c3yg7l644rrmbqcwazn";
-      name = "kcoreaddons-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.30/kcoreaddons-5.30.1.tar.xz";
+      sha256 = "0w1yqcvd97jhm3w2x7mmayrifb1swda8lmzzmlz41crsq909ilnd";
+      name = "kcoreaddons-5.30.1.tar.xz";
     };
   };
   kcrash = {

From 7d01fff5160b12f2ce6795c028a1178bcd33805a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 16 Jan 2017 09:15:57 -0600
Subject: [PATCH 234/727] kde5.applications: 16.12.0 -> 16.12.1

---
 pkgs/desktops/kde-5/applications/fetch.sh |    2 +-
 pkgs/desktops/kde-5/applications/srcs.nix | 2224 ++++++++++-----------
 2 files changed, 1113 insertions(+), 1113 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh
index eb1b1654bb8..1ef623fe513 100644
--- a/pkgs/desktops/kde-5/applications/fetch.sh
+++ b/pkgs/desktops/kde-5/applications/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/16.12.0/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/16.12.1/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix
index ae014032851..10bb6936bca 100644
--- a/pkgs/desktops/kde-5/applications/srcs.nix
+++ b/pkgs/desktops/kde-5/applications/srcs.nix
@@ -3,2227 +3,2227 @@
 
 {
   akonadi = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/akonadi-16.12.0.tar.xz";
-      sha256 = "1gqjaxq8b3mcwjm28aqc9kss4p46hga252j27vsg85pzvw58q718";
-      name = "akonadi-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/akonadi-16.12.1.tar.xz";
+      sha256 = "1snf6jdr7yz1ng5whqkjsc89h82a97zj6vw8ijwiqqyas1cifdm3";
+      name = "akonadi-16.12.1.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/akonadi-calendar-16.12.0.tar.xz";
-      sha256 = "1y6yg4f9ayl0il074fln2496pfh6jdsr489yh25jjcs8wf52669h";
-      name = "akonadi-calendar-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/akonadi-calendar-16.12.1.tar.xz";
+      sha256 = "0q2gpk8ci5snlz1v4rwwnrl74damjlz7fvdys875jykdnnb7jsfi";
+      name = "akonadi-calendar-16.12.1.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/akonadi-calendar-tools-16.12.0.tar.xz";
-      sha256 = "0wwchjf2pisbj5hp9hfs8m2bhxgzkxf6c0rj8zv5p66lcl964iad";
-      name = "akonadi-calendar-tools-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/akonadi-calendar-tools-16.12.1.tar.xz";
+      sha256 = "1v9nj1nv4sxvqvd397vr38vscda0r3z80hll7jr8psyx7lyn91jx";
+      name = "akonadi-calendar-tools-16.12.1.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/akonadiconsole-16.12.0.tar.xz";
-      sha256 = "033rx5nqkwyrshacm3bykd8w2c2dffx6wfhm26l7siicaa6kani6";
-      name = "akonadiconsole-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/akonadiconsole-16.12.1.tar.xz";
+      sha256 = "11rqyp7grjijhbl1apjjhc3d9qcxf0mz31l9mgd223vaxkv5lbjs";
+      name = "akonadiconsole-16.12.1.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/akonadi-contacts-16.12.0.tar.xz";
-      sha256 = "1imiv3w78gsk33yiwpkrfzgdlcyqwrzmjid6wwbxjh52rawjvvzc";
-      name = "akonadi-contacts-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/akonadi-contacts-16.12.1.tar.xz";
+      sha256 = "042m4mnvs8a6jgrlyybysm0jax07r1756fixn4kglb0ki3lp57kr";
+      name = "akonadi-contacts-16.12.1.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/akonadi-import-wizard-16.12.0.tar.xz";
-      sha256 = "1nz7ca3457cmlrvmk33hphlm3q2fq3qcq36rmandsv5n1jplfcf5";
-      name = "akonadi-import-wizard-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/akonadi-import-wizard-16.12.1.tar.xz";
+      sha256 = "1ns7y1wqd4zvbgpzlczyailmvf6raqwqrpxxhshdskdd672n849p";
+      name = "akonadi-import-wizard-16.12.1.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/akonadi-mime-16.12.0.tar.xz";
-      sha256 = "06547ixg4054lm8clyfsmkmwc8zai3w9swyw7hyjz257fd0147dr";
-      name = "akonadi-mime-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/akonadi-mime-16.12.1.tar.xz";
+      sha256 = "01bzh2hb73q25jnw9wkragvglr9j89rh079p6k4f898cpjqfvdin";
+      name = "akonadi-mime-16.12.1.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/akonadi-notes-16.12.0.tar.xz";
-      sha256 = "03cadn97fa1jkbpljk0764w8dwv5k1brm1iv554gmag0xky2a6in";
-      name = "akonadi-notes-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/akonadi-notes-16.12.1.tar.xz";
+      sha256 = "1brc53mc1zggqgx6gy9f3vysis3cqyrsn7h02zc49mljycmkri7n";
+      name = "akonadi-notes-16.12.1.tar.xz";
     };
   };
   akonadi-search = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/akonadi-search-16.12.0.tar.xz";
-      sha256 = "08y7rk9i30d3kg61xfzck0a78dyrgb6jzs3w4i7rxq28z374mi2m";
-      name = "akonadi-search-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/akonadi-search-16.12.1.tar.xz";
+      sha256 = "05xdznd4g3jm74n3yjg0w9vh435l0ix4sssmh2z3i2apxak3rxdy";
+      name = "akonadi-search-16.12.1.tar.xz";
     };
   };
   akregator = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/akregator-16.12.0.tar.xz";
-      sha256 = "0ibls40w0wad1gkdj3djmmvdd89pia3fbykqfjwrvnxslr7zfvnl";
-      name = "akregator-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/akregator-16.12.1.tar.xz";
+      sha256 = "1f1hf3r124icy59k829f6yfrk6zy512f3zy9rm5zv33vl5fmc437";
+      name = "akregator-16.12.1.tar.xz";
     };
   };
   analitza = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/analitza-16.12.0.tar.xz";
-      sha256 = "1ws1whss7p5ijyaw7vs5lfvrisljk2b4m6iqbnr1v4n45cr27vrq";
-      name = "analitza-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/analitza-16.12.1.tar.xz";
+      sha256 = "1b07hl516sd7qvrkhv0ihsc83jycyp2dqckziw8g0cm2sj81ymcz";
+      name = "analitza-16.12.1.tar.xz";
     };
   };
   ark = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ark-16.12.0.tar.xz";
-      sha256 = "0gg84p1qaamklgvyqw5pjcdm2934srkvclrvn07jdpcf8xirn51a";
-      name = "ark-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ark-16.12.1.tar.xz";
+      sha256 = "1l78pshhkpyc9fybpypi3kdp7jism1c6lljflncpvxxvk1q16k5m";
+      name = "ark-16.12.1.tar.xz";
     };
   };
   artikulate = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/artikulate-16.12.0.tar.xz";
-      sha256 = "1ahz3kypszfc5smzdblbr47yb320p4sc28frl7b5vvbx2mj77iyi";
-      name = "artikulate-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/artikulate-16.12.1.tar.xz";
+      sha256 = "1v8p494x9dgm6yqw6mfhzkg6hkbb1rnk8x4jfjdsncknfk27ni5b";
+      name = "artikulate-16.12.1.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/audiocd-kio-16.12.0.tar.xz";
-      sha256 = "0hl5qiafp6yqi87qncp1kgd6178jn7bh2paz4fxyc4v92w2mzlcy";
-      name = "audiocd-kio-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/audiocd-kio-16.12.1.tar.xz";
+      sha256 = "1s06lnmzllb4nd24x7bri1g4g77865k1w5gdn46ryfmlhwg4bccm";
+      name = "audiocd-kio-16.12.1.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/baloo-widgets-16.12.0.tar.xz";
-      sha256 = "06w0f54m9bw7640049gl10v6krdm5c0xlb6bjf61ay99mbyv7cgq";
-      name = "baloo-widgets-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/baloo-widgets-16.12.1.tar.xz";
+      sha256 = "0z1109wi0gdz9c8qr278ca1r0ff1p89966245fgg6rcxpm52zzsb";
+      name = "baloo-widgets-16.12.1.tar.xz";
     };
   };
   blinken = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/blinken-16.12.0.tar.xz";
-      sha256 = "0l3l3fjhsxm13m99mvcqgnyw0vmnjvx5akaa3nyx0mfzm1y1iw4v";
-      name = "blinken-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/blinken-16.12.1.tar.xz";
+      sha256 = "0jijzz31iv9v1yv898j6q25y5fmrk8vqsvx7xwcj84ca8qmp9scf";
+      name = "blinken-16.12.1.tar.xz";
     };
   };
   blogilo = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/blogilo-16.12.0.tar.xz";
-      sha256 = "0582dfznwvwc28zqzmbayypgy6kn2gq87q7j1y6q8m0lm017xgqy";
-      name = "blogilo-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/blogilo-16.12.1.tar.xz";
+      sha256 = "11dq36vis770hgmyq119aw2bl99855j5r38f7kr81ad2fjmla54z";
+      name = "blogilo-16.12.1.tar.xz";
     };
   };
   bomber = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/bomber-16.12.0.tar.xz";
-      sha256 = "0qxs0slw4q75bhakmp7di2izi3sz9niq7v0kjincis9vc2l13dd9";
-      name = "bomber-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/bomber-16.12.1.tar.xz";
+      sha256 = "081109mf1lqcc03ba852h021s2i3kwy6nnl3jc4zyn5igkm08cad";
+      name = "bomber-16.12.1.tar.xz";
     };
   };
   bovo = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/bovo-16.12.0.tar.xz";
-      sha256 = "0cmxf4i5zpzc1lc9ggbvbd74i4ks29q915mygdam99b2bzfbq9qv";
-      name = "bovo-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/bovo-16.12.1.tar.xz";
+      sha256 = "1dk0hrpn22v5ia8qnlan0i4wrxbccwl88k9bapxydnrgwyw4vfkx";
+      name = "bovo-16.12.1.tar.xz";
     };
   };
   calendarsupport = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/calendarsupport-16.12.0.tar.xz";
-      sha256 = "11jz7vl8ay4fkxifpyg4vpdw7cl9m8dj6bgbmfw8nhdf8v8m9i6v";
-      name = "calendarsupport-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/calendarsupport-16.12.1.tar.xz";
+      sha256 = "0d74sghas76ry9vyd19fr9hgirvhycljdrvdmrxsh1sxjd04q96g";
+      name = "calendarsupport-16.12.1.tar.xz";
     };
   };
   cantor = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/cantor-16.12.0.tar.xz";
-      sha256 = "0k1ps1dxilikm1qnfpd0fmbxsrqi5mrf2wyl07b67a3sfl7bzw98";
-      name = "cantor-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/cantor-16.12.1.tar.xz";
+      sha256 = "1m7n7n03p7060w7rw3mgzpkv841azv42flrzq4h9589akl91k0js";
+      name = "cantor-16.12.1.tar.xz";
     };
   };
   cervisia = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/cervisia-16.12.0.tar.xz";
-      sha256 = "0c8g3l0q0inyggikqlz7spb32v26lz63ghs1m2cfjagvzisiylbg";
-      name = "cervisia-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/cervisia-16.12.1.tar.xz";
+      sha256 = "1lsg8hb2kgsbygi63hdfbfng2lk7kl8mdksfhkwfa2g4l7sjlcy8";
+      name = "cervisia-16.12.1.tar.xz";
     };
   };
   dolphin = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/dolphin-16.12.0.tar.xz";
-      sha256 = "0dyzlpd7pj21jl4k5j6x6fbxzj7vlp7ww4z82rkld3x7kmmi4b4v";
-      name = "dolphin-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/dolphin-16.12.1.tar.xz";
+      sha256 = "0vpsj1s2hijksay7wblzgk97md4hbrpzzdnrdxmfz3izdnzbyaxh";
+      name = "dolphin-16.12.1.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/dolphin-plugins-16.12.0.tar.xz";
-      sha256 = "0ab62pbvb6n47b86j1bdicahwqvcnv401872f5q08na1zybxklx3";
-      name = "dolphin-plugins-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/dolphin-plugins-16.12.1.tar.xz";
+      sha256 = "1g9sdfmq04incgxj428y5r3k7wgjl77bv95cp3svwd5kxz6syipz";
+      name = "dolphin-plugins-16.12.1.tar.xz";
     };
   };
   dragon = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/dragon-16.12.0.tar.xz";
-      sha256 = "08sasdzd22l8mdzlb0jf780qcy374qg5ngispq78vn2x8zkyk3q2";
-      name = "dragon-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/dragon-16.12.1.tar.xz";
+      sha256 = "14k0q96k1h6b21c5wpwr3bxjngkm1qz3pisv0cvx7dcahy4z20ik";
+      name = "dragon-16.12.1.tar.xz";
     };
   };
   eventviews = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/eventviews-16.12.0.tar.xz";
-      sha256 = "048sgmr3ws48xmfp1h6zyrizyigp2qqhiz3lrwla39iblxi0l4sf";
-      name = "eventviews-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/eventviews-16.12.1.tar.xz";
+      sha256 = "1ghpd7rsfkh2xvy2p8pfxgrabhkq4hbq05n1sqa95zb3ax2q4qwd";
+      name = "eventviews-16.12.1.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ffmpegthumbs-16.12.0.tar.xz";
-      sha256 = "036py6cgkb7zismbffavk3jzjz2lzrh4jbknqrdrwli4fxsxbpi6";
-      name = "ffmpegthumbs-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ffmpegthumbs-16.12.1.tar.xz";
+      sha256 = "19rnqkwbv5dflhhkrczr5hd8qnscvbdfr8kfb3phcai2shgn0pps";
+      name = "ffmpegthumbs-16.12.1.tar.xz";
     };
   };
   filelight = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/filelight-16.12.0.tar.xz";
-      sha256 = "05v0db9n6s3fxn31450biij0w0vf7s4bsvfbyiy3cnf33habgz4d";
-      name = "filelight-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/filelight-16.12.1.tar.xz";
+      sha256 = "0zax3vmynh2aajq24znbdqnxslgkyqmy6n0d9xasi10zq0hli97q";
+      name = "filelight-16.12.1.tar.xz";
     };
   };
   granatier = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/granatier-16.12.0.tar.xz";
-      sha256 = "1hzqqsdq7xj7ackc11yn966cnns82200ff7yc1wiazgivg39l8wj";
-      name = "granatier-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/granatier-16.12.1.tar.xz";
+      sha256 = "1v85cw83gfzd3vwnbmmpbvsz85n6vh7478r572pikq1scgvxpn62";
+      name = "granatier-16.12.1.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/grantlee-editor-16.12.0.tar.xz";
-      sha256 = "049fvgyri9bqm792gyyz6qx7mrriqb3gmdbd2i8zs0x1i1lxfbn7";
-      name = "grantlee-editor-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/grantlee-editor-16.12.1.tar.xz";
+      sha256 = "08jkdcj3nka8r31h76vl9nf2wlmr92ndab8pj42wx7kf7nldbzh1";
+      name = "grantlee-editor-16.12.1.tar.xz";
     };
   };
   grantleetheme = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/grantleetheme-16.12.0.tar.xz";
-      sha256 = "07i2vidzvh9z05iz8xs08w918x7917mckfm1w5agpi4ma8iz8g4b";
-      name = "grantleetheme-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/grantleetheme-16.12.1.tar.xz";
+      sha256 = "1b199870pkg1lkqbyf27b2rn4xqpbkm5hkwr08x65y67cfy1jm8v";
+      name = "grantleetheme-16.12.1.tar.xz";
     };
   };
   gwenview = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/gwenview-16.12.0.tar.xz";
-      sha256 = "0pqzqfb604qfcck2jml65aya6gyjqvx8gnl047mr04yd4x65mjnn";
-      name = "gwenview-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/gwenview-16.12.1.tar.xz";
+      sha256 = "0r1cg3zw98wmbvdfb1cjlqpca30067zzc3w8flrql9rldfbgcp95";
+      name = "gwenview-16.12.1.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/incidenceeditor-16.12.0.tar.xz";
-      sha256 = "1ylkxx7j2dsipcxrdj3cs142hjnz25c76q6jlpwj6p4vv7vzhvq9";
-      name = "incidenceeditor-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/incidenceeditor-16.12.1.tar.xz";
+      sha256 = "0n4fq7pbmnkn9zx96svd6azs89arhpzlnrbjp60vbrpix8r6m0q5";
+      name = "incidenceeditor-16.12.1.tar.xz";
     };
   };
   jovie = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/jovie-16.12.0.tar.xz";
-      sha256 = "0qm853z8g620klmcay955yfc76mb8ggfdx65zrhiiq5nkfaybwkr";
-      name = "jovie-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/jovie-16.12.1.tar.xz";
+      sha256 = "0c5sz80yzkmp18r1c9wcf6n9cg9rj12sax5yx3j3x7gz5p9r5jj0";
+      name = "jovie-16.12.1.tar.xz";
     };
   };
   juk = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/juk-16.12.0.tar.xz";
-      sha256 = "05jk2gp9mcsjjdppahg3r70vjr203wf63mb5kqmdr98gfm9wfm74";
-      name = "juk-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/juk-16.12.1.tar.xz";
+      sha256 = "0v647vlfvq7lm33295v2c8w5qjm8ww9mxmxvvqd4rj35vg419zsb";
+      name = "juk-16.12.1.tar.xz";
     };
   };
   kaccessible = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kaccessible-16.12.0.tar.xz";
-      sha256 = "1mh3610my9l21cq1zyjfk991q1gi6mii0z83zwq83wyi146b42mx";
-      name = "kaccessible-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kaccessible-16.12.1.tar.xz";
+      sha256 = "04j74411rsjyvv7ann1hgb6wmqxk2ym7g6h2y07ld1vdl9kcj1vl";
+      name = "kaccessible-16.12.1.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kaccounts-integration-16.12.0.tar.xz";
-      sha256 = "14v3pifz0diz3dscbyl49bp4fm2ivwdwm6hhxycv69fd221wkx5x";
-      name = "kaccounts-integration-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kaccounts-integration-16.12.1.tar.xz";
+      sha256 = "0d4z9b8w76njnjqsr5w555p3016d0aa5hlsxplac9h82gysdj6q7";
+      name = "kaccounts-integration-16.12.1.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kaccounts-providers-16.12.0.tar.xz";
-      sha256 = "0fiq8zkaz3jyxnphi7z2r6q8xjsqlkzzjcs51akal5dm2cp1i6px";
-      name = "kaccounts-providers-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kaccounts-providers-16.12.1.tar.xz";
+      sha256 = "1aphsn0xwlrsw2snwhzbj4kpwpw09nwsv61lpmp97byl3sq814fw";
+      name = "kaccounts-providers-16.12.1.tar.xz";
     };
   };
   kaddressbook = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kaddressbook-16.12.0.tar.xz";
-      sha256 = "11hnrf1cwjnjysx8wgwnkfj0vkfv7vgv4wdrllnxj5mpx8mcw3k7";
-      name = "kaddressbook-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kaddressbook-16.12.1.tar.xz";
+      sha256 = "14sdkfzmfhfyvy8cky6015gnsz199ngj4ffg9r4qrkkdqcvw5rar";
+      name = "kaddressbook-16.12.1.tar.xz";
     };
   };
   kajongg = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kajongg-16.12.0.tar.xz";
-      sha256 = "1aymlzrw331z8ch46cwpv8x1v4j8ilhz42hzji1x06rh4s0xn5k6";
-      name = "kajongg-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kajongg-16.12.1.tar.xz";
+      sha256 = "0g6amf644q2540y5iyqcv5d25g32hfi13qm3hcc1rmqghz7dn4k4";
+      name = "kajongg-16.12.1.tar.xz";
     };
   };
   kalarm = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kalarm-16.12.0.tar.xz";
-      sha256 = "1kbrq5d854szx6nknyx2jbzmr47xajicaqgjfg59jwbb453mdbkm";
-      name = "kalarm-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kalarm-16.12.1.tar.xz";
+      sha256 = "015hylcqn4z57a9ibhvi5wrngjks8qkp7wg5faiwhx6cvw77jhw7";
+      name = "kalarm-16.12.1.tar.xz";
     };
   };
   kalarmcal = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kalarmcal-16.12.0.tar.xz";
-      sha256 = "16qqk1wqyjxfjnz9jaihcj7mdn8iixvmcm1i0cjfpck0bja9sj0p";
-      name = "kalarmcal-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kalarmcal-16.12.1.tar.xz";
+      sha256 = "061wzn0y5cslgarz8lv73waipp0cahm5am27hc1a9j7y14cbqm16";
+      name = "kalarmcal-16.12.1.tar.xz";
     };
   };
   kalgebra = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kalgebra-16.12.0.tar.xz";
-      sha256 = "0av4k54cil7jl545q5m7klwvw586hcdfpnvq95bcng8is0bnfrgs";
-      name = "kalgebra-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kalgebra-16.12.1.tar.xz";
+      sha256 = "0fyfpsh8pgdnspyaxrnmr93rh2shxrhn0nl0772a5bssw35xgb3x";
+      name = "kalgebra-16.12.1.tar.xz";
     };
   };
   kalzium = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kalzium-16.12.0.tar.xz";
-      sha256 = "03l8dbhhcqaz009g1lxqkq9mci3v0kqx03mxgfdsjq0pzf2hq1ah";
-      name = "kalzium-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kalzium-16.12.1.tar.xz";
+      sha256 = "1ipscw8721sl9kkb4lxpz3bg9pgf0fp3jx1y4643pk6qrrci1mcm";
+      name = "kalzium-16.12.1.tar.xz";
     };
   };
   kamera = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kamera-16.12.0.tar.xz";
-      sha256 = "02q8kbkwg7w2iqn76dchyqhwmx6k2a2q3dz3pn1ah0b0ildqr93n";
-      name = "kamera-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kamera-16.12.1.tar.xz";
+      sha256 = "1rwd88qnbp7ha5rlndbillwhshs6fnv0ppr2gva4m8w9s4sj008q";
+      name = "kamera-16.12.1.tar.xz";
     };
   };
   kanagram = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kanagram-16.12.0.tar.xz";
-      sha256 = "1xsph7983qnpg0zisbrw9r18i98zdy9xrpsdhq89wz895iqrfxqn";
-      name = "kanagram-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kanagram-16.12.1.tar.xz";
+      sha256 = "0rrdav0rigbvi1ya8iwv9h2jjkf4vqcywsb7wxdrksrng35hc57h";
+      name = "kanagram-16.12.1.tar.xz";
     };
   };
   kapman = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kapman-16.12.0.tar.xz";
-      sha256 = "1p8h6xr7na9ihgcvc63c537kd9d4zhhvhim559dbf371cpkfm40l";
-      name = "kapman-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kapman-16.12.1.tar.xz";
+      sha256 = "1wxxk7airpfq43rmwskjkv8r9zyrlb7vzd9ihbsxgacb8i0dvb86";
+      name = "kapman-16.12.1.tar.xz";
     };
   };
   kapptemplate = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kapptemplate-16.12.0.tar.xz";
-      sha256 = "07sd32hkmw07afw65hi4rbzwvxasan01clag4z4smqscibz4dfr1";
-      name = "kapptemplate-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kapptemplate-16.12.1.tar.xz";
+      sha256 = "0k7gvjqfp8iq9z9mc6jvp7f90kysgmqla83qfxqmpin1k5l24p8z";
+      name = "kapptemplate-16.12.1.tar.xz";
     };
   };
   kate = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kate-16.12.0.tar.xz";
-      sha256 = "0n769wn2ja81mzhynqab034a7644nd0dcz3digqcf7hxplcjwcrz";
-      name = "kate-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kate-16.12.1.tar.xz";
+      sha256 = "1p0jf0fwsq28jk3rmck4sv0pnipp4sv1amsjn3m57dcpb0084jlq";
+      name = "kate-16.12.1.tar.xz";
     };
   };
   katomic = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/katomic-16.12.0.tar.xz";
-      sha256 = "1kk7h293qcxmq8wn597xc8awnfr5pbz8gf3h6zicvcmmcl6a2v6r";
-      name = "katomic-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/katomic-16.12.1.tar.xz";
+      sha256 = "1galbrlpj331mxi9a1zivx78v1qjvb1mdbf7nzgsqg9qqdszrx2p";
+      name = "katomic-16.12.1.tar.xz";
     };
   };
   kblackbox = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kblackbox-16.12.0.tar.xz";
-      sha256 = "146x0rj6408d96aw426qcs5h43xw9dash51spys0frsrgnblm7ji";
-      name = "kblackbox-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kblackbox-16.12.1.tar.xz";
+      sha256 = "0782v6dqc8jvzvmsirfjg9ddngx3m9wxjwbj3mahxdn0hjzghxhj";
+      name = "kblackbox-16.12.1.tar.xz";
     };
   };
   kblocks = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kblocks-16.12.0.tar.xz";
-      sha256 = "0h60w4x003ypip5svbda88sxbyxxpjf6kxxfyxniv81hq5vag49d";
-      name = "kblocks-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kblocks-16.12.1.tar.xz";
+      sha256 = "16i9c7w81y70r834g3chv479pv28xvkb8p2b8kapqdl1qci17niw";
+      name = "kblocks-16.12.1.tar.xz";
     };
   };
   kblog = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kblog-16.12.0.tar.xz";
-      sha256 = "1ph86xkjc42m3mysg68xwfy0d364vjqlm4wsn8yx0ag0ndr34vw2";
-      name = "kblog-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kblog-16.12.1.tar.xz";
+      sha256 = "1azg2yp0nbvknkff4d8g2i28l48gvgny1j12aqs540wag9jv8j68";
+      name = "kblog-16.12.1.tar.xz";
     };
   };
   kbounce = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kbounce-16.12.0.tar.xz";
-      sha256 = "0jr0pgdp9nmiikbrnx82ydjkh4mgv0wcqjp7fdfyh1rmcz8r02v1";
-      name = "kbounce-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kbounce-16.12.1.tar.xz";
+      sha256 = "109lik70lqvfpk4b2k5pkcbb9dfn2b9cfl6s3vdybvd8j79w3kcf";
+      name = "kbounce-16.12.1.tar.xz";
     };
   };
   kbreakout = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kbreakout-16.12.0.tar.xz";
-      sha256 = "0pk2hn2bzx3cdxmilsd3rbrvajv2ysipybmd5ca3q65rf8d0l727";
-      name = "kbreakout-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kbreakout-16.12.1.tar.xz";
+      sha256 = "0wfdskc3bqb8cffqc6abgdziqg47k9w06s0w58khzvh6skjafxn5";
+      name = "kbreakout-16.12.1.tar.xz";
     };
   };
   kbruch = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kbruch-16.12.0.tar.xz";
-      sha256 = "1q7zbixix29qcakixra11ffb6x2l64cxigxc9jw40hpggh9rki16";
-      name = "kbruch-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kbruch-16.12.1.tar.xz";
+      sha256 = "058lidgj8b03lkksy0jjrkh4jk7fmajc7sx994bxccb907r9jbav";
+      name = "kbruch-16.12.1.tar.xz";
     };
   };
   kcachegrind = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kcachegrind-16.12.0.tar.xz";
-      sha256 = "0660b13vsky54lfw42nzk136a5pdhdszqr53ahfa2966ij5dswwz";
-      name = "kcachegrind-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kcachegrind-16.12.1.tar.xz";
+      sha256 = "1qr5fgxkzk4ql8ib2bb3m85bx033gxg468860aqkz0im0lf216s4";
+      name = "kcachegrind-16.12.1.tar.xz";
     };
   };
   kcalc = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kcalc-16.12.0.tar.xz";
-      sha256 = "0vx71zv2fs0di28h1g0cvnmawjyadd7jc6z9ahf4w55ycmamxj71";
-      name = "kcalc-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kcalc-16.12.1.tar.xz";
+      sha256 = "0ncq609jil3ssqj8rslxz9pn4cdlbik0y93rc6mvw4hgk0p0yfgv";
+      name = "kcalc-16.12.1.tar.xz";
     };
   };
   kcalcore = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kcalcore-16.12.0.tar.xz";
-      sha256 = "0f86yz4jrrfvf869kppmms4l3w8xwaygjqa1wqxrrmm7wsvrysd7";
-      name = "kcalcore-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kcalcore-16.12.1.tar.xz";
+      sha256 = "167c8rl5zqfbnk5ricy0lrw8jjyqm5j5d39d2xgf6p5hd3lqw22f";
+      name = "kcalcore-16.12.1.tar.xz";
     };
   };
   kcalutils = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kcalutils-16.12.0.tar.xz";
-      sha256 = "088lbl9zgjbrhy0ahjmjn8qx8gd10171jprab7d083ny7crx27ik";
-      name = "kcalutils-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kcalutils-16.12.1.tar.xz";
+      sha256 = "1p36vhk3ylvw1zn82pahg3grwl6ag4rdwn8lzgf9day3bdr9fr8h";
+      name = "kcalutils-16.12.1.tar.xz";
     };
   };
   kcharselect = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kcharselect-16.12.0.tar.xz";
-      sha256 = "1pcphx845r0kjah94n1b2j7fmrrqy4kvrhiyc40wmqp12fp0km8b";
-      name = "kcharselect-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kcharselect-16.12.1.tar.xz";
+      sha256 = "0fv989ff94bhlhapk1irwkdghx8vq19n5b208qkrbfna5jzs0nfz";
+      name = "kcharselect-16.12.1.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kcolorchooser-16.12.0.tar.xz";
-      sha256 = "0zdkpn0i53wv49ynwmkz0pd0yvh1f2fjkdgqrs8i4bslipp0411z";
-      name = "kcolorchooser-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kcolorchooser-16.12.1.tar.xz";
+      sha256 = "1vq72gm73vpmjb635cmjx25cfx5rgvpmapjkw6yhdpp9bdv3xs3z";
+      name = "kcolorchooser-16.12.1.tar.xz";
     };
   };
   kcontacts = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kcontacts-16.12.0.tar.xz";
-      sha256 = "1qxxh7bqadrbq28b9fmjj748az9ir6rznn179pvlr2v32ch25vrw";
-      name = "kcontacts-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kcontacts-16.12.1.tar.xz";
+      sha256 = "10g2r62db7mbfrkr8qjf7m4kl7c9ybv5l3ci37mabkvnnnacqqni";
+      name = "kcontacts-16.12.1.tar.xz";
     };
   };
   kcron = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kcron-16.12.0.tar.xz";
-      sha256 = "1cqx4k384kk3g48qp9vdxd46cijzdskay3a67k7jwszinjnhqgbx";
-      name = "kcron-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kcron-16.12.1.tar.xz";
+      sha256 = "00ipxmfm5wvj3szjlw550xsm3cpcm27wnvwbffxjpikzipzrhsr9";
+      name = "kcron-16.12.1.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdebugsettings-16.12.0.tar.xz";
-      sha256 = "1nkqqcrbkwfcvnqylniqlwlay4x2ma2i7jdp0msm2yr2q743k01l";
-      name = "kdebugsettings-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdebugsettings-16.12.1.tar.xz";
+      sha256 = "0valppahimpdj00gbvhasqq12d2rvl4i16cqc7g9q5mbmr51fs3y";
+      name = "kdebugsettings-16.12.1.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-dev-scripts-16.12.0.tar.xz";
-      sha256 = "1qadnwi4ph4hdjzfrjfqr4idw8ky4j14mc37w7r7025mdlfbj06n";
-      name = "kde-dev-scripts-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-dev-scripts-16.12.1.tar.xz";
+      sha256 = "11b4mbxs22x78qzz4dnq15cgvjsb3z8w23xz4x6af8vd6dizy8xc";
+      name = "kde-dev-scripts-16.12.1.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-dev-utils-16.12.0.tar.xz";
-      sha256 = "039i3by9hl3h6yc1bbkf4y1bx3gxclncx69mh0z4fh5h58z5vz1r";
-      name = "kde-dev-utils-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-dev-utils-16.12.1.tar.xz";
+      sha256 = "1acadqsi5sv3dbdxrlil8a5yrhgqvvibi05sdvvqzmz0c1fw6w0k";
+      name = "kde-dev-utils-16.12.1.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdeedu-data-16.12.0.tar.xz";
-      sha256 = "144px97jyfc258cwaqp8jw8jfnw22bnpa4p48mzxdl70p0q6maal";
-      name = "kdeedu-data-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdeedu-data-16.12.1.tar.xz";
+      sha256 = "1axg6k0jwnpsfbk5mis17fnsacdlf9p8pfqy8qp83l0n8pink1nb";
+      name = "kdeedu-data-16.12.1.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdegraphics-mobipocket-16.12.0.tar.xz";
-      sha256 = "1wpnijyvacajz96zaqa0185qwbg1ma5c1lvkzd1ww6h04dychfvi";
-      name = "kdegraphics-mobipocket-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdegraphics-mobipocket-16.12.1.tar.xz";
+      sha256 = "0a59irbkwcvf81jj0rqf9fb1ks6crk4xrrqzp0l0h0hjza7qmk6n";
+      name = "kdegraphics-mobipocket-16.12.1.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdegraphics-thumbnailers-16.12.0.tar.xz";
-      sha256 = "1r8f1167sqnd4qd9ibgknp1w9jfbw4yr2rcyp62xi3xlp04mn9fm";
-      name = "kdegraphics-thumbnailers-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdegraphics-thumbnailers-16.12.1.tar.xz";
+      sha256 = "08qj67xkij6g8hzs5wj4c53pwnm711y54qdcrnrl4cpbcfvcynzd";
+      name = "kdegraphics-thumbnailers-16.12.1.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ar-16.12.0.tar.xz";
-      sha256 = "1hz9bi8z3z2vgxbmsqv8vp4pi03gg6vjnxcf1jngc7jix91iqaf4";
-      name = "kde-l10n-ar-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ar-16.12.1.tar.xz";
+      sha256 = "0s4a05zl66xks3kixf07z1s05y932qb5ssz1njwas6j8sx7dxvl5";
+      name = "kde-l10n-ar-16.12.1.tar.xz";
     };
   };
   kde-l10n-ast = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ast-16.12.0.tar.xz";
-      sha256 = "1kj0l96wz5j1s8kr5za9az62v7qgw1z9ig4m38hxb9635m2zrp59";
-      name = "kde-l10n-ast-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ast-16.12.1.tar.xz";
+      sha256 = "0dk2wcb3yd9lgc5j0imkfsclir54za83g5kqkyf7a81fwy799ndm";
+      name = "kde-l10n-ast-16.12.1.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-bg-16.12.0.tar.xz";
-      sha256 = "0xy5icllcq56lmqrpnmyja8kycnr3njzg1adrr2dnvdhwgjm8knj";
-      name = "kde-l10n-bg-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-bg-16.12.1.tar.xz";
+      sha256 = "15qz82sbmyxi1gj62d36a6hdx1q9fmg8b9wchxkbls84429ancgz";
+      name = "kde-l10n-bg-16.12.1.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-bs-16.12.0.tar.xz";
-      sha256 = "1wrdqcargx9qfmkmk0scwvrb1x5dqcxfba1mj44biijzxmaxy6v7";
-      name = "kde-l10n-bs-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-bs-16.12.1.tar.xz";
+      sha256 = "1jqcib98rs2albx9vxcn2cnk23rx05pk2fhd4mgbcdcx7vmj2ws3";
+      name = "kde-l10n-bs-16.12.1.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ca-16.12.0.tar.xz";
-      sha256 = "0w8k81jar52hy60cwdn5l6n3d535cyvf72rdsshs148s4hpx1naz";
-      name = "kde-l10n-ca-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ca-16.12.1.tar.xz";
+      sha256 = "0vnvpnrxfasfmkahmvs28x2kbq7rb725nspgp9y96m58brwis4h9";
+      name = "kde-l10n-ca-16.12.1.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-16.12.0";
+    version = "ca_valencia-16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ca@valencia-16.12.0.tar.xz";
-      sha256 = "1raj2w8ixaxi43nh44z19xd9m2iqg5b2wrqccd8pjyip73c1la3q";
-      name = "kde-l10n-ca_valencia-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ca@valencia-16.12.1.tar.xz";
+      sha256 = "0mhiwqih6z4cj9hwksnkiad29l4bn9bvbnngnh5dgz8m566471sq";
+      name = "kde-l10n-ca_valencia-16.12.1.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-cs-16.12.0.tar.xz";
-      sha256 = "143h9gkb2l5h3fm6phv07x0az5i7fzs9m53xck71wpahz1z244km";
-      name = "kde-l10n-cs-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-cs-16.12.1.tar.xz";
+      sha256 = "033yzzvs8cb747fnjjy982y6sadprmwbjhpxy2icgkhppimyi90y";
+      name = "kde-l10n-cs-16.12.1.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-da-16.12.0.tar.xz";
-      sha256 = "03p1npjikfmb3a1hgmcd14lx3x9vfvf1x3mzz25493wlwzkb5lbm";
-      name = "kde-l10n-da-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-da-16.12.1.tar.xz";
+      sha256 = "01kwa0swc2jg870v60hp01hkksw4h85644qf0capq84diqy370j9";
+      name = "kde-l10n-da-16.12.1.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-de-16.12.0.tar.xz";
-      sha256 = "146zb25f54ig4zkmys4wq5j057k9ajfp9jyyfqmmpch33567llb6";
-      name = "kde-l10n-de-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-de-16.12.1.tar.xz";
+      sha256 = "0rlv3mqd1m7vk29ywlhs11zspgzzlhvai25w1j3cj89mbsyryqja";
+      name = "kde-l10n-de-16.12.1.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-el-16.12.0.tar.xz";
-      sha256 = "0vcf8wi1wd358hs1ynyil2ahb26w9dp8snlszyhr63zbg9qwwic4";
-      name = "kde-l10n-el-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-el-16.12.1.tar.xz";
+      sha256 = "087nj0w3r9vs9ph8459jy26bmyj9dq1q8hwww40dsvi6lg4pm09m";
+      name = "kde-l10n-el-16.12.1.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-16.12.0";
+    version = "en_GB-16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-en_GB-16.12.0.tar.xz";
-      sha256 = "1bvcgasl672xawfd8alwcindyj16j5p3cplqndw4z1pybnsmzgmk";
-      name = "kde-l10n-en_GB-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-en_GB-16.12.1.tar.xz";
+      sha256 = "0wf6kwb2i5lp5j2mhh4sdj14w6gzgmpz4avjvxsydal13mcvb8q0";
+      name = "kde-l10n-en_GB-16.12.1.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-eo-16.12.0.tar.xz";
-      sha256 = "1sln4krw8l8zm3q4h7q7rhd5lf7s7rfb6n73wybxmwypawyz0qqn";
-      name = "kde-l10n-eo-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-eo-16.12.1.tar.xz";
+      sha256 = "1qbb3pcvyszfmjzl1jcwhj3fybfza181wnm28jzw2c68s7n7f18s";
+      name = "kde-l10n-eo-16.12.1.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-es-16.12.0.tar.xz";
-      sha256 = "1kp1ihmlkkg053bplsjbbiixp0yzidd4gidpcj9axsa74f04084w";
-      name = "kde-l10n-es-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-es-16.12.1.tar.xz";
+      sha256 = "1whwbaxklr972w0s6ck277ql5vhh2v15dnw3gfasp5k5rx1g1rcb";
+      name = "kde-l10n-es-16.12.1.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-et-16.12.0.tar.xz";
-      sha256 = "0w48lirqnsgk78hkiam8cc7r7h5h4mrd7b8wssvxwbknyz33jfkz";
-      name = "kde-l10n-et-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-et-16.12.1.tar.xz";
+      sha256 = "0jlx8rf4y7mdwcmc9ypyi2rm09mddmpz2l2p0k1p2fb3596n6yg8";
+      name = "kde-l10n-et-16.12.1.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-eu-16.12.0.tar.xz";
-      sha256 = "0mpjr6yklvvfjhrssvn1m27gqs7r9jvdr0prp6yss8v00ij9i3ig";
-      name = "kde-l10n-eu-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-eu-16.12.1.tar.xz";
+      sha256 = "0x8pmxdnzzxbki9r66y5ha44q6j7sihjkn6y5psqrqghrgxmg11b";
+      name = "kde-l10n-eu-16.12.1.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-fa-16.12.0.tar.xz";
-      sha256 = "167lq8fnlfhrmvivzpznmv7x82izs9jdl6w4p8dg2i3801jwi9ff";
-      name = "kde-l10n-fa-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-fa-16.12.1.tar.xz";
+      sha256 = "0m886zx1kp6aykwcmrhc6w2g20va3sskwjg5l03lb0dq2g4b8nlv";
+      name = "kde-l10n-fa-16.12.1.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-fi-16.12.0.tar.xz";
-      sha256 = "19y8jrxfl0nh4dcrl7sdz8r9cyka3cjg0dp8cs84v5c10fab4w8l";
-      name = "kde-l10n-fi-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-fi-16.12.1.tar.xz";
+      sha256 = "0mcz0cc1wzrfhbacgxas9wlk9jczbnbbdb96q0dypj7vbwdw15j2";
+      name = "kde-l10n-fi-16.12.1.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-fr-16.12.0.tar.xz";
-      sha256 = "1p487x8jsihxn7lrjmssi6i3is01498szblqn84yc8bgc7pgfdly";
-      name = "kde-l10n-fr-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-fr-16.12.1.tar.xz";
+      sha256 = "07ax7ldfjzvrlkwh1bl4y1j8ngq5rgnikykjqc0iy5g8vv71pb24";
+      name = "kde-l10n-fr-16.12.1.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ga-16.12.0.tar.xz";
-      sha256 = "0avpkwmdac9c8n8l0ddssgmn2pk9lkn7zhs532ird8axv4i9ynk4";
-      name = "kde-l10n-ga-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ga-16.12.1.tar.xz";
+      sha256 = "19gqdnih89cbqjxdxxj6mv1528z0kqhh020pf6cnb638k6fw2jpf";
+      name = "kde-l10n-ga-16.12.1.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-gl-16.12.0.tar.xz";
-      sha256 = "1qdwfxgaqbymgqwmpki3zk3d5h18fmb7n62basn2yqhbj7cdpkil";
-      name = "kde-l10n-gl-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-gl-16.12.1.tar.xz";
+      sha256 = "03bwvly40j9ynh6gqxjxq3p9rqdiwclm3iyn6iwa0ri1y8jix0dy";
+      name = "kde-l10n-gl-16.12.1.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-he-16.12.0.tar.xz";
-      sha256 = "19nkvhs7gjrcxsynraqmgvif1n5m1zmjm6j7h1zviqmwcn9zncj4";
-      name = "kde-l10n-he-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-he-16.12.1.tar.xz";
+      sha256 = "0zj9ppvj6k2wxsp0f8drrrwhb93xlgggskhyp93dcb7d6dpl561x";
+      name = "kde-l10n-he-16.12.1.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-hi-16.12.0.tar.xz";
-      sha256 = "1m5qlc3mf9ns7ka8kmj5c2iqaqkb68hcab13hp5y5j4i7miqpp6d";
-      name = "kde-l10n-hi-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-hi-16.12.1.tar.xz";
+      sha256 = "0l8aa97mkl0csz3yrq8ib1ypdwiir47nhnll8zgw8gxh97rzkr4w";
+      name = "kde-l10n-hi-16.12.1.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-hr-16.12.0.tar.xz";
-      sha256 = "1lbf25apks10c1byy0z8zjsfqd7f07xzhpdrinxbpdsa69ln28k2";
-      name = "kde-l10n-hr-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-hr-16.12.1.tar.xz";
+      sha256 = "1azp8rpai0v7wyqm8a8cfw8dnx9053nmb9cjps4jxvzfcxggbb1x";
+      name = "kde-l10n-hr-16.12.1.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-hu-16.12.0.tar.xz";
-      sha256 = "0m2pv1zddfflpgmvab84j19b0nb7fymslqy2pzcdx6ga9f0k37gl";
-      name = "kde-l10n-hu-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-hu-16.12.1.tar.xz";
+      sha256 = "111g42krxx41zph5h02mrxd8zj31gfpji9ai7hw88h089gxy1c0z";
+      name = "kde-l10n-hu-16.12.1.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ia-16.12.0.tar.xz";
-      sha256 = "0x6h4k29s6pqd0k6c7lv15pa6837a59g5dskfph38kjdiv8lfwvq";
-      name = "kde-l10n-ia-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ia-16.12.1.tar.xz";
+      sha256 = "0bncwdnwa7bzm5n5gac3f44qai9z6ymwgn72g3fr9g8lw0a48h2m";
+      name = "kde-l10n-ia-16.12.1.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-id-16.12.0.tar.xz";
-      sha256 = "12ysf2q9cjfmsc00p6rdwhykbwvhzq6n5j0i296506hhmvbz2n15";
-      name = "kde-l10n-id-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-id-16.12.1.tar.xz";
+      sha256 = "0nqnl8aisvvmx4rrycyixarjrkq8cil6wq9xyxd1gv6r3wyxi25i";
+      name = "kde-l10n-id-16.12.1.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-is-16.12.0.tar.xz";
-      sha256 = "1042skag9p1d1x1yg0jr8a3k1qsbr65nrswvmi2bqxmv59ls60zz";
-      name = "kde-l10n-is-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-is-16.12.1.tar.xz";
+      sha256 = "0afkgwz3rqsl5fmvi7lij4krwkal9qcfgafpqfsgxh053ip4h97r";
+      name = "kde-l10n-is-16.12.1.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-it-16.12.0.tar.xz";
-      sha256 = "0q44bcan48rjngc892prgqd0nyagh0wsha47hhxb9lm5cnf8kzis";
-      name = "kde-l10n-it-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-it-16.12.1.tar.xz";
+      sha256 = "0bjbq21w7pm88ij5p69rjg5a5plbk5kblf760zyxw19dhmj1rx98";
+      name = "kde-l10n-it-16.12.1.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ja-16.12.0.tar.xz";
-      sha256 = "100wlprb149vpccypw5i0f6jj3f9yb77rkifn65h8brfmiiynisa";
-      name = "kde-l10n-ja-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ja-16.12.1.tar.xz";
+      sha256 = "0y05zaw7a6xyvzkc0zy5snlxzpdmh796h1nm6hqjr3l1w65anj0x";
+      name = "kde-l10n-ja-16.12.1.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-kk-16.12.0.tar.xz";
-      sha256 = "045sni4cb70r94zb3vgprplr2nnpixbdx80c7cc99m2z4dd9bk01";
-      name = "kde-l10n-kk-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-kk-16.12.1.tar.xz";
+      sha256 = "16ca99aaqmg4n9lp0h554s399kxmk42i6qlkaw3slzr9s2ljbb70";
+      name = "kde-l10n-kk-16.12.1.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-km-16.12.0.tar.xz";
-      sha256 = "025cp9xpqa1hiax5lwpbqabdcdjpkm3szcbhwf607gz51ck6l4q3";
-      name = "kde-l10n-km-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-km-16.12.1.tar.xz";
+      sha256 = "0sm0v7y9lpzzdagvbjybj8ym0ihr26j4slmga4izr9i035rid24m";
+      name = "kde-l10n-km-16.12.1.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ko-16.12.0.tar.xz";
-      sha256 = "1aga8cmf2mv5746b5ix6j2ims2xp7s1mmn8dksipj0inrg9bim3b";
-      name = "kde-l10n-ko-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ko-16.12.1.tar.xz";
+      sha256 = "0g54fz1z611i6r49ahr54mz40950w8yv8ii4w6gx66yh7m805czw";
+      name = "kde-l10n-ko-16.12.1.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-lt-16.12.0.tar.xz";
-      sha256 = "1rf1rwq4gzpcifpki1dx8iw7yv9fdyqrkbg96pnp47lynbdkp63s";
-      name = "kde-l10n-lt-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-lt-16.12.1.tar.xz";
+      sha256 = "19z5fwsv67pm5fj62g5vsjy56614kwv198sh9wr06b0c1122a33s";
+      name = "kde-l10n-lt-16.12.1.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-lv-16.12.0.tar.xz";
-      sha256 = "0hn4c453fj3r7bscl5zr4n42cpxxxs738fc24cz34yjcxq19fgc3";
-      name = "kde-l10n-lv-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-lv-16.12.1.tar.xz";
+      sha256 = "0q8ni73yyfkqzc4kdh9cm7518pvczjbf7z27fy662vpx6bdw8dab";
+      name = "kde-l10n-lv-16.12.1.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-mr-16.12.0.tar.xz";
-      sha256 = "04jljwj8kk2h5bqxfcpwnmig457w8141q1ckk91nfv4927gq3im3";
-      name = "kde-l10n-mr-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-mr-16.12.1.tar.xz";
+      sha256 = "143s0ldvz1lkq1mc3cv4xifhrmiqbqavval40dn5w78f3qsb2h6q";
+      name = "kde-l10n-mr-16.12.1.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nb-16.12.0.tar.xz";
-      sha256 = "16msjakcjlg6q9lk1bslayy1gsa2s3gf0b9gy1nkw3v09df93hv6";
-      name = "kde-l10n-nb-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nb-16.12.1.tar.xz";
+      sha256 = "100ykwdw4nhwahijn9mqp1y9cyllw8i7dy9lyhvhw4zw1r89nbyj";
+      name = "kde-l10n-nb-16.12.1.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nds-16.12.0.tar.xz";
-      sha256 = "1jfswrb3z3q39pfgv7m1jzb1nigchfdnjg26zc1wmw8n6b544yhs";
-      name = "kde-l10n-nds-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nds-16.12.1.tar.xz";
+      sha256 = "0gn35547hjya99bxzf47frh3y2jm6vgmwfc822s7hr7a629bdvmv";
+      name = "kde-l10n-nds-16.12.1.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nl-16.12.0.tar.xz";
-      sha256 = "1i9z5bp76gz8w58qzmgi5b90xbfar0ypjyhmnfksdzvpgd571lmq";
-      name = "kde-l10n-nl-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nl-16.12.1.tar.xz";
+      sha256 = "0a11cqn7brvxfbh497qmqivdki0hwbgjnmlp1y438xgnmmny8kr8";
+      name = "kde-l10n-nl-16.12.1.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-nn-16.12.0.tar.xz";
-      sha256 = "1fvva9p572fi05z2542pfyx3wjycld1ap1zqgzlmk6j28a3ifzcb";
-      name = "kde-l10n-nn-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nn-16.12.1.tar.xz";
+      sha256 = "1s43fh3kc0w9cd0fnwhb04hm8q2la5s5qkx9dadc0v8mwxnr56k9";
+      name = "kde-l10n-nn-16.12.1.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pa-16.12.0.tar.xz";
-      sha256 = "0dqn7bijj6k8hp20nvh79jwzz1dnkx0py125b0isvjpakslqwf3p";
-      name = "kde-l10n-pa-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pa-16.12.1.tar.xz";
+      sha256 = "1zzv3bjn159a4lapfiqcvhdlvvac29q5h42jc7w1kfbv15byykz8";
+      name = "kde-l10n-pa-16.12.1.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pl-16.12.0.tar.xz";
-      sha256 = "1l3ja8j4pw75qzaswli8a7c0qd1ac272dblx597njcs8iqgs6y3l";
-      name = "kde-l10n-pl-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pl-16.12.1.tar.xz";
+      sha256 = "07l5vfchiwwszxfw3fpidh869049wg9fkjkjzpf0hvqgknlii2va";
+      name = "kde-l10n-pl-16.12.1.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pt-16.12.0.tar.xz";
-      sha256 = "0riyk5sz63sv8cfx8s25hw5l9g0052fbbq7m8srmc79hhw4w3p5h";
-      name = "kde-l10n-pt-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pt-16.12.1.tar.xz";
+      sha256 = "14cp6mm740v8fwc2p8c1w164yl925wk5ysz19527g6nmydfww3f0";
+      name = "kde-l10n-pt-16.12.1.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-16.12.0";
+    version = "pt_BR-16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-pt_BR-16.12.0.tar.xz";
-      sha256 = "0a3nhv7m5jkzsw158i5fbhlxz0p1pgn6rnzdja25v8hs3jqnzcq4";
-      name = "kde-l10n-pt_BR-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pt_BR-16.12.1.tar.xz";
+      sha256 = "173yjk28hbvgjcr07p99svw2z5g3bb58ln2cv50lckj0lmr4j379";
+      name = "kde-l10n-pt_BR-16.12.1.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ro-16.12.0.tar.xz";
-      sha256 = "0qs8dlcvh2366g0ifcwd7s5kg3q28bagpp8sm5zliyd79fh60mhh";
-      name = "kde-l10n-ro-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ro-16.12.1.tar.xz";
+      sha256 = "1jakhzs21417rd6cafq6p1qda3w3w0vq8v4lp45nas45iij2f9vr";
+      name = "kde-l10n-ro-16.12.1.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ru-16.12.0.tar.xz";
-      sha256 = "0mk6h5fyna5qbq97mxwfihcjfg8lv7w5r1kis505ds6icym2pkzz";
-      name = "kde-l10n-ru-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ru-16.12.1.tar.xz";
+      sha256 = "05hxgd4dpqdvyhbn1vj64x7h00iylwl2cih4myb77pcjw0hdpgi4";
+      name = "kde-l10n-ru-16.12.1.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sk-16.12.0.tar.xz";
-      sha256 = "0qvgsjc9dbqfydg5zpygncpapw3df68yd1ham5d36v0c3k5161wi";
-      name = "kde-l10n-sk-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sk-16.12.1.tar.xz";
+      sha256 = "0rhjqsa15xp99k67yy88qp2v7pi1i29v7kr1jvvwrfn4byrgjr5f";
+      name = "kde-l10n-sk-16.12.1.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sl-16.12.0.tar.xz";
-      sha256 = "15lia25c9nasp6w6y1xvnnhkxb3977rdbl4zcanla7da6ma7h8yd";
-      name = "kde-l10n-sl-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sl-16.12.1.tar.xz";
+      sha256 = "00p4j40f5sbsfnbmnfj6hciq2817m41ii81m6g3ckg3fyv184vbh";
+      name = "kde-l10n-sl-16.12.1.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sr-16.12.0.tar.xz";
-      sha256 = "1irjpki6pnnkxdp49vw61caixfhkjgahdgx14cayb4zi16qsmn7p";
-      name = "kde-l10n-sr-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sr-16.12.1.tar.xz";
+      sha256 = "18k4nhbiriq0wng0jr51wbkgi6hzwn7g3r2aqh57gsf50z5rjj6k";
+      name = "kde-l10n-sr-16.12.1.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-sv-16.12.0.tar.xz";
-      sha256 = "0a9jh60bz6xjq1ckyw2v67w9sdsjdlajlcbkb3jl021l8f5hywpx";
-      name = "kde-l10n-sv-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sv-16.12.1.tar.xz";
+      sha256 = "0ca6gyxfvss3sxl3lxb9jf6ac2fb1lnz5bs4imrgxly1wphzd66p";
+      name = "kde-l10n-sv-16.12.1.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-tr-16.12.0.tar.xz";
-      sha256 = "0i3sigwhrj36dmv2li9qqdshd3zh4p8sa9zgngfvz1942x32yi8x";
-      name = "kde-l10n-tr-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-tr-16.12.1.tar.xz";
+      sha256 = "10j649xb1zvn9zp9i0zmsmc6bwx08wgm0a3y66213w2framsx9fn";
+      name = "kde-l10n-tr-16.12.1.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-ug-16.12.0.tar.xz";
-      sha256 = "04mw7h9pyrbfvhx3mbp16czzawbqi9kn83nakysgkyy7dri1rl4g";
-      name = "kde-l10n-ug-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ug-16.12.1.tar.xz";
+      sha256 = "0dr23z6f9azvxnagdsyzgbwqr0xknricxwm6lykqdaa1r4s3mnzs";
+      name = "kde-l10n-ug-16.12.1.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-uk-16.12.0.tar.xz";
-      sha256 = "0iwzqvr677sqmgl4jdpawfnrf63k0x4xm3p29lbb2hpqnc0xmmpy";
-      name = "kde-l10n-uk-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-uk-16.12.1.tar.xz";
+      sha256 = "0cxjz1d07429z0fasppjl8p0gr9a4ylz8ymcx3pqmaa872sgg7h6";
+      name = "kde-l10n-uk-16.12.1.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-wa-16.12.0.tar.xz";
-      sha256 = "057kpzn50rs625ri737kjgn9zy8vxdaxmjlhk777piq5pq6id9s1";
-      name = "kde-l10n-wa-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-wa-16.12.1.tar.xz";
+      sha256 = "1pdzr1hs0zr31qv11n029chjgbwi7si8nas26y8wz5xxbfrjrb07";
+      name = "kde-l10n-wa-16.12.1.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-16.12.0";
+    version = "zh_CN-16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-zh_CN-16.12.0.tar.xz";
-      sha256 = "0313ph852wygmws225534nv2ldmd5kvky3vl5nmcwg5fryc0dq7i";
-      name = "kde-l10n-zh_CN-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-zh_CN-16.12.1.tar.xz";
+      sha256 = "04bxkjdpld13i609dircbdh8zknlsn9jcwy4nvcwa1p2xf04dr5z";
+      name = "kde-l10n-zh_CN-16.12.1.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-16.12.0";
+    version = "zh_TW-16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-l10n/kde-l10n-zh_TW-16.12.0.tar.xz";
-      sha256 = "0vfj5zdwrqzd34nxja8lwk93m9hiw3dzmbkaf9k5a7cpkqwnhf5s";
-      name = "kde-l10n-zh_TW-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-zh_TW-16.12.1.tar.xz";
+      sha256 = "0wmcf8v3c68a4mfqzfy1dxdyb1bx29ak1zy8skmrvshn1arfhyab";
+      name = "kde-l10n-zh_TW-16.12.1.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.27";
+    version = "4.14.28";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdelibs-4.14.27.tar.xz";
-      sha256 = "1cngdvkpwdwbl5b40q00h9ivnpqbnjbd7kkfvsma7rlgg7wfg7xp";
-      name = "kdelibs-4.14.27.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdelibs-4.14.28.tar.xz";
+      sha256 = "1r2dyr723w75yh65zgpzg9irm0jx3nsywa9zxw1xgls4p8xksyy0";
+      name = "kdelibs-4.14.28.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdenetwork-filesharing-16.12.0.tar.xz";
-      sha256 = "1icsranvsyvxrnlg9lm034i6xf247sqxdgcvrfqjw35rf047yp0d";
-      name = "kdenetwork-filesharing-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdenetwork-filesharing-16.12.1.tar.xz";
+      sha256 = "100pagqj2y2jdzn5b37zyiab382dmx7j4kdwyrrnz6rzsr0lm9pr";
+      name = "kdenetwork-filesharing-16.12.1.tar.xz";
     };
   };
   kdenlive = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdenlive-16.12.0.tar.xz";
-      sha256 = "1qsnjya1sppn5dfx8lanxqpgakd5jgi7677wq7vvyz3v9i47zvmc";
-      name = "kdenlive-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdenlive-16.12.1.tar.xz";
+      sha256 = "13bn0i7qyw4cil5cp0s1ynx80y2xp9wzbycmw9mcvbi66clyk9dw";
+      name = "kdenlive-16.12.1.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdepim-addons-16.12.0.tar.xz";
-      sha256 = "1a063qxmal8n5rd2a6v05zml61l52sm33574vqxybh1bnx2dpq58";
-      name = "kdepim-addons-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdepim-addons-16.12.1.tar.xz";
+      sha256 = "1yaymzyh6rg1b17d556v5prbd4y46kph33r55riq5mbzfwfwx85j";
+      name = "kdepim-addons-16.12.1.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdepim-apps-libs-16.12.0.tar.xz";
-      sha256 = "1zm2mnwsxk4c58dbx3ln26mz89f1d20vywiljczfzpn99rg4cvvi";
-      name = "kdepim-apps-libs-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdepim-apps-libs-16.12.1.tar.xz";
+      sha256 = "14sx43g7fi62g278m95mjpfixwcyrj2qrz0hlp3zzlcjpq0ra9zv";
+      name = "kdepim-apps-libs-16.12.1.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdepim-runtime-16.12.0.tar.xz";
-      sha256 = "0vkmjh0l5yzpd9rmnyc2cchwpk9ccyk79g2ii5qg6xxr46r1vmfs";
-      name = "kdepim-runtime-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdepim-runtime-16.12.1.tar.xz";
+      sha256 = "0l8ypmynwmiyh2v9kwr3b5wdydwzmm9q02qij1vff01frq7hnh8s";
+      name = "kdepim-runtime-16.12.1.tar.xz";
     };
   };
   kde-runtime = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kde-runtime-16.12.0.tar.xz";
-      sha256 = "1vs5q063li8jj56vwyy3wh6hfabf0xhmp6ag9mc2ns8kwcia1m6x";
-      name = "kde-runtime-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kde-runtime-16.12.1.tar.xz";
+      sha256 = "1inz7dlbw9ngjizc7nrnr6y93b34zmkjp89v58xqzmyajk1hbqp1";
+      name = "kde-runtime-16.12.1.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdesdk-kioslaves-16.12.0.tar.xz";
-      sha256 = "19jbw3w8mg20m3f96s9bnw0wg28zxq2kgq0fs9c5rbjr8alxlyz2";
-      name = "kdesdk-kioslaves-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdesdk-kioslaves-16.12.1.tar.xz";
+      sha256 = "0qi9pkbg63kc8b27my05z9ih8z48mffc54m05gdcapgqx1qxigis";
+      name = "kdesdk-kioslaves-16.12.1.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdesdk-thumbnailers-16.12.0.tar.xz";
-      sha256 = "1syzfdffggs3hidykmg9y6l4nzh7wbqs4ah9vih8cgs0qr2hml9s";
-      name = "kdesdk-thumbnailers-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdesdk-thumbnailers-16.12.1.tar.xz";
+      sha256 = "07fbm60x6rqf39w13980dmg4qcm9i6y004hzydfgjd7gyfmh2jrx";
+      name = "kdesdk-thumbnailers-16.12.1.tar.xz";
     };
   };
   kdf = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdf-16.12.0.tar.xz";
-      sha256 = "0shwr55nrjgzm6cb2cdglvkkmknppd4yl0arn38w5a56sacsczcc";
-      name = "kdf-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdf-16.12.1.tar.xz";
+      sha256 = "1nhb718fmqqk22vrb5brykymsjfvh6w57v83lnyvp7w9ryks52fv";
+      name = "kdf-16.12.1.tar.xz";
     };
   };
   kdialog = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdialog-16.12.0.tar.xz";
-      sha256 = "0p6bf557k5ycmfaz7jrc65fp4j104c2cbv0ibamkyfrlpp1d0i1c";
-      name = "kdialog-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdialog-16.12.1.tar.xz";
+      sha256 = "1qg1fcjyh8fybl2vg9dp1v9bwb3xx2mrlcx4zdr3fhpaq13pqs3f";
+      name = "kdialog-16.12.1.tar.xz";
     };
   };
   kdiamond = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kdiamond-16.12.0.tar.xz";
-      sha256 = "1v0k23m74hiwr3a679h4wpc1w3m6y5mnjqc66pd9m94rshz8i8k6";
-      name = "kdiamond-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kdiamond-16.12.1.tar.xz";
+      sha256 = "16vssx8zklsia84zdp5yb5y9did92dqfly95a8w82zabdm47rx3b";
+      name = "kdiamond-16.12.1.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/keditbookmarks-16.12.0.tar.xz";
-      sha256 = "1pw2snbdrndx42vxw51vss7mf52v6ys9jmkg7j6bkwp90dnlly1v";
-      name = "keditbookmarks-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/keditbookmarks-16.12.1.tar.xz";
+      sha256 = "0jnldxlx9kdqrl3i8b4xa1p2dbna80ffxw83cbv53125fqg5ii71";
+      name = "keditbookmarks-16.12.1.tar.xz";
     };
   };
   kfilereplace = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kfilereplace-16.12.0.tar.xz";
-      sha256 = "0bcn07p1iq44pry0q771vadpi9gm9p2icbn8q5fympxf2y9smmqx";
-      name = "kfilereplace-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kfilereplace-16.12.1.tar.xz";
+      sha256 = "1pzf2gz89slv7fhp9d7n32p7vjpdr594qqmc4qi4i51gv0cksj2m";
+      name = "kfilereplace-16.12.1.tar.xz";
     };
   };
   kfind = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kfind-16.12.0.tar.xz";
-      sha256 = "0i2sjcw3ah35x3w7cvhrpzrv5khwax6nazbqbwzgvfa0gwc9y8ki";
-      name = "kfind-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kfind-16.12.1.tar.xz";
+      sha256 = "0bddyxjzha9flbj3b8ry805w5xns7al7hmx7hmpik7w1ph3ch0fx";
+      name = "kfind-16.12.1.tar.xz";
     };
   };
   kfloppy = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kfloppy-16.12.0.tar.xz";
-      sha256 = "0awcayd1hffdv7dybbrv2m38q33yl26g4bs9z1yib7h4iilky3lz";
-      name = "kfloppy-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kfloppy-16.12.1.tar.xz";
+      sha256 = "0g9v6rgvjfwmikyd7c7w6xpbdymvqm8p4gs0mlbb7d1ianylfgv1";
+      name = "kfloppy-16.12.1.tar.xz";
     };
   };
   kfourinline = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kfourinline-16.12.0.tar.xz";
-      sha256 = "18l218fww9y3msmx28j42xyvgyvngj2bhdx05ji8q9x40phq8dby";
-      name = "kfourinline-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kfourinline-16.12.1.tar.xz";
+      sha256 = "1zna1l1pll6hvjh1cbrh2kji17d67axwc955mx8xpjjm2fhw3np3";
+      name = "kfourinline-16.12.1.tar.xz";
     };
   };
   kgeography = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kgeography-16.12.0.tar.xz";
-      sha256 = "1zcw344y2xrz2h9f37kvk0fl4c9rm5xcahqc3hranm922ki0c8v4";
-      name = "kgeography-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kgeography-16.12.1.tar.xz";
+      sha256 = "1irs63lb8gaghb2qxqbih4bi7w3fyjbkl379jzlxacz963a35hk8";
+      name = "kgeography-16.12.1.tar.xz";
     };
   };
   kget = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kget-16.12.0.tar.xz";
-      sha256 = "125b4knvng34cj99g45590d9ci5s0f1y3m223rxvzmn5sds2vp1k";
-      name = "kget-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kget-16.12.1.tar.xz";
+      sha256 = "0n670vxkqa9w51rdmp07g8ihh80v60m076f4rcrlliavw3wg2s76";
+      name = "kget-16.12.1.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kgoldrunner-16.12.0.tar.xz";
-      sha256 = "155smz222s38ib0rrfcsfg0vi4l0iksawagwmxvnr1h51s80l5pz";
-      name = "kgoldrunner-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kgoldrunner-16.12.1.tar.xz";
+      sha256 = "17gi794m6s0v7c1xgxwmy5sldicds3yiyyf5520s56q3vx8sav93";
+      name = "kgoldrunner-16.12.1.tar.xz";
     };
   };
   kgpg = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kgpg-16.12.0.tar.xz";
-      sha256 = "1jn51r4f2ixwp4qfx635jy017gls0aaz0638kfz8404zj4l523qs";
-      name = "kgpg-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kgpg-16.12.1.tar.xz";
+      sha256 = "08f8jq9inic05639xx0jh31d8mky4v3w7ig6d7b4k47nm06zzkpi";
+      name = "kgpg-16.12.1.tar.xz";
     };
   };
   khangman = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/khangman-16.12.0.tar.xz";
-      sha256 = "0827754548bxbhqgfykb7n97hxjszf8azrz2vi6l0vsd080q0kvf";
-      name = "khangman-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/khangman-16.12.1.tar.xz";
+      sha256 = "1lcwkfppkkiq3fswhydgkxcqgcaq65x0ijdymrnp4g0bsk4y6w2l";
+      name = "khangman-16.12.1.tar.xz";
     };
   };
   khelpcenter = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/khelpcenter-16.12.0.tar.xz";
-      sha256 = "015s3yj0ppba8b90h0fwwra3xqz2b21n701zd4q40rqfjhkh9p0j";
-      name = "khelpcenter-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/khelpcenter-16.12.1.tar.xz";
+      sha256 = "1psjs1p3va6f3prymr9pzk0bn41zk6g69y0v1dpxf5ylgpn45234";
+      name = "khelpcenter-16.12.1.tar.xz";
     };
   };
   kholidays = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kholidays-16.12.0.tar.xz";
-      sha256 = "0rimmd74ls77zzmk00dxs17b9h4vj3382hiz2cl5pgf834s0ljgn";
-      name = "kholidays-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kholidays-16.12.1.tar.xz";
+      sha256 = "137rkfngcfjb5piva7iihyb3fib3qg84b9xk7f801pwy61pq30rk";
+      name = "kholidays-16.12.1.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kidentitymanagement-16.12.0.tar.xz";
-      sha256 = "0z559af17qjcr7s2nsr0v4yvqn69svkzcqis99x329kbhza1208k";
-      name = "kidentitymanagement-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kidentitymanagement-16.12.1.tar.xz";
+      sha256 = "0m0x42jd2nlr3xj15zp8iv527driihxqsi64km20577jniw0jz6i";
+      name = "kidentitymanagement-16.12.1.tar.xz";
     };
   };
   kig = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kig-16.12.0.tar.xz";
-      sha256 = "10svcqid4rzhq8vb4bbxhnp1dlyl4fd8w18blxvqan0qiv43332x";
-      name = "kig-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kig-16.12.1.tar.xz";
+      sha256 = "148mnp03j9kx3n2xlswc6jpamazljrh3j1r3xi3fkwqhdmqx7ybf";
+      name = "kig-16.12.1.tar.xz";
     };
   };
   kigo = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kigo-16.12.0.tar.xz";
-      sha256 = "033jbyck21qzm9r9j7q012rbkr0bk0n2prjb70lk38wsb2ghvziw";
-      name = "kigo-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kigo-16.12.1.tar.xz";
+      sha256 = "09srhp1p14yxnk31fps6cpm4cbpaqghlijf62mjg9414hpm13wyf";
+      name = "kigo-16.12.1.tar.xz";
     };
   };
   killbots = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/killbots-16.12.0.tar.xz";
-      sha256 = "0079fsh5yld69a3lq4ibbyhlr6kk7j2x0wylnk00jq0m886jqi4j";
-      name = "killbots-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/killbots-16.12.1.tar.xz";
+      sha256 = "0dabz54bdncvbhldgwdwp7yb5p0fzxjd7rhgciqs387isnrf9l3k";
+      name = "killbots-16.12.1.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kimagemapeditor-16.12.0.tar.xz";
-      sha256 = "1p7r9k7xrvnab83sljlgjlncdpv3z1fxskyzsihdzb3qw1da5sg9";
-      name = "kimagemapeditor-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kimagemapeditor-16.12.1.tar.xz";
+      sha256 = "1ljkbljxz4656pn6yhsni5jxdw3zpkik7d3b86ns1gaicq2ghw3r";
+      name = "kimagemapeditor-16.12.1.tar.xz";
     };
   };
   kimap = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kimap-16.12.0.tar.xz";
-      sha256 = "1sm3ifnl80wmzbxz9ybsj4xl224mg5sn43ja29sf7m0syyypfc9n";
-      name = "kimap-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kimap-16.12.1.tar.xz";
+      sha256 = "0c58jf16i8mwk20446sy7wf72a519nj7aa3g7iw79shjxzljx4zb";
+      name = "kimap-16.12.1.tar.xz";
     };
   };
   kio-extras = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kio-extras-16.12.0.tar.xz";
-      sha256 = "0g4xxzqbv5bi1msqp1vhkq04815dz4zflnlsgyimihi74mdawd3x";
-      name = "kio-extras-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kio-extras-16.12.1.tar.xz";
+      sha256 = "14vhh16xbrb1ywmclc2sbr1dm3lvjjcbv2riz5kyx548cnkmid9c";
+      name = "kio-extras-16.12.1.tar.xz";
     };
   };
   kiriki = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kiriki-16.12.0.tar.xz";
-      sha256 = "034fgl0qvslzyk04gnr68gcvlvynfim8bn0plgz5vd0k5w9n67kc";
-      name = "kiriki-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kiriki-16.12.1.tar.xz";
+      sha256 = "0rvj9f3kpdc0p6bpjgfjm3j4gxfhmqswag866s9zkm4zmr9l05y9";
+      name = "kiriki-16.12.1.tar.xz";
     };
   };
   kiten = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kiten-16.12.0.tar.xz";
-      sha256 = "1s6qpzficpfm0zxs8g80xyly7wflxfxwjpr0avsn6ydzz0yj4vc7";
-      name = "kiten-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kiten-16.12.1.tar.xz";
+      sha256 = "1kzw3867jvmc7yj3897hn2lgh59s571g6629ih7ncwsqbilbagz3";
+      name = "kiten-16.12.1.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kjumpingcube-16.12.0.tar.xz";
-      sha256 = "0japldhq8a7rfmzhlyk057iab9xnzwy1ahsp8fbdqh5xgp7yc0sq";
-      name = "kjumpingcube-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kjumpingcube-16.12.1.tar.xz";
+      sha256 = "0mfllbzhlvhr3h8crzg89zarxzsn9lgridyc6q9ljxzv6hf6w9rp";
+      name = "kjumpingcube-16.12.1.tar.xz";
     };
   };
   kldap = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kldap-16.12.0.tar.xz";
-      sha256 = "1xz46h39clz5pqlhqfmvdiw67i7dknng5jk9907vjzp84rck8qmr";
-      name = "kldap-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kldap-16.12.1.tar.xz";
+      sha256 = "070vk1ig1qp8aqv457bwxg8z9gszj90g9ff5n5wyjcgl721n23nz";
+      name = "kldap-16.12.1.tar.xz";
     };
   };
   kleopatra = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kleopatra-16.12.0.tar.xz";
-      sha256 = "0g5crp2vwvl0bfb95ym3wj3z39vy1bzcdcqw77pw4l1k9jd334sk";
-      name = "kleopatra-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kleopatra-16.12.1.tar.xz";
+      sha256 = "14d71qym527akx90krzk863f45rmbyj632bvhl2zfwx6ra5wpayx";
+      name = "kleopatra-16.12.1.tar.xz";
     };
   };
   klettres = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/klettres-16.12.0.tar.xz";
-      sha256 = "1gggmllh4j5178gasc9qzbk7l453nsgmnp3gq18iymcrvjbm5r1k";
-      name = "klettres-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/klettres-16.12.1.tar.xz";
+      sha256 = "0d9z4g6hkryky8gs5x2agrql4lyw0n64miwk88b5gb7yg3723mp5";
+      name = "klettres-16.12.1.tar.xz";
     };
   };
   klickety = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/klickety-16.12.0.tar.xz";
-      sha256 = "0xznghprfy7fl2b84dhf7yrcqwj7aa6dxyzani7q0vms6680vjrd";
-      name = "klickety-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/klickety-16.12.1.tar.xz";
+      sha256 = "1gg91l2fy5iwkmd8z990b561nhgqwvy4rb5i0cv67sikd1mafx0m";
+      name = "klickety-16.12.1.tar.xz";
     };
   };
   klines = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/klines-16.12.0.tar.xz";
-      sha256 = "086d9cak6vx7paygl2b2vim22gnpcq290agx62z98gy4a4r0aq3x";
-      name = "klines-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/klines-16.12.1.tar.xz";
+      sha256 = "04mrgv7xbqn4cjwiwr9cydpnkw50zkiv1a0nf2syppcayib3jgyz";
+      name = "klines-16.12.1.tar.xz";
     };
   };
   klinkstatus = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/klinkstatus-16.12.0.tar.xz";
-      sha256 = "1xr5mzhrs3jsp13587n0r3mr9z5j2fc7qr4z7c9c4za2v0qp83h7";
-      name = "klinkstatus-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/klinkstatus-16.12.1.tar.xz";
+      sha256 = "1g13npcqdslg6ggk5bjr61q06skkb92w9z8gd0nbkkq8ca6438kd";
+      name = "klinkstatus-16.12.1.tar.xz";
     };
   };
   kmag = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kmag-16.12.0.tar.xz";
-      sha256 = "1aihng2ippkavrlsrf9l3klpwkyql3lyy44x81ibmaw6xaa9zgjs";
-      name = "kmag-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kmag-16.12.1.tar.xz";
+      sha256 = "0398jb6fj1vw2lrby3smns59fiv3s109bd1nnzv69jba11gnr47f";
+      name = "kmag-16.12.1.tar.xz";
     };
   };
   kmahjongg = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kmahjongg-16.12.0.tar.xz";
-      sha256 = "1lv95cjsc0ahnxij1y7b2pdihvkcnmbq6385rlxwqmqjp2mprga7";
-      name = "kmahjongg-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kmahjongg-16.12.1.tar.xz";
+      sha256 = "1qpvykd7adf3fx3sl6rd4d64d6y1ffmx9b048bm3vhlx32g6ksim";
+      name = "kmahjongg-16.12.1.tar.xz";
     };
   };
   kmail = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kmail-16.12.0.tar.xz";
-      sha256 = "0nydggfk2jndj6f7vn9far29z9n5zrmdfcfmfh7pbq5qhgdaxrzf";
-      name = "kmail-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kmail-16.12.1.tar.xz";
+      sha256 = "0vx7ydm9rzw71b46va89k83l1ck364nczla3jia5wcqmli13wswl";
+      name = "kmail-16.12.1.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kmail-account-wizard-16.12.0.tar.xz";
-      sha256 = "151ixamq9910pw8q8phn3crhc250khagrimfhsg721kcl0k0ajzs";
-      name = "kmail-account-wizard-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kmail-account-wizard-16.12.1.tar.xz";
+      sha256 = "0166vfycgcvxfj2zlizcmzqdsv6s41djb14x8sff6hxhhxni4hyd";
+      name = "kmail-account-wizard-16.12.1.tar.xz";
     };
   };
   kmailtransport = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kmailtransport-16.12.0.tar.xz";
-      sha256 = "0hm797zk8lcq3icyddh46snx0f1n35j9vx7qg7zy77lfs9xrhh6n";
-      name = "kmailtransport-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kmailtransport-16.12.1.tar.xz";
+      sha256 = "1jwdpw7b1yji2zj70d4bn8z5cjrc51ar00qd0chzi2ykjb4fwvla";
+      name = "kmailtransport-16.12.1.tar.xz";
     };
   };
   kmbox = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kmbox-16.12.0.tar.xz";
-      sha256 = "0xmib0fpardw9f5f61mhmj04qlhh0nkq9cdp0z374r6mar29q2dj";
-      name = "kmbox-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kmbox-16.12.1.tar.xz";
+      sha256 = "0s1qimkiglhsb889sxvsg7w4w9k0l703f8r0092bv0zpz54rzx7l";
+      name = "kmbox-16.12.1.tar.xz";
     };
   };
   kmime = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kmime-16.12.0.tar.xz";
-      sha256 = "0rk6ggpa1iqc6vvkx1w7v68pngxfa0xailgd0rfkb7rxvbv9zvhs";
-      name = "kmime-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kmime-16.12.1.tar.xz";
+      sha256 = "1g792vqm8lb60psccwjg8kdcawdfrbnsflpg1kqif8a2327p0df4";
+      name = "kmime-16.12.1.tar.xz";
     };
   };
   kmines = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kmines-16.12.0.tar.xz";
-      sha256 = "0j15c9valn6zi0siig132ck0jl3ccq8mwi87jmv01lk3wk8wf70n";
-      name = "kmines-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kmines-16.12.1.tar.xz";
+      sha256 = "1vq836nj46r3rn2hddg2vs3541p7q4s4sh6l554pjpdd8dbs8kjv";
+      name = "kmines-16.12.1.tar.xz";
     };
   };
   kmix = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kmix-16.12.0.tar.xz";
-      sha256 = "0q0x0azd6qaa9fqcf4bl9q05fggb1amqdn3y4fj6y4fmybzwy2lk";
-      name = "kmix-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kmix-16.12.1.tar.xz";
+      sha256 = "1acc77v9arr7593qzw0vwhdpxdxd00gmvymkyyn2qlzwy4ihci8g";
+      name = "kmix-16.12.1.tar.xz";
     };
   };
   kmousetool = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kmousetool-16.12.0.tar.xz";
-      sha256 = "08h0jpwf16xxrxijlg1lhlsixmfm8k6kby6z8m47ixd1pfj0dkxa";
-      name = "kmousetool-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kmousetool-16.12.1.tar.xz";
+      sha256 = "02qm8x9jfs86d1hv3g130q0kqiqxm7i9ab11f5n93xb9migi7q68";
+      name = "kmousetool-16.12.1.tar.xz";
     };
   };
   kmouth = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kmouth-16.12.0.tar.xz";
-      sha256 = "1nvxd3kykb0a1kr3pk8rs4imrnv2x2cqvyg4rdj2vzrxszckcirp";
-      name = "kmouth-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kmouth-16.12.1.tar.xz";
+      sha256 = "1l7r63f93q46p1kgjyyvg49mfdfr3n1bbzy6081wlb18igjgwkmq";
+      name = "kmouth-16.12.1.tar.xz";
     };
   };
   kmplot = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kmplot-16.12.0.tar.xz";
-      sha256 = "1wdx63cv0qyccfgr7zbp1myfyfd2prk8jfq60n240rv0ji1r7ah8";
-      name = "kmplot-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kmplot-16.12.1.tar.xz";
+      sha256 = "0djrxsh8zm5dncmiy8xn1x54k3g1hscds0f7vaa1lv97prcclqcz";
+      name = "kmplot-16.12.1.tar.xz";
     };
   };
   knavalbattle = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/knavalbattle-16.12.0.tar.xz";
-      sha256 = "0wyxxhgrmn7fyh3mmanpi7ki59zlrvhwyqpjya6dxysa8v7f6bda";
-      name = "knavalbattle-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/knavalbattle-16.12.1.tar.xz";
+      sha256 = "1h98fvi31l20b2mx812z1wy0njp22jwc546h6wp50q4l1m7shxg1";
+      name = "knavalbattle-16.12.1.tar.xz";
     };
   };
   knetwalk = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/knetwalk-16.12.0.tar.xz";
-      sha256 = "1xbrzp8qhvnnx85zx5gkbkv5babkgm1zzlrrjbpbgghvqz71g36h";
-      name = "knetwalk-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/knetwalk-16.12.1.tar.xz";
+      sha256 = "1129v31xabk27wqfq3nvyhd8gx3yipcl15zcn2vg89qbj5j71pc9";
+      name = "knetwalk-16.12.1.tar.xz";
     };
   };
   knotes = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/knotes-16.12.0.tar.xz";
-      sha256 = "0rsl0d25i771r96lmp1bpq7g46jdk1jkfml0f10s3h940y73fyax";
-      name = "knotes-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/knotes-16.12.1.tar.xz";
+      sha256 = "0i8s8rfqilc8r4x26bisshhp2x3hss748kz1rs9wv2lb6s60r2n8";
+      name = "knotes-16.12.1.tar.xz";
     };
   };
   kolf = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kolf-16.12.0.tar.xz";
-      sha256 = "12dyfv9zsh3vacakh1yh037ma4n43lqhhqcqns4cimxwqzhdmwz5";
-      name = "kolf-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kolf-16.12.1.tar.xz";
+      sha256 = "0rjzk40szpfkfc32qyhc41kpnpd96avwl6l4ahgdghx86bdn233k";
+      name = "kolf-16.12.1.tar.xz";
     };
   };
   kollision = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kollision-16.12.0.tar.xz";
-      sha256 = "0rb83c0ab6hf6y41ll5wp41gkv05jzk4gjjb9z0iy8vbl0zgfy8b";
-      name = "kollision-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kollision-16.12.1.tar.xz";
+      sha256 = "0yml0a5c2iypj4gzdvak2jjm09gjslbzcyqv0cwaygydzclkn896";
+      name = "kollision-16.12.1.tar.xz";
     };
   };
   kolourpaint = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kolourpaint-16.12.0.tar.xz";
-      sha256 = "0xapdx2h1ki3lmw6413d4zi6d23ag4cqbhnf8ndk49rk3nal8mlf";
-      name = "kolourpaint-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kolourpaint-16.12.1.tar.xz";
+      sha256 = "06fg433dqnm1x4v7ixiix5vq33kr865jhw2bnbrpfhyq8qhvcqk1";
+      name = "kolourpaint-16.12.1.tar.xz";
     };
   };
   kommander = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kommander-16.12.0.tar.xz";
-      sha256 = "03qx7s45dmbbz4yp3d5d0l70ihr5kw08xywirpgdn78gbrzgz5rm";
-      name = "kommander-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kommander-16.12.1.tar.xz";
+      sha256 = "12d7j6nifblg24zn9bgghil0qcc9sljy4h09sh6qxchnagdx8bb3";
+      name = "kommander-16.12.1.tar.xz";
     };
   };
   kompare = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kompare-16.12.0.tar.xz";
-      sha256 = "0yxnc7w7zzbra9n7hwv3mccxivivj9dzv8d2va110cm1h7gx5v06";
-      name = "kompare-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kompare-16.12.1.tar.xz";
+      sha256 = "0kjk6bad6321mgfxfvh9hjj823cilpjrihlrspwr4jh7w8gkb730";
+      name = "kompare-16.12.1.tar.xz";
     };
   };
   konqueror = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/konqueror-16.12.0.tar.xz";
-      sha256 = "18xc0d8hryi6c80ka93n83wlyb208mk8yxvxcx5b0b76yhz642d2";
-      name = "konqueror-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/konqueror-16.12.1.tar.xz";
+      sha256 = "1rrv20mi5czcpdq0h294s9gr9970f88yhv8hvc10i3h3gpjcv5vg";
+      name = "konqueror-16.12.1.tar.xz";
     };
   };
   konquest = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/konquest-16.12.0.tar.xz";
-      sha256 = "0811a1649hqavgix8y7b3ngcngpxnz1gf6nf5ljydf5nlja612ai";
-      name = "konquest-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/konquest-16.12.1.tar.xz";
+      sha256 = "1fib398af900c99x1k263dwqhwp2d6wfp8qn04ry6siyfwlpxkrj";
+      name = "konquest-16.12.1.tar.xz";
     };
   };
   konsole = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/konsole-16.12.0.tar.xz";
-      sha256 = "125arsfrzh9103gpw67pb4h63zjmn4653rnqm17hvcdpibs5x7lk";
-      name = "konsole-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/konsole-16.12.1.tar.xz";
+      sha256 = "0nik8xvfppr30942pjcz2h70xdj0p35mxvq2cirh4h1wwb4458nm";
+      name = "konsole-16.12.1.tar.xz";
     };
   };
   kontact = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kontact-16.12.0.tar.xz";
-      sha256 = "1ym07xfmyy60h2hf575gllhhprgx3n9q5mqqj3z444ipd5z73jhx";
-      name = "kontact-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kontact-16.12.1.tar.xz";
+      sha256 = "1ynk2cv9ik6zahb92cq4miw05qrw0ffipcq9j71n6m79f319hmkc";
+      name = "kontact-16.12.1.tar.xz";
     };
   };
   kontactinterface = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kontactinterface-16.12.0.tar.xz";
-      sha256 = "16gw9sq1s9szw9zh1dp025qqj2al6yqf5c1yqkvp94y6kgw901gi";
-      name = "kontactinterface-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kontactinterface-16.12.1.tar.xz";
+      sha256 = "1qdii6y05ya8jjjfimr61r6d6x31bqgrdb89gms9qpf5rpr3ql2l";
+      name = "kontactinterface-16.12.1.tar.xz";
     };
   };
   kopete = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kopete-16.12.0.tar.xz";
-      sha256 = "1297ixqq2g5kqvyap2md5y0nm11027sjffq47m99yrxvsb3z5v60";
-      name = "kopete-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kopete-16.12.1.tar.xz";
+      sha256 = "0pi3i02myj8bgkqif94n434l13k2ydslrn2nvy47rwsiyr77wrn2";
+      name = "kopete-16.12.1.tar.xz";
     };
   };
   korganizer = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/korganizer-16.12.0.tar.xz";
-      sha256 = "1xfgklw266zv83d57g1q9yqkzwlr06bf5gg76ac9qfn6fczc5qs7";
-      name = "korganizer-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/korganizer-16.12.1.tar.xz";
+      sha256 = "1v85bfyq0iyd9qc3lcqi7k65w8hpaq9yx093g4l6yh561xkw8yac";
+      name = "korganizer-16.12.1.tar.xz";
     };
   };
   kpat = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kpat-16.12.0.tar.xz";
-      sha256 = "00kwpv1zhrj428qbi38fcd87bzkdvq79jcj2z2wlxf496kdr73z3";
-      name = "kpat-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kpat-16.12.1.tar.xz";
+      sha256 = "1zgwg6pvpq6adlzcm12mqq73w9rpixh7cx892c687930d17r5l8i";
+      name = "kpat-16.12.1.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kpimtextedit-16.12.0.tar.xz";
-      sha256 = "1yj3ihl3r04av6bcw6g574ix5xq3vy7xn1bxf5lldxcs0d56485h";
-      name = "kpimtextedit-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kpimtextedit-16.12.1.tar.xz";
+      sha256 = "1x1q26qwby3d3krx9nimwnx72zp3yns5inc88xkb0r74sn9743la";
+      name = "kpimtextedit-16.12.1.tar.xz";
     };
   };
   kppp = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kppp-16.12.0.tar.xz";
-      sha256 = "1s760apss671855cc35r52vyrh1n65miibsr9x66fssy2dixbm8a";
-      name = "kppp-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kppp-16.12.1.tar.xz";
+      sha256 = "01alps13995d1b3974c8ihi7i1pjm5xf5iskrp9bsc2ad8hka7xb";
+      name = "kppp-16.12.1.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kqtquickcharts-16.12.0.tar.xz";
-      sha256 = "170490rl9j73zw4679p5l08rxg4x9agc2xvig029maarkbymy46i";
-      name = "kqtquickcharts-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kqtquickcharts-16.12.1.tar.xz";
+      sha256 = "0pff2jm814x9f1zyxb8c718f43x34g9diggd15hbzshl0mhdx9h8";
+      name = "kqtquickcharts-16.12.1.tar.xz";
     };
   };
   krdc = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/krdc-16.12.0.tar.xz";
-      sha256 = "1n0wwb16kfhzsqxj0d1y5ms6k7i568aggrip27l8hgj3bnp1lfv9";
-      name = "krdc-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/krdc-16.12.1.tar.xz";
+      sha256 = "1v1p6ghvv72swqpv43f6k6wn5jwvk5b21aarm2as6c4x4nzkhffx";
+      name = "krdc-16.12.1.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kremotecontrol-16.12.0.tar.xz";
-      sha256 = "1h2znx0vqa9i4qg4b6mdlg4i5pzif266f81wa3kkh2zqw6qiyd77";
-      name = "kremotecontrol-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kremotecontrol-16.12.1.tar.xz";
+      sha256 = "0l4i47wlzpsm02r5fvkzfqjx9jixkc5c9j69s3ms4h4wwysi7r2z";
+      name = "kremotecontrol-16.12.1.tar.xz";
     };
   };
   kreversi = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kreversi-16.12.0.tar.xz";
-      sha256 = "01z4nwnpcbgd7y1xilwbjc803hqgzp3x89sif6zhkmcrvh17wzsd";
-      name = "kreversi-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kreversi-16.12.1.tar.xz";
+      sha256 = "1mhdz7wqi8ij2rdbsa30wsmz33z04dbxbczymi0wcbnvm2hai34a";
+      name = "kreversi-16.12.1.tar.xz";
     };
   };
   krfb = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/krfb-16.12.0.tar.xz";
-      sha256 = "0mdi6v4ijibr4cm0gsr5jid4qd1wi5i6bccqn1ii4v2v59pnrzyw";
-      name = "krfb-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/krfb-16.12.1.tar.xz";
+      sha256 = "0ggpzycqd2jdi0k3knbc0hyfa1vl8mim9v5s4nbclg99y2yyybvl";
+      name = "krfb-16.12.1.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kross-interpreters-16.12.0.tar.xz";
-      sha256 = "1dsw0wzwnqz2hgw3s6gjs7bpvkxyqgc0nad7pj7gnhd4j68fr0h1";
-      name = "kross-interpreters-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kross-interpreters-16.12.1.tar.xz";
+      sha256 = "1m7xpjsggsrig1wqar8m7hjnhr561h20wqkyz66xf11fvwrc7zks";
+      name = "kross-interpreters-16.12.1.tar.xz";
     };
   };
   kruler = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kruler-16.12.0.tar.xz";
-      sha256 = "0k30cw24ygcc1rbqx5hsy46w4laha733kkcvi0axzhgfkk19wbvq";
-      name = "kruler-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kruler-16.12.1.tar.xz";
+      sha256 = "1j4xl3s2yw44qb1p287zc8af1nsjrc8dxvsn4xhc5cl0c5hcwi0s";
+      name = "kruler-16.12.1.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ksaneplugin-16.12.0.tar.xz";
-      sha256 = "17im3pjwchlqsgf8f6ml0i23s6y8x2p5pjfwrc4giwd1v83hh02s";
-      name = "ksaneplugin-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ksaneplugin-16.12.1.tar.xz";
+      sha256 = "05s38s1j1nf9flhaf089bjd10s8mi97ngw0ckr2xjjjkfj4p6abq";
+      name = "ksaneplugin-16.12.1.tar.xz";
     };
   };
   kscd = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kscd-16.12.0.tar.xz";
-      sha256 = "0g8307qby224zhravfm350mkknhj44rjxcs04pgws3y3ra0bqzcz";
-      name = "kscd-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kscd-16.12.1.tar.xz";
+      sha256 = "1njzzvkhxqfw889rxw4vd6jyqsmqsrrcjgb5fmrjvwhg94h4i745";
+      name = "kscd-16.12.1.tar.xz";
     };
   };
   kshisen = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kshisen-16.12.0.tar.xz";
-      sha256 = "1i2mbh1nwwpvns9nkzr7bl5gxk5v58psbw2fad0gxddbcng2sbnh";
-      name = "kshisen-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kshisen-16.12.1.tar.xz";
+      sha256 = "118fad0k4cv7klkv20x7rvwabnn6fcymypmraamprc76ygvyvk02";
+      name = "kshisen-16.12.1.tar.xz";
     };
   };
   ksirk = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ksirk-16.12.0.tar.xz";
-      sha256 = "1rzp5b35x7yiz1cyfbw80b1wzf68bd3k5ax4pl12q15h1wpcr582";
-      name = "ksirk-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ksirk-16.12.1.tar.xz";
+      sha256 = "0w05nxqw5a18h0ylwx5lmw10wcmjrv293npfz1fl7nkhkxry0wy5";
+      name = "ksirk-16.12.1.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ksnakeduel-16.12.0.tar.xz";
-      sha256 = "12ybsl1awsz1pygpgfbzfyyql24znafmll6qcydcg07rjxld9ywq";
-      name = "ksnakeduel-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ksnakeduel-16.12.1.tar.xz";
+      sha256 = "1zrh34kb66sg1crhbndxhqychz359d1779ykw25q577panagwhgd";
+      name = "ksnakeduel-16.12.1.tar.xz";
     };
   };
   kspaceduel = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kspaceduel-16.12.0.tar.xz";
-      sha256 = "1rpacxbzg8rdl1hmm6nvksjj8z4cwqyh0v8javazf8ngas29bijj";
-      name = "kspaceduel-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kspaceduel-16.12.1.tar.xz";
+      sha256 = "1g0ghr8lwvhlxq9b27864hfbsirb3y3zn0ipcw5cc0qdfcs9cqq2";
+      name = "kspaceduel-16.12.1.tar.xz";
     };
   };
   ksquares = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ksquares-16.12.0.tar.xz";
-      sha256 = "16gd9l9bm96dv6srl11blxh15n3invh7znzxikxspjzckm3jqc5q";
-      name = "ksquares-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ksquares-16.12.1.tar.xz";
+      sha256 = "1bb7saml0l76cpkngpvdfn9yv7kg3fzj152dgav6cgvfzaj6xdz5";
+      name = "ksquares-16.12.1.tar.xz";
     };
   };
   kstars = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kstars-16.12.0.tar.xz";
-      sha256 = "0j6g58xlasxa23vqc12kzl4ijaw34wncdvrsfgdzi3b9bvqy3njm";
-      name = "kstars-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kstars-16.12.1.tar.xz";
+      sha256 = "0pfmg3669nigdl0zhab45jh7h6gh5jmxvca1vxavwp8jmn96ghkl";
+      name = "kstars-16.12.1.tar.xz";
     };
   };
   ksudoku = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ksudoku-16.12.0.tar.xz";
-      sha256 = "05jak7hg3yn9dwbinhny0av5rhj1r9zzp7l79nrg8nbm52jnyy4m";
-      name = "ksudoku-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ksudoku-16.12.1.tar.xz";
+      sha256 = "07h550yvv48xk8s8ppnhxr6lfv69qsfxghadybf4g777hyxl06dy";
+      name = "ksudoku-16.12.1.tar.xz";
     };
   };
   ksystemlog = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ksystemlog-16.12.0.tar.xz";
-      sha256 = "0q3ca4c98a0j8d0370gaczqqs32446hyyf70kf7rxmr6f35d7y4q";
-      name = "ksystemlog-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ksystemlog-16.12.1.tar.xz";
+      sha256 = "0mjwqczvmncrf7hr19vdyyswnnfnvzqx18i7fqj7f15cg29yzh86";
+      name = "ksystemlog-16.12.1.tar.xz";
     };
   };
   kteatime = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kteatime-16.12.0.tar.xz";
-      sha256 = "1b05ahhdmjlp3fknmbp5c050sgx8iih3j3xxp0bj998xbh975s88";
-      name = "kteatime-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kteatime-16.12.1.tar.xz";
+      sha256 = "0dx74zz4mk3ckg51hyckwk5ff96jd95pdcpmywkyjzxqlqkyg5j0";
+      name = "kteatime-16.12.1.tar.xz";
     };
   };
   ktimer = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktimer-16.12.0.tar.xz";
-      sha256 = "11lb7isyr2qc2fh0ypqrs0xzfiwby94hgr4ilv0sd052kvzxwmry";
-      name = "ktimer-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktimer-16.12.1.tar.xz";
+      sha256 = "18va6sb4qcb54rgrxaa0s87bxh15ynvvz8vispb054h8mj5k469j";
+      name = "ktimer-16.12.1.tar.xz";
     };
   };
   ktnef = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktnef-16.12.0.tar.xz";
-      sha256 = "0f4nkmy3rdy6kk3l83r7j404vpdgmxy3hls18j8bm5jkhv6n08rh";
-      name = "ktnef-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktnef-16.12.1.tar.xz";
+      sha256 = "18k9a36qn0fbfx797cb7ngg9xss7h4svl491inwg6l0s2ydwxf74";
+      name = "ktnef-16.12.1.tar.xz";
     };
   };
   ktouch = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktouch-16.12.0.tar.xz";
-      sha256 = "05yhrjb536v98sh8l979psd824ilj4cj3wcbbfbqkpnv0i4agxf2";
-      name = "ktouch-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktouch-16.12.1.tar.xz";
+      sha256 = "03q9l2s09gm1fgqkr4c71zyyrsrymikfh69z4yyba3azr15ayzy3";
+      name = "ktouch-16.12.1.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktp-accounts-kcm-16.12.0.tar.xz";
-      sha256 = "1lwkajaj9zjk1hksx7b5x73a09kri69bq6bxsr1fwi9m47608bhm";
-      name = "ktp-accounts-kcm-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktp-accounts-kcm-16.12.1.tar.xz";
+      sha256 = "1lmmy4pmr44x7kgwc72xn8sijbqgblqkxcr08qj8hrmpvzrc8nh0";
+      name = "ktp-accounts-kcm-16.12.1.tar.xz";
     };
   };
   ktp-approver = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktp-approver-16.12.0.tar.xz";
-      sha256 = "124448c05cr1y6032fkqdb46n3ynyh2njxmn52zn814i797pwz6b";
-      name = "ktp-approver-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktp-approver-16.12.1.tar.xz";
+      sha256 = "0nzpmylm58yx28lz1wx1c0ib19v980h6r0dylp2lx9h738jh0wq4";
+      name = "ktp-approver-16.12.1.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktp-auth-handler-16.12.0.tar.xz";
-      sha256 = "0ya8q9qvq72vfp5yhb3jd2am83i42cap2yl1xykfwib0r8lmfakb";
-      name = "ktp-auth-handler-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktp-auth-handler-16.12.1.tar.xz";
+      sha256 = "14b31mqy4n5ymm0adxlsi2aqlgdhzhhg5yq3smg13361dj0jxf70";
+      name = "ktp-auth-handler-16.12.1.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktp-call-ui-16.12.0.tar.xz";
-      sha256 = "1qyiipyffhav5wxi7cjbshi9x9fam0snbdl4sqca3nly1cn1k21k";
-      name = "ktp-call-ui-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktp-call-ui-16.12.1.tar.xz";
+      sha256 = "00s81rh7zffry754yzqvxz6q9wcn0nb7v2z9xq4iav6spl7b35c3";
+      name = "ktp-call-ui-16.12.1.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktp-common-internals-16.12.0.tar.xz";
-      sha256 = "1xlfgs2gc15443vb3pyly0zbrmaliq3nvs7w25ldks8z72m6gqf6";
-      name = "ktp-common-internals-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktp-common-internals-16.12.1.tar.xz";
+      sha256 = "083hbvdd8xzlvdgldvxc45a8jq78k4dsz2idz9ljj7x5naizmkjx";
+      name = "ktp-common-internals-16.12.1.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktp-contact-list-16.12.0.tar.xz";
-      sha256 = "1dkndda4xhb7x76m43gbz67jc4bd50bj8mzyyvblijq6rn2a4wsr";
-      name = "ktp-contact-list-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktp-contact-list-16.12.1.tar.xz";
+      sha256 = "0qddi195ayq63nji7cppqxxq2jifflfxr8zskd6shr720invkdm3";
+      name = "ktp-contact-list-16.12.1.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktp-contact-runner-16.12.0.tar.xz";
-      sha256 = "0754q5mxghba6imh20qk1qaxbq2c9z6qls5pybjzm71bzbwaf2wg";
-      name = "ktp-contact-runner-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktp-contact-runner-16.12.1.tar.xz";
+      sha256 = "10f2cygyjchydd35rx1daimlfkab4wijahp0vznjc46k332znl37";
+      name = "ktp-contact-runner-16.12.1.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktp-desktop-applets-16.12.0.tar.xz";
-      sha256 = "0jq0j9i2r9nq3i7g7qg6vnca2vyb5fhx8jcd45yml4clxg6xggjy";
-      name = "ktp-desktop-applets-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktp-desktop-applets-16.12.1.tar.xz";
+      sha256 = "109aq8dgf9gig4dvb5n2khcslnyhfcfrl95b3h0dkbfiz6xlxhby";
+      name = "ktp-desktop-applets-16.12.1.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktp-filetransfer-handler-16.12.0.tar.xz";
-      sha256 = "1mfmx4jxzpz81df53b2gy8l2rrfqszqjcmjp5s30k0cyrrqiq1v1";
-      name = "ktp-filetransfer-handler-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktp-filetransfer-handler-16.12.1.tar.xz";
+      sha256 = "1qwhqyn2v0axn7rdlm5ckkjybfhmysz8612akd499yp8jyvgm046";
+      name = "ktp-filetransfer-handler-16.12.1.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktp-kded-module-16.12.0.tar.xz";
-      sha256 = "192aynmagrmxyil9sc19r37kj28fgcyyivija8q22jwfhh7ds5w6";
-      name = "ktp-kded-module-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktp-kded-module-16.12.1.tar.xz";
+      sha256 = "173a3pdrlsl7vv8xxxckfn7y0vi2ndbds2vzm2ir4crxcl5mm3cm";
+      name = "ktp-kded-module-16.12.1.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktp-send-file-16.12.0.tar.xz";
-      sha256 = "0g808dndrr2cb0xcjl643r23zxnaqnycvkinbd9783nkw9i5ak87";
-      name = "ktp-send-file-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktp-send-file-16.12.1.tar.xz";
+      sha256 = "0makfaalzidnqm4gk3kd2qnchjy15xcqprbjs9908jvixk3nfj1c";
+      name = "ktp-send-file-16.12.1.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktp-text-ui-16.12.0.tar.xz";
-      sha256 = "1fhlgfs6ynkmqyjypr0922y2p32jqk3j7v08x6wxacp5aifx5i22";
-      name = "ktp-text-ui-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktp-text-ui-16.12.1.tar.xz";
+      sha256 = "16lwsy4fjxc77pg2gsjsmj7fhbrsjcgpiv0yx6a6nh2mz69zw3ml";
+      name = "ktp-text-ui-16.12.1.tar.xz";
     };
   };
   ktuberling = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/ktuberling-16.12.0.tar.xz";
-      sha256 = "1z0hhidjandl2bd9d9pihk16yqqyn75z6hn5sxdx5z1icpxdkara";
-      name = "ktuberling-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/ktuberling-16.12.1.tar.xz";
+      sha256 = "1g1sbvnizs5cp80jyn1liizd8lj3jl38nysgii8fzdfpqmspwx35";
+      name = "ktuberling-16.12.1.tar.xz";
     };
   };
   kturtle = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kturtle-16.12.0.tar.xz";
-      sha256 = "1nxijmai4b2ddg6km2krxzrz46djazcqn4xqi6sdr2yv4rsw4467";
-      name = "kturtle-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kturtle-16.12.1.tar.xz";
+      sha256 = "0q1qq2a9308y85b9lk44k109gfi9cmzrkaqd8darp3alwaqbaphr";
+      name = "kturtle-16.12.1.tar.xz";
     };
   };
   kubrick = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kubrick-16.12.0.tar.xz";
-      sha256 = "0xrfdmxr7p7m11rgpa0ag247pkr88k1l4br59k6gr92vpxghd1l0";
-      name = "kubrick-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kubrick-16.12.1.tar.xz";
+      sha256 = "01q3rswfn5r32r2ssq6xmhym158x4pwb7l76xw0h096s4swwri2k";
+      name = "kubrick-16.12.1.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kwalletmanager-16.12.0.tar.xz";
-      sha256 = "01w97cax7smayp536d4javjksg0l2yz1c9i39rh195gaz8wnglxy";
-      name = "kwalletmanager-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kwalletmanager-16.12.1.tar.xz";
+      sha256 = "16kjgqrv9w9il9kla5swywqbc3qrijiz1ii49bjhn1vsa4g1f9n1";
+      name = "kwalletmanager-16.12.1.tar.xz";
     };
   };
   kwave = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kwave-16.12.0.tar.xz";
-      sha256 = "07wx614nq5dhym5dlpfvyxbh9asadxbpx6niyl5g7z4xvq2kms8f";
-      name = "kwave-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kwave-16.12.1.tar.xz";
+      sha256 = "1sr19gjr7m3f140vl2lqp6ms8j6vz1djdnkh1ggs7chr2aws52p2";
+      name = "kwave-16.12.1.tar.xz";
     };
   };
   kwordquiz = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/kwordquiz-16.12.0.tar.xz";
-      sha256 = "0md3a3q16xghv94hqik0jzvg1nwihagdapdn3pz0k4p8nypykz8k";
-      name = "kwordquiz-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/kwordquiz-16.12.1.tar.xz";
+      sha256 = "14sa1gjswp9y9kzxk5qfg3df8n9527zkspdz2v9phf9n0jdl9wqw";
+      name = "kwordquiz-16.12.1.tar.xz";
     };
   };
   libgravatar = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libgravatar-16.12.0.tar.xz";
-      sha256 = "0nwz8a2kv66b57f3032xl05mxxasvg4k7ap30smlfxlzfm1p48sc";
-      name = "libgravatar-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libgravatar-16.12.1.tar.xz";
+      sha256 = "1j53kqa9ypv3igcllr1a9z7pvg1ax3lk957l2i7bb0kwjqhvlqkb";
+      name = "libgravatar-16.12.1.tar.xz";
     };
   };
   libkcddb = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libkcddb-16.12.0.tar.xz";
-      sha256 = "0f9b2gddjia47mi8rm6vb2h3nycwyiyj6fz3w7kwwv32mnbwmqsg";
-      name = "libkcddb-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libkcddb-16.12.1.tar.xz";
+      sha256 = "16429hxxq1kw9gv61sljy96y4zxyq5qgs3hvq1n73rq7vwl4bgl3";
+      name = "libkcddb-16.12.1.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libkcompactdisc-16.12.0.tar.xz";
-      sha256 = "0lh6gna28kxja9v5cmz4qnzdlzz3bnxs1x24v2nzvq4lds73rwrp";
-      name = "libkcompactdisc-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libkcompactdisc-16.12.1.tar.xz";
+      sha256 = "0s4107aa4qrzrh4xi3p4j40alx9nynckawjhyh42c0yz2cgzdvbg";
+      name = "libkcompactdisc-16.12.1.tar.xz";
     };
   };
   libkdcraw = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libkdcraw-16.12.0.tar.xz";
-      sha256 = "0pz1jll1amc42gjzdf7ic43ncd73mrp4cjhwgwmqh7aik2sjmr5m";
-      name = "libkdcraw-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libkdcraw-16.12.1.tar.xz";
+      sha256 = "09vrj7ds257f699782vgp4pvanirkbacar5w2aiy89s5c88wcf3p";
+      name = "libkdcraw-16.12.1.tar.xz";
     };
   };
   libkdegames = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libkdegames-16.12.0.tar.xz";
-      sha256 = "0ql18w1gliz2k9g460fgh7pwy9r0p0narzc7bzdzv2pc4r2v7w0f";
-      name = "libkdegames-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libkdegames-16.12.1.tar.xz";
+      sha256 = "0a511clm36dvlvqzarf2sppp5mmr3jqzbvq3873fwyyjhk17n9si";
+      name = "libkdegames-16.12.1.tar.xz";
     };
   };
   libkdepim = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libkdepim-16.12.0.tar.xz";
-      sha256 = "09q2z688kkbwiysqzxq2id77fv7sxq3vbs1q88saw8qvhhb4vs5q";
-      name = "libkdepim-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libkdepim-16.12.1.tar.xz";
+      sha256 = "04l073xl6wdzslvnlpg4jxg74bc5jnqij4gk9cw6zm93fxcs61kh";
+      name = "libkdepim-16.12.1.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libkeduvocdocument-16.12.0.tar.xz";
-      sha256 = "1kd795z0lkh1b3hgdca36l0wgac1m4g38q5igs40fjz6nakwqczk";
-      name = "libkeduvocdocument-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libkeduvocdocument-16.12.1.tar.xz";
+      sha256 = "1s3qbv67vzqvwaym9ac1izpfffp1gvc9crydg1hwgpfxccgnk0sf";
+      name = "libkeduvocdocument-16.12.1.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libkexiv2-16.12.0.tar.xz";
-      sha256 = "019lnz2d5m47xx6h48ykhd1ln9bq0wch676ddpywp4kfnlyqs2vc";
-      name = "libkexiv2-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libkexiv2-16.12.1.tar.xz";
+      sha256 = "0mnw9ck144x1b2bhjs0llx4kx95z2y1qrblzrvjaydg7f4q5h3qd";
+      name = "libkexiv2-16.12.1.tar.xz";
     };
   };
   libkface = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libkface-16.12.0.tar.xz";
-      sha256 = "02i0qk5q0sbb2m34qg9zrm6whxm9qasi4h5k3fr110k8dwc393v7";
-      name = "libkface-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libkface-16.12.1.tar.xz";
+      sha256 = "0pmwxrd1afgmj2bhqnk903kq20mzfji3wnzrlv5xyc8jd7w5f7s8";
+      name = "libkface-16.12.1.tar.xz";
     };
   };
   libkgeomap = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libkgeomap-16.12.0.tar.xz";
-      sha256 = "0n17db1jb1xbjfdmrgi57ndhp4bgwwsk26026zxh1ipqavdrpjg8";
-      name = "libkgeomap-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libkgeomap-16.12.1.tar.xz";
+      sha256 = "0phqx125n1nklk9v3bnhnfr13b7qylga0zwvb9hajq6g67frsh95";
+      name = "libkgeomap-16.12.1.tar.xz";
     };
   };
   libkipi = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libkipi-16.12.0.tar.xz";
-      sha256 = "1pj3cpz7q1jiz2yhvk2g6fz2pwblblxj6qzlsyqs156j98ayjk6g";
-      name = "libkipi-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libkipi-16.12.1.tar.xz";
+      sha256 = "137r2kympkqf06a9w1a174krinra63yknnphprygaxxr6dbrh3a4";
+      name = "libkipi-16.12.1.tar.xz";
     };
   };
   libkleo = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libkleo-16.12.0.tar.xz";
-      sha256 = "0g394bykb9f93f3i4r9y666n72wsbk2njc4b86n5hkw94pcgavlq";
-      name = "libkleo-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libkleo-16.12.1.tar.xz";
+      sha256 = "0cziv4pwippcikj4nlsdgz5nkrb7kimap0nyldvq8rzhi6s7dy4r";
+      name = "libkleo-16.12.1.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libkmahjongg-16.12.0.tar.xz";
-      sha256 = "1jh3qh3833faa66jvxy28j24zr9wg1chg0rx95zpjpqg9xllqzir";
-      name = "libkmahjongg-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libkmahjongg-16.12.1.tar.xz";
+      sha256 = "0crbkxaym2z9p76v3bya414xcpn6h52nbp5902fa4l67a3z1k736";
+      name = "libkmahjongg-16.12.1.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libkomparediff2-16.12.0.tar.xz";
-      sha256 = "1yxgy4hpd8am6501aqz3018d4v36ipp4g393xc0mq7ygbsmb9sj3";
-      name = "libkomparediff2-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libkomparediff2-16.12.1.tar.xz";
+      sha256 = "1garymnwcnwrlcpxz9dyh9spqgx91z8cznrxirw22cgz5n6mn1ld";
+      name = "libkomparediff2-16.12.1.tar.xz";
     };
   };
   libksane = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libksane-16.12.0.tar.xz";
-      sha256 = "05m9fl22hfcd41jn2hxj9yms027rjs2gfrhsksvl80m18j6ix51b";
-      name = "libksane-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libksane-16.12.1.tar.xz";
+      sha256 = "0p133qfrd5pmsifmq8064wrw49vrrn27d6543nrg88x9l2d7hi53";
+      name = "libksane-16.12.1.tar.xz";
     };
   };
   libksieve = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/libksieve-16.12.0.tar.xz";
-      sha256 = "1fcxs8bwb32pbprb8x4ld3s1m2mv44awlb9014nqb9gw8xikrci1";
-      name = "libksieve-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/libksieve-16.12.1.tar.xz";
+      sha256 = "1qbnd2pwbb39nkdc6v4mrmyiva333b0l2h0x57cxsjw5zbcpx467";
+      name = "libksieve-16.12.1.tar.xz";
     };
   };
   lokalize = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/lokalize-16.12.0.tar.xz";
-      sha256 = "06k5wkx8wmhrl0ff0rix9fr2hhbxh0cm0mskajwavg9hcd3aga36";
-      name = "lokalize-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/lokalize-16.12.1.tar.xz";
+      sha256 = "1cf3zs81p6fqi6dgn12bskldydwm0yqbfvkjqh5h41qzlfky1j7s";
+      name = "lokalize-16.12.1.tar.xz";
     };
   };
   lskat = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/lskat-16.12.0.tar.xz";
-      sha256 = "1mlvg3iwz0klsnd258dgqs1zz7sz25l3bbwyvfz5r8j3k1gllw5q";
-      name = "lskat-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/lskat-16.12.1.tar.xz";
+      sha256 = "0ldyw445cqgb2bf6ymcpwcrizypldghh611ihr6sa1l1x16238v2";
+      name = "lskat-16.12.1.tar.xz";
     };
   };
   mailcommon = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/mailcommon-16.12.0.tar.xz";
-      sha256 = "1a25b8akcf1k957jbbcr21ksw3kl0vbs2xn28hzqzlbg5hsnw9yy";
-      name = "mailcommon-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/mailcommon-16.12.1.tar.xz";
+      sha256 = "18mm2fmyvqs6rlxdgi2fh1vj4b3jjs6vf2jsy4dimw4ghgbag0m2";
+      name = "mailcommon-16.12.1.tar.xz";
     };
   };
   mailimporter = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/mailimporter-16.12.0.tar.xz";
-      sha256 = "1z1lml4hlzzk7kj6ln3p0gz5pganwrjl57zvn0mpbwxsbpdkf8gk";
-      name = "mailimporter-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/mailimporter-16.12.1.tar.xz";
+      sha256 = "0ivgyl3bz2vcn6vwshcbxlydlxcsxqhkxzfy9rc690asvn9152cg";
+      name = "mailimporter-16.12.1.tar.xz";
     };
   };
   marble = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/marble-16.12.0.tar.xz";
-      sha256 = "06hpwwqa62z63fsiw5qa50pbkjkyy93h14l9xphnwmcr8cjnfh8x";
-      name = "marble-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/marble-16.12.1.tar.xz";
+      sha256 = "1hv2qpikskx7n4myfvfh403cjcsrxdd24955743mlnsikbq3rj0s";
+      name = "marble-16.12.1.tar.xz";
     };
   };
   mbox-importer = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/mbox-importer-16.12.0.tar.xz";
-      sha256 = "0pk751sjniz8kalydg2gl48w2v9jqcsp6qclgccxrm7rj7nsmyr2";
-      name = "mbox-importer-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/mbox-importer-16.12.1.tar.xz";
+      sha256 = "0jpxrwl3v8fkpx5blbagm1ls9h1j9bd7ac7pm78ihavvm4n4piw6";
+      name = "mbox-importer-16.12.1.tar.xz";
     };
   };
   messagelib = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/messagelib-16.12.0.tar.xz";
-      sha256 = "0n65xk2prhwjn172b47qjvml20hmff9qspk6dczx3b8knamzsyj4";
-      name = "messagelib-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/messagelib-16.12.1.tar.xz";
+      sha256 = "054hjrm3z8mslkl5j05ik30bwbn95rrbbrnc5b6jmi937ks57z56";
+      name = "messagelib-16.12.1.tar.xz";
     };
   };
   minuet = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/minuet-16.12.0.tar.xz";
-      sha256 = "17yjs7hwr71f78zx89g83md5mad5g3rgxfxhnmc1hvwclcri12nv";
-      name = "minuet-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/minuet-16.12.1.tar.xz";
+      sha256 = "07jl0n0w34wbnzxwjj6zainkw3gyzkk99p7c21hqkhmiivbk3rab";
+      name = "minuet-16.12.1.tar.xz";
     };
   };
   okteta = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/okteta-16.12.0.tar.xz";
-      sha256 = "0n334ksh2c7s5bavhgks1a11mr1w6pf6lvfb51735r379xxh6yqh";
-      name = "okteta-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/okteta-16.12.1.tar.xz";
+      sha256 = "08zygqhrz7i1dvb2i6dqpn9zmyr43y2rkdjl43rwlgcj59hd0xvc";
+      name = "okteta-16.12.1.tar.xz";
     };
   };
   okular = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/okular-16.12.0.tar.xz";
-      sha256 = "0a8g2845c0f6z2k6d4f8fccfa9zhqls2yaj1pkasrg8xmanmpmbd";
-      name = "okular-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/okular-16.12.1.tar.xz";
+      sha256 = "134afacy3d9hjq2avzp8d0fp3vwlaaxcvf4b65wvkds2zhggi8w3";
+      name = "okular-16.12.1.tar.xz";
     };
   };
   palapeli = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/palapeli-16.12.0.tar.xz";
-      sha256 = "1ix8xhsif0pa1zsgwn33sqf1kclkpz8mhbviqjzh5ds80dyychdn";
-      name = "palapeli-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/palapeli-16.12.1.tar.xz";
+      sha256 = "1kpca4l45c9ydhls1sqqlhca7wv2d0xf33wxa5dmgriivn0s0qym";
+      name = "palapeli-16.12.1.tar.xz";
     };
   };
   parley = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/parley-16.12.0.tar.xz";
-      sha256 = "1lvimp0fjy12973rjqa9y0680x19hqln2dmywqmg7fxyhk3ilwv3";
-      name = "parley-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/parley-16.12.1.tar.xz";
+      sha256 = "0jxzz9dg3bb1pk8rrfqvjf5aww361wkaiz4xvsfc6vj4333kgzid";
+      name = "parley-16.12.1.tar.xz";
     };
   };
   picmi = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/picmi-16.12.0.tar.xz";
-      sha256 = "03i8g7c84cyg1bn1d70cf34pw2bgfsnhvvjfavzzmmb0kmkj5nhw";
-      name = "picmi-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/picmi-16.12.1.tar.xz";
+      sha256 = "0l9y4h9q032vqham0nlci9kcp143rdaaz9rhwwh0i7mw5p98xg5r";
+      name = "picmi-16.12.1.tar.xz";
     };
   };
   pimcommon = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/pimcommon-16.12.0.tar.xz";
-      sha256 = "1crz2g2wcgq22vxxywvislw0n7rc21z08rsgcyq6m0dqcv96063l";
-      name = "pimcommon-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/pimcommon-16.12.1.tar.xz";
+      sha256 = "0hk0p5x78mcxv07x4jpx2d6dh2wxxiqp79vma37g90zlh8p28323";
+      name = "pimcommon-16.12.1.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/pim-data-exporter-16.12.0.tar.xz";
-      sha256 = "0x2nrspv4bc91ir361y6sp80a9c4nm8fwjzy76q3j23kvyk838m9";
-      name = "pim-data-exporter-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/pim-data-exporter-16.12.1.tar.xz";
+      sha256 = "0qx156jg03xpl62rxsm5lma0z7pr6nrsq5912d6kx1w7zxwizjln";
+      name = "pim-data-exporter-16.12.1.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/pim-sieve-editor-16.12.0.tar.xz";
-      sha256 = "0da0fav852yazrlpinnsr97jm1vc5335wc3wb1rbcamcrvkkpz5r";
-      name = "pim-sieve-editor-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/pim-sieve-editor-16.12.1.tar.xz";
+      sha256 = "02km83p4h39bl8zm5lf7qypqq6qs1cl0b9ncr0c68b0kd05pfms3";
+      name = "pim-sieve-editor-16.12.1.tar.xz";
     };
   };
   pim-storage-service-manager = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/pim-storage-service-manager-16.12.0.tar.xz";
-      sha256 = "1b3z8z921nfmqs2gn653jdsqma4xn3lf1imz942xbgc1w3000p64";
-      name = "pim-storage-service-manager-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/pim-storage-service-manager-16.12.1.tar.xz";
+      sha256 = "19mfxxpvx5lz0067ssdmw0xdmznl7jak4rapkawvfwkbk0vsfpd3";
+      name = "pim-storage-service-manager-16.12.1.tar.xz";
     };
   };
   poxml = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/poxml-16.12.0.tar.xz";
-      sha256 = "18q5lmwx5vdmj2kdi45rhi6cqnk9wrd1v7xc0xn842gjd7y42zh0";
-      name = "poxml-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/poxml-16.12.1.tar.xz";
+      sha256 = "19g964bb96z86ynx7zi3chg1pksvcyrv41qz5qnhlj258a3b9g4m";
+      name = "poxml-16.12.1.tar.xz";
     };
   };
   print-manager = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/print-manager-16.12.0.tar.xz";
-      sha256 = "1na2kw6cdq2qkbjyaxi21cy4lkyalfyw50d6cvgpl4jgrmvdqc8h";
-      name = "print-manager-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/print-manager-16.12.1.tar.xz";
+      sha256 = "1vwsd71y3r6w9gix6d5n06j0yv4rw9qgzz1d4nb8axlnmwdnkzy6";
+      name = "print-manager-16.12.1.tar.xz";
     };
   };
   rocs = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/rocs-16.12.0.tar.xz";
-      sha256 = "0lw5mrxjhxwwh7ms5jn576y303jzk54h79vf2qmf6hkmhmwwggam";
-      name = "rocs-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/rocs-16.12.1.tar.xz";
+      sha256 = "0xkkd3hwrnv52074q53wx5agdc75arm2pg80k2ck7vnxl3mpp997";
+      name = "rocs-16.12.1.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/signon-kwallet-extension-16.12.0.tar.xz";
-      sha256 = "0shgg850cgnr3iihdhf4v04fmp1lc3hblgfwsrcyys23zh2xfqr5";
-      name = "signon-kwallet-extension-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/signon-kwallet-extension-16.12.1.tar.xz";
+      sha256 = "1xfmwz3h7acdkj61zq9rwz654lf8z9wfhzlmr1ss530c94isfpjb";
+      name = "signon-kwallet-extension-16.12.1.tar.xz";
     };
   };
   spectacle = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/spectacle-16.12.0.tar.xz";
-      sha256 = "1cri1yklzkdfhynfvlqrz21bmr58rcrlcg4g5n5wd71wl46v1m1i";
-      name = "spectacle-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/spectacle-16.12.1.tar.xz";
+      sha256 = "1pmpmfzch9d8iapjpgyzy77d9a8zjhafkw52x9mqj0r8ym0kgq2p";
+      name = "spectacle-16.12.1.tar.xz";
     };
   };
   step = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/step-16.12.0.tar.xz";
-      sha256 = "0ilnbk8ax18vk0sbziydm2mzlhp3kl3jymg7cllpb8kknsmjiky4";
-      name = "step-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/step-16.12.1.tar.xz";
+      sha256 = "0ks8mzw9wmp57pkz3mbpnlpa2vsvdhngvj0i2pyvhwzmclifgm03";
+      name = "step-16.12.1.tar.xz";
     };
   };
   svgpart = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/svgpart-16.12.0.tar.xz";
-      sha256 = "0cqlzxcnqsxyq60dlglpzz3081slr0fwf9bq1pv4d80fs84yj1nw";
-      name = "svgpart-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/svgpart-16.12.1.tar.xz";
+      sha256 = "0m84z6jm52mvsbb6khajxp8cp52bhyix8s2ssc3j86dhi0n7imbi";
+      name = "svgpart-16.12.1.tar.xz";
     };
   };
   sweeper = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/sweeper-16.12.0.tar.xz";
-      sha256 = "0lha6m8aa8jwlkcyzwc11l48197m90apwv5fbbiy67h2gj105izr";
-      name = "sweeper-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/sweeper-16.12.1.tar.xz";
+      sha256 = "0ds7w70zhnqmyq0b5703sjw3airmfby21vfjl69nqqmsncf8snb4";
+      name = "sweeper-16.12.1.tar.xz";
     };
   };
   syndication = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/syndication-16.12.0.tar.xz";
-      sha256 = "1z0mfklr3f7081smxihvcck5arzvzqy3bnyf2wdj92wlj4k974km";
-      name = "syndication-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/syndication-16.12.1.tar.xz";
+      sha256 = "1l1klni18xlgfjlhwc3gdzpkj5gfcmwzwv6f6q731xkjay7rdlqh";
+      name = "syndication-16.12.1.tar.xz";
     };
   };
   umbrello = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/umbrello-16.12.0.tar.xz";
-      sha256 = "01zkrlg1iz0qampzxp77kralz4s9kw02lz5x2114mfjh8l3h65f6";
-      name = "umbrello-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/umbrello-16.12.1.tar.xz";
+      sha256 = "1f8bsf60y5s5ms9ypgd0865is5xf8fjhsfrp7dg8hi15nmd69k9c";
+      name = "umbrello-16.12.1.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "16.12.0";
+    version = "16.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.0/src/zeroconf-ioslave-16.12.0.tar.xz";
-      sha256 = "0alfyp22w72yf7gaxgiqini6nv0qkjjnkgicph9z2yiysywq57a2";
-      name = "zeroconf-ioslave-16.12.0.tar.xz";
+      url = "${mirror}/stable/applications/16.12.1/src/zeroconf-ioslave-16.12.1.tar.xz";
+      sha256 = "1r6ls8hsahgbqvailwaz2qwk3m3z3mfwav8g2rwdqk7s3p2fp1cx";
+      name = "zeroconf-ioslave-16.12.1.tar.xz";
     };
   };
 }

From fec95a40f1d4eba786f8404b4dcc5dc1de15393f Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Sun, 25 Dec 2016 23:32:40 +0100
Subject: [PATCH 235/727] ddclient: Don't include blank server= lines.

---
 nixos/modules/services/networking/ddclient.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index d1900deceaf..5928203368d 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -132,7 +132,8 @@ in
         login=${config.services.ddclient.username}
         password=${config.services.ddclient.password}
         protocol=${config.services.ddclient.protocol}
-        server=${config.services.ddclient.server}
+        ${let server = config.services.ddclient.server; in
+          lib.optionalString (server != "") "server=${server}"}
         ssl=${if config.services.ddclient.ssl then "yes" else "no"}
         wildcard=YES
         ${config.services.ddclient.domain}

From dc0e5e13bb99b06e09c58e5e411ca03943f0c4b7 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 16 Jan 2017 20:37:44 +0100
Subject: [PATCH 236/727] udunits: 2.2.20 -> 2.2.21

---
 pkgs/development/libraries/udunits/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix
index a48f4487dd5..74b89fbe48c 100644
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/pkgs/development/libraries/udunits/default.nix
@@ -3,13 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-    name = "udunits-2.2.20";
+    name = "udunits-2.2.21";
     src = fetchurl {
         url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz";
-        sha256 = "15fiv66ni6fmyz96k138vrjd7cx6ndxrj6c71pah18n69c0h42pi";
+        sha256 = "0z8sglqc3d409cylqln53jrv97rw7npyh929y2xdvbc40kzzaxcv";
     };
 
-    buildInputs = [ bison flex expat file ];
+    nativeBuildInputs = [ bison flex file ];
+    buildInputs = [ expat ];
 
     meta = with stdenv.lib; {
       homepage = http://www.unidata.ucar.edu/software/udunits/;

From 21e3948c8c7558e4df65e58793449408da837ad4 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 16 Jan 2017 20:38:22 +0100
Subject: [PATCH 237/727] udunits: remove unused patch

---
 pkgs/development/libraries/udunits/configure.patch | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 pkgs/development/libraries/udunits/configure.patch

diff --git a/pkgs/development/libraries/udunits/configure.patch b/pkgs/development/libraries/udunits/configure.patch
deleted file mode 100644
index 36a0efb8590..00000000000
--- a/pkgs/development/libraries/udunits/configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' udunits-2.1.24_orig/configure udunits-2.1.24/configure
---- udunits-2.1.24_orig/configure	2011-09-13 05:58:39.000000000 +0900
-+++ udunits-2.1.24/configure	2014-11-21 21:59:30.308180814 +0900
-@@ -7033,7 +7033,7 @@
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--    case `/usr/bin/file conftest.o` in
-+    case `$MAGIC_CMD conftest.o` in
-     *32-bit*)
-       case $host in
-         x86_64-*kfreebsd*-gnu)

From b280b6c568764d32fc955448411775f2e39ee4bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 16 Jan 2017 20:36:46 +0100
Subject: [PATCH 238/727] lighttpd: 1.4.44 -> 1.4.45

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

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index c6f88c24509..87efc41b1d6 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null;
 assert enableMysql -> mysql != null;
 
 stdenv.mkDerivation rec {
-  name = "lighttpd-1.4.44";
+  name = "lighttpd-1.4.45";
 
   src = fetchurl {
     url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "08jlgcy08w1gd8hkmz0bccipv4dzxdairj89nbz5f6b5hnlnrdmd";
+    sha256 = "0grsqh7pdqnjx6xicd96adsx84vryb7c4n21dnxfygm3xrfj55qw";
   };
 
   buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]

From 2ba9a67299b45d247456119c0c7aeb27ed726cfc Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 16 Jan 2017 20:42:53 +0100
Subject: [PATCH 239/727] bitlbee: 3.4.2 -> 3.5

---
 .../networking/instant-messengers/bitlbee/default.nix    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 89ee38a7380..8b0dda1694d 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -2,15 +2,16 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bitlbee-3.4.2";
+  name = "bitlbee-3.5";
 
   src = fetchurl {
     url = "mirror://bitlbee/src/${name}.tar.gz";
-    sha256 = "0mza8lnfwibmklz8hdzg4f7p83hblf4h6fbf7d732kzpvra5bj39";
+    sha256 = "06c371bjly38yrkvfwdh5rjfx9xfl7bszyhrlbldy0xk38c057al";
   };
 
-  buildInputs = [ gnutls glib pkgconfig libotr python ]
-    ++ optional doCheck check;
+  nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check;
+
+  buildInputs = [ gnutls glib libotr python ];
 
   configureFlags = [
     "--gcov=1"

From 15389b51cea6a3a25272a1bb198a1db9a6fec0a8 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Mon, 16 Jan 2017 14:53:41 -0500
Subject: [PATCH 240/727] haskell-packages: fix purescript_0_10_5 deps

purescript-0.10.5 requires bower-json >= 1.0.0.1 && < 1.1, which is
available as bower-json_1_0_0_1.
---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8a4dfa60151..2d9a04b7576 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -614,6 +614,11 @@ self: super: {
   # /homeless-shelter. Disabled.
   purescript = dontCheck super.purescript;
 
+  # Requires bower-json >= 1.0.0.1 && < 1.1
+  purescript_0_10_5 = super.purescript_0_10_5.overrideScope (self: super: {
+    bower-json = self.bower-json_1_0_0_1;
+  });
+
   # https://github.com/tych0/xcffib/issues/37
   xcffib = dontCheck super.xcffib;
 

From f1a9bc356ecaef1d399ed7f245d7160c87427a9c Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 16 Jan 2017 21:24:21 +0000
Subject: [PATCH 241/727] lkl: init

---
 .../virtualization/lkl/default.nix            | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/virtualization/lkl/default.nix

diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
new file mode 100644
index 00000000000..752dfb9ce16
--- /dev/null
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:
+
+stdenv.mkDerivation rec {
+  name = "lkl-${stdenv.lib.substring 0 7 rev}";
+  rev  = "8a0fc49c2d13d5ae5e591d859d78035c368469b0";
+
+  buildInputs = [ bc python fuse libarchive ];
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "copumpkin"; # TODO: use 'lkl' here once https://github.com/lkl/linux/pull/294 is merged
+    repo   = "linux";
+    sha256 = "07k1mq25a907l1ivlgwxycx2vc0fmir3da4xrjkj2v87c7siqvwf";
+  };
+
+  installPhase = ''
+    mkdir -p $out/{bin,lib}
+
+    # This tool assumes a different directory structure so let's point it at the right location
+    cp tools/lkl/bin/lkl-hijack.sh $out/bin
+    substituteInPlace $out/bin/lkl-hijack.sh --replace '/../' '/../lib'
+
+    cp tools/lkl/{cptofs,cpfromfs,fs2tar,lklfuse} $out/bin
+    cp -r tools/lkl/include $out
+    cp tools/lkl/liblkl*.{a,so} $out/lib
+  '';
+
+  # We turn off format and fortify because of these errors (fortify implies -O2, which breaks the jitter entropy code):
+  #   fs/xfs/xfs_log_recover.c:2575:3: error: format not a string literal and no format arguments [-Werror=format-security]
+  #   crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c."
+  hardeningDisable = [ "format" "fortify" ];
+
+  makeFlags = "-C tools/lkl";
+
+  enableParallelBuilds = true;
+
+  meta = with stdenv.lib; {
+    description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead";
+    platforms   = platforms.linux; # Darwin probably works too but I haven't tested it
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ copumpkin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18f663c2d92..fb5c9f055e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11097,6 +11097,8 @@ in
 
   # -- Linux kernel expressions ------------------------------------------------
 
+  lkl = callPackage ../applications/virtualization/lkl { };
+
   linuxHeaders = linuxHeaders_4_4;
 
   linuxHeaders24Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/2.4.nix {

From 919a1435da08b0fdd051b1bf3670a8f347aa4a4e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 17 Jan 2017 00:13:18 +0100
Subject: [PATCH 242/727] gperf: 3.0.4 -> 3.1

See https://lists.gnu.org/archive/html/info-gnu/2017-01/msg00005.html
for full release announcement.
---
 pkgs/development/tools/misc/gperf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix
index bfada264d50..b88a107bdbc 100644
--- a/pkgs/development/tools/misc/gperf/default.nix
+++ b/pkgs/development/tools/misc/gperf/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "gperf-3.0.4";
+  name = "gperf-3.1";
 
   src = fetchurl {
     url = "mirror://gnu/gperf/${name}.tar.gz";
-    sha256 = "0gnnm8iqcl52m8iha3sxrzrl9mcyhg7lfrhhqgdn4zj00ji14wbn";
+    sha256 = "1qispg6i508rq8pkajh26cznwimbnj06wq9sd85vg95v8nwld1aq";
   };
 
   meta = {

From fc6d746e62a90ab284373e22d5814c8a65cd9275 Mon Sep 17 00:00:00 2001
From: Ben Zhang <benzhangniu@gmail.com>
Date: Tue, 17 Jan 2017 01:22:26 -0500
Subject: [PATCH 243/727] yarn: 0.18.1 -> 0.19.1

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

diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index 2276eb04e6f..7d93ea1fcab 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yarn-${version}";
-  version = "0.18.1";
+  version = "0.19.1";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "1jkgd2d0n78jw66a0v3cgawcc9qvzjy1zp8c1wzfqf0hl5wrcv9q";
+    sha256 = "1006ijhig9pcmrlsqfwxhn4i78bcji2grvkl4hz64fmqv6rh783s";
   };
 
   buildInputs = [makeWrapper nodejs];

From be7cd4cfcf098c287bcb7da05d870ccf09ac03cf Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 17 Jan 2017 09:28:02 +0100
Subject: [PATCH 244/727] cloc: 1.70 -> 1.72

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

diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index b58ae6505dc..fb1c79d250a 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cloc-${version}";
-  version = "1.70";
+  version = "1.72";
 
   src = fetchFromGitHub {
     owner = "AlDanial";
     repo = "cloc";
     rev = "v${version}";
-    sha256 = "1abkfkjn4fxplq33cwqjmgxabk2x6ij2klqn0w4a0lj82a7xx10x";
+    sha256 = "192z3fzib71y3sjic03ll67xv51igdlpvfhx12yv9wnzkir7lx02";
   };
 
   sourceRoot = "cloc-v${version}-src/Unix";

From 518c3a00b2f51974add7a4d9d54256d59a3b84a3 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 17 Jan 2017 08:28:39 +0800
Subject: [PATCH 245/727] monero: 0.9.4 -> 0.10.1

---
 pkgs/applications/misc/monero/default.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix
index 7f4311c2f49..a8bde39a278 100644
--- a/pkgs/applications/misc/monero/default.nix
+++ b/pkgs/applications/misc/monero/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchFromGitHub, cmake, boost, miniupnpc, pkgconfig, unbound }:
 
 let
-  version = "0.9.4";
+  version = "0.10.1";
 in
 stdenv.mkDerivation {
   name = "monero-${version}";
 
   src = fetchFromGitHub {
     owner = "monero-project";
-    repo = "bitmonero";
+    repo = "monero";
     rev = "v${version}";
-    sha256 = "1qzpy1mxz0ky6hfk1gf67ybbr9xy6p6irh6zwri35h1gb97sbc3c";
+    sha256 = "1zngskpgxz3vqq348h0mab2kv95z6g9ckvqkr77mx15m5z3qi6aw";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
@@ -27,19 +27,17 @@ stdenv.mkDerivation {
 
   installPhase = ''
     install -Dt "$out/bin/" \
-        bin/bitmonerod \
-        bin/blockchain_converter \
-        bin/blockchain_dump \
-        bin/blockchain_export \
-        bin/blockchain_import \
-        bin/cn_deserialize \
-        bin/simpleminer \
-        bin/simplewallet
+        bin/monerod \
+        bin/monero-blockchain-export \
+        bin/monero-blockchain-import \
+        bin/monero-utils-deserialize \
+        bin/monero-wallet-cli \
+        bin/monero-wallet-rpc
   '';
 
   meta = with stdenv.lib; {
     description = "Private, secure, untraceable currency";
-    homepage = http://monero.cc/;
+    homepage = https://getmonero.org/;
     license = licenses.bsd3;
     maintainers = [ maintainers.ehmry ];
     platforms = [ "x86_64-linux" ];

From 00965c05fbfafc19b5dcf880321db24c7c12e51e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 17 Jan 2017 10:59:29 +0100
Subject: [PATCH 246/727] haskellPackages: turtle_1_3_*: 1_3_0 -> 1_3_1

I am not the correct person to patch haskellPackages, but this
expression was missing `super.turtle_1_3_0` before and builds now.

Real motivation: fix evaluation tests for `master`. Right now
`test-eval-release.sh` passes fine.
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2d9a04b7576..7c94211d566 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1181,7 +1181,7 @@ self: super: {
   # https://github.com/krisajenkins/elm-export/pull/22
   elm-export = doJailbreak super.elm-export;
 
-  turtle_1_3_0 = super.turtle_1_3_0.overrideScope (self: super: {
+  turtle_1_3_1 = super.turtle_1_3_1.overrideScope (self: super: {
     optparse-applicative = self.optparse-applicative_0_13_0_0;
   });
 

From cc0981b17676dde2d637c36d280c2e429cc9ddf4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 17 Jan 2017 10:53:20 +0100
Subject: [PATCH 247/727] debian: 8.6 -> 8.7

---
 pkgs/build-support/vm/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index d03265c089a..36cb068d93d 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1886,22 +1886,22 @@ rec {
     };
 
     debian8i386 = {
-      name = "debian-8.6-jessie-i386";
-      fullName = "Debian 8.6 Jessie (i386)";
+      name = "debian-8.7-jessie-i386";
+      fullName = "Debian 8.7 Jessie (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz;
-        sha256 = "b915c936233609af3ecf9272cd53fbdb2144d463e8472a30507aa112ef5e6a6b";
+        sha256 = "71cacb934dc4ab2e67a5ed215ccbc9836cf8d95687edec7e7fe8d3916e3b3fe8";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian8x86_64 = {
-      name = "debian-8.6-jessie-amd64";
-      fullName = "Debian 8.6 Jessie (amd64)";
+      name = "debian-8.7-jessie-amd64";
+      fullName = "Debian 8.7 Jessie (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
-        sha256 = "8b80b6608a8fc72509b949efe1730077f0e8383b29c6aed5f86d9f9b51a631d8";
+        sha256 = "b4cfbaaef31f05ce1726d00f0a173f5b6f33a9192513302319a49848884a17f3";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From 3e86a0b496eee935cf67048d7f90e277de0a8c79 Mon Sep 17 00:00:00 2001
From: Lee Machin <leemachin@users.noreply.github.com>
Date: Tue, 17 Jan 2017 10:55:23 +0100
Subject: [PATCH 248/727] Add rubocop linter for Ruby (#21934)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use gemdir and pname as suggested by @zimbatm

Fix silly typo
---
 lib/maintainers.nix                         |  1 +
 pkgs/development/tools/rubocop/Gemfile      |  3 +
 pkgs/development/tools/rubocop/Gemfile.lock | 27 ++++++++
 pkgs/development/tools/rubocop/default.nix  | 17 +++++
 pkgs/development/tools/rubocop/gemset.nix   | 69 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 6 files changed, 119 insertions(+)
 create mode 100644 pkgs/development/tools/rubocop/Gemfile
 create mode 100644 pkgs/development/tools/rubocop/Gemfile.lock
 create mode 100644 pkgs/development/tools/rubocop/default.nix
 create mode 100644 pkgs/development/tools/rubocop/gemset.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9ba52bdefb4..b7ca05af16a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -248,6 +248,7 @@
   ldesgoui = "Lucas Desgouilles <ldesgoui@gmail.com>";
   league = "Christopher League <league@contrapunctus.net>";
   lebastr = "Alexander Lebedev <lebastr@gmail.com>";
+  leemachin = "Lee Machin <me@mrl.ee>";
   leenaars = "Michiel Leenaars <ml.software@leenaa.rs>";
   leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>";
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
diff --git a/pkgs/development/tools/rubocop/Gemfile b/pkgs/development/tools/rubocop/Gemfile
new file mode 100644
index 00000000000..f6ab81c8112
--- /dev/null
+++ b/pkgs/development/tools/rubocop/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gem 'rake'
+gem 'rubocop'
diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock
new file mode 100644
index 00000000000..abc782465cc
--- /dev/null
+++ b/pkgs/development/tools/rubocop/Gemfile.lock
@@ -0,0 +1,27 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.3.0)
+    parser (2.3.3.1)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.2.1)
+    rake (12.0.0)
+    rubocop (0.47.0)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    unicode-display_width (1.1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  rubocop
+
+BUNDLED WITH
+   1.13.7
diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix
new file mode 100644
index 00000000000..850fb5ad7f5
--- /dev/null
+++ b/pkgs/development/tools/rubocop/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, lib, bundlerEnv, ruby, makeWrapper }:
+
+bundlerEnv rec {
+  pname = "rubocop";
+
+  inherit ruby;
+
+  gemdir = ./.;
+
+  meta = with lib; {
+    description = "Automatic Ruby code style checking tool";
+    homepage = http://rubocop.readthedocs.io/en/latest/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ leemachin ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix
new file mode 100644
index 00000000000..908b5b76dd3
--- /dev/null
+++ b/pkgs/development/tools/rubocop/gemset.nix
@@ -0,0 +1,69 @@
+{
+  ast = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  parser = {
+    dependencies = ["ast"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nply96nqrkgx8d3jay31sfy5p4q74dg8ymln0mdazxx5cz2n8bq";
+      type = "gem";
+    };
+    version = "2.3.3.1";
+  };
+  powerpack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  rainbow = {
+    dependencies = ["rake"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0frz90gyi5k26jx3ham1x661hpkxf82rkxb85nakcz70dna7i8ri";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+  rake = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
+      type = "gem";
+    };
+    version = "12.0.0";
+  };
+  rubocop = {
+    dependencies = ["parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lsv3zbjl14nqyqqvcwciz15nq76l7vg97nydrdsrxs2bc5jrlsm";
+      type = "gem";
+    };
+    version = "0.47.0";
+  };
+  ruby-progressbar = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
+  unicode-display_width = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1r28mxyi0zwby24wyn1szj5hcnv67066wkv14wyzsc94bf04fqhx";
+      type = "gem";
+    };
+    version = "1.1.3";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb5c9f055e2..1c148094f31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3664,6 +3664,8 @@ in
   rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
 
   rubber = callPackage ../tools/typesetting/rubber { };
+  
+  rubocop = callPackage ../development/tools/rubocop { };
 
   runningx = callPackage ../tools/X11/runningx { };
 

From a42044c6b5a0ebaccf675d0f8fe42263fb0bffc3 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 17 Jan 2017 10:58:38 +0100
Subject: [PATCH 249/727] rustc: Disable another failing tcp test on Darwin.

Fixes #21936
---
 .../darwin-disable-fragile-tcp-tests.patch    | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch b/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch
index 5c51886b4d8..da550f0327d 100644
--- a/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch
+++ b/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch
@@ -1,29 +1,37 @@
-From 0becb0b7cff0176279fc9f94c91299d788a43941 Mon Sep 17 00:00:00 2001
+From 1d8a91d5b09cb762fe890d04bfb61b9eefd0624a Mon Sep 17 00:00:00 2001
 From: Moritz Ulrich <moritz@tarn-vedra.de>
 Date: Sun, 8 Jan 2017 10:28:17 +0100
 Subject: [PATCH] Disable libstd::net::tcp::{ttl, timeouts} on Darwin
 
 ---
- src/libstd/net/tcp.rs | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ src/libstd/net/tcp.rs | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
-index 0e7c5b0671..189c31b958 100644
+index 0e7c5b0671..d42fd26267 100644
 --- a/src/libstd/net/tcp.rs
 +++ b/src/libstd/net/tcp.rs
-@@ -1022,7 +1022,10 @@ mod tests {
+@@ -551,6 +551,7 @@ mod tests {
+         })
+     }
+ 
++    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn write_close() {
+         each_ip(&mut |addr| {
+@@ -1022,7 +1023,10 @@ mod tests {
  
      // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
      //        no longer has rounding errors.
 -    #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)]
-+  #[cfg_attr(any(target_os = "bitrig",
-+                 target_os = "netbsd",
-+                 target_os = "openbsd",
-+                 target_os = "macos"), ignore)]
++    #[cfg_attr(any(target_os = "bitrig",
++                   target_os = "netbsd",
++                   target_os = "openbsd",
++                   target_os = "macos"), ignore)]
      #[test]
      fn timeouts() {
          let addr = next_test_ip4();
-@@ -1101,6 +1104,7 @@ mod tests {
+@@ -1101,6 +1105,7 @@ mod tests {
          assert_eq!(false, t!(stream.nodelay()));
      }
  

From c885570944c8e9be235b9e7038748112ba1c2fd9 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Tue, 17 Jan 2017 11:54:03 +0100
Subject: [PATCH 250/727] fping: enable IPv6 (provides fping6 binary) (#21950)

---
 pkgs/tools/networking/fping/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index 83899c2380c..32f52ab807f 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "082pis2c2ad6kkj35zmsf6xb2lm8v8hdrnjiwl529ldk3kyqxcjb";
   };
 
+  configureFlags = [ "--enable-ipv6" "--enable-ipv4" ];
+
   meta = {
     homepage = "http://fping.org/";
     description = "Send ICMP echo probes to network hosts";

From c7ea194b415dfc8582446cbd82967ab0c169ea36 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Tue, 17 Jan 2017 11:55:09 +0100
Subject: [PATCH 251/727] fping: 3.13 -> 3.15 (#21949)

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

diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index 32f52ab807f..11e019dfec3 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fping-3.13";
+  name = "fping-3.15";
 
   src = fetchurl {
     url = "http://www.fping.org/dist/${name}.tar.gz";
-    sha256 = "082pis2c2ad6kkj35zmsf6xb2lm8v8hdrnjiwl529ldk3kyqxcjb";
+    sha256 = "072jhm9wpz1bvwnwgvz24ijw0xwwnn3z3zan4mgr5s5y6ml8z54n";
   };
 
   configureFlags = [ "--enable-ipv6" "--enable-ipv4" ];

From 9a9be9296f03ed48b9d7b7ac510619d2923de7a4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 17 Jan 2017 12:02:07 +0100
Subject: [PATCH 252/727] linux: 4.9.3 -> 4.9.4

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index b39e0e023c7..948f700b484 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.3";
+  version = "4.9.4";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1a7cn0bfxjyrn4va3cgylbs32k30zigqavzgan720zj761icmyvl";
+    sha256 = "1160rs35w58cwynq2pcdjxvxgc5lkhy4ydh00hylsnmi9jvazpcv";
   };
 
   kernelPatches = args.kernelPatches;

From e9109b1b979d8ce9385431b38d0f2eda693cbaf3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 17 Jan 2017 12:02:37 +0100
Subject: [PATCH 253/727] linux: 4.4.42 -> 4.4.43

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 82126f8a680..2d2f4d924db 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.42";
+  version = "4.4.43";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0y788bnhfddackx19lhs1y3qpxb8m28v5j2yxvih7wljirb4firj";
+    sha256 = "1yzphiznkwambniq21fiw0vw1fgql4cwcxjlp290y8cf3b3704qb";
   };
 
   kernelPatches = args.kernelPatches;

From c97b7fd64079cee1848ec12dcd198c89fd437a6b Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 15 Jan 2017 13:44:03 -0500
Subject: [PATCH 254/727] elpa-packages: 2017-01-17

---
 .../editors/emacs-modes/elpa-generated.nix    | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index e2ae9e1df0d..9aa66d12fdc 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -306,6 +306,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    cobol-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "cobol-mode";
+        version = "1.0.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/cobol-mode-1.0.0.el";
+          sha256 = "1zmcfpl7v787yacc7gxm8mkp53fmrznp5mnad628phf3vj4kwnxi";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/cobol-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "coffee-mode";
         version = "0.4.1.1";
@@ -809,10 +822,10 @@
     gnugo = callPackage ({ ascii-art-to-unicode, cl-lib ? null, elpaBuild, fetchurl, lib, xpm }:
     elpaBuild {
         pname = "gnugo";
-        version = "3.0.0";
+        version = "3.0.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnugo-3.0.0.tar";
-          sha256 = "0b94kbqxir023wkmqn9kpjjj2v0gcz856mqipz30gxjbjj42w27x";
+          url = "https://elpa.gnu.org/packages/gnugo-3.0.1.tar";
+          sha256 = "08z2hg9mvsxdznq027cmwhkb5i7n7s9r2kvd4jha9xskrcnzj3pp";
         };
         packageRequires = [ ascii-art-to-unicode cl-lib xpm ];
         meta = {
@@ -956,10 +969,10 @@
     js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "js2-mode";
-        version = "20160623";
+        version = "20170116";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/js2-mode-20160623.tar";
-          sha256 = "057djy6amda8kyprkb3v733d21nlmq5fgfazi65fywlfwyq1adxs";
+          url = "https://elpa.gnu.org/packages/js2-mode-20170116.tar";
+          sha256 = "1z4k7710yz1fbm2w8m17q81yyp8sxllld0zmgfnc336iqrc07hmk";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {

From d119a433212c4b36111a1e36384704526a55be43 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 15 Jan 2017 13:46:33 -0500
Subject: [PATCH 255/727] melpa-stable-packages: 2017-01-17

---
 .../emacs-modes/melpa-stable-generated.nix    | 360 +++++++++++++-----
 1 file changed, 264 insertions(+), 96 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 66123749c58..9d945859ffe 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -230,6 +230,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-emacs-eclim";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "emacs-eclim";
+          repo = "emacs-eclim";
+          rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6";
+          sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
+          sha256 = "0bkh7x6zj5drdvm9ji4vwqdxv7limd9a1idy8lsg0lcca3rjq3s5";
+          name = "ac-emacs-eclim";
+        };
+        packageRequires = [ auto-complete eclim ];
+        meta = {
+          homepage = "https://melpa.org/#/ac-emacs-eclim";
+          license = lib.licenses.free;
+        };
+      }) {};
     ac-emoji = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ac-emoji";
@@ -524,22 +545,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-racer = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }:
+    ac-racer = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }:
     melpaBuild {
         pname = "ac-racer";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-ac-racer";
-          rev = "2708b0a49afc89fb99a6d74a016cff6b94138ed0";
-          sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl";
+          rev = "4408c2d652dec0432e20c05e001db8222d778c6b";
+          sha256 = "01154kqzh3pjy57vxhv27nm69p85a1fwl7r95c7pzmzxgxigfz1p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4318daf4dbb6864ee41f41287c89010fb811641/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
           name = "ac-racer";
         };
-        packageRequires = [ auto-complete cl-lib racer ];
+        packageRequires = [ auto-complete emacs racer ];
         meta = {
           homepage = "https://melpa.org/#/ac-racer";
           license = lib.licenses.free;
@@ -1687,22 +1708,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    aurel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aurel";
-        version = "0.8";
+        version = "0.9";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "aurel";
-          rev = "2b462d08c0e21f7fee0039457a02fa766fc6181c";
-          sha256 = "0dqr1yrzf7a8655dsbcch4622rc75j9yjbn9zhkyikqjicddnlda";
+          rev = "fc7ad208f43f8525f84a18941c9b55f956df8961";
+          sha256 = "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel";
           sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
           name = "aurel";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ bui dash emacs ];
         meta = {
           homepage = "https://melpa.org/#/aurel";
           license = lib.licenses.free;
@@ -2065,6 +2086,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    autothemer = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "autothemer";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "sebastiansturm";
+          repo = "autothemer";
+          rev = "8c467f57571c154129d660dfccebd151c998f2d9";
+          sha256 = "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d7beed6ba10d7aa6a36328a696ba2d0d21dc2/recipes/autothemer";
+          sha256 = "1lcyqfzx7qpkr3ajk0zi0mn32yvcwn06f61vhghn9c66xambsr7f";
+          name = "autothemer";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/autothemer";
+          license = lib.licenses.free;
+        };
+      }) {};
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
@@ -2743,6 +2785,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "buffer-manage";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "plandes";
+          repo = "buffer-manage";
+          rev = "09c7e652010ce84ea43c0ac20a943e7733bea0af";
+          sha256 = "0dhqx4zlqznl4kn8cqp2a4a7c8nsw58pxss2852pfaz11pyv22ma";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
+          sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb";
+          name = "buffer-manage";
+        };
+        packageRequires = [ choice-program emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/buffer-manage";
+          license = lib.licenses.free;
+        };
+      }) {};
     buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buffer-move";
@@ -3733,12 +3796,12 @@
     cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "cliphist";
-        version = "0.4.0";
+        version = "0.5.1";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cliphist";
-          rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4";
-          sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd";
+          rev = "72a8a92f69b280c347afe2f8b5f5eb57606a9aec";
+          sha256 = "0arilk9msbrx4kwg6nk0faw1yi2ss225wdlz6ycdgqc1531h6jkm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist";
@@ -4038,12 +4101,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.7.1";
+        version = "3.7.2";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "db3499df5d06ab2cacc61e9f7720a33456aeafe4";
-          sha256 = "17ab5xln94z2ybvn8s9pivyd6xvi9h448fxjc8yk7605zsjmr9i0";
+          rev = "35413bf2c1b33980afd418030af27f184872af6b";
+          sha256 = "1kk0xri88h4lla8r8y5gksiwpyxb468h8qn0f61sfa1kni73z09s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4434,22 +4497,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-emacs-eclim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    company-emacs-eclim = callPackage ({ cl-lib ? null, company, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-emacs-eclim";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "c5c7272ae30e5017ebd08d4e03508abc6b23bf4c";
-          sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra";
+          rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6";
+          sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
           sha256 = "1l56hcy0y3cr38z1pjf0ilsdqdzvj3zwd40markm6si2xhdr8xig";
           name = "company-emacs-eclim";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib company eclim ];
         meta = {
           homepage = "https://melpa.org/#/company-emacs-eclim";
           license = lib.licenses.free;
@@ -4881,22 +4944,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    concurrent = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    concurrent = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "concurrent";
-        version = "0.4.0";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "8827106c83f0fc773bc406d381ea25a29a5965e1";
-          sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
+          rev = "9668749635472a63e7a9282e2124325405199b79";
+          sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent";
           sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
           name = "concurrent";
         };
-        packageRequires = [ deferred ];
+        packageRequires = [ deferred emacs ];
         meta = {
           homepage = "https://melpa.org/#/concurrent";
           license = lib.licenses.free;
@@ -5406,6 +5469,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ctags-update";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "jixiuf";
+          repo = "ctags-update";
+          rev = "ff4f211e42df94fdeba376e62b65dc67f0388589";
+          sha256 = "09vdfmm846zhn5nxnndi7qg7rdsf5xd4zhynbx0mnm00cfw1vf0y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update";
+          sha256 = "07548jjpx4var2817y47i6br8iicjlj66n1b33h0av6r1h514nci";
+          name = "ctags-update";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ctags-update";
+          license = lib.licenses.free;
+        };
+      }) {};
     ctxmenu = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }:
     melpaBuild {
         pname = "ctxmenu";
@@ -5805,22 +5889,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    deferred = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "deferred";
-        version = "0.4.0";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "8827106c83f0fc773bc406d381ea25a29a5965e1";
-          sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
+          rev = "9668749635472a63e7a9282e2124325405199b79";
+          sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred";
           sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
           name = "deferred";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/deferred";
           license = lib.licenses.free;
@@ -7114,12 +7198,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "2.9";
+        version = "2.10";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "a34f046c1981e881811d54f43ea3ad3ce9a99c84";
-          sha256 = "05l4gd1179gfxpc1jlmpwjb1w221clkg3nyb3z7l30hghnbhjvj4";
+          rev = "4c2581ad17a636909e7ed0f46bd813cd6d9c45d3";
+          sha256 = "1ic55fml4ll7pvakcf32ahps4za8mf4q10jgdyi8xj5bccvi3n3r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -7132,22 +7216,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    eclim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
     melpaBuild {
         pname = "eclim";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "c5c7272ae30e5017ebd08d4e03508abc6b23bf4c";
-          sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra";
+          rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6";
+          sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
           sha256 = "1n60ci6kjmzy2khr3gs7s8gf21j1f9zjaj5a1yy2dyygsarbxw7b";
           name = "eclim";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib dash json popup s yasnippet ];
         meta = {
           homepage = "https://melpa.org/#/eclim";
           license = lib.licenses.free;
@@ -8897,12 +8981,12 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "19.2";
+        version = "19.2.1";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "3473ecd83a7bbe7e0bebb865f25dddb93e3bf10f";
-          sha256 = "06pr4ydrqpp1skx85zjb1an4kvzv6vacb771vy71k54j7w6lh9hk";
+          rev = "bca5bf5a2d68a0e9ca681363a8943809c4751950";
+          sha256 = "1bxksxp2ggzskmrzh4k66w27ckh77jjjriq85xfz52n963al9crr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -9504,12 +9588,12 @@
     evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-escape";
-        version = "3.12";
+        version = "3.14";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "evil-escape";
-          rev = "befb07d03c0c06ff5c40eb9cdd436c97fc49f394";
-          sha256 = "0cj17gk7cxia2p9xzqnlnmqqbw2afd3x61gfw9fpf65j9wik5hbz";
+          rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec";
+          sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/770fc6dd82c4d30f98e973958044e4d47b8fd127/recipes/evil-escape";
@@ -14460,12 +14544,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.3.4";
+        version = "2.4.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624";
-          sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8";
+          rev = "a1bc339cbdaad200cb947e1e6264e9013322b434";
+          sha256 = "1pjp629xwya55ld6hkys4gmgn0mvnd7qzpzz1qraaympsnymrh3w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -14712,12 +14796,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.3.4";
+        version = "2.4.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624";
-          sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8";
+          rev = "a1bc339cbdaad200cb947e1e6264e9013322b434";
+          sha256 = "1pjp629xwya55ld6hkys4gmgn0mvnd7qzpzz1qraaympsnymrh3w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -17208,6 +17292,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    info-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "info-buffer";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "llvilanova";
+          repo = "info-buffer";
+          rev = "d35dad6e766c6e2ddb8dc6acb4ce5b6e10fbcaa7";
+          sha256 = "0czkp7cf7qmdm1jdn67gxyxz8b4qj2kby8if50d450xqwbx0da7x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3c44a1d69725b687444329d8af43c9799112b407/recipes/info-buffer";
+          sha256 = "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4";
+          name = "info-buffer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/info-buffer";
+          license = lib.licenses.free;
+        };
+      }) {};
     inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inherit-local";
@@ -17567,12 +17672,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "0.1.1";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "7bb7dd161889dc74f4a1ec34cd9cd8469843eab9";
-          sha256 = "03gvavrprim1n1av7dam1kgw4m82nrcb8lffp5nk64yz0lcrca6g";
+          rev = "65d80ff0052be9aa65e9a1cd8f6b1f5fb112ee36";
+          sha256 = "05qjpv95xrhwpg1g0znsp33a8827w4p7vl6iflrrmi15kij5imb4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -18048,12 +18153,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20160623";
+        version = "20170116";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "0cda39255827f283e7578cd469ae42daad9556a2";
-          sha256 = "1k91nckxg6d9q9pmn2ikcw85yrmj4yrw20i8v0pq8499wz8i15gs";
+          rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236";
+          sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -19357,12 +19462,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "0.5.3";
+        version = "0.5.4";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "4f1db3f2081e819dd35545497529a03466bd0397";
-          sha256 = "0f96wxijls743qyqfgkdqil3p5nn0sm02rlz1nqkm6bd8k28rcg1";
+          rev = "c22ac44d14de8aaad532e47ea60c21c24d661a50";
+          sha256 = "02842gbxlq6crvd3817aqvj5irshls5km675vmhk0qd4cqg38abv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -21568,12 +21673,12 @@
     neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "0.5";
+        version = "0.5.1";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "ba1f4bacd97c99d55ad37e5940bd7567d2ae50d4";
-          sha256 = "1a8riwz37sws2g2992zj6y8q4ypr76gxfwril6vnfig367anv4js";
+          rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81";
+          sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -21673,12 +21778,12 @@
     nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "1.11.5";
+        version = "1.11.6";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "d39f51fa3472ccc30f1b2896f5538d0b2dbce916";
-          sha256 = "0ms42pmnmzhn0b74s3b441m0nqbckgm64bc00qdlvb1s644j32i6";
+          rev = "1fa2c86db50af806916d72e76f10bef39dd65e7d";
+          sha256 = "1l4xfv38famawrxs6lg9k7gxghgmlgbpp2dbchnqln21d32b6a8h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -22770,12 +22875,12 @@
     org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "2.5.1";
+        version = "2.5.2";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "f441421a5182e356f55bda317a7b3e2d981fdd68";
-          sha256 = "0kzia2l11lj6ddp1rsc71d3nb8cim7i3b5g8yfyfc2zms4mqyzkn";
+          rev = "af4115f4e8b4e77de5642fb28ce6d5e0d7cb0b70";
+          sha256 = "1g775f9gpl0nqq3vn6h9cnjazimn9bjwk31dc7fdylz3nf7f3h03";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -22871,6 +22976,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-mime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-mime";
+        version = "0.0.4";
+        src = fetchFromGitHub {
+          owner = "org-mime";
+          repo = "org-mime";
+          rev = "3c4f24c8d43c24332c4f2f4bf763459b11ead956";
+          sha256 = "04xs06sgdigi9hpciqb0d12rsgzg5b5vyf08rlvkjiddkqclp5pw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
+          sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6";
+          name = "org-mime";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/org-mime";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-multiple-keymap";
@@ -24169,12 +24295,12 @@
     parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parinfer";
-        version = "0.4.6";
+        version = "0.4.7";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "3d5b8d4a3f7e73f15f816f7555abed09c5516338";
-          sha256 = "1w3j0dzi19h1k94gnj1zxx4s1aji91wq4sjwkf813zs7q769mfsp";
+          rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b";
+          sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -24250,6 +24376,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    passmm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "passmm";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "pjones";
+          repo = "passmm";
+          rev = "983fc8e3e6d24bb8088e2e89254ecd5e03db787d";
+          sha256 = "1mcxfk3yqhxslsjl3j25n87di5i2a3v9rk1cj1vnf46695s2fk38";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae2a1e10375f9cd55d19502c9740b2737eba209/recipes/passmm";
+          sha256 = "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b";
+          name = "passmm";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/passmm";
+          license = lib.licenses.free;
+        };
+      }) {};
     passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "passthword";
@@ -24566,12 +24713,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "2.9.4";
+        version = "2.9.5";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "8200c8753513b14ebc1a8b40b917d7c0a6f5ac6a";
-          sha256 = "13pcdy18pqanjhkacl5rbfmyw3y52d9ll0b6w0w4ffc2lhqpi7nd";
+          rev = "1116ead88123a11efef346db0045ee8389250bd2";
+          sha256 = "11xncsvzy13xc939qfvlzplsz2izvf16hy45k500h44g2dxcvq3m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -24944,12 +25091,12 @@
     plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plain-theme";
-        version = "1";
+        version = "2";
         src = fetchFromGitHub {
           owner = "yegortimoshenko";
           repo = "plain-theme";
-          rev = "4210122812df9b5fe375ad35a3b933bf040460a3";
-          sha256 = "184rw6pri55mkab8wv2n483zp0cvd6j911abq290pcqw1pgswcgh";
+          rev = "43fc59d487d39e6110230a073f1376ab877aa739";
+          sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
@@ -25571,12 +25718,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "0.12.1";
+        version = "0.13.0";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1";
-          sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2";
+          rev = "8c41f3c92cd7f5eb5a983f6f3d42cb67dff04366";
+          sha256 = "1rial7py4n451d6ylymf5q4cb57ala4rvvi7619r1c5y1m493qi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -26240,22 +26387,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quickrun";
-        version = "2.2.7";
+        version = "2.2.8";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-quickrun";
-          rev = "fe23f324b0198f8827cc0768e8507a02194eec68";
-          sha256 = "1iypwvdgdh30c9br7jnibgwbdca2mqjy95x2ppsc51sik2mz2db1";
+          rev = "70e93e06778f44113f405aedec6187b925311d57";
+          sha256 = "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun";
           sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy";
           name = "quickrun";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/quickrun";
           license = lib.licenses.free;
@@ -27858,12 +28005,12 @@
     sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "sekka";
-        version = "1.6.4";
+        version = "1.6.5";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "2b0facc87e743e21534672aadac6db3164e38daf";
-          sha256 = "0nsm7z056rh32sq7abgdwyaz4dbz8v9pgbha5jvpk7y0zmnabrgs";
+          rev = "001e205b37ae0dded430b9a809425dc7ed730366";
+          sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -29976,12 +30123,12 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "2.2";
+        version = "2.2.1";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "a07be7a34d4f677a28878f4b72a2095addc628fd";
-          sha256 = "14l8cm82fx0p1xcbf48a303llx2p9p0i17ly1vx8y5ff3a0i0l0h";
+          rev = "6cd2948589771d926e545d8cbe054705eebce18f";
+          sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -32671,8 +32818,8 @@
         version = "0.9.1";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "ab6afca9ee2e";
-          sha256 = "19yy6z12pqaz9l0gj4hm73m7z2gcyivwymf6732vk8im77i8agyl";
+          rev = "280ab84bf8ad";
+          sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -33299,8 +33446,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "59459111e042";
-          sha256 = "072aminyiw7pwm74sq3xqqyd1f2l2ilcwg98r094xjvw4fz3yjq5";
+          rev = "c2c547e147c7";
+          sha256 = "1khsvzg7ma98ijpj21xmdlnp18wwxf2n9jr2y1xia4a6qgkmlchb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -33365,6 +33512,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ydk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ydk-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "jacksonrayhamilton";
+          repo = "ydk-mode";
+          rev = "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e";
+          sha256 = "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/865b9ee86ca28fc1cedc0a432a292400184711ae/recipes/ydk-mode";
+          sha256 = "1z9digf39d7dd736svp0cy6773l3nklzc263q23gwfcg0jswbdyg";
+          name = "ydk-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ydk-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "yesql-ghosts";

From 31556f2fabbe8ea140c00928536409ca05f901f8 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 15 Jan 2017 13:44:16 -0500
Subject: [PATCH 256/727] melpa-packages: 2017-01-17

Removals:
 - character-fold+: Removed from melpa
---
 .../editors/emacs-modes/melpa-generated.nix   | 1116 ++++++++++-------
 1 file changed, 662 insertions(+), 454 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 14d6131f44f..4920dfa3f53 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -380,8 +380,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "7dc87324f4d8c935ad70508707755d89522007ac";
-          sha256 = "0lyhyi50dg165bpm6apq417b5mbyg0wk24d29cw10zzm0y8rxdzh";
+          rev = "5b7d58c783f6453442570ae8cedd489a0659a58e";
+          sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -737,8 +737,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "c3e3a64e8b4ab48a35c2bcaddac6ebb0e1c693f7";
-          sha256 = "1i2x0bl4w9zj7hd1ij2dbmnrbj62yni0na2y0wlb3154inj7ygq8";
+          rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f";
+          sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -758,8 +758,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "c3e3a64e8b4ab48a35c2bcaddac6ebb0e1c693f7";
-          sha256 = "1i2x0bl4w9zj7hd1ij2dbmnrbj62yni0na2y0wlb3154inj7ygq8";
+          rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f";
+          sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -772,22 +772,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ac-racer = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }:
+    ac-racer = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }:
     melpaBuild {
         pname = "ac-racer";
-        version = "20160517.2220";
+        version = "20170114.9";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-ac-racer";
-          rev = "eef0de84bd61136d2ed46da08537c9a89da8bd57";
-          sha256 = "0p0220axf7c0ga4bkd8d2lcwdgwz08xqglw56lnwzdlksgqhsgyf";
+          rev = "4408c2d652dec0432e20c05e001db8222d778c6b";
+          sha256 = "01154kqzh3pjy57vxhv27nm69p85a1fwl7r95c7pzmzxgxigfz1p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4318daf4dbb6864ee41f41287c89010fb811641/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
           name = "ac-racer";
         };
-        packageRequires = [ auto-complete cl-lib racer ];
+        packageRequires = [ auto-complete emacs racer ];
         meta = {
           homepage = "https://melpa.org/#/ac-racer";
           license = lib.licenses.free;
@@ -1465,12 +1465,12 @@
     alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alect-themes";
-        version = "20161218.1121";
+        version = "20170117.217";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "alect-themes";
-          rev = "e01abf039a39de2fdc00a1b7f36842c5f68ff97d";
-          sha256 = "1nbr25003b0jlchy26l4pm1r4gxa2zprnqr8k0qvkhyrszjy78qg";
+          rev = "714516d3f3695d0673f07721d4cff0043a287495";
+          sha256 = "1cxc27579ik7yrjvahdk5ciji1gfwzlzbjrwzx55v67v13y9kz6r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
@@ -1528,12 +1528,12 @@
     all-ext = callPackage ({ all, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "all-ext";
-        version = "20170109.2113";
+        version = "20170114.1805";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "all-ext";
-          rev = "6068946d67dd084c912e75eb64b499d15c41aba1";
-          sha256 = "12d2lxxqs2xr8anx5jhrhzbx9gjwhlswbg4hh4724i4v8bl5d9yb";
+          rev = "9f4ef84a147cf4e0af6ef45826d6cb3558db6b88";
+          sha256 = "0gdrsi9n9i1ibijkgk5kyjdjdmnsccfbpifpv679371glap9f68b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/all-ext";
@@ -2801,12 +2801,12 @@
     atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "atom-one-dark-theme";
-        version = "20161101.1955";
+        version = "20170113.743";
         src = fetchFromGitHub {
           owner = "jonathanchu";
           repo = "atom-one-dark-theme";
-          rev = "ff2990e56f5ff7abf6c20dac7d4d96fa9090221b";
-          sha256 = "1mph3sr9mb2hizx02xn4yaag5h6yanhg5zabrpg5cqz2w6ifagaq";
+          rev = "ab59b076afe892a0dafe56f943533dafb4594369";
+          sha256 = "05k4x5gg0gga2nks0jnk0c4vwv383irm60q1b2z45yqykj9cn1f9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme";
@@ -2906,12 +2906,12 @@
     aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aurel";
-        version = "20170106.1028";
+        version = "20170114.137";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "aurel";
-          rev = "e264f9d6fa5209d377b9cfd851a166d3d7147814";
-          sha256 = "19fx0x4fnpcfngdkmj8s36vk07f4yjky02p5nc3c5dwm50k17zs5";
+          rev = "fc7ad208f43f8525f84a18941c9b55f956df8961";
+          sha256 = "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel";
@@ -3054,8 +3054,8 @@
         src = fetchFromGitHub {
           owner = "auto-complete";
           repo = "auto-complete";
-          rev = "ed1abca79bf476287bdf55ed8f7e0af53e5fdbae";
-          sha256 = "0478sfs8gsn3x9q4ld2lrm1qgf6yfv34nqljh202n6fh982iqdxn";
+          rev = "297e2f77a35dba222c24dd2e3eb0a5d8d0d1ee09";
+          sha256 = "0185d1dc0fld06fk5n77q06wrmrphffs9xz3a6c2clyxf8mfx2vy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete";
@@ -3717,12 +3717,12 @@
     autothemer = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "autothemer";
-        version = "20161221.1331";
+        version = "20170112.1324";
         src = fetchFromGitHub {
           owner = "sebastiansturm";
           repo = "autothemer";
-          rev = "add7d430e0be2f4cd7ccc622f8fbc8bc44be762f";
-          sha256 = "0av6r2frjsbfxxl7lh9r7ccmsrc9yxmllqq8r1y52dzpc18iihpx";
+          rev = "8c467f57571c154129d660dfccebd151c998f2d9";
+          sha256 = "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d7beed6ba10d7aa6a36328a696ba2d0d21dc2/recipes/autothemer";
@@ -4889,8 +4889,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "5954ad37cf2d3c9237f4d2037e8619be15681cd1";
-          sha256 = "0scn6wrs6040j4z1gfmn9akzknjhaj2kr07kfzx1v42ibm42ihcd";
+          rev = "38034854ac21bd5ddc1a1129fd6c8ff86d939f8a";
+          sha256 = "0s20z5njwmk591674mb2lyv50agg6496hkr5b11904jq5ca3xagz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5134,12 +5134,12 @@
     bln-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bln-mode";
-        version = "20161210.610";
+        version = "20170112.527";
         src = fetchFromGitHub {
           owner = "mgrachten";
           repo = "bln-mode";
-          rev = "74563279cb98e42d8649bff53229d5f89a5fb5e0";
-          sha256 = "0mjlbih1dnfmqy41jgs37b8yi39mqwppw7yn5pgdyh8lzr1qh9vw";
+          rev = "1de92cec97a4693b8b932713e333730118db9183";
+          sha256 = "0dlcxh3acaiw3q9sa74jw4bpz7fv9lvpws68gw1qhs39f1plyzfx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee12ef97df241b7405feee69c1e66b3c1a67204b/recipes/bln-mode";
@@ -5322,7 +5322,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20170110.1606";
+        version = "20170113.1310";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "02akakw7zfjx8bjb3sjlf8rhbh1xzx00h3dz7cp84f7jy9xak5v1";
@@ -5774,6 +5774,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "buffer-manage";
+        version = "20170109.1220";
+        src = fetchFromGitHub {
+          owner = "plandes";
+          repo = "buffer-manage";
+          rev = "e320ae7e05803551d8b534aaee84cae6e53155e2";
+          sha256 = "1dns2ngvmyyyr2a0ww9af0s8yzhbgm1gqqlc6686b04wnj8gdphf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
+          sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb";
+          name = "buffer-manage";
+        };
+        packageRequires = [ choice-program emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/buffer-manage";
+          license = lib.licenses.free;
+        };
+      }) {};
     buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buffer-move";
@@ -5795,19 +5816,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    buffer-sets = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    buffer-sets = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buffer-sets";
-        version = "20160811.1911";
-        src = fetchFromGitHub {
-          owner = "swflint";
-          repo = "buffer-sets";
-          rev = "9f266fb9b6325286ea312c9997071b74b5bb45cc";
-          sha256 = "0pxykjnq892k93i1yil1f51gv9286gpwlnddq82jhq20hzh79r9c";
+        version = "20161231.1331";
+        src = fetchgit {
+          url = "https://git.flintfam.org/swf-projects/buffer-sets.git";
+          rev = "f29c30f7cef4e29837c1e6e1282cf99a37c4210c";
+          sha256 = "0kdi330p5xk67nzhj7mrz8arsblbx39lj1z4zy863294fn3ark7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/dc99dde16a23ba5f07848bd4a8483cbe384e7a6d/recipes/buffer-sets";
-          sha256 = "1011x76h8sqk4lp85gddwc9hagmcsykywn0h7qpv0z9bmwqj1s43";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/buffer-sets";
+          sha256 = "0r8mr53bd5cml5gsvq1hbl9894xsq0wwv4p1pp2q4zlcyxlwf4fl";
           name = "buffer-sets";
         };
         packageRequires = [ cl-lib ];
@@ -5900,12 +5920,12 @@
     bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bui";
-        version = "20170106.956";
+        version = "20170113.124";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "bui.el";
-          rev = "3bf8af2f339d2483203eda2c97a61b8771c3269d";
-          sha256 = "1qx7cdm7jd15rf1silwj1yh0mg5fhldfi001k1msi50nyni90c82";
+          rev = "8d0c5e3dd6bcd11943dd23615be9b89367eabade";
+          sha256 = "1h1jzpq1rq9jvvihq9n7agsdr86ppwgs38wmmi8qn6w2p99r6k5p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
@@ -6906,7 +6926,7 @@
         version = "20160801.615";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11937";
+          rev = "11945";
           sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl";
         };
         recipeFile = fetchurl {
@@ -6983,25 +7003,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    character-fold-plus = callPackage ({ fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "character-fold-plus";
-        version = "20170102.916";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/character-fold+.el";
-          sha256 = "0z6fc46sqdhnkpfichq9cnnnjmlcni0rxaj30rabpzkzmpsza79h";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0bb32513eaaafded547058e3de84fc87710d2cf0/recipes/character-fold+";
-          sha256 = "01ibdwd7vap9m64w0bhyknxa3iank3wfss49gsgg4xbbxibyrjh3";
-          name = "character-fold-plus";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/character-fold+";
-          license = lib.licenses.free;
-        };
-      }) {};
     charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "charmap";
@@ -7047,12 +7048,12 @@
     cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cheatsheet";
-        version = "20161106.1219";
+        version = "20170114.2251";
         src = fetchFromGitHub {
           owner = "darksmile";
           repo = "cheatsheet";
-          rev = "329ac84def1af01c19761bd745ee4f275003161f";
-          sha256 = "0981dkn8vkjyw50cbsx1zsa2nmyhsbz6kmrprj5jd828m49c1kc5";
+          rev = "00f8f3cdf6131d1eafe1107e5c82ef69661e1318";
+          sha256 = "0ba2j3g12mf1rckbpfcpb0j0fv7wwxln8jcw7mn8a05c5pcikjp6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2cd657fcadb2dd3fd12864fe94a3465f8c9bd7/recipes/cheatsheet";
@@ -7506,12 +7507,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170111.138";
+        version = "20170112.26";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "3a1bc62b94b233fa42d318e2a5f033a4badd8bd9";
-          sha256 = "1sszr92rlrxj73vwy0kihzvr0s75zc85r6b209bc5d249vd6ilhq";
+          rev = "460a1dc948ea8994eb8b379d132448d26cf7572c";
+          sha256 = "0j9f6gi8zhws12vcwzng2a4bg4hdyvqsb08ha70as7xm9ym8vv6p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7782,8 +7783,8 @@
         version = "20161004.253";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "291717";
-          sha256 = "1vbngm8xf7i8f3140y0dk704vagcws6is9waj9qsy6yg0vxmqp0y";
+          rev = "292208";
+          sha256 = "0li360592lv9hw3a73lva1bjj5qx518ky0yy1sqsb0mw1y7l5rip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -7904,12 +7905,12 @@
     cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "cliphist";
-        version = "20160916.513";
+        version = "20170116.1431";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cliphist";
-          rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4";
-          sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd";
+          rev = "72a8a92f69b280c347afe2f8b5f5eb57606a9aec";
+          sha256 = "0arilk9msbrx4kwg6nk0faw1yi2ss225wdlz6ycdgqc1531h6jkm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist";
@@ -7988,12 +7989,12 @@
     clj-refactor = callPackage ({ cider, clojure-mode, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "20161223.1457";
+        version = "20170114.1148";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "46a925305ad9cf3fce09921ce201e7f527d76e77";
-          sha256 = "1dxy1y02x2447ig0cfvjfhkiv8sih5d75hbdy6s9qhy2ljbmnjw3";
+          rev = "7941d906d603a650d836e3a2ba25554772adb236";
+          sha256 = "0gjmhwx4ibyr7fm2lssah9xbqfwm0174w5zv2hm27v37a8ncvzhv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8357,12 +8358,12 @@
     cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cm-mode";
-        version = "20160914.148";
+        version = "20170112.614";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "criticmarkup-emacs";
-          rev = "12b7460691dc502d27329d6ac11c51cc83cd098e";
-          sha256 = "018limfwcb396yr2kn6jixxdmpmiif3l7gp0p1pmwbg07fldllha";
+          rev = "64913b0107a5ccf3ba4a3569ee03c020c45a3566";
+          sha256 = "1smj4iig5x3va3jl91aassk0smcg67naknk81fshigshif1vs273";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode";
@@ -8424,8 +8425,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "e0cc40ed58a16f63a26cf25c56f6e8471401fbfe";
-          sha256 = "0vz1lxw7kp76glfz2kdkbbb6xnp1pnxgj30m2z2nzpf22kz4nac9";
+          rev = "020cba316bb3a4d33da5108ab10d2c06b4712427";
+          sha256 = "1c2hsy6b6b7vwg7fdjliz3f0yy7j7f8cj3627w5alhp5k6r6mnv1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9167,12 +9168,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20170109.333";
+        version = "20170112.2005";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "7bd93b8e3180eea8e8b1c8e1174e7eb73628e847";
-          sha256 = "0yznjz9wvjl6axswqykddnmcp9q6i868qxdwdg4pjnnw5qavpc5g";
+          rev = "c494fc65d35f7f00c2da17206e6550385ae9b300";
+          sha256 = "07ys3rbsdvhi60lan2gsk7rccikf9gsl2ddmm0sz2g8qal7d2a2a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9459,8 +9460,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "7dc87324f4d8c935ad70508707755d89522007ac";
-          sha256 = "0lyhyi50dg165bpm6apq417b5mbyg0wk24d29cw10zzm0y8rxdzh";
+          rev = "5b7d58c783f6453442570ae8cedd489a0659a58e";
+          sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9812,12 +9813,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "20170110.2036";
+        version = "20170111.2112";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "c3e3a64e8b4ab48a35c2bcaddac6ebb0e1c693f7";
-          sha256 = "1i2x0bl4w9zj7hd1ij2dbmnrbj62yni0na2y0wlb3154inj7ygq8";
+          rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f";
+          sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -9965,12 +9966,12 @@
     company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
     melpaBuild {
         pname = "company-sourcekit";
-        version = "20170106.1437";
+        version = "20170115.1551";
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "71d9e7002a9892308d64af62d21ac73f8d9d4ad5";
-          sha256 = "0fz7pf95zsh597g6az29khjmj3jz4ml3285p98zbkl75vh6h5p0f";
+          rev = "a28ac4811fac929686aca6aa6976845c02d6efd3";
+          sha256 = "09vv6bhiahazjwzg5083b23z3xz5f4b3d4jra61m5xffkmjnbs9s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit";
@@ -10095,8 +10096,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "ca51cbce87f671f2bb133d1df9f327bb8f1bb729";
-          sha256 = "0riz0jj8c80x6p9fcxyni7q3b0dgxjwss8qbihndq8h2jypdhcgd";
+          rev = "386f6101fec6975000ad724f117816c01ab55f16";
+          sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -11135,12 +11136,12 @@
     ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ctags-update";
-        version = "20170110.2142";
+        version = "20170111.2150";
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "ctags-update";
-          rev = "fba14ab3f8077683f63c143f13b37c8a41129a2a";
-          sha256 = "17d301mdrynazyn81klbdck0c0xs47hqsr6v0r9cp1d3k2yfzi21";
+          rev = "b0b5f88bb8a617871692429cf099c4203eff610c";
+          sha256 = "0wdxqkhflwnaic3ydr8an23z2cwsm1sj3di2qj5svs84y0nvyw7s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update";
@@ -11466,8 +11467,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "3d4f7a1978f4c03a941a2dcff8136b10638476cd";
-          sha256 = "0vnn3gk19f6qff1xvldi4zprz0wzspdrxy7hw09a0ncvkmf1qysp";
+          rev = "d02cc4c5d831da27cd871cbb3feaf8bea72ec0c0";
+          sha256 = "055wjr2kgvqji9ifwjchi8m4f095sq8df3vfxcv2n6ifgdwlmzkf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -13111,10 +13112,10 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20170101.840";
+        version = "20170112.1427";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "1vblbkflszci8x415am68fy9if02gnnphz2sz3h3c0368kixf6w7";
+          sha256 = "136nacjnnfd8j771k90zszbjq96fsvm944l1zb06gqlm7x94psll";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -13582,12 +13583,12 @@
     discover-my-major = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }:
     melpaBuild {
         pname = "discover-my-major";
-        version = "20160108.1041";
+        version = "20170113.2306";
         src = fetchFromGitHub {
           owner = "steckerhalter";
           repo = "discover-my-major";
-          rev = "af36998444ac6844ba85f72abbc8575040cb4cc2";
-          sha256 = "0b73nc4jkf9bggnlp0l34jfcgx91vxbpavz6bpnf5rjvm0v1bil9";
+          rev = "ac83b24b5130eb0944f820736012df0924cce528";
+          sha256 = "1hkz2sg8wnjqmsqm0di1h9cf9hb1j6qbw30hda3w8z3m0apzr5fr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/274185fa94a3442c56593f3c8b99bdc6b9bd4994/recipes/discover-my-major";
@@ -14040,12 +14041,12 @@
     docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
     melpaBuild {
         pname = "docker";
-        version = "20161221.49";
+        version = "20170114.440";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "9da6013f24fb00ffc1f2f15c3aeb05181df5d36f";
-          sha256 = "1im6aqc26vjw9sc4x2gj16jdz3hh0mz64p81d7gvmfhjysinyfhn";
+          rev = "2c2f3c68f8136caeef67c4e74cc84d52a7664535";
+          sha256 = "0qyksf5svcpz263ah197bcmpnfn2rfq8x049wbalxi638bmbvzfg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -14195,12 +14196,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170111.203";
+        version = "20170111.2138";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "3ec0853af7745554e88f587512e1d95d9ed638d5";
-          sha256 = "0r43k3dlijws4z6dkkw3wbsmnmjh5776qgayhxrlmvav5a6hkwvg";
+          rev = "bb1e7d7ad7bb8cfe3dccf6499076941a08169e9d";
+          sha256 = "024am5z7ihibkr5pbavdybxdq9q1pnsxhnfppwlzl8kaijqmmzs4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -14599,12 +14600,12 @@
     drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
     melpaBuild {
         pname = "drupal-mode";
-        version = "20161215.414";
+        version = "20170112.1136";
         src = fetchFromGitHub {
           owner = "arnested";
           repo = "drupal-mode";
-          rev = "dea5a8da789e5c707fa6c63cd400282ea7205a14";
-          sha256 = "1zxsa6fapbxa5yfpawivjmav9i80j9752bc6gmpq7ilzsnd67h0v";
+          rev = "6f40ad04b760d2266b8c07283df266471d85a9b2";
+          sha256 = "13wlgy1g1nl3xxkibh0cj983lq3snw4xxmq4nsphq92pjd2lggs7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode";
@@ -14643,7 +14644,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1778356";
+          rev = "1779173";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15247,12 +15248,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "20170109.1442";
+        version = "20170112.443";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "a34f046c1981e881811d54f43ea3ad3ce9a99c84";
-          sha256 = "05l4gd1179gfxpc1jlmpwjb1w221clkg3nyb3z7l30hghnbhjvj4";
+          rev = "4c2581ad17a636909e7ed0f46bd813cd6d9c45d3";
+          sha256 = "1ic55fml4ll7pvakcf32ahps4za8mf4q10jgdyi8xj5bccvi3n3r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -15328,12 +15329,12 @@
     eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
     melpaBuild {
         pname = "eclim";
-        version = "20170107.2050";
+        version = "20170116.1335";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "7dc87324f4d8c935ad70508707755d89522007ac";
-          sha256 = "0lyhyi50dg165bpm6apq417b5mbyg0wk24d29cw10zzm0y8rxdzh";
+          rev = "5b7d58c783f6453442570ae8cedd489a0659a58e";
+          sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -15710,8 +15711,8 @@
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "a4d10d12d40e8611383e67619ed2d2a5f39cb934";
-          sha256 = "17i5gnx3vb2n0ni5lws8d0g4gj9gldrvrrqjnc2i2k9995d48r1r";
+          rev = "99011d5780dd726ec46b7936e2cbbade66b725db";
+          sha256 = "1757lgjbycbf5368s908xbj6dwn3xm9a9zix6ixwxd7j4gyhy16n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -15883,12 +15884,12 @@
     ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "ego";
-        version = "20161219.528";
+        version = "20170112.2043";
         src = fetchFromGitHub {
           owner = "emacs-china";
           repo = "EGO";
-          rev = "334a1ea3869818ac40e84f9832b8996564286ca1";
-          sha256 = "1fi71fkfl95alkamam1z51ksn2pqchcy2gvnkn0smfs9wcy038s1";
+          rev = "d81561d39524a5f78d5f94216b0ca5fef4b5700b";
+          sha256 = "0scnhpj4naaicxp62hd0b5g3kf05gpldbi1z1sfnq4mqi84fnfgx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego";
@@ -16049,12 +16050,12 @@
     el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-get";
-        version = "20161022.614";
+        version = "20170112.2204";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "4a76c7e99edf7b3660fb8360261db1eba953958b";
-          sha256 = "0s5gklk1my6awc9rlqfpjgxqgp3y4i34rahza4gw1y2wb4n81240";
+          rev = "a6510f13c15d9811b51ccb1a96293bbe05162dbb";
+          sha256 = "03i8ma0npxfixlbn4g5ffycpk1fagfjgsl4qg4hkrj9l0dmnm7qq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16112,12 +16113,12 @@
     el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-mock";
-        version = "20160923.1157";
+        version = "20170114.2257";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "el-mock.el";
-          rev = "e3cff9f127ab62dc177b043ce319c7866f6fe2f0";
-          sha256 = "1qclqb5g50m208hwyalc6gc0y04lbai8fplxs0nadas3478x5344";
+          rev = "5fb2867d2e0350dda047a903ce60d264f78ef424";
+          sha256 = "0fdnvsdnkc9xlxch3zavq7ya463g7m7xsc60ymx7a4350zl2vwyn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock";
@@ -16334,6 +16335,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eldoc-overlay-mode";
+        version = "20170114.2125";
+        src = fetchFromGitHub {
+          owner = "stardiviner";
+          repo = "eldoc-overlay-mode";
+          rev = "794c2b959611d1352cdda9e930f2ddd866b4118a";
+          sha256 = "04lndhm1jb0kvv0npr5wmgj8v18537fgp62c6m4gzgcjyfxihmr7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/de4d7c143f24d34eed093cfcdf481e98a6d2f839/recipes/eldoc-overlay-mode";
+          sha256 = "158w2ffayqlcbgka3894p3zbq45kw9mijf421yzf55y1f1ipzqqs";
+          name = "eldoc-overlay-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/eldoc-overlay-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     electric-case = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "electric-case";
@@ -16442,12 +16464,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20161231.735";
+        version = "20170116.1128";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "c6c24403193caa907dbab0d00d6f4ccd9e02d82e";
-          sha256 = "046kz2v650ln39l57cabmk17r8vqp8kic86hp91bxxrlmq6znc60";
+          rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47";
+          sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16516,8 +16538,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "c6c24403193caa907dbab0d00d6f4ccd9e02d82e";
-          sha256 = "046kz2v650ln39l57cabmk17r8vqp8kic86hp91bxxrlmq6znc60";
+          rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47";
+          sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -18615,12 +18637,12 @@
     ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20161206.1258";
+        version = "20170112.1108";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "d5d7e5b6a5537cdcfcc79efd43bbde138fc7863c";
-          sha256 = "1jj7pgcbspallki9in4dn2d0wzis873r89y5kniycnydqfzadpjs";
+          rev = "b4b5241e679cc1a7bd7b1f3703f1a7ce602cd1f6";
+          sha256 = "1zmwzpp410hxgwycys7ij4xjmzz8piykx4scclvvyl63hhqlrrfh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -18661,8 +18683,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "ad8229b57c8dcd8ff129398b53e3b81849daecc7";
-          sha256 = "1rxxx83r5jim8ll54f80yhjnq53gabm42za828s5gygpxsz35359";
+          rev = "eadc98327e3fb173d80a92e6ae2e7d7e85f92d67";
+          sha256 = "1bn43p122ld3269klzcpfwacswnlpj2hdz9kx6n5691zv0w3qi5b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19094,12 +19116,12 @@
     eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eshell-z";
-        version = "20170110.2301";
+        version = "20170116.2038";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "eshell-z";
-          rev = "96ec3f5f8a801c893d2c6a6b140e333ef2bfd8b5";
-          sha256 = "1aac4m814jgxwpz7lbyx5r4z5dmawp4sk7pwbx0zqpnbcsaq5wwc";
+          rev = "c9334cbc1552234df3437f35d98e32f4d18446b8";
+          sha256 = "1zja4hb2lj4m5w4j9mpc7xyqgg2ivpslllffjsg8x1w8xsxpj8fh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z";
@@ -19220,12 +19242,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20170110.58";
+        version = "20170116.214";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "d673c53bd6718e39153bba6a8ed6a7b44e5853a5";
-          sha256 = "0s8qif73lab9kls320rp3c7pklclggwsi69ifc4aizh3qbgrl8bv";
+          rev = "8ba2d5c5a5d9abb5fa907e2e27e6ccb9a130158e";
+          sha256 = "12kx8wbr4wzvrlcbk48qbpfp4pdfsxxgx19qvl127c91ajbxksxa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -19843,12 +19865,12 @@
     evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-escape";
-        version = "20160607.1015";
+        version = "20170115.1343";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "evil-escape";
-          rev = "09e0622e167c89cd4dfa4e2037aaff0aceee52ad";
-          sha256 = "0lk1wsv7k53774mn6ggrm28i9mxzg0xqv8hj372ka66v6ahlb34f";
+          rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec";
+          sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/770fc6dd82c4d30f98e973958044e4d47b8fd127/recipes/evil-escape";
@@ -20137,12 +20159,12 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20161229.1224";
+        version = "20170113.19";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "c1b886acffa804c39b85909bbcb699fc1dbd03fe";
-          sha256 = "0jj45m6s2hm36h5v2bwlxhnayrfwbs99zc1xvfd0kxkx9jz10fz6";
+          rev = "d5b50be73b4288400d418abe86f92504081ea32d";
+          sha256 = "13wvjif6479c1l6hvyhm7jhf41kdh4c56n4rmnncc9cw5z9z7fcb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -20494,12 +20516,12 @@
     evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-surround";
-        version = "20161029.606";
+        version = "20170115.1604";
         src = fetchFromGitHub {
           owner = "timcharper";
           repo = "evil-surround";
-          rev = "5c07befaf7930bbd61c24f3e251f8ce41026cfc2";
-          sha256 = "0gd9dh1k0ydgc8nz575613bry240jb3qymzakkrq8pvcpl57nx7y";
+          rev = "27dc66d5d8ee64917bf5077a4d408f41099622ed";
+          sha256 = "1s0ffrk1avn008ns6qvj4mnjb476bvgsg74b22piq3s3fl8yycr4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround";
@@ -22419,12 +22441,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170110.304";
+        version = "20170112.1646";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "820cdf6e8ee93c467896b03e217f8cfd48db768b";
-          sha256 = "078fh3an9c1b21ggk344bdify7nfsypk8c013gq1cm1557ns0ijs";
+          rev = "d0b058ecbfbf7f1d130aa46580cb77ac67a1fc9d";
+          sha256 = "17x8na9wbclznr4rvvznpljizx6vaw4a8cvpk45c2mijwbh1bz2d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -22839,12 +22861,12 @@
     flycheck-flawfinder = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-flawfinder";
-        version = "20161222.1516";
+        version = "20170115.1927";
         src = fetchFromGitHub {
           owner = "alexmurray";
           repo = "flycheck-flawfinder";
-          rev = "1cd5303c206732faaaab5abbda08bb9a9eb269b9";
-          sha256 = "1577xjqlcyi46jcy0xfb04vbil0cczc0b7z0xwxl5sc5ydrhbgx6";
+          rev = "7d964d38023b088adf3ffc2fddeead81f4491a45";
+          sha256 = "0y023brz8adwa6gdaaixk6dnrq4kj2i5h56rj54cxrjkagyklfxl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e67a84d1a8c890ea56bd842549d70d9841d1e7a7/recipes/flycheck-flawfinder";
@@ -23536,8 +23558,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "ca51cbce87f671f2bb133d1df9f327bb8f1bb729";
-          sha256 = "0riz0jj8c80x6p9fcxyni7q3b0dgxjwss8qbihndq8h2jypdhcgd";
+          rev = "386f6101fec6975000ad724f117816c01ab55f16";
+          sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -25041,12 +25063,12 @@
     fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170111.1014";
+        version = "20170112.1727";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "39c373e2aa07f8b6e7d71843086d9a1b6275bbf2";
-          sha256 = "0fdsxmlrxlaj0pzibmm6ln6ff6waq3hxfj0k7jsxbihkxbn465yr";
+          rev = "3a9be64827bbed8e34d38803b5c44d8d4f6cd688";
+          sha256 = "0manmkd66355g1fw2q1q96ispd0vxf842i8dcr6g592abrz5lhi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
@@ -25065,8 +25087,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "5743ed204c255191df3dcf42089116e0cbf4f49a";
-          sha256 = "1wc0amz87ai2m837jgypq081l32fxbmdgah182qkqsplzcbwwp1k";
+          rev = "0701902122308f376dab4f2a4371600ddc05ae3e";
+          sha256 = "0ahjhr7bmmpkvqxmr0m8c3agaiffqg8p6h5xnbjv93ar6ajk2pz9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25473,12 +25495,12 @@
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "20161202.1657";
+        version = "20170116.1834";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "6893f692259c0241049bf614147160c44dd4ba3e";
-          sha256 = "12gimg3qhnl2r2hx00q602k1rnjcj49hc1v7a23d58c0gmqr4yb6";
+          rev = "46b4c82278029d7193176b72ed3f0d3b1fa8899a";
+          sha256 = "16hvw10xg3nd8scybn95szppa1p5v30hdawxl1wzvafnfz83yf2r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -25666,8 +25688,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "85d38f5bc175cb33586522b094f55288c9f5706a";
-          sha256 = "073qbqzdxbsblcwffkmdmni0rmm43nnh3hawrhpbbcsb47pk5lzs";
+          rev = "e20bb704f61776926ce1d7d3852b54b76dd43644";
+          sha256 = "085ym61ll1ixk7lp3kxcp7aryf6ih9nqkx1nbm93i5asb4h8v996";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -25956,12 +25978,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20170109.1253";
+        version = "20170112.334";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "c6624d143aa3c3e210a04d15e56f42c156226198";
-          sha256 = "0lv4rxs23njyry8akkjrpim1x0w8a172ww599as1ckcgrsnb420k";
+          rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc";
+          sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26040,12 +26062,12 @@
     git-gutter-fringe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fringe-helper, git-gutter, lib, melpaBuild }:
     melpaBuild {
         pname = "git-gutter-fringe";
-        version = "20161221.1712";
+        version = "20170112.2133";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-gutter-fringe";
-          rev = "0b28a5f2a575cc710473884d6d2bbda5975c11e0";
-          sha256 = "0474y0qxdq9srhc279dndx4338wrjxq4cq4ngx5ig7sj6v12dqn4";
+          rev = "16226caab44174301f1659f7bf8cc67a76153445";
+          sha256 = "1y77gjl0yznamdj0f55d418zb75k22izisjg7ikvrfsl2yfqf3pm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter-fringe";
@@ -26394,6 +26416,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    github-pullrequest = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, request }:
+    melpaBuild {
+        pname = "github-pullrequest";
+        version = "20170115.2216";
+        src = fetchFromGitHub {
+          owner = "jakoblind";
+          repo = "github-pullrequest";
+          rev = "9ccdeea36b2cb78f0bd2907cb45d1ab287a6af90";
+          sha256 = "12j81h095rsfqbways4hm9wdr91wwc31b8hr1my55m91r204b9r4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dca88ef598d676661abea79cdbc41bad6dd28be/recipes/github-pullrequest";
+          sha256 = "1icyxvkqy2vyx4b6f7ln0h3hfg0a4lkyajd596fch81irl8cjl34";
+          name = "github-pullrequest";
+        };
+        packageRequires = [ dash emacs magit request ];
+        meta = {
+          homepage = "https://melpa.org/#/github-pullrequest";
+          license = lib.licenses.free;
+        };
+      }) {};
     github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "github-search";
@@ -26418,12 +26461,12 @@
     github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "github-theme";
-        version = "20170111.1029";
+        version = "20170112.2207";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
           repo = "emacs-github-theme";
-          rev = "d0461f84c0bd9eb68a1a90ca9543d66bec37f2e4";
-          sha256 = "1achc9ppvsjbw89mf9nbxjmcpjr1916r6jhkjhh93cw3ambz360q";
+          rev = "cf9a167e8940ee8f678f2c72495f4ffff9e88509";
+          sha256 = "01wxs4vywfnzb0j2inxmm37glqz004laay711scrizwvqs3bhjd6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme";
@@ -27465,12 +27508,12 @@
     google-contacts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }:
     melpaBuild {
         pname = "google-contacts";
-        version = "20160111.211";
+        version = "20170112.1022";
         src = fetchFromGitHub {
           owner = "jd";
           repo = "google-contacts.el";
-          rev = "bb1a149bbcc5627250be8267481e884795b448cb";
-          sha256 = "1h7nj570drp2l9x6475gwzcjrp75ms8dkixa7qsgszjdk58qyhnb";
+          rev = "cf654c59b197a028eb8bf432d52776c2e0ad4135";
+          sha256 = "1qrn9zqn25wpsrqbacamn3ixf90xmgxa8ifkday6cxn5ks0kgyj4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-contacts";
@@ -28350,12 +28393,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170109.1205";
+        version = "20170114.133";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "b832ff6c417b83652b7aa6d9ecfa75803fabe23c";
-          sha256 = "153fr29lvhfkfmfhpinaffc2dpll2r3dlsk1hpxkw4j2cac5visl";
+          rev = "2794ab96de95fae8aad12c33ff1726d5348cae7b";
+          sha256 = "0cj5mlshh76m3fmnzxjyrq8kw0y22qvcd9wjqwkg392jw9s5kaqc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -28812,12 +28855,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170105.1516";
+        version = "20170116.407";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "695c4d73fc1e21291659b56c6b9a0583b6fc90fd";
-          sha256 = "1dsxf33ppbr29jghq364gj86895sh5li3jxmy71ydapa5fivcicp";
+          rev = "6f729159ea21997f629473652266dcd32dcba523";
+          sha256 = "0hmynqg4qv10w2s4wlh3k1ignzxspqfr67860xy9g7vyyifyrhqj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -29080,12 +29123,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170111.105";
+        version = "20170116.2331";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "c1e9cc8b14ef3d9693438311120ba5b881cd1cf1";
-          sha256 = "1l074vh1xdljymjl4n0kr2qwh664bmqhcxwbd7k54bbd7qakx115";
+          rev = "bc2bfb3017f327a5307e7c46be27d1b614b3e90d";
+          sha256 = "1jfdbbzv6prxkiz9hxvyjfgdbzb9yzf8g71nny0xcfm76r18vrwi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -29479,12 +29522,12 @@
     helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "helm-cider";
-        version = "20160912.1935";
+        version = "20170115.1740";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "helm-cider";
-          rev = "9481f84bfbc6538e1cbe1a4cb01255088bfe1491";
-          sha256 = "00zciia468svzhk4f7w9bwj20ixb280gwd7vfrxr1iw60p23x237";
+          rev = "d678f1346331f12bdb6fe95536608fb3e94b2f70";
+          sha256 = "0gmi23yx8l85923y0arm7v0v9zgspbp6gkb8a8jmnl5z2akqpzgh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider";
@@ -29647,12 +29690,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170110.252";
+        version = "20170116.2331";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "c1e9cc8b14ef3d9693438311120ba5b881cd1cf1";
-          sha256 = "1l074vh1xdljymjl4n0kr2qwh664bmqhcxwbd7k54bbd7qakx115";
+          rev = "bc2bfb3017f327a5307e7c46be27d1b614b3e90d";
+          sha256 = "1jfdbbzv6prxkiz9hxvyjfgdbzb9yzf8g71nny0xcfm76r18vrwi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -29920,12 +29963,12 @@
     helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-etags-plus";
-        version = "20170108.848";
+        version = "20170113.614";
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "helm-etags-plus";
-          rev = "0c9f6d704de71e3a7136b23d5b2876194c88d534";
-          sha256 = "17hdwgjyx2akgcx9rpsk1jfl1irn2sk2nw6sivl56cm5gw08qwl6";
+          rev = "704f0991ee4a2298b01c33aafc224eef322e15e3";
+          sha256 = "03n7c9jlpqkz5z1gygx2s3yf46caav2l11d9xnmqhyhbvyimjqf9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/helm-etags-plus";
@@ -29966,8 +30009,8 @@
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-firefox";
-          rev = "294850c4ce16ae25f2214f863cee0118add60974";
-          sha256 = "1kaa58xlnr82qsvdzn8sxk5kkd2lxqnvfciyw7kfi2fdrl6nr4pf";
+          rev = "0ad34b7b5abc485a86cae6920c14de861cbeb085";
+          sha256 = "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/257e452d37768d2f3a6e0a5ccd062d128b2bc867/recipes/helm-firefox";
@@ -30361,12 +30404,12 @@
     helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-gtags";
-        version = "20160917.2238";
+        version = "20170115.2129";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-gtags";
-          rev = "76c573d2c0bd277041d917c9968b180d48a0fdce";
-          sha256 = "1dxm1r5qfriv33kaqf9gzwdrlmsww08lzvmxvfg9505qsjma4b5c";
+          rev = "108e93d0d099ebb7b98847388f368311cf177033";
+          sha256 = "0hfshcnzrrvf08yw4xz5c93g9pw6bvjp2bmv0s6acrsjqgwhx158";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags";
@@ -31074,12 +31117,12 @@
     helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-projectile";
-        version = "20161213.2311";
+        version = "20170113.209";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "10531b2634559ea2179f2530423beaac815e9a38";
-          sha256 = "1bh9cvkp5gr8ykmy8fr94appkhpqx9hicqyj6ahvi2ykgb50ib4c";
+          rev = "6d750dee69befb97bda1e8b6045973e5a5eca233";
+          sha256 = "0dsc8k7qk24qvk8msxla9z3r4299rrcwmm4k5fslplh66h0b8z85";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -31137,12 +31180,12 @@
     helm-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, window-purpose }:
     melpaBuild {
         pname = "helm-purpose";
-        version = "20160218.1009";
+        version = "20170114.836";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "helm-purpose";
-          rev = "de9e38c55b114cadeed60e70fc406f5181ff30d8";
-          sha256 = "1lxknzjfhl6irrspynlkc1dp02s0byp94y4qp69gcl9sla9262ip";
+          rev = "9ff4c21c1e9ebc7afb851b738f815df7343bb287";
+          sha256 = "1xh6v5xlf1prgk6mrvkc6qa0r0bz74s5f4z3dl7d00chsi7i2m5v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/931471b9df5e722d579aab378887890bf6e854a5/recipes/helm-purpose";
@@ -32006,10 +32049,10 @@
       }) {};
     hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hide-comnt";
-        version = "20170101.1008";
+        version = "20170116.1012";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hide-comnt.el";
-          sha256 = "1gjca7796bg6skyqry90l5ywpw72zl6zkhzbq9fy8bi8q7a76g06";
+          sha256 = "1g58gvbh5qrfc5r1af2plxdc1ygd6rxspmhhdz9z8hbf172b8j62";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05a695ab2bc358690c54611d21ef80cb51812739/recipes/hide-comnt";
@@ -33475,6 +33518,25 @@
           license = lib.licenses.free;
         };
       }) {};
+    i3wm = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "i3wm";
+        version = "20170116.1825";
+        src = fetchgit {
+          url = "https://git.flintfam.org/swf-projects/emacs-i3.git";
+          rev = "7daad9bcbb545ed5cd75706eef56172cef1498cf";
+          sha256 = "1y69hh9gaz8q3kljgjarqkxmc70qpf83rzwsb1rzsglf4aqlr2rq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/i3wm";
+          sha256 = "11246d71g82iv9zrd44013zwkmnf32m1x8zbrbb656dnzx7ps4rl";
+          name = "i3wm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/i3wm";
+          license = lib.licenses.free;
+        };
+      }) {};
     iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "iasm-mode";
@@ -33603,7 +33665,7 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20170101.1027";
+        version = "20170115.1431";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el";
           sha256 = "072pxihvwpj6zkzrgw8bq9z71mcx5f6xsjr95bm42xqh4ag2qq0x";
@@ -34514,12 +34576,12 @@
     imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenus";
-        version = "20160220.1332";
+        version = "20170115.1226";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "imenus.el";
-          rev = "c24bc3a5b3bb942afcdf2dfb568968cf836ddafc";
-          sha256 = "1p6b7wvzf63dca446gpxm90pmbh9f7r097hbhwj2jmm2i9j5d0lg";
+          rev = "5449180574f52a3a9f8de7408594ccf45c92d5d5";
+          sha256 = "1xd9ymqmxdfnw6l6bz2bvpn764h3y9abgymm3c66403cq3dx8rz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc571105a8d7e2ea85391812f1fa639787fa7563/recipes/imenus";
@@ -34849,12 +34911,12 @@
     inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-ruby";
-        version = "20161218.1754";
+        version = "20170115.1602";
         src = fetchFromGitHub {
           owner = "nonsequitur";
           repo = "inf-ruby";
-          rev = "1dd007201a6f1465791edaea7e80e3adbeda5a45";
-          sha256 = "07hgzwydvg56f9kpg7ch5g1i429s6c8fssn3zzk58rxnc620jv83";
+          rev = "bf380c13e50c18b6bac6651b22b6fc6ba349062f";
+          sha256 = "1in57d8q33x68ccxng13yp8l4frdgab3nx74p4n4lxa183qcs2n5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -34912,12 +34974,12 @@
     info-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "info-buffer";
-        version = "20161230.1442";
+        version = "20170112.622";
         src = fetchFromGitHub {
           owner = "llvilanova";
           repo = "info-buffer";
-          rev = "24b22e181d41dcec6b280d88fa2882310c3dad9a";
-          sha256 = "0ml5jxb7xs72mivg7p37kwnxvn0a0k9p32hhrasghn8d0ymxflih";
+          rev = "d35dad6e766c6e2ddb8dc6acb4ce5b6e10fbcaa7";
+          sha256 = "0czkp7cf7qmdm1jdn67gxyxz8b4qj2kby8if50d450xqwbx0da7x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c44a1d69725b687444329d8af43c9799112b407/recipes/info-buffer";
@@ -35865,12 +35927,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20170107.133";
+        version = "20170113.247";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "d2596eb8d6317767a642dee9f0a450eff4930a6f";
-          sha256 = "18i1xwaqh0py2rfc8dq7jagsynh170p8smwmwb02p9xcij15fq1q";
+          rev = "65d80ff0052be9aa65e9a1cd8f6b1f5fb112ee36";
+          sha256 = "05qjpv95xrhwpg1g0znsp33a8827w4p7vl6iflrrmi15kij5imb4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -36472,12 +36534,12 @@
     jazz-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jazz-theme";
-        version = "20170109.353";
+        version = "20170115.723";
         src = fetchFromGitHub {
           owner = "donderom";
           repo = "jazz-theme";
-          rev = "03adcb7a161d84d19b9e1ef700c999cf996e23e9";
-          sha256 = "0kq3l96mmdsgxi1d5q971lc95ag441shlh9wvh9y24d736mr6nha";
+          rev = "0ae13bd12ddc339b8ef6f112c59b916a2da6922e";
+          sha256 = "12iz3hvxha9mya2629azvmrwgkxk6b4fgmgpx1n30wlaw8ap69gj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da25345df9d8d567541ed6b0ec832310cde67115/recipes/jazz-theme";
@@ -36952,12 +37014,12 @@
     js-import = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "js-import";
-        version = "20161027.2259";
+        version = "20170115.853";
         src = fetchFromGitHub {
           owner = "jakoblind";
           repo = "js-import";
-          rev = "e57a8dc4a61d2b33add3da7ac44ea28979b792f9";
-          sha256 = "1prcifdih35nnbbgz04dd4prfmi25fdxjwajp4wms2hm0q8z4mkr";
+          rev = "7b1b7c963e3df9c76ed6cfb66c908c80775c6cfb";
+          sha256 = "03a13bcipk32hdvh5bm2z8kxs4b2xp3r1phwxmvb49lxx6417bs9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69613bafcb5ca5d5436a4b27be6863f37a7d2fab/recipes/js-import";
@@ -37015,12 +37077,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20161230.1612";
+        version = "20170116.733";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "8569ba6734184b869b4ac42e79231d195ea4dba2";
-          sha256 = "14j9qaqls403i5w5046w6qhw23gva7yfhmbw9mrdmwffl53nxfng";
+          rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236";
+          sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -37537,11 +37599,11 @@
       }) {};
     kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "kanban";
-        version = "20150930.917";
+        version = "20170117.316";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/kanban.el";
-          rev = "54d855426372";
-          sha256 = "14g0f51jig8b1y6zfaw7b1cp692lddqzkc0ngf4y89sw9gbmsh3w";
+          rev = "713e6c7d8e07";
+          sha256 = "1m1rgkdwb9zm3k131l6xh2pz4750arvflly7fbmsik3y1pr5f60r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/kanban";
@@ -38062,8 +38124,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "67b9bebd3016000f3773d63b1736ac4e47751a2f";
-          sha256 = "1c7dcxvg1yfp16n46ssc53g51qr2gk3ilcz378aqdjix9mrsm11q";
+          rev = "80f1f82759d5e4f2537da7620e2c0d3ea88aa7da";
+          sha256 = "0bk7ixm4dvblmal8xi0n061xqb13ipdgxpl9gx7aihzi18429i8n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -38079,12 +38141,12 @@
     kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kiwix";
-        version = "20161230.2008";
+        version = "20170116.503";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "kiwix.el";
-          rev = "d43238ffbbf9863c36a0064f3291dac2013a46c8";
-          sha256 = "1mbw82w0l1lazm6k9hchvcdqrrs2q9zpj7fxb0kyvfd5nkk99p0m";
+          rev = "edea2234a7a5267c1888dbe2271e9100bdc3f5a8";
+          sha256 = "0b9bwcgxm2gachh2g5cn4fih2n5mzqzvl591ahq0rylgajxmxvhp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix";
@@ -38936,12 +38998,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20170108.1242";
+        version = "20170114.617";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "7e6ac87406c8c2d361bb55b3dff6342e61c09d87";
-          sha256 = "18sylih1a3qf07fs66a4crzfbxpw46jr29rkj4xbvgd4cn1fhy4w";
+          rev = "fa5f6105a18d08727172e6b9200cd0dec737d4ba";
+          sha256 = "0pmhg22rx6yd431lfcvyai1cahiljs1dr670i9i6m5ckdakcl1f4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -39000,8 +39062,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "46c683df95331a267073d34a0c4f37e9cc66044c";
-          sha256 = "1zshzklwcjpw8b9d5zbb0xy6hyhxmbdb1g43v5hwi5a4mi8xwj23";
+          rev = "0d412fc713efb893c7f44f1bd8dd66eb01693f30";
+          sha256 = "1hsr21fzd3kkavznjcgd9jv6galkx3aky73fs91plr5l7gdvqz38";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -39313,12 +39375,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170109.535";
+        version = "20170112.236";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "23b5719e92f4f95ea17499bb97143199c2acaff3";
-          sha256 = "1ffmgfavg37hcgfp2kh7s46bnck680bp7j6nwnf142djnzcgw6ka";
+          rev = "f66433837a4ccabcfc7f05d74d7ee8217691d943";
+          sha256 = "154kwk1h1grcjbimaglsir5i5j72bak1lxw69bjm5d5yf3qg60p5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -39355,12 +39417,12 @@
     lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }:
     melpaBuild {
         pname = "lispyville";
-        version = "20160816.1536";
+        version = "20170116.1335";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "lispyville";
-          rev = "a5648a611c7d538176b86dd1b3dcb6477c136f12";
-          sha256 = "1h9a8jx0jajpi1kfw9n10q9zq842psh89z60ka3pvma5kwn8njyd";
+          rev = "c951f65a2300d884eff7afdd941fea275550c9fe";
+          sha256 = "0hhllm6b0gkllpbfkc6ifcax1vmfplll9vbrfa8wqi0lghmy4npm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville";
@@ -39626,12 +39688,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20170105.1854";
+        version = "20170116.1607";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "d602ed6a3009d27dfb9732e313ff02e2d7f78af8";
-          sha256 = "1xf5bp45az2nr24ilzkcc4yd0g7mh1kx4c2q2bqfshk9vcf9k8kj";
+          rev = "f702dd8475b48526d1701b11776800388f6d8c70";
+          sha256 = "0zdxz5zyy8xgrsbl3kpnzxifgbr670qnrq02sbc208al9jn8blk9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -39713,8 +39775,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "7371eca308fdb139271e75a0e82180a479f6f4c3";
-          sha256 = "0qfpcbap9la15kcarmiyya7d4bvniv5g68kii2fmfam0s6dsdm60";
+          rev = "fca725c1928670ccc48510f431d96f19751dbc1b";
+          sha256 = "1ag3h8jcrfdbhs1zil6xra5abngkl35yw6av769x0vp6wldxklrv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -39939,12 +40001,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "20161108.1149";
+        version = "20170114.1515";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "4f1db3f2081e819dd35545497529a03466bd0397";
-          sha256 = "0f96wxijls743qyqfgkdqil3p5nn0sm02rlz1nqkm6bd8k28rcg1";
+          rev = "c22ac44d14de8aaad532e47ea60c21c24d661a50";
+          sha256 = "02842gbxlq6crvd3817aqvj5irshls5km675vmhk0qd4cqg38abv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -40353,12 +40415,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170106.1903";
+        version = "20170114.1211";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "c6624d143aa3c3e210a04d15e56f42c156226198";
-          sha256 = "0lv4rxs23njyry8akkjrpim1x0w8a172ww599as1ckcgrsnb420k";
+          rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc";
+          sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -40532,8 +40594,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "c6624d143aa3c3e210a04d15e56f42c156226198";
-          sha256 = "0lv4rxs23njyry8akkjrpim1x0w8a172ww599as1ckcgrsnb420k";
+          rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc";
+          sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -40633,12 +40695,12 @@
     magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
     melpaBuild {
         pname = "magithub";
-        version = "20161129.934";
+        version = "20170115.1723";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "c9bff9889650bee96c6d4f5cd46ac469ac1c3dbb";
-          sha256 = "0vzln1b6cf90nnv7a28n2w781qrc17sss1s8h6i7fmnaldr0913j";
+          rev = "dc03f31edb5f45a1c9ada8ae00c1c9baf0126213";
+          sha256 = "1sv7h3gnqxm6vw4ygqm28grckxzvcfr39fgd4qhrzj0d6sss9gr5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub";
@@ -40969,12 +41031,12 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20161228.39";
+        version = "20170115.2357";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "d225283f221d718ef858784d6db30fd31191ba78";
-          sha256 = "1pqx65jrbg1ki2widnxm8s7vp1q69j1zr6ph28q70jhy5nkmzcmz";
+          rev = "c58481b5dacc62dcc53a9886e032ccaf4a41a627";
+          sha256 = "023kpmj01ixpb2yfsfxym7zvbldhj8486ndanma0srzf1p9lmqq6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -41643,12 +41705,12 @@
     mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mediawiki";
-        version = "20160902.827";
+        version = "20170113.1308";
         src = fetchFromGitHub {
           owner = "hexmode";
           repo = "mediawiki-el";
-          rev = "7cc465af1d95a814387d241ff8a4c89d03b1e86e";
-          sha256 = "1bhp0cx8kdr7mnmwg5q59qv019aalk4z7ic625qaa03gd6xr2ym4";
+          rev = "03c5ca4e884782950d2bcc784ecc2167e43e4aa9";
+          sha256 = "1d2dxpgbccd0p818xpj2wghfhvngyf4mad1ds84v2lbzyxphp6qa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki";
@@ -41668,8 +41730,8 @@
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "8eab3fc08bbf9929b6d169bf6fa45e5701b1f8f8";
-          sha256 = "1s6fiwvj3w7q01qnl3ww8jzczy93apl6pxw30k87j1dl2bsclqzm";
+          rev = "fe384624b5e382b331ff80bc74a17becb5b01c7c";
+          sha256 = "1l2wqjdmsh77vcxfmm8437z7rlx1avdk2bvq8w1wmps32gi52lhg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -42451,10 +42513,10 @@
       }) {};
     misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "misc-cmds";
-        version = "20170101.1049";
+        version = "20170113.904";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/misc-cmds.el";
-          sha256 = "191362k5mx0phzq4sc0x7n341dswgq9hkani6icwjhj5dsgvr6wy";
+          sha256 = "05ymqzikn16538iqjiwyhwhqzshx9kx9v8amarb8ybr96l1ci4bz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds";
@@ -42718,12 +42780,12 @@
     mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mode-icons";
-        version = "20170110.720";
+        version = "20170116.1230";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "mode-icons";
-          rev = "7d864662b9e866543fdee5a6cf02888502b5c9b7";
-          sha256 = "10q9cy508p6a3664vrwrx31zikh0s0xvyn2qxvk9agv9fhafjgwa";
+          rev = "60d5b4dbbb07d2515f195f8ffe75f12f0913a3d7";
+          sha256 = "0ck7v4pzhzymq0cjwyl0iv721k9m0cx36m8ff7lw0bmgbzdi8izn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons";
@@ -42777,10 +42839,10 @@
       }) {};
     modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "modeline-posn";
-        version = "20170108.717";
+        version = "20170114.1554";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/modeline-posn.el";
-          sha256 = "198x9h6ma8ds95akf1f4wdqzaw41zplam01adxaqwxsfixb01398";
+          sha256 = "068kdgzzv76ls5hyxs77vzm5ai7x8zcsmhjk78pmfirfrjrxcjgf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn";
@@ -42838,12 +42900,12 @@
     moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "moe-theme";
-        version = "20161129.115";
+        version = "20170111.1838";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "moe-theme.el";
-          rev = "1a77b2ee52f5077ef3a31c794ecf13b37b3b4fd3";
-          sha256 = "1gimdcrkbanzl1zxxw2955k7a4ygyqgls12g31g8nvjjp46hgjhr";
+          rev = "70e71ef7404cc5c38254771695eee221090d5110";
+          sha256 = "1dpcffb6pyggg2lj7n9lnxyg2clwm4q7hnxvgc87r6b61vjr3a20";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme";
@@ -44604,8 +44666,8 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "e6662886178abd17078d714e128f090108dfe7ad";
-          sha256 = "0k3b5sxwgr4fg2zibh4mr3my84rqamhlkb20bx1qi4b86gsvkqad";
+          rev = "95a09d97fdc86a570a9276a05fe42dc3c90dcbc5";
+          sha256 = "1lydpljxf0air78qrc04x9g71ixmh5g5q6ln77acnivq9gn3xha5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
@@ -44898,8 +44960,8 @@
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "95ddaa14eac8b241a33c6665e55e0de13fb94cc9";
-          sha256 = "1s08mfndgqfg5pkvqysvcs7zy53svnhm6rd5qc748zl4nz7gclr4";
+          rev = "9e71431e6f8323be8ced8997409cfe7a389c6583";
+          sha256 = "0lnahkq47x9w8gi89bm91mjvap4dvwpn88pjysmp4ciw04v2h8s2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -44940,8 +45002,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "451c223deea17918454ae083dcfc0ea2b6103cab";
-          sha256 = "003cq5lzp8l2qqa7jx7xx2nxhakk4if18cxf1cngx9jjx2mk5awi";
+          rev = "c0d55f918379f46b87e43457745895439a85555c";
+          sha256 = "05kmk92f7zzincs84z6zphmwsli6jhb81hha1ili9xibqpg5983w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -45209,8 +45271,8 @@
         version = "20161215.457";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "32065e79090ce27c609db6a2fc07e134f1d3d4df";
-          sha256 = "0dd5m1ifmcxmba0pfq6hijcbinpg4bg3d7bgx6f5pcz8kvzbpmdk";
+          rev = "4a2ce7b5706b53cdd30c474d556f18d731c21bb5";
+          sha256 = "1hhdaapyj6kg9zys7fw5rh7rqc4540wyh3c5dkhb4b9jlbzslj40";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -47703,12 +47765,12 @@
     org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "20170106.2046";
+        version = "20170111.2044";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "878af483c8ecb9e40808ca201460d2738b4f4494";
-          sha256 = "15q1h66y4p3zzhcfjcdnfvsw9rxh9lzmbjbdn4ainmkq0bp18nxi";
+          rev = "af4115f4e8b4e77de5642fb28ce6d5e0d7cb0b70";
+          sha256 = "1g775f9gpl0nqq3vn6h9cnjazimn9bjwk31dc7fdylz3nf7f3h03";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -47790,8 +47852,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "a51c6ffa532a3f40a1d5c9a77788926397fedf78";
-          sha256 = "17w060dww4fyz9gaxnyxhwk124ppnzfzsfbqgpdmwvbwqwfyphas";
+          rev = "4d0609f8af0db7248fa5f8eb2b69ee02665e8cbd";
+          sha256 = "1kv13imxw6k4mv8hi2ns80p78zc0r8y91mcv01nvpzvh28qnkwa2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -47810,8 +47872,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "a51c6ffa532a3f40a1d5c9a77788926397fedf78";
-          sha256 = "17w060dww4fyz9gaxnyxhwk124ppnzfzsfbqgpdmwvbwqwfyphas";
+          rev = "4d0609f8af0db7248fa5f8eb2b69ee02665e8cbd";
+          sha256 = "1kv13imxw6k4mv8hi2ns80p78zc0r8y91mcv01nvpzvh28qnkwa2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -47824,6 +47886,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-mime";
+        version = "20170110.2011";
+        src = fetchFromGitHub {
+          owner = "org-mime";
+          repo = "org-mime";
+          rev = "e554d8821d8513d4e8c33ca6efb147e3dfce2a5b";
+          sha256 = "000zgp2palvn12rahbjg8vrl4r3x2gjzbxxw2fkaqc2bx4rkjiv7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
+          sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6";
+          name = "org-mime";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/org-mime";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-mobile-sync = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-mobile-sync";
@@ -49370,12 +49453,12 @@
     ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-jira";
-        version = "20170110.1024";
+        version = "20170112.1537";
         src = fetchFromGitHub {
           owner = "stig";
           repo = "ox-jira.el";
-          rev = "8b28523c2c78a772443c3723514b688dfc880cad";
-          sha256 = "12f1npslidbaq3a5lg9l0p67jny5h3qzrr7jb7qh0i8qsclr9kmi";
+          rev = "3a2467d4050637a0551e1fac957f85644147d280";
+          sha256 = "1c09rfwx5ywcdbjsmkb4a6ixmqn1f289986dx96pvh26jnh2k2vp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira";
@@ -50268,12 +50351,12 @@
     parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parinfer";
-        version = "20161231.924";
+        version = "20170113.956";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "3d5b8d4a3f7e73f15f816f7555abed09c5516338";
-          sha256 = "1w3j0dzi19h1k94gnj1zxx4s1aji91wq4sjwkf813zs7q769mfsp";
+          rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b";
+          sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -50370,6 +50453,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    passmm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "passmm";
+        version = "20170113.837";
+        src = fetchFromGitHub {
+          owner = "pjones";
+          repo = "passmm";
+          rev = "076df7221f9450b96855c36684ae4a7481e0bb71";
+          sha256 = "0nap42jhjh3nq57a5hpv6wd8gli6i9g6n5rbjza685sifqn27dbf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae2a1e10375f9cd55d19502c9740b2737eba209/recipes/passmm";
+          sha256 = "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b";
+          name = "passmm";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/passmm";
+          license = lib.licenses.free;
+        };
+      }) {};
     passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "passthword";
@@ -51126,12 +51230,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20161226.518";
+        version = "20170115.651";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "1116ead88123a11efef346db0045ee8389250bd2";
-          sha256 = "11xncsvzy13xc939qfvlzplsz2izvf16hy45k500h44g2dxcvq3m";
+          rev = "06d56333d738c57fa543e47e7eb1c4962bd14344";
+          sha256 = "0khzfh7qqfqpmjqb0kaz3s5kpf1a8inxln5awap5xh2z6fv6wysy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -51189,12 +51293,12 @@
     perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "perspeen";
-        version = "20170110.2022";
+        version = "20170117.417";
         src = fetchFromGitHub {
           owner = "seudut";
           repo = "perspeen";
-          rev = "be0fa7a5d7a9d972b0957a79ff36b34bc0b9cac3";
-          sha256 = "0hri5lrxg0f9rlvh4ca49n25ixxi4f1ngrdnbwl6wg90bzaszyq2";
+          rev = "057f145f88fdfc021c574b7c263269e381494f4b";
+          sha256 = "1a5cjvc21ga2j2y7rxcfxwkc0x9v5mrwla9prm021q4sg07gvld7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen";
@@ -51207,6 +51311,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pg";
+        version = "20130731.1442";
+        src = fetchFromGitHub {
+          owner = "cbbrowne";
+          repo = "pg.el";
+          rev = "4f6516ec3946d95dcef49abb6703cc89ecb5183d";
+          sha256 = "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4d1bb21948da2b283a3a9d89d9e3aed11afa13/recipes/pg";
+          sha256 = "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji";
+          name = "pg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/pg";
+          license = lib.licenses.free;
+        };
+      }) {};
     pgdevenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pgdevenv";
@@ -51550,8 +51675,8 @@
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "3287de50464e908d421e9ad191fe31b8fae89ed3";
-          sha256 = "0m3z96n0nnsjisb1cpxcx17z2q1994qvrisnd47fv7sjj3r9g5vi";
+          rev = "a6c998937341f49138f07c15050efe7e5809be23";
+          sha256 = "1g0m9vsx0n2rzph4ipyab8fl6bv26y2dmyrgkici545k2mhhhiqp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -51987,12 +52112,12 @@
     plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plain-theme";
-        version = "20160903.1029";
+        version = "20170114.1146";
         src = fetchFromGitHub {
           owner = "yegortimoshenko";
           repo = "plain-theme";
-          rev = "4210122812df9b5fe375ad35a3b933bf040460a3";
-          sha256 = "184rw6pri55mkab8wv2n483zp0cvd6j911abq290pcqw1pgswcgh";
+          rev = "43fc59d487d39e6110230a073f1376ab877aa739";
+          sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
@@ -53414,12 +53539,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20161130.1025";
+        version = "20170115.731";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1";
-          sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2";
+          rev = "8c41f3c92cd7f5eb5a983f6f3d42cb67dff04366";
+          sha256 = "1rial7py4n451d6ylymf5q4cb57ala4rvvi7619r1c5y1m493qi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -53439,8 +53564,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "ddb7dcadf8980b9f458343aa853e4b6c3febaee0";
-          sha256 = "0ln81fgvp8sk7f01icrjz8nyicd71kp7fg2rsh9hxjr948jx5ncd";
+          rev = "876d9b410f9a183ab6bbba8fa2b9e1eb79f3f7d2";
+          sha256 = "0s2vg3c2hvlbsgbs83hvgcbg63salj7scizc52ry5m0abx6dl298";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
@@ -53691,8 +53816,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "228d242c583fb4e0dde17f0a52899f995d85c200";
-          sha256 = "04r9vdpfbd7hq6rb8br5lcv5i3j7ljfx69vsqlig2v2av05rvipa";
+          rev = "c9cd6acd71e928164db10602b9d0837216ee367e";
+          sha256 = "0rm2476gvsqsyhblw0bwa4qacpdckp6r44d2qrznysdq9086lyjj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -54020,19 +54145,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    pushover = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    pushover = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pushover";
         version = "20160718.857";
-        src = fetchFromGitHub {
-          owner = "swflint";
-          repo = "pushover.el";
-          rev = "c43f149eaef832f6af399723a5a59424aa093aaa";
-          sha256 = "0vrx8m7jcxavbfsyh35mf289vfyal0yrfl6h2m2yfx81whbinb5j";
+        src = fetchgit {
+          url = "https://git.flintfam.org/swf-projects/emacs-pushover.git";
+          rev = "0d821fc23818918bf136e47449bce53d4e51e404";
+          sha256 = "0v0dkhymh81z1wcd3nm5vrs5scz9466brr8xng0254bi3yn0yi57";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f2e3a155266e7534b4e77138fdfba4fafe9bac/recipes/pushover";
-          sha256 = "1ja3xp8nxzyhzg85791s4rb9rm938fyvgkdjxhyyy36wmda1djwr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/pushover";
+          sha256 = "0im5bf2r69s2jb6scm8xdk63y1xi5zm4kg9ghfixlvyvipfli4kl";
           name = "pushover";
         };
         packageRequires = [ cl-lib ];
@@ -54379,12 +54503,12 @@
     pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "pyimport";
-        version = "20170104.342";
+        version = "20170117.402";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "pyimport";
-          rev = "adcdb8a20b020d26b69da916e16402e62a3cc0a0";
-          sha256 = "1di07lr5i9qi22p11rlrpav7qfdgqd4ms2qa7sigh9g40c9d3xqi";
+          rev = "e2f6d2cf5a6772a8de698e67768ae2f82a43419e";
+          sha256 = "0lkkycflmkzziwr90njx8d68903m1bpb71awlb23dslw92qvl3fj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
@@ -54568,12 +54692,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170108.2329";
+        version = "20170117.130";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "470843aa11910edb46efbfa250ff4c899afc6b7c";
-          sha256 = "1dca1s1frf3ghgsfdrg8y4ljsxk9n6xsy5ydkyldm5mgrjxp4p6b";
+          rev = "d20b482c2c10f086174c6bf7d5aa86867d9a9b8a";
+          sha256 = "01jhzrm4w4lpslivkc1d9f00qmnnrfai5agl7pv6fjfhd7njwzg1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -54880,22 +55004,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quickrun";
-        version = "20160808.1753";
+        version = "20170114.645";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-quickrun";
-          rev = "487a74c7db513ceba86e849c8f42f834234c1f7b";
-          sha256 = "04n6y5ymn29saaikzfg8ak57kqysh8915bvvzkiijmzbqr6ndsgj";
+          rev = "70e93e06778f44113f405aedec6187b925311d57";
+          sha256 = "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun";
           sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy";
           name = "quickrun";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/quickrun";
           license = lib.licenses.free;
@@ -54950,8 +55074,8 @@
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "dc6c62e45a6e565b56e76162e7130ff102678bf7";
-          sha256 = "0afa5kppq3m8mln2f5ypi7dym1cdlx8ldbj87xfdcs258zhbjbiy";
+          rev = "d83091ff6b55b4663fed49de63ec2c751cdb2603";
+          sha256 = "1fj2zq9cjlnf45z1xqcfir3y739jpiv08sqlgv807i6dgbr0vxls";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
@@ -55492,12 +55616,12 @@
     rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rdf-prefix";
-        version = "20160813.829";
+        version = "20161221.1216";
         src = fetchFromGitHub {
           owner = "simenheg";
           repo = "rdf-prefix";
-          rev = "07f1b914f0bf0ca154831e13202eacecf27cf4c4";
-          sha256 = "0cis7lcsjpr2gbh59v4sj1irkdkzx893rl3z3q35pq2yklrmx9nv";
+          rev = "12fdb54d6e7b1e00dba566448280ec878bf9057c";
+          sha256 = "1gfhvq2cdvq72jppiajig6khql7f7f9n8q3akb12pipbzak1xw1g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -55639,12 +55763,12 @@
     realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20161227.1536";
+        version = "20170117.415";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "4a5fe992f2b4a68f7b3840bbb24b496738760573";
-          sha256 = "0448qvl33rvnwlwmsmm297w6ghb0gk0s1bkny3q3wagrwsi9zf2f";
+          rev = "20b8d5dd7bd96f4e8d143596a6435d84fb8d4125";
+          sha256 = "0ckd7jya4368qin90x20dqf5kh3300n03f9g2qb54s93d430n0yi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -56474,12 +56598,12 @@
     request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "request";
-        version = "20161221.1711";
+        version = "20170113.423";
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "5b6fde7af45b589c167b79971ecab07c42e51465";
-          sha256 = "0r2rpv63ns2sv555w61lkdlif92zk64ngqmfscg0mqww041462g5";
+          rev = "e2b031a4e7655ce7513b8e7d7f83c024cb2a9f35";
+          sha256 = "0r6wf3h7rwjid818aqrvf2r6dwq02mwn3y4lj7lrkl7vyf5g3va5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request";
@@ -56499,8 +56623,8 @@
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "5b6fde7af45b589c167b79971ecab07c42e51465";
-          sha256 = "0r2rpv63ns2sv555w61lkdlif92zk64ngqmfscg0mqww041462g5";
+          rev = "e2b031a4e7655ce7513b8e7d7f83c024cb2a9f35";
+          sha256 = "0r6wf3h7rwjid818aqrvf2r6dwq02mwn3y4lj7lrkl7vyf5g3va5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred";
@@ -56822,6 +56946,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rg";
+        version = "20170115.45";
+        src = fetchFromGitHub {
+          owner = "dajva";
+          repo = "rg.el";
+          rev = "96114ceeea83db703f41bed18f03d87e217c1c67";
+          sha256 = "00k9lyzy11igk0j1raq3qgymfc872rf85fj42244lpmbnij4hgjd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
+          sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm";
+          name = "rg";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/rg";
+          license = lib.licenses.free;
+        };
+      }) {};
     rhtml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rhtml-mode";
@@ -56930,12 +57075,12 @@
     ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ripgrep";
-        version = "20161116.211";
+        version = "20170116.47";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "ddb7dcadf8980b9f458343aa853e4b6c3febaee0";
-          sha256 = "0ln81fgvp8sk7f01icrjz8nyicd71kp7fg2rsh9hxjr948jx5ncd";
+          rev = "876d9b410f9a183ab6bbba8fa2b9e1eb79f3f7d2";
+          sha256 = "0s2vg3c2hvlbsgbs83hvgcbg63salj7scizc52ry5m0abx6dl298";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
@@ -57203,12 +57348,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170109.1657";
+        version = "20170111.2258";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "7b5424ec38518aa2bed1ff9f3853adfd6c67a988";
-          sha256 = "012amc3sn0bncb5wxbvaq7j3hwrs7l8ddn3zi9psbzcgknb9vcmh";
+          rev = "6e60bce8ae998e61c9cea6ceff3564a73a9efe73";
+          sha256 = "1y9m1dh946qzpad2fp2dlyjsaj9hqhwf8gvg8zffxvchd5clhnls";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -57269,7 +57414,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57310";
+          rev = "57357";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -57349,7 +57494,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57310";
+          rev = "57357";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -57765,12 +57910,12 @@
     sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "20170107.1708";
+        version = "20170113.631";
         src = fetchFromGitHub {
           owner = "sagemath";
           repo = "sage-shell-mode";
-          rev = "1586bfff1aeff04ae80fc6a8cac078ca9c961b2a";
-          sha256 = "07r151x6abjmn3ryg3h4b0siq9mizpp69pn6fgyn124wx4hjs0ln";
+          rev = "80f2f7b06e48c2a771411c39f7d0067c9d145050";
+          sha256 = "0ljd2v60f9i5pkqw2j8yylv1ya994hymrblx8dks38mx9br8m7b0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
@@ -58618,12 +58763,12 @@
     sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "sekka";
-        version = "20150708.459";
+        version = "20170115.237";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "8f256be87564653aeef702b3c09f235f0bcb6ae8";
-          sha256 = "031aiypx1n8hq613zq4j6gh61ajzja2j60df9mwy50a0qma34awr";
+          rev = "001e205b37ae0dded430b9a809425dc7ed730366";
+          sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -60406,12 +60551,12 @@
     sly-quicklisp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
     melpaBuild {
         pname = "sly-quicklisp";
-        version = "20160204.815";
+        version = "20170112.135";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly-quicklisp";
-          rev = "fccc00b2e9c123c4fb88131ce471191c3ad289ea";
-          sha256 = "1mb78cdkmik9rwccvzl8slv4dfy8sdq69dkys7q11jyn8lfm476y";
+          rev = "8a9e3c0c07c6861ec33b338cc46ac12e7ce6a477";
+          sha256 = "17xx79s2nx8prmg0xhfs9i8sdprbysaajc8k4131lnahj65v159l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/330d04e4e79eee221bcffb8be3e46e097306b175/recipes/sly-quicklisp";
@@ -61525,8 +61670,8 @@
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "71d9e7002a9892308d64af62d21ac73f8d9d4ad5";
-          sha256 = "0fz7pf95zsh597g6az29khjmj3jz4ml3285p98zbkl75vh6h5p0f";
+          rev = "a28ac4811fac929686aca6aa6976845c02d6efd3";
+          sha256 = "09vv6bhiahazjwzg5083b23z3xz5f4b3d4jra61m5xffkmjnbs9s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit";
@@ -62168,12 +62313,12 @@
     sql-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sql-indent";
-        version = "20150424.1716";
+        version = "20170112.1507";
         src = fetchFromGitHub {
           owner = "bsvingen";
           repo = "sql-indent";
-          rev = "f85bc91535b64b5d538e5aec2ce4c5e2312ec862";
-          sha256 = "17nbcaqx58fq4rz501xcqqcjhmibdlkaavmmzwcfwra7jv8hqljy";
+          rev = "761a5724d181b75f30e64040408b8836d41f9db9";
+          sha256 = "13xspvqn3y3hikacv6w6jf2x1gb33gxkva6chrz0fd8bkhwdf335";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/500ec53f14b8b0dca8ff80e8a2b1b60f4266562c/recipes/sql-indent";
@@ -62621,6 +62766,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    stem-english = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stem-english";
+        version = "20170113.24";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "stem-english";
+          rev = "c8d9ccf1ea38ea403ba360b79b1042b0fd449a70";
+          sha256 = "15bwbqapr3kfazpxagpzy6fpkgc669mb8n8psz7gaqhlpxsliwiz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8e97e70e7a86b9f5e55bdd2db492994e8abdd5/recipes/stem-english";
+          sha256 = "15d13palwdwrki9p804cdls08ph7sxxzd44nl4bhfm3dxic4sw7x";
+          name = "stem-english";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/stem-english";
+          license = lib.licenses.free;
+        };
+      }) {};
     stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "stgit";
         version = "20140213.348";
@@ -63487,12 +63653,12 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "20161016.709";
+        version = "20170114.521";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "58f31cc50ee8fac236f5aa3936152e6e70ee3ce5";
-          sha256 = "0ncz4bcnbh64p3iqbr65g6b1p8lfpqviszpz80909izi8awjgbgf";
+          rev = "6cd2948589771d926e545d8cbe054705eebce18f";
+          sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -64259,12 +64425,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20170110.50";
+        version = "20170116.2155";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "54d1a08feb856a984333b420530f42cf1a524043";
-          sha256 = "10490h25igp0vwaplxcz2cbj008q05wz44vik1hv4apkysh31vgh";
+          rev = "69b816277c334c8f4ec7da8f283d52df951d5584";
+          sha256 = "0fz59291wwrm5jdrq3qzkbihh2wvypp23hxcy24d0pp3nmav5g0a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -64704,8 +64870,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "b26e513f7bb8c7bb3509b7ce7066212673cef285";
-          sha256 = "0w8m30c6da5ahlziwnig2pprqx6w5wrp1mm341fhibfj3gd4qmxp";
+          rev = "2489fd3177a670ad6fdb864d0abf6e79355b2b7a";
+          sha256 = "0m4bj93i42705hqnjzd6b1ahh2ibbg05wxggnxanmqssfv7hmq18";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -64725,8 +64891,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "b26e513f7bb8c7bb3509b7ce7066212673cef285";
-          sha256 = "0w8m30c6da5ahlziwnig2pprqx6w5wrp1mm341fhibfj3gd4qmxp";
+          rev = "2489fd3177a670ad6fdb864d0abf6e79355b2b7a";
+          sha256 = "0m4bj93i42705hqnjzd6b1ahh2ibbg05wxggnxanmqssfv7hmq18";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -64784,12 +64950,12 @@
     terraform-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "terraform-mode";
-        version = "20170101.456";
+        version = "20170111.2117";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-terraform-mode";
-          rev = "dfd111ea892ab7c3a041d5097207d351df5af7f8";
-          sha256 = "0wxwiy08y89n1qr7wzbpsax05ivppvdcgcnamzx4br0x8lqxab63";
+          rev = "6973d1acaba2835dfdf174f5a5e27de6366002e1";
+          sha256 = "12ww36g7mz4p4nslajcsdcm8xk6blwjwqjwhyp0n10ym6ssbh820";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode";
@@ -64847,12 +65013,12 @@
     test-simple = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "test-simple";
-        version = "20160303.36";
+        version = "20170117.411";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-test-simple";
-          rev = "e199434a2ba2e19f9854504bfb0cee22fcd03975";
-          sha256 = "0i38pzqi2ih3ckfjz323d3bc3p8y9syfjr96im16wxrs1c77h814";
+          rev = "604942d36021a8b14877a0a640234a09c79e0927";
+          sha256 = "1ydbhd1xkwhd5zmas06rw7v5vzcmvri8gla3pyf2rcf2li5sz247";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b76e053faee299f5b770a0e41aa615bf5fbf10/recipes/test-simple";
@@ -66829,12 +66995,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20161222.534";
+        version = "20170116.1121";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "b62d64b8221c4209fb2d25bd49c85e3bfea19a90";
-          sha256 = "1qzpv3lh51q8f4bvyr0wykvsm1jyf78wf8xvawjspp8vz76r8h7l";
+          rev = "1837cfbf3d0b09d7e1da678e5dfb3b560a759734";
+          sha256 = "0jjr5798nqm5lwjv1j4r21vhbqy10qy3gn977g0ysb31wp2209r4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -67400,12 +67566,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20161222.903";
+        version = "20170116.1309";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "5954ad37cf2d3c9237f4d2037e8619be15681cd1";
-          sha256 = "0scn6wrs6040j4z1gfmn9akzknjhaj2kr07kfzx1v42ibm42ihcd";
+          rev = "38034854ac21bd5ddc1a1129fd6c8ff86d939f8a";
+          sha256 = "0s20z5njwmk591674mb2lyv50agg6496hkr5b11904jq5ca3xagz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -67799,12 +67965,12 @@
     vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "vdiff";
-        version = "20161221.450";
+        version = "20170116.1154";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-vdiff";
-          rev = "cfad650c53b4fcaad8f24bbb7d44623678d2edff";
-          sha256 = "06ajkby1762i3pnsq0k9048qvxldk0ajrqvq4wwcqgc1xpbcdq7l";
+          rev = "f4332f26f7a88c6339e357d19f56354d2a2489fa";
+          sha256 = "1jbhv430g2vsq0jhjypg9wdyax57m0r6hppqm2rqf0hlgn38v8d5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
@@ -68544,22 +68710,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "wand";
-        version = "20141104.1645";
+        version = "20170116.223";
         src = fetchFromGitHub {
           owner = "cmpitg";
           repo = "wand";
-          rev = "da6284ab75c3afa1275420faa9934037052e2967";
-          sha256 = "09gqsssc2sk0vwfg0h4zxq9a779sdjdgvxsw7p6n2k0g4wk0phri";
+          rev = "08c9511cd0f07ba65ef5a07ad93851549391333f";
+          sha256 = "16zd914kwnnhp6zc81z9acq69prrgiwi25ggbpn4lcx7xm8h5hv3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand";
           sha256 = "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l";
           name = "wand";
         };
-        packageRequires = [ dash ];
+        packageRequires = [ dash s ];
         meta = {
           homepage = "https://melpa.org/#/wand";
           license = lib.licenses.free;
@@ -68820,12 +68986,12 @@
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20161230.1026";
+        version = "20170114.906";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "abd9c738feb0d6069cf8de07fa7d109441a5ca54";
-          sha256 = "049q9n3881f27lpsmjsxdfw6zkizqhrh3wwyxfibnzsq9c1631hi";
+          rev = "3e74b741abf8d3113a67ab6b48fba7fdd404e712";
+          sha256 = "0lagq9gzm8wrypks2zc5qjz1pqjhhlg4dxji9c1zdji5kq3bhqz5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -69715,8 +69881,8 @@
         src = fetchFromGitHub {
           owner = "deb0ch";
           repo = "emacs-winum";
-          rev = "e89791b90e45f588f9e8c11884ea1daf3dc98518";
-          sha256 = "1gd0byijl5cyn6gkf5pkadzqvczshgizfrr3ddg6czvgblf1vgl9";
+          rev = "25fbb9524ac7cde601b07cecd81fd1446e571282";
+          sha256 = "1aibzgb9np9ik27jzaxg1gl1n15q1chxr5lhjvvpp05rr70ykll0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
@@ -69735,8 +69901,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "ab6afca9ee2e";
-          sha256 = "19yy6z12pqaz9l0gj4hm73m7z2gcyivwymf6732vk8im77i8agyl";
+          rev = "280ab84bf8ad";
+          sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -70071,8 +70237,8 @@
         src = fetchFromGitHub {
           owner = "bnbeckwith";
           repo = "writegood-mode";
-          rev = "253710702282c2a789b9a6cd64d53a5fcfe08638";
-          sha256 = "1kppxgq2hcra1a978r5m589y7cya07hpqlhg19qa3i6m92wz6jcj";
+          rev = "a99896531a260db11acb931b68dbdc45030832d7";
+          sha256 = "15g133ql8mgjchm6h255q77b6rks843lzva44kgjmfgwmgbfmc1b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/75c5a4304999fc3f5a02235a1c2c904238d2ce4f/recipes/writegood-mode";
@@ -70113,8 +70279,8 @@
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "ws-butler";
-          rev = "323b651dd70ee40a25accc940b8f80c3a3185205";
-          sha256 = "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb";
+          rev = "80dabd5d158929e8433e46207bb521282b21e4f3";
+          sha256 = "0s4kfg2ga3qa6gb2ji1jv73fv66d9vn054cl0mif7n16kic4bkr4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler";
@@ -70277,12 +70443,12 @@
     xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-css-mode";
-        version = "20161218.2250";
+        version = "20170116.919";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-css-mode";
-          rev = "80f46b8699aff1ee83ba43d636d765a852df0b4a";
-          sha256 = "1zhzh1vih468zlycr3pmnjk1f2jr8qqg61n1jbjw58daxh4jj6jd";
+          rev = "ed4539971dd9c32752c7ff5a1d280150446bc769";
+          sha256 = "1nw7mwbiaq4i28his4l7hx1qrgqykr59sw1909s1l165ygl85jb2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode";
@@ -70298,12 +70464,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20170111.654";
+        version = "20170116.1037";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "b880127e243681796cefc81125953751da15930b";
-          sha256 = "16mcbrmnh5s4982s5jxx8iwnp7l4zczr9d7xvhlx3dnr916nmkf2";
+          rev = "d49a743fede497d102d4dc2b739dbe35b41163ca";
+          sha256 = "00v20p99njhh2wgk8jfccpigss2y6vd40wl1cs0ra67a4bjwn8di";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -70340,12 +70506,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170111.1606";
+        version = "20170116.2003";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "55b7ca9765886f8a750c54882cf07f6e953e60e7";
-          sha256 = "1kpvsd2kbp97pvlya80980znprc6b8h3mr87g16pjqzaayr2nk50";
+          rev = "9c8d51eb4441351c71854612eb990246ff23b8b5";
+          sha256 = "11l2jhn82r6aavc4wkcn0w5f2g2hilaz3a3v2fv70gd1x7spw0w7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -70634,12 +70800,12 @@
     xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xmlgen";
-        version = "20170108.1614";
+        version = "20170116.833";
         src = fetchFromGitHub {
           owner = "philjackson";
           repo = "xmlgen";
-          rev = "f5eb6988efd36e05ace27799dc64dd8c55600f5e";
-          sha256 = "1vwvs6dnvds0svvzbjjxrm6l4fzjw9nh33jc6yfgibavr3zww40j";
+          rev = "331dbe01037873c209fbca2aeeaf42da446f1d79";
+          sha256 = "03hksc2ng5dl4rq9yprj65d1x8kp0ccyb913hc6byz1n6gp0jkll";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd19fded2de4e7549121485e81f7405c0176e203/recipes/xmlgen";
@@ -71096,12 +71262,12 @@
     yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yankpad";
-        version = "20160903.1935";
+        version = "20170116.1451";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "yankpad";
-          rev = "76ecf21a8b59f35087716ac713eb072fd3d98f00";
-          sha256 = "1h0gnnsqfb6q88002pjzmhmq9is1f3knwh24nw2rbsg3mpfg378x";
+          rev = "ff1064bbc4189f93433c3eebb9d0dde72a27e6c6";
+          sha256 = "1spriw8c4qv7c349p8m29j5x6b72ysbpffcc444rdd9s1yypizzf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
@@ -71343,12 +71509,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20161222.1039";
+        version = "20170114.445";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "ca51cbce87f671f2bb133d1df9f327bb8f1bb729";
-          sha256 = "0riz0jj8c80x6p9fcxyni7q3b0dgxjwss8qbihndq8h2jypdhcgd";
+          rev = "386f6101fec6975000ad724f117816c01ab55f16";
+          sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -71371,6 +71537,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ydk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ydk-mode";
+        version = "20170113.121";
+        src = fetchFromGitHub {
+          owner = "jacksonrayhamilton";
+          repo = "ydk-mode";
+          rev = "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e";
+          sha256 = "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/865b9ee86ca28fc1cedc0a432a292400184711ae/recipes/ydk-mode";
+          sha256 = "1z9digf39d7dd736svp0cy6773l3nklzc263q23gwfcg0jswbdyg";
+          name = "ydk-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ydk-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "yesql-ghosts";
@@ -71829,12 +72016,12 @@
     zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zoom-window";
-        version = "20161123.405";
+        version = "20170115.120";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-zoom-window";
-          rev = "759517e1116c9162181db3aa74438d448b5e1233";
-          sha256 = "04m9mhsmmi40n8qx1axfvg490j4afkj694jjq6r954dz2f4h2h98";
+          rev = "5d1ea2a67ca4c74557183d62ebd90bae5a81cfc6";
+          sha256 = "11qj8mqqmcxc7c14mzf84k7mpgzarpv1y2mgsky2a7hnb0si14fx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window";
@@ -71913,12 +72100,12 @@
     zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }:
     melpaBuild {
         pname = "zotxt";
-        version = "20170108.1046";
+        version = "20170109.2040";
         src = fetchFromGitLab {
           owner = "egh";
           repo = "zotxt-emacs";
-          rev = "fae693a2a1c0701cd534103dddfed46335e38f6e";
-          sha256 = "0pjjjx1gvnjs4x467dr4lnpk3s790vsmjp8ifawc36sfz8vwm5wi";
+          rev = "1a010ea5db617269adc132e4cc028a44d9b629bd";
+          sha256 = "10i5hq0mkb0b88n9lb40ad4d98fwv5inbdfiyxyrflvl4qj0q60r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt";
@@ -71973,6 +72160,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    zweilight-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zweilight-theme";
+        version = "20170112.2205";
+        src = fetchFromGitHub {
+          owner = "philiparvidsson";
+          repo = "emacs-zweilight-theme";
+          rev = "7f45ab9e23164d65538edb2beb9692ecdc24c31e";
+          sha256 = "142ixk47a1x6xz8ibavzq7jxppjc2qvfwbly4sdyiwfpznbi4l3a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/37422e259ada59122e1b4a31a4ae4dc00be797b9/recipes/zweilight-theme";
+          sha256 = "1ykhnyiv5jvn34178mzg2cy6ynvc7jild6zwdqwr3qay87zffmjf";
+          name = "zweilight-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/zweilight-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     zygospore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zygospore";

From 3ab26fdb70175d04b7654c177ce709fac41efc06 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 17 Jan 2017 18:40:58 +0000
Subject: [PATCH 257/727] lkl: update to d7470730

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

diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index 752dfb9ce16..b1b3c3aebee 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "lkl-${stdenv.lib.substring 0 7 rev}";
-  rev  = "8a0fc49c2d13d5ae5e591d859d78035c368469b0";
+  rev  = "d74707304d4e4614081ae2a612a833aeb46622b5";
 
   buildInputs = [ bc python fuse libarchive ];
 
   src = fetchFromGitHub {
     inherit rev;
-    owner  = "copumpkin"; # TODO: use 'lkl' here once https://github.com/lkl/linux/pull/294 is merged
+    owner  = "lkl";
     repo   = "linux";
-    sha256 = "07k1mq25a907l1ivlgwxycx2vc0fmir3da4xrjkj2v87c7siqvwf";
+    sha256 = "0x1hdjsrj6hfk1sgfw11ihm00fmp6g158sr2q3cgjy2b6jnsr4hp";
   };
 
   installPhase = ''

From 1503c11c5dc6d85d15339c93748af561757d3853 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 17 Jan 2017 20:37:20 +0100
Subject: [PATCH 258/727] ocamlPackages.omd: init at 1.3.0

OMD is an extensible Markdown library and tool in OCaml.

Homepage: https://github.com/ocaml/omd
---
 .../development/ocaml-modules/omd/default.nix | 23 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/omd/default.nix

diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix
new file mode 100644
index 00000000000..41d68cdc4c4
--- /dev/null
+++ b/pkgs/development/ocaml-modules/omd/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-omd-1.3.0";
+  src = fetchurl {
+    url = http://pw374.github.io/distrib/omd/omd-1.3.0.tar.gz;
+    sha256 = "0d0r6c4s3hq11d0qjc0bc1s84hz7k8nfg5q6g239as8myam4a80w";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild ];
+
+  createFindlibDestdir = true;
+
+  configurePhase = "ocaml setup.ml -configure --prefix $out";
+
+  meta = {
+    description = "Extensible Markdown library and tool in OCaml";
+    homepage = https://github.com/ocaml/omd;
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 91e349eede9..3c7be7cc1b9 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -347,6 +347,8 @@ let
 
     ojquery = callPackage ../development/ocaml-modules/ojquery { };
 
+    omd = callPackage ../development/ocaml-modules/omd { };
+
     otfm = callPackage ../development/ocaml-modules/otfm { };
 
     otr = callPackage ../development/ocaml-modules/otr { };

From 381aaebe3e01a4bd7deb79a1ed0f6a34804eaec8 Mon Sep 17 00:00:00 2001
From: Krzysztof Janosz <janosz.krzysztof@gmail.com>
Date: Tue, 17 Jan 2017 21:29:13 +0100
Subject: [PATCH 259/727] oh-my-zsh: add share dir to pathsToLink

---
 pkgs/shells/oh-my-zsh/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index 8ae11e7e75c..a50b79c251b 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "1adgj0p4c8aq9rpkv33k8ra69922vfkjw63b666i66v6zr0s8znp";
   };
 
+  environment.pathsToLink = [ "/share/oh-my-zsh" ];
+
   phases = "installPhase";
 
   installPhase = ''

From 4e516363a87339681554c0bb1b6d9b54a7d6835e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 17 Jan 2017 21:43:37 +0100
Subject: [PATCH 260/727] Create AMIs for eu-west-2 (London)

---
 nixos/maintainers/scripts/ec2/create-amis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 0750a1b18c9..7cceac8cbf5 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -19,7 +19,7 @@ rm -f ec2-amis.nix
 
 types="hvm pv"
 stores="ebs s3"
-regions="eu-west-1 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1"
+regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1"
 
 for type in $types; do
     link=$stateDir/$type

From 0214d94b24fb5cdd6fb59cd6620e1671a3f7b18b Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Tue, 17 Jan 2017 21:24:44 +0000
Subject: [PATCH 261/727] Remove extra "in" keyword from the release notes
 about overlays.

Thanks to @teh for reporting this issue on the pull request.
---
 nixos/doc/manual/release-notes/rl-1703.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 0879417d7c8..6be2cd3af7f 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -117,7 +117,7 @@ following incompatible changes:</para>
 
 <programlisting>
   let
-    pkgs = import &lt;nixpkgs&gt; {}; in
+    pkgs = import &lt;nixpkgs&gt; {};
   in
     import pkgs.path { overlays = [(self: super: ...)] }
 </programlisting>

From 513ce19fd08cabd612062010fc8040c376aa0f83 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@mayflower.de>
Date: Tue, 17 Jan 2017 23:04:37 +0100
Subject: [PATCH 262/727] offlineimap: 7.0.9 -> 7.0.12

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

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index a11b34ef991..bed9bba16b0 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "7.0.9";
+  version = "7.0.12";
   name = "offlineimap-${version}";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
     owner = "OfflineIMAP";
     repo = "offlineimap";
     rev = "v${version}";
-    sha256 = "1jrg6n4fpww98vj7gfp2li9ab4pbnrpb249cqa1bs8jjwpmrsqac";
+    sha256 = "1i83p40lxjqnvh88x623iydrwnsxib1k91qbl9myc4hi5i4fnr6x";
   };
 
   doCheck = false;

From 9988dae489daff8521a649d4e46d1381fae3af3b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 17 Jan 2017 17:55:40 -0500
Subject: [PATCH 263/727] oh-my-zsh: 2016-12-16 -> 2017-01-15

---
 pkgs/shells/oh-my-zsh/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index a50b79c251b..732f831889e 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -1,21 +1,19 @@
 # This script was inspired by the ArchLinux User Repository package:
 #
 #   https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git
-
-
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
+  version = "2017-01-15";
   name = "oh-my-zsh-${version}";
-  version = "2016-12-14";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "67dad45b38b7f0bafcaf7679da6eb4596301843b";
-    sha256 = "1adgj0p4c8aq9rpkv33k8ra69922vfkjw63b666i66v6zr0s8znp";
+    rev = "d2725d44fce59ea7060b4d712c5739512a56882d";
+    sha256 = "064q10yc0n71nqh621nk88ch4wjwwq68wlaaacl5q3llcb4b5pff";
   };
 
-  environment.pathsToLink = [ "/share/oh-my-zsh" ];
+  pathsToLink = [ "/share/oh-my-zsh" ];
 
   phases = "installPhase";
 

From 3aa218edbfaa7aaefbddf45daf29b1057a62a96d Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Tue, 17 Jan 2017 23:12:21 +0000
Subject: [PATCH 264/727] ckb: add to module list

Not the first time I've forgotten to do this.
---
 nixos/modules/module-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index df086034995..2d9bce2e93f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -26,6 +26,7 @@
   ./config/vpnc.nix
   ./config/zram.nix
   ./hardware/all-firmware.nix
+  ./hardware/ckb.nix
   ./hardware/cpu/amd-microcode.nix
   ./hardware/cpu/intel-microcode.nix
   ./hardware/ksm.nix

From 9fc3ce73d1b0a0a5da4a80987b0a5c79c0862a20 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 18 Jan 2017 01:21:08 +0200
Subject: [PATCH 265/727] kernel config: Enable BONDING and TMPFS_POSIX_ACL

Yet again something that's lacking on other platforms than x86.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 8727381bb1e..44e4ebe1748 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -142,6 +142,7 @@ with stdenv.lib;
   L2TP_IP m
   L2TP_ETH m
   BRIDGE_VLAN_FILTERING y
+  BONDING m
 
   # Wireless networking.
   CFG80211_WEXT? y # Without it, ipw2200 drivers don't build
@@ -217,6 +218,7 @@ with stdenv.lib;
   # ACLs for all filesystems that support them.
   FANOTIFY y
   TMPFS y
+  TMPFS_POSIX_ACL y
   FS_ENCRYPTION? m
   EXT2_FS_XATTR y
   EXT2_FS_POSIX_ACL y

From 068c9c6c53e65e9ef7ca12bf1784ffec9f433279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:09:22 +0100
Subject: [PATCH 266/727] r10k: use gemdir

---
 pkgs/tools/system/r10k/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/tools/system/r10k/default.nix
index 0695504cc01..95462e2c003 100644
--- a/pkgs/tools/system/r10k/default.nix
+++ b/pkgs/tools/system/r10k/default.nix
@@ -8,9 +8,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "${name}-gems";
 
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
     inherit ruby;
   };
 

From 4237a2bd18084cd72396f14f637f231a56ad47a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:10:47 +0100
Subject: [PATCH 267/727] reckon: use gemdir

---
 pkgs/tools/text/reckon/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix
index b6340fd2df4..de03963a412 100644
--- a/pkgs/tools/text/reckon/default.nix
+++ b/pkgs/tools/text/reckon/default.nix
@@ -7,9 +7,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "${name}-gems";
 
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
   };
 
   phases = [ "installPhase" ];

From 8c70770e3064e26e3aa1a994f141adfdb8e9a22e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:15:55 +0100
Subject: [PATCH 268/727] panamax_api: use gemdir

---
 pkgs/applications/networking/cluster/panamax/api/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix
index 2b801ec1acf..3347af83585 100644
--- a/pkgs/applications/networking/cluster/panamax/api/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/api/default.nix
@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "panamax-api-gems-${version}";
     inherit ruby;
-    gemset = ./gemset.nix;
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
+    gemdir = ./.;
   };
 
   bundler = args.bundler.override { inherit ruby; };

From 57b06f45dba3764c74e8164d22445f92b34acdd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:17:06 +0100
Subject: [PATCH 269/727] ruby-zoom: use gemdir

---
 pkgs/tools/text/ruby-zoom/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/text/ruby-zoom/default.nix b/pkgs/tools/text/ruby-zoom/default.nix
index eb3968a0db9..b939e1500e4 100644
--- a/pkgs/tools/text/ruby-zoom/default.nix
+++ b/pkgs/tools/text/ruby-zoom/default.nix
@@ -4,9 +4,7 @@ bundlerEnv {
   pname = "ruby-zoom";
 
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   meta = with lib; {
     description = "Quickly open CLI search results in your favorite editor!";

From 246fd4c950a7333c9168863a33929af196868262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:17:50 +0100
Subject: [PATCH 270/727] maphosts: use gemdir

---
 pkgs/tools/networking/maphosts/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix
index 08c56574dcf..3a48814928e 100644
--- a/pkgs/tools/networking/maphosts/default.nix
+++ b/pkgs/tools/networking/maphosts/default.nix
@@ -6,9 +6,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "maphosts-gems";
     inherit ruby;
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
   };
 
   phases = ["installPhase"];

From 53cd750ec6ff96eb87782ba441c733eb9444239f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:18:29 +0100
Subject: [PATCH 271/727] backup: use gemdir

---
 pkgs/tools/backup/backup/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/backup/default.nix b/pkgs/tools/backup/backup/default.nix
index 1890e8121c1..20c96b65a62 100644
--- a/pkgs/tools/backup/backup/default.nix
+++ b/pkgs/tools/backup/backup/default.nix
@@ -4,9 +4,7 @@ bundlerEnv {
   name = "backup_v4";
 
   ruby = ruby_2_1;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   buildInputs = [ curl ];
 

From d16aefb405b686e404275bcffe65f978afc21bbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:19:14 +0100
Subject: [PATCH 272/727] mpdcron: use gemdir

---
 pkgs/tools/audio/mpdcron/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
index a8556c4ada1..49425cf65b7 100644
--- a/pkgs/tools/audio/mpdcron/default.nix
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -4,9 +4,7 @@
 let
   gemEnv = bundlerEnv {
     name = "mpdcron-bundle";
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
   };
 in stdenv.mkDerivation rec {
   version = "20130809";

From bf99d330adc11c0190ab5b23058b2cf42a76d719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:20:34 +0100
Subject: [PATCH 273/727] homesick: use gemdir

---
 pkgs/tools/misc/homesick/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix
index da167026ade..81e417ee5ab 100644
--- a/pkgs/tools/misc/homesick/default.nix
+++ b/pkgs/tools/misc/homesick/default.nix
@@ -2,9 +2,7 @@
 bundlerEnv {
   name = "homesick-1.1.3";
 
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   # Cannot use `wrapProgram` because the the help is aware of the file name.
   postInstall = ''

From 18fbdf14cdb5fc99fb13be206dccf8f7730a12e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:21:16 +0100
Subject: [PATCH 274/727] pws: use gemdir

---
 pkgs/tools/misc/pws/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix
index ac4f4524b99..7294c61da8f 100644
--- a/pkgs/tools/misc/pws/default.nix
+++ b/pkgs/tools/misc/pws/default.nix
@@ -8,9 +8,7 @@ stdenv.mkDerivation rec {
 
     inherit ruby;
 
-    gemfile  = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset   = ./gemset.nix;
+    gemdir = ./.;
   };
 
   buildInputs = [ makeWrapper ];

From f2d6af23393878af5ee77f4beb6f6d3035a8732f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:22:26 +0100
Subject: [PATCH 275/727] consul: use gemdir

---
 pkgs/servers/consul/ui.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix
index a61b8baac86..caf3792e983 100644
--- a/pkgs/servers/consul/ui.nix
+++ b/pkgs/servers/consul/ui.nix
@@ -4,9 +4,7 @@ let
   # `sass` et al
   gems = bundlerEnv {
     name = "consul-ui-deps";
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
   };
 in
 

From ed608a33844cc577ec89eb2319e33c2d1c430042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:23:01 +0100
Subject: [PATCH 276/727] sensu: use gemdir

---
 pkgs/servers/monitoring/sensu/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix
index 2bb81d83337..ecc1d410984 100644
--- a/pkgs/servers/monitoring/sensu/default.nix
+++ b/pkgs/servers/monitoring/sensu/default.nix
@@ -4,9 +4,7 @@
     name = "sensu-0.17.1";
 
     inherit ruby;
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
 
     meta = with lib; {
       description = "A monitoring framework that aims to be simple, malleable, and scalable";

From 2cf82c006942a287990867b79bad8dae4b258940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:23:36 +0100
Subject: [PATCH 277/727] panamax_ui: use gemdir

---
 pkgs/applications/networking/cluster/panamax/ui/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix
index fbeb3de810f..4a6481e3e5e 100644
--- a/pkgs/applications/networking/cluster/panamax/ui/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix
@@ -10,9 +10,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "panamax-ui-gems-${version}";
     inherit ruby;
-    gemset = ./gemset.nix;
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
+    gemdir = ./.;
   };
 
   bundler = args.bundler.override { inherit ruby; };

From 27f91b30aa5f13f09068c3f46f06e76ede341044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:24:17 +0100
Subject: [PATCH 278/727] ppl-address-book: use gemdir

---
 pkgs/applications/office/ppl-address-book/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/office/ppl-address-book/default.nix b/pkgs/applications/office/ppl-address-book/default.nix
index 1c48fc50842..f15affaa8d6 100644
--- a/pkgs/applications/office/ppl-address-book/default.nix
+++ b/pkgs/applications/office/ppl-address-book/default.nix
@@ -8,9 +8,7 @@ let
   env = bundlerEnv rec {
     name = "${pname}-env-${version}";
     inherit ruby;
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
 
     gemConfig.rugged = attrs: { buildInputs = [ which ]; };
   };

From 062f905906b4e37294819f10c9b1511e396eccaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:26:00 +0100
Subject: [PATCH 279/727] matter-compiler: use gemdir

---
 pkgs/development/compilers/matter-compiler/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/matter-compiler/default.nix b/pkgs/development/compilers/matter-compiler/default.nix
index 12da620fe5b..58fb0ca22d7 100644
--- a/pkgs/development/compilers/matter-compiler/default.nix
+++ b/pkgs/development/compilers/matter-compiler/default.nix
@@ -5,9 +5,7 @@ bundlerEnv {
   name = "matter_compiler-0.5.1";
 
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   meta = with lib; {
     description = ''

From dd91891bd952eaaa763ba3d919f7456ac6a7cd6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:26:30 +0100
Subject: [PATCH 280/727] gitlab: use gemdir

---
 pkgs/applications/version-management/gitlab/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 6c2b42ddbc5..659e002dfb6 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -9,9 +9,7 @@ let
   env = bundlerEnv {
     name = "gitlab";
     inherit ruby;
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
     meta = with lib; {
       homepage = http://www.gitlab.com/;
       platforms = platforms.linux;

From d824aeb196ad1f1b54c47588d234c3852216fa5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:27:07 +0100
Subject: [PATCH 281/727] compass: use gemdir

---
 pkgs/development/tools/compass/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix
index 9b21ec48c1c..f96d3e810ca 100644
--- a/pkgs/development/tools/compass/default.nix
+++ b/pkgs/development/tools/compass/default.nix
@@ -4,9 +4,7 @@ bundlerEnv {
   name = "compass-1.0.3";
 
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   meta = with lib; {
     description = "Stylesheet Authoring Environment that makes your website design simpler to implement and easier to maintain";

From 2871ff7d9b67638f5fcade4b95533edc87d066c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:27:55 +0100
Subject: [PATCH 282/727] timetrap: use gemdir

---
 pkgs/applications/office/timetrap/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix
index f6a408d0384..e68c753750f 100644
--- a/pkgs/applications/office/timetrap/default.nix
+++ b/pkgs/applications/office/timetrap/default.nix
@@ -4,9 +4,7 @@ bundlerEnv {
   name = "timetrap-1.10.0";
 
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   meta = {
     description = "A simple command line time tracker written in ruby";

From 50a4b39b1ec6e286e0b3c10a2d284e4ba31cfdc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:28:26 +0100
Subject: [PATCH 283/727] jekyll: use gemdir

---
 pkgs/applications/misc/jekyll/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index e9536055ca3..b06a28513b8 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -5,9 +5,7 @@ bundlerEnv rec {
   version = "3.0.1";
 
   ruby = ruby_2_2;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   meta = with lib; {
     description = "Simple, blog aware, static site generator";

From 96d4d744a9ea701933f03cfc247e08c02109e53b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:28:55 +0100
Subject: [PATCH 284/727] nix-shell: use gemdir

---
 pkgs/applications/misc/pt/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix
index d85a3266bdf..a400bb04da4 100644
--- a/pkgs/applications/misc/pt/default.nix
+++ b/pkgs/applications/misc/pt/default.nix
@@ -4,9 +4,7 @@ bundlerEnv {
   name = "pt-0.7.3";
 
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   meta = with lib; {
     description = "Minimalist command-line Pivotal Tracker client";

From 1da6ebc8f55d094210dc7cd973ff9f1bb0d996e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:29:36 +0100
Subject: [PATCH 285/727] ledger-web: use gemdir

---
 pkgs/applications/office/ledger-web/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix
index 6be5ad525db..6f571bd2a1b 100644
--- a/pkgs/applications/office/ledger-web/default.nix
+++ b/pkgs/applications/office/ledger-web/default.nix
@@ -6,11 +6,9 @@
 bundlerEnv rec {
   name = "ledger-web-${version}";
 
-  version = (import gemset).ledger_web.version;
+  version = (import ./gemset.nix).ledger_web.version;
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   buildInputs =    lib.optional withPostgresql postgresql
                 ++ lib.optional withSqlite sqlite;

From 310e78d5cb6cfebed9e2ac4fa318ed46f8b7fa3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:31:07 +0100
Subject: [PATCH 286/727] ronn: use gemdir

---
 pkgs/development/tools/ronn/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix
index 7720c4f2bf2..5f20e89d408 100644
--- a/pkgs/development/tools/ronn/default.nix
+++ b/pkgs/development/tools/ronn/default.nix
@@ -6,9 +6,7 @@ stdenv.mkDerivation rec {
 
   env = bundlerEnv rec {
     name = "ronn-gems";
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
   };
 
   phases = ["installPhase"];

From 202b953c9292083e0171bafbb337c68f0a9c6b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:31:47 +0100
Subject: [PATCH 287/727] bitbucket-server-cli: use gemdir

---
 .../git-and-tools/bitbucket-server-cli/default.nix          | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
index a3cf434360b..341b50f0ef2 100644
--- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
@@ -3,11 +3,9 @@
 bundlerEnv rec {
   name = "bitbucket-server-cli-${version}";
 
-  version = (import gemset).atlassian-stash.version;
+  version = (import ./gemset.nix).atlassian-stash.version;
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   pname = "atlassian-stash";
 

From 9b688135efc829552b26a60f8a73344a55ab516d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:32:15 +0100
Subject: [PATCH 288/727] taskjuggler: use gemdir

---
 pkgs/applications/misc/taskjuggler/3.x/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/pkgs/applications/misc/taskjuggler/3.x/default.nix
index eaca537356b..23252d0c480 100644
--- a/pkgs/applications/misc/taskjuggler/3.x/default.nix
+++ b/pkgs/applications/misc/taskjuggler/3.x/default.nix
@@ -4,9 +4,7 @@ bundlerEnv {
   name = "taskjuggler-3.5.0";
 
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   meta = {
     description = "A modern and powerful project management tool";

From 2011bde22c03298aba9519dc6d718b236a8db555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:34:45 +0100
Subject: [PATCH 289/727] redis-dump: use gemdir

---
 pkgs/development/tools/redis-dump/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix
index bc1adf730a3..054517ea547 100644
--- a/pkgs/development/tools/redis-dump/default.nix
+++ b/pkgs/development/tools/redis-dump/default.nix
@@ -4,9 +4,7 @@ bundlerEnv {
   name = "redis-dump-0.3.5";
 
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   buildInputs = [ perl autoconf ];
 

From 4a03407cdad4cb0b3c5ae96590b7940544cda861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:35:15 +0100
Subject: [PATCH 290/727] cide: use gemdir

---
 .../development/tools/continuous-integration/cide/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix
index 1ed752fb393..932a02cf2bc 100644
--- a/pkgs/development/tools/continuous-integration/cide/default.nix
+++ b/pkgs/development/tools/continuous-integration/cide/default.nix
@@ -7,9 +7,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "${name}-gems";
 
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
   };
 
   phases = ["installPhase"];

From c24a5cc506ed96e3b0e60ef87c65c0a975e89ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:35:57 +0100
Subject: [PATCH 291/727] rhc: use gemdir

---
 pkgs/development/tools/rhc/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix
index e9efdb9f423..e6b342dd7b6 100644
--- a/pkgs/development/tools/rhc/default.nix
+++ b/pkgs/development/tools/rhc/default.nix
@@ -4,9 +4,7 @@ bundlerEnv {
   name = "rhc-1.36.4";
 
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   meta = with lib; {
     homepage = https://github.com/openshift/rhc;

From 624b30ca163f642cbce5246587ee188e7c0ff8d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:36:34 +0100
Subject: [PATCH 292/727] sass: use gemdir

---
 pkgs/development/tools/sass/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/tools/sass/default.nix b/pkgs/development/tools/sass/default.nix
index a291ca2de5d..cfeb3ccc0f9 100644
--- a/pkgs/development/tools/sass/default.nix
+++ b/pkgs/development/tools/sass/default.nix
@@ -4,9 +4,7 @@ bundlerEnv {
   name = "sass-3.4.22";
 
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   meta = with lib; {
     description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS";

From 040c04ee571f404a5b74986f44b8714649d3fb08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:40:27 +0100
Subject: [PATCH 293/727] chefdk: use gemdir

---
 pkgs/development/tools/chefdk/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index 80f9ef56abc..880d0ddcc74 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -4,9 +4,7 @@ bundlerEnv {
   name = "chefdk-0.11.2";
 
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   buildInputs = [ perl autoconf ];
 

From ffbcea3ce59d5665b128b37b34b682c9ec372115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:41:00 +0100
Subject: [PATCH 294/727] rake: use gemdir

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

diff --git a/pkgs/development/tools/build-managers/rake/default.nix b/pkgs/development/tools/build-managers/rake/default.nix
index 3cf85b5fcb5..db7c987465a 100644
--- a/pkgs/development/tools/build-managers/rake/default.nix
+++ b/pkgs/development/tools/build-managers/rake/default.nix
@@ -4,10 +4,8 @@ bundlerEnv {
   name = "rake-11.1.1";
 
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
-  
+  gemdir = ./.;
+
   meta = with lib; {
     description = "A software task management and build automation tool";
     homepage = https://github.com/ruby/rake;

From 69c10e52906392c62fa81043d231886f498fa64d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:41:32 +0100
Subject: [PATCH 295/727] gollum: use gemdir

---
 pkgs/applications/misc/gollum/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
index 1c58aec0233..1f3cc9e27c0 100644
--- a/pkgs/applications/misc/gollum/default.nix
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -5,9 +5,7 @@ bundlerEnv rec {
   version = "4.0.1";
 
   ruby = ruby_2_2;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   meta = with lib; {
     description = "A simple, Git-powered wiki";

From c9ff7e49a8303bd13a61b5c5cdf33cecfa52457c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 18 Jan 2017 00:13:17 +0100
Subject: [PATCH 296/727] docs: gemdir is now preferred attribute for
 bundlerEnv

---
 doc/languages-frameworks/ruby.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
index 15c0802ad69..b52361212f3 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -26,9 +26,8 @@ bundlerEnv rec {
 
   version = (import gemset).sensu.version;
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  # expects Gemfile, Gemfile.lock and gemset.nix in the same directory
+  gemdir = ./.;
 
   meta = with lib; {
     description = "A monitoring framework that aims to be simple, malleable, and scalable";

From 69ed58d88ff7eb864ddb9cf0fd4fff9eebca9f0c Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 18 Jan 2017 02:57:15 +0300
Subject: [PATCH 297/727] xorg.xserver: configure --with-xkb-path= (#21653)

---
 pkgs/servers/x11/xorg/overrides.nix  | 7 +++----
 pkgs/servers/x11/xquartz/default.nix | 3 +--
 pkgs/servers/x11/xquartz/startx      | 2 +-
 pkgs/tools/X11/bumblebee/default.nix | 3 +--
 pkgs/tools/X11/bumblebee/nixos.patch | 3 +--
 pkgs/tools/X11/xpra/default.nix      | 2 +-
 pkgs/tools/X11/xpra/gtk3.nix         | 2 +-
 pkgs/tools/misc/xvfb-run/default.nix | 3 +--
 8 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8070e1fd0d9..5a57609146a 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -456,15 +456,14 @@ in
           "--with-default-font-path="   # there were only paths containing "${prefix}",
                                         # and there are no fonts in this package anyway
           "--with-xkb-bin-directory=${xorg.xkbcomp}/bin"
+          "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"
+          "--with-xkb-output=$out/share/X11/xkb/compiled"
           "--enable-glamor"
         ];
         postInstall = ''
           rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it
-          wrapProgram $out/bin/Xephyr \
-            --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb"
           wrapProgram $out/bin/Xvfb \
-            --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri \
-            --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb"
+            --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri
           ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others
             cd "$dev"
             for f in include/xorg/*.h; do
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index 2fc012dc6c9..0357c8c17f1 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby
-, openssl, quartz-wm, fontconfig, xkeyboard_config, xlsfonts, xfontsel
+, openssl, quartz-wm, fontconfig, xlsfonts, xfontsel
 , ttf_bitstream_vera, freefont_ttf, liberation_ttf_binary
 , shell ? "${bashInteractive}/bin/bash"
 }:
@@ -126,7 +126,6 @@ in stdenv.mkDerivation {
       --replace "@DEFAULT_CLIENT@"    "${xterm}/bin/xterm" \
       --replace "@XINIT@"             "$out/bin/xinit" \
       --replace "@XINITRC@"           "$out/etc/X11/xinit/xinitrc" \
-      --replace "@XKEYBOARD_CONFIG@"  "${xkeyboard_config}/etc/X11/xkb" \
       --replace "@FONTCONFIG_FILE@"   "$fontsConfPath"
 
     wrapProgram $out/bin/Xquartz \
diff --git a/pkgs/servers/x11/xquartz/startx b/pkgs/servers/x11/xquartz/startx
index 131fbc43b8b..e908e1042d7 100755
--- a/pkgs/servers/x11/xquartz/startx
+++ b/pkgs/servers/x11/xquartz/startx
@@ -217,7 +217,7 @@ EOF
     done
 fi
 
-eval @XINIT@ \"$client\" $clientargs -- \"$server\" $display $serverargs "-xkbdir" "@XKEYBOARD_CONFIG@"
+eval @XINIT@ \"$client\" $clientargs -- \"$server\" $display $serverargs
 retval=$?
 
 if [ x"$enable_xauth" = x1 ] ; then
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 0429faab2ef..eac44efdf27 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -18,7 +18,7 @@
 
 { stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper
 , glib, libbsd
-, libX11, libXext, xorgserver, xkbcomp, kmod, xkeyboard_config, xf86videonouveau
+, libX11, libXext, xorgserver, xkbcomp, kmod, xf86videonouveau
 , nvidia_x11, virtualgl, primusLib
 , automake111x, autoconf
 # The below should only be non-null in a x86_64 system. On a i686
@@ -125,7 +125,6 @@ in stdenv.mkDerivation rec {
 
   CFLAGS = [
     "-DX_MODULE_APPENDS=\\\"${xmodules}\\\""
-    "-DX_XKB_DIR=\\\"${xkeyboard_config}/etc/X11/xkb\\\""
   ];
 
   postInstall = ''
diff --git a/pkgs/tools/X11/bumblebee/nixos.patch b/pkgs/tools/X11/bumblebee/nixos.patch
index 00fb8ad7a53..cf6ee5add98 100644
--- a/pkgs/tools/X11/bumblebee/nixos.patch
+++ b/pkgs/tools/X11/bumblebee/nixos.patch
@@ -49,12 +49,11 @@ index 71a6b73..a682d8a 100644
      char *x_argv[] = {
        XORG_BINARY,
        bb_config.x_display,
-@@ -153,24 +170,25 @@ bool start_secondary(bool need_secondary) {
+@@ -153,24 +170,24 @@ bool start_secondary(bool need_secondary) {
        "-sharevts",
        "-nolisten", "tcp",
        "-noreset",
 +      "-logfile", "/var/log/X.bumblebee.log",
-+      "-xkbdir", X_XKB_DIR,
        "-verbose", "3",
        "-isolateDevice", pci_id,
 -      "-modulepath", bb_config.mod_path, // keep last
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 4ae367abf61..eadae7ad3c4 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, python2Packages, pkgconfig
 , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
-, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config
+, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf
 , ffmpeg, x264, libvpx, libwebp
 , libfakeXinerama
 , gst_all_1, pulseaudioLight, gobjectIntrospection }:
diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
index a9ba9350736..f66b7389f31 100644
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ b/pkgs/tools/X11/xpra/gtk3.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, buildPythonApplication
 , python, cython, pkgconfig
 , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection
-, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config
+, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf
 , ffmpeg, x264, libvpx, libwebp
 , libfakeXinerama }:
 
diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index c33f09529a5..8bcbf4951d1 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config
+{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt
 , xauth, utillinux, which, fontsConf, gawk, coreutils }:
 let
   xvfb_run = fetchurl {
@@ -12,7 +12,6 @@ stdenv.mkDerivation {
   buildCommand = ''
     mkdir -p $out/bin
     cp ${xvfb_run} $out/bin/xvfb-run
-    sed -i 's|XVFBARGS="|XVFBARGS="-xkbdir ${xkeyboard_config}/etc/X11/xkb |' $out/bin/xvfb-run
 
     chmod a+x $out/bin/xvfb-run
     wrapProgram $out/bin/xvfb-run \

From 4f94657beea5a4b63bb394cdefd8720ed19ea466 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 18 Jan 2017 09:12:40 +0900
Subject: [PATCH 298/727] oraclejdk: 8u111, 8u112 -> 8u121

---
 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 6 +++---
 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index e8d737e0082..2f16acb51d9 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "111";
+  patchVersion = "121";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "07wyyds52c3fp4ha1fnzp6mbxwq0rs3vx59167b57gkggg7qz3ls";
-  sha256_x86_64 = "0x4937c3307v78wx1jf227b89cf5lsd5yarmbjrxs4pq6lidlzhq";
+  sha256_i686 = "0k1xyg000qmd96c2r2m8l84ygn6dmjf1ih5yjzq1zry5d0aczmpp";
+  sha256_x86_64 = "1g0hh9ccmsrdfa9493k31v2vd6yiymwd1nclgjh29wxfy41h5qwp";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index fc2e6448fc3..2f16acb51d9 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "112";
+  patchVersion = "121";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "19b9vwb7bd17s9p04y47zzjkccazzmpy4dqx4rgxd79k1fw2yz0y";
-  sha256_x86_64 = "19blsx81x5p2f6d9vig89z7cc8778cp6qdjy9ylsa2444vaxfyvp";
+  sha256_i686 = "0k1xyg000qmd96c2r2m8l84ygn6dmjf1ih5yjzq1zry5d0aczmpp";
+  sha256_x86_64 = "1g0hh9ccmsrdfa9493k31v2vd6yiymwd1nclgjh29wxfy41h5qwp";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

From 0ede72738db3f62597d0fc8d4a22b3d33f987c5f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 4 Jan 2017 13:20:42 -0600
Subject: [PATCH 299/727] mplayer: add darwin platform

---
 pkgs/applications/video/mplayer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 3a270da21e9..60625412617 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -199,6 +199,6 @@ stdenv.mkDerivation rec {
     homepage = "http://mplayerhq.hu";
     license = "GPL";
     maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.urkud ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }

From 5c09b223f9aca13a793935142f29cf98151ee360 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 4 Jan 2017 13:21:48 -0600
Subject: [PATCH 300/727] pulseaudio: fix on Darwin

---
 pkgs/servers/pulseaudio/default.nix | 11 +++++++++--
 pkgs/top-level/all-packages.nix     | 10 ++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index efa5d71a76f..09be8c7c587 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook
+{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook
 , json_c, libsndfile, libtool
 , xorg, libcap, alsaLib, glib
 , avahi, libjack2, libasyncns, lirc, dbus
@@ -30,6 +30,8 @@
 
 , # Whether to build only the library.
   libOnly ? false
+
+, CoreServices, AudioUnit, Cocoa
 }:
 
 stdenv.mkDerivation rec {
@@ -41,7 +43,11 @@ stdenv.mkDerivation rec {
     sha256 = "11j682g2mn723sz3bh4i44ggq29z053zcggy0glzn63zh9mxdly3";
   };
 
-  patches = [ ./caps-fix.patch ];
+  patches = [ ./caps-fix.patch ]
+            ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
+              url = "https://bugs.freedesktop.org/attachment.cgi?id=127889";
+              sha256 = "063h5vmh4ykgxjbxyxjlj6qhyyxhazbh3p18p1ik69kq24nkny9m";
+            });
 
   outputs = [ "out" "dev" ];
 
@@ -53,6 +59,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ json_c libsndfile speexdsp fftwFloat ]
     ++ lib.optionals stdenv.isLinux [ glib dbus ]
+    ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ]
     ++ lib.optionals (!libOnly) (
       [ libasyncns webrtc-audio-processing ]
       ++ lib.optional jackaudioSupport libjack2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac48186d58f..76f52481fb2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10315,11 +10315,16 @@ in
 
   pshs = callPackage ../servers/http/pshs { };
 
-  libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; };
+  libpulseaudio = callPackage ../servers/pulseaudio {
+    libOnly = true;
+    inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
+  };
 
   # Name is changed to prevent use in packages;
   # please use libpulseaudio instead.
-  pulseaudioLight = callPackage ../servers/pulseaudio { };
+  pulseaudioLight = callPackage ../servers/pulseaudio {
+    inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
+  };
 
   pulseaudioFull = callPackage ../servers/pulseaudio {
     gconf = gnome3.gconf;
@@ -10330,6 +10335,7 @@ in
     bluetoothSupport = true;
     remoteControlSupport = true;
     zeroconfSupport = true;
+    inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
   };
 
   tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };

From 6c6db7b58b79436a32022e4dcdda4a07051841f4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 4 Jan 2017 13:23:02 -0600
Subject: [PATCH 301/727] portaudio: fix on Darwin

---
 .../libraries/portaudio/default.nix            | 18 +++++++++---------
 pkgs/top-level/all-packages.nix                |  4 +++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index 5d8c2430ab9..b2375fb7583 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, alsaLib, pkgconfig }:
+{ stdenv, fetchurl, alsaLib, pkgconfig
+, AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }:
 
 stdenv.mkDerivation rec {
   name = "portaudio-19-20140130";
@@ -11,8 +12,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig ]
     ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
 
-  configureFlags = stdenv.lib.optionals stdenv.isDarwin
-    [ "--build=x86_64" "--without-oss" "--enable-static" "--enable-shared" ];
+  configureFlags = [ "--disable-mac-universal" ];
+
+  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
 
   preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i '50 i\
@@ -27,15 +29,13 @@ stdenv.mkDerivation rec {
   '';
 
   # not sure why, but all the headers seem to be installed by the make install
-  installPhase = if stdenv.isDarwin then ''
-    mkdir -p "$out"
-    cp -r include "$out"
-    cp -r lib "$out"
-  '' else ''
+  installPhase = ''
     make install
-
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     # fixup .pc file to find alsa library
     sed -i "s|-lasound|-L${alsaLib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    cp include/pa_mac_core.h $out/include/pa_mac_core.h
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76f52481fb2..4e2b4554124 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8987,7 +8987,9 @@ in
 
   popt = callPackage ../development/libraries/popt { };
 
-  portaudio = callPackage ../development/libraries/portaudio { };
+  portaudio = callPackage ../development/libraries/portaudio {
+    inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreAudio CoreServices Carbon;
+  };
 
   portmidi = callPackage ../development/libraries/portmidi {};
 

From 74b206bce2ae81d764cb9eb1239818202435fae1 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 4 Jan 2017 13:23:30 -0600
Subject: [PATCH 302/727] qt4: build webkit on Darwin

QtWebkit is needed by Anki
---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 8526a5f5b82..91a8899f4d1 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -4,7 +4,7 @@
 , libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig
 , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
 , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst_plugins_base
-, buildWebkit ? stdenv.isLinux
+, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
 , flashplayerFix ? false, gdk_pixbuf
 , gtkStyle ? false, libgnomeui, gtk2, GConf, gnome_vfs
 , developerBuild ? false

From 2614fa1de05e0dfad6ab717c9b08c55cdd6389ab Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 5 Jan 2017 13:49:44 -0600
Subject: [PATCH 303/727] portaudio: fixup patches

- don't use preBuild for patching
- leave all of the tests in place (no tests are run anyway)
---
 pkgs/development/libraries/portaudio/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index b2375fb7583..3882e1fb08a 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -16,16 +16,12 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
 
-  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i '50 i\
       #include <CoreAudio/AudioHardware.h>\
       #include <CoreAudio/AudioHardwareBase.h>\
       #include <CoreAudio/AudioHardwareDeprecated.h>' \
       include/pa_mac_core.h
-
-    # disable two tests that don't compile
-    sed -i -e 105d Makefile
-    sed -i -e 107d Makefile
   '';
 
   # not sure why, but all the headers seem to be installed by the make install

From 753b00b6c6db2ba97151bf4910fbc56d8bb00ce7 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Tue, 17 Jan 2017 20:44:49 -0500
Subject: [PATCH 304/727] pythonPackages.neovim: 0.1.12 -> 0.1.13

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c971c926619..ac5bac79f97 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29781,12 +29781,12 @@ EOF
   };
 
   neovim = buildPythonPackage rec {
-    version = "0.1.12";
+    version = "0.1.13";
     name = "neovim-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/neovim/${name}.tar.gz";
-      sha256 = "1pll4jjqdq54d867hgqnnpiiz4pz4bbjrnh6binbp7djcbgrb8zq";
+      sha256 = "0pzk5639jjjx46a6arkwy31falmk5w1061icbml8njm3rbrwwhgx";
     };
 
     buildInputs = with self; [ nose ];

From 310219c52445dce027fc01617ce4f379849a705e Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 18 Jan 2017 16:28:40 +0900
Subject: [PATCH 305/727] styx: 0.4.0 -> 0.5.0

---
 pkgs/applications/misc/styx/default.nix | 15 ++++++---
 pkgs/applications/misc/styx/themes.nix  | 42 ++++++++++++++++---------
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index 15e8453de51..23761feb0ec 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name    = "styx-${version}";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner  = "styx-static";
     repo   = "styx";
     rev    = "v${version}";
-    sha256 = "1s4465absxqwlwhn5rf51h0s1rw25ls581yjg0fy9kbyhy979qvs";
+    sha256 = "0v36i40cwrajsd02xjfdldih5g493m28lhzgjg1gd3pwk2yd6rm1";
   };
 
   setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`";
@@ -26,20 +26,27 @@ stdenv.mkDerivation rec {
     multimarkdown
   ];
 
+  outputs = [ "out" "lib" ];
+
   installPhase = ''
     mkdir $out
     install -D -m 777 styx.sh $out/bin/styx
 
     mkdir -p $out/share/styx
-    cp -r lib $out/share/styx
     cp -r scaffold $out/share/styx
     cp    builder.nix $out/share/styx
 
     mkdir -p $out/share/doc/styx
-    asciidoctor doc/manual.adoc -o $out/share/doc/styx/index.html
+    asciidoctor doc/index.adoc       -o $out/share/doc/styx/index.html
+    asciidoctor doc/styx-themes.adoc -o $out/share/doc/styx/styx-themes.html
+    cp -r doc/imgs $out/share/doc/styx/
 
     substituteAllInPlace $out/bin/styx
     substituteAllInPlace $out/share/doc/styx/index.html
+    substituteAllInPlace $out/share/doc/styx/styx-themes.html
+
+    mkdir $lib
+    cp -r lib/* $lib
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/styx/themes.nix b/pkgs/applications/misc/styx/themes.nix
index 2b3570608af..671372f6250 100644
--- a/pkgs/applications/misc/styx/themes.nix
+++ b/pkgs/applications/misc/styx/themes.nix
@@ -7,7 +7,7 @@ let
 
     src = fetchFromGitHub ({
       owner = "styx-static";
-      repo = "styx-theme-${args.themeName}";
+      repo  = "styx-theme-${args.themeName}";
     } // args.src);
 
     installPhase = ''
@@ -28,10 +28,10 @@ in
 {
   agency = mkThemeDrv {
     themeName = "agency";
-    version   = "2016-12-03";
+    version   = "20167-01-17";
     src = {
-      rev    = "3604239cc5d940eee9c14ad2540d68a53cfebd7e";
-      sha256 = "1kk8d5a3lb7fx1avivjd49gv0ffq7ppiswmwqlcsq87h2dbrqf61";
+      rev    = "3201f65841c9e7f97cc0ab0264cafb01b1620ed7";
+      sha256 = "1b3547lzmhs1lmr9gln1yvh5xrsg92m8ngrjwf0ny91y81x04da6";
     };
     meta = {
       license = stdenv.lib.licenses.asl20;
@@ -44,28 +44,40 @@ in
     };
   };
 
+  generic-templates = mkThemeDrv {
+    themeName = "generic-templates";
+    version   = "2017-01-18";
+    src = {
+      rev    = "af7cd527584322d8731a306a137a1794b18ad71a";
+      sha256 = "18zk4qihi8iw5dxkm9sf6cjai1mf22l6q1ykkrgaxjd5709is0li";
+    };
+    meta = {
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   hyde = mkThemeDrv {
     themeName = "hyde";
-    version   = "2016-12-03";
+    version   = "2017-01-17";
     src = {
-      rev    = "b6b9b77839959fbf3c9ca3a4488617fa1831cd28";
-      sha256 = "0d1k03mjn08s3rpc5rdivb8ahr345kblhqyihxnfgd1501ih9pg6";
+      rev    = "22caf4edc738f399bb1013d8e968d111c7fa2a59";
+      sha256 = "1a2j3m941vc2pyb1dz341ww5l3xblg527szfrfqh588lmsrkdqb6";
     };
     meta = {
       license = stdenv.lib.licenses.mit;
       longDescription = ''
-        Hyde is a brazen two-column Jekyll theme that pairs a prominent sidebar
-        with uncomplicated content.
+        Port of the Jekyll Hyde theme to styx; Hyde is a brazen two-column
+        Styx theme that pairs a prominent sidebar with uncomplicated content.
       '';
     };
   };
 
   orbit = mkThemeDrv {
     themeName = "orbit";
-    version   = "2016-12-03";
+    version   = "2017-01-17";
     src = {
-      rev    = "1d41745c689c4336d4e2bfbb2483b80e67ec96e4";
-      sha256 = "19pp9dykqxmrixn3cvqpdpcqy547y9n5izqhz0c4a11mmm0v3v64";
+      rev    = "b5896e25561f05e026b34d04ad95a647ddfc3d03";
+      sha256 = "11p11f2d0swgjil5hfx153yw13p7pcp6fwx1bnvxrlfmmx9x2yj5";
     };
     meta = {
       license = stdenv.lib.licenses.cc-by-30;
@@ -77,10 +89,10 @@ in
 
   showcase = mkThemeDrv {
     themeName = "showcase";
-    version   = "2016-12-04";
+    version   = "2017-01-17";
     src = {
-      rev    = "33feb0a09183e88d3580e9444ea36a255dffef60";
-      sha256 = "01ighlnrja442ip5fhllydl77bfdz8yig80spmizivdfxdrdiyyf";
+      rev    = "1b4b9d4af29c05aaadfd58233f0e3f61fac726af";
+      sha256 = "0mwd1ycwvlv15y431336wwlv8mdv0ikz1aymh3yxhjyxqllc2snk";
     };
     meta = {
       license = stdenv.lib.licenses.mit;

From d0345065567b086c68684907a78b0c35c6b547bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jan 2017 11:20:13 +0100
Subject: [PATCH 306/727] haskell-hpack: keep old version around so that we can
 build stack

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 10acd16e7b5..13765986ada 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2018,6 +2018,7 @@ extra-packages:
   - esqueleto < 2.5                     # needed for git-annex: https://github.com/bitemyapp/esqueleto/issues/8
   - generic-deriving == 1.10.5.*        # new versions don't compile with GHC 7.10.x
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
+  - hpack == 0.15.*                     # needed for stack-1.3.2
   - haddock < 2.17                      # required on GHC 7.10.x
   - haddock-api == 2.15.*               # required on GHC 7.8.x
   - haddock-api == 2.16.*               # required on GHC 7.10.x

From 7105f4baadd639f8a0d6aff284510984627b54ef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jan 2017 11:28:18 +0100
Subject: [PATCH 307/727] hackage2nix: disable failing Hydry builds

---
 .../configuration-hackage2nix.yaml            | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 13765986ada..99d211bf67f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2220,6 +2220,7 @@ dont-distribute-packages:
   aeson-t:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-yak:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  affection:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   affine-invariant-ensemble-mcmc:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   afv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Agata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2426,11 +2427,13 @@ dont-distribute-packages:
   aws-sdk-xml-unordered:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sdk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sign4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-service-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-servicebus:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   azurify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   b-tree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  babl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   babylon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   backdropper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   backtracking-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2549,6 +2552,7 @@ dont-distribute-packages:
   BiobaseVienna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseXNA:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   biohazard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BioHMM:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bioinformatics-toolkit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biophd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biosff:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2625,6 +2629,7 @@ dont-distribute-packages:
   bson-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bson-mapping:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree-concurrent:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  buchhaltung:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer-builder-aeson:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer-builder:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2813,6 +2818,7 @@ dont-distribute-packages:
   CLASE:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-ghc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash-multisignal:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-prelude-quickcheck:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-systemverilog:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2988,6 +2994,9 @@ dont-distribute-packages:
   convertible-ascii:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   convertible-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-cbmc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot-language:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot-libraries:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot-theorem:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   copr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   COrdering:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3434,6 +3443,7 @@ dont-distribute-packages:
   engine-io-wai:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  entangle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   EntrezHTTP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   EnumContainers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumerate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3483,6 +3493,7 @@ dont-distribute-packages:
   event-driven:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   event-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EventSocket:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eventsource-geteventstore-store:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   eventstore:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   every-bit-counts:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ewe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3601,6 +3612,8 @@ dont-distribute-packages:
   fixed-width:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixfile:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fizz-buzz:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flac-picture:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   flamethrower:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   flat-maybe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   flexible-time:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3733,6 +3746,7 @@ dont-distribute-packages:
   GeBoP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   geek-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   geek:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gegl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gelatin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gemstone:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gencheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3776,6 +3790,7 @@ dont-distribute-packages:
   getflag:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   GGg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ggtsTC:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-dump-tree:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-dup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-events-analyze:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-events-parallel:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3799,6 +3814,7 @@ dont-distribute-packages:
   ghcjs-dom:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-hplay:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-promise:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-xhr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghclive:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ght:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gdk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3888,6 +3904,7 @@ dont-distribute-packages:
   goal-geometry:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-probability:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-simulation:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  goat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gofer-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-containerbuilder:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-firebase-dynamiclinks:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3954,6 +3971,7 @@ dont-distribute-packages:
   graphicsFormats:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicstools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphtype:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   grasp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gray-extended:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   graylog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4076,6 +4094,7 @@ dont-distribute-packages:
   halberd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   halfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   halipeto:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  halive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamilton:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaMinitel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4202,6 +4221,7 @@ dont-distribute-packages:
   haskell-tools-backend-ghc:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-cli:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-daemon:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-debug:                          [ 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 ]
@@ -4269,6 +4289,7 @@ dont-distribute-packages:
   hasql-cursor-query:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-cursor-transaction:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-generic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasql-migration:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-postgres-options:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-postgres:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-transaction:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4721,6 +4742,7 @@ dont-distribute-packages:
   hspec-test-sandbox:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-webdriver:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsPerl5:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspkcs11:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspresent:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsprocess:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4940,6 +4962,7 @@ dont-distribute-packages:
   instant-hashable:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   instant-zipper:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   int-cast:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  integer-logarithms:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   integer-pure:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   intel-aes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   interleavableGen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4949,6 +4972,8 @@ dont-distribute-packages:
   interpolatedstring-qq:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpolation:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   interruptible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  intro-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  intro:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   intset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   invertible-syntax:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   invertible:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5082,6 +5107,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-streaming:                                [ 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 ]
@@ -5237,6 +5263,8 @@ dont-distribute-packages:
   lazysplines:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   LazyVault:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lcs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LDAP:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ldapply:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ldif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   leaf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   leaky:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5516,6 +5544,7 @@ dont-distribute-packages:
   mcpi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mdapi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mdcat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mDNSResponder-client:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mdp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mealstrom:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   MeanShift:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5779,6 +5808,7 @@ dont-distribute-packages:
   NestedFunctor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nestedmap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   netcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  netease-fm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   netlines:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   NetSNMP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   netspec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5819,6 +5849,8 @@ dont-distribute-packages:
   network-wai-router:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-websocket:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   networked-game:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  neural-network-blashs:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  neural-network-hmatrix:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   neural:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   newports:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   newsynth:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5875,6 +5907,7 @@ dont-distribute-packages:
   Nussinov78:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nutri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   nvim-hs-contrib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nvim-hs-ghcid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nvim-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   NXT:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   NXTDSL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6197,6 +6230,7 @@ dont-distribute-packages:
   pqc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pqueue-mtl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   practice-room:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  preamble:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   precis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pred-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   prednote-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6300,6 +6334,7 @@ dont-distribute-packages:
   qhull-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   QIO:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   QLearn:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  qr-imager:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   qr-repa:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   qt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   qtah-cpp-qt5:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6327,6 +6362,7 @@ dont-distribute-packages:
   quickcheck-relaxng:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-webdriver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-with-counterexamples:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickPlot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickpull:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickset:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6334,6 +6370,7 @@ dont-distribute-packages:
   quickterm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quicktest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickwebapp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quipper-rendering:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   quipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-instances:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-interleave:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6367,6 +6404,12 @@ dont-distribute-packages:
   Range:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rangemin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ranka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rasa-example-config:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rasa-ext-bufs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rasa-ext-files:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rasa-ext-slate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rasa-ext-views:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rasa-ext-vim:                                 [ 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 ]
@@ -6433,6 +6476,7 @@ dont-distribute-packages:
   reflex-orphans:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  refty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-deriv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-dfa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-genex:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6468,6 +6512,8 @@ dont-distribute-packages:
   relation:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   relative-date:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reload:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  remark:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  remarks:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   remote-debugger:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   remote-json-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   remote-json-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6623,6 +6669,7 @@ dont-distribute-packages:
   SBench:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sbp2udp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sbp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sbvPlugin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   scalable-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   scaleimage:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   SCalendar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6688,12 +6735,14 @@ dont-distribute-packages:
   sensenet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sentence-jp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sentry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  separated:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqaid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   SeqAlign:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqalign:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqloc-datafiles:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sequent-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sequor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  serokell-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   serpentine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   serv-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   serv:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6760,6 +6809,7 @@ dont-distribute-packages:
   shake-pack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-persist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   shaker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shakers:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   shakespeare-babel:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   shapely-data:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   shared-buffer:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6826,6 +6876,7 @@ dont-distribute-packages:
   skeleton:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   skell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   skemmtun:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  skylighting:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   skype4hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   slack-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   slack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6846,6 +6897,8 @@ dont-distribute-packages:
   Smooth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   smsaero:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   smt-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smtlib2-debug:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smtlib2-pipe:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   SmtLib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtp-mail-ng:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtp2mta:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6916,6 +6969,7 @@ dont-distribute-packages:
   snmp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snorkels:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   snow-white:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snowflake-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snowflake-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Snusmumrik:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   soap-openssl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6983,6 +7037,7 @@ dont-distribute-packages:
   sql-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqlite-simple-typed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqlvalue-list:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sqsd-local:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   squeeze:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   srcinst:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sscgi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7026,6 +7081,7 @@ dont-distribute-packages:
   stm-lifted:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stmcontrol:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stochastic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  StockholmAlignment:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Stomp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   storable-static-array:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   storablevector-streamfusion:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7148,6 +7204,7 @@ dont-distribute-packages:
   tagsoup-ht:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-parsec:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-selection:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tailfile-hinotify:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   takusen-oracle:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Takusen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tamarin-prover-term:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7220,6 +7277,7 @@ dont-distribute-packages:
   texrunner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-all:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-and-plots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-generic-pretty:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-icu-normalized:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-json-qq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-normal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7263,6 +7321,7 @@ dont-distribute-packages:
   thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   throttled-io-loop:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tianbar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tibetan-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   tic-tac-toe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tickle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tictactoe3d:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7391,6 +7450,7 @@ dont-distribute-packages:
   twentefp-trees:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-websockets:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentyseven:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twfy-api-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   twhs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   twidge:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   twilight-stm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7628,6 +7688,7 @@ dont-distribute-packages:
   web-fpco:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-inv-route:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-mongrel2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-routes-quasi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-routes-regular:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-routes-transformers:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7670,6 +7731,7 @@ dont-distribute-packages:
   winio:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wire-streams:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   wiring:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wiringPi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wkt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wl-pprint-ansiterm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   WL500gPControl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7691,6 +7753,7 @@ dont-distribute-packages:
   wraxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wrecker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wright:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  writer-cps-monads-tf:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsedit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wtk-gtk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wtk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7806,6 +7869,7 @@ dont-distribute-packages:
   yesod-auth-fb:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-hashdb:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-kerberos:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-ldap-mediocre:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-pam:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-smbclient:                         [ i686-linux, x86_64-linux, x86_64-darwin ]

From 18df98fe9806796ae3eba05a8cf6cd1166223137 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Jan 2017 17:34:48 +0100
Subject: [PATCH 308/727] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/bb2f2e790261ec1ba3df610b5da76573a18da526.
---
 .../haskell-modules/hackage-packages.nix      | 1297 ++++++++++++++---
 1 file changed, 1104 insertions(+), 193 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 939370ba732..b1f8ac909d6 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1401,6 +1401,7 @@ self: {
        ];
        description = "Libary for Hidden Markov Models in HMMER3 format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Biobase" = callPackage
@@ -5294,10 +5295,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "FloatingHex";
-       version = "0.2";
-       sha256 = "5a5f44f6bff788eb26a98f19c61c5a3e021ce1d20a43ba16f3b69126814223d1";
-       revision = "1";
-       editedCabalFile = "d43ab83000132911eeab85ed2bf74a37e9e7f152f1a31c00f14e0a8e34048ba6";
+       version = "0.4";
+       sha256 = "b277054db48d2dec62e3831586f218cbe0a056dec44dbc032e9a73087425a24c";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Read and write hexadecimal floating point numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -10449,6 +10448,7 @@ self: {
        homepage = "https://github.com/ezyang/ldap-haskell";
        description = "Haskell binding for C LDAP API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {lber = null; inherit (pkgs) openldap;};
 
   "LRU" = callPackage
@@ -10754,25 +10754,26 @@ self: {
      }) {};
 
   "LibClang" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, filepath, hashable, mtl
-     , ncurses, resourcet, text, time, transformers, transformers-base
-     , vector
+    ({ mkDerivation, base, bytestring, c2hs, clang, filepath, hashable
+     , mtl, ncurses, resourcet, text, time, transformers
+     , transformers-base, vector
      }:
      mkDerivation {
        pname = "LibClang";
-       version = "3.4.0";
-       sha256 = "b4bdd8fb7fa103b7045534ae43f00bb3d4ad53e909a49feff081f06751e4a44d";
+       version = "3.8.0";
+       sha256 = "945c53f04eba97e85aee1a434a79f09956b74a5c6c71d1e73faeb9574c0db9dc";
        libraryHaskellDepends = [
          base bytestring filepath hashable mtl resourcet text time
          transformers transformers-base vector
        ];
-       librarySystemDepends = [ ncurses ];
+       librarySystemDepends = [ clang ];
+       libraryPkgconfigDepends = [ ncurses ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/chetant/LibClang/issues";
+       homepage = "https://github.com/chetant/LibClang";
        description = "Haskell bindings for libclang (a C++ parsing library)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) ncurses;};
+     }) {inherit (self.llvmPackages) clang; inherit (pkgs) ncurses;};
 
   "LibZip" = callPackage
     ({ mkDerivation, base, bindings-libzip, bytestring, directory
@@ -14297,12 +14298,13 @@ self: {
      , directory, edit-distance, either-unwrap, EntrezHTTP, filepath
      , hierarchical-clustering, HTTP, http-conduit, http-types, hxt
      , matrix, network, parsec, process, pureMD5, random, split
-     , Taxonomy, text, time, transformers, vector, ViennaRNAParser
+     , Taxonomy, text, text-metrics, time, transformers, vector
+     , ViennaRNAParser
      }:
      mkDerivation {
        pname = "RNAlien";
-       version = "1.2.8";
-       sha256 = "f4d754abee29eebb424ffb6d498de24544de1895a5ace4e47863870f62d2b94a";
+       version = "1.2.9";
+       sha256 = "0de399df27f15301d7074ec5b1b4dcf6712bb7878573183edc300c19ee172f25";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14310,7 +14312,8 @@ self: {
          ClustalParser cmdargs containers directory edit-distance
          either-unwrap EntrezHTTP filepath hierarchical-clustering HTTP
          http-conduit http-types hxt matrix network parsec process pureMD5
-         random Taxonomy text transformers vector ViennaRNAParser
+         random Taxonomy text text-metrics transformers vector
+         ViennaRNAParser
        ];
        executableHaskellDepends = [
          base biocore biofasta bytestring cassava cmdargs containers
@@ -16132,6 +16135,7 @@ self: {
        ];
        description = "Libary for Stockholm aligmnent format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Stomp" = callPackage
@@ -17898,6 +17902,7 @@ self: {
        homepage = "https://github.com/opasly-wieprz/Win32-shortcut";
        description = "Support for manipulating shortcuts (.lnk files) on Windows";
        license = stdenv.lib.licenses.bsd3;
+       platforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libossp_uuid; ole32 = null;};
 
   "Wired" = callPackage
@@ -20757,6 +20762,7 @@ self: {
        homepage = "https://github.com/nek0/affection#readme";
        description = "A simple Game Engine using SDL";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "affine-invariant-ensemble-mcmc" = callPackage
@@ -29593,19 +29599,20 @@ self: {
   "aws-simple" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, amazonka-sqs
      , base, blaze-builder, bytestring, conduit, lens, mtl, resourcet
-     , text
+     , text, unordered-containers
      }:
      mkDerivation {
        pname = "aws-simple";
-       version = "0.1.0.0";
-       sha256 = "70091063d883e2320a622a2909abc093e11a47d0a18c64b6557679e401ba918f";
+       version = "0.3.0.0";
+       sha256 = "52fe1741cb4685b56bf9690273e2dc68626165aff4f59a13d82005c15962076d";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 amazonka-sqs base blaze-builder
-         bytestring conduit lens mtl resourcet text
+         bytestring conduit lens mtl resourcet text unordered-containers
        ];
        homepage = "https://github.com/agrafix/aws-simple#readme";
        description = "Dead simple bindings to commonly used AWS Services";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-sns" = callPackage
@@ -29794,6 +29801,40 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "b9_0_5_31" = callPackage
+    ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
+     , bytestring, conduit, conduit-extra, ConfigFile, directory
+     , filepath, free, hashable, hspec, hspec-expectations, mtl
+     , optparse-applicative, parallel, parsec, pretty, pretty-show
+     , process, QuickCheck, random, semigroups, syb, template, text
+     , time, transformers, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "b9";
+       version = "0.5.31";
+       sha256 = "8dcc9b68a88f6f73a0c1af060bbc7607e8894e741665fdecd40dfa842c187c95";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bifunctors binary boxes bytestring conduit
+         conduit-extra ConfigFile directory filepath free hashable mtl
+         parallel parsec pretty pretty-show process QuickCheck random
+         semigroups syb template text time transformers unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring directory optparse-applicative
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec hspec-expectations QuickCheck
+         semigroups text unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/sheyll/b9-vm-image-builder";
+       description = "A tool and library for building virtual machine images";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "babl" = callPackage
     ({ mkDerivation, babl, base }:
      mkDerivation {
@@ -29806,6 +29847,7 @@ self: {
        homepage = "http://github.com/nek0/babl#readme";
        description = "Haskell bindings to BABL library";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) babl;};
 
   "babylon" = callPackage
@@ -34238,6 +34280,38 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ble" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, d-bus
+     , data-default-class, hslogger, hspec, microlens, microlens-ghc
+     , microlens-th, mtl, QuickCheck, quickcheck-instances, random, stm
+     , text, transformers, uuid
+     }:
+     mkDerivation {
+       pname = "ble";
+       version = "0.1.0.0";
+       sha256 = "718781b4acc79797450e46340060088ce5d1a110e3cb8d525b0b0ee5a675fd12";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring cereal containers d-bus data-default-class
+         microlens microlens-ghc microlens-th mtl random text transformers
+         uuid
+       ];
+       executableHaskellDepends = [
+         base bytestring cereal containers d-bus data-default-class
+         microlens microlens-ghc microlens-th mtl random stm text
+         transformers uuid
+       ];
+       testHaskellDepends = [
+         base bytestring cereal containers d-bus data-default-class hslogger
+         hspec microlens microlens-ghc microlens-th mtl QuickCheck
+         quickcheck-instances random text transformers uuid
+       ];
+       homepage = "http://github.com/plow-technologies/ble#readme";
+       description = "Bluetooth Low Energy (BLE) peripherals";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "blink1" = callPackage
     ({ mkDerivation, base, bytestring, text, unix, usb, vector }:
      mkDerivation {
@@ -35668,6 +35742,7 @@ self: {
        homepage = "http://johannesgerer.com/buchhaltung";
        description = "Automates most of your plain text accounting data entry in ledger format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buffer-builder" = callPackage
@@ -36955,6 +37030,8 @@ self: {
        pname = "cabal-helper";
        version = "0.7.2.0";
        sha256 = "90572b1e4aeb780464f7d5f2f88c4f59ebb4539fe303f0b86d42ef3b9078a362";
+       revision = "1";
+       editedCabalFile = "ebe355cd7cc1f6b1fc06054fb645010ab63c7de7dcba0f12e3c58a197bcc8173";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36974,6 +37051,41 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "cabal-helper_0_7_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers
+     , directory, extra, filepath, ghc-prim, mtl, process
+     , template-haskell, temporary, transformers, unix, utf8-string
+     }:
+     mkDerivation {
+       pname = "cabal-helper";
+       version = "0.7.3.0";
+       sha256 = "794055f5205dd029aceb2fe9aac183880d2b4ef005d1096ee3052710d01192a4";
+       revision = "1";
+       editedCabalFile = "1ec0e453ac2b600db0767b99546f963f50436186f55f7794cef81f803a2c1b4a";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [
+         base Cabal containers directory filepath process template-haskell
+         transformers
+       ];
+       libraryHaskellDepends = [
+         base Cabal directory filepath ghc-prim mtl process transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath ghc-prim mtl process
+         template-haskell temporary transformers utf8-string
+       ];
+       testHaskellDepends = [
+         base bytestring Cabal directory extra filepath ghc-prim mtl process
+         template-haskell temporary transformers unix utf8-string
+       ];
+       testToolDepends = [ cabal-install ];
+       doCheck = false;
+       description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
+       license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-info" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath
      , optparse-applicative
@@ -41282,23 +41394,25 @@ self: {
   "clash-ghc" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
      , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl
-     , containers, deepseq, directory, filepath, ghc, ghc-typelits-extra
-     , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl
-     , process, text, time, transformers, unbound-generics, unix
-     , unordered-containers
+     , containers, deepseq, directory, filepath, ghc, ghc-boot
+     , ghc-typelits-extra, ghc-typelits-knownnat
+     , ghc-typelits-natnormalise, ghci, hashable, haskeline, lens, mtl
+     , process, text, time, transformers, unbound-generics, uniplate
+     , unix, unordered-containers
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.6.24";
-       sha256 = "03fddd334133dafc57110657542b1024749fd06d66cecad62853aad4d402acf8";
+       version = "0.7.0.1";
+       sha256 = "74ccedf030ca1ee3c09c51b6e9fbb7caef4693f1ae0610694d03b9398d9ced56";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          array base bifunctors bytestring clash-lib clash-prelude
          clash-systemverilog clash-verilog clash-vhdl containers deepseq
-         directory filepath ghc ghc-typelits-extra ghc-typelits-natnormalise
-         hashable haskeline lens mtl process text time transformers
-         unbound-generics unix unordered-containers
+         directory filepath ghc ghc-boot ghc-typelits-extra
+         ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable
+         haskeline lens mtl process text time transformers unbound-generics
+         uniplate unix unordered-containers
        ];
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware";
@@ -41332,6 +41446,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-lib_0_7" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
+     , concurrent-supply, containers, data-binary-ieee754, deepseq
+     , directory, errors, fgl, filepath, ghc, hashable, integer-gmp
+     , lens, mtl, pretty, process, template-haskell, text, time
+     , transformers, unbound-generics, unordered-containers
+     , uu-parsinglib, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-lib";
+       version = "0.7";
+       sha256 = "867a976ec5a436e953cd342ee3cff0fbeb54d32fb412ae5cade43bcb80aaab96";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring clash-prelude concurrent-supply
+         containers data-binary-ieee754 deepseq directory errors fgl
+         filepath ghc hashable integer-gmp lens mtl pretty process
+         template-haskell text time transformers unbound-generics
+         unordered-containers uu-parsinglib wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - As a Library";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clash-multisignal" = callPackage
     ({ mkDerivation, base, clash-prelude, QuickCheck }:
      mkDerivation {
@@ -41341,6 +41480,7 @@ self: {
        libraryHaskellDepends = [ base clash-prelude QuickCheck ];
        homepage = "https://github.com/ra1u/clash-multisignal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-prelude" = callPackage
@@ -41367,6 +41507,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-prelude_0_11" = callPackage
+    ({ mkDerivation, array, base, constraints, data-binary-ieee754
+     , data-default, deepseq, doctest, ghc-prim, ghc-typelits-extra
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
+     , lens, QuickCheck, reflection, singletons, template-haskell
+     }:
+     mkDerivation {
+       pname = "clash-prelude";
+       version = "0.11";
+       sha256 = "e73490ee73228af3b2a7dca432a226a45bf5d8a52791134a99d4eeb32ac8043a";
+       libraryHaskellDepends = [
+         array base constraints data-binary-ieee754 data-default deepseq
+         ghc-prim ghc-typelits-extra ghc-typelits-knownnat
+         ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection
+         singletons template-haskell
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - Prelude library";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clash-prelude-quickcheck" = callPackage
     ({ mkDerivation, base, clash-prelude, QuickCheck }:
      mkDerivation {
@@ -41397,6 +41560,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-systemverilog_0_7" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
+     , lens, mtl, text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-systemverilog";
+       version = "0.7";
+       sha256 = "1189f40348bb48d002614c3d9fbed3c228e71ab5a9a33c056256e1e763bf47bb";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl hashable lens mtl text
+         unordered-containers wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clash-verilog" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
@@ -41415,6 +41596,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-verilog_0_7" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
+     , lens, mtl, text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-verilog";
+       version = "0.7";
+       sha256 = "4a10084bd2333333af2c1616a030c57fb959f73639647ae2b6788d1d5f79e4ef";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl hashable lens mtl text
+         unordered-containers wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - Verilog backend";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clash-vhdl" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
@@ -41435,6 +41634,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-vhdl_0_7" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
+     , lens, mtl, text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-vhdl";
+       version = "0.7";
+       sha256 = "6fb6c1dfa951021307bf121cb9ed622c3b726c20d2f0b873751fbd9329458af1";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl hashable lens mtl text
+         unordered-containers wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - VHDL backend";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classify" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -43510,8 +43727,8 @@ self: {
     ({ mkDerivation, attoparsec, base, QuickCheck, text }:
      mkDerivation {
        pname = "comma";
-       version = "1.0.0";
-       sha256 = "e5f02dc70c400c389821116054fdcce5745a3aafd5f018b8dfb39e3e019e5462";
+       version = "1.0.1";
+       sha256 = "c038511aeb2c5651b853cfd64c0251103a3ae4ba4b722b752e070a8e6029df72";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base QuickCheck text ];
        homepage = "https://github.com/lovasko/comma";
@@ -46362,6 +46579,7 @@ self: {
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-libraries" = callPackage
@@ -46378,6 +46596,7 @@ self: {
        homepage = "https://github.com/leepike/copilot-libraries";
        description = "Libraries for the Copilot language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-sbv" = callPackage
@@ -46410,6 +46629,7 @@ self: {
        ];
        description = "k-induction for Copilot";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copr" = callPackage
@@ -47230,12 +47450,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "crackNum_1_7" = callPackage
+  "crackNum_1_8" = callPackage
     ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
      mkDerivation {
        pname = "crackNum";
-       version = "1.7";
-       sha256 = "60e9bfb0b75ba32d0fbdd87ba3ebcf89d6f3150c48fbaa6b5637f4414598c853";
+       version = "1.8";
+       sha256 = "26a592d71d6290c1acda8a8acc72f1e5e2be0461236ac9369ab4bc25647b3dc4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50117,8 +50337,8 @@ self: {
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "data-clist";
-       version = "0.1.0.0";
-       sha256 = "f22ba783032ad904fc797ee3ff9d015a43cf26b7670addf4d3b74f5d6f359f45";
+       version = "0.1.1.0";
+       sha256 = "ba0abd2e139d7ac6548cedd785edb3e4e809c1c116c3059d72590b0635166db6";
        libraryHaskellDepends = [ base deepseq QuickCheck ];
        homepage = "https://github.com/sw17ch/data-clist";
        description = "Simple functional ring type";
@@ -54852,8 +55072,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors";
-       version = "0.8.1.1";
-       sha256 = "3c42b7b8b89369d305621a7753c245a6250deb58bc848dd3d757e06d69f842a8";
+       version = "0.8.2.0";
+       sha256 = "af26f266d440812d0471c67ab63f14a164517c5685e9d6808501d8cb21b26d4a";
        libraryHaskellDepends = [
          base bytestring containers mtl old-locale text time
        ];
@@ -54927,14 +55147,15 @@ self: {
 
   "digestive-functors-heist" = callPackage
     ({ mkDerivation, base, blaze-builder, digestive-functors, heist
-     , mtl, text, xmlhtml
+     , map-syntax, mtl, text, xmlhtml
      }:
      mkDerivation {
        pname = "digestive-functors-heist";
-       version = "0.8.6.2";
-       sha256 = "29009a85d77d904115a3ef64659b0e56b8402c8140fd228b5194edcfb3874d5a";
+       version = "0.8.7.0";
+       sha256 = "e6d1cc5ee7ec7c266b00fc42eba7a0f546e6166198758368042ab05cd19fa78e";
        libraryHaskellDepends = [
-         base blaze-builder digestive-functors heist mtl text xmlhtml
+         base blaze-builder digestive-functors heist map-syntax mtl text
+         xmlhtml
        ];
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Heist frontend for the digestive-functors library";
@@ -56069,8 +56290,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-zookeeper";
-       version = "0.2.1.0";
-       sha256 = "98e74ca698daf1434fda5ac2cb277e8849080ef897e907716a196c1348c84bcd";
+       version = "0.2.2.0";
+       sha256 = "df15044fe0f74e4034be2f58d589e2ffa1e46c36e8024c07d6db56fe39697928";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq distributed-process hzk
          mtl network network-transport network-transport-tcp transformers
@@ -59630,19 +59851,20 @@ self: {
      }) {};
 
   "elm-export" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory
-     , formatting, hspec, hspec-core, mtl, QuickCheck
-     , quickcheck-instances, text, time
+    ({ mkDerivation, base, bytestring, containers, Diff, directory
+     , formatting, hspec, hspec-core, HUnit, mtl, QuickCheck
+     , quickcheck-instances, text, time, wl-pprint-text
      }:
      mkDerivation {
        pname = "elm-export";
-       version = "0.5.0.2";
-       sha256 = "13d1542351031f716508fdbe51876aa1cd10791b8b901cb8abdafb23981c14c4";
+       version = "0.6.0.0";
+       sha256 = "ad6342e25a5f71b7eb8abbfb894802d3d72f75b05d588c76eee780d0528dc00f";
        libraryHaskellDepends = [
          base bytestring containers directory formatting mtl text time
+         wl-pprint-text
        ];
        testHaskellDepends = [
-         base bytestring containers hspec hspec-core QuickCheck
+         base bytestring containers Diff hspec hspec-core HUnit QuickCheck
          quickcheck-instances text time
        ];
        homepage = "http://github.com/krisajenkins/elm-export";
@@ -60381,6 +60603,7 @@ self: {
        executableHaskellDepends = [ base matrix quipper-core ];
        description = "An application (and library) to convert quipper circuits into Qpmc models";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "entropy" = callPackage
@@ -61725,6 +61948,7 @@ self: {
        homepage = "https://github.com/YoEight/eventsource-api#readme";
        description = "GetEventStore store implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eventsource-store-specs" = callPackage
@@ -61917,8 +62141,8 @@ self: {
      }:
      mkDerivation {
        pname = "exact-real";
-       version = "0.12.1";
-       sha256 = "935f55ec8ae751e67a8e25b19f70e78c613728500e998a2912e1590efe29d7f0";
+       version = "0.12.2";
+       sha256 = "b9ee21fee70de5b0daa317ed5e2f7f12bdc1240f6206f351fdfd60b344530a66";
        libraryHaskellDepends = [ base integer-gmp memoize random ];
        testHaskellDepends = [
          base checkers directory doctest filepath groups QuickCheck random
@@ -64132,8 +64356,8 @@ self: {
      }:
      mkDerivation {
        pname = "ffmpeg-light";
-       version = "0.11.1";
-       sha256 = "4783a481db0e880ddcc7f5551e31ab0ef890b0b067017ecb1255cd198b89d6cc";
+       version = "0.11.3";
+       sha256 = "57206bff8bcf82f08f0881b80d5992d2be41b32443b8eca10d198789af24adfb";
        libraryHaskellDepends = [
          base either exceptions JuicyPixels mtl transformers vector
        ];
@@ -65354,6 +65578,7 @@ self: {
        homepage = "https://github.com/mrkkrp/flac";
        description = "Complete high-level binding to libFLAC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {FLAC = null;};
 
   "flac-picture" = callPackage
@@ -65374,6 +65599,7 @@ self: {
        homepage = "https://github.com/mrkkrp/flac-picture";
        description = "Support for writing picture to FLAC metadata blocks with JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flaccuraterip" = callPackage
@@ -67925,8 +68151,8 @@ self: {
      }:
      mkDerivation {
        pname = "ftp-client";
-       version = "0.2.0.0";
-       sha256 = "cab25efcdf876396bdf70dfb83d4d2cdbb3dfe018fc2aea5bcc0b5b934f4518a";
+       version = "0.3.0.0";
+       sha256 = "f21e6669f32eb088b51a1770cd8eaf66f6af97cb27ae5254ab9ed971325da3da";
        libraryHaskellDepends = [
          attoparsec base bytestring connection network transformers
        ];
@@ -67942,8 +68168,8 @@ self: {
      }:
      mkDerivation {
        pname = "ftp-client-conduit";
-       version = "0.2.0.0";
-       sha256 = "f4bc3746b62ce12645b8c1ebdd45368f159d7c1ae7cf2b5a8a079a0d804eb315";
+       version = "0.3.0.0";
+       sha256 = "dc5fd4556567f3d902b4d2a8511dc4732de2a26b0206f7af1e5c9e602ec00c52";
        libraryHaskellDepends = [
          base bytestring conduit connection ftp-client resourcet
        ];
@@ -68988,6 +69214,7 @@ self: {
        homepage = "https://github.com/nek0/gegl#readme";
        description = "Haskell bindings to GEGL library";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gegl;};
 
   "gelatin" = callPackage
@@ -70120,6 +70347,7 @@ self: {
        homepage = "https://github.com/edsko/ghc-dump-tree";
        description = "Dump GHC's parsed, renamed, and type checked ASTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-dup" = callPackage
@@ -70685,6 +70913,29 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-extra_0_2_2" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
+     , singletons, tasty, tasty-hunit, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-extra";
+       version = "0.2.2";
+       sha256 = "2e20c00c0aec2e865d270d39921b66f94cb85610e944a6da068dda5868ef86a2";
+       libraryHaskellDepends = [
+         base ghc ghc-tcplugins-extra ghc-typelits-knownnat
+         ghc-typelits-natnormalise integer-gmp singletons transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
+         tasty-hunit template-haskell
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "Additional type-level operations on GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-knownnat" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit
@@ -70706,6 +70957,28 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-knownnat_0_2_3" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
+     , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-knownnat";
+       version = "0.2.3";
+       sha256 = "bd7828cf6c3062a785ad5c35a82d2229341acca4c2fd605c4718f6f595316133";
+       libraryHaskellDepends = [
+         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons
+         template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-natnormalise singletons tasty tasty-hunit
+       ];
+       homepage = "http://clash-lang.org/";
+       description = "Derive KnownNat constraints from other KnownNat constraints";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-natnormalise" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
      , tasty-hunit, template-haskell
@@ -70723,6 +70996,24 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-natnormalise_0_5_2" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
+     , tasty-hunit, template-haskell
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-natnormalise";
+       version = "0.5.2";
+       sha256 = "b12e66e076e6f43eb1a8465e11b406518f86b955de3399ee8822880d4b794383";
+       libraryHaskellDepends = [
+         base ghc ghc-tcplugins-extra integer-gmp
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
+       homepage = "http://www.clash-lang.org/";
+       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-presburger" = callPackage
     ({ mkDerivation, base, equational-reasoning, ghc
      , ghc-tcplugins-extra, presburger, reflection
@@ -71078,6 +71369,7 @@ self: {
        homepage = "https://github.com/tdammers/ghcjs-xhr";
        description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghclive" = callPackage
@@ -74221,6 +74513,7 @@ self: {
        homepage = "https://github.com/lovasko/goat";
        description = "Time Series Compression";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "goatee" = callPackage
@@ -78043,6 +78336,7 @@ self: {
        homepage = "https://github.com/graknlabs/graql-haskell";
        description = "Execute Graql queries on a Grakn graph";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grasp" = callPackage
@@ -78318,12 +78612,15 @@ self: {
      }) {};
 
   "gross" = callPackage
-    ({ mkDerivation, base, mtl, ncurses }:
+    ({ mkDerivation, base, lens, mtl, ncurses }:
      mkDerivation {
        pname = "gross";
-       version = "0.0.0.0";
-       sha256 = "5d9af8583c00c0af8800562cadc81203e8043335ab7dd4211a90a211f6889396";
+       version = "0.1.0.0";
+       sha256 = "76468df752590a960a9132da267d42d040d5fff58530ac7783642c818d95783c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base mtl ncurses ];
+       executableHaskellDepends = [ base lens mtl ncurses ];
        description = "A spoof on gloss for terminal animation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -81668,6 +81965,7 @@ self: {
        homepage = "https://github.com/lukexi/halive";
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halma" = callPackage
@@ -83525,6 +83823,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hashtable-benchmark" = callPackage
+    ({ mkDerivation, base, containers, criterion, hashtables
+     , QuickCheck, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hashtable-benchmark";
+       version = "0.1.1";
+       sha256 = "73f338327ec8f5a30e29c5f43848617b837381c182d892a7a40a33ecd835b57f";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers criterion hashtables QuickCheck
+         unordered-containers
+       ];
+       homepage = "https://github.com/hongchangwu/hashtable-benchmark#readme";
+       description = "Benchmark of hash table implementations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hashtables" = callPackage
     ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
      mkDerivation {
@@ -85039,6 +85356,7 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Debugging Tools for Haskell-tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-demo" = callPackage
@@ -86481,8 +86799,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-migration";
-       version = "0.1.2";
-       sha256 = "cac93fcc517e7c57c14c9415bc885615442975b97572fb5928335042e151247c";
+       version = "0.1.3";
+       sha256 = "2d49e3b7a5ed775150abf2164795b10d087d2e1c714b0a8320f0c0094df068b3";
        libraryHaskellDepends = [
          base base64-bytestring bytestring contravariant cryptohash
          data-default-class directory hasql hasql-transaction text time
@@ -86493,6 +86811,7 @@ self: {
        homepage = "https://github.com/tvh/hasql-migration";
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-optparse-applicative" = callPackage
@@ -86591,8 +86910,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-transaction";
-       version = "0.4.5.1";
-       sha256 = "79b096fa3425ff53bcb5417fd67cdcf4316c00a23c092b02cec173e5a8c99879";
+       version = "0.5";
+       sha256 = "1cd433ed77a59beac628d7ebba945aafc62c55e2f092f682f60ca89a33e0b341";
        libraryHaskellDepends = [
          base base-prelude bytestring bytestring-tree-builder contravariant
          contravariant-extras hasql mtl transformers
@@ -87008,10 +87327,8 @@ self: {
      }:
      mkDerivation {
        pname = "haxl-amazonka";
-       version = "0.1.0.0";
-       sha256 = "7ca933cec8cf15d41384a8f5135713e69da7cd41c9421638afa0980b1c2768ec";
-       revision = "1";
-       editedCabalFile = "360466927f82110c63cbd3f98da74cfb2e7222ba2828040e4daabcdc8ffee7df";
+       version = "0.1.1";
+       sha256 = "3cdf3ee6bd46ee461e4ae640d300533229c1d4f9ab0489f613a1ec387fa270c6";
        libraryHaskellDepends = [
          amazonka amazonka-core async base conduit hashable haxl
          transformers
@@ -89678,24 +89995,25 @@ self: {
 
   "hgeometry" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, containers
-     , data-clist, directory, doctest, fixed-vector, Frames, hexpat
-     , hspec, lens, linear, mtl, optparse-applicative, parsec, random
-     , semigroupoids, semigroups, singletons, template-haskell, text
-     , time, vector, vinyl
+     , contravariant, data-clist, deepseq, directory, doctest
+     , fixed-vector, Frames, hexpat, hspec, lens, linear, mtl
+     , optparse-applicative, parsec, QuickCheck, random, semigroupoids
+     , semigroups, singletons, template-haskell, text, time, vector
+     , vinyl
      }:
      mkDerivation {
        pname = "hgeometry";
-       version = "0.5.0.0";
-       sha256 = "ff38930b3416a9c3edf4576c653b734786a3998c52201d22035e1210eb9164e6";
+       version = "0.6.0.0";
+       sha256 = "328e0e4438b729084b301b22f31d9f880157a5b317eacc48ddcf585d685bf0de";
        libraryHaskellDepends = [
-         base bifunctors bytestring containers data-clist directory
-         fixed-vector Frames hexpat lens linear mtl optparse-applicative
-         parsec random semigroupoids semigroups singletons template-haskell
-         text time vector vinyl
+         base bifunctors bytestring containers contravariant data-clist
+         deepseq directory fixed-vector Frames hexpat lens linear mtl
+         optparse-applicative parsec random semigroupoids semigroups
+         singletons template-haskell text time vector vinyl
        ];
        testHaskellDepends = [
          array base bytestring containers data-clist doctest Frames hspec
-         lens linear random semigroups vector vinyl
+         lens linear QuickCheck random semigroups vector vinyl
        ];
        homepage = "https://fstaals.net/software/hgeometry";
        description = "Geometric Algorithms, Data structures, and Data types";
@@ -90612,15 +90930,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hip_1_3_0_0" = callPackage
+  "hip_1_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
      , deepseq, directory, filepath, hspec, JuicyPixels, netpbm
      , primitive, process, QuickCheck, repa, temporary, vector
      }:
      mkDerivation {
        pname = "hip";
-       version = "1.3.0.0";
-       sha256 = "ee4e288bcb2ab1937d3eaa5bcf8017bff07debc8aeda3e768fe542923696b9bf";
+       version = "1.4.0.1";
+       sha256 = "960a4f964e5a7e82e5948b05da5a0b17122b50afabea86f451475b0c58a9a4c0";
        libraryHaskellDepends = [
          base bytestring Chart Chart-diagrams colour deepseq directory
          filepath JuicyPixels netpbm primitive process repa temporary vector
@@ -93138,8 +93456,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.8";
-       sha256 = "a5096f5a5786a654a7fd7eb8b019899056c70f51c3fe207df67ecd1c83400dd5";
+       version = "5.0.9";
+       sha256 = "93f584c5f7fc6a57ee50803ae8df5e6c41051a3177044b273cb7fbcd39d11874";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93855,6 +94173,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hpack_0_15_0" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
+     , deepseq, directory, filepath, Glob, hspec, interpolate, mockery
+     , QuickCheck, temporary, text, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "hpack";
+       version = "0.15.0";
+       sha256 = "72a39a5d7d8dc2e94a37f75642f7e491ae9d560070b07c5c17e9ced6e3cbab63";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base-compat containers deepseq directory filepath Glob
+         text unordered-containers yaml
+       ];
+       executableHaskellDepends = [
+         aeson base base-compat containers deepseq directory filepath Glob
+         text unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat containers deepseq directory
+         filepath Glob hspec interpolate mockery QuickCheck temporary text
+         unordered-containers yaml
+       ];
+       homepage = "https://github.com/sol/hpack#readme";
+       description = "An alternative format for Haskell packages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hpack" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
      , containers, deepseq, directory, filepath, Glob, hspec
@@ -95413,12 +95761,12 @@ self: {
     ({ mkDerivation, attoparsec, base, text, vector }:
      mkDerivation {
        pname = "hsbc";
-       version = "0.1.0.3";
-       sha256 = "20795b5c41fee21afa91c9d5ae4675a8954898f54e7e3a23222d3ebddbe1369a";
+       version = "0.1.1.0";
+       sha256 = "812c30f8901fb82b50b6e17a5d219687fecb00bb65938b2af0610965c28dc4b1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ attoparsec base text vector ];
-       description = "Command Line Calculator";
+       description = "A command line calculator";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -97781,6 +98129,7 @@ self: {
        homepage = "https://github.com/denisenkom/hspkcs11";
        description = "Wrapper for PKCS #11 interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspr-sh" = callPackage
@@ -99026,18 +99375,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "http-api-data_0_3_3" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, doctest
-     , filepath, hashable, hspec, HUnit, QuickCheck
+  "http-api-data_0_3_4" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, directory
+     , doctest, filepath, hashable, hspec, HUnit, QuickCheck
      , quickcheck-instances, text, time, time-locale-compat
      , unordered-containers, uri-bytestring, uuid, uuid-types
      }:
      mkDerivation {
        pname = "http-api-data";
-       version = "0.3.3";
-       sha256 = "cb3d7ef8a924a6b03481b7c5e26a580df72cbf89f2e8247e825f43f4b3ba8449";
-       revision = "1";
-       editedCabalFile = "1b9b0887231d162187782afe3fa8e5483b896fafd8772bc22203027ae87bc48c";
+       version = "0.3.4";
+       sha256 = "aaf5faa89d51e93e4d238fd43c5ad12bf798b948bd13b9304d7104ff05166bc3";
+       setupHaskellDepends = [ base Cabal directory filepath ];
        libraryHaskellDepends = [
          base bytestring containers hashable text time time-locale-compat
          unordered-containers uri-bytestring uuid-types
@@ -104800,6 +105148,7 @@ self: {
        homepage = "https://github.com/phadej/integer-logarithms";
        description = "Integer logarithms";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "integer-pure" = callPackage
@@ -105182,8 +105531,8 @@ self: {
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.1.0.2";
-       sha256 = "fa4b8dce96686431f867bc972153a694a3a1d1f8daee08123d7c30e7d1e00d5f";
+       version = "0.1.0.3";
+       sha256 = "ad0f8df58a00d0e4c905e73e5c7f97efc9efa495bd8ebc77ecd3d104653e183d";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
          hashable mtl safe string-conversions tagged text transformers
@@ -105197,6 +105546,7 @@ self: {
        homepage = "https://github.com/minad/intro#readme";
        description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intro-prelude" = callPackage
@@ -105213,6 +105563,7 @@ self: {
        homepage = "https://github.com/minad/intro-prelude#readme";
        description = "Intro reexported as Prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "introduction" = callPackage
@@ -108823,6 +109174,7 @@ self: {
        homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme";
        description = "Expose Java iterators as streams from the streaming package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jwt" = callPackage
@@ -109431,8 +109783,8 @@ self: {
      }:
      mkDerivation {
        pname = "kcd";
-       version = "0.1.0.0";
-       sha256 = "e7b1db6f0b48e1482b6e0dd6c2e47512713c933f92f08a577158b192f9b90041";
+       version = "0.2.0.0";
+       sha256 = "5d69a5acf138e90f2993fdb5c5b1e3802d7d153b82a2b51b5df16f8ba48835a3";
        libraryHaskellDepends = [
          base conduit conduit-parse exceptions lens resourcet text
          xml-conduit xml-types
@@ -110466,8 +110818,8 @@ self: {
      }:
      mkDerivation {
        pname = "krapsh";
-       version = "0.1.6.2";
-       sha256 = "081bebfed17c6bd548c0a3ef69523bad78eb0aa11e17d5ceb0de7baebc24cc9b";
+       version = "0.1.9.0";
+       sha256 = "fc8466f7c7e1b06d5873f476d2542f1a6449f943c801fb64b78b8c67edb6aaf0";
        libraryHaskellDepends = [
          aeson aeson-pretty base base16-bytestring binary bytestring
          containers cryptohash-sha256 deepseq exceptions formatting hashable
@@ -112965,6 +113317,7 @@ self: {
        ];
        description = "LDIF idempotent apply tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ldif" = callPackage
@@ -115857,6 +116210,8 @@ self: {
        pname = "liquidhaskell";
        version = "0.6.0.0";
        sha256 = "4b5d6fc321c7b92b80b84bda67fc34e3f37f44d23dd60828ba9d9e3d7d645696";
+       revision = "1";
+       editedCabalFile = "3de51855d7c0c9dd89e345a9a27ff151baec1140b9e464ae91604cb5a885f4c9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117129,8 +117484,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "0.2.2";
-       sha256 = "f0008e0cd1a031f17dcb179f4b6767836f5daf25ee1ed2515f321179650d295a";
+       version = "0.2.3";
+       sha256 = "217976f8e82b2efae445ad8316a654b250f8e4750a1e0b9a31b4e8d46b22aa84";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118587,6 +118942,7 @@ self: {
        homepage = "https://github.com/obsidiansystems/mDNSResponder-client";
        description = "Library for talking to the mDNSResponder daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maam" = callPackage
@@ -121217,17 +121573,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "memory_0_14" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim
-     , tasty, tasty-hunit, tasty-quickcheck
+  "memory_0_14_1" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty
+     , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "memory";
-       version = "0.14";
-       sha256 = "ca0248c9a889906a5a8fc95ce3c549b27abc3edb4d85d03893aef56934148e1d";
-       libraryHaskellDepends = [
-         base bytestring deepseq foundation ghc-prim
-       ];
+       version = "0.14.1";
+       sha256 = "1cd87a34ca28ab5fbb9fbeb82f66cdbabf4e276e10caf7a64b798bf42edc0825";
+       libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
        description = "memory and related abstraction stuff";
@@ -124916,8 +125270,8 @@ self: {
      }:
      mkDerivation {
        pname = "morfette";
-       version = "0.4.3";
-       sha256 = "5e6dab28515a626a7d3a785ae3384fa5aabd3146065dbae31740695b34b83291";
+       version = "0.4.4";
+       sha256 = "9ed165f672c26d24600e189e77898098bb40ca84f5da7e168232670f667b9c18";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -125246,6 +125600,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mrifk" = callPackage
+    ({ mkDerivation, array, base, containers, mtl }:
+     mkDerivation {
+       pname = "mrifk";
+       version = "4.3";
+       sha256 = "bd1699b75fbac5ef25477ca6a9f23869f46f0e3943247c6f24612671e995a95d";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ array base containers mtl ];
+       description = "Decompiles Glulx files";
+       license = "GPL";
+     }) {};
+
   "mrm" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -127641,6 +128008,8 @@ self: {
        pname = "ncurses";
        version = "0.2.16";
        sha256 = "e50fb7b1f700d6fa60b4040623b7e0249ae6af2ef2729801fb2917e8b1f25e3f";
+       revision = "1";
+       editedCabalFile = "8ad9fe6562a80d28166d76adbac1eb4d40c6511fe4e9272ed6e1166dc2f1cdf1";
        libraryHaskellDepends = [ base containers text transformers ];
        librarySystemDepends = [ ncurses ];
        libraryToolDepends = [ c2hs ];
@@ -128050,6 +128419,7 @@ self: {
        homepage = "http://github.com/foreverbell/netease-fm#readme";
        description = "NetEase Cloud Music FM client in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netlines" = callPackage
@@ -129316,6 +129686,7 @@ self: {
        homepage = "https://github.com/pierric/neural-network";
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "neural-network-hmatrix" = callPackage
@@ -129333,6 +129704,7 @@ self: {
        librarySystemDepends = [ blas ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas;};
 
   "newports" = callPackage
@@ -130813,6 +131185,7 @@ self: {
        homepage = "https://github.com/saep/nvim-hs-ghcid";
        description = "Neovim plugin that runs ghcid to update the quickfix list";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvvm" = callPackage
@@ -134109,22 +134482,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-types_1_17_0_4" = callPackage
+  "pandoc-types_1_17_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , ghc-prim, HUnit, QuickCheck, string-qq, syb, test-framework
      , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.17.0.4";
-       sha256 = "531996e547714e34a2e4134e9e80dad9929bbc6814ebb5515f95538fa76c3f74";
-       revision = "1";
-       editedCabalFile = "9ede2044ebbf4fbb7e8244d7f458988178d7bad81e566e8c8a2bc1793ee3d27d";
+       version = "1.17.0.5";
+       sha256 = "c8825588b587ff5ed0c105156a11a43f3b752279997231cfc13102809bbc51b3";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
        ];
        testHaskellDepends = [
-         aeson base bytestring containers HUnit QuickCheck string-qq
+         aeson base bytestring containers HUnit QuickCheck string-qq syb
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        homepage = "http://johnmacfarlane.net/pandoc";
@@ -134187,14 +134558,22 @@ self: {
 
   "papa" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, papa-base
-     , papa-include, papa-prelude, QuickCheck, template-haskell
+     , papa-base-export, papa-base-implement, papa-bifunctors
+     , papa-bifunctors-export, papa-bifunctors-implement, papa-export
+     , papa-implement, papa-lens, papa-lens-export, papa-lens-implement
+     , papa-semigroupoids, papa-semigroupoids-export
+     , papa-semigroupoids-implement, QuickCheck, template-haskell
      }:
      mkDerivation {
        pname = "papa";
-       version = "0.1.0";
-       sha256 = "65e86b5cda900e60856216f000cd95931780f7ba437e5ecc5924da698a9fc730";
+       version = "0.2.1";
+       sha256 = "1be9afdf1804971617cdca5a94347853a0a5dad33bfa8270394dbf9e00a75386";
        libraryHaskellDepends = [
-         base papa-base papa-include papa-prelude
+         base papa-base papa-base-export papa-base-implement papa-bifunctors
+         papa-bifunctors-export papa-bifunctors-implement papa-export
+         papa-implement papa-lens papa-lens-export papa-lens-implement
+         papa-semigroupoids papa-semigroupoids-export
+         papa-semigroupoids-implement
        ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -134206,14 +134585,17 @@ self: {
      }) {};
 
   "papa-base" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
+    ({ mkDerivation, base, directory, doctest, filepath
+     , papa-base-export, papa-base-implement, QuickCheck
      , template-haskell
      }:
      mkDerivation {
        pname = "papa-base";
-       version = "0.1.0";
-       sha256 = "532ddec481ae97e7fdf074c653c3549a150f34a701572ed33aadab3f4899dcdf";
-       libraryHaskellDepends = [ base ];
+       version = "0.2.0";
+       sha256 = "8b11f0b11d2fc6517967794320e453e40927f2d7e197c9ea68a306c8a59473c3";
+       libraryHaskellDepends = [
+         base papa-base-export papa-base-implement
+       ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
@@ -134222,6 +134604,141 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "papa-base-export" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-base-export";
+       version = "0.2.0";
+       sha256 = "1fec80f4bc71eb761c1085816f1d86c485df34d42d0223a052378da15d45a94a";
+       revision = "1";
+       editedCabalFile = "16ab8a0d0b30fc32c0aea4f2229a02d9203a8ac4747370d000d0ac8293cb28f8";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/data61/papa-base-export";
+       description = "Prelude with only useful functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "papa-base-implement" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-base-implement";
+       version = "0.2.0";
+       sha256 = "64a0e4ca45f479ad81397cd6f132c5cb40ad76629b7f18b92549a97432e1071d";
+       revision = "1";
+       editedCabalFile = "e0bce83e04d2258364585033821dea273ea72e873cd362107444bdec505d66e5";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/data61/papa-base-implement";
+       description = "Useful base functions reimplemented";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "papa-bifunctors" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath
+     , papa-bifunctors-export, papa-bifunctors-implement, QuickCheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-bifunctors";
+       version = "0.2.0";
+       sha256 = "ea55cc34900fe9acde2e4dae35dfc4b68f8ee21cf58d9bdc0202bf4082c3983f";
+       libraryHaskellDepends = [
+         base papa-bifunctors-export papa-bifunctors-implement
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/data61/papa-bifunctors";
+       description = "Prelude with only useful functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "papa-bifunctors-export" = callPackage
+    ({ mkDerivation, base, bifunctors, directory, doctest, filepath
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-bifunctors-export";
+       version = "0.2.0";
+       sha256 = "c3845130eb7ba2524573c0b266546d5efcb62c2fdaef3a06360cdf90b5e93760";
+       libraryHaskellDepends = [ base bifunctors ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/data61/papa-bifunctors-export";
+       description = "export useful functions from `bifunctors`";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "papa-bifunctors-implement" = callPackage
+    ({ mkDerivation, base, bifunctors, directory, doctest, filepath
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-bifunctors-implement";
+       version = "0.2.0";
+       sha256 = "2cba24228b508080945bc81699801690ba868e49cb623a94cf3529a6d36c1613";
+       libraryHaskellDepends = [ base bifunctors ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/data61/papa-bifunctors-implement";
+       description = "useful `bifunctors` functions reimplemented";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "papa-export" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath
+     , papa-base-export, papa-bifunctors-export, papa-lens-export
+     , papa-semigroupoids-export, QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-export";
+       version = "0.2.1";
+       sha256 = "31d1b3b4e0f12310739e31aa3b5d4adb12376a1acceb603ee161fd9efadb5d0a";
+       libraryHaskellDepends = [
+         base papa-base-export papa-bifunctors-export papa-lens-export
+         papa-semigroupoids-export
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/data61/papa-export";
+       description = "Reasonable default import";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "papa-implement" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, lens
+     , papa-base-implement, papa-bifunctors-implement
+     , papa-lens-implement, papa-semigroupoids-implement, QuickCheck
+     , semigroupoids, template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-implement";
+       version = "0.2.2";
+       sha256 = "7bd73663de95b0784d217374b37b8e2c301c1be0c0d52789f7e37af21376d3f8";
+       libraryHaskellDepends = [
+         base lens papa-base-implement papa-bifunctors-implement
+         papa-lens-implement papa-semigroupoids-implement semigroupoids
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/data61/papa";
+       description = "Reasonable default import";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "papa-include" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, lens
      , QuickCheck, semigroupoids, semigroups, template-haskell
@@ -134240,14 +134757,17 @@ self: {
      }) {};
 
   "papa-lens" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, lens
-     , QuickCheck, template-haskell
+    ({ mkDerivation, base, directory, doctest, filepath
+     , papa-lens-export, papa-lens-implement, QuickCheck
+     , template-haskell
      }:
      mkDerivation {
        pname = "papa-lens";
-       version = "0.0.1";
-       sha256 = "b28ec4395f517a599b8632ec6430ef9e566fd5a591041816e3bbbf01bd98a10b";
-       libraryHaskellDepends = [ base lens ];
+       version = "0.2.0";
+       sha256 = "eb938277cc49d3a4fa6e95501f577bdc7d1ba1ca3c3444b1273c20e29aa22cd5";
+       libraryHaskellDepends = [
+         base papa-lens-export papa-lens-implement
+       ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
@@ -134256,6 +134776,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "papa-lens-export" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, lens
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-lens-export";
+       version = "0.2.0";
+       sha256 = "a3ea619b9447497cf2578d979c7b95978df1803523396192c13fc5475cf30eb1";
+       libraryHaskellDepends = [ base lens ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/data61/papa-lens-export";
+       description = "export useful functions from `lens`";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "papa-lens-implement" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, lens
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-lens-implement";
+       version = "0.2.1";
+       sha256 = "a9b98e295fffd12b6aa21073bfa4c77ba8d237c8a926f9c63d25a982adae9c2f";
+       libraryHaskellDepends = [ base lens ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/data61/papa-lens-implement";
+       description = "useful `lens` functions reimplemented";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "papa-prelude" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
      , template-haskell
@@ -134344,6 +134898,60 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "papa-semigroupoids" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath
+     , papa-semigroupoids-export, papa-semigroupoids-implement
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-semigroupoids";
+       version = "0.2.0";
+       sha256 = "3e8749a7a4fa7117de60d3cbde328045f7a5e7a469754afa5dca40c0cc9d89be";
+       libraryHaskellDepends = [
+         base papa-semigroupoids-export papa-semigroupoids-implement
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/data61/papa-semigroupoids";
+       description = "Prelude with only useful functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "papa-semigroupoids-export" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
+     , semigroupoids, template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-semigroupoids-export";
+       version = "0.2.0";
+       sha256 = "1be94a9a3f95c618b48c5597ba7c9e38426dc237ee1dd1aadbb3eed59ebf6519";
+       libraryHaskellDepends = [ base semigroupoids ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/data61/papa-semigroupoids-export";
+       description = "export useful functions from `semigroupoids`";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "papa-semigroupoids-implement" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
+     , semigroupoids, template-haskell
+     }:
+     mkDerivation {
+       pname = "papa-semigroupoids-implement";
+       version = "0.2.1";
+       sha256 = "3007b2b844c671e0b28dcb246b9a2ec6afa4a532948e4379e534cebb47df287f";
+       libraryHaskellDepends = [ base semigroupoids ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/data61/papa";
+       description = "useful `bifunctors` functions reimplemented";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "paphragen" = callPackage
     ({ mkDerivation, base, bytestring, containers }:
      mkDerivation {
@@ -135827,8 +136435,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-slave";
-       version = "1.3.0.0";
-       sha256 = "0020adc44e21938637c5fe7f69bf7ff714b5773654a74ff2c0ff544bf934f5b9";
+       version = "1.3.1.0";
+       sha256 = "0417ecfaf51fee975f6387403d1b9eb2af71d625af28adef9cc53f3c9c640509";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141359,6 +141967,7 @@ self: {
        homepage = "https://github.com/swift-nav/preamble";
        description = "Yet another prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "precis" = callPackage
@@ -141922,8 +142531,8 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-simple";
-       version = "1.0.0.3";
-       sha256 = "f455dc0bbbfb068a59088e43cb354741c1bbf877d0bfc440667790aa3d550740";
+       version = "1.0.0.6";
+       sha256 = "a5f816efd624ca511909674a65481c9e938d1357130b4e88040665890dcf459c";
        libraryHaskellDepends = [
          ansi-terminal base containers lens mono-traversable mtl parsec
          semigroups text transformers
@@ -144694,18 +145303,23 @@ self: {
 
   "python-pickle" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, cmdargs
-     , containers, mtl
+     , containers, directory, HUnit, mtl, process, test-framework
+     , test-framework-hunit
      }:
      mkDerivation {
        pname = "python-pickle";
-       version = "0.2.0";
-       sha256 = "e5406a2e8fa753e61656e4ecc27291919a2ec404d280400c31dbc9a431aff75c";
+       version = "0.2.3";
+       sha256 = "77df7f0892f543ee9969ea00493a979f74f99a4d7f7ff79350ce20aa7d366885";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring cereal containers mtl
        ];
        executableHaskellDepends = [ base bytestring cmdargs ];
+       testHaskellDepends = [
+         base bytestring containers directory HUnit process test-framework
+         test-framework-hunit
+       ];
        description = "Serialization/deserialization using Python Pickle format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144805,6 +145419,7 @@ self: {
        homepage = "https://github.com/vmchale/QRImager#readme";
        description = "Library to generate QR codes from bytestrings and objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qr-repa" = callPackage
@@ -145287,6 +145902,20 @@ self: {
        license = stdenv.lib.licenses.lgpl3;
      }) {};
 
+  "quickcheck-assertions_0_3_0" = callPackage
+    ({ mkDerivation, base, hspec, ieee754, pretty-show, QuickCheck }:
+     mkDerivation {
+       pname = "quickcheck-assertions";
+       version = "0.3.0";
+       sha256 = "9b0328a788dcac0824a7d7496ab403eef04170551255c9e58fb6e2e319a9cacf";
+       libraryHaskellDepends = [ base ieee754 pretty-show QuickCheck ];
+       testHaskellDepends = [ base hspec ieee754 QuickCheck ];
+       homepage = "https://github.com/s9gf4ult/quickcheck-assertions";
+       description = "HUnit like assertions for QuickCheck";
+       license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quickcheck-combinators" = callPackage
     ({ mkDerivation, base, QuickCheck, unfoldable-restricted }:
      mkDerivation {
@@ -145540,6 +146169,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quickcheck-with-counterexamples" = callPackage
+    ({ mkDerivation, base, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "quickcheck-with-counterexamples";
+       version = "1.0";
+       sha256 = "0775755444042169f949474f8931bbf2a88b5cba475d190aacad9af0213fde5e";
+       revision = "3";
+       editedCabalFile = "e86f17bffaf0d7909be7b79aed021931e806738d44c76e883f27f5fe2e8fe773";
+       libraryHaskellDepends = [ base QuickCheck template-haskell ];
+       homepage = "http://www.github.com/nick8325/quickcheck-with-counterexamples";
+       description = "Get counterexamples from QuickCheck as Haskell values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quicklz" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck, test-framework
      , test-framework-quickcheck2
@@ -145616,12 +146260,19 @@ self: {
      }) {};
 
   "quickterm" = callPackage
-    ({ mkDerivation, base, edit-distance, hashmap }:
+    ({ mkDerivation, base, edit-distance, hashmap, regex-base
+     , regex-tdfa, uu-parsinglib
+     }:
      mkDerivation {
        pname = "quickterm";
-       version = "0.1.0.0";
-       sha256 = "389310e766ef5169819a296719827b0c4aa50c5c6a9eef2a58c3500e6bc147f9";
-       libraryHaskellDepends = [ base edit-distance hashmap ];
+       version = "0.2.4.0";
+       sha256 = "cba5a2de043dee23e88781eeee1afe43a11c78411ffb8fbf0b9cc08f21be6f52";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base edit-distance hashmap regex-base regex-tdfa uu-parsinglib
+       ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/SamuelSchlesinger/Quickterm";
        description = "An interface for describing and executing terminal applications";
        license = stdenv.lib.licenses.gpl3;
@@ -145714,6 +146365,7 @@ self: {
        homepage = "http://www.mathstat.dal.ca/~selinger/quipper/";
        description = "An embedded, scalable functional programming language for quantum computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quiver" = callPackage
@@ -146699,8 +147351,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasa";
-       version = "0.1.6";
-       sha256 = "ec2c1f23f4a44f691a32d1b4784cd72bf2452076908f4c8cf61945d499da22bd";
+       version = "0.1.7";
+       sha256 = "e5d1ecdbcd350a2686ebcf45f2a7aa1922aa6909fe6bb79040a81963c8ddbbe3";
        libraryHaskellDepends = [
          async base containers data-default lens mtl text text-lens
          transformers yi-rope
@@ -146711,24 +147363,25 @@ self: {
      }) {};
 
   "rasa-example-config" = callPackage
-    ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-bufs
-     , rasa-ext-cursors, rasa-ext-files, rasa-ext-logger, rasa-ext-slate
-     , rasa-ext-status-bar, rasa-ext-style, rasa-ext-vim
+    ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-cursors
+     , rasa-ext-files, rasa-ext-logger, rasa-ext-slate
+     , rasa-ext-status-bar, rasa-ext-style, rasa-ext-views, rasa-ext-vim
      }:
      mkDerivation {
        pname = "rasa-example-config";
-       version = "0.1.1";
-       sha256 = "efc1307d1f0e616977ae5c5f637b6e8d45fc45ccebe367d2282a9b6344041855";
+       version = "0.1.2";
+       sha256 = "e6d4eac030ba165eb446dacb7eef1fcd19673cd45d4656b5f9ff0f5c924f8db7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base lens mtl rasa rasa-ext-bufs rasa-ext-cursors rasa-ext-files
-         rasa-ext-logger rasa-ext-slate rasa-ext-status-bar rasa-ext-style
+         base lens mtl rasa rasa-ext-cursors rasa-ext-files rasa-ext-logger
+         rasa-ext-slate rasa-ext-status-bar rasa-ext-style rasa-ext-views
          rasa-ext-vim
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Example user config for Rasa";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa-ext-bufs" = callPackage
@@ -146744,6 +147397,7 @@ self: {
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for useful buffer utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa-ext-cmd" = callPackage
@@ -146767,8 +147421,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-cursors";
-       version = "0.1.3";
-       sha256 = "e7eb3007b5afb21ceb1122dce2cbbd52bb246a36c9efef4e237bfa3f26d827a2";
+       version = "0.1.4";
+       sha256 = "549776d01b0e363780b3301bc6320bcad74ddcd47278b2cdfda07ab9291e022b";
        libraryHaskellDepends = [
          base data-default lens mtl rasa rasa-ext-style text text-lens
          yi-rope
@@ -146779,28 +147433,29 @@ self: {
      }) {};
 
   "rasa-ext-files" = callPackage
-    ({ mkDerivation, base, data-default, lens, rasa, rasa-ext-bufs
-     , rasa-ext-cmd, rasa-ext-status-bar, text, yi-rope
+    ({ mkDerivation, base, data-default, lens, rasa, rasa-ext-cmd
+     , rasa-ext-status-bar, rasa-ext-views, text, yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-files";
-       version = "0.1.1";
-       sha256 = "5f81d7e731216ae25d571ec4dc567e155619ce0f97451efd1d5b998f311d6dea";
+       version = "0.1.2";
+       sha256 = "a70077f9237d274b24a2d83bf87aaa12565cb33bcb9e94fce22e0377067e0016";
        libraryHaskellDepends = [
-         base data-default lens rasa rasa-ext-bufs rasa-ext-cmd
-         rasa-ext-status-bar text yi-rope
+         base data-default lens rasa rasa-ext-cmd rasa-ext-status-bar
+         rasa-ext-views text yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for filesystem actions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa-ext-logger" = callPackage
     ({ mkDerivation, base, lens, mtl, rasa }:
      mkDerivation {
        pname = "rasa-ext-logger";
-       version = "0.1.1";
-       sha256 = "60dc316154e0c3a1a51c0eb54d18b2612e02b4c76745fe72ab7fc3f3efafcb77";
+       version = "0.1.2";
+       sha256 = "3f60b4a22f053f6fe33fbe6849146fc73c16695951008c3ed086b2c79a32f854";
        libraryHaskellDepends = [ base lens mtl rasa ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for logging state/actions";
@@ -146814,8 +147469,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-slate";
-       version = "0.1.3";
-       sha256 = "eb5b0055822825079abefe9066d05380881f003d7e4842a841352de08268f612";
+       version = "0.1.4";
+       sha256 = "4c6bbfd12b4aa8bb69076925bf6d4143ea692e8b458ad6e22128d6dc9c351aaf";
        libraryHaskellDepends = [
          base lens mtl rasa rasa-ext-logger rasa-ext-status-bar
          rasa-ext-style rasa-ext-views recursion-schemes text vty yi-rope
@@ -146823,14 +147478,15 @@ self: {
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa extension for rendering to terminal with vty";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa-ext-status-bar" = callPackage
     ({ mkDerivation, base, data-default, lens, rasa, yi-rope }:
      mkDerivation {
        pname = "rasa-ext-status-bar";
-       version = "0.1.1";
-       sha256 = "96b5c3a0331b0fe1d16223a98768345adfce7c15193b3113df904e7860dd4a37";
+       version = "0.1.2";
+       sha256 = "07c98db2eeb0f511b6d8104e706541817fc69405392c0576eac42cf48e8455f3";
        libraryHaskellDepends = [ base data-default lens rasa yi-rope ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for populating status-bar";
@@ -146841,8 +147497,8 @@ self: {
     ({ mkDerivation, base, data-default, lens, rasa }:
      mkDerivation {
        pname = "rasa-ext-style";
-       version = "0.1.2";
-       sha256 = "638cab2cc0f07db50663d1fce116ab7c5e9aeeeea4d3163bb8eec5066649ff60";
+       version = "0.1.3";
+       sha256 = "4cf78443b2a2d4b41400d15d614c2767a9f0a94042df09fcb2209accc3c77327";
        libraryHaskellDepends = [ base data-default lens rasa ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext managing rendering styles";
@@ -146863,6 +147519,7 @@ self: {
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext managing rendering views";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa-ext-vim" = callPackage
@@ -146872,8 +147529,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-vim";
-       version = "0.1.2";
-       sha256 = "d3fb58f10308d6a156691c37844eec7ecf1ff48f88bb81c8294625184b6f86ea";
+       version = "0.1.3";
+       sha256 = "9282689ed13d9dbd67c46a4c2071e5a57f7ac3723bff0477dd40d54fea7ad3cf";
        libraryHaskellDepends = [
          base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files
          rasa-ext-status-bar rasa-ext-views text text-lens yi-rope
@@ -146881,6 +147538,7 @@ self: {
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for vim bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rascal" = callPackage
@@ -148880,8 +149538,8 @@ self: {
     ({ mkDerivation, base, data-default, exceptions, lens, mtl }:
      mkDerivation {
        pname = "refresht";
-       version = "0.1.0.1";
-       sha256 = "5c910830cc9ee1272602d84ef8545f31120bf456205d18553e2e7cb8fc9c223e";
+       version = "0.1.1.0";
+       sha256 = "07350b47c06d2a1466419b33fa6983dd289fa33713c046b57f2ec92303bc633f";
        libraryHaskellDepends = [ base data-default exceptions lens mtl ];
        homepage = "https://github.com/konn/refresht#readme";
        description = "Environment Monad with automatic resource refreshment";
@@ -148899,6 +149557,7 @@ self: {
        homepage = "https://github.com/oreshinya/refty";
        description = "Formatted JSON generator for API server inspired by normalizr";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-applicative" = callPackage
@@ -149872,6 +150531,30 @@ self: {
        homepage = "https://github.com/oleks/remark#readme";
        description = "A DSL for marking student work";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "remarks" = callPackage
+    ({ mkDerivation, base, directory, filepath, GenericPretty, pretty
+     , tasty, tasty-golden, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "remarks";
+       version = "0.1.6";
+       sha256 = "e70849c614981dac9ed036ab389d484b683ad9af5af89a32b171510d7c84f70a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base GenericPretty pretty ];
+       executableHaskellDepends = [
+         base directory filepath GenericPretty
+       ];
+       testHaskellDepends = [
+         base GenericPretty tasty tasty-golden tasty-hunit
+       ];
+       homepage = "https://github.com/oleks/remarks#readme";
+       description = "A DSL for marking student work";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rematch" = callPackage
@@ -151215,6 +151898,8 @@ self: {
        pname = "rethinkdb";
        version = "2.2.0.7";
        sha256 = "ed74dd74333e5cd5fd99dfd84af8c6331fca04d1d04e241b533e2c2936078873";
+       revision = "1";
+       editedCabalFile = "87cbc3bf8f5d02043e4b7a93a85cc7cb5c0994bd17cee8e65210715e1272b705";
        libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring containers
          data-default mtl network scientific text time unordered-containers
@@ -151226,6 +151911,27 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "rethinkdb_2_2_0_8" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+     , containers, data-default, doctest, mtl, network, scientific, text
+     , time, unordered-containers, utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "rethinkdb";
+       version = "2.2.0.8";
+       sha256 = "444938d62cba4cbe8606507e3c0abd341f45fd9acf6000102f1743ddb5a0e50f";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring binary bytestring containers
+         data-default mtl network scientific text time unordered-containers
+         utf8-string vector
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/atnnn/haskell-rethinkdb";
+       description = "A driver for RethinkDB 2.2";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rethinkdb-client-driver" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , hashable, hspec, hspec-smallcheck, mtl, network, old-locale
@@ -154229,6 +154935,7 @@ self: {
        homepage = "http://github.com/LeventErkok/sbvPlugin";
        description = "Formally prove properties of Haskell programs using SBV/SMT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sc3-rdu" = callPackage
@@ -155445,15 +156152,21 @@ self: {
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;};
 
   "sdl2-image" = callPackage
-    ({ mkDerivation, base, SDL2, sdl2, SDL2_image }:
+    ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_image
+     , template-haskell, text, transformers
+     }:
      mkDerivation {
        pname = "sdl2-image";
-       version = "0.1.3.2";
-       sha256 = "527b2e7683aee11cf3a054359ad2c253515c612549efc60aa4f54be27d42fa3e";
-       libraryHaskellDepends = [ base sdl2 ];
-       librarySystemDepends = [ SDL2 ];
+       version = "2.0.0";
+       sha256 = "399742b2b7e64fe4e58c9d8a44ad29b2c355589233535238f8c9b371de6c26df";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring sdl2 template-haskell text transformers
+       ];
        libraryPkgconfigDepends = [ SDL2 SDL2_image ];
-       description = "Haskell binding to sdl2-image";
+       executableHaskellDepends = [ base sdl2 text ];
+       description = "Bindings to SDL2_image";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
@@ -156260,6 +156973,7 @@ self: {
        homepage = "https://github.com/data61/separated";
        description = "A data type with elements separated by values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqaid" = callPackage
@@ -156577,6 +157291,7 @@ self: {
        homepage = "https://github.com/serokell/serokell-util";
        description = "General-purpose functions by Serokell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serpentine" = callPackage
@@ -156812,7 +157527,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-auth-cookie_0_4_2" = callPackage
+  "servant-auth-cookie_0_4_2_1" = callPackage
     ({ mkDerivation, base, base-compat, base64-bytestring
      , blaze-builder, blaze-html, blaze-markup, bytestring, cereal
      , cookie, cryptonite, data-default, deepseq, exceptions, hspec
@@ -156822,8 +157537,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-cookie";
-       version = "0.4.2";
-       sha256 = "e1199517da33d5f0b3735567d2391dcf36ca8ca61edea703b674103192a1ed79";
+       version = "0.4.2.1";
+       sha256 = "830df7c6d14345b6ff8e869354388f6242b75abe371265e5f1e414427a88fed3";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring cereal cookie
          cryptonite data-default exceptions http-api-data http-types memory
@@ -158779,6 +159494,7 @@ self: {
        homepage = "https://github.com/swift-nav/shakers";
        description = "Shake helpers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shakespeare" = callPackage
@@ -161062,6 +161778,7 @@ self: {
        homepage = "https://github.com/jgm/skylighting";
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skype4hs" = callPackage
@@ -161621,6 +162338,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smoothie_0_4_2_6" = callPackage
+    ({ mkDerivation, aeson, base, linear, text, vector }:
+     mkDerivation {
+       pname = "smoothie";
+       version = "0.4.2.6";
+       sha256 = "9225877499dd0b4504d91e26403b23f6d8517c097073abf07982fc5041836174";
+       libraryHaskellDepends = [ aeson base linear text vector ];
+       homepage = "https://github.com/phaazon/smoothie";
+       description = "Smooth curves via several interpolation modes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smsaero" = callPackage
     ({ mkDerivation, aeson, base, containers, http-api-data
      , http-client, servant, servant-client, servant-docs, text, time
@@ -161711,6 +162441,7 @@ self: {
        ];
        description = "Dump the communication with an SMT solver for debugging purposes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smtlib2-pipe" = callPackage
@@ -161732,6 +162463,7 @@ self: {
        ];
        description = "A type-safe interface to communicate with an SMT solver";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smtlib2-quickcheck" = callPackage
@@ -163329,6 +164061,7 @@ self: {
        homepage = "https://github.com/jiakai0419/snowflake#readme";
        description = "twitter's snowflake";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snowflake-server" = callPackage
@@ -165160,6 +165893,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sqsd-local" = callPackage
+    ({ mkDerivation, amazonka, amazonka-sqs, base, bytestring
+     , case-insensitive, exceptions, http-client, lens, lifted-base
+     , resourcet, text, unordered-containers, wreq
+     }:
+     mkDerivation {
+       pname = "sqsd-local";
+       version = "0.2.0";
+       sha256 = "909037383cb8948b4a1451414db65046a8cb967e17580282948ba4fae94aba76";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         amazonka amazonka-sqs base bytestring case-insensitive exceptions
+         http-client lens lifted-base resourcet text unordered-containers
+         wreq
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/owickstrom/sqsd-local#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "squeeze" = callPackage
     ({ mkDerivation, base, Cabal, data-default, directory, factory
      , filepath, mtl, QuickCheck, random, toolshed
@@ -167632,6 +168388,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming_0_1_4_5" = callPackage
+    ({ mkDerivation, base, containers, exceptions, ghc-prim, mmorph
+     , monad-control, mtl, resourcet, time, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "streaming";
+       version = "0.1.4.5";
+       sha256 = "d6a920e2c08cea30480fc5823ef83bcd312f2e052ae3b54a2ed16ba0a5da6843";
+       libraryHaskellDepends = [
+         base containers exceptions ghc-prim mmorph monad-control mtl
+         resourcet time transformers transformers-base
+       ];
+       homepage = "https://github.com/michaelt/streaming";
+       description = "an elementary streaming prelude and general stream type";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streaming-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl
      , resourcet, smallcheck, streaming, tasty, tasty-smallcheck
@@ -167654,6 +168429,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming-bytestring_0_1_4_6" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl
+     , resourcet, smallcheck, streaming, tasty, tasty-smallcheck
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "streaming-bytestring";
+       version = "0.1.4.6";
+       sha256 = "89d597dd78ebcf292347441ccca226fb6b67e125205db74f7aadab5592ce6a02";
+       libraryHaskellDepends = [
+         base bytestring deepseq exceptions mmorph mtl resourcet streaming
+         transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base bytestring smallcheck streaming tasty tasty-smallcheck
+         transformers
+       ];
+       homepage = "https://github.com/michaelt/streaming-bytestring";
+       description = "effectful byte steams, or: bytestring io done right";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streaming-commons" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , deepseq, directory, hspec, network, process, QuickCheck, random
@@ -167734,19 +168532,20 @@ self: {
   "streaming-utils" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client
      , http-client-tls, json-stream, mtl, network, network-simple, pipes
-     , resourcet, streaming, streaming-bytestring, transformers
+     , resourcet, streaming, streaming-bytestring, streaming-commons
+     , transformers
      }:
      mkDerivation {
        pname = "streaming-utils";
-       version = "0.1.4.3";
-       sha256 = "9c17f8c1574aec072a2004259bf881e46832b91b82d2c1167115af57339a9f34";
+       version = "0.1.4.6";
+       sha256 = "fe061b466b47b227b871c40bbb55a90a9425341de32690328ce04adeb2067e51";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring http-client http-client-tls
          json-stream mtl network network-simple pipes resourcet streaming
-         streaming-bytestring transformers
+         streaming-bytestring streaming-commons transformers
        ];
        homepage = "https://github.com/michaelt/streaming-utils";
-       description = "http, attoparsec, pipes and conduit utilities for the streaming libraries";
+       description = "http, attoparsec, pipes and other utilities for the streaming libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -171156,6 +171955,7 @@ self: {
        ];
        description = "Tail files in Unix, using hinotify";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tak" = callPackage
@@ -173593,6 +174393,7 @@ self: {
        homepage = "https://github.com/joe9/GenericPretty";
        description = "A generic, derivable, haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-icu" = callPackage
@@ -175369,6 +176170,7 @@ self: {
        homepage = "https://github.com/vmchale/tibetan-utils#readme";
        description = "Parse and display tibetan numerals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tic-tac-toe" = callPackage
@@ -178873,6 +179675,7 @@ self: {
        homepage = "https://github.com/wiggly/twfy-api-client#readme";
        description = "They Work For You API Client Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twhs" = callPackage
@@ -181852,8 +182655,8 @@ self: {
      }:
      mkDerivation {
        pname = "unsequential";
-       version = "0.5.1";
-       sha256 = "4dd469dc657d82ec8d8ef89cb86822c6f99669f0f781698c75e9e72384718669";
+       version = "0.5.2";
+       sha256 = "89e70fc1bcdb982cf832e20c5fe540524d885a22210b832d3e3ea7307e3c7b4a";
        libraryHaskellDepends = [ base base-prelude dlist transformers ];
        testHaskellDepends = [
          attoparsec interspersed QuickCheck quickcheck-instances rebase
@@ -181959,6 +182762,27 @@ self: {
        license = "unknown";
      }) {};
 
+  "update-nix-fetchgit" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, async, base, bytestring
+     , data-fix, errors, hnix, process, text, time, transformers
+     , trifecta, uniplate, utf8-string
+     }:
+     mkDerivation {
+       pname = "update-nix-fetchgit";
+       version = "0.1.0.0";
+       sha256 = "a2782a528180831e4245997d47a561c008887672c7dc299ac73135b9890a14b2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint async base bytestring data-fix errors hnix
+         process text time transformers trifecta uniplate utf8-string
+       ];
+       executableHaskellDepends = [ base text ];
+       homepage = "https://github.com/expipiplus1/update-nix-fetchgit#readme";
+       description = "A program to update fetchgit values in Nix expressions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "uploadcare" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cryptohash
      , hex, http-conduit, http-types, old-locale, time
@@ -184289,6 +185113,8 @@ self: {
        pname = "vgrep";
        version = "0.2.0.0";
        sha256 = "2b53c200e872d253c1195e93ed8362111461d621759a15562f9fd06d333c2d33";
+       revision = "1";
+       editedCabalFile = "939169b5cb33e4f625431bffe87d0285f12b458005dbe10f17fbddd66c819262";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -185337,6 +186163,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-extra_3_0_19_1" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, fast-logger, hspec
+     , http-types, HUnit, iproute, lifted-base, network, old-locale
+     , resourcet, streaming-commons, stringsearch, text, time
+     , transformers, unix, unix-compat, vault, void, wai, wai-logger
+     , word8, zlib
+     }:
+     mkDerivation {
+       pname = "wai-extra";
+       version = "3.0.19.1";
+       sha256 = "f7e7ca4432fd868bb549f16ff2671534cab4e0bcfff194b9de55aa561b21a7f6";
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring blaze-builder bytestring
+         case-insensitive containers cookie data-default-class deepseq
+         directory fast-logger http-types iproute lifted-base network
+         old-locale resourcet streaming-commons stringsearch text time
+         transformers unix unix-compat vault void wai wai-logger word8 zlib
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring case-insensitive cookie fast-logger
+         hspec http-types HUnit resourcet text time transformers wai zlib
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-frontend-monadcgi" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, cgi
      , containers, http-types, transformers, wai
@@ -186999,6 +187855,7 @@ self: {
        homepage = "https://github.com/sarthakbagaria/web-push#readme";
        description = "Helper functions to send messages using Web Push protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes" = callPackage
@@ -188210,6 +189067,7 @@ self: {
        homepage = "https://github.com/ppelleti/hs-wiringPi";
        description = "Access GPIO pins on Raspberry Pi via wiringPi library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {wiringPi = null;};
 
   "with-location" = callPackage
@@ -188993,14 +189851,15 @@ self: {
      }:
      mkDerivation {
        pname = "writer-cps-monads-tf";
-       version = "0.1.0.0";
-       sha256 = "39717b684cc70e75e8fdacc3641dd615672ea77174ee3ef26bf6929ebf4ac28b";
+       version = "0.1.0.1";
+       sha256 = "d844c0a995898968ae9ed7f53d3ac8eabd6f9623b70c22214f956ea3692b9583";
        libraryHaskellDepends = [
          base monads-tf transformers writer-cps-transformers
        ];
        homepage = "https://github.com/minad/writer-cps-monads-tf#readme";
        description = "MonadWriter orphan instances for writer-cps-transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "writer-cps-mtl" = callPackage
@@ -189018,6 +189877,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "writer-cps-mtl_0_1_1_2" = callPackage
+    ({ mkDerivation, base, mtl, transformers, writer-cps-transformers
+     }:
+     mkDerivation {
+       pname = "writer-cps-mtl";
+       version = "0.1.1.2";
+       sha256 = "55d14bfe21dad79b4254c188b5b3f30144d741a821bfb024e38c798dbf7c5f61";
+       libraryHaskellDepends = [
+         base mtl transformers writer-cps-transformers
+       ];
+       homepage = "https://github.com/minad/writer-cps-mtl#readme";
+       description = "MonadWriter orphan instances for writer-cps-transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "writer-cps-transformers" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -189030,6 +189905,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "writer-cps-transformers_0_1_1_2" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "writer-cps-transformers";
+       version = "0.1.1.2";
+       sha256 = "3c82d9a2157da42229b9f7eaa476d26ce9ce2f3910efe8afc603e07fa4da348a";
+       libraryHaskellDepends = [ base transformers ];
+       homepage = "https://github.com/minad/writer-cps-transformers#readme";
+       description = "WriteT and RWST monad transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wsdl" = callPackage
     ({ mkDerivation, base, bytestring, conduit, exceptions, file-embed
      , hspec, mtl, network-uri, resourcet, text, xml-conduit, xml-types
@@ -190094,14 +190982,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "xlsx-tabular_0_2_1_1" = callPackage
+  "xlsx-tabular_0_2_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , lens, text, xlsx
      }:
      mkDerivation {
        pname = "xlsx-tabular";
-       version = "0.2.1.1";
-       sha256 = "17e6c4c6a91bed2648356da244b5d664681c97929462dada5d7fcf834b07fd06";
+       version = "0.2.2";
+       sha256 = "d4d95c3f6ead3af2185f22d7bd1ab0f0fb972864553f1edde6eb2fbb4ef75556";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default lens text xlsx
        ];
@@ -190361,6 +191249,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xml-hamlet_0_4_1" = callPackage
+    ({ mkDerivation, base, containers, hspec, HUnit, parsec
+     , shakespeare, template-haskell, text, xml-conduit
+     }:
+     mkDerivation {
+       pname = "xml-hamlet";
+       version = "0.4.1";
+       sha256 = "7df390f59599a0b16831c3f2cbb13ad0bebb92faa4a350fc6ae613bfba4ec2bb";
+       libraryHaskellDepends = [
+         base containers parsec shakespeare template-haskell text
+         xml-conduit
+       ];
+       testHaskellDepends = [
+         base containers hspec HUnit parsec shakespeare template-haskell
+         text xml-conduit
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Hamlet-style quasiquoter for XML content";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xml-helpers" = callPackage
     ({ mkDerivation, base, xml }:
      mkDerivation {
@@ -192309,6 +193219,7 @@ self: {
        ];
        description = "Very simlple LDAP auth for yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-ldap-native" = callPackage

From 73e221992717a95777710a841134f43781240bba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jan 2017 11:23:38 +0100
Subject: [PATCH 309/727] stack: pin build to old version of hpack

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7c94211d566..191f19bb312 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1011,6 +1011,7 @@ self: super: {
     optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;
     criterion = super.criterion.override { inherit (super) optparse-applicative; };
     aeson = self.aeson_1_0_2_1;
+    hpack = self.hpack_0_15_0;
   });
 
   # The latest Hoogle needs versions not yet in LTS Haskell 7.x.

From 8f5937e36e9e3c46e90e668ada5436dbb7b558f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jan 2017 13:28:28 +0100
Subject: [PATCH 310/727] haskell-distributive: fix build with ghc versions
 prior to 8.x

---
 .../haskell-modules/configuration-ghc-7.10.x.nix            | 6 ++----
 .../development/haskell-modules/configuration-ghc-7.6.x.nix | 1 +
 .../development/haskell-modules/configuration-ghc-7.8.x.nix | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 564ce3c04ec..6263d38a2bb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -103,8 +103,6 @@ self: super: {
     license = pkgs.stdenv.lib.licenses.bsd3;
   }) {};
 
-  mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
-
   # diagrams/monoid-extras#19
   monoid-extras = overrideCabal super.monoid-extras (drv: {
     prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal";
@@ -185,6 +183,8 @@ self: super: {
   hackage-security = dontHaddock (dontCheck super.hackage-security);
 
   # GHC versions prior to 8.x require additional build inputs.
+  distributive = addBuildDepend super.distributive self.semigroups;
+  mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
   attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]);
   Glob = addBuildDepends super.Glob (with self; [semigroups]);
   Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]);
@@ -208,6 +208,4 @@ self: super: {
   # Moved out from common as no longer the case for GHC8
   ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; };
 
-
-
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 1c579b9d6e2..ffd6845b1d0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -99,6 +99,7 @@ self: super: {
   # Needs additional inputs on pre 7.10.x compilers.
   semigroups = addBuildDepends super.semigroups (with self; [bytestring-builder nats tagged unordered-containers transformers]);
   lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
+  distributive = addBuildDepend super.distributive self.semigroups;
 
   # Haddock doesn't cope with the new markup.
   bifunctors = dontHaddock super.bifunctors;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index f7410689866..4b18332648d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -142,6 +142,7 @@ self: super: {
   # Needs additional inputs on pre 7.10.x compilers.
   semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]);
   lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
+  distributive = addBuildDepend super.distributive self.semigroups;
 
   # Haddock doesn't cope with the new markup.
   bifunctors = dontHaddock super.bifunctors;

From 1489bb4cb991635a7f998b5f93760f3e34b7bd3c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2017 09:41:37 +0100
Subject: [PATCH 311/727] haskell-http-api-data: fix override for latest 0.3.x
 version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 191f19bb312..9a66b07d4fd 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1076,7 +1076,7 @@ self: super: {
 
   # 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_3 = dontCheck super.http-api-data_0_3_3;
+  http-api-data_0_3_4 = dontCheck super.http-api-data_0_3_4;
 
   # Fix build for latest versions of servant and servant-client.
   servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: {

From 4a662e5206703868b13e9ac01d401c66d997f800 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 18 Jan 2017 14:05:30 +0300
Subject: [PATCH 312/727] nano: add nix syntax hightlight, nano module: provide
 default (#21912)

this is awesome! thanks.
---
 nixos/modules/programs/nano.nix            | 12 +++++++++---
 pkgs/applications/editors/nano/default.nix | 15 +++++++++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/programs/nano.nix b/nixos/modules/programs/nano.nix
index b8803eec7be..27b6d446c75 100644
--- a/nixos/modules/programs/nano.nix
+++ b/nixos/modules/programs/nano.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   cfg = config.programs.nano;
@@ -20,16 +20,22 @@ in
         example = ''
           set nowrap
           set tabstospaces
-          set tabsize 4
+          set tabsize 2
         '';
       };
+      syntaxHighlight = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Whether to enable syntax highlight for various languages.";
+      };
     };
   };
 
   ###### implementation
 
   config = lib.mkIf (cfg.nanorc != "") {
-    environment.etc."nanorc".text = cfg.nanorc;
+    environment.etc."nanorc".text = lib.concatStrings [ cfg.nanorc
+      (lib.optionalString cfg.syntaxHighlight ''include "${pkgs.nano}/share/nano/*.nanorc"'') ];
   };
 
 }
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 0b45f9502fa..9814e697d22 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, fetchFromGitHub
 , ncurses
 , texinfo
 , gettext ? null
@@ -10,7 +10,14 @@ assert enableNls -> (gettext != null);
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
+let
+  nixSyntaxHighlight = fetchFromGitHub {
+    owner = "seitz";
+    repo = "nanonix";
+    rev = "17e0de65e1cbba3d6baa82deaefa853b41f5c161";
+    sha256 = "1g51h65i31andfs2fbp1v3vih9405iknqn11fzywjxji00kjqv5s";
+  };
+in stdenv.mkDerivation rec {
   name = "nano-${version}";
   version = "2.7.3";
   src = fetchurl {
@@ -30,6 +37,10 @@ stdenv.mkDerivation rec {
     substituteInPlace src/text.c --replace "__time_t" "time_t"
   '';
 
+  postInstall = ''
+    cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/
+  '';
+
   meta = {
     homepage = http://www.nano-editor.org/;
     description = "A small, user-friendly console text editor";

From 42a7d906d92ac8f82127a5fad96d0a843261ee72 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 18 Jan 2017 12:42:39 +0100
Subject: [PATCH 313/727] EC2 AMIs: 16.09.666.3738950 -> 16.09.1508.3909827

In particular, this includes a fix for using ephemeral disks for /tmp,
and adds AMIs for the new eu-west-2 (London) and us-east-2 (Ohio)
regions.
---
 nixos/modules/virtualisation/ec2-amis.nix | 98 ++++++++++++-----------
 1 file changed, 53 insertions(+), 45 deletions(-)

diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index ffd1cbec3ce..0753e2ce994 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -135,51 +135,59 @@ let self = {
   "16.03".us-west-2.pv-ebs = "ami-5e61a23e";
   "16.03".us-west-2.pv-s3 = "ami-734c8f13";
 
-  # 16.09.666.3738950
-  "16.09".ap-northeast-1.hvm-ebs = "ami-35578954";
-  "16.09".ap-northeast-1.hvm-s3 = "ami-d6528cb7";
-  "16.09".ap-northeast-1.pv-ebs = "ami-07548a66";
-  "16.09".ap-northeast-1.pv-s3 = "ami-f1548a90";
-  "16.09".ap-northeast-2.hvm-ebs = "ami-d48753ba";
-  "16.09".ap-northeast-2.hvm-s3 = "ami-4c865222";
-  "16.09".ap-northeast-2.pv-ebs = "ami-ca8551a4";
-  "16.09".ap-northeast-2.pv-s3 = "ami-9c8551f2";
-  "16.09".ap-south-1.hvm-ebs = "ami-922450fd";
-  "16.09".ap-south-1.hvm-s3 = "ami-6d3a4e02";
-  "16.09".ap-south-1.pv-ebs = "ami-4d394d22";
-  "16.09".ap-south-1.pv-s3 = "ami-17384c78";
-  "16.09".ap-southeast-1.hvm-ebs = "ami-f824809b";
-  "16.09".ap-southeast-1.hvm-s3 = "ami-f924809a";
-  "16.09".ap-southeast-1.pv-ebs = "ami-af2480cc";
-  "16.09".ap-southeast-1.pv-s3 = "ami-5826823b";
-  "16.09".ap-southeast-2.hvm-ebs = "ami-40fecd23";
-  "16.09".ap-southeast-2.hvm-s3 = "ami-48fecd2b";
-  "16.09".ap-southeast-2.pv-ebs = "ami-dffecdbc";
-  "16.09".ap-southeast-2.pv-s3 = "ami-e0fccf83";
-  "16.09".eu-central-1.hvm-ebs = "ami-1d8b7472";
-  "16.09".eu-central-1.hvm-s3 = "ami-1c8b7473";
-  "16.09".eu-central-1.pv-ebs = "ami-8c8d72e3";
-  "16.09".eu-central-1.pv-s3 = "ami-3488775b";
-  "16.09".eu-west-1.hvm-ebs = "ami-15662766";
-  "16.09".eu-west-1.hvm-s3 = "ami-476b2a34";
-  "16.09".eu-west-1.pv-ebs = "ami-876928f4";
-  "16.09".eu-west-1.pv-s3 = "ami-70682903";
-  "16.09".sa-east-1.hvm-ebs = "ami-27bc2e4b";
-  "16.09".sa-east-1.hvm-s3 = "ami-e4b92b88";
-  "16.09".sa-east-1.pv-ebs = "ami-4dbe2c21";
-  "16.09".sa-east-1.pv-s3 = "ami-77fc6e1b";
-  "16.09".us-east-1.hvm-ebs = "ami-93347684";
-  "16.09".us-east-1.hvm-s3 = "ami-5e347649";
-  "16.09".us-east-1.pv-ebs = "ami-b0387aa7";
-  "16.09".us-east-1.pv-s3 = "ami-51357746";
-  "16.09".us-west-1.hvm-ebs = "ami-06337a66";
-  "16.09".us-west-1.hvm-s3 = "ami-76307916";
-  "16.09".us-west-1.pv-ebs = "ami-fd327b9d";
-  "16.09".us-west-1.pv-s3 = "ami-cc347dac";
-  "16.09".us-west-2.hvm-ebs = "ami-49fe2729";
-  "16.09".us-west-2.hvm-s3 = "ami-93fc25f3";
-  "16.09".us-west-2.pv-ebs = "ami-14fe2774";
-  "16.09".us-west-2.pv-s3 = "ami-74f12814";
+  # 16.09.1508.3909827
+  "16.09".ap-northeast-1.hvm-ebs = "ami-68453b0f";
+  "16.09".ap-northeast-1.hvm-s3 = "ami-f9bec09e";
+  "16.09".ap-northeast-1.pv-ebs = "ami-254a3442";
+  "16.09".ap-northeast-1.pv-s3 = "ami-ef473988";
+  "16.09".ap-northeast-2.hvm-ebs = "ami-18ae7f76";
+  "16.09".ap-northeast-2.hvm-s3 = "ami-9eac7df0";
+  "16.09".ap-northeast-2.pv-ebs = "ami-57aa7b39";
+  "16.09".ap-northeast-2.pv-s3 = "ami-5cae7f32";
+  "16.09".ap-south-1.hvm-ebs = "ami-b3f98fdc";
+  "16.09".ap-south-1.hvm-s3 = "ami-98e690f7";
+  "16.09".ap-south-1.pv-ebs = "ami-aef98fc1";
+  "16.09".ap-south-1.pv-s3 = "ami-caf88ea5";
+  "16.09".ap-southeast-1.hvm-ebs = "ami-80fb51e3";
+  "16.09".ap-southeast-1.hvm-s3 = "ami-2df3594e";
+  "16.09".ap-southeast-1.pv-ebs = "ami-37f05a54";
+  "16.09".ap-southeast-1.pv-s3 = "ami-27f35944";
+  "16.09".ap-southeast-2.hvm-ebs = "ami-57ece834";
+  "16.09".ap-southeast-2.hvm-s3 = "ami-87f4f0e4";
+  "16.09".ap-southeast-2.pv-ebs = "ami-d8ede9bb";
+  "16.09".ap-southeast-2.pv-s3 = "ami-a6ebefc5";
+  "16.09".eu-central-1.hvm-ebs = "ami-1b884774";
+  "16.09".eu-central-1.hvm-s3 = "ami-b08c43df";
+  "16.09".eu-central-1.pv-ebs = "ami-888946e7";
+  "16.09".eu-central-1.pv-s3 = "ami-06874869";
+  "16.09".eu-west-1.hvm-ebs = "ami-1ed3e76d";
+  "16.09".eu-west-1.hvm-s3 = "ami-73d1e500";
+  "16.09".eu-west-1.pv-ebs = "ami-44c0f437";
+  "16.09".eu-west-1.pv-s3 = "ami-f3d8ec80";
+  "16.09".eu-west-2.hvm-ebs = "ami-2c9c9648";
+  "16.09".eu-west-2.hvm-s3 = "ami-6b9e940f";
+  "16.09".eu-west-2.pv-ebs = "ami-f1999395";
+  "16.09".eu-west-2.pv-s3 = "ami-bb9f95df";
+  "16.09".sa-east-1.hvm-ebs = "ami-a11882cd";
+  "16.09".sa-east-1.hvm-s3 = "ami-7726bc1b";
+  "16.09".sa-east-1.pv-ebs = "ami-9725bffb";
+  "16.09".sa-east-1.pv-s3 = "ami-b027bddc";
+  "16.09".us-east-1.hvm-ebs = "ami-854ca593";
+  "16.09".us-east-1.hvm-s3 = "ami-2241a834";
+  "16.09".us-east-1.pv-ebs = "ami-a441a8b2";
+  "16.09".us-east-1.pv-s3 = "ami-e841a8fe";
+  "16.09".us-east-2.hvm-ebs = "ami-3f41645a";
+  "16.09".us-east-2.hvm-s3 = "ami-804065e5";
+  "16.09".us-east-2.pv-ebs = "ami-f1466394";
+  "16.09".us-east-2.pv-s3 = "ami-05426760";
+  "16.09".us-west-1.hvm-ebs = "ami-c2efbca2";
+  "16.09".us-west-1.hvm-s3 = "ami-d71042b7";
+  "16.09".us-west-1.pv-ebs = "ami-04e8bb64";
+  "16.09".us-west-1.pv-s3 = "ami-31e9ba51";
+  "16.09".us-west-2.hvm-ebs = "ami-6449f504";
+  "16.09".us-west-2.hvm-s3 = "ami-344af654";
+  "16.09".us-west-2.pv-ebs = "ami-6d4af60d";
+  "16.09".us-west-2.pv-s3 = "ami-de48f4be";
 
   latest = self."16.09";
 }; in self

From 8abce1dbfbd24390bed22de518a83686f0b4c1ae Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Wed, 18 Jan 2017 14:35:27 +0100
Subject: [PATCH 314/727] munin: 2.0.25 -> 2.0.29

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

diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index e3da9dfa75f..25ff8ed25fc 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.25";
+  version = "2.0.29";
   name = "munin-${version}";
 
   src = fetchurl {
     url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz";
-    sha256 = "1ig67l3p5fnx44fcvbbinajxlin9i7g9cbac93h2hcvb2qhzzzra";
+    sha256 = "1zpv0p10iyx49z1hsqvlkk6hh46hp9dhbrdyx103hgx7p3xnxfnv";
   };
 
   buildInputs = [ 

From 8e5e365265acac552cf322c755b349a90db120d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 18 Jan 2017 15:12:19 +0100
Subject: [PATCH 315/727] libtasn1: 4.9 -> 4.10

The fixes in NEWS seem like having a possible security impact.
---
 pkgs/development/libraries/libtasn1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 5ecbcc63a95..34727c1e5f6 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-4.9";
+  name = "libtasn1-4.10";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "0869cp6jx7cajgv6cnddsh3vc7bimmdkdjn80y1jpb4iss7plvsg";
+    sha256 = "681a4d9a0d259f2125713f2e5766c5809f151b3a1392fd91390f780b4b8f5a02";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From 6ced9ee7a49081d3019dfa10ae49af83a12d038f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 18 Jan 2017 16:18:25 +0200
Subject: [PATCH 316/727] fsmon: init at 1.4

---
 pkgs/tools/misc/fsmon/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/misc/fsmon/default.nix

diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix
new file mode 100644
index 00000000000..d3a1a712466
--- /dev/null
+++ b/pkgs/tools/misc/fsmon/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "fsmon-${version}";
+  version = "1.4";
+
+  src = fetchFromGitHub {
+    owner = "nowsecure";
+    repo = "fsmon";
+    rev = "${version}";
+    sha256 = "0sqld41jn142d4zbqmylzrnx1km7xs6r8dnmf453gyhi3yzdbr1j";
+  };
+
+  installPhase = ''
+    make install PREFIX=$out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "FileSystem Monitor utility";
+    homepage = https://github.com/nowsecure/fsmon;
+    license = licenses.mit;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c148094f31..b4de9685154 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -862,6 +862,8 @@ in
 
   filebench = callPackage ../tools/misc/filebench { };
 
+  fsmon = callPackage ../tools/misc/fsmon { };
+
   fop = callPackage ../tools/typesetting/fop { };
 
   fondu = callPackage ../tools/misc/fondu { };

From 04e479003357c7b3053a74da16fea7211530c234 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 18 Jan 2017 14:11:45 +0100
Subject: [PATCH 317/727] pythonPackages.case: init at 1.5.2

---
 pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ac5bac79f97..aa278bfccf0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3476,6 +3476,25 @@ in {
     meta.maintainers = with maintainers; [ garbas ];
   };
 
+  case = buildPythonPackage rec {
+    name = "case-${version}";
+    version = "1.5.2";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/c/case/${name}.tar.gz";
+      sha256 = "1zbhbw87izcxj9rvqg432a7r69ps2ks20mqq3g3hgd42sckcy3ca";
+    };
+
+    propagatedBuildInputs = with self; [ six nose unittest2 mock ];
+
+    meta = {
+      homepage = https://github.com/celery/case;
+      description = "unittests utilities";
+      license = licenses.bsd3;
+    };
+
+  };
+
   cassandra-driver = buildPythonPackage rec {
     name = "cassandra-driver-3.6.0";
 

From ece1154382bbe4d3bd51e60f09aa85e00057b4f3 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 18 Jan 2017 14:18:42 +0100
Subject: [PATCH 318/727] pythonPackages.vine: init at 1.1.3

---
 pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aa278bfccf0..cf33d0c1d35 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31911,6 +31911,26 @@ EOF
 
   urlscan = callPackage ../applications/misc/urlscan { };
 
+  vine = buildPythonPackage rec {
+    name = "vine-${version}";
+    version = "1.1.3";
+
+    disable = pythonOlder "2.7";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/v/vine/${name}.tar.gz";
+      sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7";
+    };
+
+    buildInputs = with self; [ case pytest_30 ];
+
+    meta = {
+      homepage = https://github.com/celery/vine;
+      description = "python promises";
+      license = licenses.bsd3;
+    };
+  };
+
   wp_export_parser = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "wp_export_parser";

From b8acb928ccca8d1fdf6de996a8dd41ced0d7bad6 Mon Sep 17 00:00:00 2001
From: "Andrew R. M" <andrewmiller237@gmail.com>
Date: Wed, 18 Jan 2017 09:32:59 -0500
Subject: [PATCH 319/727] hy: init at 0.11.1

This is the hy language, a dialect of lisp designed to be closely
intergrated with python.
---
 lib/maintainers.nix                          |  1 +
 pkgs/development/interpreters/hy/default.nix | 22 ++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 pkgs/top-level/python-packages.nix           | 36 ++++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/interpreters/hy/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4cbedd7be03..a58e6aa7539 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -329,6 +329,7 @@
   nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>";
   nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
   NikolaMandic = "Ratko Mladic <nikola@mandic.email>";
+  nixy = "Andrew R. M. <andrewmiller237@gmail.com>";
   notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
   nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix
new file mode 100644
index 00000000000..ee6ac6d39e5
--- /dev/null
+++ b/pkgs/development/interpreters/hy/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "hy-${version}";
+  version = "0.11.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/h/hy/${name}.tar.gz";
+    sha256 = "1msqv747iz12r73mz4qvsmlwkddwjvrahlrk7ysrcz07h7dsscxs";
+  };
+
+  buildInputs = [ pythonPackages.appdirs ];
+  propagatedBuildInputs = [ pythonPackages.clint pythonPackages.astor pythonPackages.rply ];
+
+  meta = {
+    description = "A LISP dialect embedded in Python";
+    homepage = http://hylang.org/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = stdenv.lib.maintainers.nixy; 
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c247b5dddf..73a249e169c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17923,4 +17923,6 @@ in
   fpm2 = callPackage ../tools/security/fpm2 { };
 
   simplenote = callPackage ../applications/misc/simplenote { };
+
+  hy = callPackage ../development/interpreters/hy {};
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0141729e30..e5840effca3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1064,6 +1064,23 @@ in {
     };
   };
 
+  astor = buildPythonPackage rec {
+    name = "astor-${version}";
+    version = "0.5";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/a/astor/${name}.tar.gz";
+      sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa";
+    };
+
+    meta = with pkgs.stdenv.lib; {
+      descriptions = "Library for reading, writing and rewriting python AST";
+      homepage = https://github.com/berkerpeksag/astor;
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ nixy ];
+    };
+  };
+
   asyncio = if (pythonAtLeast "3.3") then buildPythonPackage rec {
     name = "asyncio-${version}";
     version = "3.4.3";
@@ -22797,6 +22814,25 @@ in {
 
   });
 
+  rply = buildPythonPackage rec {
+    name = "rply-${version}";
+    version = "0.7.4";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/r/rply/${name}.tar.gz";
+      sha256 = "12rp1d9ba7nvd5rhaxi6xzx1rm67r1k1ylsrkzhpwnphqpb06cvj";
+    };
+
+    buildInputs = with self; [ appdirs ];
+
+    meta = with pkgs.stdenv.lib; {
+      descriptions = "A python Lex/Yacc that works with RPython";
+      homepage = https://github.com/alex/rply;
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ nixy ];
+    };
+  };
+
   rpm = (pkgs.rpm.override{inherit python;});
 
   rpy2 = buildPythonPackage rec {

From 68c95309980d6e6e1dc315628de55844f8b02ca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 18 Jan 2017 15:50:58 +0100
Subject: [PATCH 320/727] libtiff: apply security patches from Debian

/cc #21967.
---
 pkgs/development/libraries/libtiff/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 49fddd06c17..c6705703149 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -11,6 +11,17 @@ stdenv.mkDerivation rec {
     sha256 = "06ghqhr4db1ssq0acyyz49gr8k41gzw6pqb6mbn5r7jqp77s4hwz";
   };
 
+  prePatch =let
+      # https://lwn.net/Vulnerabilities/711777/
+      debian = fetchurl {
+        url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.7-5.debian.tar.xz;
+        sha256 = "1ribxdn89wx3nllcyh7ql3dx6wpr1h7z3waglz1w7dklxm43q67l";
+      };
+    in ''
+      tar xf '${debian}'
+      patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')"
+    '';
+
   outputs = [ "bin" "dev" "out" "doc" ];
 
   nativeBuildInputs = [ pkgconfig ];

From ce0e16f5ea0285bfb4c8a0bdf795e53684289d5d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Jan 2017 15:49:34 +0100
Subject: [PATCH 321/727] libupnp: 1.6.20 -> 1.6.21

Fixes CVE-2016-8863, CVE-2016-6255

cc @grahamc
---
 pkgs/development/libraries/pupnp/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index 389e575dbb1..fd738faf507 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -1,28 +1,20 @@
-{ fetchFromGitHub, stdenv, autoconf, automake, libtool }:
+{ fetchFromGitHub, stdenv, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libupnp-${version}";
-  version = "1.6.20";
+  version = "1.6.21";
 
   src = fetchFromGitHub {
     owner = "mrjimenez";
     repo = "pupnp";
     rev = "release-${version}";
-    sha256 = "10583dkz1l5sjp2833smql8w428x2nbh1fni8j6h9rji6ma2yhs0";
+    sha256 = "07ksfhadinaa20542gblrxi9pqz0v6y70a836hp3qr4037id4nm9";
   };
 
-  buildInputs = [
-    autoconf
-    automake
-    libtool
-  ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   hardeningDisable = [ "fortify" ];
 
-  preConfigure = ''
-    ./bootstrap
-  '';
-
   meta = {
     description = "libupnp, an open source UPnP development kit for Linux";
 

From 0dc43ab9d68e37bdabe9dafaab12d2ccd5f49720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 18 Jan 2017 16:06:07 +0100
Subject: [PATCH 322/727] virt-manager: fixup evaluation to unbreak Hydra

The package itself is probably still broken.  /cc @fridh e94d9cdfaaa
---
 pkgs/applications/virtualization/virt-manager/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index c779cf43967..bd003df57f8 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -21,7 +21,7 @@ buildPythonApplication rec {
     [ eventlet greenlet gflags netaddr carrot routes
       PasteDeploy m2crypto ipy twisted
       distutils_extra simplejson glanceclient cheetah lockfile httplib2
-      urlgrabber virtinst pyGtkGlade dbus-python gnome_python pygobject3
+      urlgrabber virtinst pyGtkGlade dbus-python /*gnome_python FIXME*/ pygobject3
       libvirt libxml2 ipaddr vte libosinfo gobjectIntrospection gtk3 mox
       gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme
       wrapGAppsHook

From 59e0cfb589d3fb3d2697f26c269bc1ea0324d44b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 18 Jan 2017 16:45:52 +0100
Subject: [PATCH 323/727] gperf: bring back 3.0.4 to fix systemd build

Systemd has fixed this on master, but I don't want to meddle with the
patch that doesn't apply cleanly on our version.
---
 pkgs/development/tools/misc/gperf/3.0.x.nix | 33 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/tools/misc/gperf/3.0.x.nix

diff --git a/pkgs/development/tools/misc/gperf/3.0.x.nix b/pkgs/development/tools/misc/gperf/3.0.x.nix
new file mode 100644
index 00000000000..bfada264d50
--- /dev/null
+++ b/pkgs/development/tools/misc/gperf/3.0.x.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "gperf-3.0.4";
+
+  src = fetchurl {
+    url = "mirror://gnu/gperf/${name}.tar.gz";
+    sha256 = "0gnnm8iqcl52m8iha3sxrzrl9mcyhg7lfrhhqgdn4zj00ji14wbn";
+  };
+
+  meta = {
+    description = "Perfect hash function generator";
+
+    longDescription = ''
+      GNU gperf is a perfect hash function generator.  For a given
+      list of strings, it produces a hash function and hash table, in
+      form of C or C++ code, for looking up a value depending on the
+      input string.  The hash function is perfect, which means that
+      the hash table has no collisions, and the hash table lookup
+      needs a single string comparison only.
+
+      GNU gperf is highly customizable.  There are options for
+      generating C or C++ code, for emitting switch statements or
+      nested ifs instead of a hash table, and for tuning the algorithm
+      employed by gperf.
+    '';
+
+    license = stdenv.lib.licenses.gpl3Plus;
+
+    homepage = http://www.gnu.org/software/gperf/;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1bbb22e06f..f209201eb2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6354,6 +6354,7 @@ in
   gradle_2_5 = self.gradleGen.gradle_2_5;
 
   gperf = callPackage ../development/tools/misc/gperf { };
+  gperf_3_0 = callPackage ../development/tools/misc/gperf/3.0.x.nix { };
 
   grail = callPackage ../development/libraries/grail { };
 
@@ -11723,6 +11724,7 @@ in
 
   systemd = callPackage ../os-specific/linux/systemd {
     utillinux = utillinuxMinimal; # break the cyclic dependency
+    gperf = gperf_3_0; # fix build until v233
   }
     // {
       udev.bin = systemd;     # ${systemd.udev.bin}/bin/udevadm

From a272ca2c2efd89027072b346d81da9fef1eb9963 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 18 Jan 2017 14:19:22 +0100
Subject: [PATCH 324/727] pythonPackages.amqp: 1.4.9 -> 2.1.4

---
 pkgs/top-level/python-packages.nix | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf33d0c1d35..70ce93f663c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -864,8 +864,7 @@ in {
     };
   };
 
-
-  amqp = buildPythonPackage rec {
+  amqp_1 = buildPythonPackage rec {
     name = "amqp-${version}";
     version = "1.4.9";
     disabled = pythonOlder "2.6";
@@ -884,6 +883,26 @@ in {
     };
   };
 
+  amqp = buildPythonPackage rec {
+    name = "amqp-${version}";
+    version = "2.1.4";
+    disabled = pythonOlder "2.6";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/a/amqp/${name}.tar.gz";
+      sha256 = "1ybywzkd840v1qvb1p2bs08js260vq1jscjg8182hv7bmwacqy0k";
+    };
+
+    buildInputs = with self; [ pytest_30 case ];
+    propagatedBuildInputs = with self; [ vine ];
+
+    meta = {
+      homepage = http://github.com/celery/py-amqp;
+      description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project";
+      license = licenses.lgpl21;
+    };
+  };
+
 
   amqplib = buildPythonPackage rec {
     name = "amqplib-0.6.1";
@@ -3556,7 +3575,7 @@ in {
     };
 
     buildInputs = with self; [ mock nose unittest2 ];
-    propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp ];
+    propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp_1 ];
 
     checkPhase = ''
       nosetests $out/${python.sitePackages}/celery/tests/
@@ -13614,7 +13633,7 @@ in {
     # most of these are simply to allow the test suite to do its job
     buildInputs = with self; optionals isPy27 [ mock unittest2 nose redis qpid-python pymongo sqlalchemy pyyaml msgpack boto ];
 
-    propagatedBuildInputs = with self; [ amqp anyjson ] ++
+    propagatedBuildInputs = with self; [ amqp_1 anyjson ] ++
       (optionals (pythonOlder "2.7") [ importlib ordereddict ]);
 
     # tests broken on python 2.6? https://github.com/nose-devs/nose/issues/806

From 0be9f1b3e511dd43c3ed75ad0e31bbac9b5e71e3 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 18 Jan 2017 14:19:52 +0100
Subject: [PATCH 325/727] pythonPackages.billiard: 3.3.0.23 -> 3.5.0.2

---
 pkgs/top-level/python-packages.nix | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 70ce93f663c..818adea68e3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2668,8 +2668,7 @@ in {
     };
   };
 
-
-  billiard = buildPythonPackage rec {
+  billiard_33 = buildPythonPackage rec {
     name = "billiard-${version}";
     version = "3.3.0.23";
 
@@ -2689,6 +2688,26 @@ in {
     };
   };
 
+  billiard = buildPythonPackage rec {
+    name = "billiard-${version}";
+    version = "3.5.0.2";
+
+    disabled = isPyPy;
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/b/billiard/${name}.tar.gz";
+      sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y";
+    };
+
+    buildInputs = with self; [ pytest_30 case ];
+
+    meta = {
+      homepage = https://github.com/celery/billiard;
+      description = "Python multiprocessing fork with improvements and bugfixes";
+      license = licenses.bsd3;
+    };
+  };
+
 
   binaryornot = buildPythonPackage rec {
     name = "binaryornot-${version}";
@@ -3575,7 +3594,7 @@ in {
     };
 
     buildInputs = with self; [ mock nose unittest2 ];
-    propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp_1 ];
+    propagatedBuildInputs = with self; [ kombu billiard_33 pytz anyjson amqp_1 ];
 
     checkPhase = ''
       nosetests $out/${python.sitePackages}/celery/tests/

From 67a8210d6ad04ecdf3ffc355bac6695b0463d2c6 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 18 Jan 2017 14:20:19 +0100
Subject: [PATCH 326/727] pythonPackages.kombu: 3.0.35 -> 4.0.2

---
 pkgs/top-level/python-packages.nix | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 818adea68e3..34a6b732ed2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3594,7 +3594,7 @@ in {
     };
 
     buildInputs = with self; [ mock nose unittest2 ];
-    propagatedBuildInputs = with self; [ kombu billiard_33 pytz anyjson amqp_1 ];
+    propagatedBuildInputs = with self; [ kombu_3 billiard_33 pytz anyjson amqp_1 ];
 
     checkPhase = ''
       nosetests $out/${python.sitePackages}/celery/tests/
@@ -13638,7 +13638,7 @@ in {
 
   koji = callPackage ../development/python-modules/koji { };
 
-  kombu = buildPythonPackage rec {
+  kombu_3 = buildPythonPackage rec {
     name = "kombu-${version}";
     version = "3.0.35";
 
@@ -13665,6 +13665,26 @@ in {
     };
   };
 
+  kombu = buildPythonPackage rec {
+    name = "kombu-${version}";
+    version = "4.0.2";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/k/kombu/${name}.tar.gz";
+      sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h";
+    };
+
+    buildInputs = with self; [ pytest_30 case pytz ];
+
+    propagatedBuildInputs = with self; [ amqp ];
+
+    meta = {
+      description = "Messaging library for Python";
+      homepage    = "http://github.com/celery/kombu";
+      license     = licenses.bsd3;
+    };
+  };
+
   konfig = buildPythonPackage rec {
     name = "konfig-${version}";
     version = "0.9";
@@ -17015,7 +17035,7 @@ in {
 
     propagatedBuildInputs = with self; [
       pbr oslo-config oslo-context oslo-log oslo-utils oslo-serialization
-      oslo-i18n stevedore six eventlet greenlet webob pyyaml kombu trollius
+      oslo-i18n stevedore six eventlet greenlet webob pyyaml kombu_3 trollius
       aioeventlet cachetools oslo-middleware futurist redis oslo-service
       eventlet pyzmq
     ];

From cdf3b50917382cd6b54f35a7ade053064fcc38d1 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 18 Jan 2017 14:23:25 +0100
Subject: [PATCH 327/727] pythonPackages.celery: 3.1.23 -> 4.0.2

---
 pkgs/top-level/python-packages.nix | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 34a6b732ed2..5e5be3019fc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3581,8 +3581,7 @@ in {
     };
   };
 
-
-  celery = buildPythonPackage rec {
+  celery_3 = buildPythonPackage rec {
     name = "celery-${version}";
     version = "3.1.23";
 
@@ -3607,6 +3606,25 @@ in {
     };
   };
 
+  celery = buildPythonPackage rec {
+    name = "celery-${version}";
+    version = "4.0.2";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/c/celery/${name}.tar.gz";
+      sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3";
+    };
+
+    buildInputs = with self; [ pytest_30 case ];
+    propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ];
+
+    meta = {
+      homepage = https://github.com/celery/celery/;
+      description = "Distributed task queue";
+      license = licenses.bsd3;
+    };
+  };
+
   cerberus = buildPythonPackage rec {
     name = "Cerberus-${version}";
     version = "0.9.2";
@@ -10577,7 +10595,7 @@ in {
     };
 
     propagatedBuildInputs = with self ; [ numpy django_colorful pillow psycopg2
-                                          pyparsing django celery ];
+                                          pyparsing django celery_3 ];
 
     meta = {
       description = "Basic raster data integration for Django";

From c71087b345096232564f46810f061482b480ccd2 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 18 Jan 2017 14:23:44 +0100
Subject: [PATCH 328/727] pythonPackages.pytest_30: 3.0.4 -> 3.0.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e5be3019fc..c2eb404049c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5042,12 +5042,12 @@ in {
   };
 
   pytest_30 = self.pytest_27.override rec {
-    name = "pytest-3.0.4";
+    name = "pytest-3.0.5";
 
     propagatedBuildInputs = with self; [ hypothesis py ];
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pytest/${name}.tar.gz";
-      sha256 = "03d49xc0l4sdncq47rn1p42ywjnxqrvpc160y8dwvanv3wnfx7w7";
+      sha256 = "1z9pj39w0r2gw5hsqndlmsqa80kgbrann5kfma8ww8zhaslkl02a";
     };
   };
 

From 63d7b206d884a01d19303f91ae33b7a5e1ea18aa Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 18 Jan 2017 16:57:19 +0100
Subject: [PATCH 329/727] flightgear, simgear: 2016.4.3 -> 2016.4.4

---
 pkgs/development/libraries/simgear/default.nix | 4 ++--
 pkgs/games/flightgear/default.nix              | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index aef1a1dc822..b5c94678146 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation rec {
   name = "simgear-${version}";
-  version = "2016.4.3";
+  version = "2016.4.4";
   shortVersion = "2016.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
-    sha256 = "1gfj0d03jbi0p08baj46ihhyzbgpymmipw2dp11j13412l15acv9";
+    sha256 = "1p615wmh744m01mcqik27ah1wjdf3sj7vard1vfdpz5v0q0gs52m";
   };
 
   buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index 1a1b3a10895..2d7f5566c5d 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -6,14 +6,14 @@
 }:
 
 let
-  version = "2016.4.3";
+  version = "2016.4.4";
   shortVersion = "2016.4";
   data = stdenv.mkDerivation rec {
     name = "flightgear-base-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
-      sha256 = "1wy4fg6r79a635rrjy2a2a6jkz2p5zzahxs0hz7scgxg4ikb5xp4";
+      sha256 = "0s4nlkwi9jfc408agsl0w5xl3vajrvplc66k3nwg92wsr614pz9x";
     };
 
     phases = [ "installPhase" ];
@@ -26,11 +26,12 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flightgear-${version}";
-  inherit version;
+   # inheriting data for `nix-prefetch-url -A pkgs.flightgear.data.src`
+  inherit version data;
 
   src = fetchurl {
     url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
-    sha256 = "08i8dlia3aral2wwf72n5q5ji4vxj51bnn24g6prqjjy4qww9a9m";
+    sha256 = "1z7s9m2g85g8q9zxawhpal84rq2jin1ppchshbwi460gwk5r46fm";
   };
 
   # Of all the files in the source and data archives, there doesn't seem to be

From f715d3fd2c265945a77df8d9912fa57d2099bb45 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 18 Jan 2017 13:38:57 +0100
Subject: [PATCH 330/727] pythonPackages.channels: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ac5bac79f97..2f59ae16639 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2321,11 +2321,11 @@ in {
 
   channels = buildPythonPackage rec {
     name = "channels-${version}";
-    version = "1.0.1";
+    version = "1.0.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/channels/${name}.tar.gz";
-      sha256 = "0m55qzifg47s0zndnh3w7fnpd3skcbkq3lv8m87xgmcrczl7x5mf";
+      sha256 = "0d8fywg416p851i8vz26pmz8b47akg5z10yw7xc7i51cpmp7y5zj";
     };
 
     # Files are missing in the distribution

From 460b43dbfe8f21253637be350eb1ef1d586eaf5e Mon Sep 17 00:00:00 2001
From: Michael Weiss <primeos@users.noreply.github.com>
Date: Wed, 18 Jan 2017 17:18:11 +0100
Subject: [PATCH 331/727] firewall: Improve the comments (documentation)
 (#21862)

* Fix the FW names

FW_REFUSE was removed and nixos-fw-input was renamed to nixos-fw.

* Update the comment (documentation) at the top

Order the chains of the main table alphabetically (like in the rest of
the file) and add nixos-fw-rpfilter (from the raw table) and nixos-drop
(used while reloading the firewall).

* Refactor the module (mainly comments)

- Move some attributes to the top for better visibility (that should
  hopefully make it easier to read and understand this module without
  jumping around too much).
- Add some missing examples and improve some descriptions.
- Reorder the mkOption attributes for consistency.
- Wrap lines at 72 characters.
- Use two spaces between sentences.
---
 .../modules/services/networking/firewall.nix  | 102 +++++++++++-------
 1 file changed, 63 insertions(+), 39 deletions(-)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index ea406864fd3..c251b52e03f 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -4,17 +4,29 @@
    ‘networking.firewall.extraCommands’.  For modularity, the firewall
    uses several chains:
 
-   - ‘nixos-fw-input’ is the main chain for input packet processing.
+   - ‘nixos-fw’ is the main chain for input packet processing.
+
+   - ‘nixos-fw-accept’ is called for accepted packets.  If you want
+     additional logging, or want to reject certain packets anyway, you
+     can insert rules at the start of this chain.
 
    - ‘nixos-fw-log-refuse’ and ‘nixos-fw-refuse’ are called for
      refused packets.  (The former jumps to the latter after logging
      the packet.)  If you want additional logging, or want to accept
      certain packets anyway, you can insert rules at the start of
-     these chain.
+     this chain.
 
-   - ‘nixos-fw-accept’ is called for accepted packets.  If you want
-     additional logging, or want to reject certain packets anyway, you
-     can insert rules at the start of this chain.
+   - ‘nixos-fw-rpfilter’ is used as the main chain in the raw table,
+     called from the built-in ‘PREROUTING’ chain.  If the kernel
+     supports it and `cfg.checkReversePath` is set this chain will
+     perform a reverse path filter test.
+
+   - ‘nixos-drop’ is used while reloading the firewall in order to drop
+     all traffic.  Since reloading isn't implemented in an atomic way
+     this'll prevent any traffic from leaking through while reloading
+     the firewall.  However, if the reloading fails, the ‘firewall-stop’
+     script will be called which in return will effectively disable the
+     complete firewall (in the default configuration).
 
 */
 
@@ -26,6 +38,11 @@ let
 
   cfg = config.networking.firewall;
 
+  kernelPackages = config.boot.kernelPackages;
+
+  kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false;
+  kernelCanDisableHelpers = kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers or false;
+
   helpers =
     ''
       # Helper command to manipulate both the IPv4 and IPv6 tables.
@@ -49,7 +66,7 @@ let
     # firewall would be atomic.  Apparently that's possible
     # with iptables-restore.
     ip46tables -D INPUT -j nixos-fw 2> /dev/null || true
-    for chain in nixos-fw nixos-fw-accept nixos-fw-log-refuse nixos-fw-refuse FW_REFUSE; do
+    for chain in nixos-fw nixos-fw-accept nixos-fw-log-refuse nixos-fw-refuse; do
       ip46tables -F "$chain" 2> /dev/null || true
       ip46tables -X "$chain" 2> /dev/null || true
     done
@@ -231,11 +248,6 @@ let
     fi
   '';
 
-  kernelPackages = config.boot.kernelPackages;
-
-  kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false;
-  kernelCanDisableHelpers = kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers or false;
-
 in
 
 {
@@ -293,26 +305,30 @@ in
       default = false;
       description =
         ''
-          If set, forbidden packets are rejected rather than dropped
+          If set, refused packets are rejected rather than dropped
           (ignored).  This means that an ICMP "port unreachable" error
-          message is sent back to the client.  Rejecting packets makes
+          message is sent back to the client (or a TCP RST packet in
+          case of an existing connection).  Rejecting packets makes
           port scanning somewhat easier.
         '';
     };
 
     networking.firewall.trustedInterfaces = mkOption {
       type = types.listOf types.str;
+      default = [ ];
+      example = [ "enp0s2" ];
       description =
         ''
           Traffic coming in from these interfaces will be accepted
-          unconditionally.
+          unconditionally.  Traffic from the loopback (lo) interface
+          will always be accepted.
         '';
     };
 
     networking.firewall.allowedTCPPorts = mkOption {
-      default = [];
-      example = [ 22 80 ];
       type = types.listOf types.int;
+      default = [ ];
+      example = [ 22 80 ];
       description =
         ''
           List of TCP ports on which incoming connections are
@@ -321,9 +337,9 @@ in
     };
 
     networking.firewall.allowedTCPPortRanges = mkOption {
-      default = [];
-      example = [ { from = 8999; to = 9003; } ];
       type = types.listOf (types.attrsOf types.int);
+      default = [ ];
+      example = [ { from = 8999; to = 9003; } ];
       description =
         ''
           A range of TCP ports on which incoming connections are
@@ -332,9 +348,9 @@ in
     };
 
     networking.firewall.allowedUDPPorts = mkOption {
-      default = [];
-      example = [ 53 ];
       type = types.listOf types.int;
+      default = [ ];
+      example = [ 53 ];
       description =
         ''
           List of open UDP ports.
@@ -342,9 +358,9 @@ in
     };
 
     networking.firewall.allowedUDPPortRanges = mkOption {
-      default = [];
-      example = [ { from = 60000; to = 61000; } ];
       type = types.listOf (types.attrsOf types.int);
+      default = [ ];
+      example = [ { from = 60000; to = 61000; } ];
       description =
         ''
           Range of open UDP ports.
@@ -352,8 +368,8 @@ in
     };
 
     networking.firewall.allowPing = mkOption {
-      default = true;
       type = types.bool;
+      default = true;
       description =
         ''
           Whether to respond to incoming ICMPv4 echo requests
@@ -364,36 +380,43 @@ in
     };
 
     networking.firewall.pingLimit = mkOption {
-      default = null;
       type = types.nullOr (types.separatedString " ");
+      default = null;
+      example = "--limit 1/minute --limit-burst 5";
       description =
         ''
           If pings are allowed, this allows setting rate limits
-          on them. If non-null, this option should be in the form
-          of flags like "--limit 1/minute --limit-burst 5"
+          on them.  If non-null, this option should be in the form of
+          flags like "--limit 1/minute --limit-burst 5"
         '';
     };
 
     networking.firewall.checkReversePath = mkOption {
-      default = kernelHasRPFilter;
       type = types.either types.bool (types.enum ["strict" "loose"]);
+      default = kernelHasRPFilter;
+      example = "loose";
       description =
         ''
-          Performs a reverse path filter test on a packet.
-          If a reply to the packet would not be sent via the same interface
-          that the packet arrived on, it is refused.
+          Performs a reverse path filter test on a packet.  If a reply
+          to the packet would not be sent via the same interface that
+          the packet arrived on, it is refused.
 
-          If using asymmetric routing or other complicated routing,
-          set this option to loose mode or disable it and setup your
-          own counter-measures.
+          If using asymmetric routing or other complicated routing, set
+          this option to loose mode or disable it and setup your own
+          counter-measures.
+
+          This option can be either true (or "strict"), "loose" (only
+          drop the packet if the source address is not reachable via any
+          interface) or false.  Defaults to the value of
+          kernelHasRPFilter.
 
           (needs kernel 3.3+)
         '';
     };
 
     networking.firewall.logReversePathDrops = mkOption {
-      default = false;
       type = types.bool;
+      default = false;
       description =
         ''
           Logs dropped packets failing the reverse path filter test if
@@ -402,9 +425,9 @@ in
     };
 
     networking.firewall.connectionTrackingModules = mkOption {
+      type = types.listOf types.str;
       default = [ "ftp" ];
       example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ];
-      type = types.listOf types.str;
       description =
         ''
           List of connection-tracking helpers that are auto-loaded.
@@ -415,14 +438,14 @@ in
           networking.firewall.autoLoadConntrackHelpers
 
           Loading of helpers is recommended to be done through the new
-          CT target. More info:
+          CT target.  More info:
           https://home.regit.org/netfilter-en/secure-use-of-helpers/
         '';
     };
 
     networking.firewall.autoLoadConntrackHelpers = mkOption {
-      default = true;
       type = types.bool;
+      default = true;
       description =
         ''
           Whether to auto-load connection-tracking helpers.
@@ -464,7 +487,8 @@ in
         ''
           Additional shell commands executed as part of the firewall
           shutdown script.  These are executed just after the removal
-          of the nixos input rule, or if the service enters a failed state.
+          of the NixOS input rule, or if the service enters a failed
+          state.
         '';
     };
 
@@ -502,7 +526,7 @@ in
       path = [ pkgs.iptables ] ++ cfg.extraPackages;
 
       # FIXME: this module may also try to load kernel modules, but
-      # containers don't have CAP_SYS_MODULE. So the host system had
+      # containers don't have CAP_SYS_MODULE.  So the host system had
       # better have all necessary modules already loaded.
       unitConfig.ConditionCapability = "CAP_NET_ADMIN";
       unitConfig.DefaultDependencies = false;

From f4f4200d9ad497efaf4366cfb95112aee20cc32e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Jan 2017 17:54:42 +0100
Subject: [PATCH 332/727] install-devices: add vim

This moves vim to the install-device profile to add vim to netboot, too.

Fixes #20013 (see discussion there for further information)
---
 nixos/modules/installer/cd-dvd/installation-cd-minimal.nix | 5 -----
 nixos/modules/profiles/installation-device.nix             | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
index f4122ab0e51..7ec55f159d0 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -7,9 +7,4 @@
   imports =
     [ ./installation-cd-base.nix
     ];
-
-  environment.systemPackages =
-    [
-      pkgs.vim
-    ];
 }
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 7949e600f86..b2973d88b15 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -76,5 +76,6 @@ with lib;
     boot.consoleLogLevel = mkDefault 7;
     networking.firewall.logRefusedConnections = mkDefault false;
 
+    environment.systemPackages = [ pkgs.vim ];
   };
 }

From 1f6ca0f37b93efde3fff877799a8f94b11aa545b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 13 Jan 2017 16:19:46 +0100
Subject: [PATCH 333/727] pythonPackages.bcrypt: 3.1.0 -> 3.1.2

---
 pkgs/development/python-modules/bcrypt.nix | 23 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix         | 19 +-----------------
 2 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/bcrypt.nix

diff --git a/pkgs/development/python-modules/bcrypt.nix b/pkgs/development/python-modules/bcrypt.nix
new file mode 100644
index 00000000000..94f04880c8e
--- /dev/null
+++ b/pkgs/development/python-modules/bcrypt.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, isPyPy, fetchurl
+, cffi, pycparser, mock, pytest, py }:
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+  name = "bcrypt-${version}";
+  version = "3.1.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/b/bcrypt/${name}.tar.gz";
+    sha256 = "1al54xafv1aharpb22yv5rjjc63fm60z3pn2shbiq48ah9f1fvil";
+  };
+  buildInputs = [ pycparser mock pytest py ];
+  propagatedBuildInputs = optional (!isPyPy) cffi;
+
+  meta = {
+    maintainers = with maintainers; [ domenkozar ];
+    description = "Modern password hashing for your software and your servers";
+    license = licenses.asl20;
+    homepage = https://github.com/pyca/bcrypt/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c971c926619..fcfe8bebadf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4781,24 +4781,7 @@ in {
     };
   };
 
-  bcrypt = buildPythonPackage rec {
-    name = "bcrypt-${version}";
-    version = "3.1.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/b/bcrypt/${name}.tar.gz";
-      sha256 = "e54820d8b9eff357d1003f5b8d4b949a632b76b89610d8a933783fd476033ebe";
-    };
-    buildInputs = with self; [ pycparser mock pytest py ];
-    propagatedBuildInputs = with self; optional (!isPyPy) cffi;
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-      description = "Modern password hashing for your software and your servers";
-      license = licenses.asl20;
-      homepage = https://github.com/pyca/bcrypt/;
-    };
-  };
+  bcrypt = callPackage ../development/python-modules/bcrypt.nix { };
 
   cffi = if isPyPy then null else buildPythonPackage rec {
     name = "cffi-1.9.1";

From 14a65c5ecdaa68ee811a686c9c6ace3bf6710eb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 13 Jan 2017 16:21:37 +0100
Subject: [PATCH 334/727] pythonPackages.ldap: 2.4.19 -> 2.4.22

---
 pkgs/development/python-modules/ldap.nix | 15 +++++++++++++++
 pkgs/top-level/python-packages.nix       | 13 ++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/python-modules/ldap.nix

diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix
new file mode 100644
index 00000000000..95243f52a38
--- /dev/null
+++ b/pkgs/development/python-modules/ldap.nix
@@ -0,0 +1,15 @@
+{ buildPythonPackage, isPy3k, fetchurl
+, openldap, cyrus_sasl, openssl }:
+
+buildPythonPackage rec {
+  name = "ldap-2.4.22";
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz";
+    sha256 = "1dshpq84kl4xpa0hmnjrh6q5h5bybn09r83sa3z3ybr9jlm8gxcy";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl";
+  propagatedBuildInputs = [openldap cyrus_sasl openssl];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fcfe8bebadf..db000770a73 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21164,17 +21164,8 @@ in {
     };
   });
 
-  ldap = buildPythonPackage rec {
-    name = "ldap-2.4.19";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz";
-      sha256 = "0j5hzaar4d0vhnrlpmkczgwm7ci2wibr99a7zx04xddzrhxdpz82";
-    };
-
-    NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl.dev}/include/sasl";
-    propagatedBuildInputs = with self; [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl];
+  ldap = callPackage ../development/python-modules/ldap.nix {
+    inherit (pkgs) openldap cyrus_sasl openssl;
   };
 
   ldap3 = buildPythonPackage rec {

From c6c5ed15ab0e8c9aaa6ce77c2d13cfc6b52aa0d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 13 Jan 2017 16:27:27 +0100
Subject: [PATCH 335/727] pythonPackages.requests_oauthlib: 0.4.1 -> 0.7.0

---
 .../python-modules/requests-oauthlib.nix      | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +----------------
 2 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/requests-oauthlib.nix

diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib.nix
new file mode 100644
index 00000000000..a353ebd39d9
--- /dev/null
+++ b/pkgs/development/python-modules/requests-oauthlib.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchurl
+, oauthlib, requests2 }:
+
+buildPythonPackage rec {
+  version = "0.7.0";
+  name = "requests-oauthlib-${version}";
+
+  src = fetchurl {
+    url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz";
+    sha256 = "0cdn45k7qla0qwha0rm9pk9bcfhghvmqrdsphs73irs2rzk5cp2j";
+  };
+
+  doCheck = false;        # Internet tests fail when building in chroot
+  propagatedBuildInputs = [ oauthlib requests2 ];
+
+  meta = with stdenv.lib; {
+    description = "OAuthlib authentication support for Requests";
+    homepage = https://github.com/requests/requests-oauthlib;
+    maintainers = with maintainers; [ prikhi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index db000770a73..4fab1ec7583 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22095,24 +22095,7 @@ in {
     };
   };
 
-  requests_oauthlib = buildPythonPackage rec {
-    version = "0.4.1";
-    name = "requests-oauthlib-${version}";
-
-    src = pkgs.fetchurl {
-      url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz";
-      sha256 = "0vx252nzq5h9m9brwnw2ph8aj526y26jr2dqcafzzcdx6z4l8vj4";
-    };
-
-    doCheck = false;        # Internet tests fail when building in chroot
-    propagatedBuildInputs = with self; [ oauthlib requests2 ];
-
-    meta = {
-      description = "OAuthlib authentication support for Requests";
-      homepage = https://github.com/requests/requests-oauthlib;
-      maintainers = with maintainers; [ prikhi ];
-    };
-  };
+  requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { };
 
   requests_toolbelt = buildPythonPackage rec {
     version = "0.6.2";

From bbe73c77c1cde3e05097fba9593d485fb38e7f04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 13 Jan 2017 16:20:20 +0100
Subject: [PATCH 336/727] pythonPackages.dulwich: 0.14.0 -> 0.14.1

---
 pkgs/development/python-modules/dulwich.nix | 27 +++++++++++++++++++++
 pkgs/top-level/python-packages.nix          | 26 ++------------------
 2 files changed, 29 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/dulwich.nix

diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich.nix
new file mode 100644
index 00000000000..d482aa14627
--- /dev/null
+++ b/pkgs/development/python-modules/dulwich.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchurl
+, gevent, geventhttpclient, mock, fastimport
+, git, glibcLocales }:
+
+buildPythonPackage rec {
+  name = "dulwich-${version}";
+  version = "0.14.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/d/dulwich/${name}.tar.gz";
+    sha256 = "14xsyxha6qyxxyf0ma3zv1sy31iy22vzwayk519n7a1gwzk4j7vw";
+  };
+
+  LC_ALL = "en_US.UTF-8";
+
+  # Only test dependencies
+  buildInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ];
+
+  doCheck = !stdenv.isDarwin;
+
+  meta = with stdenv.lib; {
+    description = "Simple Python implementation of the Git file formats and protocols";
+    homepage = http://samba.org/~jelmer/dulwich/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ koral ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4fab1ec7583..1d5ccf6c170 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10758,32 +10758,10 @@ in {
     };
   };
 
-
-  dulwich = buildPythonPackage rec {
-    name = "dulwich-${version}";
-    version = "0.12.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/dulwich/${name}.tar.gz";
-      sha256 = "1ihc1bdgxj7i068mhhmkzar56r2vdcj68w0dnsm7aqgcgvrp144g";
-    };
-
-    LC_ALL = "en_US.UTF-8";
-
-    # Only test dependencies
-    buildInputs = with self; [ pkgs.git gevent geventhttpclient pkgs.glibcLocales mock fastimport ];
-
-    doCheck = !stdenv.isDarwin;
-
-    meta = {
-      description = "Simple Python implementation of the Git file formats and protocols";
-      homepage = http://samba.org/~jelmer/dulwich/;
-      license = licenses.gpl2Plus;
-      maintainers = with maintainers; [ koral ];
-    };
+  dulwich = callPackage ../development/python-modules/dulwich.nix {
+    inherit (pkgs) git glibcLocales;
   };
 
-
   hg-git = buildPythonPackage rec {
     name = "hg-git-${version}";
     version = "0.8.5";

From 1f5b7484a3b423fc3de67835edc031bdea44fcea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:08:19 +0100
Subject: [PATCH 337/727] pythonPackages.gunicorn: 19.1.0 -> 19.3.0

---
 pkgs/development/python-modules/gunicorn.nix | 23 ++++++++++++++++++++
 pkgs/top-level/python-packages.nix           | 16 +-------------
 2 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/gunicorn.nix

diff --git a/pkgs/development/python-modules/gunicorn.nix b/pkgs/development/python-modules/gunicorn.nix
new file mode 100644
index 00000000000..026e9df360c
--- /dev/null
+++ b/pkgs/development/python-modules/gunicorn.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchurl
+, pytest, mock, pytestcov, coverage }:
+
+buildPythonPackage rec {
+  name = "gunicorn-19.3.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/g/gunicorn/${name}.tar.gz";
+    sha256 = "12d0jd9y9fyssc28mn8j6nzrck8y05hc946p5h0rmbc25043bj4b";
+  };
+
+  buildInputs = [ pytest mock pytestcov coverage ];
+
+  prePatch = ''
+    substituteInPlace requirements_test.txt --replace "==" ">="
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://pypi.python.org/pypi/gunicorn;
+    description = "WSGI HTTP Server for UNIX";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1d5ccf6c170..639d7dc5bc2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12418,21 +12418,7 @@ in {
     };
   };
 
-  gunicorn = buildPythonPackage rec {
-    name = "gunicorn-19.1.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/gunicorn/${name}.tar.gz";
-      sha256 = "ae1dd6452f62b3470bc9acaf62cb5301545fbb9c697d863a5bfe35097ed7a0b3";
-    };
-
-    buildInputs = with self; [ pytest ];
-
-    meta = {
-      homepage = http://pypi.python.org/pypi/gunicorn;
-      description = "WSGI HTTP Server for UNIX";
-    };
-  };
+  gunicorn = callPackage ../development/python-modules/gunicorn.nix { };
 
   hawkauthlib = buildPythonPackage rec {
     name = "hawkauthlib-${version}";

From 1094e948bfde4deb76221950554e0893bc654490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:09:18 +0100
Subject: [PATCH 338/727] pythonPackages.markdown2: 2.3.0 -> 2.3.1

---
 pkgs/development/python-modules/markdown2.nix | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +------------------
 2 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/markdown2.nix

diff --git a/pkgs/development/python-modules/markdown2.nix b/pkgs/development/python-modules/markdown2.nix
new file mode 100644
index 00000000000..af7511bc9aa
--- /dev/null
+++ b/pkgs/development/python-modules/markdown2.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPythonPackage, fetchurl }:
+
+buildPythonPackage rec {
+  name = "markdown2-${version}";
+  version = "2.3.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/m/markdown2/${name}.zip";
+    sha256 = "03nqcx79r9lr5gp2zpqa1n54hnxqczdq27f2j3aazr3r9rsxsqs4";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A fast and complete Python implementation of Markdown";
+    homepage =  https://github.com/trentm/python-markdown2;
+    license = licenses.mit;
+    maintainers = with maintainers; [ hbunke ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 639d7dc5bc2..4b249d169cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29530,24 +29530,7 @@ EOF
     };
   };
 
-
-  markdown2 = buildPythonPackage rec {
-    name = "markdown2-${version}";
-    version = "2.3.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/markdown2/${name}.zip";
-      sha256 = "073zyx3caqa9zlzxa82k9k2nhhn8c5imqpgp5nwqnh0fgaj9pqn8";
-    };
-    propagatedBuildInputs = with self; [];
-    meta = {
-      description = "A fast and complete Python implementation of Markdown";
-      homepage =  https://github.com/trentm/python-markdown2;
-      license = licenses.mit;
-      maintainers = with maintainers; [ hbunke ];
-    };
-  };
-
+  markdown2 = callPackage ../development/python-modules/markdown2.nix { };
 
   evernote = buildPythonPackage rec {
     name = "evernote-${version}";

From 0b3d711fc4e65c03f197736843250ecb5e1d6452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 13 Jan 2017 23:47:34 +0100
Subject: [PATCH 339/727] pythonPackages.flask_login: enable python3 tests

---
 .../python-modules/flask-login.nix            | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +--------------
 2 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/flask-login.nix

diff --git a/pkgs/development/python-modules/flask-login.nix b/pkgs/development/python-modules/flask-login.nix
new file mode 100644
index 00000000000..0149e29bcf7
--- /dev/null
+++ b/pkgs/development/python-modules/flask-login.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pythonAtLeast
+, flask, nose, mock, blinker}:
+
+buildPythonPackage rec {
+  name = "Flask-Login-${version}";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "maxcountryman";
+    repo = "flask-login";
+    rev = version;
+    sha256 = "0sjbmk8m4mmd9g99n6c6lx9nv2jwwqp6qsqhl945w2m0f1sknwdh";
+  };
+
+  buildInputs = [ nose mock ];
+  propagatedBuildInputs = [ flask blinker ];
+
+  checkPhase = "nosetests -d";
+
+  doCheck = pythonAtLeast "3.3";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/maxcountryman/flask-login";
+    description = "User session management for Flask";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b249d169cc..716d8a4c056 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11320,28 +11320,7 @@ in {
     };
   };
 
-  flask_login = buildPythonPackage rec {
-    name = "Flask-Login-${version}";
-    version = "0.4.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/F/Flask-Login/${name}.tar.gz";
-      sha256 = "19w2f33lglkyvxqnj3qghhxa4pr8mp13235k1bd557x52imkapnj";
-    };
-
-    propagatedBuildInputs = with self; [ flask ];
-
-    # FIXME
-    doCheck = false;
-
-    meta = {
-      homepage = "https://github.com/maxcountryman/flask-login";
-      description = "User session management for Flask";
-      license = licenses.mit;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ abbradar ];
-    };
-  };
+  flask_login = callPackage ../development/python-modules/flask-login.nix { };
 
   flask_migrate = buildPythonPackage rec {
     name = "Flask-Migrate-${version}";

From c065c400e9ace3678ec7949f88ed5c7b616d0e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 17:30:11 +0100
Subject: [PATCH 340/727] pythonPackages.flask_elastic: init at 0.2

---
 .../python-modules/flask-elastic.nix          | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-elastic.nix

diff --git a/pkgs/development/python-modules/flask-elastic.nix b/pkgs/development/python-modules/flask-elastic.nix
new file mode 100644
index 00000000000..9ea9616fbda
--- /dev/null
+++ b/pkgs/development/python-modules/flask-elastic.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchurl
+, flask, elasticsearch }:
+
+buildPythonPackage rec {
+  name = "Flask-Elastic-${version}";
+  version = "0.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/F/Flask-Elastic/${name}.tar.gz";
+    sha256 = "0hqkwff6z78aspkf1cf815qwp02g3ch1y9dhm5v2ap8vakyac0az";
+  };
+
+  propagatedBuildInputs = [ flask elasticsearch ];
+  doCheck = false; # no tests
+
+  meta = with stdenv.lib; {
+    description = "Integrates official client for Elasticsearch into Flask";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.mic92 ];
+    homepage = https://github.com/cepture/foppch/flask-elastic;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 716d8a4c056..974b3ec1f21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11320,6 +11320,8 @@ in {
     };
   };
 
+  flask_elastic = callPackage ../development/python-modules/flask-elastic.nix { };
+
   flask_login = callPackage ../development/python-modules/flask-login.nix { };
 
   flask_migrate = buildPythonPackage rec {

From b3bef109c2713af76c0216f94b748e638fd9a894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 13 Jan 2017 23:55:52 +0100
Subject: [PATCH 341/727] pythonPackages.flask-ldap-login: init at 0.3.0

---
 .../python-modules/flask-ldap-login.nix       | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-ldap-login.nix

diff --git a/pkgs/development/python-modules/flask-ldap-login.nix b/pkgs/development/python-modules/flask-ldap-login.nix
new file mode 100644
index 00000000000..37f9d72dd3f
--- /dev/null
+++ b/pkgs/development/python-modules/flask-ldap-login.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchurl
+, flask, flask_wtf, flask_testing, ldap
+, mock, nose }:
+
+buildPythonPackage rec {
+  name = "flask-ldap-login-0.3.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/f/flask-ldap-login/${name}.tar.gz";
+    sha256 = "085rik7q8xrp5g95346p6jcp9m2yr8kamwb2kbiw4q0b0fpnnlgq";
+  };
+
+  buildInputs = [ nose mock flask_testing ];
+  propagatedBuildInputs = [ flask flask_wtf ldap ];
+
+  checkPhase = "nosetests -d";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ContinuumIO/flask-ldap-login;
+    description = "User session management for Flask";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 974b3ec1f21..c0f8bac3523 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11324,6 +11324,8 @@ in {
 
   flask_login = callPackage ../development/python-modules/flask-login.nix { };
 
+  flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login.nix { };
+
   flask_migrate = buildPythonPackage rec {
     name = "Flask-Migrate-${version}";
     version = "1.7.0";

From f957ce45c477b37fbd6fa559c5b9fc47d1fae86f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:07:28 +0100
Subject: [PATCH 342/727] pythonPackages.flask_oauthlib: init at 0.9.3

---
 .../python-modules/flask-oauthlib.nix         | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-oauthlib.nix

diff --git a/pkgs/development/python-modules/flask-oauthlib.nix b/pkgs/development/python-modules/flask-oauthlib.nix
new file mode 100644
index 00000000000..83413dadb7f
--- /dev/null
+++ b/pkgs/development/python-modules/flask-oauthlib.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, flask, oauthlib, requests_oauthlib, flask_sqlalchemy
+, mock, nose}:
+buildPythonPackage rec {
+  name = "Flask-OAuthlib-${version}";
+  version = "0.9.3";
+
+  src = fetchFromGitHub {
+    owner = "lepture";
+    repo = "flask-oauthlib";
+    rev = "v${version}";
+    sha256 = "1vnr2kmbwl6mv2fsv92jjxzfibq2m3pnbcs6ba9k32jr1ci7wfh7";
+  };
+
+  buildInputs = [ mock nose ];
+  propagatedBuildInputs = [
+    flask flask_sqlalchemy oauthlib requests_oauthlib
+  ];
+
+  checkPhase = "nosetests -d";
+  doCheck = false; # request mocking fails
+
+  meta = with stdenv.lib; {
+    description = "OAuthlib implementation for Flask";
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+    homepage = https://github.com/lepture/flask-oauthlib;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c0f8bac3523..cb28d01b2b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11351,6 +11351,8 @@ in {
     };
   };
 
+  flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib.nix { };
+
   flask_principal = buildPythonPackage rec {
     name = "Flask-Principal-${version}";
     version = "0.4.0";

From b9e0da457a593dff4541ad9b8191835ea61d3d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:12:03 +0100
Subject: [PATCH 343/727] pythonPackages.ghdiff: init at 0.4

---
 pkgs/development/python-modules/ghdiff.nix | 21 +++++++++++++++++++++
 pkgs/top-level/python-packages.nix         |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/ghdiff.nix

diff --git a/pkgs/development/python-modules/ghdiff.nix b/pkgs/development/python-modules/ghdiff.nix
new file mode 100644
index 00000000000..156d9f23729
--- /dev/null
+++ b/pkgs/development/python-modules/ghdiff.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchurl
+, zope_testrunner, six, chardet}:
+
+buildPythonPackage rec {
+  name = "ghdiff-0.4";
+
+  src = fetchurl {
+    url = "mirror://pypi/g/ghdiff/${name}.tar.gz";
+    sha256 = "17mdhi2sq9017nq8rkjhhc87djpi5z99xiil0xz17dyplr7nmkqk";
+  };
+
+  buildInputs = [ zope_testrunner ];
+  propagatedBuildInputs = [ six chardet ];
+
+  meta = with stdenv.lib; {
+    homepage =  https://github.com/kilink/ghdiff;
+    license = license.mit;
+    description = "Generate Github-style HTML for unified diffs.";
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb28d01b2b8..b400c5a41a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12082,6 +12082,8 @@ in {
     };
   };
 
+  ghdiff = callPackage ../development/python-modules/ghdiff.nix { };
+
   gipc = buildPythonPackage rec {
     name = "gipc-0.5.0";
     disabled = !isPy26 && !isPy27;

From 5da2caab634d052f44933a9dbf47a41d7c4c14d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:13:45 +0100
Subject: [PATCH 344/727] pythonPackages.flask_testing: init at 0.6.1

---
 .../python-modules/flask-testing.nix          | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-testing.nix

diff --git a/pkgs/development/python-modules/flask-testing.nix b/pkgs/development/python-modules/flask-testing.nix
new file mode 100644
index 00000000000..c5fe8f8bdbe
--- /dev/null
+++ b/pkgs/development/python-modules/flask-testing.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, buildPythonPackage, pythonOlder
+, flask, blinker, twill }:
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+  name = "Flask-Testing-0.6.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/F/Flask-Testing/${name}.tar.gz";
+    sha256 = "1ckmy7kz2qkggdlm9y5wx6gvd2x7qv921dyb059ywfh15hrkkxdb";
+  };
+
+  buildInputs = optionals (pythonOlder "3.0") [ twill ];
+  propagatedBuildInputs = [ flask blinker ];
+
+  meta = {
+    description = "Flask unittest integration.";
+    homepage = https://pythonhosted.org/Flask-Testing/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b400c5a41a5..62294be8b35 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11430,6 +11430,8 @@ in {
     };
   };
 
+  flask_testing = callPackage ../development/python-modules/flask-testing.nix { };
+
   wtforms = buildPythonPackage rec {
     version = "2.1";
     name = "wtforms-${version}";

From 3b44782026bcd839b5c98690d548c75e8dce3619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:17:33 +0100
Subject: [PATCH 345/727] pythonPackages.flask_wtf: init at 0.14.2

---
 pkgs/development/python-modules/flask-wtf.nix | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-wtf.nix

diff --git a/pkgs/development/python-modules/flask-wtf.nix b/pkgs/development/python-modules/flask-wtf.nix
new file mode 100644
index 00000000000..f8f94736680
--- /dev/null
+++ b/pkgs/development/python-modules/flask-wtf.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, buildPythonPackage, flask, wtforms, nose }:
+
+buildPythonPackage rec {
+  name = "Flask-WTF-0.14.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/F/Flask-WTF/${name}.tar.gz";
+    sha256 = "0dncc5as2k61b28k8kal5yh3prmv7zya1jz7kvci7ximzmfda52x";
+  };
+
+  propagatedBuildInputs = [ flask wtforms nose ];
+
+  doCheck = false; # requires external service
+
+  meta = with stdenv.lib; {
+    description = "Simple integration of Flask and WTForms.";
+    license = licenses.bsd;
+    maintainers = [ maintainers.mic92 ];
+    homepage = https://github.com/lepture/flask-wtf/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62294be8b35..6ec0a960611 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11432,6 +11432,8 @@ in {
 
   flask_testing = callPackage ../development/python-modules/flask-testing.nix { };
 
+  flask_wtf = callPackage ../development/python-modules/flask-wtf.nix { };
+
   wtforms = buildPythonPackage rec {
     version = "2.1";
     name = "wtforms-${version}";

From 17c457e47bd60e26d0c5135e0126d519cc69a653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:17:58 +0100
Subject: [PATCH 346/727] pythonPackages.twill: init at 0.9.1

---
 .../python-modules/twill/default.nix          | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/twill/default.nix

diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix
new file mode 100644
index 00000000000..6d4e3cbf1df
--- /dev/null
+++ b/pkgs/development/python-modules/twill/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchurl, isPy3k, pythonPackages }:
+buildPythonPackage rec {
+  name = "twill-0.9.1";
+
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url    = "mirror://pypi/t/twill/${name}.tar.gz";
+    sha256 = "0zmssp41cgb5sz1jym7rxy6mamb64dxq3wra1bn6snna9v653pyj";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [ nose ];
+
+  doCheck = false; # pypi package comes without tests, other homepage does not provide all verisons
+
+  meta = with stdenv.lib; {
+    homepage = http://twill.idyll.org/;
+    description = "a simple scripting language for Web browsing";
+    license     = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ Mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ec0a960611..0186b8499fc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25879,6 +25879,8 @@ in {
     };
   };
 
+  twill = callPackage ../development/python-modules/twill { };
+
   twitter = buildPythonPackage rec {
     name = "twitter-${version}";
     version = "1.15.0";

From 19dc19690b00b3a8d9440749c465c6424e8c6cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 18 Jan 2017 20:16:49 +0100
Subject: [PATCH 347/727] system-config-printer: add missing dependency
 'pycairo'

Noticed when running on KDE (in contrast with GNOME, which probably
pulls in pycairo via some impurity).
---
 pkgs/tools/misc/system-config-printer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index ab4a008fa09..fc4a24ec355 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
     ];
 
   pythonPath = with pythonPackages;
-    [ pycups pycurl dbus-python pygobject3 requests2 ];
+    [ pycups pycurl dbus-python pygobject3 requests2 pycairo ];
 
   configureFlags =
     [ "--with-udev-rules"

From 6a52a130debae70422f7dc16c808df634ac7f13b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 18 Jan 2017 19:50:04 +0100
Subject: [PATCH 348/727] nixos/kde5: enable system-config-printer dbus service

Without it, the following error is shown in the "Add Printer" window:

Failed to group devices: 'The name org.fedoraproject.Config.Printing was not provided by any .service files'
---
 nixos/modules/services/x11/desktop-managers/kde5.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index de5bfe263d4..ee4ec0fc819 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -229,6 +229,8 @@ in
       # Enable helpful DBus services.
       services.udisks2.enable = true;
       services.upower.enable = config.powerManagement.enable;
+      services.dbus.packages =
+        mkIf config.services.printing.enable [ pkgs.system-config-printer ];
 
       # Extra UDEV rules used by Solid
       services.udev.packages = [

From 63bb3f3fa679eecf2fe67ba0d09f82eaf2a9412f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20G=C3=B6tz?= <stefan.goetz@uni-ulm.de>
Date: Wed, 18 Jan 2017 21:12:55 +0100
Subject: [PATCH 349/727] youtube-dl: 2017.01.14 -> 2017.01.18

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index ef2164b5a14..f9590b3f044 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.01.14";
+  version = "2017.01.18";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "76c8bd77db6c820bfa72f1e2a873101ca736fd1d9954ccebf349fa7caef99cca";
+    sha256 = "7c16f3ce7cf8a673a4c531e4a1fc10801467a61732cb65430e40b3ab8b2f2d2e";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From 74d4d3e4f9bec56e20bb0adcb6dd8df6c4d14247 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Tue, 17 Jan 2017 15:49:32 +0100
Subject: [PATCH 350/727] docker: 1.12.6 -> 1.13.0

- Update docker version to 1.13.0.
- Introduce now docker-proxy package (from libnetmork).
- Use overrideDerivation to set the correct version for docker.
- Update tini to make sure we can build it static.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../virtualization/docker/default.nix         | 53 ++++++++++++++++---
 .../virtualization/docker/proxy.nix           | 36 +++++++++++++
 .../virtualization/tini/default.nix           | 14 ++---
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 91 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/applications/virtualization/docker/proxy.nix

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index ba21a23f8ad..2391775af42 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, pkgconfig, go-md2man
-, go, containerd, runc
+, go, containerd, runc, docker-proxy, tini
 , sqlite, iproute, bridge-utils, devicemapper, systemd
 , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
 , procps
@@ -11,15 +11,53 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.12.6";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker";
     rev = "v${version}";
-    sha256 = "10jhjas07xxlxjsxby8865rr0d0zsc5azy16rsz1idmy7f7lk6jh";
+    sha256 = "03b181xiqgnwanc567w9p6rbdgdvrfv0lk4r7b604ksm0fr4cz23";
   };
 
+  docker-runc = runc.overrideAttrs (oldAttrs: rec {
+    name = "docker-runc";
+    src = fetchFromGitHub {
+      owner = "docker";
+      repo = "runc";
+      rev = "2f7393a47307a16f8cee44a37b262e8b81021e3e";
+      sha256 = "1s5nfnbinzmcnm8avhvsniz0ihxyva4w5qz1hzzyqdyr0w2scnbj";
+    };
+    # docker/runc already include these patches / are not applicable
+    patches = [];
+  });
+  docker-containerd = containerd.overrideAttrs (oldAttrs: rec {
+    name = "docker-containerd";
+    src = fetchFromGitHub {
+      owner = "docker";
+      repo = "containerd";
+      rev = "03e5862ec0d8d3b3f750e19fca3ee367e13c090e";
+      sha256 = "184sd9dwkcba3zhxnz9grw8p81x05977p36cif2dgkhjdhv12map";
+    };
+  });
+  docker-tini = tini.overrideAttrs  (oldAttrs: rec {
+    name = "docker-init";
+    src = fetchFromGitHub {
+      owner = "krallin";
+      repo = "tini";
+      rev = "949e6facb77383876aeff8a6944dde66b3089574";
+      sha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
+    };
+
+    # Do not remove static from make files as we want a static binary
+    patchPhase = ''
+    '';
+
+    NIX_CFLAGS_COMPILE = [
+      "-DMINIMAL=ON"
+    ];
+  });
+
   buildInputs = [
     makeWrapper pkgconfig go-md2man go
     sqlite devicemapper btrfs-progs systemd
@@ -52,16 +90,17 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker
     install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
-    install -Dm755 ./bundles/${version}/dynbinary-daemon/docker-proxy-${version} $out/libexec/docker/docker-proxy
     makeWrapper $out/libexec/docker/docker $out/bin/docker \
       --prefix PATH : "$out/libexec/docker:$extraPath"
     makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
       --prefix PATH : "$out/libexec/docker:$extraPath"
 
     # docker uses containerd now
-    ln -s ${containerd}/bin/containerd $out/libexec/docker/docker-containerd
-    ln -s ${containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim
-    ln -s ${runc}/bin/runc $out/libexec/docker/docker-runc
+    ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd
+    ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim
+    ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc
+    ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy
+    ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init
 
     # systemd
     install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix
new file mode 100644
index 00000000000..a9f278c4d2a
--- /dev/null
+++ b/pkgs/applications/virtualization/docker/proxy.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchFromGitHub, go, docker }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "docker-proxy-${rev}";
+  rev = "0f534354b813003a754606689722fe253101bc4e";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "docker";
+    repo = "libnetwork";
+    sha256 = "1ah7h417llcq0xzdbp497pchb9m9qvjhrwajcjb0ybrs8v889m31";
+  };
+
+  buildInputs = [ go ];
+
+  buildPhase = ''
+    mkdir -p .gopath/src/github.com/docker
+    ln -sf $(pwd) .gopath/src/github.com/docker/libnetwork
+    GOPATH="$(pwd)/.gopath:$(pwd)/Godeps/_workspace" go build -ldflags="$PROXY_LDFLAGS" -o docker-proxy ./cmd/proxy
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp docker-proxy $out/bin
+  '';
+
+  meta = {
+    description = "Docker proxy binary to forward traffic between host and containers";
+    license = licenses.asl20;
+    homepage = https://github.com/docker/libnetwork;
+    maintainers = with maintainers; [vdemeester];
+    platforms = docker.meta.platforms;
+  };
+}
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix
index 535ca551785..2a7b4810a24 100644
--- a/pkgs/applications/virtualization/tini/default.nix
+++ b/pkgs/applications/virtualization/tini/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl, cmake }:
+{ stdenv, fetchFromGitHub, cmake, glibc }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.3";
+  version = "0.13.1";
   name = "tini-${version}";
-  src = fetchurl {
-    url = "https://github.com/krallin/tini/archive/v0.8.3.tar.gz";
-    sha256 ="1w7rj4crrcyv25idmh4asbp2sxzwyihy5mbpw384bzxjzaxn9xpa";
+  src = fetchFromGitHub {
+    owner = "krallin";
+    repo = "tini";
+    rev = "v${version}";
+    sha256 ="1g4n8v5d197zcb41fcpbhip2x342383zw1d2zkv57w73vkqgv6z6";
   };
   patchPhase = "sed -i /tini-static/d CMakeLists.txt";
   NIX_CFLAGS_COMPILE = [
     "-DPR_SET_CHILD_SUBREAPER=36"
     "-DPR_GET_CHILD_SUBREAPER=37"
   ];
-  buildInputs = [ cmake ];
+  buildInputs = [ cmake glibc glibc.static ];
   meta = with stdenv.lib; {
     description = "A tiny but valid init for containers";
     homepage = https://github.com/krallin/tini;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c148094f31..e4c04b7f0b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12802,6 +12802,7 @@ in
   };
 
   docker = callPackage ../applications/virtualization/docker { };
+  docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
 
   docker-gc = callPackage ../applications/virtualization/docker/gc.nix { };
 

From 08e99191f66c4a6cfe045601411bf6db08a78cac Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 18 Jan 2017 21:29:31 +0100
Subject: [PATCH 351/727] remove xorg.intelgputools in favor of intel-gpu-tools

There is no reason in having both and the latter is a
separate derivation and thus easier to maintain.

Closes #21976
---
 pkgs/servers/x11/xorg/default.nix   | 11 -----------
 pkgs/servers/x11/xorg/overrides.nix |  4 ----
 2 files changed, 15 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 07243682283..d5a3bea67a6 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -602,17 +602,6 @@ let
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
-  intelgputools = (mkDerivation "intelgputools" {
-    name = "intel-gpu-tools-1.15";
-    builder = ./builder.sh;
-    src = fetchurl {
-      url = mirror://xorg/individual/app/intel-gpu-tools-1.15.tar.bz2;
-      sha256 = "1gb22hvj4gdjj92iqbwcp44kf2znk2l1fvbcrr4sm4i65l8mdwnw";
-    };
-    buildInputs = [pkgconfig dri2proto libdrm udev libpciaccess python libX11 libXext libXrandr libXv ];
-    meta.platforms = stdenv.lib.platforms.unix;
-  }) // {inherit dri2proto libdrm udev libpciaccess python libX11 libXext libXrandr libXv ;};
-
   kbproto = (mkDerivation "kbproto" {
     name = "kbproto-1.0.7";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 5a57609146a..889dd58c01b 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -57,10 +57,6 @@ in
     tradcpp = if stdenv.isDarwin then args.tradcpp else null;
   };
 
-  intelgputools = attrs: attrs // {
-    buildInputs = attrs.buildInputs ++ [ args.cairo args.libunwind ];
-  };
-
   mkfontdir = attrs: attrs // {
     preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin";
   };

From b635355554a6344a1f88b22e8020e3a429966425 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Thu, 19 Jan 2017 02:52:42 +0000
Subject: [PATCH 352/727] python27Packages.influxdb: 0.1.12 -> 4.0.0

Updated, as the old package is not compatible with current InfluxDB versions.
Changed buildInputs as following:
* requests -> requests2 as it is newer
* added dateutil as it is needed
* added tytz as it is needed
* added six as it is needed
---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2f59ae16639..8ba3632866d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12888,16 +12888,16 @@ in {
   };
 
   influxdb = buildPythonPackage rec {
-    name = "influxdb-0.1.12";
+    name = "influxdb-4.0.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/i/influxdb/${name}.tar.gz";
-      sha256 = "6b5ea154454b86d14f2a3960d180e666ba9863da964032dacf2b50628e774a33";
+      sha256 = "0injsml6zmb3hkgc03117fdlg573kbfgjbijpd5npf0vsy0xnpvz";
     };
 
     # ImportError: No module named tests
     doCheck = false;
-    propagatedBuildInputs = with self; [ requests ];
+    propagatedBuildInputs = with self; [ requests2 dateutil pytz six ];
 
     meta = {
       description = "Python client for InfluxDB";

From d9340971d9b2439f17711ac25c2a351650bc0173 Mon Sep 17 00:00:00 2001
From: Jon Meredith <jon@sunlightpayments.com>
Date: Mon, 16 Jan 2017 17:18:27 -0800
Subject: [PATCH 353/727] Add yubioath-desktop application and required pyscard
 module to support it

---
 .../misc/yubioath-desktop/default.nix         | 41 +++++++++++++++++++
 .../python-modules/pyscard/default.nix        | 27 ++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 72 insertions(+)
 create mode 100644 pkgs/applications/misc/yubioath-desktop/default.nix
 create mode 100644 pkgs/development/python-modules/pyscard/default.nix

diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix
new file mode 100644
index 00000000000..3d12fc03710
--- /dev/null
+++ b/pkgs/applications/misc/yubioath-desktop/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl,  python27Packages, swig, gettext, pcsclite, qt48Full, yubikey-personalization }:
+
+python27Packages.buildPythonApplication rec {
+    namePrefix = "";
+    name = "yubioath-desktop-${version}";
+    version = "3.1.0";
+
+    src = fetchurl {
+      url = "http://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz";
+      sha256 = "0jfvllgh88g2vwd8sg6willlnn2hq05nd9d3xmv98lhl7gyy1akw";
+    };
+
+    doCheck = false;
+
+    buildInputs = [ stdenv ];
+
+    propagatedBuildInputs = [ python27Packages.pycrypto python27Packages.click python27Packages.pyscard python27Packages.pyside ];
+
+    # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary
+    # support that the yubicommon library uses to load libykpers
+    makeWrapperArgs = ''--prefix LD_LIBRARY_PATH : "${pcsclite}/lib:${yubikey-personalization}/lib" --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so"'';
+
+    postInstall = ''
+      mkdir -p $out/share/applications
+      cp resources/yubioath.desktop $out/share/applications/yubioath.desktop
+      mkdir -p $out/share/yubioath/icons
+      cp resources/yubioath*.{icns,ico,png,xpm} $out/share/yubioath/icons
+      substituteInPlace $out/share/applications/yubioath.desktop \
+        --replace 'Exec=yubioath-gui' "Exec=$out/bin/yubioath-gui" \
+        --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons"
+
+    '';
+
+    meta = {
+      description = "Yubikey Desktop Authenticator";
+
+      homepage = https://www.yubico.com/support/knowledge-base/categories/articles/yubico-authenticator-download/;
+
+      license = stdenv.lib.licenses.gpl3;
+    };
+}
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
new file mode 100644
index 00000000000..b1f991b1adc
--- /dev/null
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, fetchpatch, python, buildPythonPackage, swig, pcsclite }:
+
+buildPythonPackage rec {
+  name = "pyscard-1.9.4";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pyscard/${name}.tar.gz";
+    sha256 = "0gn0p4p8dhk99g8vald0dcnh45jbf82bj72n4djyr8b4hawkck4v";
+  };
+
+  configurePhase = "";
+
+
+  LDFLAGS="-L${pcsclite}/lib";
+  CFLAGS="-I${pcsclite}/include/PCSC";
+
+  propagatedBuildInputs = [ swig pcsclite ];
+
+  #doCheck = !(python.isPypy or stdenv.isDarwin); # error: AF_UNIX path too long
+
+  meta = {
+    homepage = "https://pyscard.sourceforge.io/";
+    description = "Smartcard library for python";
+    license = stdenv.lib.licenses.lgpl21;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb6576491bb..40d6d5320e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9879,6 +9879,8 @@ in
 
   yajl = callPackage ../development/libraries/yajl { };
 
+  yubioath-desktop = callPackage ../applications/misc/yubioath-desktop { };
+
   yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { };
 
   yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2f59ae16639..daddf1f6465 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -281,6 +281,8 @@ in {
     pythonPackages = self;
   };
 
+  pyscard = callPackage ../development/python-modules/pyscard { };
+
   pyside = callPackage ../development/python-modules/pyside { };
 
   pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };

From 75cea1db58e48cd8bba4b1a1d0e8a1d843a219c0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Jan 2017 05:51:49 +0000
Subject: [PATCH 354/727] ocamlPackages.fpath: init at 0.7.1

Fpath is an OCaml module for handling file system paths with POSIX and Windows conventions.

Homepage: http://erratique.ch/software/fpath
---
 .../ocaml-modules/fpath/default.nix           | 25 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/fpath/default.nix

diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix
new file mode 100644
index 00000000000..88f12003380
--- /dev/null
+++ b/pkgs/development/ocaml-modules/fpath/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, astring }:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-fpath-0.7.1";
+  src = fetchurl {
+    url = http://erratique.ch/software/fpath/releases/fpath-0.7.1.tbz;
+    sha256 = "05134ij27xjl6gaqsc65yl19vfj6cjxq3mbm9bf4mija8grdpn6g";
+  };
+
+  unpackCmd = "tar xjf $src";
+
+  buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+
+  propagatedBuildInputs = [ astring ];
+
+  inherit (topkg) buildPhase installPhase;
+
+  meta = {
+    description = "An OCaml module for handling file system paths with POSIX and Windows conventions";
+    homepage = http://erratique.ch/software/fpath;
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 3c7be7cc1b9..5be040a5393 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -182,6 +182,8 @@ let
       inherit (pkgs) fontconfig;
     };
 
+    fpath = callPackage ../development/ocaml-modules/fpath { };
+
     functory = callPackage ../development/ocaml-modules/functory { };
 
     gen = callPackage ../development/ocaml-modules/gen { };

From d1c3cc63e15fee42d98f960a1d9b844cca937760 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Jan 2017 05:54:05 +0000
Subject: [PATCH 355/727] jabref: 3.6 -> 3.8.1

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

diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index 6904d1873aa..ef21b37b59e 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, makeDesktopItem, ant, jdk, jre }:
 
 stdenv.mkDerivation rec {
-  version = "3.6";
+  version = "3.8.1";
   name = "jabref-${version}";
 
   src = fetchurl {
     url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}.jar";
-    sha256 = "140fixwffw463dprgg6kcccsp833dnclzjzvwmqs7dq0f9y2nyc5";
+    sha256 = "11asfym74zdq46i217z5n6vc79gylcx8xn7nvwacfqmym0bz79cg";
   };
 
   desktopItem = makeDesktopItem {

From 806d8c19baad20652fd322c5546c4a32987b3fff Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Thu, 19 Jan 2017 16:30:43 +0900
Subject: [PATCH 356/727] styx-themes.agency: fix version typo

---
 pkgs/applications/misc/styx/themes.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/styx/themes.nix b/pkgs/applications/misc/styx/themes.nix
index 671372f6250..86904a73584 100644
--- a/pkgs/applications/misc/styx/themes.nix
+++ b/pkgs/applications/misc/styx/themes.nix
@@ -28,7 +28,7 @@ in
 {
   agency = mkThemeDrv {
     themeName = "agency";
-    version   = "20167-01-17";
+    version   = "2017-01-17";
     src = {
       rev    = "3201f65841c9e7f97cc0ab0264cafb01b1620ed7";
       sha256 = "1b3547lzmhs1lmr9gln1yvh5xrsg92m8ngrjwf0ny91y81x04da6";

From f4f885243e6139edb196d00a9313f6ce5141e0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 Jan 2017 09:07:50 +0100
Subject: [PATCH 357/727] treewide: switch more packages to older gperf

They wouldn't build otherwise.
---
 pkgs/top-level/all-packages.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f209201eb2f..a79bf546243 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6354,6 +6354,7 @@ in
   gradle_2_5 = self.gradleGen.gradle_2_5;
 
   gperf = callPackage ../development/tools/misc/gperf { };
+  # 3.1 changed some parameters from int to size_t, leading to mismatches.
   gperf_3_0 = callPackage ../development/tools/misc/gperf/3.0.x.nix { };
 
   grail = callPackage ../development/libraries/grail { };
@@ -6412,7 +6413,9 @@ in
 
   jenkins-job-builder = pythonPackages.jenkins-job-builder;
 
-  kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { };
+  kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends {
+    gperf = gperf_3_0;
+  };
 
   kcov = callPackage ../development/tools/analysis/kcov { };
 
@@ -8254,7 +8257,9 @@ in
   # On non-GNU systems we need GNU Gettext for libintl.
   libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext;
 
-  libid3tag = callPackage ../development/libraries/libid3tag { };
+  libid3tag = callPackage ../development/libraries/libid3tag {
+    gperf = gperf_3_0;
+  };
 
   libidn = callPackage ../development/libraries/libidn { };
 
@@ -10419,7 +10424,9 @@ in
 
   rspamd = callPackage ../servers/mail/rspamd { };
 
-  pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { };
+  pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix {
+    gperf = gperf_3_0;
+  };
   pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { };
 
   postgrey = callPackage ../servers/mail/postgrey { };
@@ -12526,7 +12533,9 @@ in
 
   bibletime = callPackage ../applications/misc/bibletime { };
 
-  bitkeeper = callPackage ../applications/version-management/bitkeeper { };
+  bitkeeper = callPackage ../applications/version-management/bitkeeper {
+    gperf = gperf_3_0;
+  };
 
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
   bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { };

From 38b4ae554925a7b48c81f924ccbe627feb313383 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 19 Jan 2017 09:19:51 +0100
Subject: [PATCH 358/727] screen: 4.4.0 -> 4.5.0

See http://lists.gnu.org/archive/html/info-gnu/2017-01/msg00007.html
for release announcement.
---
 pkgs/tools/misc/screen/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 8367bde6fdd..27e0270952e 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }:
 
 stdenv.mkDerivation rec {
-  name = "screen-4.4.0";
+  name = "screen-${version}";
+  version = "4.5.0";
 
   src = fetchurl {
     url = "mirror://gnu/screen/${name}.tar.gz";
-    sha256 = "12r12xwhsg59mlprikbbmn60gh8lqhrvyar7mlxg4fwsfma2lwpg";
+    sha256 = "1c7grw03a9iwvqbxfd6hmjb681rp8gb55zsxm7b3apqqcb1sghq1";
   };
 
   configureFlags= [

From 42c1f449bd6fa205baef8ba267acb339791fa514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 Jan 2017 09:41:38 +0100
Subject: [PATCH 359/727] intel-gpu-tools: finish removing the duplicate

---
 pkgs/servers/x11/xorg/extra.list | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 3129e090e6b..56a7b1f76a9 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -9,4 +9,3 @@ http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2
 mirror://xorg/individual/app/appres-1.0.4.tar.bz2
-mirror://xorg/individual/app/intel-gpu-tools-1.15.tar.bz2

From 6d211110f558f37e9d102b569166094023b7a3aa Mon Sep 17 00:00:00 2001
From: tkatchev <tkatchev@gmail.com>
Date: Thu, 19 Jan 2017 13:10:07 +0300
Subject: [PATCH 360/727] libkrb5: fix issue #16161.

---
 pkgs/development/libraries/kerberos/krb5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 1b8c274c457..09e6492b49a 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "0z0jxm6ppbxi9anv2h12nrb5lpwl95f96kw6dx7sn268fhkpad7x";
   };
 
-  configureFlags = optional stdenv.isFreeBSD ''WARN_CFLAGS=""'';
+  configureFlags = [ "--with-tcl=no" ] ++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""'';
 
   nativeBuildInputs = [ pkgconfig perl yacc ]
     # Provides the mig command used by the build scripts

From 64b7f096e63cd4a69de101593e6a83802827d817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 Jan 2017 11:22:56 +0100
Subject: [PATCH 361/727] knot-dns: 2.3.3 -> 2.4.0

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

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 62343666729..9ecd6fe0b9d 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -4,11 +4,11 @@
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.3.3";
+  version = "2.4.0";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "a929bce3b957a81776b1db7b43b0e4473339bf16be8dbba5abb4b0593bf43c94";
+    sha256 = "0y9nhp9lfmxv4iy1xg7l4lfxv4168qhag26wwg0dbi0zjpkd790b";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 03700daf07efe842f973882fab3bc02abc01cbcc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 19 Jan 2017 11:33:00 +0100
Subject: [PATCH 362/727] ikiwiki: 3.20160905 -> 3.20170111

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

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 71418732a48..bce5b6cf589 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
 
 let
   name = "ikiwiki";
-  version = "3.20160905";
+  version = "3.20170111";
 
   lib = stdenv.lib;
 in
@@ -31,8 +31,8 @@ stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "1xbjj5qpxh7f05b69z9vvajg05zv63fj8js77c47yx01xifgd3vn";
+    url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.tar.xz";
+    sha256 = "00d7yzv426fvqbhvzyafddv7fa6b4j2647b0wi371wd5yjj9j3sz";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

From 4b9b1fa9456b0858244fc5ba36cfbc71944cad75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 19 Jan 2017 14:48:00 +0100
Subject: [PATCH 363/727] util-linux: remove seccomp sandbox for CVE-2016-2279

the patch for CVE-2016-2779 was reverted by upstream and was not adopted
by any other downstream distributions. Upstream waits for a better fix
in the kernel:
https://www.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28-ReleaseNotes
---
 pkgs/os-specific/linux/util-linux/default.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index f6e26f51cc8..a97ce920533 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchurl, pkgconfig, zlib, libseccomp, fetchpatch, autoreconfHook, ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
+{ lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch
+, ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
 
 stdenv.mkDerivation rec {
   name = "util-linux-${version}";
@@ -12,13 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "1rzrmdrz51p9sy7vlw5qmj8pmqazm7hgcch5yq242mkvrikyln9c";
   };
 
-  patches = [
-    ./rtcwake-search-PATH-for-shutdown.patch
-    (fetchpatch {
-      name = "CVE-2016-2779.diff";
-      url = https://github.com/karelzak/util-linux/commit/8e4925016875c6a4f2ab4f833ba66f0fc57396a2.patch;
-      sha256 = "0kmigkq4s1b1ijrq8vcg2a5cw4qnm065m7cb1jn1q1f4x99ycy60";
-  })];
+  patches = [ ./rtcwake-search-PATH-for-shutdown.patch ];
 
   outputs = [ "bin" "dev" "out" "man" ];
 
@@ -54,11 +49,9 @@ stdenv.mkDerivation rec {
 
   makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin";
 
-  # autoreconfHook is required for CVE-2016-2779
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  # libseccomp is required for CVE-2016-2779
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs =
-    [ zlib pam libseccomp ]
+    [ zlib pam ]
     ++ lib.optional (ncurses != null) ncurses
     ++ lib.optional (systemd != null) systemd
     ++ lib.optional (perl != null) perl;

From 104a37a9fbd101de63562b8560e27e843887fe9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 19 Jan 2017 15:11:23 +0100
Subject: [PATCH 364/727] util-linux: improve purity by using login from shadow

replacing shutdown in postPatch phase is not necessary as rtcwake was already
patched to use the search path (the only user of shutdown)
---
 pkgs/os-specific/linux/util-linux/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index a97ce920533..f7f60e8997f 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch
+{ lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch, shadow
 , ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
 
 stdenv.mkDerivation rec {
@@ -17,12 +17,9 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "man" ];
 
-  #FIXME: make it also work on non-nixos?
   postPatch = ''
-    # Substituting store paths would create a circular dependency on systemd
     substituteInPlace include/pathnames.h \
-      --replace "/bin/login" "/run/current-system/sw/bin/login" \
-      --replace "/sbin/shutdown" "/run/current-system/sw/bin/shutdown"
+      --replace "/bin/login" "${shadow}/bin/login"
   '';
 
   crossAttrs = {

From e735f85c4d9b359ec5c84f5fb366980b6ccee0cb Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Thu, 19 Jan 2017 15:20:54 +0100
Subject: [PATCH 365/727] pythonPackages.pcsclite: refactor

---
 .../python-modules/pyscard/default.nix        | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index b1f991b1adc..bb2291fb4ac 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -1,27 +1,28 @@
-{ stdenv, fetchurl, fetchpatch, python, buildPythonPackage, swig, pcsclite }:
+{ stdenv, fetchurl, buildPythonPackage, swig, pcsclite }:
 
 buildPythonPackage rec {
-  name = "pyscard-1.9.4";
-  namePrefix = "";
+  name = "pyscard-${version}";
+  version = "1.9.4";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyscard/${name}.tar.gz";
     sha256 = "0gn0p4p8dhk99g8vald0dcnh45jbf82bj72n4djyr8b4hawkck4v";
   };
 
-  configurePhase = "";
+  patchPhase = ''
+    sed -e 's!"libpcsclite\.so\.1"!"${pcsclite}/lib/libpcsclite.so.1"!' \
+        -i smartcard/scard/winscarddll.c
+  '';
 
+  NIX_CFLAGS_COMPILE = "-isystem ${pcsclite}/include/PCSC/";
 
-  LDFLAGS="-L${pcsclite}/lib";
-  CFLAGS="-I${pcsclite}/include/PCSC";
-
-  propagatedBuildInputs = [ swig pcsclite ];
-
-  #doCheck = !(python.isPypy or stdenv.isDarwin); # error: AF_UNIX path too long
+  propagatedBuildInputs = [ pcsclite ];
+  buildInputs = [ swig ];
 
   meta = {
     homepage = "https://pyscard.sourceforge.io/";
     description = "Smartcard library for python";
     license = stdenv.lib.licenses.lgpl21;
+    maintainers = with stdenv.lib.maintainers; [ layus ];
   };
 }

From 24038e63853daafdca8cf50e34d57bdca7fe09dd Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 16:39:28 +0100
Subject: [PATCH 366/727] mysql-workbench: rename from mysqlWorkbench, add
 alias

fixes #21226
---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 905ff02d000..4b686903702 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -77,6 +77,7 @@ doNotDisplayTwice rec {
   mssys = ms-sys; # added 2015-12-13
   multipath_tools = multipath-tools;  # added 2016-01-21
   mupen64plus1_5 = mupen64plus; # added 2016-02-12
+  mysqlWorkbench = mysql-workbench; # added 2017-01-19
   ncat = nmap;  # added 2016-01-26
   nfsUtils = nfs-utils;  # added 2014-12-06
   owncloudclient = owncloud-client;  # added 2016-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7241cdfb27..d4ee456b9d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17609,7 +17609,7 @@ in
 
   mnemonicode = callPackage ../misc/mnemonicode { };
 
-  mysqlWorkbench = newScope gnome2 ../applications/misc/mysql-workbench (let mysql = mysql57; in {
+  mysql-workbench = newScope gnome2 ../applications/misc/mysql-workbench (let mysql = mysql57; in {
     automake = automake113x;
     gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};};
     mysql = mysql;

From fa79441055b090116a4e7bb9e735e67a9670b8b1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 16:38:00 +0100
Subject: [PATCH 367/727] mysql-workbench: 6.3.7 -> 6.3.8

fixes #21226
---
 pkgs/applications/misc/mysql-workbench/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index fbb10bc9ceb..b9fcd1a7f15 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -12,12 +12,12 @@ let
   inherit (pythonPackages) pexpect pycrypto python paramiko;
 in stdenv.mkDerivation rec {
   pname = "mysql-workbench";
-  version = "6.3.7";
+  version = "6.3.8";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
-    sha256 = "1v4k04facdn2qzflf0clf3ir5hghqlabq89ssm2s4x1nqdniz544";
+    sha256 = "1bxd828nrawmym6d8awh1vrni8dsbwh1k5am1lrq5ihp5c3kw9ka";
   };
 
   buildInputs = [ cmake pkgconfig glibc gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo

From 9cb67274fc71b0700a9ef18ece6195173783df84 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 16:48:27 +0100
Subject: [PATCH 368/727] treewide: fix evaluation

cc @Mic92 @nixy @7c6f434c
---
 pkgs/development/interpreters/hy/default.nix      | 2 +-
 pkgs/development/python-modules/flask-wtf.nix     | 2 +-
 pkgs/development/python-modules/ghdiff.nix        | 2 +-
 pkgs/development/python-modules/twill/default.nix | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix
index ee6ac6d39e5..e1ce01b5906 100644
--- a/pkgs/development/interpreters/hy/default.nix
+++ b/pkgs/development/interpreters/hy/default.nix
@@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
     description = "A LISP dialect embedded in Python";
     homepage = http://hylang.org/;
     license = stdenv.lib.licenses.mit;
-    maintainers = stdenv.lib.maintainers.nixy; 
+    maintainers = [ stdenv.lib.maintainers.nixy ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/python-modules/flask-wtf.nix b/pkgs/development/python-modules/flask-wtf.nix
index f8f94736680..24e66ea4e98 100644
--- a/pkgs/development/python-modules/flask-wtf.nix
+++ b/pkgs/development/python-modules/flask-wtf.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Simple integration of Flask and WTForms.";
-    license = licenses.bsd;
+    license = licenses.bsd3;
     maintainers = [ maintainers.mic92 ];
     homepage = https://github.com/lepture/flask-wtf/;
   };
diff --git a/pkgs/development/python-modules/ghdiff.nix b/pkgs/development/python-modules/ghdiff.nix
index 156d9f23729..1f14b661d53 100644
--- a/pkgs/development/python-modules/ghdiff.nix
+++ b/pkgs/development/python-modules/ghdiff.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     homepage =  https://github.com/kilink/ghdiff;
-    license = license.mit;
+    license = licenses.mit;
     description = "Generate Github-style HTML for unified diffs.";
     maintainers = [ maintainers.mic92 ];
   };
diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix
index 6d4e3cbf1df..f3e7bb7025b 100644
--- a/pkgs/development/python-modules/twill/default.nix
+++ b/pkgs/development/python-modules/twill/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
     description = "a simple scripting language for Web browsing";
     license     = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ Mic92 ];
+    maintainers = with maintainers; [ mic92 ];
   };
 }

From d9418bf8fbf7136cc10ec969ad8017a4ed3d4f3d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 12 Jan 2017 14:50:38 +0100
Subject: [PATCH 369/727] eduke32: fix build

---
 pkgs/games/eduke32/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 519b7c2ac24..185295a20b6 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
       --replace libGLU.so	${mesa}/lib/libGLU.so
   '';
 
-  NIX_CFLAGS_COMPILE = "-I${SDL2}/include/SDL";
+  NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2 -I${SDL2_mixer}/include/SDL2";
   NIX_LDFLAGS = "-L${SDL2}/lib";
 
   makeFlags = [

From 9e60e432ba9a3d44e74b94e380714e00353478fd Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 17:06:51 +0100
Subject: [PATCH 370/727] dvdisaster: fix broken make discovery

---
 pkgs/tools/cd-dvd/dvdisaster/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index 08da13b569a..a0306d8d51a 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -23,6 +23,9 @@ stdenv.mkDerivation rec {
   postPatch = ''
     patchShebangs ./
     sed -i 's/dvdisaster48.png/dvdisaster/' contrib/dvdisaster.desktop
+    substituteInPlace scripts/bash-based-configure \
+      --replace 'if (make -v | grep "GNU Make") > /dev/null 2>&1 ;' \
+                'if make -v | grep "GNU Make" > /dev/null 2>&1 ;'
   '';
 
   configureFlags = [

From a6ebca448e327cc0e415fdbe60f729da84c893b2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 17:28:22 +0100
Subject: [PATCH 371/727] iproute: update fan patches

---
 .../linux/iproute/1000-ubuntu-poc-fan-driver.patch            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch b/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch
index e0c8278d488..733a5122d13 100644
--- a/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch
+++ b/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch
@@ -6,10 +6,10 @@ Index: iproute2-4.1.1/include/linux/if_tunnel.h
 ===================================================================
 --- iproute2-4.1.1.orig/include/linux/if_tunnel.h
 +++ iproute2-4.1.1/include/linux/if_tunnel.h
-@@ -57,6 +57,9 @@ enum {
- 	IFLA_IPTUN_ENCAP_FLAGS,
+@@ -75,6 +75,9 @@ enum {
  	IFLA_IPTUN_ENCAP_SPORT,
  	IFLA_IPTUN_ENCAP_DPORT,
+	IFLA_IPTUN_COLLECT_METADATA,
 +
 +	IFLA_IPTUN_FAN_UNDERLAY = 32,
 +

From 87a5de01a7ed56330c8b360aa3ee00c70a248d59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2017 09:55:38 +0100
Subject: [PATCH 372/727] LTS Haskell 7.16

---
 .../configuration-hackage2nix.yaml            | 83 +++++++++----------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 99d211bf67f..23e452baa78 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 7.15
+  # LTS Haskell 7.16
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -135,7 +135,7 @@ default-package-overrides:
   - amazonka-test ==1.4.3
   - amazonka-waf ==1.4.3
   - amazonka-workspaces ==1.4.3
-  - amqp ==0.14.0
+  - amqp ==0.14.1
   - angel ==0.6.2
   - annotated-wl-pprint ==0.7.0
   - anonymous-sums ==0.4.0.0
@@ -166,7 +166,7 @@ default-package-overrides:
   - attoparsec-expr ==0.1.1.2
   - authenticate ==1.3.3.2
   - authenticate-oauth ==1.5.1.2
-  - auto ==0.4.3.0
+  - auto ==0.4.3.1
   - auto-update ==0.1.4
   - autoexporter ==0.2.3
   - aws ==0.14.1
@@ -288,7 +288,7 @@ default-package-overrides:
   - cgi ==3001.3.0.2
   - ChannelT ==0.0.0.2
   - charset ==0.3.7.1
-  - charsetdetect-ae ==1.1.0.1
+  - charsetdetect-ae ==1.1.0.2
   - Chart ==1.8.1
   - Chart-cairo ==1.8.1
   - Chart-diagrams ==1.8.1
@@ -324,7 +324,7 @@ default-package-overrides:
   - clckwrks-theme-bootstrap ==0.4.2.1
   - cli ==0.1.2
   - clientsession ==0.9.1.2
-  - Clipboard ==2.3.0.2
+  - Clipboard ==2.3.1.0
   - clock ==0.7.2
   - clumpiness ==0.17.0.0
   - ClustalParser ==1.1.4
@@ -340,7 +340,7 @@ default-package-overrides:
   - comonad ==5
   - comonad-transformers ==4.0
   - comonads-fd ==4.0
-  - compactmap ==0.1.4.1
+  - compactmap ==0.1.4.2
   - compdata ==0.10.1
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
@@ -397,7 +397,7 @@ default-package-overrides:
   - cryptohash-sha1 ==0.11.100.1
   - cryptohash-sha256 ==0.11.100.1
   - cryptol ==2.4.0
-  - cryptonite ==0.19
+  - cryptonite ==0.21
   - cryptonite-conduit ==0.1
   - css-syntax ==0.0.5
   - css-text ==0.1.2.2
@@ -405,7 +405,7 @@ default-package-overrides:
   - ctrie ==0.1.1.0
   - cubicspline ==0.1.2
   - curl ==1.3.8
-  - darcs ==2.12.4
+  - darcs ==2.12.5
   - data-accessor ==0.2.2.7
   - data-accessor-mtl ==0.2.0.4
   - data-binary-ieee754 ==0.4.4
@@ -424,7 +424,7 @@ default-package-overrides:
   - data-reify ==0.6.1
   - dataurl ==0.1.0.0
   - DAV ==1.3.1
-  - dawg-ord ==0.5.0.2
+  - dawg-ord ==0.5.1.0
   - dbus ==0.10.12
   - debian-build ==0.10.1.0
   - Decimal ==0.4.2
@@ -581,7 +581,7 @@ default-package-overrides:
   - focus ==0.1.5
   - fold-debounce ==0.2.0.4
   - fold-debounce-conduit ==0.1.0.4
-  - foldl ==1.2.2
+  - foldl ==1.2.3
   - FontyFruity ==0.5.3.2
   - force-layout ==0.4.0.6
   - forecast-io ==0.2.0.0
@@ -621,9 +621,9 @@ default-package-overrides:
   - ghc-paths ==0.1.0.9
   - ghc-syb-utils ==0.2.3
   - ghc-tcplugins-extra ==0.2
-  - ghc-typelits-extra ==0.2.1
-  - ghc-typelits-knownnat ==0.2.2
-  - ghc-typelits-natnormalise ==0.5.1
+  - ghc-typelits-extra ==0.2.2
+  - ghc-typelits-knownnat ==0.2.3
+  - ghc-typelits-natnormalise ==0.5.2
   - ghcid ==0.6.6
   - ghcjs-codemirror ==0.0.0.1
   - ghcjs-hplay ==0.3.4.2
@@ -641,7 +641,7 @@ default-package-overrides:
   - gi-soup ==2.4.3
   - gi-webkit ==3.0.3
   - gio ==0.13.3.1
-  - gipeda ==0.3.3.0
+  - gipeda ==0.3.3.1
   - giphy-api ==0.4.0.0
   - git-fmt ==0.4.1.0
   - github-types ==0.2.1
@@ -772,7 +772,7 @@ default-package-overrides:
   - groupoids ==4.0
   - groups ==0.4.0.0
   - gtk ==0.14.6
-  - gtk2hs-buildtools ==0.13.2.1
+  - gtk2hs-buildtools ==0.13.2.2
   - gtk3 ==0.14.6
   - gtksourceview3 ==0.13.3.1
   - H ==0.9.0.1
@@ -789,7 +789,7 @@ default-package-overrides:
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
   - hapistrano ==0.2.1.2
-  - happstack-authenticate ==2.3.4.6
+  - happstack-authenticate ==2.3.4.7
   - happstack-clientsession ==7.3.1
   - happstack-hsp ==7.3.7.1
   - happstack-jmacro ==7.0.11
@@ -803,7 +803,7 @@ default-package-overrides:
   - hashable-time ==0.2
   - hashmap ==1.3.2
   - hashtables ==1.2.1.0
-  - haskeline ==0.7.2.3
+  - haskeline ==0.7.3.0
   - haskell-gi ==0.18
   - haskell-gi-base ==0.18.4
   - haskell-lexer ==1.0.1
@@ -822,7 +822,7 @@ default-package-overrides:
   - hastache ==0.6.1
   - hasty-hamiltonian ==1.1.5
   - HaTeX ==3.17.1.0
-  - hatex-guide ==1.3.1.5
+  - hatex-guide ==1.3.1.6
   - hbayes ==0.5.2
   - hbeanstalk ==0.2.4
   - Hclip ==3.0.0.4
@@ -876,11 +876,11 @@ default-package-overrides:
   - hostname-validate ==1.0.0
   - hourglass ==0.2.10
   - hpack-convert ==0.14.6
-  - hpc-coveralls ==1.0.6
+  - hpc-coveralls ==1.0.8
   - hPDB ==1.2.0.9
   - hPDB-examples ==1.2.0.7
   - HPDF ==1.4.10
-  - hpio ==0.8.0.4
+  - hpio ==0.8.0.5
   - hprotoc ==2.4.0
   - hquantlib ==0.0.3.3
   - hreader ==1.0.2
@@ -991,7 +991,7 @@ default-package-overrides:
   - ini ==0.3.5
   - inline-c ==0.5.5.9
   - inline-c-cpp ==0.1.0.0
-  - inline-r ==0.9.0.0
+  - inline-r ==0.9.0.1
   - insert-ordered-containers ==0.1.0.1
   - integration ==0.2.1
   - intero ==0.1.20
@@ -1006,7 +1006,7 @@ default-package-overrides:
   - io-memoize ==1.1.1.0
   - io-region ==0.1.1
   - io-storage ==0.3
-  - io-streams ==1.3.5.0
+  - io-streams ==1.3.6.0
   - io-streams-haproxy ==1.0.0.1
   - ip6addr ==0.5.2
   - iproute ==1.7.1
@@ -1089,7 +1089,7 @@ default-package-overrides:
   - libxml-sax ==0.7.5
   - LibZip ==1.0.1
   - lift-generics ==0.1.1
-  - lifted-async ==0.9.0
+  - lifted-async ==0.9.1
   - lifted-base ==0.2.3.8
   - line ==1.0.1.0
   - linear ==1.20.5
@@ -1108,7 +1108,7 @@ default-package-overrides:
   - logict ==0.6.0.2
   - loop ==0.3.0
   - lrucache ==1.2.0.0
-  - lrucaching ==0.3.0
+  - lrucaching ==0.3.1
   - ltext ==0.1.2.1
   - lucid ==2.9.7
   - lucid-svg ==0.7.0.0
@@ -1138,11 +1138,11 @@ default-package-overrides:
   - MFlow ==0.4.6.0
   - microformats2-parser ==1.0.1.6
   - microlens ==0.4.7.0
-  - microlens-aeson ==2.1.1.2
+  - microlens-aeson ==2.1.1.3
   - microlens-contra ==0.1.0.1
   - microlens-ghc ==0.4.7.0
   - microlens-mtl ==0.1.10.0
-  - microlens-platform ==0.3.7.0
+  - microlens-platform ==0.3.7.1
   - microlens-th ==0.4.1.1
   - mighty-metropolis ==1.0.4
   - mime-mail ==0.4.12
@@ -1324,7 +1324,7 @@ default-package-overrides:
   - phantom-state ==0.2.1.2
   - picoparsec ==0.1.2.3
   - pinboard ==0.9.6
-  - pinch ==0.3.0.1
+  - pinch ==0.3.0.2
   - pinchot ==0.22.0.0
   - pipes ==4.1.9
   - pipes-aeson ==0.4.1.7
@@ -1343,7 +1343,7 @@ default-package-overrides:
   - pipes-mongodb ==0.1.0.0
   - pipes-network ==0.6.4.1
   - pipes-parse ==3.0.8
-  - pipes-random ==1.0.0.2
+  - pipes-random ==1.0.0.3
   - pipes-safe ==2.2.4
   - pipes-text ==0.0.2.5
   - pipes-wai ==3.2.0
@@ -1361,7 +1361,7 @@ default-package-overrides:
   - posix-realtime ==0.0.0.4
   - post-mess-age ==0.2.1.0
   - postgresql-binary ==0.9.1.1
-  - postgresql-libpq ==0.9.2.0
+  - postgresql-libpq ==0.9.3.0
   - postgresql-query ==3.0.1
   - postgresql-schema ==0.1.10
   - postgresql-simple ==0.5.2.1
@@ -1408,7 +1408,7 @@ default-package-overrides:
   - purescript-bridge ==0.8.0.1
   - pwstore-fast ==2.4.4
   - pwstore-purehaskell ==2.1.4
-  - quantum-random ==0.6.3
+  - quantum-random ==0.6.4
   - QuasiText ==0.1.2.6
   - questioner ==0.1.1.0
   - quickbench ==1.0
@@ -1531,7 +1531,6 @@ default-package-overrides:
   - serf ==0.1.1.0
   - servant ==0.8.1
   - servant-aeson-specs ==0.5.2.0
-  - servant-auth-cookie ==0.3.2
   - servant-blaze ==0.7.1
   - servant-cassava ==0.8
   - servant-client ==0.8.1
@@ -1582,9 +1581,9 @@ default-package-overrides:
   - skeletons ==0.4.0
   - slave-thread ==1.0.2
   - slug ==0.1.6
-  - smallcaps ==0.6.0.3
+  - smallcaps ==0.6.0.4
   - smallcheck ==1.1.1
-  - smoothie ==0.4.2.4
+  - smoothie ==0.4.2.6
   - smsaero ==0.6.2
   - smtLib ==1.0.8
   - smtp-mail ==0.1.4.6
@@ -1642,7 +1641,7 @@ default-package-overrides:
   - storable-record ==0.0.3.1
   - store ==0.2.1.2
   - store-core ==0.2.0.2
-  - Strafunski-StrategyLib ==5.0.0.9
+  - Strafunski-StrategyLib ==5.0.0.10
   - stratosphere ==0.1.6
   - streaming ==0.1.4.3
   - streaming-bytestring ==0.1.4.5
@@ -1736,7 +1735,7 @@ default-package-overrides:
   - tf-random ==0.5
   - th-data-compat ==0.0.2.2
   - th-desugar ==1.6
-  - th-expand-syns ==0.4.1.0
+  - th-expand-syns ==0.4.2.0
   - th-extras ==0.0.0.4
   - th-lift ==0.7.6
   - th-lift-instances ==0.1.11
@@ -1764,7 +1763,7 @@ default-package-overrides:
   - timezone-series ==0.1.6.1
   - tinylog ==0.14.0
   - tinytemplate ==0.1.2.0
-  - tls ==1.3.8
+  - tls ==1.3.9
   - tls-debug ==0.4.4
   - token-bucket ==0.1.0.1
   - tostring ==0.2.1.1
@@ -1799,7 +1798,7 @@ default-package-overrides:
   - typelits-witnesses ==0.2.3.0
   - typography-geometry ==1.0.0.1
   - tzdata ==0.1.20160614.0
-  - ua-parser ==0.7.2
+  - ua-parser ==0.7.3
   - uglymemo ==0.1.0.1
   - unbound ==0.5.1
   - unbound-generics ==0.3.1
@@ -1833,7 +1832,7 @@ default-package-overrides:
   - uri-encode ==1.5.0.5
   - url ==2.1.3
   - urlpath ==5.0.0.1
-  - userid ==0.1.2.7
+  - userid ==0.1.2.8
   - users ==0.5.0.0
   - users-postgresql-simple ==0.5.0.2
   - users-test ==0.5.0.1
@@ -1845,22 +1844,22 @@ default-package-overrides:
   - uuid ==1.3.13
   - uuid-orphans ==1.4.1
   - uuid-types ==1.0.3
-  - vado ==0.0.7
+  - vado ==0.0.8
   - validate-input ==0.4.0.0
   - validation ==0.5.4
   - validity ==0.3.0.4
   - varying ==0.5.0.3
   - vault ==0.3.0.6
-  - vcswrapper ==0.1.3
+  - vcswrapper ==0.1.5
   - vector ==0.11.0.0
   - vector-algorithms ==0.7.0.1
-  - vector-binary-instances ==0.2.3.3
+  - vector-binary-instances ==0.2.3.4
   - vector-buffer ==0.4.1
   - vector-fftw ==0.1.3.7
   - vector-instances ==3.3.1
   - vector-space ==0.10.4
   - vector-th-unbox ==0.2.1.6
-  - vectortiles ==1.2.0.1
+  - vectortiles ==1.2.0.2
   - versions ==3.0.0
   - vhd ==0.2.2
   - ViennaRNAParser ==1.2.9

From db4bcbe7e1d16e6fa0bf3a7ac94b9ee3a096dbdd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2017 10:34:47 +0100
Subject: [PATCH 373/727] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/de841f22822055b7e383395441f5136acb5bd8b1.
---
 .../haskell-modules/hackage-packages.nix      | 1270 +++++------------
 1 file changed, 358 insertions(+), 912 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b1f8ac909d6..4648208c2af 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2759,18 +2759,6 @@ self: {
      }) {};
 
   "Clipboard" = callPackage
-    ({ mkDerivation, base, directory, unix, utf8-string, X11 }:
-     mkDerivation {
-       pname = "Clipboard";
-       version = "2.3.0.2";
-       sha256 = "c746972095b1c4473208992bb6f267a9b3ba2620b722922f0f4c35d71c71e939";
-       libraryHaskellDepends = [ base directory unix utf8-string X11 ];
-       homepage = "http://haskell.org/haskellwiki/Clipboard";
-       description = "System clipboard interface";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Clipboard_2_3_1_0" = callPackage
     ({ mkDerivation, base, directory, unix, utf8-string, X11 }:
      mkDerivation {
        pname = "Clipboard";
@@ -2780,7 +2768,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Clipboard";
        description = "System clipboard interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ClustalParser" = callPackage
@@ -16187,17 +16174,6 @@ self: {
      }) {};
 
   "Strafunski-StrategyLib" = callPackage
-    ({ mkDerivation, base, directory, mtl, syb, transformers }:
-     mkDerivation {
-       pname = "Strafunski-StrategyLib";
-       version = "5.0.0.9";
-       sha256 = "c8e464538cd27c4f2636eb25dcd1a1ef1df680f89600219baa2ca21ce2a98e1d";
-       libraryHaskellDepends = [ base directory mtl syb transformers ];
-       description = "Library for strategic programming";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Strafunski-StrategyLib_5_0_0_10" = callPackage
     ({ mkDerivation, base, directory, mtl, syb, transformers }:
      mkDerivation {
        pname = "Strafunski-StrategyLib";
@@ -16206,7 +16182,6 @@ self: {
        libraryHaskellDepends = [ base directory mtl syb transformers ];
        description = "Library for strategic programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "StrappedTemplates" = callPackage
@@ -21877,6 +21852,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "alternators" = callPackage
+    ({ mkDerivation, base, mmorph, transformers }:
+     mkDerivation {
+       pname = "alternators";
+       version = "0.1.1.0";
+       sha256 = "f95d9a4826c57194e2a22e41a9f0eaef0e96cf95f6372179aa7c47bc3ca8f627";
+       libraryHaskellDepends = [ base mmorph transformers ];
+       homepage = "https://github.com/louispan/alternators#readme";
+       description = "Handy functions when using transformers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "altfloat" = callPackage
     ({ mkDerivation, base, ghc-prim, integer-gmp }:
      mkDerivation {
@@ -25078,34 +25065,6 @@ self: {
      }) {};
 
   "amqp" = callPackage
-    ({ mkDerivation, base, binary, bytestring, clock, connection
-     , containers, data-binary-ieee754, hspec, hspec-expectations
-     , monad-control, network, network-uri, split, stm, text, vector
-     , xml
-     }:
-     mkDerivation {
-       pname = "amqp";
-       version = "0.14.0";
-       sha256 = "32d8c07217713e8aa97d79f07847ea147a657cd86292f0a0cc2dbbb62da35ab1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring clock connection containers
-         data-binary-ieee754 monad-control network network-uri split stm
-         text vector
-       ];
-       executableHaskellDepends = [ base containers xml ];
-       testHaskellDepends = [
-         base binary bytestring clock connection containers
-         data-binary-ieee754 hspec hspec-expectations network network-uri
-         split stm text vector
-       ];
-       homepage = "https://github.com/hreinhardt/amqp";
-       description = "Client library for AMQP servers (currently only RabbitMQ)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "amqp_0_14_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, connection
      , containers, data-binary-ieee754, hspec, hspec-expectations
      , monad-control, network, network-uri, split, stm, text, vector
@@ -25131,7 +25090,6 @@ self: {
        homepage = "https://github.com/hreinhardt/amqp";
        description = "Client library for AMQP servers (currently only RabbitMQ)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amqp-conduit" = callPackage
@@ -28678,24 +28636,6 @@ self: {
      }) {};
 
   "auto" = callPackage
-    ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
-     , deepseq, MonadRandom, profunctors, random, semigroups
-     , transformers
-     }:
-     mkDerivation {
-       pname = "auto";
-       version = "0.4.3.0";
-       sha256 = "c836cdc107b3d131129340b74285c55b8d65dc217e3c6f0a79bdc742a0062c8e";
-       libraryHaskellDepends = [
-         base base-orphans bytestring cereal containers deepseq MonadRandom
-         profunctors random semigroups transformers
-       ];
-       homepage = "https://github.com/mstksg/auto";
-       description = "Denotative, locally stateful programming DSL & platform";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "auto_0_4_3_1" = callPackage
     ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
      , deepseq, MonadRandom, profunctors, random, semigroups
      , transformers
@@ -28711,7 +28651,6 @@ self: {
        homepage = "https://github.com/mstksg/auto";
        description = "Denotative, locally stateful programming DSL & platform";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "auto-update" = callPackage
@@ -40168,18 +40107,6 @@ self: {
      }) {};
 
   "charsetdetect-ae" = callPackage
-    ({ mkDerivation, base, bytestring }:
-     mkDerivation {
-       pname = "charsetdetect-ae";
-       version = "1.1.0.1";
-       sha256 = "1da16c91136cfe357e40522cdabcb4afc7a9f8a36a29492812e224563b1dcbf8";
-       libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://github.com/aelve/charsetdetect-ae";
-       description = "Character set detection using Mozilla's Universal Character Set Detector";
-       license = "LGPL";
-     }) {};
-
-  "charsetdetect-ae_1_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "charsetdetect-ae";
@@ -40189,7 +40116,6 @@ self: {
        homepage = "http://github.com/aelve/charsetdetect-ae";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chart-histogram" = callPackage
@@ -43990,18 +43916,6 @@ self: {
      }) {};
 
   "compactmap" = callPackage
-    ({ mkDerivation, base, containers, hspec, QuickCheck, vector }:
-     mkDerivation {
-       pname = "compactmap";
-       version = "0.1.4.1";
-       sha256 = "6475d10742293f3a5b2ce1538846223deecffd9f0d5a59f70695b6ee78b606a9";
-       libraryHaskellDepends = [ base vector ];
-       testHaskellDepends = [ base containers hspec QuickCheck ];
-       description = "A read-only memory-efficient key-value store";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "compactmap_0_1_4_2" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck, vector }:
      mkDerivation {
        pname = "compactmap";
@@ -44011,7 +43925,6 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A read-only memory-efficient key-value store";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compare-type" = callPackage
@@ -48355,8 +48268,8 @@ self: {
      }:
      mkDerivation {
        pname = "crypto-rng";
-       version = "0.1.0.0";
-       sha256 = "cde72050adb3c430de86c9c830d9fe9255ab857285c35adc20bded58f3df12cc";
+       version = "0.1.0.1";
+       sha256 = "fa374420ae0290cdf9af3955f7b4e1c8bfd8d927c067d9394be6b8b90da0b5c2";
        libraryHaskellDepends = [
          base bytestring crypto-api DRBG exceptions monad-control mtl
          transformers-base
@@ -48571,27 +48484,6 @@ self: {
      }) {};
 
   "cryptonite" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
-     , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "cryptonite";
-       version = "0.19";
-       sha256 = "1ceac099f80058111b0a57a5bd5c8f336ba875060eb69f3d1981d8bbc99885e7";
-       libraryHaskellDepends = [
-         base bytestring deepseq ghc-prim integer-gmp memory
-       ];
-       testHaskellDepends = [
-         base byteable bytestring memory tasty tasty-hunit tasty-kat
-         tasty-quickcheck
-       ];
-       homepage = "https://github.com/haskell-crypto/cryptonite";
-       description = "Cryptography Primitives sink";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cryptonite_0_21" = callPackage
     ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
      , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
      , tasty-quickcheck
@@ -48610,7 +48502,6 @@ self: {
        homepage = "https://github.com/haskell-crypto/cryptonite";
        description = "Cryptography Primitives sink";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptonite-conduit" = callPackage
@@ -49688,50 +49579,6 @@ self: {
      }) {};
 
   "darcs" = callPackage
-    ({ mkDerivation, array, async, attoparsec, base, base16-bytestring
-     , binary, bytestring, cmdargs, containers, cryptohash, curl
-     , data-ordlist, directory, fgl, filepath, FindBin, graphviz
-     , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network
-     , network-uri, old-time, parsec, process, QuickCheck, random
-     , regex-applicative, regex-compat-tdfa, sandi, shelly, split, tar
-     , terminfo, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, transformers
-     , transformers-compat, unix, unix-compat, utf8-string, vector
-     , zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "darcs";
-       version = "2.12.4";
-       sha256 = "48e836a482bd2fcfe0be499fe4f255925ce50bdcf5ce8023bb9aa359288fdc49";
-       configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array async attoparsec base base16-bytestring binary bytestring
-         containers cryptohash data-ordlist directory fgl filepath graphviz
-         hashable haskeline html HTTP mmap mtl network network-uri old-time
-         parsec process random regex-applicative regex-compat-tdfa sandi tar
-         terminfo text time transformers transformers-compat unix
-         unix-compat utf8-string vector zip-archive zlib
-       ];
-       librarySystemDepends = [ curl ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         array base bytestring cmdargs containers directory filepath FindBin
-         HUnit mtl QuickCheck shelly split test-framework
-         test-framework-hunit test-framework-quickcheck2 text zip-archive
-       ];
-       doCheck = false;
-       postInstall = ''
-         mkdir -p $out/etc/bash_completion.d
-         mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
-       '';
-       homepage = "http://darcs.net/";
-       description = "a distributed, interactive, smart revision control system";
-       license = "GPL";
-     }) {inherit (pkgs) curl;};
-
-  "darcs_2_12_5" = callPackage
     ({ mkDerivation, array, async, attoparsec, base, base16-bytestring
      , binary, bytestring, cmdargs, containers, cryptohash, curl
      , data-ordlist, directory, fgl, filepath, FindBin, graphviz
@@ -49773,7 +49620,6 @@ self: {
        homepage = "http://darcs.net/";
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) curl;};
 
   "darcs-benchmark" = callPackage
@@ -51898,27 +51744,6 @@ self: {
      }) {};
 
   "dawg-ord" = callPackage
-    ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers
-     , vector
-     }:
-     mkDerivation {
-       pname = "dawg-ord";
-       version = "0.5.0.2";
-       sha256 = "7a15c20781257d9002d3037828083da2f7adc37b04cd02c68439f9882f246a82";
-       libraryHaskellDepends = [
-         base containers mtl transformers vector
-       ];
-       testHaskellDepends = [
-         base containers HUnit mtl smallcheck tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck
-       ];
-       homepage = "https://github.com/kawu/dawg-ord";
-       description = "Directed acyclic word graphs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dawg-ord_0_5_1_0" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty
      , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers
      , vector
@@ -51937,7 +51762,6 @@ self: {
        homepage = "https://github.com/kawu/dawg-ord";
        description = "Directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbcleaner" = callPackage
@@ -55559,12 +55383,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_3_0_0" = callPackage
+  "directory_1_3_0_1" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.3.0.0";
-       sha256 = "369cd8212b0167b48ea7ad1f44a4ae7648286af21449bd816492ced03fbdd387";
+       version = "1.3.0.1";
+       sha256 = "b2b444aea7faac750efa23c994d9a16f207f12b2009cf38ba39fc7334f373f3c";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -56601,8 +56425,8 @@ self: {
      }:
      mkDerivation {
        pname = "dmenu";
-       version = "0.3.1.0";
-       sha256 = "0c5e0cc0e78ceffcb762e507e083b22ce509e21e87088052597ab1e6dc5bd899";
+       version = "0.3.1.1";
+       sha256 = "21447fcdd14d6355c5c6dd9b2d79f49f38bb24a81874a7c38dc05cdd5abbe634";
        libraryHaskellDepends = [
          base containers directory lens mtl process transformers
        ];
@@ -56617,8 +56441,8 @@ self: {
      }:
      mkDerivation {
        pname = "dmenu-pkill";
-       version = "0.1.0.0";
-       sha256 = "5dc7055896945f60231a9eeda11242c1c739d7e9eed316866597305df941fa75";
+       version = "0.1.0.1";
+       sha256 = "e36f1317fa67dd56c2daf5193a91f33c26ffac481c90d1aadbdceecc5d9ebb78";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -56635,8 +56459,8 @@ self: {
      }:
      mkDerivation {
        pname = "dmenu-pmount";
-       version = "0.1.0.0";
-       sha256 = "2a7bc00b47554944c5ac3a88897325d47dcf64bdc9f229214ea64474cfb5009c";
+       version = "0.1.0.1";
+       sha256 = "c5cbdbea006bc4f62256b907c6845cbdabe6425116949f9af398770ba57f6643";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -56653,8 +56477,8 @@ self: {
      }:
      mkDerivation {
        pname = "dmenu-search";
-       version = "0.1.0.0";
-       sha256 = "c3aa52379389c120b2858796baa0b1dc21212573ed2ca4cf2b5b9141196094c6";
+       version = "0.1.0.1";
+       sha256 = "8ab29fe89764bab3ed4f0d4f8d99145c9c43945ea37db4d04b313c74e4b33ec9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -66367,23 +66191,6 @@ self: {
      }) {};
 
   "foldl" = callPackage
-    ({ mkDerivation, base, bytestring, comonad, containers
-     , contravariant, mwc-random, primitive, profunctors, text
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "foldl";
-       version = "1.2.2";
-       sha256 = "c869deb0dc7d41d496539968968ff6045022d1286dfb2c1d53f61dc974f455eb";
-       libraryHaskellDepends = [
-         base bytestring comonad containers contravariant mwc-random
-         primitive profunctors text transformers vector
-       ];
-       description = "Composable, streaming, and efficient left folds";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "foldl_1_2_3" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, mwc-random, primitive, profunctors, text
      , transformers, vector
@@ -66398,7 +66205,6 @@ self: {
        ];
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-incremental" = callPackage
@@ -70601,6 +70407,45 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "ghc-mod_5_7_0_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper
+     , containers, deepseq, directory, djinn-ghc, doctest, extra
+     , fclabels, filepath, ghc, ghc-boot, ghc-paths, ghc-syb-utils
+     , haskell-src-exts, hlint, hspec, monad-control, monad-journal, mtl
+     , old-time, optparse-applicative, pipes, pretty, process, safe
+     , semigroups, split, syb, template-haskell, temporary, text, time
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "ghc-mod";
+       version = "5.7.0.0";
+       sha256 = "2aab240c89ab6513807cea4e2065d474274a5ae20f8edc4f77df8e2eafb9e5ca";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [
+         base Cabal containers filepath process template-haskell
+         transformers
+       ];
+       libraryHaskellDepends = [
+         base binary bytestring cabal-helper containers deepseq directory
+         djinn-ghc extra fclabels filepath ghc ghc-boot ghc-paths
+         ghc-syb-utils haskell-src-exts hlint monad-control monad-journal
+         mtl old-time optparse-applicative pipes pretty process safe split
+         syb template-haskell temporary text time transformers
+         transformers-base
+       ];
+       executableHaskellDepends = [
+         base binary deepseq directory fclabels filepath ghc monad-control
+         mtl old-time optparse-applicative pretty process semigroups split
+         time
+       ];
+       testHaskellDepends = [ base doctest hspec ];
+       homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
+       description = "Happy Haskell Programming";
+       license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-mtl" = callPackage
     ({ mkDerivation, base, exceptions, extensible-exceptions, ghc, mtl
      }:
@@ -70892,28 +70737,6 @@ self: {
      }) {};
 
   "ghc-typelits-extra" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
-     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
-     , singletons, tasty, tasty-hunit, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-extra";
-       version = "0.2.1";
-       sha256 = "bc76eccd4686d12e77ada1b08c8bb087d46d102acedf37c502391a5da01d55f8";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra ghc-typelits-knownnat
-         ghc-typelits-natnormalise integer-gmp singletons transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
-         tasty-hunit template-haskell
-       ];
-       homepage = "http://www.clash-lang.org/";
-       description = "Additional type-level operations on GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-extra_0_2_2" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
      , singletons, tasty, tasty-hunit, template-haskell, transformers
@@ -70933,31 +70756,9 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "Additional type-level operations on GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-knownnat" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
-     , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-knownnat";
-       version = "0.2.2";
-       sha256 = "5236eda806fd52ec51a9a10666129d1c66e20c45e4167008f1b7442a25353f12";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons
-         template-haskell transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-natnormalise singletons tasty tasty-hunit
-       ];
-       homepage = "http://clash-lang.org/";
-       description = "Derive KnownNat constraints from other KnownNat constraints";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-knownnat_0_2_3" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit
      , template-haskell, transformers
@@ -70976,27 +70777,9 @@ self: {
        homepage = "http://clash-lang.org/";
        description = "Derive KnownNat constraints from other KnownNat constraints";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-natnormalise" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
-     , tasty-hunit, template-haskell
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-natnormalise";
-       version = "0.5.1";
-       sha256 = "999459e94b1b577d5ad591390f56b2b29ccf6c1244d1c2d09ffae11524629b4c";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra integer-gmp
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
-       homepage = "http://www.clash-lang.org/";
-       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-natnormalise_0_5_2" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
      , tasty-hunit, template-haskell
      }:
@@ -71011,7 +70794,6 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-presburger" = callPackage
@@ -72417,29 +72199,6 @@ self: {
      }) {system-glib = pkgs.glib;};
 
   "gipeda" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cassava
-     , concurrent-output, containers, directory, extra, file-embed
-     , filepath, gitlib, gitlib-libgit2, scientific, shake, split
-     , tagged, text, transformers, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "gipeda";
-       version = "0.3.3.0";
-       sha256 = "9b3f111ed3b980a5b9a721948df16c6a05b28f3a805657d0cfa271e356169744";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base bytestring cassava concurrent-output containers
-         directory extra file-embed filepath gitlib gitlib-libgit2
-         scientific shake split tagged text transformers
-         unordered-containers vector yaml
-       ];
-       homepage = "https://github.com/nomeata/gipeda";
-       description = "Git Performance Dashboard";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "gipeda_0_3_3_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava
      , concurrent-output, containers, directory, extra, file-embed
      , filepath, gitlib, gitlib-libgit2, scientific, shake, split
@@ -72460,7 +72219,6 @@ self: {
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "giphy-api" = callPackage
@@ -73641,6 +73399,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glaze" = callPackage
+    ({ mkDerivation, base, lens }:
+     mkDerivation {
+       pname = "glaze";
+       version = "0.2.0.0";
+       sha256 = "ab8552b9ccf26ddcf3af418a4ab8f7225e24f2141fc4171f8e10f6bfd8f6d7c5";
+       libraryHaskellDepends = [ base lens ];
+       homepage = "https://github.com/louispan/glaze#readme";
+       description = "Framework for rendering things with metadata/headers and values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gli" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , friendly-time, http-client, http-client-tls, http-conduit
@@ -79201,27 +78971,6 @@ self: {
      }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs) x11;};
 
   "gtk2hs-buildtools" = callPackage
-    ({ mkDerivation, alex, array, base, Cabal, containers, directory
-     , filepath, happy, hashtables, pretty, process, random
-     }:
-     mkDerivation {
-       pname = "gtk2hs-buildtools";
-       version = "0.13.2.1";
-       sha256 = "86ea21a2e07d83dcff57eb224a7c76835fb4ea561e4d6ba9b52b8035b38d064b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base Cabal containers directory filepath hashtables pretty
-         process random
-       ];
-       libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [ base ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
-       description = "Tools to build the Gtk2Hs suite of User Interface libraries";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "gtk2hs-buildtools_0_13_2_2" = callPackage
     ({ mkDerivation, alex, array, base, Cabal, containers, directory
      , filepath, happy, hashtables, pretty, process, random
      }:
@@ -79240,7 +78989,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Tools to build the Gtk2Hs suite of User Interface libraries";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-glade" = callPackage
@@ -82558,35 +82306,6 @@ self: {
      }) {};
 
   "happstack-authenticate" = callPackage
-    ({ mkDerivation, acid-state, aeson, authenticate, base
-     , base64-bytestring, boomerang, bytestring, containers
-     , data-default, email-validate, filepath, happstack-hsp
-     , happstack-jmacro, happstack-server, hsp, hsx-jmacro, hsx2hs
-     , http-conduit, http-types, ixset-typed, jmacro, jwt, lens
-     , mime-mail, mtl, pwstore-purehaskell, random, safecopy
-     , shakespeare, text, time, unordered-containers, userid, web-routes
-     , web-routes-boomerang, web-routes-happstack, web-routes-hsp
-     , web-routes-th
-     }:
-     mkDerivation {
-       pname = "happstack-authenticate";
-       version = "2.3.4.6";
-       sha256 = "633fb4d68122bd33725adb4f39e348b0ca293041abbf9941a3e5e2ce784d641a";
-       libraryHaskellDepends = [
-         acid-state aeson authenticate base base64-bytestring boomerang
-         bytestring containers data-default email-validate filepath
-         happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro
-         hsx2hs http-conduit http-types ixset-typed jmacro jwt lens
-         mime-mail mtl pwstore-purehaskell random safecopy shakespeare text
-         time unordered-containers userid web-routes web-routes-boomerang
-         web-routes-happstack web-routes-hsp web-routes-th
-       ];
-       homepage = "http://www.happstack.com/";
-       description = "Happstack Authentication Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "happstack-authenticate_2_3_4_7" = callPackage
     ({ mkDerivation, acid-state, aeson, authenticate, base
      , base64-bytestring, boomerang, bytestring, containers
      , data-default, email-validate, filepath, happstack-hsp
@@ -82613,7 +82332,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -87139,23 +86857,6 @@ self: {
      }) {};
 
   "hatex-guide" = callPackage
-    ({ mkDerivation, base, blaze-html, directory, filepath, HaTeX
-     , parsec, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "hatex-guide";
-       version = "1.3.1.5";
-       sha256 = "da69f3ea3b9736d69b64ab3c5fdc8b27afc0e9723c7bd1e725e9cd0f1affc34c";
-       libraryHaskellDepends = [
-         base blaze-html directory filepath HaTeX parsec text time
-         transformers
-       ];
-       description = "HaTeX User's Guide";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hatex-guide_1_3_1_6" = callPackage
     ({ mkDerivation, base, blaze-html, directory, filepath, HaTeX
      , parsec, text, time, transformers
      }:
@@ -88612,8 +88313,8 @@ self: {
        pname = "heist";
        version = "1.0.1.0";
        sha256 = "fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb";
-       revision = "2";
-       editedCabalFile = "17d5d80fc0a124f4e7159d50458067418ee6578484fb71b64f128aecc45cb663";
+       revision = "3";
+       editedCabalFile = "35bff91163943a30b86f87edf1873568e88b12ebe70a66d3f5fc146c6af4d84f";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist filepath hashable
@@ -90554,8 +90255,8 @@ self: {
      }:
      mkDerivation {
        pname = "hills";
-       version = "0.1.2.3";
-       sha256 = "b2a3f0f1f0936691c26251e2dc92915279bde51d45355d3646cd41403ac597ad";
+       version = "0.1.2.4";
+       sha256 = "d886279bb0c6fe69be9e9d3e520e3ff70fee99eeca7b517c69c4ffa706555643";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -94426,33 +94127,6 @@ self: {
      }) {};
 
   "hpc-coveralls" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
-     , containers, curl, directory, directory-tree, hpc, HUnit, process
-     , pureMD5, regex-posix, retry, safe, split, transformers
-     }:
-     mkDerivation {
-       pname = "hpc-coveralls";
-       version = "1.0.6";
-       sha256 = "e58739ab2c0db02770911927aa534e04c808b38f11b39b646c14b0cab802cf84";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring Cabal cmdargs containers curl directory
-         directory-tree hpc process pureMD5 retry safe split transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base bytestring Cabal cmdargs containers curl directory
-         directory-tree hpc process pureMD5 regex-posix retry safe split
-         transformers
-       ];
-       testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
-       description = "Coveralls.io support for Haskell.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hpc-coveralls_1_0_8" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
      , containers, curl, directory, directory-tree, hpc, HUnit, process
      , pureMD5, regex-posix, retry, safe, split, transformers
@@ -94528,37 +94202,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.4";
-       sha256 = "68a97e2a83f2b21143e96ee607726bcf23251ce36bff901bdc60024bb3fbe4f3";
-       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_5" = callPackage
     ({ mkDerivation, async, base, base-compat, bytestring, containers
      , directory, doctest, exceptions, filepath, hlint, hspec, mtl
      , mtl-compat, optparse-applicative, QuickCheck, text, transformers
@@ -94587,7 +94230,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
@@ -96460,6 +96102,21 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {inherit (pkgs) adns;};
 
+  "hsdns_1_7" = callPackage
+    ({ mkDerivation, adns, base, containers, network }:
+     mkDerivation {
+       pname = "hsdns";
+       version = "1.7";
+       sha256 = "48960ac9e1f0d1e338170aac35f6fd7e064a3b36314894f4a968113385205cd3";
+       libraryHaskellDepends = [ base containers network ];
+       librarySystemDepends = [ adns ];
+       homepage = "http://github.com/peti/hsdns";
+       description = "Asynchronous DNS Resolver";
+       license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {inherit (pkgs) adns;};
+
   "hsdns-cache" = callPackage
     ({ mkDerivation, base, hsdns, network, SafeSemaphore, text, time
      , unordered-containers
@@ -104733,6 +104390,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-c_0_5_6_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
+     , containers, cryptohash, directory, filepath, hashable, hspec, mtl
+     , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix
+     , template-haskell, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "inline-c";
+       version = "0.5.6.0";
+       sha256 = "ea9ae36f9716f714d8a6b9d758c1f839862e5ced38c265d9fd7e65051d04d554";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base binary bytestring containers cryptohash
+         directory filepath hashable mtl parsec parsers QuickCheck
+         template-haskell transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base containers hashable hspec parsers QuickCheck
+         raw-strings-qq regex-posix template-haskell transformers
+         unordered-containers vector
+       ];
+       description = "Write Haskell source files including C code inline. No FFI required.";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inline-c-cpp" = callPackage
     ({ mkDerivation, base, inline-c, template-haskell }:
      mkDerivation {
@@ -104787,39 +104469,6 @@ self: {
      }) {};
 
   "inline-r" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, c2hs, containers
-     , data-default-class, deepseq, directory, exceptions, filepath
-     , ieee754, mtl, pretty, primitive, process, quickcheck-assertions
-     , R, reflection, setenv, silently, singletons, strict, tasty
-     , tasty-expected-failure, tasty-golden, tasty-hunit
-     , tasty-quickcheck, template-haskell, temporary, text, th-lift
-     , th-orphans, transformers, unix, vector
-     }:
-     mkDerivation {
-       pname = "inline-r";
-       version = "0.9.0.0";
-       sha256 = "b066e719427b0398ab1e9bb3dec210f4e0d4ecf51e2add35ef206aeb90201e6f";
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default-class deepseq
-         exceptions mtl pretty primitive process reflection setenv
-         singletons template-haskell text th-lift th-orphans transformers
-         unix vector
-       ];
-       libraryPkgconfigDepends = [ R ];
-       libraryToolDepends = [ c2hs ];
-       testHaskellDepends = [
-         base bytestring directory filepath ieee754 mtl process
-         quickcheck-assertions silently singletons strict tasty
-         tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
-         template-haskell temporary text unix vector
-       ];
-       homepage = "https://tweag.github.io/HaskellR";
-       description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) R;};
-
-  "inline-r_0_9_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, c2hs, containers
      , data-default-class, deepseq, directory, exceptions, filepath
      , ieee754, mtl, pretty, primitive, process, quickcheck-assertions
@@ -105328,6 +104977,8 @@ self: {
        pname = "intero";
        version = "0.1.20";
        sha256 = "e93fd2df3a3cd1c6a0203420a94b0329c08b51a51ef8d5ec5a38efe61469da77";
+       revision = "1";
+       editedCabalFile = "144efed4811883db90813e73814074f1b1527d49c62b24f7583e693ef168f8b9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -105793,32 +105444,6 @@ self: {
      }) {};
 
   "io-streams" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
-     , deepseq, directory, filepath, HUnit, mtl, network, primitive
-     , process, QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, transformers, vector
-     , zlib, zlib-bindings
-     }:
-     mkDerivation {
-       pname = "io-streams";
-       version = "1.3.5.0";
-       sha256 = "6c27d7ef3c5e06f4dd3aac33d5f2354b9778455473ab314a0b58dec4794ecae0";
-       configureFlags = [ "-fnointeractivetests" ];
-       libraryHaskellDepends = [
-         attoparsec base bytestring bytestring-builder network primitive
-         process text time transformers vector zlib-bindings
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring bytestring-builder deepseq directory
-         filepath HUnit mtl network primitive process QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-         time transformers vector zlib zlib-bindings
-       ];
-       description = "Simple, composable, and easy-to-use stream I/O";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "io-streams_1_3_6_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
      , deepseq, directory, filepath, HUnit, mtl, network, primitive
      , process, QuickCheck, test-framework, test-framework-hunit
@@ -105829,6 +105454,8 @@ self: {
        pname = "io-streams";
        version = "1.3.6.0";
        sha256 = "5e2ae8363cc30d69687db98bfa6711ec53b3b104fcc1829c1e62d8de3d249e3d";
+       revision = "1";
+       editedCabalFile = "2e5ea27945eb6c0f4260a482cc77c6ebebdf160cd00fa86130f4d31342fa994f";
        configureFlags = [ "-fnointeractivetests" ];
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder network primitive
@@ -105842,7 +105469,6 @@ self: {
        ];
        description = "Simple, composable, and easy-to-use stream I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "io-streams-haproxy" = callPackage
@@ -110937,6 +110563,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {lbfgsb = null;};
 
+  "l10n" = callPackage
+    ({ mkDerivation, base, text, time }:
+     mkDerivation {
+       pname = "l10n";
+       version = "0.1.0.0";
+       sha256 = "56f935a18248473cada2bca5cef2c5e98fbab77a02f5bb075ecdc90750de6531";
+       libraryHaskellDepends = [ base text time ];
+       homepage = "https://github.com/louispan/l10n#readme";
+       description = "Enables providing localization as typeclass instances in separate files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "labeled-graph" = callPackage
     ({ mkDerivation, base, labeled-tree }:
      mkDerivation {
@@ -115151,27 +114789,6 @@ self: {
      }) {};
 
   "lifted-async" = callPackage
-    ({ mkDerivation, async, base, constraints, HUnit, lifted-base
-     , monad-control, mtl, tasty, tasty-hunit, tasty-th
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "lifted-async";
-       version = "0.9.0";
-       sha256 = "3930922419084557d8b78ad3c7202efbb599d35539adb564c2d11a6699e3d601";
-       libraryHaskellDepends = [
-         async base constraints lifted-base monad-control transformers-base
-       ];
-       testHaskellDepends = [
-         async base HUnit lifted-base monad-control mtl tasty tasty-hunit
-         tasty-th
-       ];
-       homepage = "https://github.com/maoe/lifted-async";
-       description = "Run lifted IO operations asynchronously and wait for their results";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lifted-async_0_9_1" = callPackage
     ({ mkDerivation, async, base, constraints, HUnit, lifted-base
      , monad-control, mtl, tasty, tasty-hunit, tasty-th
      , transformers-base
@@ -115190,7 +114807,6 @@ self: {
        homepage = "https://github.com/maoe/lifted-async";
        description = "Run lifted IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-base" = callPackage
@@ -118220,27 +117836,6 @@ self: {
      }) {};
 
   "lrucaching" = callPackage
-    ({ mkDerivation, base, base-compat, containers, deepseq, hashable
-     , hspec, psqueues, QuickCheck, transformers, vector
-     }:
-     mkDerivation {
-       pname = "lrucaching";
-       version = "0.3.0";
-       sha256 = "7e699143604a50f597ba4b7877fecd04e6c23bcb303fac4831056966bd521a7f";
-       revision = "1";
-       editedCabalFile = "fc9c55f797b467e6ff5dc701de45e7480a8e60cb5e3aea0ceb458807c7a15aff";
-       libraryHaskellDepends = [
-         base base-compat deepseq hashable psqueues vector
-       ];
-       testHaskellDepends = [
-         base containers deepseq hashable hspec QuickCheck transformers
-       ];
-       homepage = "https://github.com/cocreature/lrucaching#readme";
-       description = "LRU cache";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lrucaching_0_3_1" = callPackage
     ({ mkDerivation, base, base-compat, containers, deepseq, hashable
      , hspec, psqueues, QuickCheck, transformers, vector
      }:
@@ -118257,7 +117852,6 @@ self: {
        homepage = "https://github.com/cocreature/lrucaching#readme";
        description = "LRU cache";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ls-usb" = callPackage
@@ -120886,8 +120480,8 @@ self: {
      }:
      mkDerivation {
        pname = "mcm";
-       version = "0.6.4.10";
-       sha256 = "daa13513fd3b7d0c6469977020b61a659ec43fc1dab891b01ba34f39ebf8d364";
+       version = "0.6.5.0";
+       sha256 = "35dd7823314ff88d64fc533429a188f455c9dc3dc55abe12f37d791fbf22c5ed";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -120895,7 +120489,7 @@ self: {
          MissingH polyparse process text unix
        ];
        homepage = "http://interfaces.org.uk/mcm";
-       description = "Machine Configuration Manager";
+       description = "Manages the contents of files and directories";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -122051,8 +121645,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-aeson";
-       version = "2.1.1.2";
-       sha256 = "f1295f2b6b4db3118b445551ae585650e9ddb2d40bd50194514e478710840f79";
+       version = "2.1.1.3";
+       sha256 = "4e43bdbd0d258804ee4de0f78149dc93cfe1aaa2e1e235bc11b1965c94166731";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring microlens scientific text
          unordered-containers vector
@@ -122148,23 +121742,6 @@ self: {
      }) {};
 
   "microlens-platform" = callPackage
-    ({ mkDerivation, base, hashable, microlens, microlens-ghc
-     , microlens-mtl, microlens-th, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "microlens-platform";
-       version = "0.3.7.0";
-       sha256 = "8050a15818c3ee2e58b42f948aef7d658cb7d06f5007a3e58560faef39a6bf09";
-       libraryHaskellDepends = [
-         base hashable microlens microlens-ghc microlens-mtl microlens-th
-         text unordered-containers vector
-       ];
-       homepage = "http://github.com/aelve/microlens";
-       description = "Feature-complete microlens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-platform_0_3_7_1" = callPackage
     ({ mkDerivation, base, hashable, microlens, microlens-ghc
      , microlens-mtl, microlens-th, text, unordered-containers, vector
      }:
@@ -122179,7 +121756,6 @@ self: {
        homepage = "http://github.com/aelve/microlens";
        description = "Feature-complete microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-th" = callPackage
@@ -125588,8 +125164,8 @@ self: {
      }:
      mkDerivation {
        pname = "mqtt-hs";
-       version = "1.0.0";
-       sha256 = "14e4b668f27d1e1380e4a881f38441dcf02329d4708f1cd951401ebc82a771b1";
+       version = "1.0.1";
+       sha256 = "ed804b7a0576daaa389df3cb197c159439efd2b8a4386f66df6368e66cb2caf0";
        libraryHaskellDepends = [
          async attoparsec base bytestring monad-loops mtl network singletons
          stm text transformers
@@ -138017,10 +137593,11 @@ self: {
     ({ mkDerivation, base, bytestring, phonenumber }:
      mkDerivation {
        pname = "phone-numbers";
-       version = "0.0.6";
-       sha256 = "4c7027177d003112fc8d6cfb817810fb17bbf9aba3ccd52dbb56e43f6e531b69";
+       version = "0.1.0";
+       sha256 = "0eeccc920f5bb9473313da108d851c0d9d55dc2bcc9cb267d5dd3f78a9854e81";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ phonenumber ];
+       testHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/christian-marie/phone-numbers";
        description = "Haskell bindings to the libphonenumber library";
        license = stdenv.lib.licenses.bsd3;
@@ -138411,28 +137988,6 @@ self: {
      }) {};
 
   "pinch" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pinch";
-       version = "0.3.0.1";
-       sha256 = "985fb2c392ceedff92d46af9086b1b6cdcde88f65920e5afb1cbf7a4c52e8b53";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq ghc-prim hashable text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec hspec-discover QuickCheck text
-         unordered-containers vector
-       ];
-       homepage = "https://github.com/abhinav/pinch#readme";
-       description = "An alternative implementation of Thrift for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pinch_0_3_0_2" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
      , unordered-containers, vector
@@ -138452,7 +138007,6 @@ self: {
        homepage = "https://github.com/abhinav/pinch#readme";
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinchot" = callPackage
@@ -138722,6 +138276,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pipes-category" = callPackage
+    ({ mkDerivation, base, lens, mtl, pipes, pipes-extras, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-category";
+       version = "0.1.0.0";
+       sha256 = "eb8c49adca4d6787232d36e045fb8c415f195afa5f75e0846bfbef1e67456329";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base lens mtl pipes pipes-extras ];
+       executableHaskellDepends = [ base pipes transformers ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/louispan/pipes-category#readme";
+       description = "Allows instances for Category, Arrow and ArrowChoice for Pipes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-cellular" = callPackage
     ({ mkDerivation, base, bytestring, data-cell, pipes }:
      mkDerivation {
@@ -139232,17 +138803,6 @@ self: {
      }) {};
 
   "pipes-random" = callPackage
-    ({ mkDerivation, base, mwc-random, pipes, vector }:
-     mkDerivation {
-       pname = "pipes-random";
-       version = "1.0.0.2";
-       sha256 = "1b176ae550fd31ebe8d0d5fca6f1c420b50adb2364d68f7fcaeb7006a48c6520";
-       libraryHaskellDepends = [ base mwc-random pipes vector ];
-       description = "Producers for handling randomness";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-random_1_0_0_3" = callPackage
     ({ mkDerivation, base, mwc-random, pipes, vector }:
      mkDerivation {
        pname = "pipes-random";
@@ -139251,7 +138811,6 @@ self: {
        libraryHaskellDepends = [ base mwc-random pipes vector ];
        description = "Producers for handling randomness";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-rt" = callPackage
@@ -141326,8 +140885,8 @@ self: {
     ({ mkDerivation, bytestring }:
      mkDerivation {
        pname = "postgresql-error-codes";
-       version = "1";
-       sha256 = "7e9e1c5aa7d54a0fb0ac713369726c9259e424b7e1fd091924a2212b7f63e8dd";
+       version = "1.0.1";
+       sha256 = "e6d49d3d2737d1a5da8358900d69736a485390142f891136c026fc106fd82de4";
        libraryHaskellDepends = [ bytestring ];
        homepage = "https://github.com/nikita-volkov/postgresql-error-codes";
        description = "PostgreSQL error codes";
@@ -141335,19 +140894,6 @@ self: {
      }) {};
 
   "postgresql-libpq" = callPackage
-    ({ mkDerivation, base, bytestring, postgresql }:
-     mkDerivation {
-       pname = "postgresql-libpq";
-       version = "0.9.2.0";
-       sha256 = "0338a93518bf73cd64b47977961f8183f6009b4e4ecc0c99b8bc68320808f310";
-       libraryHaskellDepends = [ base bytestring ];
-       librarySystemDepends = [ postgresql ];
-       homepage = "http://github.com/lpsmith/postgresql-libpq";
-       description = "low-level binding to libpq";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) postgresql;};
-
-  "postgresql-libpq_0_9_3_0" = callPackage
     ({ mkDerivation, base, bytestring, postgresql }:
      mkDerivation {
        pname = "postgresql-libpq";
@@ -141358,7 +140904,6 @@ self: {
        homepage = "http://github.com/lpsmith/postgresql-libpq";
        description = "low-level binding to libpq";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
   "postgresql-orm" = callPackage
@@ -141954,8 +141499,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.16";
-       sha256 = "fdcb911e5f035d4b6ee6040e7f043daa9b0c10d964ef607fef2538b1874c9d90";
+       version = "0.0.18";
+       sha256 = "9b88a25950cda8f7335ce9132b84afc21a14b052ba09709e315e7201c26ffb06";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142531,8 +142076,8 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-simple";
-       version = "1.0.0.6";
-       sha256 = "a5f816efd624ca511909674a65481c9e938d1357130b4e88040665890dcf459c";
+       version = "1.1.0.0";
+       sha256 = "ebb343d0a26d88c4700a2b60d5185b8444e879cc7ed60b79eec157b004325aa8";
        libraryHaskellDepends = [
          ansi-terminal base containers lens mono-traversable mtl parsec
          semigroups text transformers
@@ -145658,28 +145203,6 @@ self: {
      }) {};
 
   "quantum-random" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, ansigraph, base, bytestring
-     , directory, haskeline, hspec, http-conduit, mtl, QuickCheck
-     , regex-posix, terminal-size, text
-     }:
-     mkDerivation {
-       pname = "quantum-random";
-       version = "0.6.3";
-       sha256 = "ef14cb9adf4e05ed71d1707ebb773dc8be9ffd1bd8a54016f1c1f9b5c0def714";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal ansigraph base bytestring directory
-         http-conduit regex-posix terminal-size text
-       ];
-       executableHaskellDepends = [ base haskeline mtl ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "http://github.com/BlackBrane/quantum-random/";
-       description = "Retrieve, store and manage real quantum random data";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "quantum-random_0_6_4" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, ansigraph, base, bytestring
      , directory, haskeline, hspec, http-conduit, mtl, QuickCheck
      , terminal-size, text
@@ -145699,7 +145222,6 @@ self: {
        homepage = "http://github.com/BlackBrane/quantum-random/";
        description = "Retrieve, store and manage real quantum random data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qudb" = callPackage
@@ -147703,8 +147225,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "2.1.4";
-       sha256 = "e5513105bba4917caa18a41499b38a0d98114761207170674a9c559fb85ff0dc";
+       version = "2.1.5";
+       sha256 = "ee0d7107df30d4be74908d4be2a92c0042a7b7ef92ec3886045bc17babd03bbe";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -150540,8 +150062,8 @@ self: {
      }:
      mkDerivation {
        pname = "remarks";
-       version = "0.1.6";
-       sha256 = "e70849c614981dac9ed036ab389d484b683ad9af5af89a32b171510d7c84f70a";
+       version = "0.1.9";
+       sha256 = "fe76db6ef442c2b7cf234a909e359651ac7dddc9c603c78d49f2094805a1542b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base GenericPretty pretty ];
@@ -155029,14 +154551,14 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "scalpel_0_4_0" = callPackage
+  "scalpel_0_4_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, curl, data-default
      , fail, HUnit, regex-base, regex-tdfa, tagsoup, text, vector
      }:
      mkDerivation {
        pname = "scalpel";
-       version = "0.4.0";
-       sha256 = "ed252c502b138e3a3d87d8fa4b1bf88836c6bd297870532e0bf445c2f72415d8";
+       version = "0.4.1";
+       sha256 = "463028b6f62fd02f07591433b842552f7e68a650dbe3869f96e5abbbf0c6a534";
        libraryHaskellDepends = [
          base bytestring containers curl data-default fail regex-base
          regex-tdfa tagsoup text vector
@@ -157497,37 +157019,6 @@ self: {
      }) {};
 
   "servant-auth-cookie" = callPackage
-    ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
-     , blaze-markup, bytestring, cereal, cookie, cryptonite
-     , data-default, deepseq, exceptions, hspec, http-media, http-types
-     , memory, mtl, QuickCheck, servant, servant-blaze, servant-server
-     , text, time, transformers, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-auth-cookie";
-       version = "0.3.2";
-       sha256 = "c77ba7d3fb289c792aa99f6691c7d2b53f3e5dd4a2bc9ea9ebae41a3addf8080";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base64-bytestring blaze-builder bytestring cereal cookie
-         cryptonite data-default exceptions http-types memory mtl servant
-         servant-server time transformers wai
-       ];
-       executableHaskellDepends = [
-         base blaze-html blaze-markup bytestring cereal cryptonite
-         data-default http-media mtl servant servant-blaze servant-server
-         text wai warp
-       ];
-       testHaskellDepends = [
-         base bytestring cereal cryptonite data-default deepseq hspec
-         QuickCheck servant-server time
-       ];
-       description = "Authentication via encrypted cookies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-auth-cookie_0_4_2_1" = callPackage
     ({ mkDerivation, base, base-compat, base64-bytestring
      , blaze-builder, blaze-html, blaze-markup, bytestring, cereal
      , cookie, cryptonite, data-default, deepseq, exceptions, hspec
@@ -157551,7 +157042,6 @@ self: {
        ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-docs" = callPackage
@@ -159102,14 +158592,18 @@ self: {
      }) {};
 
   "sext" = callPackage
-    ({ mkDerivation, base, bytestring, template-haskell, text }:
+    ({ mkDerivation, base, bytestring, template-haskell, text, vector
+     }:
      mkDerivation {
        pname = "sext";
-       version = "0.1.1";
-       sha256 = "d954401c7c416ff8d6c8783c074c061f8268fb0042d553253afd82881284151d";
-       libraryHaskellDepends = [ base bytestring template-haskell text ];
-       homepage = "http://github.com/dzhus/sext/";
-       description = "Lists, Texts and ByteStrings with type-encoded length";
+       version = "0.1.2";
+       sha256 = "c046a0613bc8275f9e0c4c0052c2a9e9e7468fa20a1fd7f64a6d6ce5f02f46a1";
+       libraryHaskellDepends = [
+         base bytestring template-haskell text vector
+       ];
+       testHaskellDepends = [ base template-haskell ];
+       homepage = "https://github.com/dzhus/sext#readme";
+       description = "Lists, Texts, ByteStrings, and Vectors with type-encoded length";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -159351,6 +158845,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shake_0_15_11" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, directory
+     , extra, filepath, hashable, js-flot, js-jquery, primitive, process
+     , QuickCheck, random, time, transformers, unix
+     , unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "shake";
+       version = "0.15.11";
+       sha256 = "05520d833ce9563977aa57d777a644b2a2322366a9f54c1004d83967e826b1bb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery process random time transformers unix
+         unordered-containers utf8-string
+       ];
+       executableHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery primitive process random time transformers unix
+         unordered-containers utf8-string
+       ];
+       testHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery process QuickCheck random time transformers unix
+         unordered-containers utf8-string
+       ];
+       homepage = "http://shakebuild.com";
+       description = "Build system library, like Make, but more accurate dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shake-cabal-build" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, process }:
      mkDerivation {
@@ -159485,8 +159012,8 @@ self: {
     ({ mkDerivation, base, basic-prelude, directory, shake }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.13";
-       sha256 = "dbb3062ff1e3d416e3bc83efaf3da7771161cdadc9583a8eeab9c5328716919d";
+       version = "0.0.15";
+       sha256 = "056d96901beef17cdb4f7fd45777b096ef64c77944ecd0cef195ae0da499b645";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base basic-prelude directory shake ];
@@ -160851,6 +160378,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "simple-money" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "simple-money";
+       version = "0.1.0.1";
+       sha256 = "482631afc85ad0f176886a7c39093937ebd048b0a2396e9a3661ab7bb2700701";
+       libraryHaskellDepends = [ base containers ];
+       homepage = "https://github.com/nbrk/simple-money";
+       description = "Simple library to handle and interexchange money";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "simple-neural-networks" = callPackage
     ({ mkDerivation, base, containers, deepseq, parallel, random, split
      }:
@@ -161765,8 +161304,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.1.0.1";
-       sha256 = "e7cdbea2909306f97135b4444489cfff0136ec5609c22228a68201440d6304ac";
+       version = "0.1.1";
+       sha256 = "010c00a96fe61acb2650695633705a19ebda535822862887b94aadc31177945b";
        libraryHaskellDepends = [
          aeson base blaze-html bytestring case-insensitive containers
          directory filepath hxt mtl regex-pcre-builtin safe text utf8-string
@@ -162074,28 +161613,6 @@ self: {
      }) {};
 
   "smallcaps" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, data-default
-     , directory, filepath, parsec, text, transformers
-     }:
-     mkDerivation {
-       pname = "smallcaps";
-       version = "0.6.0.3";
-       sha256 = "2ec2cac6c542f3e6574f622c963a5931a424daadd4c93078fd0ac160a6705d03";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base containers data-default directory filepath parsec
-         text transformers
-       ];
-       executableHaskellDepends = [ base containers data-default text ];
-       testHaskellDepends = [
-         attoparsec base containers data-default parsec text
-       ];
-       description = "Flatten camel case text in LaTeX files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "smallcaps_0_6_0_4" = callPackage
     ({ mkDerivation, attoparsec, base, containers, data-default
      , directory, filepath, parsec, text, transformers
      }:
@@ -162115,7 +161632,6 @@ self: {
        ];
        description = "Flatten camel case text in LaTeX files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallcheck" = callPackage
@@ -162327,18 +161843,6 @@ self: {
      }) {};
 
   "smoothie" = callPackage
-    ({ mkDerivation, aeson, base, linear, text, vector }:
-     mkDerivation {
-       pname = "smoothie";
-       version = "0.4.2.4";
-       sha256 = "962e8c5927e24ebc56fa419bca2fc43db2a187c26410acd316d9914f8391d96c";
-       libraryHaskellDepends = [ aeson base linear text vector ];
-       homepage = "https://github.com/phaazon/smoothie";
-       description = "Smooth curves via several interpolation modes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "smoothie_0_4_2_6" = callPackage
     ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
        pname = "smoothie";
@@ -162348,7 +161852,6 @@ self: {
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smsaero" = callPackage
@@ -162606,8 +162109,8 @@ self: {
        pname = "snap";
        version = "1.0.0.1";
        sha256 = "293f16c1404793121d3d85abb6287bbb32f5dc1d82b12146d4bb650052322db8";
-       revision = "2";
-       editedCabalFile = "162e742faa2af87763daf5c733ae2a0ff35c9b29d68de9659c948a24b1681e62";
+       revision = "3";
+       editedCabalFile = "97c68769fdd4f5693b365da446e17a0181e2fcc2e41dbc56f37804a3204646ef";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession configurator
          containers directory directory-tree dlist filepath hashable heist
@@ -162728,6 +162231,8 @@ self: {
        pname = "snap-core";
        version = "1.0.1.0";
        sha256 = "f5d2a8b690e77b03626e7bd1856011fc2a13b286939176bde7b61c064aafa37c";
+       revision = "1";
+       editedCabalFile = "ef248be20bc9d535defbc2f091db3f48dd02e5b233a8305f8ad3c83f2f4548c8";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder case-insensitive
          containers directory filepath HUnit io-streams lifted-base
@@ -162933,6 +162438,8 @@ self: {
        pname = "snap-server";
        version = "1.0.1.1";
        sha256 = "878d83a815b9cc8f3d282ef6fafc441528b5f7819147f17f0c1b1f9904146c70";
+       revision = "1";
+       editedCabalFile = "5b9b8071df32b8590c28df9cf4eb4afd77ee4554ff536b7e5a1d617f5e32f9a7";
        configureFlags = [ "-fopenssl" ];
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring bytestring-builder
@@ -167632,6 +167139,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stm-extras" = callPackage
+    ({ mkDerivation, base, stm }:
+     mkDerivation {
+       pname = "stm-extras";
+       version = "0.1.0.0";
+       sha256 = "ee0887d762a3d541ef74038b3f23f61b6081933da024d3309c9fa5faf0bf1a5f";
+       libraryHaskellDepends = [ base stm ];
+       homepage = "https://github.com/louispan/stm-extras#readme";
+       description = "Extra STM functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stm-firehose" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, http-types
      , HUnit, resourcet, stm, stm-chans, stm-conduit, transformers, wai
@@ -169205,17 +168724,17 @@ self: {
      }) {};
 
   "structured-haskell-mode" = callPackage
-    ({ mkDerivation, applicative-quoters, base, descriptive, ghc-prim
-     , haskell-src-exts, text
+    ({ mkDerivation, base, descriptive, ghc-prim, haskell-src-exts
+     , text
      }:
      mkDerivation {
        pname = "structured-haskell-mode";
-       version = "1.0.20";
-       sha256 = "62b3673fba19d9b3eae87a0d4be6259a74fa41a8c4df34d0988796c4e2409edd";
+       version = "1.1.0";
+       sha256 = "c5517a56ebf64134b4b0f0d866357ab498a81d90469985fbeacc458c5ada38b4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         applicative-quoters base descriptive ghc-prim haskell-src-exts text
+         base descriptive ghc-prim haskell-src-exts text
        ];
        homepage = "https://github.com/chrisdone/structured-haskell-mode";
        description = "Structured editing Emacs mode for Haskell";
@@ -170799,8 +170318,8 @@ self: {
      }:
      mkDerivation {
        pname = "synthesizer-dimensional";
-       version = "0.8.0.1";
-       sha256 = "bb8b032cb291ef8f8d6dd69e49e871350ee8478961a706365a25541169672c63";
+       version = "0.8.0.2";
+       sha256 = "d687c5907132d106952e033618ab7256885aa03bc462840c68131fbd4ec1a19d";
        libraryHaskellDepends = [
          base bytestring event-list non-negative numeric-prelude random sox
          storable-record storablevector synthesizer-core transformers
@@ -171344,12 +170863,12 @@ self: {
     ({ mkDerivation, base, safe, text }:
      mkDerivation {
        pname = "tabl";
-       version = "0.1.0.0";
-       sha256 = "4adb4507af71badd8cb5f076d8c996f9e26e8102e4c2361a93bad1ae303c9b2e";
+       version = "1.0.3";
+       sha256 = "4ed4b152c4c2ec8eebc8ec1e4dae6d7dd99b1b15148ea5b43be32ed9c333b0df";
        libraryHaskellDepends = [ base safe text ];
        homepage = "https://github.com/lovasko/tabl";
        description = "Table layout";
-       license = stdenv.lib.licenses.bsd3;
+       license = "unknown";
      }) {};
 
   "table" = callPackage
@@ -172328,6 +171847,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty_0_11_1" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers
+     , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
+     , unbounded-delays
+     }:
+     mkDerivation {
+       pname = "tasty";
+       version = "0.11.1";
+       sha256 = "ab9f83401ba8b99d05bc85e2447e32416da593684daae14647777db8bb5eabdc";
+       libraryHaskellDepends = [
+         ansi-terminal async base clock containers deepseq mtl
+         optparse-applicative regex-tdfa stm tagged unbounded-delays
+       ];
+       homepage = "http://documentup.com/feuerbach/tasty";
+       description = "Modern and extensible testing framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-ant-xml" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
@@ -175294,18 +174832,6 @@ self: {
      }) {};
 
   "th-expand-syns" = callPackage
-    ({ mkDerivation, base, containers, syb, template-haskell }:
-     mkDerivation {
-       pname = "th-expand-syns";
-       version = "0.4.1.0";
-       sha256 = "c198f592cc5cd644da97209f1aca0decd10e0847dd676195cb5dcb6abbbe48ea";
-       libraryHaskellDepends = [ base containers syb template-haskell ];
-       testHaskellDepends = [ base template-haskell ];
-       description = "Expands type synonyms in Template Haskell ASTs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-expand-syns_0_4_2_0" = callPackage
     ({ mkDerivation, base, containers, syb, template-haskell }:
      mkDerivation {
        pname = "th-expand-syns";
@@ -175316,7 +174842,6 @@ self: {
        homepage = "https://github.com/DanielSchuessler/th-expand-syns";
        description = "Expands type synonyms in Template Haskell ASTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-extras" = callPackage
@@ -177395,30 +176920,6 @@ self: {
      }) {};
 
   "tls" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
-     , cereal, cryptonite, data-default-class, hourglass, memory, mtl
-     , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509
-     , x509-store, x509-validation
-     }:
-     mkDerivation {
-       pname = "tls";
-       version = "1.3.8";
-       sha256 = "b440cf011c3e7af89e1ed719c714ab1001e8d3b13ef9dd3660019d88826bb1e5";
-       libraryHaskellDepends = [
-         asn1-encoding asn1-types async base bytestring cereal cryptonite
-         data-default-class memory mtl network transformers x509 x509-store
-         x509-validation
-       ];
-       testHaskellDepends = [
-         base bytestring cereal cryptonite data-default-class hourglass mtl
-         QuickCheck tasty tasty-quickcheck x509 x509-validation
-       ];
-       homepage = "http://github.com/vincenthz/hs-tls";
-       description = "TLS/SSL protocol native implementation (Server and Client)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tls_1_3_9" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
      , cereal, cryptonite, data-default-class, hourglass, memory, mtl
      , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509
@@ -177440,7 +176941,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-tls";
        description = "TLS/SSL protocol native implementation (Server and Client)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tls-debug" = callPackage
@@ -181014,26 +180514,6 @@ self: {
      }) {};
 
   "ua-parser" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, file-embed
-     , filepath, HUnit, pcre-light, tasty, tasty-hunit, tasty-quickcheck
-     , text, yaml
-     }:
-     mkDerivation {
-       pname = "ua-parser";
-       version = "0.7.2";
-       sha256 = "469afe9d9c7d7de7405b316a388639858b515840f74ba0b4c48985559922df55";
-       libraryHaskellDepends = [
-         aeson base bytestring data-default file-embed pcre-light text yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring data-default file-embed filepath HUnit
-         pcre-light tasty tasty-hunit tasty-quickcheck text yaml
-       ];
-       description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ua-parser_0_7_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, file-embed
      , filepath, HUnit, pcre-light, tasty, tasty-hunit, tasty-quickcheck
      , text, yaml
@@ -181051,7 +180531,6 @@ self: {
        ];
        description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uacpid" = callPackage
@@ -182268,17 +181747,18 @@ self: {
 
   "universum" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
-     , exceptions, ghc-prim, hashable, mtl, safe, stm, text, text-format
-     , transformers, unordered-containers, utf8-string
+     , exceptions, ghc-prim, hashable, microlens, microlens-mtl, mtl
+     , safe, stm, text, text-format, transformers, unordered-containers
+     , utf8-string, vector
      }:
      mkDerivation {
        pname = "universum";
-       version = "0.1.12";
-       sha256 = "7826471999166223a737b5b265c489e35c208a6bb48cc8be6edf3543c147f021";
+       version = "0.2";
+       sha256 = "e913282eb9952229d109544c1f4541d8fce503d6ab77e38dc50330423d91e665";
        libraryHaskellDepends = [
          async base bytestring containers deepseq exceptions ghc-prim
-         hashable mtl safe stm text text-format transformers
-         unordered-containers utf8-string
+         hashable microlens microlens-mtl mtl safe stm text text-format
+         transformers unordered-containers utf8-string vector
        ];
        homepage = "https://github.com/serokell/universum";
        description = "Custom prelude used in Serokell";
@@ -183236,22 +182716,6 @@ self: {
      }) {};
 
   "userid" = callPackage
-    ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes
-     , web-routes-th
-     }:
-     mkDerivation {
-       pname = "userid";
-       version = "0.1.2.7";
-       sha256 = "9d8a614cf760556f40ab79f7f733161defd5240219bcd23399756c0589f2dc8c";
-       libraryHaskellDepends = [
-         aeson base boomerang safecopy web-routes web-routes-th
-       ];
-       homepage = "http://www.github.com/Happstack/userid";
-       description = "The UserId type and useful instances for web development";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "userid_0_1_2_8" = callPackage
     ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes
      , web-routes-th
      }:
@@ -183265,7 +182729,6 @@ self: {
        homepage = "http://www.github.com/Happstack/userid";
        description = "The UserId type and useful instances for web development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "users" = callPackage
@@ -183893,30 +183356,6 @@ self: {
      }) {};
 
   "vado" = callPackage
-    ({ mkDerivation, attoparsec, base, directory, filepath, process
-     , QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "vado";
-       version = "0.0.7";
-       sha256 = "fc8609a92ce40a4c52d37a44297b67928bf30562c4b87a2e3885059ecbc6273b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base directory filepath process text
-       ];
-       executableHaskellDepends = [
-         attoparsec base directory filepath process text
-       ];
-       testHaskellDepends = [
-         attoparsec base directory filepath process QuickCheck text
-       ];
-       homepage = "https://github.com/hamishmack/vado";
-       description = "Runs commands on remote machines using ssh";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "vado_0_0_8" = callPackage
     ({ mkDerivation, attoparsec, base, directory, filepath, process
      , QuickCheck, text
      }:
@@ -183938,7 +183377,6 @@ self: {
        homepage = "https://github.com/hamishmack/vado";
        description = "Runs commands on remote machines using ssh";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "valid-names" = callPackage
@@ -184411,29 +183849,6 @@ self: {
      }) {};
 
   "vcswrapper" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, hxt, mtl
-     , parsec, process, split, text
-     }:
-     mkDerivation {
-       pname = "vcswrapper";
-       version = "0.1.3";
-       sha256 = "99cee523d8a4164fce6a2598aad7c8efa3b70785d0a07441bbf7203e3d383e89";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filepath hxt mtl parsec process split
-         text
-       ];
-       executableHaskellDepends = [
-         base containers directory filepath hxt mtl parsec process split
-         text
-       ];
-       homepage = "https://github.com/forste/haskellVCSWrapper";
-       description = "Wrapper for source code management systems";
-       license = "GPL";
-     }) {};
-
-  "vcswrapper_0_1_5" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, hxt, mtl
      , parsec, process, split, text
      }:
@@ -184454,7 +183869,6 @@ self: {
        homepage = "https://github.com/forste/haskellVCSWrapper";
        description = "Wrapper for source code management systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vect" = callPackage
@@ -184596,19 +184010,6 @@ self: {
      }) {};
 
   "vector-binary-instances" = callPackage
-    ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }:
-     mkDerivation {
-       pname = "vector-binary-instances";
-       version = "0.2.3.3";
-       sha256 = "20158b1ab2fb8dd1bad57896fa3f75bb7fbc5354020c5715e997972b6ffb9f5c";
-       libraryHaskellDepends = [ base binary vector ];
-       testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
-       homepage = "https://github.com/bos/vector-binary-instances";
-       description = "Instances of Data.Binary and Data.Serialize for vector";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector-binary-instances_0_2_3_4" = callPackage
     ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }:
      mkDerivation {
        pname = "vector-binary-instances";
@@ -184619,7 +184020,6 @@ self: {
        homepage = "https://github.com/bos/vector-binary-instances";
        description = "Instances of Data.Binary and Data.Serialize for vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-buffer" = callPackage
@@ -184969,27 +184369,6 @@ self: {
      }) {};
 
   "vectortiles" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, deepseq, hex
-     , protobuf, tasty, tasty-hunit, text, th-printf, transformers
-     , vector
-     }:
-     mkDerivation {
-       pname = "vectortiles";
-       version = "1.2.0.1";
-       sha256 = "fb034cb99c10f61ff0d2d7454b51d0e5996c5443a652e436490313d7a064401d";
-       libraryHaskellDepends = [
-         base bytestring cereal containers deepseq protobuf text th-printf
-         transformers vector
-       ];
-       testHaskellDepends = [
-         base bytestring cereal hex protobuf tasty tasty-hunit text vector
-       ];
-       homepage = "https://github.com/fosskers/vectortiles";
-       description = "GIS Vector Tiles, as defined by Mapbox";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "vectortiles_1_2_0_2" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, deepseq, hex
      , protobuf, tasty, tasty-hunit, text, transformers, vector
      }:
@@ -185007,7 +184386,6 @@ self: {
        homepage = "https://github.com/fosskers/vectortiles";
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "verbalexpressions" = callPackage
@@ -189845,6 +189223,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "writer-cps-full" = callPackage
+    ({ mkDerivation, base, writer-cps-lens, writer-cps-morph
+     , writer-cps-mtl, writer-cps-transformers
+     }:
+     mkDerivation {
+       pname = "writer-cps-full";
+       version = "0.1.0.0";
+       sha256 = "ba51df5149470be6d70fd179f2af4cae30824a3a63528f1549a97f57610a5e95";
+       libraryHaskellDepends = [
+         base writer-cps-lens writer-cps-morph writer-cps-mtl
+         writer-cps-transformers
+       ];
+       homepage = "https://github.com/minad/writer-cps-full#readme";
+       description = "WriteT and RWST monad transformers (Reexport with all dependencies)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "writer-cps-lens" = callPackage
+    ({ mkDerivation, base, lens, profunctors, transformers
+     , writer-cps-mtl, writer-cps-transformers
+     }:
+     mkDerivation {
+       pname = "writer-cps-lens";
+       version = "0.1.0.0";
+       sha256 = "23daa611fc16cddc8b8df3436818870c34ec87795b960b3cea2a3e3c408e3448";
+       libraryHaskellDepends = [
+         base lens profunctors transformers writer-cps-mtl
+         writer-cps-transformers
+       ];
+       homepage = "https://github.com/louispan/writer-cps-lens#readme";
+       description = "Lens instances for the stricter CPS WriterT and RWST";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "writer-cps-monads-tf" = callPackage
     ({ mkDerivation, base, monads-tf, transformers
      , writer-cps-transformers
@@ -189862,6 +189274,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "writer-cps-morph" = callPackage
+    ({ mkDerivation, base, mmorph, writer-cps-transformers }:
+     mkDerivation {
+       pname = "writer-cps-morph";
+       version = "0.1.0.1";
+       sha256 = "bd685fa9dec074ef7d0f545f95eaf20bd0b600d2fb067f3dcfdc3a3b0e678cee";
+       libraryHaskellDepends = [ base mmorph writer-cps-transformers ];
+       homepage = "https://github.com/louispan/writer-cps-morph#readme";
+       description = "MFunctor instance for CPS style WriterT and RWST";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "writer-cps-mtl" = callPackage
     ({ mkDerivation, base, mtl, transformers, writer-cps-transformers
      }:
@@ -194724,6 +194148,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-websockets_0_2_5" = callPackage
+    ({ mkDerivation, async, base, conduit, enclosed-exceptions
+     , monad-control, transformers, wai, wai-websockets, websockets
+     , yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-websockets";
+       version = "0.2.5";
+       sha256 = "c5f609aea82035a8bd43998f29bb2fc8547f72260dafdc9fdc44a7706975c944";
+       libraryHaskellDepends = [
+         async base conduit enclosed-exceptions monad-control transformers
+         wai wai-websockets websockets yesod-core
+       ];
+       homepage = "https://github.com/yesodweb/yesod";
+       description = "WebSockets support for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-websockets-extra" = callPackage
     ({ mkDerivation, base, enclosed-exceptions, transformers
      , websockets, yesod-websockets
@@ -195996,7 +195439,7 @@ self: {
      }) {};
 
   "zip-archive" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
+    ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , digest, directory, filepath, HUnit, mtl, old-time, pretty
      , process, temporary, text, time, unix, zip, zlib
      }:
@@ -196004,6 +195447,9 @@ self: {
        pname = "zip-archive";
        version = "0.3.0.5";
        sha256 = "dc83366e44d735df4088eb174c02c35a522e6228c04fecc35fe9493299fc97c7";
+       revision = "1";
+       editedCabalFile = "f9284c6bdf1e6c9f85091c602faae19dfad856ac6628531d999a611994f3da86";
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          array base binary bytestring containers digest directory filepath
          mtl old-time pretty text time unix zlib

From 1708d4da13b53557fc95b2e1416288c4672400b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 19 Jan 2017 18:57:08 +0100
Subject: [PATCH 374/727] python27Packages.xmpppy: fix ssl socket api

---
 .../python-modules/xmpppy/default.nix         | 26 +++++++++++++++++++
 .../python-modules/xmpppy/ssl.patch           | 25 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +--------------
 3 files changed, 52 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/xmpppy/default.nix
 create mode 100644 pkgs/development/python-modules/xmpppy/ssl.patch

diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
new file mode 100644
index 00000000000..632c01c7446
--- /dev/null
+++ b/pkgs/development/python-modules/xmpppy/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, fetchurl, isPy3k }:
+buildPythonPackage rec {
+  name = "xmpp.py-${version}";
+  version = "0.5.0rc1";
+
+  patches = [ ./ssl.patch ];
+
+  src = fetchurl {
+    url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz";
+    sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si";
+  };
+
+  preInstall = ''
+    mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out)
+    export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
+  '';
+
+  disabled = isPy3k;
+
+  meta = with stdenv.lib; {
+    description = "XMPP python library";
+    homepage = "http://xmpppy.sourceforge.net/";
+    license = license.gpl3;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/development/python-modules/xmpppy/ssl.patch b/pkgs/development/python-modules/xmpppy/ssl.patch
new file mode 100644
index 00000000000..915602dc23e
--- /dev/null
+++ b/pkgs/development/python-modules/xmpppy/ssl.patch
@@ -0,0 +1,25 @@
+diff -wbBur xmpppy-0.5.0rc1/xmpp/transports.py xmpppy-0.5.0rc1.q/xmpp/transports.py
+--- xmpppy-0.5.0rc1/xmpp/transports.py	2009-04-07 12:34:09.000000000 +0400
++++ xmpppy-0.5.0rc1.q/xmpp/transports.py	2015-05-08 13:06:03.049252065 +0300
+@@ -27,7 +27,7 @@
+ Also exception 'error' is defined to allow capture of this module specific exceptions.
+ """
+ 
+-import socket,select,base64,dispatcher,sys
++import socket,ssl,select,base64,dispatcher,sys
+ from simplexml import ustr
+ from client import PlugIn
+ from protocol import *
+@@ -312,9 +312,9 @@
+         """ Immidiatedly switch socket to TLS mode. Used internally."""
+         """ Here we should switch pending_data to hint mode."""
+         tcpsock=self._owner.Connection
+-        tcpsock._sslObj    = socket.ssl(tcpsock._sock, None, None)
+-        tcpsock._sslIssuer = tcpsock._sslObj.issuer()
+-        tcpsock._sslServer = tcpsock._sslObj.server()
++        tcpsock._sslObj    = ssl.wrap_socket(tcpsock._sock, None, None)
++        tcpsock._sslIssuer = tcpsock._sslObj.getpeercert().get('issuer')
++        tcpsock._sslServer = tcpsock._sslObj.getpeercert().get('server')
+         tcpsock._recv = tcpsock._sslObj.read
+         tcpsock._send = tcpsock._sslObj.write
+ 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 385e079284f..34510a25829 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30447,26 +30447,7 @@ EOF
     };
   };
 
-  xmpppy = buildPythonPackage rec {
-    name = "xmpp.py-${version}";
-    version = "0.5.0rc1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz";
-      sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si";
-    };
-
-    preInstall = ''
-      mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out)
-      export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
-    '';
-
-    disabled = isPy3k;
-
-    meta = {
-      description = "XMPP python library";
-    };
-  };
+  xmpppy = callPackage ../development/python-modules/xmpppy {};
 
   xstatic-bootbox = buildPythonPackage rec {
     name = "XStatic-Bootbox-${version}";

From 6762884a9a862b4feda5d7776c966c9ebca26554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 19 Jan 2017 18:57:36 +0100
Subject: [PATCH 375/727] python27Packages.jabberbot: init at 0.16

---
 pkgs/development/python-modules/jabberbot.nix | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/jabberbot.nix

diff --git a/pkgs/development/python-modules/jabberbot.nix b/pkgs/development/python-modules/jabberbot.nix
new file mode 100644
index 00000000000..efbd4b981fa
--- /dev/null
+++ b/pkgs/development/python-modules/jabberbot.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, isPy3k, fetchurl, xmpppy }:
+
+buildPythonPackage rec {
+  name = "jabberbot-0.16";
+
+  disabled = isPy3k;
+  src = fetchurl {
+    url = "mirror://pypi/j/jabberbot/${name}.tar.gz";
+    sha256 = "1qr7c5p9a0nzsvri1djnd5r3d7ilh2mdxvviqn1s2hcc70rha65d";
+  };
+
+  propagatedBuildInputs = [ xmpppy ];
+
+  doCheck = false; # lol, it does not even specify dependencies properly
+
+  meta = with stdenv.lib; {
+    description = "A framework for writing Jabber/XMPP bots and services";
+    homepage = http://thp.io/2007/python-jabberbot/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 34510a25829..ebab286c900 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13293,6 +13293,8 @@ in {
     };
   };
 
+  jabberbot = callPackage ../development/python-modules/jabberbot.nix {};
+
   jedi = buildPythonPackage (rec {
     name = "jedi-0.9.0";
 

From 5326cb7340e0cdc8a6f49291b3a127be9743a127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 Jan 2017 19:25:02 +0100
Subject: [PATCH 376/727] webkit: security 2.14.2 -> 2.14.3

https://webkitgtk.org/security/WSA-2017-0001.html
/cc #21967.
---
 pkgs/development/libraries/webkitgtk/2.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix
index 6835f59f586..2af7133bf2b 100644
--- a/pkgs/development/libraries/webkitgtk/2.14.nix
+++ b/pkgs/development/libraries/webkitgtk/2.14.nix
@@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.14.2";
+  version = "2.14.3";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0mjmcxhafh6l6j062z2nwfqbbvfyx16iqrzrbajswijh23awpnrf";
+    sha256 = "0v0hkvggxi38cdb3v672qwr0m0y3x2rmnwh8j3q28869li8d9shb";
   };
 
   # see if we can clean this up....

From c20062311bdb2f10ed8898ce3f84f9fe53d4efe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 19 Jan 2017 20:04:54 +0100
Subject: [PATCH 377/727] Fix evaluation (xmpppy: use correct 'licenses' attr)

CC @Mic92
---
 pkgs/development/python-modules/xmpppy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
index 632c01c7446..332feef9e49 100644
--- a/pkgs/development/python-modules/xmpppy/default.nix
+++ b/pkgs/development/python-modules/xmpppy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "XMPP python library";
     homepage = "http://xmpppy.sourceforge.net/";
-    license = license.gpl3;
+    license = licenses.gpl3;
     maintainers = [ maintainers.mic92 ];
   };
 }

From 1b5d5e3913f3b1b736aebb06f99c57968370cb62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 19 Jan 2017 20:01:43 +0100
Subject: [PATCH 378/727] nmap-graphical: rename from nmap_graphical

Align attrpath and pkgname. Add backwards compatibility alias.
---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4b686903702..21260205d95 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -79,6 +79,7 @@ doNotDisplayTwice rec {
   mupen64plus1_5 = mupen64plus; # added 2016-02-12
   mysqlWorkbench = mysql-workbench; # added 2017-01-19
   ncat = nmap;  # added 2016-01-26
+  nmap_graphical = nmap-graphical;  # added 2017-01-19
   nfsUtils = nfs-utils;  # added 2014-12-06
   owncloudclient = owncloud-client;  # added 2016-08
   pidgin-with-plugins = pidgin; # added 2016-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4ee456b9d2..14c8d927d69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3043,7 +3043,7 @@ in
 
   nmap = callPackage ../tools/security/nmap { };
 
-  nmap_graphical = callPackage ../tools/security/nmap {
+  nmap-graphical = callPackage ../tools/security/nmap {
     graphicalSupport = true;
   };
 

From 003ae42ae66d21756f42079b52b5c8982ae0f293 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 17 Jan 2017 08:20:54 -0500
Subject: [PATCH 379/727] packet: init at 20161215-2b8f07a

Signed-off-by: Robin Gloster <mail@glob.in>
---
 pkgs/development/tools/packet/default.nix |  27 ++++
 pkgs/development/tools/packet/deps.nix    | 156 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |   4 +-
 3 files changed, 186 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/packet/default.nix
 create mode 100644 pkgs/development/tools/packet/deps.nix

diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix
new file mode 100644
index 00000000000..eb1a48d24b8
--- /dev/null
+++ b/pkgs/development/tools/packet/default.nix
@@ -0,0 +1,27 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "packet-${version}";
+  version = "20161215-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "2b8f07ae2246e1a96e007233419867fa0d6747f9";
+
+  goPackagePath = "github.com/ebsarr/packet";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "ebsarr";
+    repo = "packet";
+    sha256 = "1wchrm96ly5m1rcy9d51fs3xjswh746r27hgc410rksiahanzhff";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = {
+    description = "a CLI tool to manage packet.net services";
+    homepage = https://github.com/ebsarr/packet;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.grahamc ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/packet/deps.nix b/pkgs/development/tools/packet/deps.nix
new file mode 100644
index 00000000000..0c7fee1a11a
--- /dev/null
+++ b/pkgs/development/tools/packet/deps.nix
@@ -0,0 +1,156 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "github.com/cpuguy83/go-md2man";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cpuguy83/go-md2man";
+      rev = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa";
+      sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6";
+    };
+  }
+  {
+    goPackagePath = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev = "fd9ec7deca8bf46ecd2a795baaacf2b3a9be1197";
+      sha256 = "0jf7zmkypfl6v24xxnv12w55384diyabfp2m7ibafgafljwlg3ls";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "eb6f65b2d77ed5078887f960ff570fbddbbeb49d";
+      sha256 = "1wx6hpxmq5sby54025j9hliz10gv5v0bq6q1z2cd0asznj154ij1";
+    };
+  }
+  {
+    goPackagePath = "github.com/magiconair/properties";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magiconair/properties";
+      rev = "b3b15ef068fd0b17ddf408a23669f20811d194d2";
+      sha256 = "0m6jvlsi4bcnrfb4mas54wxp80d4ls209vhanvv20zgpy4y7qdsh";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "bfdb1a85537d60bc7e954e600c250219ea497417";
+      sha256 = "141kkh801jyp1r6hba14krydqg1iivp13j12is70j0g05z9fbji8";
+    };
+  }
+  {
+    goPackagePath = "github.com/packethost/packngo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/packethost/packngo";
+      rev = "91a3a4f65e3cd6ee66d919b4e7103ae038ce66ff";
+      sha256 = "0v032qv9jjvv67fm2jl20pk4f46pymj688b6j0i42kpgmc9zxanz";
+    };
+  }
+  {
+    goPackagePath = "github.com/pelletier/go-buffruneio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-buffruneio";
+      rev = "df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d";
+      sha256 = "0jwn2g4jfdb3wvpqisd8h055099pwx6c5i3bb4zxk5l9vybg1c5f";
+    };
+  }
+  {
+    goPackagePath = "github.com/pelletier/go-toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-toml";
+      rev = "a1f048ba24490f9b0674a67e1ce995d685cddf4a";
+      sha256 = "09fb872v64bvjgzp3a926ic5hm08pzy0i53j02yb93v38g4ihdv3";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/afero";
+      rev = "72b31426848c6ef12a7a8e216708cb0d1530f074";
+      sha256 = "0sbmpv1zxxl32nsv76bp3n3zp08in2yz4fv02mjzaws9rk97yfj8";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast";
+      rev = "56a7ecbeb18dde53c6db4bd96b541fd9741b8d44";
+      sha256 = "16fj6ghk7wykcfh3ka4iyhl1s11briawrvscncb6l64dv794w2cr";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev = "1dd5ff2e11b6dca62fdcb275eb804b94607d8b06";
+      sha256 = "0whzk9yz0yby9vag9m7hk4n1kwa07qcgi6wizvw20j0y30d31hgx";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman";
+      rev = "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66";
+      sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "51268031d79952516489a9f8aa34e9709b98d946";
+      sha256 = "04qkkm2gjklh66hx3zj4jm6v0bdxvyq6rchs4r0k87aba7syw008";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/viper";
+      rev = "5ed0fc31f7f453625df314d8e66b9791e8d13003";
+      sha256 = "16j2lly6rv60hc7mpbmda9vp1vs1qhig9kjgf6mss7n6my40s3ga";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "d75a52659825e75fff6158388dddc6a5b04f9ba5";
+      sha256 = "0zbv11kq5d8dxiddd4kzr785gbwb7x8d7lq4rqs5s7s43h0pl3x7";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "11dbc599981ccdf4fb18802a28392a8bcf7a9395";
+      sha256 = "139hlf5xr5ggy48dbrfya3ajy7q3z3y6p6lrvkvl6m5wxfapa9hj";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0";
+      sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14c8d927d69..23a3eae8385 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3666,7 +3666,7 @@ in
   rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
 
   rubber = callPackage ../tools/typesetting/rubber { };
-  
+
   rubocop = callPackage ../development/tools/rubocop { };
 
   runningx = callPackage ../tools/X11/runningx { };
@@ -14477,6 +14477,8 @@ in
 
   paraview = callPackage ../applications/graphics/paraview { };
 
+  packet = callPackage ../development/tools/packet { };
+
   pbrt = callPackage ../applications/graphics/pbrt { };
 
   pcsxr = callPackage ../misc/emulators/pcsxr {

From 10cfe945fed31fef4ee97bddc2df5192eb69da32 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 19 Jan 2017 15:21:00 -0600
Subject: [PATCH 380/727] xcbuild: 0ab861ab -> 0.1.1 (#21895)

* xcbuild: add xcode-select wrapper
* xcbuild: update to 0.1.1
---
 pkgs/development/tools/xcbuild/default.nix | 8 +++++---
 pkgs/development/tools/xcbuild/wrapper.nix | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index 3a1b753bf31..99859ed9640 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -15,14 +15,14 @@ let
     sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w";
   };
 in stdenv.mkDerivation rec {
-  name    = "xcbuild-${stdenv.lib.substring 0 8 version}";
-  version = "0ab861abcc11185a17d59608f96a015752a6fadc";
+  name    = "xcbuild-${version}";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "xcbuild";
     rev    = version;
-    sha256 = "12h0rn8v0js2vph2pwp5wvcrfkj12nz365i5qxw9miyfn4msnz26";
+    sha256 = "0i98c6lii8r3bgs5gj7div12pxyzjvm4qqzmmzgr7dyhj00qa8r5";
   };
 
   prePatch = ''
@@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
     rmdir $out/usr
   '';
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=strict-aliasing";
+
   buildInputs = [ cmake zlib libxml2 libpng ninja ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ];
 
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index a40a3440d68..0da733b8078 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -60,7 +60,8 @@ stdenv.mkDerivation {
       --add-flags "DERIVED_DATA_DIR=." \
       --set DEVELOPER_DIR "$out"
     wrapProgram $out/bin/xcrun \
-      --add-flags "-sdk ${sdkName}" \
+      --set DEVELOPER_DIR "$out"
+    wrapProgram $out/bin/xcode-select \
       --set DEVELOPER_DIR "$out"
   '';
 

From a7f25fe16793ba50cb015034513ee6b40e0eb016 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 1 Oct 2016 21:16:55 +0200
Subject: [PATCH 381/727] php: add embedded package

---
 pkgs/development/interpreters/php/default.nix | 9 ++++++++-
 pkgs/top-level/all-packages.nix               | 8 ++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 1a5bed6d20b..920bf2c3207 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -38,6 +38,10 @@ let
           buildInputs = [apacheHttpd];
         };
 
+        embed = {
+          configureFlags = ["--enable-embed"];
+        };
+
         # Extensions
         imap = {
           configureFlags = [
@@ -230,6 +234,7 @@ let
         pdo_mysqlSupport = config.php.pdo_mysql or true;
         libxml2Support = config.php.libxml2 or true;
         apxs2Support = config.php.apxs2 or (!stdenv.isDarwin);
+        embedSupport = config.php.embed or false;
         bcmathSupport = config.php.bcmath or true;
         socketsSupport = config.php.sockets or true;
         curlSupport = config.php.curl or true;
@@ -263,13 +268,15 @@ let
 
       configurePhase = ''
         # Don't record the configure flags since this causes unnecessary
-        # runtime dependencies.
+        # runtime dependencies - except for php-embed, as uwsgi needs them.
+        ${lib.optionalString (!(config.php.embed or false)) ''
         for i in main/build-defs.h.in scripts/php-config.in; do
           substituteInPlace $i \
             --replace '@CONFIGURE_COMMAND@' '(omitted)' \
             --replace '@CONFIGURE_OPTIONS@' "" \
             --replace '@PHP_LDFLAGS@' ""
         done
+        ''}
 
         [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
         ./configure --with-config-file-scan-dir=/etc/php.d --with-config-file-path=$out/etc --prefix=$out $configureFlags
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23a3eae8385..a30602fdad4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5756,6 +5756,14 @@ in
     php70
     php71;
 
+  php-embed = php71-embed;
+
+  php71-embed = php71.override {
+    config.php.embed = true;
+    config.php.apxs2 = false;
+  };
+
+
   picoc = callPackage ../development/interpreters/picoc {};
 
   picolisp = callPackage ../development/interpreters/picolisp {};

From 3f3b6e6b6cbee2fb0512657d9757f7d4d33bd339 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 22 Oct 2016 14:08:30 +0200
Subject: [PATCH 382/727] uwsgi: enable php plugin

---
 pkgs/servers/uwsgi/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index 4994894a038..6d29c745697 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -4,7 +4,7 @@
 , pam, withPAM ? false
 , systemd, withSystemd ? false
 , python2, python3, ncurses
-, ruby
+, ruby, php-embed
 }:
 
 let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else "3"}" {
@@ -26,9 +26,16 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else
                     inputs = [ ruby ];
                   })
                   (lib.nameValuePair "cgi" {
+                    # usage: https://uwsgi-docs.readthedocs.io/en/latest/CGI.html?highlight=cgi
                     path = "plugins/cgi";
                     inputs = [ ];
                   })
+                  (lib.nameValuePair "php" {
+                    # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx
+                    path = "plugins/php";
+                    preBuild = "touch unix.h";
+                    inputs = [ php-embed php-embed.nativeBuildInputs ];
+                  })
                 ];
 
     getPlugin = name:
@@ -74,7 +81,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     mkdir -p $pluginDir
     python3 uwsgiconfig.py --build nixos
-    ${lib.concatMapStringsSep ";" (x: "${x.interpreter or "python3"} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed}
+    ${lib.concatMapStringsSep ";" (x: "${x.preBuild or ""}\n ${x.interpreter or "python3"} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed}
   '';
 
   installPhase = ''
@@ -88,7 +95,7 @@ stdenv.mkDerivation rec {
     homepage = "http://uwsgi-docs.readthedocs.org/en/latest/";
     description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = with maintainers; [ abbradar schneefux ];
     platforms = platforms.linux;
   };
 }

From a927abbee008bbaba0abd7c1b1879687ad9ecdbf Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 16 Jan 2017 11:04:45 -0500
Subject: [PATCH 383/727] qt55.qtbase: fix patch sha with fetchpatch instead of
 fetchurl

---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 5a44ca89902..a8598f654dd 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, copyPathsToStore
+{ stdenv, lib, fetchpatch, copyPathsToStore
 , srcs
 
 , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
@@ -30,10 +30,10 @@ let
   # Search path for Gtk plugin
   gtkLibPath = lib.makeLibraryPath [ gtk2 gnome_vfs libgnomeui GConf ];
 
-  dontInvalidateBacking = fetchurl {
+  dontInvalidateBacking = fetchpatch {
     url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c";
     name = "qtbug-48321-dont-invalidate-backing-store.patch";
-    sha256 = "07vnndmvri73psz0nrs2hg0zw2i4b1k1igy2al6kwjbp7d5xpglr";
+    sha256 = "1wynm2hhbhpvzvsz4vpzzkl0ss5skac6934bva8brcpi5xq68h1q";
   };
 in
 

From f4bff9d633ef2d9ffb08d6267b2410b8cd4f5617 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jan 2017 23:35:40 +0100
Subject: [PATCH 384/727] freepv: 0.3.0_beta1 -> 0.3.0, fix build

---
 pkgs/applications/graphics/freepv/default.nix | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix
index e042b15855c..6d82db4bac1 100644
--- a/pkgs/applications/graphics/freepv/default.nix
+++ b/pkgs/applications/graphics/freepv/default.nix
@@ -1,25 +1,35 @@
 { stdenv, fetchurl, libjpeg, mesa, freeglut, zlib, cmake, libX11, libxml2, libpng,
-  libXxf86vm }:
+  libXxf86vm, gcc6 }:
 
 stdenv.mkDerivation {
-  name = "freepv-0.3.0_beta1";
+  name = "freepv-0.3.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/freepv/freepv-0.3.0_beta1.tar.gz;
-    sha256 = "084qqa361np73anvqrv78ngw8hjxglmdm3akkpszbwnzniw89qla";
+    url = mirror://sourceforge/freepv/freepv-0.3.0.tar.gz;
+    sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56";
   };
 
   buildInputs = [ libjpeg mesa freeglut zlib cmake libX11 libxml2 libpng
-    libXxf86vm ];
+    libXxf86vm gcc6 ];
 
-  patchPhase = ''
+  postPatch = ''
     sed -i -e '/GECKO/d' CMakeLists.txt
     sed -i -e '/mozilla/d' src/CMakeLists.txt
+    sed -i -e '1i \
+      #include <cstdio>' src/libfreepv/OpenGLRenderer.cpp
+    sed -i -e '1i \
+      #include <cstring>' src/libfreepv/Image.cpp
+    substituteInPlace src/libfreepv/Action.h \
+      --replace NULL nullptr
+    substituteInPlace src/libfreepv/pngReader.cpp \
+      --replace png_set_gray_1_2_4_to_8 png_set_expand_gray_1_2_4_to_8
   '';
 
+  NIX_CFLAGS_COMPILE = "-fpermissive -Wno-narrowing";
+
   meta = {
     description = "Open source panorama viewer using GL";
     homepage = http://freepv.sourceforge.net/;
-    license = "LGPL";
+    license = [ stdenv.lib.licenses.lgpl21 ];
   };
 }

From 0f86750d1d42cc6f74f125183d47dbb160757497 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 20 Jan 2017 00:15:53 +0100
Subject: [PATCH 385/727] mpir: add patch to account for sed update

---
 pkgs/development/libraries/mpir/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
index c3a254c6bdc..142bd93fe52 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -1,12 +1,21 @@
-{stdenv, fetchurl, m4}:
+{ stdenv, fetchurl, fetchpatch, m4 }:
+
 stdenv.mkDerivation rec {
   name = "mpir-${version}";
   version = "2.7.2";
-  buildInputs = [m4];
+
+  buildInputs = [ m4 ];
+
   src = fetchurl {
     url = "http://mpir.org/mpir-${version}.tar.bz2";
     sha256 = "1v25dx7cah2vxwzgq78hpzqkryrfxhwx3mcj3jjq3xxljlsw7m57";
   };
+
+  patches = [ (fetchpatch {
+    url = "https://github.com/wbhart/mpir/commit/fdb590023f7ca4b2e881a2e9573718e7ed180f03.patch";
+    sha256 = "152pdqpf8xxr4ky25f9zrvfb66i1wzy6a5b91h4zmpqjdffqf1iw";
+  }) ];
+
   meta = {
     inherit version;
     description = ''A highly optimised library for bignum arithmetic forked from GMP'';

From 0387e10928d93ab03c4739e9fb08b4e49ef36db6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 20 Jan 2017 00:29:59 +0100
Subject: [PATCH 386/727] gmuc: 0.7.2 -> 0.10.1

---
 pkgs/applications/audio/gmu/default.nix | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix
index f23ba66a3b5..8446855d190 100644
--- a/pkgs/applications/audio/gmu/default.nix
+++ b/pkgs/applications/audio/gmu/default.nix
@@ -1,24 +1,20 @@
 {stdenv, fetchurl, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod
-, speex
-, keymap ? "newdefault"
+, speex, ncurses
+, keymap ? "default"
 , conf ? "unknown"
 }:
 
 stdenv.mkDerivation rec {
-  name = "gmu-0.7.2";
-  
+  name = "gmu-0.10.1";
+
   src = fetchurl {
-    url = http://wejp.k.vu/files/gmu-0.7.2.tar.gz;
-    sha256 = "0gvhwhhlj64lc425wqch4g6v59ldd5i3rxll3zdcrdgk2vkh8nys";
+    url = "http://wejp.k.vu/files/${name}.tar.gz";
+    sha256 = "03x0mc0xw2if0bpf0a15yprcyx1xccki039zvl2099dagwk6xskv";
   };
 
-  buildInputs = [ SDL SDL_gfx SDL_image tremor flac mpg123 libmikmod speex ];
+  buildInputs = [ SDL SDL_gfx SDL_image tremor flac mpg123 libmikmod speex ncurses ];
 
-  NIX_LDFLAGS = "-lgcc_s";
-
-  preBuild = ''
-    makeFlags="$makeFlags PREFIX=$out"
-  '';
+  makeFlags = [ "PREFIX=$(out)" ];
 
   postInstall = ''
     cp ${keymap}.keymap $out/share/gmu/default.keymap

From 35aebd45f236127a6d33ee07e13082b9876b9813 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 19 Jan 2017 15:45:41 -0800
Subject: [PATCH 387/727] 
 haskellPackages.servant_09_1_1,servant-client_0_9_1_1: update http-api-data
 reference

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9a66b07d4fd..f019567f5f2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1080,10 +1080,10 @@ self: super: {
 
   # 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_3;
+    http-api-data = self.http-api-data_0_3_4;
   });
   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_3;
+    http-api-data = self.http-api-data_0_3_4;
     servant-server = self.servant-server_0_9_1_1;
     servant = self.servant_0_9_1_1;
   });

From 10bae1a2074ce4d335542898f9e67f4beb607ee4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 20 Jan 2017 02:48:24 +0300
Subject: [PATCH 388/727] opencl-icd: remove, point to ocl-icd

---
 .../libraries/opencl-icd/default.nix           | 18 ------------------
 .../python-modules/pyopencl/default.nix        |  6 +++---
 pkgs/misc/emulators/wine/base.nix              |  2 +-
 .../security/hashcat/hashcat3/default.nix      |  4 ++--
 pkgs/top-level/aliases.nix                     |  3 ++-
 pkgs/top-level/all-packages.nix                |  2 --
 6 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/development/libraries/opencl-icd/default.nix

diff --git a/pkgs/development/libraries/opencl-icd/default.nix b/pkgs/development/libraries/opencl-icd/default.nix
deleted file mode 100644
index 5cf144e198b..00000000000
--- a/pkgs/development/libraries/opencl-icd/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, ruby, opencl-headers }: let
-
-  version = "2.2.9";
-
-in stdenv.mkDerivation {
-
-  name = "opencl-icd-${version}";
-  buildInputs = [ ruby opencl-headers ];
-  configureFlags = [ "--enable-official-khronos-headers" ];
-  src = fetchurl {
-    url = "https://forge.imag.fr/frs/download.php/716/ocl-icd-${version}.tar.gz";
-    sha256 = "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc";
-  };
-
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index d09f38914b5..7be60b1e69b 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -10,7 +10,7 @@
 , appdirs
 , six
 , opencl-headers
-, opencl-icd
+, ocl-icd
 }:
 
 buildPythonPackage rec {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   version = "2016.2";
   name = "${pname}-${version}";
 
-  buildInputs = [ pytest opencl-headers opencl-icd ];
+  buildInputs = [ pytest opencl-headers ocl-icd ];
 
   propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ];
 
@@ -36,4 +36,4 @@ buildPythonPackage rec {
     license = stdenv.lib.licenses.mit;
     maintainer = stdenv.lib.maintainers.fridh;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index d556f94b78c..19026274d56 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   ++ lib.optional xineramaSupport        pkgs.xorg.libXinerama
   ++ lib.optionals gstreamerSupport      (with pkgs.gst_all; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ])
   ++ lib.optionals gtkSupport    [ pkgs.gtk3 pkgs.glib ]
-  ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.opencl-icd ]
+  ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
   ++ lib.optionals xmlSupport    [ pkgs.libxml2 pkgs.libxslt ]
   ++ lib.optionals tlsSupport    [ pkgs.openssl pkgs.gnutls ]
   ++ lib.optionals openglSupport [ pkgs.mesa pkgs.mesa_noglu.osmesa pkgs.libdrm ]
diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix
index ef41b0b2a0e..810d9df9e2f 100644
--- a/pkgs/tools/security/hashcat/hashcat3/default.nix
+++ b/pkgs/tools/security/hashcat/hashcat3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, opencl-headers, opencl-icd }:
+{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }:
 
 assert stdenv.isLinux;
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${opencl-icd}/lib
+    wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib
   '';
 
   meta = {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 905ff02d000..96aea28e911 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -69,6 +69,7 @@ doNotDisplayTwice rec {
   links = links2; # added 2016-01-31
   lttngTools = lttng-tools;  # added 2014-07-31
   lttngUst = lttng-ust;  # added 2014-07-31
+  m3d-linux = m33-linux; # added 2016-08-13
   manpages = man-pages; # added 2015-12-06
   man_db = man-db; # added 2016-05
   midoriWrapper = midori; # added 2015-01
@@ -79,6 +80,7 @@ doNotDisplayTwice rec {
   mupen64plus1_5 = mupen64plus; # added 2016-02-12
   ncat = nmap;  # added 2016-01-26
   nfsUtils = nfs-utils;  # added 2014-12-06
+  opencl-icd = ocl-icd; # added 2017-01-20
   owncloudclient = owncloud-client;  # added 2016-08
   pidgin-with-plugins = pidgin; # added 2016-06
   pidginlatexSF = pidginlatex; # added 2014-11-02
@@ -115,7 +117,6 @@ doNotDisplayTwice rec {
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
   xlibs = xorg; # added 2015-09
   youtubeDL = youtube-dl;  # added 2014-10-26
-  m3d-linux = m33-linux; # added 2016-08-13
 
   inherit (ocaml-ng) # added 2016-09-14
     ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69192cd6d3a..11b92df2988 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8899,8 +8899,6 @@ in
 
   opencl-headers = callPackage ../development/libraries/opencl-headers { };
 
-  opencl-icd = callPackage ../development/libraries/opencl-icd { };
-
   opencollada = callPackage ../development/libraries/opencollada { };
 
   opencsg = callPackage ../development/libraries/opencsg { };

From af7a8a36df8aca93f42a6a674c40d0ae866fbec1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 20 Jan 2017 02:48:55 +0300
Subject: [PATCH 389/727] ocl-icd: 2.2.9 -> 2.2.10

Patch to search for OpenCL vendor files in Mesa driver link directory.
---
 pkgs/development/libraries/ocl-icd/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix
index 1cb8408416d..6c3a77cfaf5 100644
--- a/pkgs/development/libraries/ocl-icd/default.nix
+++ b/pkgs/development/libraries/ocl-icd/default.nix
@@ -1,14 +1,19 @@
-{stdenv, fetchurl, ruby }:
+{stdenv, fetchurl, ruby, opencl-headers, mesa_noglu }:
 
 stdenv.mkDerivation rec {
-  name = "ocl-icd-2.2.9";
+  name = "ocl-icd-${version}";
+  version = "2.2.10";
 
   src = fetchurl {
-    url = "https://forge.imag.fr/frs/download.php/716/${name}.tar.gz";
-    sha256 = "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc";
+    url = "https://forge.imag.fr/frs/download.php/810/${name}.tar.gz";
+    sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2";
   };
 
-  buildInputs = [ ruby ];
+  buildInputs = [ ruby opencl-headers ];
+
+  postPatch = ''
+    sed -i 's,"/etc/OpenCL/vendors","${mesa_noglu.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c
+  '';
 
   meta = with stdenv.lib; {
     description = "OpenCL ICD Loader";

From 45c8c077ad1a8b811f04051dae36a39e7ae69c87 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 20 Jan 2017 02:49:34 +0300
Subject: [PATCH 390/727] beignet: 1.1.2 -> 1.2.1

Split unit tests to a separate package.
---
 .../development/libraries/beignet/default.nix | 138 ++++++++----------
 pkgs/top-level/all-packages.nix               |   5 +-
 2 files changed, 64 insertions(+), 79 deletions(-)

diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
index 5d5c834b4ac..7f127522f05 100644
--- a/pkgs/development/libraries/beignet/default.nix
+++ b/pkgs/development/libraries/beignet/default.nix
@@ -6,111 +6,99 @@
 , llvm
 , libdrm
 , libX11
-, libXfixes
 , libpthreadstubs
 , libXdmcp
 , libXdamage
-, libXxf86vm
-, python
-, gl
+, libXext
+, python3
 , ocl-icd
+, mesa_noglu
+, makeWrapper
+, beignet
 }: 
 
 stdenv.mkDerivation rec {
   name = "beignet-${version}";
-  version = "1.1.2"; 
+  version = "1.2.1";
 
   src = fetchurl {
     url = "https://01.org/sites/default/files/${name}-source.tar.gz"; 
-    sha256 = "6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96"; 
+    sha256 = "07y8ga545654jdbijmplga7a7j3jn04q5gfdjsl8cax16hsv0kmp";
   };  
 
   patches = [ ./clang_llvm.patch ]; 
 
+  enableParallelBuilding = true;
+
   postPatch = ''
-    patchShebangs src/git_sha1.sh; 
-
-    for f in $(find utests -type f)
-    do
-      sed -e "s@isnan(@std::isnan(@g" -i $f
-      sed -e "s@_std::isnan@_isnan@g" -i $f
-
-      sed -e "s@isinf(@std::isinf(@g" -i $f
-      sed -e "s@_std::isinf@_isinf@g" -i $f
-    done
+    patchShebangs src/git_sha1.sh
   ''; 
 
-  configurePhase = ''
-    cmake . -DCMAKE_INSTALL_PREFIX=$out \
-            -DCLANG_LIBRARY_DIR="${clang-unwrapped}/lib" \
-            -DLLVM_INSTALL_DIR="${llvm}/bin" \
-            -DCLANG_INSTALL_DIR="${clang-unwrapped}/bin"
-  '';
-
-  postInstall = ''
-    mkdir -p $out/utests/kernels
-    mkdir -p $out/utests/lib
-
-    cp -r kernels $out/utests
-    cp src/libcl.so $out/utests/lib
-
-    cat > $out/utests/setenv.sh << EOF
-#!/bin/sh
-export OCL_BITCODE_LIB_PATH=$out/lib/beignet/beignet.bc
-export OCL_HEADER_FILE_DIR=$out/lib/beignet/include
-export OCL_PCH_PATH=$out/lib/beignet/beignet.pch
-export OCL_GBE_PATH=$out/lib/beignet/libgbe.so
-export OCL_INTERP_PATH=$out/lib/beignet/libgbeinterp.so
-export OCL_KERNEL_PATH=$out/utests/kernels
-export OCL_IGNORE_SELF_TEST=1
-EOF
-
-    function fixRunPath {
-      p0=$(patchelf --print-rpath $1)
-      p1=$(echo $p0 | sed -e "s@$(pwd)/src@$out/utests/lib@g" -)
-      p2=$(echo $p1 | sed -e "s@$(pwd)/utests@$out/utests@g" -)
-      patchelf --set-rpath $p2 $1 
-    }
-    
-    fixRunPath utests/utest_run
-    fixRunPath utests/libutests.so
-
-    cp utests/utest_run $out/utests
-    cp utests/libutests.so $out/utests
-
-    mkdir -p $out/bin
-    ln -s $out/utests/setenv.sh $out/bin/beignet_setenv.sh
-    ln -s $out/utests/utest_run $out/bin/beignet_utest_run
-  ''; 
-
-  # To run the unit tests, the user must be in "video" group. 
-  # The nix builders are members of only "nixbld" group, so 
-  # they are able to compile the tests, but not to run them. 
-  # To verify the installation, add yourself to "video" group, 
-  # switch to a working directory which has both read and write 
-  # permissions, run: nix-shell -p pkgs.beignet, and execute:
-  # . beignet_setenv.sh && beignet_utest_run
-  doCheck = false; 
+  cmakeFlags = [ "-DCLANG_LIBRARY_DIR=${clang-unwrapped}/lib" ];
 
   buildInputs = [ 
     llvm 
     clang-unwrapped
-    cmake 
     libX11 
-    pkgconfig 
-    libdrm 
-    gl 
-    libXfixes 
+    libXext
     libpthreadstubs
+    libdrm 
     libXdmcp
     libXdamage
-    libXxf86vm
-    python
     ocl-icd
+    mesa_noglu
   ];
 
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    python3
+  ];
+
+  passthru.utests = stdenv.mkDerivation rec {
+    name = "beignet-utests-${version}";
+    inherit version src;
+
+    preConfigure = ''
+      cd utests
+    '';
+
+    enableParallelBuilding = true;
+
+    nativeBuildInputs = [
+      cmake
+      python3
+      pkgconfig
+      makeWrapper
+    ];
+
+    buildInputs = [
+      ocl-icd
+    ];
+
+    installPhase = ''
+      wrapBin() {
+        install -Dm755 "$1" "$out/bin/$(basename "$1")"
+        wrapProgram "$out/bin/$(basename "$1")" \
+          --set OCL_BITCODE_LIB_PATH ${beignet}/lib/beignet/beignet.bc \
+          --set OCL_HEADER_FILE_DIR "${beignet}/lib/beignet/include" \
+          --set OCL_PCH_PATH "${beignet}/lib/beignet/beignet.pch" \
+          --set OCL_GBE_PATH "${beignet}/lib/beignet/libgbe.so" \
+          --set OCL_INTERP_PATH "${beignet}/lib/beignet/libgbeinterp.so" \
+          --set OCL_KERNEL_PATH "$out/lib/beignet/kernels" \
+          --set OCL_IGNORE_SELF_TEST 1
+      }
+
+      install -Dm755 libutests.so $out/lib/libutests.so
+      wrapBin utest_run
+      wrapBin flat_address_space
+      mkdir $out/lib/beignet
+      cp -r ../../kernels $out/lib/beignet
+    '';
+  };
+
   meta = with stdenv.lib; {
-    homepage = https://cgit.freedesktop.org/beignet/;
+    homepage = "https://cgit.freedesktop.org/beignet/";
     description = "OpenCL Library for Intel Ivy Bridge and newer GPUs";
     longDescription = ''
       The package provides an open source implementation of the OpenCL specification for Intel GPUs. 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11b92df2988..9542506d22d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6815,10 +6815,7 @@ in
   beecrypt = callPackage ../development/libraries/beecrypt { };
 
   beignet = callPackage ../development/libraries/beignet {
-    inherit (llvmPackages_37) llvm clang-unwrapped;
-    inherit (xorg) libX11 libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm;
-    inherit (python3Packages) python;
-    inherit (purePackages) gl;
+    inherit (llvmPackages) llvm clang-unwrapped;
   };
 
   belle-sip = callPackage ../development/libraries/belle-sip { };

From 05eee18e7a70304a4807755e69b22235182b31be Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 20 Jan 2017 02:50:32 +0300
Subject: [PATCH 391/727] linuxPackages.nvidia_x11: fix OpenCL support

* Move OpenCL .icd file to the right place;
* Remove libOpenCL.so (we use ocl-icd instead).
---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 1f4671a7615..32502bb7b6c 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -28,13 +28,15 @@ buildPhase() {
 
 installPhase() {
     # Install libGL and friends.
-    mkdir -p "$out/lib/vendors"
-    cp -p nvidia.icd $out/lib/vendors/
+    mkdir -p "$out/etc/OpenCL/vendors"
+    cp -p nvidia.icd $out/etc/OpenCL/vendors/
 
+    mkdir -p "$out/lib"
     cp -prd *.so.* tls "$out/lib/"
     rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately
 
     rm $out/lib/libGL.so.1.* # GLVND
+    rm $out/lib/libOpenCL.so* # ocl-icd is used instead
 
     if test -z "$libsOnly"; then
         # Install the X drivers.

From 221685aee9f59a6cfb1845b6b661fac2335881a4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 20 Jan 2017 02:51:31 +0300
Subject: [PATCH 392/727] opengl service: mention that you can add OpenCL
 drivers

---
 nixos/modules/hardware/opengl.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index c4fad9a6672..5e38a988096 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -96,7 +96,7 @@ in
       example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]";
       description = ''
         Additional packages to add to OpenGL drivers. This can be used
-        to add additional VA-API/VDPAU drivers.
+        to add OpenCL drivers, VA-API/VDPAU drivers etc.
       '';
     };
 
@@ -107,7 +107,7 @@ in
       description = ''
         Additional packages to add to 32-bit OpenGL drivers on
         64-bit systems. Used when <option>driSupport32Bit</option> is
-        set. This can be used to add additional VA-API/VDPAU drivers.
+        set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc.
       '';
     };
 

From 5c65546725ff308501dce17117ec640096de8829 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 20 Jan 2017 03:23:04 +0300
Subject: [PATCH 393/727] opencl-clhpp: init at 2.0.10

---
 .../libraries/opencl-clhpp/default.nix        | 28 +++++++++++++++++++
 .../libraries/opencl-headers/default.nix      |  2 +-
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/opencl-clhpp/default.nix

diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix
new file mode 100644
index 00000000000..20b7c9ba6df
--- /dev/null
+++ b/pkgs/development/libraries/opencl-clhpp/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake, python, opencl-headers }:
+
+stdenv.mkDerivation rec {
+  name = "opencl-clhpp-${version}";
+  version = "2.0.10";
+
+  src = fetchFromGitHub {
+    owner = "KhronosGroup";
+    repo = "OpenCL-CLHPP";
+    rev = "v${version}";
+    sha256 = "0h5kpg5cl8wzfnqmv6i26aig2apv06ffm9p3rh35938n9r8rladm";
+  };
+
+  nativeBuildInputs = [ cmake python ];
+
+  propagatedBuildInputs = [ opencl-headers ];
+
+  preConfigure = ''
+    cmakeFlags="-DCMAKE_INSTALL_PREFIX=$out/include -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "OpenCL Host API C++ bindings";
+    homepage = "http://github.khronos.org/OpenCL-CLHPP/";
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix
index 228e628aa19..34ccd75d9e7 100644
--- a/pkgs/development/libraries/opencl-headers/default.nix
+++ b/pkgs/development/libraries/opencl-headers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "opencl-headers-2.1.0";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9542506d22d..b980cc317e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8896,6 +8896,8 @@ in
 
   opencl-headers = callPackage ../development/libraries/opencl-headers { };
 
+  opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { };
+
   opencollada = callPackage ../development/libraries/opencollada { };
 
   opencsg = callPackage ../development/libraries/opencsg { };

From cc68ab1ae2c38adf3f71f178c4931a16e1a79ce9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 20 Jan 2017 03:31:16 +0300
Subject: [PATCH 394/727] opencl-headers: 2.1.0 -> 2.1-2016-11-29

---
 pkgs/development/libraries/opencl-headers/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix
index 34ccd75d9e7..58822b96b08 100644
--- a/pkgs/development/libraries/opencl-headers/default.nix
+++ b/pkgs/development/libraries/opencl-headers/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "opencl-headers-2.1.0";
+  name = "opencl-headers-2.1-2016-11-29";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-Headers";
-    rev = "c1770dcc6cf1daadec1905e7393f3691c1dde200";
-    sha256 = "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck";
+    rev = "abb29588550c77f8340a6c3683531407013bf26b";
+    sha256 = "0zjznq65i4b2h4k36qfbbzq1acf2jdd9vygjv5az1yk7qgsp4jj7";
   };
 
   installPhase = ''
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Khronos OpenCL headers";
-    homepage = https://www.khronos.org/registry/cl/;
+    homepage = "https://www.khronos.org/registry/cl/";
     license = licenses.mit;
     platforms = platforms.unix;
   };

From 1db8ab66e3d9911ca7f3d7c59e8c31a67bacf3f2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 20 Jan 2017 03:32:25 +0300
Subject: [PATCH 395/727] opencl-info: init at 2014-02-21

---
 pkgs/tools/system/opencl-info/default.nix | 28 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/system/opencl-info/default.nix

diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix
new file mode 100644
index 00000000000..b4d9f699b05
--- /dev/null
+++ b/pkgs/tools/system/opencl-info/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, opencl-clhpp, ocl-icd }:
+
+stdenv.mkDerivation {
+  name = "opencl-info-2014-02-21";
+
+  src = fetchFromGitHub {
+    owner = "marchv";
+    repo = "opencl-info";
+    rev = "3e53d001a98978feb865650cf0e93b045400c0d7";
+    sha256 = "114lxgnjg40ivjjszkv4n3f3yq2lbrvywryvbazf20kqmdz7315l";
+  };
+
+  buildInputs = [ opencl-clhpp ocl-icd ];
+
+  NIX_LDFLAGS = [ "-lOpenCL" ];
+
+  installPhase = ''
+    install -Dm755 opencl-info $out/bin/opencl-info
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tool to dump OpenCL platform/device information";
+    homepage = "https://github.com/marchv/opencl-info";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b980cc317e4..bd5ae9160f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3108,6 +3108,8 @@ in
 
   opencc = callPackage ../tools/text/opencc { };
 
+  opencl-info = callPackage ../tools/system/opencl-info { };
+
   opencryptoki = callPackage ../tools/security/opencryptoki { };
 
   opendbx = callPackage ../development/libraries/opendbx { };

From 5fb2fc73dbc16b052dcc3e7fb59fa631f325a45f Mon Sep 17 00:00:00 2001
From: Nick Novitski <nicknovitski@gmail.com>
Date: Fri, 20 Jan 2017 14:08:25 +1300
Subject: [PATCH 396/727] newsbeuter: podbeuter can download without
 segfaulting

---
 .../networking/feedreaders/newsbeuter/default.nix             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
index d2c1a2aeb07..9cb42759734 100644
--- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
       url = "https://github.com/akrennmair/newsbeuter/commit/cdacfbde9fe3ae2489fc96d35dfb7d263ab03f50.patch";
       sha256 = "1lhvn63cqjpikwsr6zzndb1p5y140vvphlg85fazwx4xpzd856d9";
     })
+    (fetchpatch {
+      url = "https://github.com/akrennmair/newsbeuter/commit/33577f842d9b74c119f3cebda95ef8652304db81.patch";
+      sha256 = "1kwhp6k14gk1hclgsr9w47qg7hs60p23zsl6f6vw13mczp2naqlb";
+    })
   ];
 
   installFlags = [ "DESTDIR=$(out)" "prefix=" ];

From 489c593b6839e9678d4432161a07e7dee89dc41d Mon Sep 17 00:00:00 2001
From: Nick Novitski <nicknovitski@gmail.com>
Date: Fri, 20 Jan 2017 14:09:16 +1300
Subject: [PATCH 397/727] newsbeuter: darwin build working and enabled

---
 .../networking/feedreaders/newsbeuter/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
index 9cb42759734..e570a6e7c10 100644
--- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "DESTDIR=$(out)" "prefix=" ];
 
-  installPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     for prog in $out/bin/*; do
       wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
     done
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
     description = "An open-source RSS/Atom feed reader for text terminals";
     maintainers = with stdenv.lib.maintainers; [ lovek323 ];
     license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.unix;
   };
 }

From 30597dd656eb905a1800f2e95012ae2dc2a265a2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 20 Jan 2017 09:15:34 +0800
Subject: [PATCH 398/727] blockdiag: use version as part of name

All the other "diags" have the version as part of the name.
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ebab286c900..c92d7eb02fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2937,7 +2937,7 @@ in {
 
 
   blockdiag = buildPythonPackage rec {
-    name = "blockdiag";
+    name = "blockdiag-${version}";
     version = "1.5.3";
 
     src = pkgs.fetchurl {

From 97f5eea0b6cf3b83136d1bb452fd084390d3755a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 20 Jan 2017 02:20:43 +0100
Subject: [PATCH 399/727] gnome3.libgames-support: 1.0 -> 1.2.1

---
 .../gnome-3/3.22/misc/libgames-support/default.nix  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix
index 06937c74c65..98b71c9d9c9 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix
@@ -1,15 +1,12 @@
 { stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool }:
 
-let
-  major = "1";
-  minor = "0";
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "libgames-support-${version}";
+stdenv.mkDerivation rec {
+  version = "1.2.1";
+  name = "libgnome-games-support-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgames-support/${version}/${name}.tar.xz";
-    sha256 = "02qn009m1i07nh8wnyrrjf7kbbapk814ap5pvin5ka5sj996cyqq";
+    url = "mirror://gnome/sources/libgnome-games-support/1.2/${name}.tar.xz";
+    sha256 = "1rsyf5hbjim7zpk1yar3gv65g1nmw6zbbc0smrmxsfk0f9n3j9m6";
   };
 
   buildInputs = [ pkgconfig glib gtk3 libgee intltool ];

From f11a0e0efffe017fe6c4bee44f4e39b74a12516f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 20 Jan 2017 02:38:50 +0100
Subject: [PATCH 400/727] gnome3.nemiver: fix build

---
 .../desktops/gnome-3/3.22/devtools/nemiver/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix
index e61643fd9db..bc42c900de9 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb,
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb,
   boost, sqlite, gconf, libgtop, glibmm, gtkmm, vte, gtksourceview,
   gtksourceviewmm, wrapGAppsHook }:
 
@@ -10,7 +10,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ gtk3 libxml2 intltool itstool gdb boost sqlite gconf libgtop
     glibmm gtkmm vte gtksourceview gtksourceviewmm ];
 
-  patches = [ ./bool_slot.patch ./safe_ptr.patch ];
+  patches = [
+    ./bool_slot.patch ./safe_ptr.patch
+    (fetchpatch {
+      url = "https://git.gnome.org/browse/nemiver/patch/src/persp/dbgperspective/nmv-dbg-perspective.cc?id=262cf9657f9c2727a816972b348692adcc666008";
+      sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7";
+    })
+  ];
 
   meta = with stdenv.lib; {
     homepage = "https://wiki.gnome.org/Apps/Nemiver";

From 7acadd6f9bb93b2fd070a55cb5eb4cfe1ae8ab43 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 20 Jan 2017 02:52:16 +0100
Subject: [PATCH 401/727] ardour{3,4}: remove due to build failures

---
 pkgs/applications/audio/ardour/ardour3.nix | 94 ----------------------
 pkgs/applications/audio/ardour/ardour4.nix | 86 --------------------
 pkgs/top-level/all-packages.nix            | 14 +---
 3 files changed, 1 insertion(+), 193 deletions(-)
 delete mode 100644 pkgs/applications/audio/ardour/ardour3.nix
 delete mode 100644 pkgs/applications/audio/ardour/ardour4.nix

diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
deleted file mode 100644
index 0db95104970..00000000000
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
-, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2
-, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
-, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
-, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
-, perl, pkgconfig, python2, rubberband, serd, sord, sratom, suil, taglib, vampSDK }:
-
-let
-
-  # Ardour git repo uses a mix of annotated and lightweight tags. Annotated
-  # tags are used for MAJOR.MINOR versioning, and lightweight tags are used
-  # in-between; MAJOR.MINOR.REV where REV is the number of commits since the
-  # last annotated tag. A slightly different version string format is needed
-  # for the 'revision' info that is built into the binary; it is the format of
-  # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
-
-  # Version to build.
-  #tag = "3.5.403";
-
-  # Version info that is built into the binary. Keep in sync with 'tag'. The
-  # last 8 digits is a (fake) commit id.
-  revision = "3.5-4539-g7024232";
-
-  # temporarily use a non tagged version, because 3.5.403 has a bug that
-  # causes loss of audio-files,  and it was decided that there won't be a
-  # hotfix release, and we should use 4.0 when it comes out.
-  # more info: http://comments.gmane.org/gmane.comp.audio.ardour.user/13665
-
-  version = "2015-02-20";
-in
-
-stdenv.mkDerivation rec {
-  name = "ardour3-git-${version}";
-
-  src = fetchgit {
-    url = git://git.ardour.org/ardour/ardour.git;
-    rev = "7024232855d268633760674d34c096ce447b7240";
-    sha256 = "0pnnx22asizin5rvf352nfv6003zarw3jd64magp10310wrfiwbq";
-  };
-
-  buildInputs =
-    [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
-      glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
-      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
-      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
-      makeWrapper pango perl pkgconfig python2 rubberband serd sord sratom suil taglib vampSDK
-    ];
-
-  patchPhase = ''
-    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
-    sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
-    patchShebangs ./tools/
-  '';
-
-  configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out";
-
-  buildPhase = "${python2.interpreter} waf";
-
-  installPhase = ''
-    ${python2.interpreter} waf install
-
-    # Install desktop file
-    mkdir -p "$out/share/applications"
-    cat > "$out/share/applications/ardour.desktop" << EOF
-    [Desktop Entry]
-    Name=Ardour 3
-    GenericName=Digital Audio Workstation
-    Comment=Multitrack harddisk recorder
-    Exec=$out/bin/ardour3
-    Icon=$out/share/ardour3/icons/ardour_icon_256px.png
-    Terminal=false
-    Type=Application
-    X-MultipleArgs=false
-    Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video;
-    EOF
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Multi-track hard disk recording software";
-    longDescription = ''
-      Ardour is a digital audio workstation (DAW), You can use it to
-      record, edit and mix multi-track audio and midi. Produce your
-      own CDs. Mix video soundtracks. Experiment with new ideas about
-      music and sound.
-
-      Please consider supporting the ardour project financially:
-      https://community.ardour.org/node/8288
-    '';
-    homepage = http://ardour.org/;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}
diff --git a/pkgs/applications/audio/ardour/ardour4.nix b/pkgs/applications/audio/ardour/ardour4.nix
deleted file mode 100644
index e6a0ff66b3c..00000000000
--- a/pkgs/applications/audio/ardour/ardour4.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
-, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2
-, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
-, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
-, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
-, perl, pkgconfig, python2, rubberband, serd, sord, sratom, suil, taglib, vampSDK }:
-
-let
-
-  # Ardour git repo uses a mix of annotated and lightweight tags. Annotated
-  # tags are used for MAJOR.MINOR versioning, and lightweight tags are used
-  # in-between; MAJOR.MINOR.REV where REV is the number of commits since the
-  # last annotated tag. A slightly different version string format is needed
-  # for the 'revision' info that is built into the binary; it is the format of
-  # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
-
-  # Version to build.
-  tag = "4.7";
-
-in
-
-stdenv.mkDerivation rec {
-  name = "ardour-${tag}";
-
-  src = fetchFromGitHub {
-    owner = "Ardour";
-    repo = "ardour";
-    rev = "d84a8222f2b6dab5028b2586f798535a8766670e";
-    sha256 = "149gswphz77m3pkzsn2nqbm6yvcfa3fva560bcvjzlgb73f64q5l";
-  };
-
-  buildInputs =
-    [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
-      glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
-      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
-      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
-      makeWrapper pango perl pkgconfig python2 rubberband serd sord sratom suil taglib vampSDK
-    ];
-
-  # ardour's wscript has a "tarball" target but that required the git revision
-  # be available. Since this is an unzipped tarball fetched from github we
-  # have to do that ourself.
-  patchPhase = ''
-    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc
-    sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
-    patchShebangs ./tools/
-  '';
-
-  configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out";
-
-  buildPhase = "${python2.interpreter} waf";
-
-  installPhase = ''
-    ${python2.interpreter} waf install
-    # Install desktop file
-    mkdir -p "$out/share/applications"
-    cat > "$out/share/applications/ardour.desktop" << EOF
-    [Desktop Entry]
-    Name=Ardour 4
-    GenericName=Digital Audio Workstation
-    Comment=Multitrack harddisk recorder
-    Exec=$out/bin/ardour4
-    Icon=$out/share/ardour4/icons/ardour_icon_256px.png
-    Terminal=false
-    Type=Application
-    X-MultipleArgs=false
-    Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video;
-    EOF
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Multi-track hard disk recording software";
-    longDescription = ''
-      Ardour is a digital audio workstation (DAW), You can use it to
-      record, edit and mix multi-track audio and midi. Produce your
-      own CDs. Mix video soundtracks. Experiment with new ideas about
-      music and sound.
-      Please consider supporting the ardour project financially:
-      https://community.ardour.org/node/8288
-    '';
-    homepage = http://ardour.org/;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu maintainers.fps ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a30602fdad4..65d142d323b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12403,19 +12403,7 @@ in
 
   ao = callPackage ../applications/graphics/ao {};
 
-  ardour = ardour5;
-
-  ardour3 =  callPackage ../applications/audio/ardour/ardour3.nix {
-    inherit (gnome2) libgnomecanvas libgnomecanvasmm;
-    inherit (vamp) vampSDK;
-  };
-
-  ardour4 =  callPackage ../applications/audio/ardour/ardour4.nix {
-    inherit (gnome2) libgnomecanvas libgnomecanvasmm;
-    inherit (vamp) vampSDK;
-  };
-
-  ardour5 =  callPackage ../applications/audio/ardour {
+  ardour = callPackage ../applications/audio/ardour {
     inherit (gnome2) libgnomecanvas libgnomecanvasmm;
     inherit (vamp) vampSDK;
   };

From b81d07e6e6639cc828fd8413ea53ce8ad939810a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 20 Jan 2017 03:10:12 +0100
Subject: [PATCH 402/727] ardour: 5.4 -> 5.5

---
 pkgs/applications/audio/ardour/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 5e9e71f42cb..6745109d7d0 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -16,7 +16,7 @@ let
   # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
 
   # Version to build.
-  tag = "5.4";
+  tag = "5.5";
 
 in
 

From cda11c958efabcde4303bd5fb2d9a2109d7ed60e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 19 Jan 2017 21:44:22 -0500
Subject: [PATCH 403/727] pythonPackages.pysaml2: patch against external XML
 entities (CVE-2016-10127)

---
 pkgs/top-level/python-packages.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ebab286c900..ef520db327b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19540,9 +19540,18 @@ in {
       sha256 = "0y2iw1dddcvi13xjh3l52z1mvnrbc41ik9k4nn7lwj8x5kimnk9n";
     };
 
+    patches = [
+      (pkgs.fetchpatch {
+        name = "CVE-2016-10127.patch";
+        url = "https://sources.debian.net/data/main/p/python-pysaml2/3.0.0-5/debian/patches/fix-xxe-in-xml-parsing.patch";
+        sha256 = "184lkwdayjqiahzsn4yp15parqpmphjsb1z7zwd636jvarxqgs2q";
+      })
+    ];
+
     propagatedBuildInputs = with self; [
       repoze_who paste cryptography pycrypto pyopenssl ipaddress six cffi idna
       enum34 pytz setuptools zope_interface dateutil requests2 pyasn1 webob decorator pycparser
+      defusedxml
     ];
     buildInputs = with self; [
       Mako pytest memcached pymongo mongodict pkgs.xmlsec

From c0f3b8d629e5b8935936efca05a5612a3712ebdc Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 19 Jan 2017 21:55:05 -0500
Subject: [PATCH 404/727] wordpress: 4.6.1 -> 4.7.1 for multiple CVEs

CVE-2017-5487 CVE-2017-5488 CVE-2017-5489 CVE-2017-5490 CVE-2017-5491 CVE-2017-5492 CVE-2017-5493
---
 nixos/modules/services/web-servers/apache-httpd/wordpress.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index 32dd4439675..26f0bdec655 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -6,7 +6,7 @@ with lib;
 let
 
   # Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix
-  version = "4.6.1";
+  version = "4.7.1";
   fullversion = "${version}";
 
   # Our bare-bones wp-config.php file using the above settings
@@ -75,7 +75,7 @@ let
       owner = "WordPress";
       repo = "WordPress";
       rev = "${fullversion}";
-      sha256 = "0n82xgjg1ry2p73hhgpslnkdzrma5n6hxxq76s7qskkzj0qjfvpn";
+      sha256 = "1wb4f4zn55d23qi0whsfpbpcd4sjvzswgmni6f5rzrmlawq9ssgr";
     };
     installPhase = ''
       mkdir -p $out

From 18a5e1522ce48de7d729dd25d7b4fe092f07fee8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 20 Jan 2017 06:36:44 +0000
Subject: [PATCH 405/727] ocamlPackages.{camlpdf,cpdf}: 2.1.1 -> 2.2.1

---
 pkgs/development/ocaml-modules/camlpdf/default.nix | 6 +++---
 pkgs/development/ocaml-modules/cpdf/default.nix    | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix
index 9946366de01..01441fcb4ec 100644
--- a/pkgs/development/ocaml-modules/camlpdf/default.nix
+++ b/pkgs/development/ocaml-modules/camlpdf/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, ocaml, findlib, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "2.1.1";
-  name = "ocaml-camlpdf-${version}";
+  version = "2.2.1";
+  name = "ocaml${ocaml.version}-camlpdf-${version}";
   src = fetchgit {
     url = https://github.com/johnwhitington/camlpdf.git;
     rev = "refs/tags/v${version}";
-    sha256 = "118656hc3zv5nwmbhr6llvb7q2pbxk2hz95bv8x4879a9qsnb4xr";
+    sha256 = "0wa4rw8ccpb8xprslg88hbk352bi8bia4iffc22y55gkjr60f8gj";
   };
 
   buildInputs = [ ocaml findlib ncurses ];
diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix
index 66294206e66..07909d1a465 100644
--- a/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -1,16 +1,14 @@
 { stdenv, fetchgit, ocaml, findlib, camlpdf, ncurses }:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.0";
-
-let version = "2.1.1"; in
+let version = "2.2.1"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-cpdf-${version}";
+  name = "ocaml${ocaml.version}-cpdf-${version}";
 
   src = fetchgit {
     url = https://github.com/johnwhitington/cpdf-source.git;
     rev = "refs/tags/v${version}";
-    sha256 = "01dq7z3admwnyp22z1h43a8f3glii3zxc9c7i6s2rgza3pd9jq4k";
+    sha256 = "1i2z417agnzzdavjfwb20r6716jl3sk5yi43ssy4jqzy6ah8x1ff";
   };
 
   buildInputs = [ ocaml findlib ncurses ];

From 7b885e339b4d39b528dd3ff9f9e66c0f224d285a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 20 Jan 2017 09:51:05 +0100
Subject: [PATCH 406/727] hbase: 0.98.19 -> 0.98.24

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

diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix
index 56b71ef969c..dcd81fa44b0 100644
--- a/pkgs/servers/hbase/default.nix
+++ b/pkgs/servers/hbase/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 stdenv.mkDerivation rec {
   name = "hbase-${version}";
-  version = "0.98.19";
+  version = "0.98.24";
 
   src = fetchurl {
     url = "mirror://apache/hbase/${version}/hbase-${version}-hadoop2-bin.tar.gz";
-    sha256 = "0g7y38cw09fydbf4fbs1anyilhfgxpbfs41f0aignli5i3hd1pgx";
+    sha256 = "0kz72wqsii09v9hxkw10mzyvjhji5sx3l6aijjalgbybavpcxglb";
   };
 
   buildInputs = [ makeWrapper ];

From 86fc322e0a5d2ab47b9ca0ec9936b5b863810473 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 20 Jan 2017 09:51:40 +0100
Subject: [PATCH 407/727] elasticsearch2: 2.4.0 -> 2.4.4

---
 pkgs/servers/search/elasticsearch/2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix
index b45d66fd141..e66482fcf6a 100644
--- a/pkgs/servers/search/elasticsearch/2.x.nix
+++ b/pkgs/servers/search/elasticsearch/2.x.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.4.0";
+  version = "2.4.4";
   name = "elasticsearch-${version}";
 
   src = fetchurl {
     url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz";
-    sha256 = "1jglmj1dnh1n2niyds6iyrpf6x6ppqgkivzy6qabkjvvmr013q1s";
+    sha256 = "1qjq04sfqb35pf2xpvr8j5p27chfxpjp8ymrp1h5bfk5rbk9444q";
   };
 
   patches = [ ./es-home-2.x.patch ];

From 1948cdf3f457047d61240793b4bff23cda33a62e Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 20 Jan 2017 09:52:07 +0100
Subject: [PATCH 408/727] elasticsearch2: Minor cleanup

---
 pkgs/servers/search/elasticsearch/2.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix
index e66482fcf6a..35b6ee92cdc 100644
--- a/pkgs/servers/search/elasticsearch/2.x.nix
+++ b/pkgs/servers/search/elasticsearch/2.x.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
     # don't want to have binary with name plugin
     mv $out/bin/plugin $out/bin/elasticsearch-plugin
-       wrapProgram $out/bin/elasticsearch ${if (!stdenv.isDarwin)
+    wrapProgram $out/bin/elasticsearch ${if (!stdenv.isDarwin)
         then ''--prefix PATH : "${utillinux}/bin/"''
         else ''--prefix PATH : "${getopt}/bin"''} \
       --set JAVA_HOME "${jre}"

From 7f71dd0c495a8bee86944bdc9d7eb39bf43062ce Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 20 Jan 2017 09:52:30 +0100
Subject: [PATCH 409/727] opentsdb: 2.2.0 -> 2.3.0

---
 pkgs/tools/misc/opentsdb/default.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index e111cda9cd1..672ec52c076 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -1,27 +1,25 @@
-{ stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools, python }:
+{ stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools
+, python, git
+}:
+
 with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "opentsdb-${version}";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1dfzfsagpviqbifz81pik7pzvadz71kls1idi7jiq7z27vcd92an";
+    sha256 = "0nip40rh3vl5azfc27yha4ngnm9sw47hf110c90hg0warzz85sch";
   };
 
-  buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ];
+  buildInputs = [ autoconf automake curl jdk makeWrapper nettools python git ];
 
-  configurePhase = ''
-    echo > build-aux/fetchdep.sh.in
+  preConfigure = ''
     ./bootstrap
-    mkdir build
-    cd build
-    ../configure --prefix=$out
-    patchShebangs ../build-aux/
   '';
 
-  installPhase = ''
-    make install
+  postInstall = ''
     wrapProgram $out/bin/tsdb \
       --set JAVA_HOME "${jre}" \
       --set JAVA "${jre}/bin/java"

From 6c9f4a61be48fa10dbed04b7f795003d54193080 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 20 Jan 2017 10:59:54 +0100
Subject: [PATCH 410/727] lean: 2017-01-14 -> 3.0.0

---
 pkgs/applications/science/logic/lean/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 52cdca0b169..b6de57951ca 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lean-${version}";
-  version = "2017-01-14";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
-    rev    = "6e9a6d15dbfba3e8a1560d2cfcdbc7d81314d7bb";
-    sha256 = "0wi1jssj1bi45rji4prlnvzs8nr48mqnj9yg5vnhah4rsjwl20km";
+    rev    = "v${version}";
+    sha256 = "1ds25213vir8llans7na3laqs8rgr06clgp9xzq8akiwfy87b74i";
   };
 
   buildInputs = [ gmp mpfr cmake gperftools ];

From 0bd3f82a676ff867d402fd0cfa9a1f98b7730d51 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 20 Jan 2016 21:14:15 +0100
Subject: [PATCH 411/727] qemu: fix the url of patch for CVE-2016-9921 and
 CVE-2016-9922

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

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index eb167210126..a5cb774a130 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -145,8 +145,8 @@ stdenv.mkDerivation rec {
     })
     (fetchpatch {
       name = "qemu-CVE-2016-9921_9922.patch";
-      url = "http://git.qemu.org/?p=qemu.git;a=commit;h=4299b90e9ba9ce5ca9024572804ba751aa1a7e70";
-      sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=4299b90e9ba9ce5ca9024572804ba751aa1a7e70";
+      sha256 = "125xlysdgpp59m4rp1mb59i3ipmf3yjk8x01gzvxcg1hnpgm4j4c";
     })
   ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
   hardeningDisable = [ "stackprotector" ];

From 9f1514f086e9f2e13281c62cd25ebef2b9acb056 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 20 Jan 2016 21:21:47 +0100
Subject: [PATCH 412/727] qemu: fix several CVEs

- CVE 2016-9845
- CVE-2016-9846
- CVE-2016-9907
- CVE-2016-9912
---
 .../virtualization/qemu/default.nix           | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index a5cb774a130..ae88399f13a 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -148,6 +148,26 @@ stdenv.mkDerivation rec {
       url = "http://git.qemu.org/?p=qemu.git;a=patch;h=4299b90e9ba9ce5ca9024572804ba751aa1a7e70";
       sha256 = "125xlysdgpp59m4rp1mb59i3ipmf3yjk8x01gzvxcg1hnpgm4j4c";
     })
+    (fetchpatch {
+      name = "qemu-CVE-2016-9845.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=42a8dadc74f8982fc269e54e3c5627b54d9f83d8";
+      sha256 = "0qivj585pp1g6xfzknzgi5d2p6can3ihfgpxz3wi12h5jl5q6677";
+    })
+    (fetchpatch {
+      name = "qemu-CVE-2016-9846.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=2d1cd6c7a91a4beb99a0c3a21be529222a708545";
+      sha256 = "1pa8wwxaz4k4sw1zfa4w0zlxkw6qpsrny1z8c8i8di91aswspq3i";
+    })
+    (fetchpatch {
+      name = "qemu-CVE-2016-9907.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=07b026fd82d6cf11baf7d7c603c4f5f6070b35bf";
+      sha256 = "0phsk2x6mfsd6gabmfk4pr5nc4aymcqsfd88zihlm9d20gg9pbv3";
+    })
+    (fetchpatch {
+      name = "qemu-CVE-2016-9912.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=b8e23926c568f2e963af39028b71c472e3023793";
+      sha256 = "1b711s63pg6rzqkqyx0mrlb4x6jv3dscc90qg8w6lflwlhwa73iv";
+    })
   ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
   hardeningDisable = [ "stackprotector" ];
 

From cf8ca492af0704bece4dbdc125cea75532f8786a Mon Sep 17 00:00:00 2001
From: tkatchev <tkatchev@gmail.com>
Date: Fri, 20 Jan 2017 13:16:13 +0300
Subject: [PATCH 413/727] swig: fix problem similar to #16161.

---
 pkgs/development/tools/misc/swig/3.x.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
index 2d5358b2255..dfcfe7c9e89 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ pcre ];
 
+  configureFlags = "--without-tcl";
+
   postPatch = ''
     # Disable ccache documentation as it need yodl
     sed -i '/man1/d' CCache/Makefile.in

From 35fdfd88d4e2f56e243ff8f4d803f9320b23cf9c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 20 Jan 2017 11:54:03 +0100
Subject: [PATCH 414/727] php56: 5.6.29 -> 5.6.30

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 920bf2c3207..651b22ff409 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -309,8 +309,8 @@ let
 
 in {
   php56 = generic {
-    version = "5.6.29";
-    sha256 = "1fr530x1hxpaf0gb1ayrs9a4xa9v14dfb4hn2560dgm7i96896s9";
+    version = "5.6.30";
+    sha256 = "01krq8r9xglq59x376zlg261yikckq179jmhnlcg3gqxza9w41d1";
   };
 
   php70 = generic {

From ff5ef7d052a32bb98057362509f827fd665539f5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 20 Jan 2017 11:54:34 +0100
Subject: [PATCH 415/727] php70: 7.0.14 -> 7.0.15

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 651b22ff409..d676e0c1b68 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -314,8 +314,8 @@ in {
   };
 
   php70 = generic {
-    version = "7.0.14";
-    sha256 = "0d0596vzpyw86a77smk799sxl4mh2wylzsvmrv8mzda21nd3di7v";
+    version = "7.0.15";
+    sha256 = "1nbxwj4yx30k77qibhmnx0rvqhia1zbkwi5ps5nzm0sn6d3zkj58";
   };
 
   php71 = generic {

From e5acde0cf4975282cf26461e6d46db1e4ef90026 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 20 Jan 2017 11:54:44 +0100
Subject: [PATCH 416/727] php71: 7.1.0 -> 7.1.1

@NixOS/security-notifications (for all three updates)

Relevant to #21967
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index d676e0c1b68..c261668edd2 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -319,7 +319,7 @@ in {
   };
 
   php71 = generic {
-    version = "7.1.0";
-    sha256 = "0qcf4aahkiwypidw42pd5dz34n10296zgjfyh56lgcymxryzvg38";
+    version = "7.1.1";
+    sha256 = "1g3mqscxnsic9ypf641jhiyn95d4d1nz198539245v2lgffx74fp";
   };
 }

From 067a9ee73ef14bc3e3b4f92ea00c4587e782aa0c Mon Sep 17 00:00:00 2001
From: tkatchev <tkatchev@gmail.com>
Date: Fri, 20 Jan 2017 13:16:13 +0300
Subject: [PATCH 417/727] swig: fix problem similar to #16161.

---
 pkgs/development/tools/misc/swig/2.x.nix | 2 ++
 pkgs/development/tools/misc/swig/3.x.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix
index 48ba12ccd9c..21da4b21a4b 100644
--- a/pkgs/development/tools/misc/swig/2.x.nix
+++ b/pkgs/development/tools/misc/swig/2.x.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ pcre ];
 
+  configureFlags = "--without-tcl";
+
   postPatch = ''
     # Disable ccache documentation as it need yodl
     sed -i '/man1/d' CCache/Makefile.in
diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
index 2d5358b2255..dfcfe7c9e89 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ pcre ];
 
+  configureFlags = "--without-tcl";
+
   postPatch = ''
     # Disable ccache documentation as it need yodl
     sed -i '/man1/d' CCache/Makefile.in

From 1fafd2a2d321d8b3f8b8ab213299f3a91777e9ae Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 27 Dec 2016 12:47:25 +0800
Subject: [PATCH 418/727] cpp-hocon: 0.1.2 -> 0.1.4

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

diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix
index 3c4fe70c19d..90c27083d77 100644
--- a/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/pkgs/development/libraries/cpp-hocon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "cpp-hocon-${version}";
-  version = "0.1.2";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
-    sha256 = "0v2mnak6fh13dkl25lfvw1la2dfjqrh3lq1d40r3a52m56vwflrg";
+    sha256 = "1abalk0sjfg4yfz148hdknsbnl2xwjb8li7lqc64d07ifxhcqr87";
     rev = version;
     repo = "cpp-hocon";
     owner = "puppetlabs";

From a85c994dd1ec8df212d7aca4b77bab69c54fae93 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 27 Dec 2016 12:47:58 +0800
Subject: [PATCH 419/727] leatherman: 0.9.0 -> 0.10.1

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

diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index bc62a04808f..ea092a33637 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "leatherman-${version}";
-  version = "0.9.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
-    sha256 = "18nidasykbwdd9qzwc8pnzhczy6acr3rsxwvv2v3j5gq3nbsk2mc";
+    sha256 = "0kjk3xq7v6bqq35ymj9vr9xz5kpcka51ms6489pm48adyaf53hs7";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";

From 1feedf25df22c95eb725809d44e5b4a3f7cef729 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 20 Jan 2017 14:50:02 +0200
Subject: [PATCH 420/727] U-Boot: 2016.11 -> 2017.01

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

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index e6577839718..597866a80ab 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -10,11 +10,11 @@ let
            stdenv.mkDerivation (rec {
 
     name = "uboot-${defconfig}-${version}";
-    version = "2016.11";
+    version = "2017.01";
 
     src = fetchurl {
       url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-      sha256 = "1j6dkd9fqiibsdv0smq6q4x5zgyd4i1n4lk7prm47h6wcmjkx0a5";
+      sha256 = "1wpc51jm3zyibgcr78jng2yksqvrya76bxgsr4pcyjrsz5sm2hkc";
     };
 
     nativeBuildInputs = [ bc dtc ];

From 0fdef7d2f170f83b5af242c77709e4939f73f89d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 20 Jan 2017 09:34:19 -0500
Subject: [PATCH 421/727] 4.9 is the latest longterm kernel.

https://lkml.org/lkml/2017/1/19/339
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5241df8da1b..db55af478a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11407,7 +11407,7 @@ in
   });
 
   # The current default kernel / kernel modules.
-  linuxPackages = linuxPackages_4_4;
+  linuxPackages = linuxPackages_4_9;
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!

From 34c52896d18615363cf6cc7936b1b610ab67bbdc Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 20 Jan 2017 09:36:04 -0500
Subject: [PATCH 422/727] linux 4.9.4 -> 4.9.5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 948f700b484..54c67901f50 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.4";
+  version = "4.9.5";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1160rs35w58cwynq2pcdjxvxgc5lkhy4ydh00hylsnmi9jvazpcv";
+    sha256 = "fcf5c43efcc9540815dae8f4d4f73c04dca9a6906c762cbee1242fdd908cf5a7";
   };
 
   kernelPatches = args.kernelPatches;

From ea7dadcaf67f5a1ab974f818e99c99948f2a312e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 20 Jan 2017 15:38:19 +0100
Subject: [PATCH 423/727] pythonPackages.Pweave: disable broken tests

---
 pkgs/top-level/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ad2a42e46a..bcfcd239a3d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24838,6 +24838,9 @@ in {
       matplotlib
     ];
 
+    # fails due to trying to run CSS as test
+    doCheck = false;
+
     meta = {
       description = "Scientific reports with embedded python computations with reST, LaTeX or markdown";
       homepage = http://mpastell.com/pweave/ ;

From 9b92a0784303b8384b71855e7cee27bc8d72dae8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 20 Jan 2017 15:43:34 +0100
Subject: [PATCH 424/727] treewide: use lib.maintainers for meta.maintainers

---
 pkgs/applications/version-management/tortoisehg/default.nix | 2 +-
 pkgs/applications/window-managers/i3/blocks-gaps.nix        | 2 +-
 pkgs/applications/window-managers/i3/blocks.nix             | 1 -
 pkgs/misc/emulators/cdemu/base.nix                          | 1 -
 pkgs/tools/text/reckon/default.nix                          | 1 -
 pkgs/tools/text/uni2ascii/default.nix                       | 2 +-
 pkgs/top-level/python-packages.nix                          | 6 +++---
 7 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index fd61e490402..c4eed94017c 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -26,6 +26,6 @@ python2Packages.buildPythonApplication rec {
       homepage = http://tortoisehg.bitbucket.org/;
       license = lib.licenses.gpl2;
       platforms = lib.platforms.linux;
-      maintainers = [ "abcz2.uprola@gmail.com" ];
+      maintainers = with lib.maintainers; [ danbst ];
     };
 }
diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix
index a80dbd38ec8..d32e82f100e 100644
--- a/pkgs/applications/window-managers/i3/blocks-gaps.nix
+++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "A flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps";
     homepage = https://github.com/Airblader/i3blocks-gaps;
     license = licenses.gpl3;
-    maintainers = [ "carlsverre" ];
+    maintainers = with maintainers; [ carlsverre ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix
index 00de6b87453..60f13ce440c 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
     description = "A flexible scheduler for your i3bar blocks";
     homepage = https://github.com/vivien/i3blocks;
     license = licenses.gpl3;
-    maintainers = [ "MindTooth" ];
     platforms = with platforms; freebsd ++ linux;
   };
 }
diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix
index cfd2ad37cad..cc9d11f8643 100644
--- a/pkgs/misc/emulators/cdemu/base.nix
+++ b/pkgs/misc/emulators/cdemu/base.nix
@@ -32,6 +32,5 @@ in stdenv.mkDerivation ({
     homepage = http://cdemu.sourceforge.net/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = [ "Rok Mandeljc <mrok AT users DOT sourceforge DOT net>" ];
   };
 } // drvParams)
diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix
index de03963a412..b97ffc7c58a 100644
--- a/pkgs/tools/text/reckon/default.nix
+++ b/pkgs/tools/text/reckon/default.nix
@@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Flexibly import bank account CSV files into Ledger for command line accounting";
     license = licenses.mit;
-    maintainers = [ "mckean.kylej@gmail.com" ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix
index 9e62b2b3d59..9eebb830db1 100644
--- a/pkgs/tools/text/uni2ascii/default.nix
+++ b/pkgs/tools/text/uni2ascii/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     It also provides ways of converting non-ASCII characters to
     similar ASCII characters, e.g. by stripping diacritics.
     '';
-    maintainers = [ "cillian.deroiste@gmail.com" ];
+    maintainers = with stdenv.lib.maintainers; [ goibhniu ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bcfcd239a3d..3a56d612c82 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7851,7 +7851,7 @@ in {
     meta = with stdenv.lib; {
       description = "Accessing and Modifying INI files";
       license = licenses.mit;
-      maintainers = [ "abcz2.uprola@gmail.com" ];
+      maintainers = with maintainers; [ danbst ];
     };
   };
 
@@ -22237,7 +22237,7 @@ in {
       meta = with stdenv.lib; {
         description = "A Python binding to QScintilla, Qt based text editing control";
         license = licenses.lgpl21Plus;
-        maintainers = [ "abcz2.uprola@gmail.com" ];
+        maintainers = with maintainers; [ danbst ];
         platforms = platforms.linux;
       };
     };
@@ -29105,7 +29105,7 @@ EOF
     meta = {
       homepage = https://developers.google.com/storage/docs/gsutil;
       description = "Google Cloud Storage Tool";
-      maintainers = [ "Russell O'Connor <oconnorr@google.com>" ];
+      maintainers = with maintainers; [ roconnor ];
       license = licenses.asl20;
     };
     doCheck = false;

From e3597b9ddf94234b9ec61d46782b7797334b4a4e Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 20 Jan 2017 16:08:01 +0100
Subject: [PATCH 425/727] grafana: 4.0.2 -> 4.1.1

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index aa14af89c32..f2ce7822b8a 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,8 +1,8 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "4.0.2";
-  ts = "1481203731";
+  version = "4.1.1";
+  ts = "1484211277";
   name = "grafana-v${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -10,12 +10,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "1z71nb4qmp1qavsc101k86hc4yyis3mlqb1csrymkhgl94qpiiqm";
+    sha256 = "028s8fq8akv509kqw49865qpccxmhskaxcm51nn3c0i7vask2ivs";
   };
 
   srcStatic = fetchurl {
     url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz";
-    sha256 = "1jnh2hn95r1ik0z31b4p0niq7apykppf8jcjjhsbqf8yp8i2b737";
+    sha256 = "1srscjlm9m08z7shydhkl4wnhv19by7pqfd7qvbvz2v3d5slqiji";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From 46cb55ced8f75d6ae222a7c4608cd54846740327 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Fri, 20 Jan 2017 23:36:43 +0800
Subject: [PATCH 426/727] facter: 3.4.1 -> 3.5.1

---
 pkgs/tools/system/facter/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 83936ca65a5..677981b97ca 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, boost, cmake, cpp-hocon, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }:
+{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }:
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.4.1";
-  src = fetchurl {
-    url = "https://downloads.puppetlabs.com/facter/${name}.tar.gz";
-    sha256 = "1vvvqni68l3hmnxi8jp0n2rwzxyh1vmgv6xa2954h94dfax6dmcj";
+  version = "3.5.1";
+  src = fetchFromGitHub {
+    sha256 = "1rhfww0knjh6bj3b0ykxgfgw6rg2bzibkdrisq3nhl3djfq7r1a8";
+    rev = version;
+    repo = "facter";
+    owner = "puppetlabs";
   };
 
   cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];

From fd400ced6b003b222e64b7bf2ff2bcca1a93c5b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Fri, 20 Jan 2017 12:23:57 +0100
Subject: [PATCH 427/727] Rename page to cpages to match github

I also updated the mail.
---
 lib/maintainers.nix                                     | 2 +-
 pkgs/applications/networking/yafc/default.nix           | 2 +-
 pkgs/applications/video/kodi/plugins.nix                | 2 +-
 pkgs/development/libraries/SDL2/default.nix             | 2 +-
 pkgs/development/libraries/jsoncpp/1.6.5/default.nix    | 2 +-
 pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix | 2 +-
 pkgs/games/minecraft/default.nix                        | 2 +-
 pkgs/games/openxcom/default.nix                         | 2 +-
 pkgs/servers/amqp/qpid-cpp/default.nix                  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d40722dacac..58c8fc0f1d8 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -102,6 +102,7 @@
   corngood = "David McFarland <corngood@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   couchemar = "Andrey Pavlov <couchemar@yandex.ru>";
+  cpages = "Carles Pagès <page@ruiec.cat>";
   cransom = "Casey Ransom <cransom@hubns.net>";
   cryptix = "Henry Bubert <cryptix@riseup.net>";
   CrystalGamma = "Jona Stubbe <nixos@crystalgamma.de>";
@@ -350,7 +351,6 @@
   osener = "Ozan Sener <ozan@ozansener.com>";
   otwieracz = "Slawomir Gonet <slawek@otwiera.cz>";
   oxij = "Jan Malakhovski <oxij@oxij.org>";
-  page = "Carles Pagès <page@cubata.homelinux.net>";
   paholg = "Paho Lurie-Gregg <paho@paholg.com>";
   pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
   palo = "Ingolf Wanger <palipalo9@googlemail.com>";
diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix
index 45bb5518f9c..67c1b11e169 100644
--- a/pkgs/applications/networking/yafc/default.nix
+++ b/pkgs/applications/networking/yafc/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "ftp/sftp client with readline, autocompletion and bookmarks";
     homepage = http://www.yafc-ftp.com;
-    maintainers = [ stdenv.lib.maintainers.page ];
+    maintainers = [ stdenv.lib.maintainers.cpages ];
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index f179325e0a2..6abb47b81c3 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -232,7 +232,7 @@ in
       homepage = https://github.com/kodi-pvr/pvr.hts;
       description = "Kodi's Tvheadend HTSP client addon";
       platforms = platforms.all;
-      maintainers = with maintainers; [ page ];
+      maintainers = with maintainers; [ cpages ];
     };
   }).override {
     buildInputs = [ cmake kodi libcec_platform kodi-platform ];
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index f94d7051d0d..c25b0642637 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -75,6 +75,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.libsdl.org/";
     license = licenses.zlib;
     platforms = platforms.all;
-    maintainers = with maintainers; [ page ];
+    maintainers = with maintainers; [ cpages ];
   };
 }
diff --git a/pkgs/development/libraries/jsoncpp/1.6.5/default.nix b/pkgs/development/libraries/jsoncpp/1.6.5/default.nix
index 53df8d6e7cf..00dffdbc3ce 100644
--- a/pkgs/development/libraries/jsoncpp/1.6.5/default.nix
+++ b/pkgs/development/libraries/jsoncpp/1.6.5/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     inherit version;
     homepage = https://github.com/open-source-parsers/jsoncpp;
     description = "A simple API to manipulate JSON data in C++";
-    maintainers = with stdenv.lib.maintainers; [ ttuegel page ];
+    maintainers = with stdenv.lib.maintainers; [ ttuegel cpages ];
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.mit;
     branch = "1.6";
diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
index 86f5029e9a5..654bdd2e61f 100644
--- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
+++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     repositories.git = https://github.com/divVerent/s2tc.git;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.page ];
+    maintainers = [ stdenv.lib.maintainers.cpages ];
   };
 }
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 6bceb40b523..ebf04ec7536 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation {
   meta = {
       description = "A sandbox-building game";
       homepage = http://www.minecraft.net;
-      maintainers = with stdenv.lib.maintainers; [ page ryantm ];
+      maintainers = with stdenv.lib.maintainers; [ cpages ryantm ];
       license = stdenv.lib.licenses.unfreeRedistributable;
   };
 }
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 7b939af096a..204663e1448 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     description = "Open source clone of UFO: Enemy Unknown";
     homepage = http://openxcom.org;
     repositories.git = https://github.com/SupSuper/OpenXcom.git;
-    maintainers = [ stdenv.lib.maintainers.page ];
+    maintainers = [ stdenv.lib.maintainers.cpages ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl3;
   };
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index 410bd23eb30..c03ec8eb7f9 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     description = "An AMQP message broker and a C++ messaging API";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.page ];
+    maintainers = [ stdenv.lib.maintainers.cpages ];
   };
 }

From 305e3e27b6a5346d24fd8cdbf71667245707bbb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Fri, 20 Jan 2017 13:03:31 +0100
Subject: [PATCH 428/727] yafc: remove

Some things are broken and it's no longer maintained.
---
 pkgs/applications/networking/yafc/default.nix | 19 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 21 deletions(-)
 delete mode 100644 pkgs/applications/networking/yafc/default.nix

diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix
deleted file mode 100644
index 67c1b11e169..00000000000
--- a/pkgs/applications/networking/yafc/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, readline, libssh, intltool, libbsd, pkgconfig}:
-
-stdenv.mkDerivation rec {
-  name = "yafc-1.3.6";
-  src = fetchurl {
-    url = "http://www.yafc-ftp.com/downloads/${name}.tar.xz";
-    sha256 = "0wvrljihliggysfnzczc0s74i3ab2c1kzjjs99iqk98nxmb2b8v3";
-  };
-
-  buildInputs = [ readline libssh intltool libbsd pkgconfig ];
-
-  meta = {
-    description = "ftp/sftp client with readline, autocompletion and bookmarks";
-    homepage = http://www.yafc-ftp.com;
-    maintainers = [ stdenv.lib.maintainers.cpages ];
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 272c59a6fe4..2eb5d038b5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17939,8 +17939,6 @@ in
 
   yadm = callPackage ../applications/version-management/yadm { };
 
-  yafc = callPackage ../applications/networking/yafc { };
-
   yamdi = callPackage ../tools/video/yamdi { };
 
   yandex-disk = callPackage ../tools/filesystems/yandex-disk { };

From 00ab8e84c672fbf4b9a97ddc3ff94863ac7f14b8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 20 Jan 2017 17:46:44 +0100
Subject: [PATCH 429/727] doc: improve hardening docs

Fixes #18887.
---
 doc/stdenv.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 68441ea9393..44a0e4601fc 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1401,8 +1401,15 @@ These can be toggled using the <varname>stdenv.mkDerivation</varname> parameters
 <varname>hardeningDisable</varname> and <varname>hardeningEnable</varname>.
 </para>
 
-<para>The following flags are enabled by default and might require disabling
-if the program to package is incompatible.
+<para>
+Both parameters take a list of flags as strings. The special
+<varname>"all"</varname> flag can be passed to <varname>hardeningDisable</varname>
+to turn off all hardening. These flags can also be used as environment variables
+for testing or development purposes.
+</para>
+
+<para>The following flags are enabled by default and might require disabling with
+<varname>hardeningDisable</varname> if the program to package is incompatible.
 </para>
 
 <variablelist>
@@ -1563,7 +1570,8 @@ intel_drv.so: undefined symbol: vgaHWFreeHWRec
 </variablelist>
 
 <para>The following flags are disabled by default and should be enabled
-for packages that take untrusted input, like network services.
+with <varname>hardeningEnable</varname> for packages that take untrusted
+input like network services.
 </para>
 
 <variablelist>

From e70dcf681801fb01d4edc7407f4121e2abf5567d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 20 Jan 2017 14:10:15 -0500
Subject: [PATCH 430/727] ios-cross: Bump sdk version, verify sdk install at
 build time

---
 pkgs/os-specific/darwin/ios-cross/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix
index 1d26a8b350b..01753a5300b 100644
--- a/pkgs/os-specific/darwin/ios-cross/default.nix
+++ b/pkgs/os-specific/darwin/ios-cross/default.nix
@@ -18,7 +18,9 @@
 { prefix, arch, simulator ? false }: let
   sdkType = if simulator then "Simulator" else "OS";
 
-  sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}10.0.sdk";
+  sdkVer = "10.2";
+
+  sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${sdkVer}.sdk";
 
   /* TODO: Properly integrate with gcc-cross-wrapper */
   wrapper = import ../../../build-support/cc-wrapper {
@@ -29,6 +31,10 @@
     libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}";
     cc = clang;
     extraBuildCommands = ''
+      if ! [ -d ${sdk} ]; then
+          echo "You must have ${sdkVer} of the iPhone${sdkType} sdk installed at ${sdk}" >&2
+          exit 1
+      fi
       # ugh
       tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
       mv cc-cflags.tmp $out/nix-support/cc-cflags

From 7a92f2aab4571b6623eb39101beb9ee22a8896d4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 20 Jan 2017 10:44:21 -0600
Subject: [PATCH 431/727] kde5.plasma-desktop: move patches to quilt

---
 .../0001-qt-5.5-QML-import-paths.patch        | 69 -------------------
 .../plasma/plasma-desktop/0003-tzdir.patch    | 30 --------
 .../kde-5/plasma/plasma-desktop/default.nix   | 20 +++---
 ...{0002-hwclock.patch => hwclock-path.patch} | 20 ++----
 .../plasma-desktop/qml-import-paths.patch     | 54 +++++++++++++++
 .../kde-5/plasma/plasma-desktop/series        |  3 +
 .../kde-5/plasma/plasma-desktop/tzdir.patch   | 18 +++++
 7 files changed, 88 insertions(+), 126 deletions(-)
 delete mode 100644 pkgs/desktops/kde-5/plasma/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
 delete mode 100644 pkgs/desktops/kde-5/plasma/plasma-desktop/0003-tzdir.patch
 rename pkgs/desktops/kde-5/plasma/plasma-desktop/{0002-hwclock.patch => hwclock-path.patch} (60%)
 create mode 100644 pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch
 create mode 100644 pkgs/desktops/kde-5/plasma/plasma-desktop/series
 create mode 100644 pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch

diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
deleted file mode 100644
index ca85119e97f..00000000000
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From a91568d7c6635f4d66bb4e8ebaf2666c24980312 Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk <fridh@fridh.nl>
-Date: Sat, 14 May 2016 12:54:27 +0200
-Subject: [PATCH] qml import paths
-
----
- applets/pager/package/contents/ui/main.qml              | 2 +-
- containments/desktop/package/contents/ui/FolderView.qml | 2 +-
- containments/desktop/package/contents/ui/main.qml       | 4 ++--
- containments/panel/contents/ui/main.qml                 | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml
-index b8eb8a6..fad3f69 100644
---- a/applets/pager/package/contents/ui/main.qml
-+++ b/applets/pager/package/contents/ui/main.qml
-@@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
- import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents
- import org.kde.draganddrop 2.0
- import org.kde.plasma.private.pager 2.0
--import "utils.js" as Utils
-+import "../code/utils.js" as Utils
- 
- MouseArea {
-     id: root
-diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
-index ced3507..6073545 100644
---- a/containments/desktop/package/contents/ui/FolderView.qml
-+++ b/containments/desktop/package/contents/ui/FolderView.qml
-@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
- import org.kde.kquickcontrolsaddons 2.0
- 
- import org.kde.private.desktopcontainment.folder 0.1 as Folder
--import "FolderTools.js" as FolderTools
-+import "../code/FolderTools.js" as FolderTools
- 
- Item {
-     id: main
-diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml
-index a438b74..b907a36 100644
---- a/containments/desktop/package/contents/ui/main.qml
-+++ b/containments/desktop/package/contents/ui/main.qml
-@@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
- 
- import org.kde.private.desktopcontainment.desktop 0.1 as Desktop
- 
--import "LayoutManager.js" as LayoutManager
--import "FolderTools.js" as FolderTools
-+import "../code/LayoutManager.js" as LayoutManager
-+import "../code/FolderTools.js" as FolderTools
- 
- DragDrop.DropArea {
-     id: root
-diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
-index 4d71c6e..337c356 100644
---- a/containments/panel/contents/ui/main.qml
-+++ b/containments/panel/contents/ui/main.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
- import org.kde.kquickcontrolsaddons 2.0
- import org.kde.draganddrop 2.0 as DragDrop
- 
--import "LayoutManager.js" as LayoutManager
-+import "../code/LayoutManager.js" as LayoutManager
- 
- DragDrop.DropArea {
-     id: root
--- 
-2.8.0
-
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/0003-tzdir.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/0003-tzdir.patch
deleted file mode 100644
index aba97b032f8..00000000000
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/0003-tzdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0a8e2ae5cb64c5762408df920d99459b20d52b29 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 22 Nov 2015 09:39:24 -0600
-Subject: [PATCH 3/3] tzdir
-
----
- kcms/dateandtime/helper.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
-index 5171753..92b5d9e 100644
---- a/kcms/dateandtime/helper.cpp
-+++ b/kcms/dateandtime/helper.cpp
-@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone )
- 
-     val = selectedzone;
- #else
--    QString tz = "/usr/share/zoneinfo/" + selectedzone;
-+    QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR"));
-+    QString tz = tzdir + "/" + selectedzone;
-+    if (tzdir.isEmpty()) {
-+      // Standard Linux path
-+      tz = "/usr/share/zoneinfo/" + selectedzone;
-+    }
- 
-     if (QFile::exists(tz)) { // make sure the new TZ really exists
-         QFile::remove(QStringLiteral("/etc/localtime"));
--- 
-2.6.3
-
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
index 8d4098ca31f..21ceec25d53 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
@@ -1,13 +1,14 @@
 {
-  plasmaPackage, substituteAll,
+  plasmaPackage, lib, copyPathsToStore,
   ecm, kdoctools,
   attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth,
   kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
   kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig,
   kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft,
   libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework,
-  plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras, xf86inputevdev,
-  xf86inputsynaptics, xinput, xkeyboard_config, xorgserver, utillinux
+  plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras,
+  xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver,
+  utillinux
 }:
 
 plasmaPackage rec {
@@ -22,15 +23,12 @@ plasmaPackage rec {
     ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative
     qtquickcontrols qtx11extras ksysguard
   ];
-  patches = [
-    ./0001-qt-5.5-QML-import-paths.patch
-    (substituteAll {
-      src = ./0002-hwclock.patch;
-      hwclock = "${utillinux}/sbin/hwclock";
-    })
-    ./0003-tzdir.patch
-  ];
+
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postPatch = ''
+    substituteInPlace kcms/dateandtime/helper.cpp \
+        --subst-var hwclock "${utillinux}/sbin/hwclock"
+
     sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
   '';
   NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ];
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/0002-hwclock.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch
similarity index 60%
rename from pkgs/desktops/kde-5/plasma/plasma-desktop/0002-hwclock.patch
rename to pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch
index 17b01486d92..5623de84668 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/0002-hwclock.patch
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch
@@ -1,16 +1,7 @@
-From d0056fa6c1158408db169a7f5e6eb75691083094 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 22 Nov 2015 09:34:43 -0600
-Subject: [PATCH 2/3] hwclock
-
----
- kcms/dateandtime/helper.cpp | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
-index e955f0c..5171753 100644
---- a/kcms/dateandtime/helper.cpp
-+++ b/kcms/dateandtime/helper.cpp
+Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
+===================================================================
+--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
++++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
 @@ -48,10 +48,6 @@
  #include <sys/stat.h>
  #endif
@@ -31,6 +22,3 @@ index e955f0c..5171753 100644
      if (!hwclock.isEmpty()) {
          KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));
      }
--- 
-2.6.3
-
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch
new file mode 100644
index 00000000000..def5b577b97
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch
@@ -0,0 +1,54 @@
+Index: plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml
+===================================================================
+--- plasma-desktop-5.8.5.orig/applets/pager/package/contents/ui/main.qml
++++ plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as
+ import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents
+ import org.kde.draganddrop 2.0
+ import org.kde.plasma.private.pager 2.0
+-import "utils.js" as Utils
++import "../code/utils.js" as Utils
+ 
+ MouseArea {
+     id: root
+Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml
+===================================================================
+--- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/FolderView.qml
++++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml
+@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as Plas
+ import org.kde.kquickcontrolsaddons 2.0
+ 
+ import org.kde.private.desktopcontainment.folder 0.1 as Folder
+-import "FolderTools.js" as FolderTools
++import "../code/FolderTools.js" as FolderTools
+ 
+ Item {
+     id: main
+Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml
+===================================================================
+--- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/main.qml
++++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml
+@@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0
+ 
+ import org.kde.private.desktopcontainment.desktop 0.1 as Desktop
+ 
+-import "LayoutManager.js" as LayoutManager
+-import "FolderTools.js" as FolderTools
++import "../code/LayoutManager.js" as LayoutManager
++import "../code/FolderTools.js" as FolderTools
+ 
+ DragDrop.DropArea {
+     id: root
+Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml
+===================================================================
+--- plasma-desktop-5.8.5.orig/containments/panel/contents/ui/main.qml
++++ plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as
+ import org.kde.kquickcontrolsaddons 2.0
+ import org.kde.draganddrop 2.0 as DragDrop
+ 
+-import "LayoutManager.js" as LayoutManager
++import "../code/LayoutManager.js" as LayoutManager
+ 
+ DragDrop.DropArea {
+     id: root
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/series b/pkgs/desktops/kde-5/plasma/plasma-desktop/series
new file mode 100644
index 00000000000..6334deb7d97
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/series
@@ -0,0 +1,3 @@
+qml-import-paths.patch
+hwclock-path.patch
+tzdir.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch
new file mode 100644
index 00000000000..97504b330fe
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch
@@ -0,0 +1,18 @@
+Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
+===================================================================
+--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
++++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
+@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& sele
+ 
+     val = selectedzone;
+ #else
+-    QString tz = "/usr/share/zoneinfo/" + selectedzone;
++    QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR"));
++    QString tz = tzdir + "/" + selectedzone;
++    if (tzdir.isEmpty()) {
++      // Standard Linux path
++      tz = "/usr/share/zoneinfo/" + selectedzone;
++    }
+ 
+     if (QFile::exists(tz)) { // make sure the new TZ really exists
+         QFile::remove(QStringLiteral("/etc/localtime"));

From 892a831726a73e236c67b095005490de91334469 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 20 Jan 2017 13:36:19 -0600
Subject: [PATCH 432/727] kde5.plasma-desktop: don't stop ibus

Stopping ibus when keyboards are hotplugged causes applications to lose
input. See https://bugs.kde.org/show_bug.cgi?id=359109 for more details.
---
 .../kde-5/plasma/plasma-desktop/ibus.patch    | 26 +++++++++++++++++++
 .../kde-5/plasma/plasma-desktop/series        |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch

diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch
new file mode 100644
index 00000000000..d5ac4b25087
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch
@@ -0,0 +1,26 @@
+Index: plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp
+===================================================================
+--- plasma-desktop-5.8.5.orig/kcms/keyboard/xkb_helper.cpp
++++ plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp
+@@ -185,21 +185,5 @@ bool XkbHelper::initializeKeyboardLayout
+ 
+ bool XkbHelper::preInitialize()
+ {
+-    // stop ibus so it does not mess with our layouts, we can remove this when we integrate IM into keyboard module
+-
+-    QString ibusExe = QStandardPaths::findExecutable(QStringLiteral("ibus"));
+-    if( ibusExe.isEmpty() ) {
+-        return 0;
+-    }
+-
+-    KProcess ibusProcess;
+-    ibusProcess << ibusExe << QStringLiteral("exit");
+-    ibusProcess.setOutputChannelMode(KProcess::SeparateChannels);
+-    int res = ibusProcess.execute();
+-
+-    if( res == 0 ) {
+-        qCWarning(KCM_KEYBOARD) << "ibus successfully stopped";
+-    }
+-
+     return 0;
+ }
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/series b/pkgs/desktops/kde-5/plasma/plasma-desktop/series
index 6334deb7d97..36778cd1c56 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/series
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/series
@@ -1,3 +1,4 @@
 qml-import-paths.patch
 hwclock-path.patch
 tzdir.patch
+ibus.patch

From 5cf1a4d36a5162601970a18abd113d81f3df8e14 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 20 Jan 2017 22:05:44 +0100
Subject: [PATCH 433/727] nodePackages: upgrade node2nix to version 1.1.1 and
 regenerate the package set

---
 .../node-packages/composition-v4.nix          |    6 +-
 .../node-packages/composition-v6.nix          |    6 +-
 pkgs/development/node-packages/node-env.nix   |    4 +-
 .../node-packages/node-packages-v4.nix        | 6496 ++++++++---------
 .../node-packages/node-packages-v6.nix        | 5070 ++++++-------
 .../web/remarkjs/node-packages.nix            | 1242 +++-
 pkgs/development/web/remarkjs/nodepkgs.nix    |    4 +-
 pkgs/servers/web-apps/pump.io/composition.nix |    6 +-
 .../web-apps/pump.io/node-packages.nix        | 1059 +--
 pkgs/tools/package-management/nixui/nixui.nix |    6 +-
 .../nixui/node-packages.nix                   |    5 +-
 11 files changed, 6822 insertions(+), 7082 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index ad8c76b4e6e..b78bbda5d5e 100644
--- a/pkgs/development/node-packages/composition-v4.nix
+++ b/pkgs/development/node-packages/composition-v4.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.1.0. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,11 +6,11 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in
 import ./node-packages-v4.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index 57bd88bd2a1..1c21b47b92c 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.1.0. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,11 +6,11 @@
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in
 import ./node-packages-v6.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 389ccae2fe5..bd1de3e9f93 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -1,9 +1,9 @@
 # This file originates from node2nix
 
-{stdenv, nodejs, utillinux, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, utillinux, runCommand, writeTextFile}:
 
 let
-  inherit (nodejs) python;
+  python = if nodejs ? python then nodejs.python else python2;
 
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
   tarWrapper = runCommand "tarWrapper" {} ''
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 20197d1833e..8f5d178e734 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.1.0. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -76,13 +76,13 @@ let
         sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3";
       };
     };
-    "resolve-1.1.7" = {
+    "resolve-1.2.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.1.7";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
-        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz";
+        sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c";
       };
     };
     "global-paths-0.1.2" = {
@@ -274,13 +274,13 @@ let
         sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe";
       };
     };
-    "global-prefix-0.1.4" = {
+    "global-prefix-0.1.5" = {
       name = "global-prefix";
       packageName = "global-prefix";
-      version = "0.1.4";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.4.tgz";
-        sha1 = "05158db1cde2dd491b455e290eb3ab8bfc45c6e1";
+        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz";
+        sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f";
       };
     };
     "is-windows-0.2.0" = {
@@ -292,6 +292,15 @@ let
         sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c";
       };
     };
+    "homedir-polyfill-1.0.1" = {
+      name = "homedir-polyfill";
+      packageName = "homedir-polyfill";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz";
+        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
+      };
+    };
     "ini-1.3.4" = {
       name = "ini";
       packageName = "ini";
@@ -301,15 +310,6 @@ let
         sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
       };
     };
-    "osenv-0.1.3" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz";
-        sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217";
-      };
-    };
     "which-1.2.12" = {
       name = "which";
       packageName = "which";
@@ -319,22 +319,13 @@ let
         sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
       };
     };
-    "os-homedir-1.0.2" = {
-      name = "os-homedir";
-      packageName = "os-homedir";
-      version = "1.0.2";
+    "parse-passwd-1.0.0" = {
+      name = "parse-passwd";
+      packageName = "parse-passwd";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
-        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
-      };
-    };
-    "os-tmpdir-1.0.2" = {
-      name = "os-tmpdir";
-      packageName = "os-tmpdir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
-        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+        url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz";
+        sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
       };
     };
     "isexe-1.1.2" = {
@@ -409,13 +400,13 @@ let
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-arm-cdn-0.2.1" = {
+    "azure-arm-cdn-1.0.0" = {
       name = "azure-arm-cdn";
       packageName = "azure-arm-cdn";
-      version = "0.2.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-0.2.1.tgz";
-        sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz";
+        sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85";
       };
     };
     "azure-arm-commerce-0.2.0" = {
@@ -427,13 +418,31 @@ let
         sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
-    "azure-arm-compute-0.19.0" = {
+    "azure-arm-compute-0.19.1" = {
       name = "azure-arm-compute";
       packageName = "azure-arm-compute";
-      version = "0.19.0";
+      version = "0.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.0.tgz";
-        sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e";
+        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz";
+        sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd";
+      };
+    };
+    "azure-arm-datalake-analytics-1.0.1-preview" = {
+      name = "azure-arm-datalake-analytics";
+      packageName = "azure-arm-datalake-analytics";
+      version = "1.0.1-preview";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.1-preview.tgz";
+        sha1 = "75461904000427e12ce11d634d74c052c86de994";
+      };
+    };
+    "azure-arm-datalake-store-1.0.1-preview" = {
+      name = "azure-arm-datalake-store";
+      packageName = "azure-arm-datalake-store";
+      version = "1.0.1-preview";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.1-preview.tgz";
+        sha1 = "bd07cbeb5eb355a00b7bed69e198a1a968115dd5";
       };
     };
     "azure-arm-hdinsight-0.2.2" = {
@@ -535,24 +544,6 @@ let
         sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02";
       };
     };
-    "azure-arm-datalake-analytics-0.4.3" = {
-      name = "azure-arm-datalake-analytics";
-      packageName = "azure-arm-datalake-analytics";
-      version = "0.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-0.4.3.tgz";
-        sha1 = "10c81e59d3064289a42ab37fea805a334333ed91";
-      };
-    };
-    "azure-arm-datalake-store-0.4.2" = {
-      name = "azure-arm-datalake-store";
-      packageName = "azure-arm-datalake-store";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-0.4.2.tgz";
-        sha1 = "479f4a28986c9737b8fef14090c0c7ccc33cb123";
-      };
-    };
     "azure-arm-devtestlabs-0.1.0" = {
       name = "azure-arm-devtestlabs";
       packageName = "azure-arm-devtestlabs";
@@ -643,13 +634,13 @@ let
         sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54";
       };
     };
-    "azure-arm-resource-1.4.5-preview" = {
+    "azure-arm-resource-1.6.1-preview" = {
       name = "azure-arm-resource";
       packageName = "azure-arm-resource";
-      version = "1.4.5-preview";
+      version = "1.6.1-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.5-preview.tgz";
-        sha1 = "166934783752607e9a4128ea0ad715b9b7a9015f";
+        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz";
+        sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
       };
     };
     "azure-arm-storage-0.13.1-preview" = {
@@ -742,13 +733,13 @@ let
         sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e";
       };
     };
-    "applicationinsights-0.15.12" = {
+    "applicationinsights-0.16.0" = {
       name = "applicationinsights";
       packageName = "applicationinsights";
-      version = "0.15.12";
+      version = "0.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.15.12.tgz";
-        sha1 = "d03f282da9424f33729eb7da8279e8e8a20dc7fc";
+        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
+        sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3";
       };
     };
     "caller-id-0.1.0" = {
@@ -868,13 +859,13 @@ let
         sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
       };
     };
-    "moment-2.17.0" = {
+    "moment-2.17.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.17.0";
+      version = "2.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz";
-        sha1 = "a4c292e02aac5ddefb29a6eed24f51938dd3b74f";
+        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
+        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
       };
     };
     "ms-rest-1.15.2" = {
@@ -904,15 +895,6 @@ let
         sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
       };
     };
-    "node-uuid-1.2.0" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz";
-        sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b";
-      };
-    };
     "omelette-0.1.0" = {
       name = "omelette";
       packageName = "omelette";
@@ -1039,6 +1021,15 @@ let
         sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
       };
     };
+    "uuid-3.0.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
+        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
+      };
+    };
     "validator-5.2.0" = {
       name = "validator";
       packageName = "validator";
@@ -1120,13 +1111,13 @@ let
         sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
       };
     };
-    "xmldom-0.1.22" = {
+    "xmldom-0.1.27" = {
       name = "xmldom";
       packageName = "xmldom";
-      version = "0.1.22";
+      version = "0.1.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
-        sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz";
+        sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
       };
     };
     "xpath.js-1.0.7" = {
@@ -1147,13 +1138,13 @@ let
         sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb";
       };
     };
-    "jwa-1.1.4" = {
+    "jwa-1.1.5" = {
       name = "jwa";
       packageName = "jwa";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz";
-        sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e";
+        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz";
+        sha1 = "a0552ce0220742cd52e153774a32905c30e756e5";
       };
     };
     "safe-buffer-5.0.1" = {
@@ -1174,22 +1165,13 @@ let
         sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
       };
     };
-    "ecdsa-sig-formatter-1.0.7" = {
+    "ecdsa-sig-formatter-1.0.9" = {
       name = "ecdsa-sig-formatter";
       packageName = "ecdsa-sig-formatter";
-      version = "1.0.7";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.7.tgz";
-        sha1 = "3137e976a1d6232517e2513e04e32f79bcbdf126";
-      };
-    };
-    "base64-url-1.3.3" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
-        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
+        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz";
+        sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1";
       };
     };
     "xml2js-0.2.7" = {
@@ -1831,13 +1813,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.13" = {
+    "mime-types-2.1.14" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.13";
+      version = "2.1.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz";
-        sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
+        sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -1903,13 +1885,13 @@ let
         sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
       };
     };
-    "lodash-4.17.2" = {
+    "lodash-4.17.4" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.2";
+      version = "4.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz";
-        sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
+        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
       };
     };
     "chalk-1.1.3" = {
@@ -1993,13 +1975,13 @@ let
         sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
       };
     };
-    "ansi-regex-2.0.0" = {
+    "ansi-regex-2.1.1" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
-        sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
       };
     };
     "graceful-readlink-1.0.1" = {
@@ -2029,13 +2011,13 @@ let
         sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
       };
     };
-    "jsonpointer-4.0.0" = {
+    "jsonpointer-4.0.1" = {
       name = "jsonpointer";
       packageName = "jsonpointer";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz";
-        sha1 = "6661e161d2fc445f19f98430231343722e1fcbd5";
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
+        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
       };
     };
     "xtend-4.0.1" = {
@@ -2119,13 +2101,13 @@ let
         sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252";
       };
     };
-    "sshpk-1.10.1" = {
+    "sshpk-1.10.2" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.10.1";
+      version = "1.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz";
-        sha1 = "30e1a5d329244974a1af61511339d595af6638b0";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz";
+        sha1 = "d5a804ce22695515638e798dbe23273de070a5fa";
       };
     };
     "extsprintf-1.0.2" = {
@@ -2173,13 +2155,13 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "dashdash-1.14.0" = {
+    "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
-      version = "1.14.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz";
-        sha1 = "29e486c5418bf0f356034a993d51686a33e84141";
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     };
     "getpass-0.1.6" = {
@@ -2200,13 +2182,13 @@ let
         sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
       };
     };
-    "tweetnacl-0.14.3" = {
+    "tweetnacl-0.14.5" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
-      version = "0.14.3";
+      version = "0.14.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz";
-        sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d";
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
     "jodid25519-1.0.2" = {
@@ -2236,13 +2218,13 @@ let
         sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
       };
     };
-    "mime-db-1.25.0" = {
+    "mime-db-1.26.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.25.0";
+      version = "1.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz";
-        sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
+        sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
       };
     };
     "punycode-1.4.1" = {
@@ -2299,13 +2281,13 @@ let
         sha1 = "0c989774f2870c69378aa665648cdc60f343aa53";
       };
     };
-    "concat-stream-1.5.2" = {
+    "concat-stream-1.6.0" = {
       name = "concat-stream";
       packageName = "concat-stream";
-      version = "1.5.2";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
-        sha1 = "708978624d856af41a5a741defdd261da752c266";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz";
+        sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
       };
     };
     "http-response-object-1.1.0" = {
@@ -2335,6 +2317,24 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
+    "readable-stream-2.2.2" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
+        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
+      };
+    };
+    "buffer-shims-1.0.0" = {
+      name = "buffer-shims";
+      packageName = "buffer-shims";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
+        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
+      };
+    };
     "http-basic-2.5.1" = {
       name = "http-basic";
       packageName = "http-basic";
@@ -2371,6 +2371,15 @@ let
         sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
       };
     };
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+      };
+    };
     "async-1.0.0" = {
       name = "async";
       packageName = "async";
@@ -2398,13 +2407,13 @@ let
         sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
       };
     };
-    "mute-stream-0.0.6" = {
+    "mute-stream-0.0.7" = {
       name = "mute-stream";
       packageName = "mute-stream";
-      version = "0.0.6";
+      version = "0.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
-        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz";
+        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
       };
     };
     "argparse-1.0.4" = {
@@ -2695,15 +2704,6 @@ let
         sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
       };
     };
-    "readable-stream-2.2.2" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
-        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
-      };
-    };
     "stream-shift-1.0.0" = {
       name = "stream-shift";
       packageName = "stream-shift";
@@ -2722,15 +2722,6 @@ let
         sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
       };
     };
-    "buffer-shims-1.0.0" = {
-      name = "buffer-shims";
-      packageName = "buffer-shims";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
-        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
-      };
-    };
     "camelcase-keys-2.1.0" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -2785,13 +2776,13 @@ let
         sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df";
       };
     };
-    "object-assign-4.1.0" = {
+    "object-assign-4.1.1" = {
       name = "object-assign";
       packageName = "object-assign";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz";
-        sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0";
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
       };
     };
     "read-pkg-up-1.0.1" = {
@@ -2839,13 +2830,13 @@ let
         sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
       };
     };
-    "signal-exit-3.0.1" = {
+    "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz";
-        sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
     "array-find-index-1.0.2" = {
@@ -3136,13 +3127,13 @@ let
         sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
       };
     };
-    "debug-2.3.3" = {
+    "debug-2.6.0" = {
       name = "debug";
       packageName = "debug";
-      version = "2.3.3";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
-        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
+        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
       };
     };
     "ms-0.7.2" = {
@@ -3154,6 +3145,15 @@ let
         sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
       };
     };
+    "os-tmpdir-1.0.2" = {
+      name = "os-tmpdir";
+      packageName = "os-tmpdir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+      };
+    };
     "rimraf-2.2.8" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -3163,22 +3163,22 @@ let
         sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
       };
     };
-    "JSONStream-1.2.1" = {
+    "JSONStream-1.3.0" = {
       name = "JSONStream";
       packageName = "JSONStream";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
-        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
-      };
-    };
-    "assert-1.3.0" = {
-      name = "assert";
-      packageName = "assert";
       version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
-        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz";
+        sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5";
+      };
+    };
+    "assert-1.4.1" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
+        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
       };
     };
     "browser-pack-6.0.2" = {
@@ -3226,6 +3226,15 @@ let
         sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4";
       };
     };
+    "concat-stream-1.5.2" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
+        sha1 = "708978624d856af41a5a741defdd261da752c266";
+      };
+    };
     "console-browserify-1.1.0" = {
       name = "console-browserify";
       packageName = "console-browserify";
@@ -3298,15 +3307,6 @@ let
         sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
       };
     };
-    "glob-5.0.15" = {
-      name = "glob";
-      packageName = "glob";
-      version = "5.0.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
-        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
-      };
-    };
     "has-1.0.1" = {
       name = "has";
       packageName = "has";
@@ -3442,13 +3442,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.5.0" = {
+    "stream-http-2.6.3" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.5.0";
+      version = "2.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz";
-        sha1 = "585eee513217ed98fe199817e7313b6f772a6802";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz";
+        sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3";
       };
     };
     "subarg-1.0.0" = {
@@ -3469,13 +3469,13 @@ let
         sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710";
       };
     };
-    "through2-2.0.1" = {
+    "through2-2.0.3" = {
       name = "through2";
       packageName = "through2";
-      version = "2.0.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz";
-        sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9";
+        url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz";
+        sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be";
       };
     };
     "timers-browserify-1.4.2" = {
@@ -3523,6 +3523,15 @@ let
         sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
       };
     };
+    "jsonparse-1.3.0" = {
+      name = "jsonparse";
+      packageName = "jsonparse";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.0.tgz";
+        sha1 = "85fc245b1d9259acc6941960b905adf64e7de0e8";
+      };
+    };
     "through-2.3.8" = {
       name = "through";
       packageName = "through";
@@ -3586,6 +3595,15 @@ let
         sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
       };
     };
+    "resolve-1.1.7" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+      };
+    };
     "pako-0.2.9" = {
       name = "pako";
       packageName = "pako";
@@ -3820,13 +3838,13 @@ let
         sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
       };
     };
-    "asn1.js-4.9.0" = {
+    "asn1.js-4.9.1" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "4.9.0";
+      version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz";
-        sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz";
+        sha1 = "48ba240b45a9280e94748990ba597d216617fd40";
       };
     };
     "ripemd160-1.0.1" = {
@@ -3991,13 +4009,13 @@ let
         sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
       };
     };
-    "builtin-status-codes-2.0.0" = {
+    "builtin-status-codes-3.0.0" = {
       name = "builtin-status-codes";
       packageName = "builtin-status-codes";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz";
-        sha1 = "6f22003baacf003ccd287afe6872151fddc58579";
+        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
+        sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
       };
     };
     "to-arraybuffer-1.0.1" = {
@@ -4063,13 +4081,13 @@ let
         sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395";
       };
     };
-    "castv2-client-1.1.2" = {
+    "castv2-client-1.2.0" = {
       name = "castv2-client";
       packageName = "castv2-client";
-      version = "1.1.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.1.2.tgz";
-        sha1 = "7865eac9181cd1f419fdcee448b5793706f853ad";
+        url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.2.0.tgz";
+        sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544";
       };
     };
     "chalk-1.0.0" = {
@@ -4468,13 +4486,13 @@ let
         sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc";
       };
     };
-    "numeral-1.5.5" = {
+    "numeral-1.5.6" = {
       name = "numeral";
       packageName = "numeral";
-      version = "1.5.5";
+      version = "1.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.5.tgz";
-        sha1 = "b7515d64533626124e9196cfc68c8fd5b2dee208";
+        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz";
+        sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f";
       };
     };
     "open-0.0.5" = {
@@ -4540,13 +4558,13 @@ let
         sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
       };
     };
-    "mdns-js-0.5.1" = {
+    "mdns-js-0.5.3" = {
       name = "mdns-js";
       packageName = "mdns-js";
-      version = "0.5.1";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz";
-        sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec";
+        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.3.tgz";
+        sha1 = "add2958d399319b6d8f2dde29bebac5e845e8b6d";
       };
     };
     "plist-2.0.1" = {
@@ -4693,22 +4711,22 @@ let
         sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8";
       };
     };
-    "parse-torrent-file-4.0.0" = {
+    "parse-torrent-file-4.0.1" = {
       name = "parse-torrent-file";
       packageName = "parse-torrent-file";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.0.tgz";
-        sha1 = "106df57e0e509bafa6756e544d88205e52be33a6";
+        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.1.tgz";
+        sha1 = "4580c5ebb3f6e607baa02ef0ace51f627859e699";
       };
     };
-    "simple-get-2.3.0" = {
+    "simple-get-2.4.0" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.3.0.tgz";
-        sha1 = "c5fdfcce1e516ad4b2ce7b7c2bd2d710502d8ac9";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz";
+        sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2";
       };
     };
     "thirty-two-1.0.2" = {
@@ -4729,31 +4747,31 @@ let
         sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff";
       };
     };
-    "bencode-0.10.0" = {
+    "bencode-0.11.0" = {
       name = "bencode";
       packageName = "bencode";
-      version = "0.10.0";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bencode/-/bencode-0.10.0.tgz";
-        sha1 = "717b36fc61c4e9cb3755f0a9f90996ee5b46f0d0";
+        url = "https://registry.npmjs.org/bencode/-/bencode-0.11.0.tgz";
+        sha1 = "7ea65d4ce00300393a43a92d5640b6fb0204dc64";
       };
     };
-    "simple-sha1-2.0.8" = {
+    "simple-sha1-2.1.0" = {
       name = "simple-sha1";
       packageName = "simple-sha1";
-      version = "2.0.8";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.0.8.tgz";
-        sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f";
+        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz";
+        sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3";
       };
     };
-    "rusha-0.8.4" = {
+    "rusha-0.8.5" = {
       name = "rusha";
       packageName = "rusha";
-      version = "0.8.4";
+      version = "0.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rusha/-/rusha-0.8.4.tgz";
-        sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b";
+        url = "https://registry.npmjs.org/rusha/-/rusha-0.8.5.tgz";
+        sha1 = "a30ae9bd5a4e80fbc96fbe7a13232b944be24f84";
       };
     };
     "simple-concat-1.0.0" = {
@@ -4918,13 +4936,13 @@ let
         sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854";
       };
     };
-    "random-access-file-1.3.1" = {
+    "random-access-file-1.4.0" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.3.1.tgz";
-        sha1 = "5302a65a7ff2b83c50e18d79bf4cd619b520ac8d";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz";
+        sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767";
       };
     };
     "run-parallel-1.1.6" = {
@@ -5143,13 +5161,13 @@ let
         sha1 = "58cccb244f563326ba893bf5c06a35f644846daa";
       };
     };
-    "k-rpc-socket-1.6.0" = {
+    "k-rpc-socket-1.6.1" = {
       name = "k-rpc-socket";
       packageName = "k-rpc-socket";
-      version = "1.6.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.0.tgz";
-        sha1 = "28c3909cf1547aaa47d5cd924034d55720f7ba64";
+        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.1.tgz";
+        sha1 = "bf67128f89f0c62a19cec5afc3003c280111c78e";
       };
     };
     "bencode-0.8.0" = {
@@ -5188,22 +5206,22 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.0.7" = {
+    "simple-peer-6.2.1" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.0.7";
+      version = "6.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.0.7.tgz";
-        sha1 = "ccc5133b7e75e154ab17b9ccdbec91e970cc2278";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.1.tgz";
+        sha1 = "0d6bf982afb32cca2fabbb969dee4fceaceb99fb";
       };
     };
-    "simple-websocket-4.1.0" = {
+    "simple-websocket-4.2.0" = {
       name = "simple-websocket";
       packageName = "simple-websocket";
-      version = "4.1.0";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.1.0.tgz";
-        sha1 = "2b1e887e7737ae1452458ead0d0a79722901877f";
+        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.2.0.tgz";
+        sha1 = "2517742a7dafc8d44fd4e093184b6718c817f2bf";
       };
     };
     "string2compact-1.2.2" = {
@@ -5530,13 +5548,13 @@ let
         sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c";
       };
     };
-    "exit-on-epipe-0.1.0" = {
+    "exit-on-epipe-1.0.0" = {
       name = "exit-on-epipe";
       packageName = "exit-on-epipe";
-      version = "0.1.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.1.0.tgz";
-        sha1 = "aa2f0155b78b34fe60dd2b462e84637ba5ed0697";
+        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.0.tgz";
+        sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc";
       };
     };
     "xmlbuilder-4.2.1" = {
@@ -5566,13 +5584,13 @@ let
         sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33";
       };
     };
-    "insight-0.8.3" = {
+    "insight-0.8.4" = {
       name = "insight";
       packageName = "insight";
-      version = "0.8.3";
+      version = "0.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insight/-/insight-0.8.3.tgz";
-        sha1 = "72d1e1b4da6c8b405db25043f9d86900f8cbf59d";
+        url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz";
+        sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884";
       };
     };
     "nopt-3.0.1" = {
@@ -5647,6 +5665,24 @@ let
         sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
       };
     };
+    "glob-5.0.15" = {
+      name = "glob";
+      packageName = "glob";
+      version = "5.0.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
+        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
+      };
+    };
+    "osenv-0.1.4" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz";
+        sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644";
+      };
+    };
     "plist-1.2.0" = {
       name = "plist";
       packageName = "plist";
@@ -5755,13 +5791,13 @@ let
         sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980";
       };
     };
-    "cordova-serve-1.0.0" = {
+    "cordova-serve-1.0.1" = {
       name = "cordova-serve";
       packageName = "cordova-serve";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.0.tgz";
-        sha1 = "7fa1c40183d2b82adb792f9cb9e0d554a23eed85";
+        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.1.tgz";
+        sha1 = "895c7fb4bbe630fa1c89feaf6d74779cbff66da7";
       };
     };
     "dep-graph-1.1.0" = {
@@ -5935,13 +5971,13 @@ let
         sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26";
       };
     };
-    "shelljs-0.7.5" = {
+    "shelljs-0.7.6" = {
       name = "shelljs";
       packageName = "shelljs";
-      version = "0.7.5";
+      version = "0.7.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz";
-        sha1 = "2eef7a50a21e1ccf37da00df767ec69e30ad0675";
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz";
+        sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad";
       };
     };
     "interpret-1.0.1" = {
@@ -5980,6 +6016,15 @@ let
         sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae";
       };
     };
+    "assert-1.3.0" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
+        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
+      };
+    };
     "compression-1.6.2" = {
       name = "compression";
       packageName = "compression";
@@ -6214,13 +6259,13 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "proxy-addr-1.1.2" = {
+    "proxy-addr-1.1.3" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz";
-        sha1 = "b4cc5f22610d9535824c123aef9d3cf73c40ba37";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.3.tgz";
+        sha1 = "dc97502f5722e888467b3fa2297a7b1ff47df074";
       };
     };
     "qs-6.2.0" = {
@@ -6295,15 +6340,6 @@ let
         sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
       };
     };
-    "ipaddr.js-1.1.1" = {
-      name = "ipaddr.js";
-      packageName = "ipaddr.js";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz";
-        sha1 = "c791d95f52b29c1247d5df80ada39b8a73647230";
-      };
-    };
     "destroy-1.0.4" = {
       name = "destroy";
       packageName = "destroy";
@@ -6601,22 +6637,22 @@ let
         sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
       };
     };
-    "lockfile-1.0.2" = {
+    "lockfile-1.0.3" = {
       name = "lockfile";
       packageName = "lockfile";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz";
-        sha1 = "97e1990174f696cbe0a3acd58a43b84aa30c7c83";
+        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz";
+        sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79";
       };
     };
-    "lru-cache-4.0.1" = {
+    "lru-cache-4.0.2" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz";
-        sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz";
+        sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
       };
     };
     "node-gyp-3.4.0" = {
@@ -6727,13 +6763,13 @@ let
         sha1 = "d0def882952b8de3f67eba5e91199661271f41f4";
       };
     };
-    "retry-0.10.0" = {
+    "retry-0.10.1" = {
       name = "retry";
       packageName = "retry";
-      version = "0.10.0";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz";
-        sha1 = "649e15ca408422d98318161935e7f7d652d435dd";
+        url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
+        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
       };
     };
     "sha-2.0.1" = {
@@ -7294,13 +7330,13 @@ let
         sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
       };
     };
-    "write-file-atomic-1.2.0" = {
+    "write-file-atomic-1.3.1" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
-      version = "1.2.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
-        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.1.tgz";
+        sha1 = "7d45ba32316328dd1ec7d90f60ebc0d845bb759a";
       };
     };
     "xdg-basedir-2.0.0" = {
@@ -7447,15 +7483,6 @@ let
         sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
       };
     };
-    "uuid-3.0.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
-        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
-      };
-    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -7582,13 +7609,22 @@ let
         sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
       };
     };
-    "parserlib-1.0.0" = {
+    "clone-2.1.0" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz";
+        sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6";
+      };
+    };
+    "parserlib-1.1.1" = {
       name = "parserlib";
       packageName = "parserlib";
-      version = "1.0.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.0.0.tgz";
-        sha1 = "88340e7e8d95bac9e09236742eef53bec1e4b30f";
+        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz";
+        sha1 = "a64cfa724062434fdfc351c9a4ec2d92b94c06f4";
       };
     };
     "bluebird-2.9.9" = {
@@ -7988,13 +8024,13 @@ let
         sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       };
     };
-    "nan-2.4.0" = {
+    "nan-2.5.0" = {
       name = "nan";
       packageName = "nan";
-      version = "2.4.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz";
-        sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232";
+        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
+        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
       };
     };
     "jsonparse-0.0.6" = {
@@ -8351,22 +8387,22 @@ let
         sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
       };
     };
-    "ndjson-1.4.3" = {
+    "ndjson-1.5.0" = {
       name = "ndjson";
       packageName = "ndjson";
-      version = "1.4.3";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ndjson/-/ndjson-1.4.3.tgz";
-        sha1 = "7aa026fe3ab38a7da1a2b4ad07b1008e733eb239";
+        url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz";
+        sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8";
       };
     };
-    "pump-1.0.1" = {
+    "pump-1.0.2" = {
       name = "pump";
       packageName = "pump";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pump/-/pump-1.0.1.tgz";
-        sha1 = "f1f1409fb9bd1085bbdb576b43b84ec4b5eadc1a";
+        url = "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz";
+        sha1 = "3b3ee6512f94f0e575538c17995f9f16990a5d51";
       };
     };
     "pumpify-1.3.5" = {
@@ -8702,6 +8738,15 @@ let
         sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3";
       };
     };
+    "split2-2.1.1" = {
+      name = "split2";
+      packageName = "split2";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz";
+        sha1 = "7a1f551e176a90ecd3345f7246a0cfe175ef4fd0";
+      };
+    };
     "murl-0.4.1" = {
       name = "murl";
       packageName = "murl";
@@ -8720,31 +8765,40 @@ let
         sha1 = "80ab4e919749351263ef14500d684e57c4202840";
       };
     };
-    "JSONStream-1.1.4" = {
-      name = "JSONStream";
-      packageName = "JSONStream";
-      version = "1.1.4";
+    "bl-1.2.0" = {
+      name = "bl";
+      packageName = "bl";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz";
-        sha1 = "be11a495938e882d277773d11986f3974a8ba37a";
+        url = "https://registry.npmjs.org/bl/-/bl-1.2.0.tgz";
+        sha1 = "1397e7ec42c5f5dc387470c500e34a9f6be9ea98";
       };
     };
-    "async-2.0.1" = {
-      name = "async";
-      packageName = "async";
-      version = "2.0.1";
+    "awscred-1.2.0" = {
+      name = "awscred";
+      packageName = "awscred";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz";
-        sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
+        url = "https://registry.npmjs.org/awscred/-/awscred-1.2.0.tgz";
+        sha1 = "9ba714a0d2feb625b848f15c62746c07aebdc3b5";
       };
     };
-    "got-6.6.3" = {
+    "clipboardy-0.1.2" = {
+      name = "clipboardy";
+      packageName = "clipboardy";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipboardy/-/clipboardy-0.1.2.tgz";
+        sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc";
+      };
+    };
+    "got-6.7.1" = {
       name = "got";
       packageName = "got";
-      version = "6.6.3";
+      version = "6.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz";
-        sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec";
+        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
+        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
       };
     };
     "lodash.debounce-4.0.8" = {
@@ -8765,13 +8819,76 @@ let
         sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1";
       };
     };
-    "mem-0.1.1" = {
+    "mem-1.1.0" = {
       name = "mem";
       packageName = "mem";
-      version = "0.1.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz";
-        sha1 = "24df988c3102b03c074c1b296239c5b2e6647825";
+        url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz";
+        sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
+      };
+    };
+    "execa-0.5.1" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz";
+        sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36";
+      };
+    };
+    "cross-spawn-4.0.2" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz";
+        sha1 = "7b9247621c23adfdd3856004a823cbe397424d41";
+      };
+    };
+    "get-stream-2.3.1" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
+        sha1 = "5f38f93f346009666ee0150a054167f91bdd95de";
+      };
+    };
+    "npm-run-path-2.0.2" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
+        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+      };
+    };
+    "p-finally-1.0.0" = {
+      name = "p-finally";
+      packageName = "p-finally";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
+        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+      };
+    };
+    "strip-eof-1.0.0" = {
+      name = "strip-eof";
+      packageName = "strip-eof";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
+        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
+      };
+    };
+    "path-key-2.0.1" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
+        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     };
     "create-error-class-3.0.2" = {
@@ -8792,13 +8909,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "get-stream-2.3.1" = {
+    "get-stream-3.0.0" = {
       name = "get-stream";
       packageName = "get-stream";
-      version = "2.3.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
-        sha1 = "5f38f93f346009666ee0150a054167f91bdd95de";
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
+        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
       };
     };
     "is-retry-allowed-1.1.0" = {
@@ -8810,22 +8927,13 @@ let
         sha1 = "11a060568b67339444033d0125a61a20d564fb34";
       };
     };
-    "node-status-codes-2.0.1" = {
-      name = "node-status-codes";
-      packageName = "node-status-codes";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz";
-        sha1 = "298067659cb68a2b4670abbefde02a3819981f5b";
-      };
-    };
-    "timed-out-3.0.0" = {
+    "timed-out-4.0.1" = {
       name = "timed-out";
       packageName = "timed-out";
-      version = "3.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.0.0.tgz";
-        sha1 = "ff88de96030ce960eabd42487db61d3add229273";
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz";
+        sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
       };
     };
     "url-parse-lax-1.0.0" = {
@@ -8846,13 +8954,22 @@ let
         sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
       };
     };
-    "babel-code-frame-6.16.0" = {
+    "mimic-fn-1.1.0" = {
+      name = "mimic-fn";
+      packageName = "mimic-fn";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz";
+        sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18";
+      };
+    };
+    "babel-code-frame-6.22.0" = {
       name = "babel-code-frame";
       packageName = "babel-code-frame";
-      version = "6.16.0";
+      version = "6.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz";
-        sha1 = "f90e60da0862909d3ce098733b5d3987c97cb8de";
+        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz";
+        sha1 = "027620bee567a88c32561574e7fd0801d33118e4";
       };
     };
     "doctrine-1.5.0" = {
@@ -9017,6 +9134,15 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
+    "strip-json-comments-2.0.1" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
+      };
+    };
     "table-3.8.3" = {
       name = "table";
       packageName = "table";
@@ -9026,13 +9152,13 @@ let
         sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
       };
     };
-    "js-tokens-2.0.0" = {
+    "js-tokens-3.0.0" = {
       name = "js-tokens";
       packageName = "js-tokens";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz";
-        sha1 = "79903f5563ee778cc1162e6dcf1a0027c97f9cb5";
+        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.0.tgz";
+        sha1 = "a2f2a969caae142fb3cd56228358c89366957bd1";
       };
     };
     "es6-map-0.1.4" = {
@@ -9089,13 +9215,13 @@ let
         sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
       };
     };
-    "acorn-4.0.3" = {
+    "acorn-4.0.4" = {
       name = "acorn";
       packageName = "acorn";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz";
-        sha1 = "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1";
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz";
+        sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a";
       };
     };
     "acorn-jsx-3.0.1" = {
@@ -9107,13 +9233,13 @@ let
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
-    "flat-cache-1.2.1" = {
+    "flat-cache-1.2.2" = {
       name = "flat-cache";
       packageName = "flat-cache";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.1.tgz";
-        sha1 = "6c837d6225a7de5659323740b36d5361f71691ff";
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz";
+        sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96";
       };
     };
     "circular-json-0.3.1" = {
@@ -9287,13 +9413,13 @@ let
         sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
       };
     };
-    "fast-levenshtein-2.0.5" = {
+    "fast-levenshtein-2.0.6" = {
       name = "fast-levenshtein";
       packageName = "fast-levenshtein";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz";
-        sha1 = "bd33145744519ab1c36c3ee9f31f08e9079b67f2";
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
     "caller-path-0.1.0" = {
@@ -9323,22 +9449,22 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.9.0" = {
+    "ajv-4.10.4" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.9.0";
+      version = "4.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz";
-        sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz";
+        sha1 = "c0974dd00b3464984892d6010aa9c2c945933254";
       };
     };
-    "ajv-keywords-1.1.1" = {
+    "ajv-keywords-1.5.0" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "1.1.1";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz";
-        sha1 = "02550bc605a3e576041565628af972e06c549d50";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz";
+        sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c";
       };
     };
     "slice-ansi-0.0.4" = {
@@ -9449,13 +9575,13 @@ let
         sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d";
       };
     };
-    "prettyjson-1.2.0" = {
+    "prettyjson-1.2.1" = {
       name = "prettyjson";
       packageName = "prettyjson";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.0.tgz";
-        sha1 = "2a109cdf14c957896bbad8b77ef5de5db2c691bf";
+        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz";
+        sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289";
       };
     };
     "shush-1.0.0" = {
@@ -9593,13 +9719,13 @@ let
         sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
       };
     };
-    "fsevents-1.0.15" = {
+    "fsevents-1.0.17" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.0.15";
+      version = "1.0.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz";
-        sha1 = "fa63f590f3c2ad91275e4972a6cea545fb0aae44";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.17.tgz";
+        sha1 = "8537f3f12272678765b4fd6528c0f1f66f8f4558";
       };
     };
     "micromatch-2.3.11" = {
@@ -9665,13 +9791,13 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
-    "kind-of-3.0.4" = {
+    "kind-of-3.1.0" = {
       name = "kind-of";
       packageName = "kind-of";
-      version = "3.0.4";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz";
-        sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74";
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz";
+        sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47";
       };
     };
     "normalize-path-2.0.1" = {
@@ -9773,13 +9899,13 @@ let
         sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
       };
     };
-    "randomatic-1.1.5" = {
+    "randomatic-1.1.6" = {
       name = "randomatic";
       packageName = "randomatic";
-      version = "1.1.5";
+      version = "1.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz";
-        sha1 = "5e9ef5f2d573c67bd2b8124ae90b5156e457840b";
+        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz";
+        sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb";
       };
     };
     "repeat-string-1.6.1" = {
@@ -9863,13 +9989,13 @@ let
         sha1 = "207bab91638499c07b2adf240a41a87210034575";
       };
     };
-    "binary-extensions-1.7.0" = {
+    "binary-extensions-1.8.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz";
-        sha1 = "6c1610db163abfb34edfe42fa423343a1e01185d";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz";
+        sha1 = "48ec8d16df4377eae5fa5884682480af4d95c774";
       };
     };
     "set-immediate-shim-1.0.1" = {
@@ -9881,22 +10007,22 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.31" = {
+    "node-pre-gyp-0.6.32" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.31";
+      version = "0.6.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
-        sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
+        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
       };
     };
-    "npmlog-4.0.1" = {
+    "npmlog-4.0.2" = {
       name = "npmlog";
       packageName = "npmlog";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz";
-        sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
+        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
       };
     };
     "tar-pack-3.3.0" = {
@@ -9917,13 +10043,13 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
-    "gauge-2.7.1" = {
+    "gauge-2.7.2" = {
       name = "gauge";
       packageName = "gauge";
-      version = "2.7.1";
+      version = "2.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz";
-        sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7";
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz";
+        sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774";
       };
     };
     "set-blocking-2.0.0" = {
@@ -10080,13 +10206,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.11.1" = {
+    "coffee-script-1.12.2" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.11.1";
+      version = "1.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
-        sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
+        sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
       };
     };
     "jade-1.11.0" = {
@@ -10125,13 +10251,13 @@ let
         sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
       };
     };
-    "clean-css-3.4.21" = {
+    "clean-css-3.4.24" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "3.4.21";
+      version = "3.4.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz";
-        sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.24.tgz";
+        sha1 = "89f5a5e9da37ae02394fe049a41388abbe72c3b5";
       };
     };
     "commander-2.6.0" = {
@@ -10170,13 +10296,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.7.4" = {
+    "uglify-js-2.7.5" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.4";
+      version = "2.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
-        sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
+        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
       };
     };
     "void-elements-2.0.1" = {
@@ -10413,13 +10539,13 @@ let
         sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19";
       };
     };
-    "gulp-util-3.0.7" = {
+    "gulp-util-3.0.8" = {
       name = "gulp-util";
       packageName = "gulp-util";
-      version = "3.0.7";
+      version = "3.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz";
-        sha1 = "78925c4b8f8b49005ac01a011c557e6218941cbb";
+        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz";
+        sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f";
       };
     };
     "liftoff-2.3.0" = {
@@ -10494,22 +10620,22 @@ let
         sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809";
       };
     };
-    "dateformat-1.0.12" = {
+    "dateformat-2.0.0" = {
       name = "dateformat";
       packageName = "dateformat";
-      version = "1.0.12";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz";
-        sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9";
+        url = "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz";
+        sha1 = "2743e3abb5c3fc2462e527dca445e04e9f4dee17";
       };
     };
-    "fancy-log-1.2.0" = {
+    "fancy-log-1.3.0" = {
       name = "fancy-log";
       packageName = "fancy-log";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.2.0.tgz";
-        sha1 = "d5a51b53e9ab22ca07d558f2b67ae55fdb5fcbd8";
+        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz";
+        sha1 = "45be17d02bb9917d60ccffd4995c999e6c8c9948";
       };
     };
     "gulplog-1.0.0" = {
@@ -10899,13 +11025,13 @@ let
         sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5";
       };
     };
-    "is-unc-path-0.1.1" = {
+    "is-unc-path-0.1.2" = {
       name = "is-unc-path";
       packageName = "is-unc-path";
-      version = "0.1.1";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.1.tgz";
-        sha1 = "ab2533d77ad733561124c3dc0f5cd8b90054c86b";
+        url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz";
+        sha1 = "6ab053a72573c10250ff416a3814c35178af39b9";
       };
     };
     "unc-path-regex-0.1.2" = {
@@ -11313,13 +11439,13 @@ let
         sha1 = "2ce4484850537f9c97a8026d5399b935c4ed4ed7";
       };
     };
-    "supports-color-3.1.2" = {
+    "supports-color-3.2.3" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "3.1.2";
+      version = "3.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz";
-        sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz";
+        sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6";
       };
     };
     "estraverse-1.9.3" = {
@@ -11367,22 +11493,22 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "bluebird-3.4.6" = {
+    "bluebird-3.4.7" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.4.6";
+      version = "3.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz";
-        sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz";
+        sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
       };
     };
-    "body-parser-1.15.2" = {
+    "body-parser-1.16.0" = {
       name = "body-parser";
       packageName = "body-parser";
-      version = "1.15.2";
+      version = "1.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz";
-        sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67";
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.0.tgz";
+        sha1 = "924a5e472c6229fb9d69b85a20d5f2532dec788b";
       };
     };
     "combine-lists-1.0.1" = {
@@ -11439,22 +11565,22 @@ let
         sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea";
       };
     };
-    "http-proxy-1.15.2" = {
+    "http-proxy-1.16.2" = {
       name = "http-proxy";
       packageName = "http-proxy";
-      version = "1.15.2";
+      version = "1.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz";
-        sha1 = "642fdcaffe52d3448d2bda3b0079e9409064da31";
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz";
+        sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742";
       };
     };
-    "isbinaryfile-3.0.1" = {
+    "isbinaryfile-3.0.2" = {
       name = "isbinaryfile";
       packageName = "isbinaryfile";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.1.tgz";
-        sha1 = "6e99573675372e841a0520c036b41513d783e79e";
+        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz";
+        sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621";
       };
     };
     "log4js-0.6.38" = {
@@ -11475,13 +11601,13 @@ let
         sha1 = "659de9f2cf8dcc27a1481276f205377272382e73";
       };
     };
-    "socket.io-1.4.7" = {
+    "socket.io-1.7.2" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "1.4.7";
+      version = "1.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.7.tgz";
-        sha1 = "92b7f7cb88c5797d4daee279fe8075dbe6d3fa1c";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.2.tgz";
+        sha1 = "83bbbdf2e79263b378900da403e7843e05dc3b71";
       };
     };
     "tmp-0.0.28" = {
@@ -11493,13 +11619,13 @@ let
         sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120";
       };
     };
-    "useragent-2.1.9" = {
+    "useragent-2.1.11" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.1.9";
+      version = "2.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.9.tgz";
-        sha1 = "4dba2bc4dad1875777ab15de3ff8098b475000b7";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.11.tgz";
+        sha1 = "6a026e6a6c619b46ca7a0b2fdef6c1ac3da8ca29";
       };
     };
     "bytes-2.4.0" = {
@@ -11511,22 +11637,22 @@ let
         sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339";
       };
     };
-    "iconv-lite-0.4.13" = {
+    "iconv-lite-0.4.15" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
-      version = "0.4.13";
+      version = "0.4.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz";
-        sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
+        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
       };
     };
-    "raw-body-2.1.7" = {
+    "raw-body-2.2.0" = {
       name = "raw-body";
       packageName = "raw-body";
-      version = "2.1.7";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz";
-        sha1 = "adfeace2e4fb3098058014d08c072dcc59758774";
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz";
+        sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96";
       };
     };
     "custom-event-1.0.1" = {
@@ -11610,40 +11736,22 @@ let
         sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
       };
     };
-    "engine.io-1.6.10" = {
+    "debug-2.3.3" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
+        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
+      };
+    };
+    "engine.io-1.8.2" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "1.6.10";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.10.tgz";
-        sha1 = "f87d84e1bd21d1a2ec7f8deef0c62054acdfb27a";
-      };
-    };
-    "socket.io-parser-2.2.6" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz";
-        sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99";
-      };
-    };
-    "socket.io-client-1.4.6" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.4.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz";
-        sha1 = "49b0ba537efd15b8297c84016e642e1c7c752c3d";
-      };
-    };
-    "socket.io-adapter-0.4.0" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz";
-        sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.2.tgz";
+        sha1 = "6b59be730b348c0125b0a4589de1c355abcf7a7e";
       };
     };
     "has-binary-0.1.7" = {
@@ -11655,49 +11763,67 @@ let
         sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
       };
     };
-    "base64id-0.1.0" = {
+    "object-assign-4.1.0" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz";
+        sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0";
+      };
+    };
+    "socket.io-adapter-0.5.0" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
+        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
+      };
+    };
+    "socket.io-client-1.7.2" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "1.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.2.tgz";
+        sha1 = "39fdb0c3dd450e321b7e40cfd83612ec533dd644";
+      };
+    };
+    "socket.io-parser-2.3.1" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
+        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
+      };
+    };
+    "base64id-1.0.0" = {
       name = "base64id";
       packageName = "base64id";
-      version = "0.1.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
-        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+        url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz";
+        sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
       };
     };
-    "ws-1.0.1" = {
-      name = "ws";
-      packageName = "ws";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz";
-        sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9";
-      };
-    };
-    "engine.io-parser-1.2.4" = {
+    "engine.io-parser-1.3.2" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
-      version = "1.2.4";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz";
-        sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42";
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz";
+        sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a";
       };
     };
-    "accepts-1.1.4" = {
-      name = "accepts";
-      packageName = "accepts";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
-        sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
-      };
-    };
-    "after-0.8.1" = {
+    "after-0.8.2" = {
       name = "after";
       packageName = "after";
-      version = "0.8.1";
+      version = "0.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz";
-        sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627";
+        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
+        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
       };
     };
     "arraybuffer.slice-0.0.6" = {
@@ -11709,13 +11835,13 @@ let
         sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
       };
     };
-    "base64-arraybuffer-0.1.2" = {
+    "base64-arraybuffer-0.1.5" = {
       name = "base64-arraybuffer";
       packageName = "base64-arraybuffer";
-      version = "0.1.2";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
-        sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154";
+        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
+        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
       };
     };
     "blob-0.0.4" = {
@@ -11727,103 +11853,13 @@ let
         sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
       };
     };
-    "has-binary-0.1.6" = {
-      name = "has-binary";
-      packageName = "has-binary";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz";
-        sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10";
-      };
-    };
-    "utf8-2.1.0" = {
-      name = "utf8";
-      packageName = "utf8";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz";
-        sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5";
-      };
-    };
-    "negotiator-0.4.9" = {
-      name = "negotiator";
-      packageName = "negotiator";
-      version = "0.4.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
-        sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f";
-      };
-    };
-    "json3-3.3.2" = {
-      name = "json3";
-      packageName = "json3";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
-        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
-      };
-    };
-    "benchmark-1.0.0" = {
-      name = "benchmark";
-      packageName = "benchmark";
+    "wtf-8-1.0.0" = {
+      name = "wtf-8";
+      packageName = "wtf-8";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
-        sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73";
-      };
-    };
-    "engine.io-client-1.6.9" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.6.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz";
-        sha1 = "1d6ad48048a5083c95096943b29d36efdb212401";
-      };
-    };
-    "component-bind-1.0.0" = {
-      name = "component-bind";
-      packageName = "component-bind";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
-        sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
-      };
-    };
-    "component-emitter-1.2.0" = {
-      name = "component-emitter";
-      packageName = "component-emitter";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz";
-        sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe";
-      };
-    };
-    "object-component-0.0.3" = {
-      name = "object-component";
-      packageName = "object-component";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
-        sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
-      };
-    };
-    "parseuri-0.0.4" = {
-      name = "parseuri";
-      packageName = "parseuri";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz";
-        sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350";
-      };
-    };
-    "to-array-0.1.4" = {
-      name = "to-array";
-      packageName = "to-array";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
-        sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
+        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
+        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
       };
     };
     "backo2-1.0.2" = {
@@ -11835,40 +11871,58 @@ let
         sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
       };
     };
-    "has-cors-1.1.0" = {
-      name = "has-cors";
-      packageName = "has-cors";
-      version = "1.1.0";
+    "component-bind-1.0.0" = {
+      name = "component-bind";
+      packageName = "component-bind";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
-        sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+        url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
+        sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
       };
     };
-    "xmlhttprequest-ssl-1.5.1" = {
-      name = "xmlhttprequest-ssl";
-      packageName = "xmlhttprequest-ssl";
-      version = "1.5.1";
+    "component-emitter-1.2.1" = {
+      name = "component-emitter";
+      packageName = "component-emitter";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz";
-        sha1 = "3b7741fea4a86675976e908d296d4445961faa67";
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
       };
     };
-    "parsejson-0.0.1" = {
-      name = "parsejson";
-      packageName = "parsejson";
-      version = "0.0.1";
+    "engine.io-client-1.8.2" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
-        sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc";
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.2.tgz";
+        sha1 = "c38767547f2a7d184f5752f6f0ad501006703766";
       };
     };
-    "parseqs-0.0.2" = {
-      name = "parseqs";
-      packageName = "parseqs";
-      version = "0.0.2";
+    "object-component-0.0.3" = {
+      name = "object-component";
+      packageName = "object-component";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
-        sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7";
+        url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
+        sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
+      };
+    };
+    "parseuri-0.0.5" = {
+      name = "parseuri";
+      packageName = "parseuri";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
+        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+      };
+    };
+    "to-array-0.1.4" = {
+      name = "to-array";
+      packageName = "to-array";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
+        sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
       };
     };
     "component-inherit-0.0.3" = {
@@ -11880,6 +11934,42 @@ let
         sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
       };
     };
+    "has-cors-1.1.0" = {
+      name = "has-cors";
+      packageName = "has-cors";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
+        sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+      };
+    };
+    "parsejson-0.0.3" = {
+      name = "parsejson";
+      packageName = "parsejson";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
+        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
+      };
+    };
+    "parseqs-0.0.5" = {
+      name = "parseqs";
+      packageName = "parseqs";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
+        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
+      };
+    };
+    "xmlhttprequest-ssl-1.5.3" = {
+      name = "xmlhttprequest-ssl";
+      packageName = "xmlhttprequest-ssl";
+      version = "1.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
+        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
+      };
+    };
     "yeast-0.1.2" = {
       name = "yeast";
       packageName = "yeast";
@@ -11907,22 +11997,13 @@ let
         sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
       };
     };
-    "socket.io-parser-2.2.2" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz";
-        sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417";
-      };
-    };
-    "json3-3.2.6" = {
+    "json3-3.3.2" = {
       name = "json3";
       packageName = "json3";
-      version = "3.2.6";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
-        sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
+        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
+        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
       };
     };
     "lru-cache-2.2.4" = {
@@ -12222,6 +12303,24 @@ let
         sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade";
       };
     };
+    "raw-body-2.1.7" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz";
+        sha1 = "adfeace2e4fb3098058014d08c072dcc59758774";
+      };
+    };
+    "iconv-lite-0.4.13" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz";
+        sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
+      };
+    };
     "csrf-3.0.4" = {
       name = "csrf";
       packageName = "csrf";
@@ -12231,6 +12330,15 @@ let
         sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
       };
     };
+    "base64-url-1.3.3" = {
+      name = "base64-url";
+      packageName = "base64-url";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
+        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
+      };
+    };
     "rndm-1.2.0" = {
       name = "rndm";
       packageName = "rndm";
@@ -12375,22 +12483,22 @@ let
         sha1 = "a7de988a211f9cf4687377130ea74df32730c918";
       };
     };
-    "oauth-0.9.14" = {
+    "oauth-0.9.15" = {
       name = "oauth";
       packageName = "oauth";
-      version = "0.9.14";
+      version = "0.9.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
-        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz";
+        sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1";
       };
     };
-    "passport-oauth2-1.3.0" = {
+    "passport-oauth2-1.4.0" = {
       name = "passport-oauth2";
       packageName = "passport-oauth2";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.3.0.tgz";
-        sha1 = "d72b4bd62eeb807a4089ff3071a22c26c382dc0c";
+        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz";
+        sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad";
       };
     };
     "uid2-0.0.3" = {
@@ -12456,22 +12564,22 @@ let
         sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
       };
     };
-    "lodash.isequal-4.4.0" = {
+    "lodash.isequal-4.5.0" = {
       name = "lodash.isequal";
       packageName = "lodash.isequal";
-      version = "4.4.0";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.4.0.tgz";
-        sha1 = "6295768e98e14dc15ce8d362ef6340db82852031";
+        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
+        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
       };
     };
-    "merge-stream-1.0.0" = {
+    "merge-stream-1.0.1" = {
       name = "merge-stream";
       packageName = "merge-stream";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz";
-        sha1 = "9cfd156fef35421e2b5403ce11dc6eb1962b026e";
+        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz";
+        sha1 = "4041202d508a342ba00174008df0c251b8c135e1";
       };
     };
     "strip-bom-stream-1.0.0" = {
@@ -12501,13 +12609,13 @@ let
         sha1 = "1b904a59609fb328ef078138420934f6b86709a6";
       };
     };
-    "glob-parent-3.0.1" = {
+    "glob-parent-3.1.0" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "3.0.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.1.tgz";
-        sha1 = "60021327cc963ddc3b5f085764f500479ecd82ff";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
+        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     };
     "ordered-read-streams-0.3.0" = {
@@ -12555,13 +12663,13 @@ let
         sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
       };
     };
-    "is-extglob-2.1.0" = {
+    "is-extglob-2.1.1" = {
       name = "is-extglob";
       packageName = "is-extglob";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.0.tgz";
-        sha1 = "33411a482b046bf95e6b0cb27ee2711af4cf15ad";
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
       };
     };
     "extend-shallow-2.0.1" = {
@@ -12717,15 +12825,6 @@ let
         sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
       };
     };
-    "semver-5.0.3" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz";
-        sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
-      };
-    };
     "npm-registry-client-7.1.2" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
@@ -12951,15 +13050,6 @@ let
         sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103";
       };
     };
-    "after-0.8.2" = {
-      name = "after";
-      packageName = "after";
-      version = "0.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
-        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
-      };
-    };
     "yargs-1.3.3" = {
       name = "yargs";
       packageName = "yargs";
@@ -13032,13 +13122,13 @@ let
         sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
       };
     };
-    "wrap-ansi-2.0.0" = {
+    "wrap-ansi-2.1.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz";
-        sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f";
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
       };
     };
     "lcid-1.0.0" = {
@@ -13167,13 +13257,22 @@ let
         sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     };
-    "bcryptjs-2.3.0" = {
+    "bcryptjs-2.4.0" = {
       name = "bcryptjs";
       packageName = "bcryptjs";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz";
-        sha1 = "5826900cfef7abaf3425c72e4d464de509b8c2ec";
+        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.0.tgz";
+        sha1 = "fb7f4a0b133854503fe1b2da3f25db834cf0e678";
+      };
+    };
+    "body-parser-1.15.2" = {
+      name = "body-parser";
+      packageName = "body-parser";
+      version = "1.15.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz";
+        sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67";
       };
     };
     "cheerio-0.22.0" = {
@@ -13185,15 +13284,6 @@ let
         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" = {
       name = "cookie-parser";
       packageName = "cookie-parser";
@@ -13203,31 +13293,31 @@ let
         sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
       };
     };
-    "cron-1.1.1" = {
+    "cron-1.2.1" = {
       name = "cron";
       packageName = "cron";
-      version = "1.1.1";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.1.1.tgz";
-        sha1 = "02719d4ef480dfc8ee24d81a3603460ba39013ce";
+        url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz";
+        sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2";
       };
     };
-    "follow-redirects-0.2.0" = {
+    "follow-redirects-1.2.1" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "0.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.2.0.tgz";
-        sha1 = "e0229d7a388bb5ff7b29f44fc1e1b62e921272df";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.1.tgz";
+        sha1 = "796c716970df4fb0096165393545040f61b00f59";
       };
     };
-    "fs-extra-0.30.0" = {
+    "fs-extra-1.0.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
-      version = "0.30.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz";
-        sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
+        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
       };
     };
     "fs.notify-0.0.4" = {
@@ -13248,31 +13338,40 @@ let
         sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
-    "mqtt-1.14.1" = {
+    "jsonata-1.0.10" = {
+      name = "jsonata";
+      packageName = "jsonata";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.0.10.tgz";
+        sha1 = "5177b5aa3ec66e7b5894412b2f9ad170c6107b96";
+      };
+    };
+    "mqtt-2.2.1" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-1.14.1.tgz";
-        sha1 = "7e376987153d01793e946d26d46122ebf0c03554";
-      };
-    };
-    "mustache-2.2.1" = {
-      name = "mustache";
-      packageName = "mustache";
       version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-2.2.1.tgz";
-        sha1 = "2c40ca21c278f53150682bcf9090e41a3339b876";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.2.1.tgz";
+        sha1 = "b3efff8adff78dee07e09cfe89e2d2fb364a1852";
       };
     };
-    "oauth2orize-1.5.0" = {
+    "mustache-2.3.0" = {
+      name = "mustache";
+      packageName = "mustache";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz";
+        sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0";
+      };
+    };
+    "oauth2orize-1.7.0" = {
       name = "oauth2orize";
       packageName = "oauth2orize";
-      version = "1.5.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.5.0.tgz";
-        sha1 = "e352ff4f1b5bf08f0ee94a09757f8f640eb8e0a6";
+        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.7.0.tgz";
+        sha1 = "94c2a511cd0b58bde548548ffcde14fd81f257cc";
       };
     };
     "passport-http-bearer-1.0.1" = {
@@ -13293,22 +13392,13 @@ let
         sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba";
       };
     };
-    "sentiment-1.0.6" = {
+    "sentiment-2.1.0" = {
       name = "sentiment";
       packageName = "sentiment";
-      version = "1.0.6";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sentiment/-/sentiment-1.0.6.tgz";
-        sha1 = "f6096c6271f020f490d58b54a8afd598db8acbb1";
-      };
-    };
-    "uglify-js-2.7.3" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
-        sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
+        url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz";
+        sha1 = "33279100c35c38519ca5e435245186c512fe0fdc";
       };
     };
     "when-3.7.7" = {
@@ -13320,15 +13410,6 @@ let
         sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
       };
     };
-    "ws-0.8.1" = {
-      name = "ws";
-      packageName = "ws";
-      version = "0.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-0.8.1.tgz";
-        sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759";
-      };
-    };
     "node-red-node-feedparser-0.1.7" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
@@ -13338,13 +13419,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.12" = {
+    "node-red-node-email-0.1.15" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.12";
+      version = "0.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz";
-        sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz";
+        sha1 = "7a528596d3b693a077b1ee293300299855537142";
       };
     };
     "node-red-node-twitter-0.1.9" = {
@@ -13365,22 +13446,13 @@ let
         sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539";
       };
     };
-    "node-red-node-serialport-0.4.1" = {
-      name = "node-red-node-serialport";
-      packageName = "node-red-node-serialport";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz";
-        sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c";
-      };
-    };
-    "bcrypt-0.8.7" = {
+    "bcrypt-1.0.2" = {
       name = "bcrypt";
       packageName = "bcrypt";
-      version = "0.8.7";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz";
-        sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093";
+        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.2.tgz";
+        sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736";
       };
     };
     "css-select-1.2.0" = {
@@ -13527,13 +13599,13 @@ let
         sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
       };
     };
-    "moment-timezone-0.5.9" = {
+    "moment-timezone-0.5.11" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.9";
+      version = "0.5.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz";
-        sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz";
+        sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f";
       };
     };
     "retry-0.6.1" = {
@@ -13599,22 +13671,13 @@ let
         sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a";
       };
     };
-    "mqtt-connection-2.1.1" = {
-      name = "mqtt-connection";
-      packageName = "mqtt-connection";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-connection/-/mqtt-connection-2.1.1.tgz";
-        sha1 = "7b2e985a74e196619430bebd35da162c34c4e56a";
-      };
-    };
-    "mqtt-packet-3.4.7" = {
+    "mqtt-packet-5.2.1" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "3.4.7";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-3.4.7.tgz";
-        sha1 = "be8c267be7f0bf6a2a2d4f6de28307b6e0940e5f";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.1.tgz";
+        sha1 = "876e35ed616a8e348ac0283b4922039872458b58";
       };
     };
     "reinterval-1.1.0" = {
@@ -13626,15 +13689,6 @@ let
         sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
       };
     };
-    "split2-2.1.0" = {
-      name = "split2";
-      packageName = "split2";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split2/-/split2-2.1.0.tgz";
-        sha1 = "7382c148cb622c4b28af7c727f9673730b73f474";
-      };
-    };
     "websocket-stream-3.3.3" = {
       name = "websocket-stream";
       packageName = "websocket-stream";
@@ -13662,60 +13716,6 @@ let
         sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
       };
     };
-    "reduplexer-1.1.0" = {
-      name = "reduplexer";
-      packageName = "reduplexer";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/reduplexer/-/reduplexer-1.1.0.tgz";
-        sha1 = "7dfed18a679e749c1d7ad36de01acb515f08e140";
-      };
-    };
-    "lodash.assign-4.0.1" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.0.1.tgz";
-        sha1 = "8e7ff0206897a99dca32fc8123309f5c4c2c731e";
-      };
-    };
-    "lodash.keys-4.2.0" = {
-      name = "lodash.keys";
-      packageName = "lodash.keys";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz";
-        sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205";
-      };
-    };
-    "lodash.rest-4.0.5" = {
-      name = "lodash.rest";
-      packageName = "lodash.rest";
-      version = "4.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.5.tgz";
-        sha1 = "954ef75049262038c96d1fc98b28fdaf9f0772aa";
-      };
-    };
-    "bufferutil-1.2.1" = {
-      name = "bufferutil";
-      packageName = "bufferutil";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz";
-        sha1 = "37be5d36e1e06492221e68d474b1ac58e510cbd7";
-      };
-    };
-    "utf-8-validate-1.2.1" = {
-      name = "utf-8-validate";
-      packageName = "utf-8-validate";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz";
-        sha1 = "44cb7c6eead73d6b40448f71f745904357b9f72c";
-      };
-    };
     "feedparser-1.1.3" = {
       name = "feedparser";
       packageName = "feedparser";
@@ -13779,13 +13779,13 @@ let
         sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3";
       };
     };
-    "imap-0.8.18" = {
+    "imap-0.8.19" = {
       name = "imap";
       packageName = "imap";
-      version = "0.8.18";
+      version = "0.8.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/imap/-/imap-0.8.18.tgz";
-        sha1 = "4a7cdd0ff276efa0298708bb2c6d0db0b77f7a3f";
+        url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz";
+        sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5";
       };
     };
     "libmime-1.2.0" = {
@@ -13833,15 +13833,6 @@ let
         sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398";
       };
     };
-    "iconv-lite-0.4.15" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
-        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
-      };
-    };
     "libbase64-0.1.0" = {
       name = "libbase64";
       packageName = "libbase64";
@@ -13950,58 +13941,13 @@ let
         sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
       };
     };
-    "serialport-4.0.6" = {
-      name = "serialport";
-      packageName = "serialport";
-      version = "4.0.6";
+    "oauth-0.9.14" = {
+      name = "oauth";
+      packageName = "oauth";
+      version = "0.9.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz";
-        sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae";
-      };
-    };
-    "lie-3.1.0" = {
-      name = "lie";
-      packageName = "lie";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lie/-/lie-3.1.0.tgz";
-        sha1 = "65e0139eaef9ae791a1f5c8c53692c8d3b4718f4";
-      };
-    };
-    "object.assign-4.0.4" = {
-      name = "object.assign";
-      packageName = "object.assign";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz";
-        sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
-      };
-    };
-    "immediate-3.0.6" = {
-      name = "immediate";
-      packageName = "immediate";
-      version = "3.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz";
-        sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b";
-      };
-    };
-    "define-properties-1.1.2" = {
-      name = "define-properties";
-      packageName = "define-properties";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
-        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
-      };
-    };
-    "nan-2.3.5" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
-        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
+        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
       };
     };
     "mongoose-3.6.7" = {
@@ -14382,6 +14328,15 @@ let
         sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d";
       };
     };
+    "base64id-0.1.0" = {
+      name = "base64id";
+      packageName = "base64id";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+      };
+    };
     "redis-0.7.3" = {
       name = "redis";
       packageName = "redis";
@@ -14463,13 +14418,13 @@ let
         sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
       };
     };
-    "mailcomposer-3.12.0" = {
+    "mailcomposer-4.0.1" = {
       name = "mailcomposer";
       packageName = "mailcomposer";
-      version = "3.12.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz";
-        sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9";
+        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz";
+        sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4";
       };
     };
     "simplesmtp-0.3.35" = {
@@ -14481,22 +14436,22 @@ let
         sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03";
       };
     };
-    "buildmail-3.10.0" = {
+    "buildmail-4.0.1" = {
       name = "buildmail";
       packageName = "buildmail";
-      version = "3.10.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz";
-        sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159";
+        url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz";
+        sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72";
       };
     };
-    "libmime-2.1.0" = {
+    "libmime-3.0.0" = {
       name = "libmime";
       packageName = "libmime";
-      version = "2.1.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz";
-        sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd";
+        url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz";
+        sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6";
       };
     };
     "addressparser-1.0.1" = {
@@ -14553,6 +14508,15 @@ let
         sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528";
       };
     };
+    "nan-2.3.5" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
+        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
+      };
+    };
     "argparse-0.1.16" = {
       name = "argparse";
       packageName = "argparse";
@@ -14580,6 +14544,15 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
+    "JSONStream-1.2.1" = {
+      name = "JSONStream";
+      packageName = "JSONStream";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
+        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
+      };
+    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14643,6 +14616,15 @@ let
         sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
       };
     };
+    "nopt-4.0.1" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
+        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+      };
+    };
     "npm-install-checks-3.0.0" = {
       name = "npm-install-checks";
       packageName = "npm-install-checks";
@@ -14652,13 +14634,13 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-registry-client-7.3.0" = {
+    "npm-registry-client-7.4.5" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "7.3.0";
+      version = "7.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz";
-        sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.5.tgz";
+        sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df";
       };
     };
     "opener-1.4.2" = {
@@ -14688,15 +14670,6 @@ let
         sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
       };
     };
-    "request-2.78.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.78.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
-        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
-      };
-    };
     "sorted-union-stream-2.1.3" = {
       name = "sorted-union-stream";
       packageName = "sorted-union-stream";
@@ -14715,6 +14688,15 @@ let
         sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
+    "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";
+      };
+    };
     "lodash._baseindexof-3.1.0" = {
       name = "lodash._baseindexof";
       packageName = "lodash._baseindexof";
@@ -15057,13 +15039,13 @@ let
         sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d";
       };
     };
-    "update-notifier-1.0.2" = {
+    "update-notifier-1.0.3" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.2.tgz";
-        sha1 = "27c90519196dc15015be02a34ea52986feab8877";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz";
+        sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a";
       };
     };
     "request-2.75.0" = {
@@ -15210,6 +15192,15 @@ let
         sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
       };
     };
+    "timed-out-3.1.3" = {
+      name = "timed-out";
+      packageName = "timed-out";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
+        sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217";
+      };
+    };
     "unzip-response-1.0.2" = {
       name = "unzip-response";
       packageName = "unzip-response";
@@ -15330,13 +15321,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.1.11" = {
+    "service-runner-2.1.13" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.1.11";
+      version = "2.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz";
-        sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz";
+        sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb";
       };
     };
     "simplediff-0.1.1" = {
@@ -15366,13 +15357,13 @@ let
         sha1 = "07e30ad79531844179b642d2d8399435182c8727";
       };
     };
-    "busboy-0.2.13" = {
+    "busboy-0.2.14" = {
       name = "busboy";
       packageName = "busboy";
-      version = "0.2.13";
+      version = "0.2.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz";
-        sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6";
+        url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz";
+        sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453";
       };
     };
     "dicer-0.2.5" = {
@@ -15393,6 +15384,24 @@ let
         sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
       };
     };
+    "object.assign-4.0.4" = {
+      name = "object.assign";
+      packageName = "object.assign";
+      version = "4.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz";
+        sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
+      };
+    };
+    "define-properties-1.1.2" = {
+      name = "define-properties";
+      packageName = "define-properties";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
+        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
+      };
+    };
     "gelfling-0.2.0" = {
       name = "gelfling";
       packageName = "gelfling";
@@ -15691,13 +15700,13 @@ let
         sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918";
       };
     };
-    "network-address-1.1.0" = {
+    "network-address-1.1.2" = {
       name = "network-address";
       packageName = "network-address";
-      version = "1.1.0";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/network-address/-/network-address-1.1.0.tgz";
-        sha1 = "74d577b0dea652284659079fc8d7010b72f01092";
+        url = "https://registry.npmjs.org/network-address/-/network-address-1.1.2.tgz";
+        sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e";
       };
     };
     "airplay-protocol-2.0.2" = {
@@ -15817,13 +15826,13 @@ let
         sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364";
       };
     };
-    "array-flatten-2.1.0" = {
+    "array-flatten-2.1.1" = {
       name = "array-flatten";
       packageName = "array-flatten";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.0.tgz";
-        sha1 = "26a692c83881fc68dac3ec5d1f0c1b49bf2304d9";
+        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz";
+        sha1 = "426bb9da84090c1838d812c8150af20a8331e296";
       };
     };
     "dns-equal-1.0.0" = {
@@ -15880,13 +15889,22 @@ let
         sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
       };
     };
-    "run-async-2.2.0" = {
+    "mute-stream-0.0.6" = {
+      name = "mute-stream";
+      packageName = "mute-stream";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
+        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
+      };
+    };
+    "run-async-2.3.0" = {
       name = "run-async";
       packageName = "run-async";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.2.0.tgz";
-        sha1 = "8783abd83c7bb86f41ee0602fc82404b3bd6e8b9";
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
+        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
       };
     };
     "rx-4.1.0" = {
@@ -15943,15 +15961,6 @@ let
         sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
       };
     };
-    "socket.io-1.6.0" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz";
-        sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1";
-      };
-    };
     "torrent-stream-0.18.1" = {
       name = "torrent-stream";
       packageName = "torrent-stream";
@@ -16321,123 +16330,6 @@ let
         sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
       };
     };
-    "engine.io-1.8.0" = {
-      name = "engine.io";
-      packageName = "engine.io";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz";
-        sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa";
-      };
-    };
-    "socket.io-adapter-0.5.0" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
-        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
-      };
-    };
-    "socket.io-client-1.6.0" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz";
-        sha1 = "5b668f4f771304dfeed179064708386fa6717853";
-      };
-    };
-    "socket.io-parser-2.3.1" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
-        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
-      };
-    };
-    "engine.io-parser-1.3.1" = {
-      name = "engine.io-parser";
-      packageName = "engine.io-parser";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz";
-        sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf";
-      };
-    };
-    "base64-arraybuffer-0.1.5" = {
-      name = "base64-arraybuffer";
-      packageName = "base64-arraybuffer";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
-        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
-      };
-    };
-    "wtf-8-1.0.0" = {
-      name = "wtf-8";
-      packageName = "wtf-8";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
-        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
-      };
-    };
-    "component-emitter-1.2.1" = {
-      name = "component-emitter";
-      packageName = "component-emitter";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
-        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
-      };
-    };
-    "engine.io-client-1.8.0" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz";
-        sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c";
-      };
-    };
-    "parseuri-0.0.5" = {
-      name = "parseuri";
-      packageName = "parseuri";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
-        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
-      };
-    };
-    "parsejson-0.0.3" = {
-      name = "parsejson";
-      packageName = "parsejson";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
-        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
-      };
-    };
-    "parseqs-0.0.5" = {
-      name = "parseqs";
-      packageName = "parseqs";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
-        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
-      };
-    };
-    "xmlhttprequest-ssl-1.5.3" = {
-      name = "xmlhttprequest-ssl";
-      packageName = "xmlhttprequest-ssl";
-      version = "1.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
-        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
-      };
-    };
     "bittorrent-dht-3.2.6" = {
       name = "bittorrent-dht";
       packageName = "bittorrent-dht";
@@ -16717,31 +16609,31 @@ let
         sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
       };
     };
-    "recast-0.11.17" = {
+    "recast-0.11.20" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.17";
+      version = "0.11.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.17.tgz";
-        sha1 = "67e829df49ef8ea822381cc516d305411e60bad8";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.20.tgz";
+        sha1 = "2cb9bec269c03b36d0598118a936cd0a293ca3f3";
       };
     };
-    "ast-types-0.9.2" = {
+    "ast-types-0.9.4" = {
       name = "ast-types";
       packageName = "ast-types";
-      version = "0.9.2";
+      version = "0.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.2.tgz";
-        sha1 = "2cc19979d15c655108bf565323b8e7ee38751f6b";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.4.tgz";
+        sha1 = "410d1f81890aeb8e0a38621558ba5869ae53c91b";
       };
     };
-    "esprima-3.1.1" = {
+    "esprima-3.1.3" = {
       name = "esprima";
       packageName = "esprima";
-      version = "3.1.1";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.1.tgz";
-        sha1 = "02dbcc5ac3ece81070377f99158ec742ab5dda06";
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
       };
     };
     "base62-0.1.1" = {
@@ -16927,11 +16819,11 @@ let
     "oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" = {
       name = "oauth";
       packageName = "oauth";
-      version = "0.9.14";
+      version = "0.9.15";
       src = fetchurl {
-        name = "oauth-0.9.14.tar.gz";
+        name = "oauth-0.9.15.tar.gz";
         url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master;
-        sha256 = "abd0d7be4fb10804e5a38ee66a4db5fc36d2ed045be52e7c8b7e19e4c9e16bd8";
+        sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947";
       };
     };
     "connect-2.3.9" = {
@@ -17213,13 +17105,13 @@ let
         sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414";
       };
     };
-    "sanitize-html-1.13.0" = {
+    "sanitize-html-1.14.1" = {
       name = "sanitize-html";
       packageName = "sanitize-html";
-      version = "1.13.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz";
-        sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631";
+        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz";
+        sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8";
       };
     };
     "linkify-it-1.2.4" = {
@@ -17366,6 +17258,15 @@ let
         sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2";
       };
     };
+    "formidable-1.1.1" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz";
+        sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9";
+      };
+    };
     "http-signature-0.11.0" = {
       name = "http-signature";
       packageName = "http-signature";
@@ -17438,13 +17339,13 @@ let
         sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
       };
     };
-    "csv-parse-1.1.7" = {
+    "csv-parse-1.1.10" = {
       name = "csv-parse";
       packageName = "csv-parse";
-      version = "1.1.7";
+      version = "1.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.7.tgz";
-        sha1 = "6e4678f7967013ac823929a4303a3ce177115abc";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.10.tgz";
+        sha1 = "767340d0d1f26d05434c798b7132222c669189de";
       };
     };
     "stream-transform-0.1.1" = {
@@ -17636,13 +17537,13 @@ let
         sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2";
       };
     };
-    "clap-1.1.1" = {
+    "clap-1.1.2" = {
       name = "clap";
       packageName = "clap";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clap/-/clap-1.1.1.tgz";
-        sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d";
+        url = "https://registry.npmjs.org/clap/-/clap-1.1.2.tgz";
+        sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed";
       };
     };
     "async-2.1.2" = {
@@ -17699,6 +17600,15 @@ let
         sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4";
       };
     };
+    "request-2.78.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.78.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
+        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+      };
+    };
     "sprintf-0.1.5" = {
       name = "sprintf";
       packageName = "sprintf";
@@ -17798,6 +17708,15 @@ let
         sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
       };
     };
+    "xmldom-0.1.22" = {
+      name = "xmldom";
+      packageName = "xmldom";
+      version = "0.1.22";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
+        sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
+      };
+    };
     "qs-6.0.2" = {
       name = "qs";
       packageName = "qs";
@@ -17807,31 +17726,22 @@ let
         sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
       };
     };
-    "bluebird-3.3.5" = {
-      name = "bluebird";
-      packageName = "bluebird";
-      version = "3.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.3.5.tgz";
-        sha1 = "5ee747f1c7bd967658b683936430aee753955a34";
-      };
-    };
-    "blueimp-md5-2.3.1" = {
+    "blueimp-md5-2.6.0" = {
       name = "blueimp-md5";
       packageName = "blueimp-md5";
-      version = "2.3.1";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz";
-        sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a";
+        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.6.0.tgz";
+        sha1 = "c96dd67f57db522da9a0c49b464ca44e20c04e0f";
       };
     };
-    "color-0.11.4" = {
+    "color-1.0.3" = {
       name = "color";
       packageName = "color";
-      version = "0.11.4";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz";
-        sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764";
+        url = "https://registry.npmjs.org/color/-/color-1.0.3.tgz";
+        sha1 = "e48e832d85f14ef694fb468811c2d5cfe729b55d";
       };
     };
     "crossroads-0.12.2" = {
@@ -17843,31 +17753,22 @@ let
         sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2";
       };
     };
-    "diff2html-1.2.0" = {
+    "diff2html-2.0.12" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "1.2.0";
+      version = "2.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-1.2.0.tgz";
-        sha1 = "8b54af41c180befd9cb1caa130a3d76081ae4a07";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.0.12.tgz";
+        sha1 = "20eda2f1ffd14027716485c938e3fe21dc379455";
       };
     };
-    "express-4.13.4" = {
-      name = "express";
-      packageName = "express";
-      version = "4.13.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.13.4.tgz";
-        sha1 = "3c0b76f3c77590c8345739061ec0bd3ba067ec24";
-      };
-    };
-    "express-session-1.13.0" = {
+    "express-session-1.14.2" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.13.0";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.13.0.tgz";
-        sha1 = "8ac3b5c0188b48382851d88207b8e7746efb4011";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz";
+        sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275";
       };
     };
     "forever-monitor-1.1.0" = {
@@ -17915,31 +17816,13 @@ let
         sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
       };
     };
-    "lodash-4.12.0" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz";
-        sha1 = "2bd6dc46a040f59e686c972ed21d93dc59053258";
-      };
-    };
-    "moment-2.13.0" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.13.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.13.0.tgz";
-        sha1 = "24162d99521e6d40f99ae6939e806d2139eaac52";
-      };
-    };
-    "npm-3.9.6" = {
+    "npm-4.1.2" = {
       name = "npm";
       packageName = "npm";
-      version = "3.9.6";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-3.9.6.tgz";
-        sha1 = "0ef1d272a069ad95bdca8b2dfe6fcd82f4b461d7";
+        url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
+        sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
       };
     };
     "octicons-3.5.0" = {
@@ -17960,13 +17843,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-0.11.0" = {
+    "raven-1.1.1" = {
       name = "raven";
       packageName = "raven";
-      version = "0.11.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-0.11.0.tgz";
-        sha1 = "32981138a93e4c8ad08cfc17e46b85b453dc107b";
+        url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz";
+        sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42";
       };
     };
     "signals-1.0.0" = {
@@ -17987,49 +17870,40 @@ let
         sha1 = "e0767014167825957de7e125c29b0fa89796ea03";
       };
     };
-    "socket.io-1.4.8" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "1.4.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.8.tgz";
-        sha1 = "e576f330cd0bed64e55b3fd26df991141884867b";
-      };
-    };
-    "winston-2.2.0" = {
+    "winston-2.3.1" = {
       name = "winston";
       packageName = "winston";
-      version = "2.2.0";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.2.0.tgz";
-        sha1 = "2c853dd87ab552a8e8485d72cbbf9a2286f029b7";
+        url = "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz";
+        sha1 = "0b48420d978c01804cf0230b648861598225a119";
       };
     };
-    "yargs-4.7.1" = {
+    "yargs-6.6.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "4.7.1";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-4.7.1.tgz";
-        sha1 = "e60432658a3387ff269c028eacde4a512e438dff";
+        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
       };
     };
-    "color-convert-1.8.2" = {
+    "color-convert-1.9.0" = {
       name = "color-convert";
       packageName = "color-convert";
-      version = "1.8.2";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.8.2.tgz";
-        sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339";
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
+        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
       };
     };
-    "color-string-0.3.0" = {
+    "color-string-1.4.0" = {
       name = "color-string";
       packageName = "color-string";
-      version = "0.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz";
-        sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991";
+        url = "https://registry.npmjs.org/color-string/-/color-string-1.4.0.tgz";
+        sha1 = "2b47f8565fb0eb52f9f77c801992b8ca55d6e898";
       };
     };
     "color-name-1.1.1" = {
@@ -18041,58 +17915,58 @@ let
         sha1 = "4b1415304cf50028ea81643643bd82ea05803689";
       };
     };
-    "diff-2.2.3" = {
+    "simple-swizzle-0.2.2" = {
+      name = "simple-swizzle";
+      packageName = "simple-swizzle";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz";
+        sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a";
+      };
+    };
+    "is-arrayish-0.3.1" = {
+      name = "is-arrayish";
+      packageName = "is-arrayish";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz";
+        sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd";
+      };
+    };
+    "diff-3.2.0" = {
       name = "diff";
       packageName = "diff";
-      version = "2.2.3";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
-        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
+        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
+        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
       };
     };
-    "cookie-0.1.5" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.1.5";
+    "hogan.js-3.0.2" = {
+      name = "hogan.js";
+      packageName = "hogan.js";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.5.tgz";
-        sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c";
+        url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz";
+        sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd";
       };
     };
-    "finalhandler-0.4.1" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.4.1";
+    "whatwg-fetch-2.0.2" = {
+      name = "whatwg-fetch";
+      packageName = "whatwg-fetch";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
-        sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
+        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz";
+        sha1 = "fe294d1d89e36c5be8b3195057f2e4bc74fc980e";
       };
     };
-    "send-0.13.1" = {
-      name = "send";
-      packageName = "send";
-      version = "0.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.13.1.tgz";
-        sha1 = "a30d5f4c82c8a9bae9ad00a1d9b1bdbe6f199ed7";
-      };
-    };
-    "cookie-0.2.3" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.2.3.tgz";
-        sha1 = "1a59536af68537a21178a01346f87cb059d2ae5c";
-      };
-    };
-    "crc-3.4.0" = {
+    "crc-3.4.1" = {
       name = "crc";
       packageName = "crc";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz";
-        sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f";
+        url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz";
+        sha1 = "65d5830b1a2569557cfb324c0e679998521473ee";
       };
     };
     "broadway-0.2.10" = {
@@ -18203,13 +18077,13 @@ let
         sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b";
       };
     };
-    "typechecker-4.4.0" = {
+    "typechecker-4.4.1" = {
       name = "typechecker";
       packageName = "typechecker";
-      version = "4.4.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.0.tgz";
-        sha1 = "efc56882d36e435c6eb978200e22b88278a3f7fc";
+        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.1.tgz";
+        sha1 = "f97b95f51b038417212d677d45a373ee7bced7e6";
       };
     };
     "underscore-1.5.2" = {
@@ -18221,103 +18095,13 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "lodash.clonedeep-4.3.2" = {
-      name = "lodash.clonedeep";
-      packageName = "lodash.clonedeep";
-      version = "4.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz";
-        sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de";
-      };
-    };
-    "lodash.union-4.4.0" = {
-      name = "lodash.union";
-      packageName = "lodash.union";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz";
-        sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38";
-      };
-    };
-    "lodash.uniq-4.3.0" = {
-      name = "lodash.uniq";
-      packageName = "lodash.uniq";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz";
-        sha1 = "dcad810876841447d8f3ec662323c86a6d938227";
-      };
-    };
-    "lodash.without-4.2.0" = {
-      name = "lodash.without";
-      packageName = "lodash.without";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz";
-        sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6";
-      };
-    };
-    "node-gyp-3.3.1" = {
+    "node-gyp-3.5.0" = {
       name = "node-gyp";
       packageName = "node-gyp";
-      version = "3.3.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz";
-        sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0";
-      };
-    };
-    "request-2.72.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.72.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz";
-        sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1";
-      };
-    };
-    "retry-0.9.0" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz";
-        sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d";
-      };
-    };
-    "lodash._baseclone-4.5.7" = {
-      name = "lodash._baseclone";
-      packageName = "lodash._baseclone";
-      version = "4.5.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz";
-        sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
-      };
-    };
-    "lodash._baseflatten-4.2.1" = {
-      name = "lodash._baseflatten";
-      packageName = "lodash._baseflatten";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz";
-        sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208";
-      };
-    };
-    "lodash._basedifference-4.5.0" = {
-      name = "lodash._basedifference";
-      packageName = "lodash._basedifference";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz";
-        sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938";
-      };
-    };
-    "qs-6.1.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz";
-        sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26";
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
+        sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
       };
     };
     "lsmod-1.0.0" = {
@@ -18329,13 +18113,13 @@ let
         sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b";
       };
     };
-    "stack-trace-0.0.7" = {
-      name = "stack-trace";
-      packageName = "stack-trace";
-      version = "0.0.7";
+    "uuid-3.0.0" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
-        sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
+        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
       };
     };
     "eve-0.4.2" = {
@@ -18347,67 +18131,13 @@ let
         sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
       };
     };
-    "engine.io-1.6.11" = {
-      name = "engine.io";
-      packageName = "engine.io";
-      version = "1.6.11";
+    "yargs-parser-4.2.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.11.tgz";
-        sha1 = "2533a97a65876c40ffcf95397b7ef9b495c423fe";
-      };
-    };
-    "socket.io-client-1.4.8" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.4.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.8.tgz";
-        sha1 = "481b241e73df140ea1a4fb03486a85ad097f5558";
-      };
-    };
-    "ws-1.1.0" = {
-      name = "ws";
-      packageName = "ws";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.1.0.tgz";
-        sha1 = "c1d6fd1515d3ceff1f0ae2759bf5fd77030aad1d";
-      };
-    };
-    "engine.io-client-1.6.11" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.6.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.11.tgz";
-        sha1 = "7d250d8fa1c218119ecde51390458a57d5171376";
-      };
-    };
-    "pkg-conf-1.1.3" = {
-      name = "pkg-conf";
-      packageName = "pkg-conf";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-1.1.3.tgz";
-        sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b";
-      };
-    };
-    "set-blocking-1.0.0" = {
-      name = "set-blocking";
-      packageName = "set-blocking";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-1.0.0.tgz";
-        sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5";
-      };
-    };
-    "symbol-0.2.3" = {
-      name = "symbol";
-      packageName = "symbol";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/symbol/-/symbol-0.2.3.tgz";
-        sha1 = "3b9873b8a901e47c6efe21526a3ac372ef28bbc7";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
       };
     };
     "kew-0.1.7" = {
@@ -18491,13 +18221,13 @@ let
         sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
       };
     };
-    "node-libs-browser-0.6.0" = {
+    "node-libs-browser-0.7.0" = {
       name = "node-libs-browser";
       packageName = "node-libs-browser";
-      version = "0.6.0";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.6.0.tgz";
-        sha1 = "244806d44d319e048bc8607b5cc4eaf9a29d2e3c";
+        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz";
+        sha1 = "3e272c0819e308935e26674408d7af0e1491b83b";
       };
     };
     "tapable-0.1.10" = {
@@ -18518,13 +18248,13 @@ let
         sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b";
       };
     };
-    "webpack-core-0.6.8" = {
+    "webpack-core-0.6.9" = {
       name = "webpack-core";
       packageName = "webpack-core";
-      version = "0.6.8";
+      version = "0.6.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz";
-        sha1 = "edf9135de00a6a3c26dd0f14b208af0aa4af8d0a";
+        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz";
+        sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2";
       };
     };
     "memory-fs-0.2.0" = {
@@ -18554,76 +18284,40 @@ let
         sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
-    "json5-0.5.0" = {
+    "json5-0.5.1" = {
       name = "json5";
       packageName = "json5";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz";
-        sha1 = "9b20715b026cbe3778fd769edccd822d8332a5b2";
+        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
+        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
       };
     };
-    "assert-1.4.1" = {
-      name = "assert";
-      packageName = "assert";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
-        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" = {
+    "crypto-browserify-3.3.0" = {
       name = "crypto-browserify";
       packageName = "crypto-browserify";
-      version = "3.2.8";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz";
-        sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189";
+        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz";
+        sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c";
       };
     };
-    "http-browserify-1.7.0" = {
-      name = "http-browserify";
-      packageName = "http-browserify";
-      version = "1.7.0";
+    "os-browserify-0.2.1" = {
+      name = "os-browserify";
+      packageName = "os-browserify";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
-        sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
+        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz";
+        sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f";
       };
     };
-    "https-browserify-0.0.0" = {
-      name = "https-browserify";
-      packageName = "https-browserify";
-      version = "0.0.0";
+    "timers-browserify-2.0.2" = {
+      name = "timers-browserify";
+      packageName = "timers-browserify";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
-        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";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz";
+        sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86";
       };
     };
     "pbkdf2-compat-2.0.1" = {
@@ -18653,40 +18347,49 @@ let
         sha1 = "17ddeddc5f722fb66501658895461977867315ba";
       };
     };
-    "Base64-0.2.1" = {
-      name = "Base64";
-      packageName = "Base64";
-      version = "0.2.1";
+    "browserify-aes-0.4.0" = {
+      name = "browserify-aes";
+      packageName = "browserify-aes";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
-        sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
+        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz";
+        sha1 = "067149b668df31c4b58533e02d01e806d8608e2c";
       };
     };
-    "source-list-map-0.1.6" = {
+    "setimmediate-1.0.5" = {
+      name = "setimmediate";
+      packageName = "setimmediate";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz";
+        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
+      };
+    };
+    "source-list-map-0.1.8" = {
       name = "source-list-map";
       packageName = "source-list-map";
-      version = "0.1.6";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.6.tgz";
-        sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f";
+        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz";
+        sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106";
       };
     };
-    "babel-runtime-6.18.0" = {
+    "babel-runtime-6.22.0" = {
       name = "babel-runtime";
       packageName = "babel-runtime";
-      version = "6.18.0";
+      version = "6.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz";
-        sha1 = "0f4177ffd98492ef13b9f823e9994a02584c9078";
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.22.0.tgz";
+        sha1 = "1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611";
       };
     };
-    "death-1.0.0" = {
+    "death-1.1.0" = {
       name = "death";
       packageName = "death";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/death/-/death-1.0.0.tgz";
-        sha1 = "4d46e15488d4b636b699f0671b04632d752fd2de";
+        url = "https://registry.npmjs.org/death/-/death-1.1.0.tgz";
+        sha1 = "01aa9c401edd92750514470b8266390c66c67318";
       };
     };
     "detect-indent-4.0.0" = {
@@ -18698,6 +18401,15 @@ let
         sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
       };
     };
+    "diff-2.2.3" = {
+      name = "diff";
+      packageName = "diff";
+      version = "2.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
+        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
+      };
+    };
     "invariant-2.2.2" = {
       name = "invariant";
       packageName = "invariant";
@@ -18725,13 +18437,13 @@ let
         sha1 = "74c45744439550da185801912829f61d22071bc1";
       };
     };
-    "node-emoji-1.4.1" = {
+    "node-emoji-1.5.1" = {
       name = "node-emoji";
       packageName = "node-emoji";
-      version = "1.4.1";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.4.1.tgz";
-        sha1 = "c9fa0cf91094335bcb967a6f42b2305c15af2ebc";
+        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.5.1.tgz";
+        sha1 = "fd918e412769bf8c448051238233840b2aff16a1";
       };
     };
     "object-path-0.11.3" = {
@@ -18743,13 +18455,13 @@ let
         sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554";
       };
     };
-    "proper-lockfile-1.2.0" = {
+    "proper-lockfile-2.0.0" = {
       name = "proper-lockfile";
       packageName = "proper-lockfile";
-      version = "1.2.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz";
-        sha1 = "ceff5dd89d3e5f10fb75e1e8e76bc75801a59c34";
+        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.0.tgz";
+        sha1 = "b21f5e79bcbb6b4e23eeeced15cfc7f63e8a2e55";
       };
     };
     "request-capture-har-1.1.4" = {
@@ -18770,22 +18482,22 @@ let
         sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
       };
     };
-    "regenerator-runtime-0.9.6" = {
+    "regenerator-runtime-0.10.1" = {
       name = "regenerator-runtime";
       packageName = "regenerator-runtime";
-      version = "0.9.6";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz";
-        sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029";
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz";
+        sha1 = "257f41961ce44558b18f7814af48c17559f9faeb";
       };
     };
-    "loose-envify-1.3.0" = {
+    "loose-envify-1.3.1" = {
       name = "loose-envify";
       packageName = "loose-envify";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz";
-        sha1 = "6b26248c42f6d4fa4b0d8542f78edfcde35642a8";
+        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz";
+        sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848";
       };
     };
     "ci-info-1.0.0" = {
@@ -18806,25 +18518,16 @@ let
         sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78";
       };
     };
-    "err-code-1.1.1" = {
-      name = "err-code";
-      packageName = "err-code";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.1.tgz";
-        sha1 = "739d71b6851f24d050ea18c79a5b722420771d59";
-      };
-    };
   };
 in
 {
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.4";
+    version = "1.9.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.4.tgz";
-      sha1 = "8f85b28758ed0e7a251a635cd2e6a73ce92e9dde";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz";
+      sha1 = "78be031931f4b9012f6085e1544069c56dcba233";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -18866,21 +18569,20 @@ in
           sources."uglify-to-browserify-1.0.2"
         ];
       })
-      sources."resolve-1.1.7"
+      sources."resolve-1.2.0"
       (sources."global-paths-0.1.2" // {
         dependencies = [
           sources."array-unique-0.2.1"
           (sources."global-modules-0.2.3" // {
             dependencies = [
-              (sources."global-prefix-0.1.4" // {
+              (sources."global-prefix-0.1.5" // {
                 dependencies = [
-                  sources."ini-1.3.4"
-                  (sources."osenv-0.1.3" // {
+                  (sources."homedir-polyfill-1.0.1" // {
                     dependencies = [
-                      sources."os-homedir-1.0.2"
-                      sources."os-tmpdir-1.0.2"
+                      sources."parse-passwd-1.0.0"
                     ];
                   })
+                  sources."ini-1.3.4"
                   (sources."which-1.2.12" // {
                     dependencies = [
                       sources."isexe-1.1.2"
@@ -18926,10 +18628,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.7";
+    version = "0.10.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.7.tgz";
-      sha1 = "48e59f6be202122c0d71153efab4f924065da586";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz";
+      sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc";
     };
     dependencies = [
       (sources."adal-node-0.1.21" // {
@@ -18938,21 +18640,17 @@ in
           (sources."jws-3.1.4" // {
             dependencies = [
               sources."base64url-2.0.0"
-              (sources."jwa-1.1.4" // {
+              (sources."jwa-1.1.5" // {
                 dependencies = [
                   sources."buffer-equal-constant-time-1.0.1"
-                  (sources."ecdsa-sig-formatter-1.0.7" // {
-                    dependencies = [
-                      sources."base64-url-1.3.3"
-                    ];
-                  })
+                  sources."ecdsa-sig-formatter-1.0.9"
                 ];
               })
               sources."safe-buffer-5.0.1"
             ];
           })
           sources."node-uuid-1.4.7"
-          sources."xmldom-0.1.22"
+          sources."xmldom-0.1.27"
           sources."xpath.js-1.0.7"
         ];
       })
@@ -18971,9 +18669,11 @@ in
         ];
       })
       sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-cdn-0.2.1"
+      sources."azure-arm-cdn-1.0.0"
       sources."azure-arm-commerce-0.2.0"
-      sources."azure-arm-compute-0.19.0"
+      sources."azure-arm-compute-0.19.1"
+      sources."azure-arm-datalake-analytics-1.0.1-preview"
+      sources."azure-arm-datalake-store-1.0.1-preview"
       sources."azure-arm-hdinsight-0.2.2"
       sources."azure-arm-hdinsight-jobs-0.1.0"
       sources."azure-arm-insights-0.11.3"
@@ -18985,8 +18685,6 @@ in
       sources."azure-arm-dns-0.11.1"
       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"
@@ -19001,7 +18699,7 @@ in
         ];
       })
       sources."azure-asm-network-0.13.0"
-      sources."azure-arm-resource-1.4.5-preview"
+      sources."azure-arm-resource-1.6.1-preview"
       sources."azure-arm-storage-0.13.1-preview"
       sources."azure-asm-sb-0.10.1"
       sources."azure-asm-sql-0.10.1"
@@ -19043,7 +18741,7 @@ in
       sources."azure-arm-batch-0.3.0"
       sources."azure-batch-0.5.2"
       sources."azure-servicefabric-0.1.4"
-      sources."applicationinsights-0.15.12"
+      sources."applicationinsights-0.16.0"
       (sources."caller-id-0.1.0" // {
         dependencies = [
           sources."stack-trace-0.0.9"
@@ -19099,7 +18797,7 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.17.0"
+      sources."moment-2.17.1"
       (sources."ms-rest-1.15.2" // {
         dependencies = [
           sources."duplexer-0.1.1"
@@ -19113,7 +18811,6 @@ in
         ];
       })
       sources."node-forge-0.6.23"
-      sources."node-uuid-1.2.0"
       sources."omelette-0.1.0"
       (sources."openssl-wrapper-0.2.1" // {
         dependencies = [
@@ -19220,7 +18917,7 @@ in
             dependencies = [
               (sources."async-2.1.4" // {
                 dependencies = [
-                  sources."lodash-4.17.2"
+                  sources."lodash-4.17.4"
                 ];
               })
             ];
@@ -19233,12 +18930,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -19257,7 +18954,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -19286,14 +18983,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -19304,9 +19001,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."node-uuid-1.4.7"
@@ -19341,12 +19038,13 @@ in
       sources."streamline-streams-0.1.5"
       (sources."sync-request-3.0.0" // {
         dependencies = [
-          (sources."concat-stream-1.5.2" // {
+          (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.0.6" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
+                  sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
@@ -19379,6 +19077,7 @@ in
           sources."os-homedir-1.0.2"
         ];
       })
+      sources."uuid-3.0.1"
       sources."validator-5.2.0"
       (sources."winston-2.1.1" // {
         dependencies = [
@@ -19399,7 +19098,7 @@ in
       sources."xmlbuilder-0.4.3"
       (sources."read-1.0.7" // {
         dependencies = [
-          sources."mute-stream-0.0.6"
+          sources."mute-stream-0.0.7"
         ];
       })
     ];
@@ -19524,7 +19223,7 @@ in
                           sources."array-find-index-1.0.2"
                         ];
                       })
-                      sources."signal-exit-3.0.1"
+                      sources."signal-exit-3.0.2"
                     ];
                   })
                   sources."map-obj-1.0.1"
@@ -19549,7 +19248,7 @@ in
                       })
                     ];
                   })
-                  sources."object-assign-4.1.0"
+                  sources."object-assign-4.1.1"
                   (sources."read-pkg-up-1.0.1" // {
                     dependencies = [
                       (sources."find-up-1.1.2" // {
@@ -19691,7 +19390,7 @@ in
       (sources."promised-temp-0.1.0" // {
         dependencies = [
           sources."q-1.4.1"
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -19748,19 +19447,19 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "13.1.1";
+    version = "13.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-13.1.1.tgz";
-      sha1 = "72a2310e2f706ed87db929cf0ee73a5e195d9bb0";
+      url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
+      sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
     };
     dependencies = [
-      (sources."JSONStream-1.2.1" // {
+      (sources."JSONStream-1.3.0" // {
         dependencies = [
-          sources."jsonparse-1.2.0"
+          sources."jsonparse-1.3.0"
           sources."through-2.3.8"
         ];
       })
-      sources."assert-1.3.0"
+      sources."assert-1.4.1"
       (sources."browser-pack-6.0.2" // {
         dependencies = [
           (sources."combine-source-map-0.7.2" // {
@@ -19774,7 +19473,11 @@ in
           sources."umd-3.0.1"
         ];
       })
-      sources."browser-resolve-1.11.2"
+      (sources."browser-resolve-1.11.2" // {
+        dependencies = [
+          sources."resolve-1.1.7"
+        ];
+      })
       (sources."browserify-zlib-0.1.4" // {
         dependencies = [
           sources."pako-0.2.9"
@@ -19842,7 +19545,7 @@ in
               })
               (sources."parse-asn1-5.0.0" // {
                 dependencies = [
-                  (sources."asn1.js-4.9.0" // {
+                  (sources."asn1.js-4.9.1" // {
                     dependencies = [
                       sources."minimalistic-assert-1.0.0"
                     ];
@@ -19894,7 +19597,7 @@ in
               sources."browserify-rsa-4.0.1"
               (sources."parse-asn1-5.0.0" // {
                 dependencies = [
-                  (sources."asn1.js-4.9.0" // {
+                  (sources."asn1.js-4.9.1" // {
                     dependencies = [
                       sources."minimalistic-assert-1.0.0"
                     ];
@@ -19918,8 +19621,9 @@ in
       sources."domain-browser-1.1.7"
       sources."duplexer2-0.1.4"
       sources."events-1.1.1"
-      (sources."glob-5.0.15" // {
+      (sources."glob-7.1.1" // {
         dependencies = [
+          sources."fs.realpath-1.0.0"
           (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
@@ -20009,7 +19713,7 @@ in
           sources."util-deprecate-1.0.2"
         ];
       })
-      sources."resolve-1.1.7"
+      sources."resolve-1.2.0"
       (sources."shasum-1.0.2" // {
         dependencies = [
           (sources."json-stable-stringify-0.0.1" // {
@@ -20029,9 +19733,9 @@ in
         ];
       })
       sources."stream-browserify-2.0.1"
-      (sources."stream-http-2.5.0" // {
+      (sources."stream-http-2.6.3" // {
         dependencies = [
-          sources."builtin-status-codes-2.0.0"
+          sources."builtin-status-codes-3.0.0"
           sources."to-arraybuffer-1.0.1"
         ];
       })
@@ -20046,18 +19750,7 @@ in
           sources."acorn-2.7.0"
         ];
       })
-      (sources."through2-2.0.1" // {
-        dependencies = [
-          (sources."readable-stream-2.0.6" // {
-            dependencies = [
-              sources."core-util-is-1.0.2"
-              sources."isarray-1.0.0"
-              sources."process-nextick-args-1.0.7"
-              sources."util-deprecate-1.0.2"
-            ];
-          })
-        ];
-      })
+      sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
       sources."tty-browserify-0.0.0"
       (sources."url-0.11.0" // {
@@ -20096,7 +19789,7 @@ in
     };
     dependencies = [
       sources."array-loop-1.0.0"
-      (sources."castv2-client-1.1.2" // {
+      (sources."castv2-client-1.2.0" // {
         dependencies = [
           (sources."castv2-0.1.9" // {
             dependencies = [
@@ -20165,7 +19858,7 @@ in
         ];
       })
       sources."debounced-seeker-1.0.0"
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -20193,7 +19886,7 @@ in
                       sources."array-find-index-1.0.2"
                     ];
                   })
-                  sources."signal-exit-3.0.1"
+                  sources."signal-exit-3.0.2"
                 ];
               })
               sources."map-obj-1.0.1"
@@ -20218,7 +19911,7 @@ in
                   })
                 ];
               })
-              sources."object-assign-4.1.0"
+              sources."object-assign-4.1.1"
               (sources."read-pkg-up-1.0.1" // {
                 dependencies = [
                   (sources."find-up-1.1.2" // {
@@ -20307,7 +20000,7 @@ in
         dependencies = [
           (sources."airplay-js-0.2.16" // {
             dependencies = [
-              (sources."mdns-js-0.5.1" // {
+              (sources."mdns-js-0.5.3" // {
                 dependencies = [
                   (sources."dns-js-0.2.1" // {
                     dependencies = [
@@ -20321,7 +20014,7 @@ in
                 dependencies = [
                   sources."base64-js-1.1.2"
                   sources."xmlbuilder-8.2.2"
-                  sources."xmldom-0.1.22"
+                  sources."xmldom-0.1.27"
                 ];
               })
             ];
@@ -20334,7 +20027,7 @@ in
               (sources."figures-1.7.0" // {
                 dependencies = [
                   sources."escape-string-regexp-1.0.5"
-                  sources."object-assign-4.1.0"
+                  sources."object-assign-4.1.1"
                 ];
               })
               sources."lodash-3.10.1"
@@ -20349,7 +20042,7 @@ in
             ];
           })
           sources."network-address-0.0.5"
-          sources."numeral-1.5.5"
+          sources."numeral-1.5.6"
           sources."open-0.0.5"
           (sources."optimist-0.6.1" // {
             dependencies = [
@@ -20367,18 +20060,18 @@ in
                   sources."uniq-1.0.1"
                 ];
               })
-              (sources."parse-torrent-file-4.0.0" // {
+              (sources."parse-torrent-file-4.0.1" // {
                 dependencies = [
-                  sources."bencode-0.10.0"
-                  (sources."simple-sha1-2.0.8" // {
+                  sources."bencode-0.11.0"
+                  (sources."simple-sha1-2.1.0" // {
                     dependencies = [
-                      sources."rusha-0.8.4"
+                      sources."rusha-0.8.5"
                     ];
                   })
                   sources."uniq-1.0.1"
                 ];
               })
-              (sources."simple-get-2.3.0" // {
+              (sources."simple-get-2.4.0" // {
                 dependencies = [
                   (sources."once-1.4.0" // {
                     dependencies = [
@@ -20433,7 +20126,7 @@ in
                       sources."minimist-0.0.8"
                     ];
                   })
-                  (sources."random-access-file-1.3.1" // {
+                  (sources."random-access-file-1.4.0" // {
                     dependencies = [
                       sources."inherits-2.0.3"
                     ];
@@ -20462,9 +20155,9 @@ in
                   (sources."parse-torrent-file-2.1.4" // {
                     dependencies = [
                       sources."bencode-0.7.0"
-                      (sources."simple-sha1-2.0.8" // {
+                      (sources."simple-sha1-2.1.0" // {
                         dependencies = [
-                          sources."rusha-0.8.4"
+                          sources."rusha-0.8.5"
                         ];
                       })
                     ];
@@ -20550,9 +20243,9 @@ in
                               sources."randombytes-2.0.3"
                             ];
                           })
-                          (sources."k-rpc-socket-1.6.0" // {
+                          (sources."k-rpc-socket-1.6.1" // {
                             dependencies = [
-                              sources."bencode-0.10.0"
+                              sources."bencode-0.11.0"
                             ];
                           })
                         ];
@@ -20577,13 +20270,13 @@ in
                       })
                       sources."random-iterate-1.0.1"
                       sources."run-series-1.1.4"
-                      (sources."simple-get-2.3.0" // {
+                      (sources."simple-get-2.4.0" // {
                         dependencies = [
                           sources."simple-concat-1.0.0"
                           sources."unzip-response-2.0.1"
                         ];
                       })
-                      (sources."simple-peer-6.0.7" // {
+                      (sources."simple-peer-6.2.1" // {
                         dependencies = [
                           sources."get-browser-rtc-1.0.2"
                           sources."randombytes-2.0.3"
@@ -20599,7 +20292,7 @@ in
                           })
                         ];
                       })
-                      (sources."simple-websocket-4.1.0" // {
+                      (sources."simple-websocket-4.2.0" // {
                         dependencies = [
                           (sources."readable-stream-2.2.2" // {
                             dependencies = [
@@ -20682,9 +20375,9 @@ in
               (sources."parse-torrent-file-2.1.4" // {
                 dependencies = [
                   sources."bencode-0.7.0"
-                  (sources."simple-sha1-2.0.8" // {
+                  (sources."simple-sha1-2.1.0" // {
                     dependencies = [
-                      sources."rusha-0.8.4"
+                      sources."rusha-0.8.5"
                     ];
                   })
                 ];
@@ -20730,12 +20423,13 @@ in
           (sources."codepage-1.4.0" // {
             dependencies = [
               sources."voc-0.5.0"
-              (sources."concat-stream-1.5.2" // {
+              (sources."concat-stream-1.6.0" // {
                 dependencies = [
                   sources."inherits-2.0.3"
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.0.6" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
+                      sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."process-nextick-args-1.0.7"
@@ -20745,7 +20439,7 @@ in
                   })
                 ];
               })
-              sources."exit-on-epipe-0.1.0"
+              sources."exit-on-epipe-1.0.0"
               (sources."commander-2.9.0" // {
                 dependencies = [
                   sources."graceful-readlink-1.0.1"
@@ -20762,7 +20456,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.17.2"
+              sources."lodash-4.17.4"
             ];
           })
         ];
@@ -20780,10 +20474,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.11.1";
+    version = "1.12.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
-      sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
+      sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -20842,7 +20536,7 @@ in
               })
             ];
           })
-          (sources."osenv-0.1.3" // {
+          (sources."osenv-0.1.4" // {
             dependencies = [
               sources."os-homedir-1.0.2"
               sources."os-tmpdir-1.0.2"
@@ -20856,7 +20550,7 @@ in
                   sources."lodash-3.10.1"
                 ];
               })
-              sources."xmldom-0.1.22"
+              sources."xmldom-0.1.27"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -20891,7 +20585,7 @@ in
               sources."dependency-ls-1.0.0"
               sources."is-url-1.2.2"
               sources."q-1.4.1"
-              (sources."shelljs-0.7.5" // {
+              (sources."shelljs-0.7.6" // {
                 dependencies = [
                   (sources."glob-7.1.1" // {
                     dependencies = [
@@ -20923,7 +20617,7 @@ in
                   sources."interpret-1.0.1"
                   (sources."rechoir-0.6.2" // {
                     dependencies = [
-                      sources."resolve-1.1.7"
+                      sources."resolve-1.2.0"
                     ];
                   })
                 ];
@@ -20939,9 +20633,9 @@ in
             dependencies = [
               (sources."browserify-13.1.0" // {
                 dependencies = [
-                  (sources."JSONStream-1.2.1" // {
+                  (sources."JSONStream-1.3.0" // {
                     dependencies = [
-                      sources."jsonparse-1.2.0"
+                      sources."jsonparse-1.3.0"
                       sources."through-2.3.8"
                     ];
                   })
@@ -20959,7 +20653,11 @@ in
                       sources."umd-3.0.1"
                     ];
                   })
-                  sources."browser-resolve-1.11.2"
+                  (sources."browser-resolve-1.11.2" // {
+                    dependencies = [
+                      sources."resolve-1.1.7"
+                    ];
+                  })
                   (sources."browserify-zlib-0.1.4" // {
                     dependencies = [
                       sources."pako-0.2.9"
@@ -21026,7 +20724,7 @@ in
                           })
                           (sources."parse-asn1-5.0.0" // {
                             dependencies = [
-                              (sources."asn1.js-4.9.0" // {
+                              (sources."asn1.js-4.9.1" // {
                                 dependencies = [
                                   sources."minimalistic-assert-1.0.0"
                                 ];
@@ -21078,7 +20776,7 @@ in
                           sources."browserify-rsa-4.0.1"
                           (sources."parse-asn1-5.0.0" // {
                             dependencies = [
-                              (sources."asn1.js-4.9.0" // {
+                              (sources."asn1.js-4.9.1" // {
                                 dependencies = [
                                   sources."minimalistic-assert-1.0.0"
                                 ];
@@ -21169,7 +20867,7 @@ in
                       sources."util-deprecate-1.0.2"
                     ];
                   })
-                  sources."resolve-1.1.7"
+                  sources."resolve-1.2.0"
                   (sources."shasum-1.0.2" // {
                     dependencies = [
                       (sources."json-stable-stringify-0.0.1" // {
@@ -21189,9 +20887,9 @@ in
                     ];
                   })
                   sources."stream-browserify-2.0.1"
-                  (sources."stream-http-2.5.0" // {
+                  (sources."stream-http-2.6.3" // {
                     dependencies = [
-                      sources."builtin-status-codes-2.0.0"
+                      sources."builtin-status-codes-3.0.0"
                       sources."to-arraybuffer-1.0.1"
                     ];
                   })
@@ -21206,18 +20904,7 @@ in
                       sources."acorn-2.7.0"
                     ];
                   })
-                  (sources."through2-2.0.1" // {
-                    dependencies = [
-                      (sources."readable-stream-2.0.6" // {
-                        dependencies = [
-                          sources."core-util-is-1.0.2"
-                          sources."isarray-1.0.0"
-                          sources."process-nextick-args-1.0.7"
-                          sources."util-deprecate-1.0.2"
-                        ];
-                      })
-                    ];
-                  })
+                  sources."through2-2.0.3"
                   sources."timers-browserify-1.4.2"
                   sources."tty-browserify-0.0.0"
                   (sources."url-0.11.0" // {
@@ -21242,7 +20929,7 @@ in
             ];
           })
           sources."cordova-registry-mapper-1.1.15"
-          (sources."cordova-serve-1.0.0" // {
+          (sources."cordova-serve-1.0.1" // {
             dependencies = [
               (sources."chalk-1.1.3" // {
                 dependencies = [
@@ -21250,12 +20937,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -21265,9 +20952,9 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -21276,7 +20963,7 @@ in
                   sources."bytes-2.3.0"
                   (sources."compressible-2.0.9" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   (sources."debug-2.2.0" // {
@@ -21292,9 +20979,9 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -21330,10 +21017,10 @@ in
                   })
                   sources."parseurl-1.3.1"
                   sources."path-to-regexp-0.1.7"
-                  (sources."proxy-addr-1.1.2" // {
+                  (sources."proxy-addr-1.1.3" // {
                     dependencies = [
                       sources."forwarded-0.1.0"
-                      sources."ipaddr.js-1.1.1"
+                      sources."ipaddr.js-1.2.0"
                     ];
                   })
                   sources."qs-6.2.0"
@@ -21356,9 +21043,9 @@ in
                   (sources."type-is-1.6.14" // {
                     dependencies = [
                       sources."media-typer-0.3.0"
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                     ];
@@ -21443,7 +21130,7 @@ in
               sources."promzard-0.3.0"
               (sources."read-1.0.7" // {
                 dependencies = [
-                  sources."mute-stream-0.0.6"
+                  sources."mute-stream-0.0.7"
                 ];
               })
               (sources."read-package-json-2.0.4" // {
@@ -21550,8 +21237,8 @@ in
               sources."inflight-1.0.6"
               sources."inherits-2.0.3"
               sources."ini-1.3.4"
-              sources."lockfile-1.0.2"
-              (sources."lru-cache-4.0.1" // {
+              sources."lockfile-1.0.3"
+              (sources."lru-cache-4.0.2" // {
                 dependencies = [
                   sources."pseudomap-1.0.2"
                   sources."yallist-2.0.0"
@@ -21578,7 +21265,7 @@ in
                     dependencies = [
                       (sources."array-index-1.0.0" // {
                         dependencies = [
-                          (sources."debug-2.3.3" // {
+                          (sources."debug-2.6.0" // {
                             dependencies = [
                               sources."ms-0.7.2"
                             ];
@@ -21614,11 +21301,12 @@ in
               sources."npm-package-arg-4.1.1"
               (sources."npm-registry-client-7.2.1" // {
                 dependencies = [
-                  (sources."concat-stream-1.5.2" // {
+                  (sources."concat-stream-1.6.0" // {
                     dependencies = [
                       sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.0.6" // {
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
+                          sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
                           sources."isarray-1.0.0"
                           sources."process-nextick-args-1.0.7"
@@ -21649,7 +21337,7 @@ in
                 ];
               })
               sources."once-1.4.0"
-              (sources."osenv-0.1.3" // {
+              (sources."osenv-0.1.4" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                   sources."os-tmpdir-1.0.2"
@@ -21658,7 +21346,7 @@ in
               sources."path-is-inside-1.0.2"
               (sources."read-1.0.7" // {
                 dependencies = [
-                  sources."mute-stream-0.0.6"
+                  sources."mute-stream-0.0.7"
                 ];
               })
               (sources."read-installed-4.0.3" // {
@@ -21722,7 +21410,7 @@ in
                     dependencies = [
                       (sources."async-2.1.4" // {
                         dependencies = [
-                          sources."lodash-4.17.2"
+                          sources."lodash-4.17.4"
                         ];
                       })
                     ];
@@ -21750,7 +21438,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-4.0.0"
+                          sources."jsonpointer-4.0.1"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -21779,14 +21467,14 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.10.1" // {
+                      (sources."sshpk-1.10.2" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.0"
+                          sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
                           sources."jsbn-0.1.0"
-                          sources."tweetnacl-0.14.3"
+                          sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.0"
@@ -21797,9 +21485,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   sources."node-uuid-1.4.7"
@@ -21814,7 +21502,7 @@ in
                   sources."tunnel-agent-0.4.3"
                 ];
               })
-              sources."retry-0.10.0"
+              sources."retry-0.10.1"
               sources."rimraf-2.5.4"
               sources."semver-5.1.1"
               sources."sha-2.0.1"
@@ -21844,7 +21532,7 @@ in
               })
               sources."wrappy-1.0.2"
               sources."write-file-atomic-1.1.4"
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
               sources."imurmurhash-0.1.4"
             ];
           })
@@ -21857,7 +21545,7 @@ in
                   sources."lodash-3.10.1"
                 ];
               })
-              sources."xmldom-0.1.22"
+              sources."xmldom-0.1.27"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -21987,7 +21675,7 @@ in
           })
         ];
       })
-      (sources."insight-0.8.3" // {
+      (sources."insight-0.8.4" // {
         dependencies = [
           sources."async-1.5.2"
           (sources."chalk-1.1.3" // {
@@ -21996,12 +21684,12 @@ in
               sources."escape-string-regexp-1.0.5"
               (sources."has-ansi-2.0.0" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               sources."supports-color-2.0.0"
@@ -22016,13 +21704,13 @@ in
                 ];
               })
               sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.3" // {
+              (sources."osenv-0.1.4" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                 ];
               })
               sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.2.0" // {
+              (sources."write-file-atomic-1.3.1" // {
                 dependencies = [
                   sources."imurmurhash-0.1.4"
                   sources."slide-1.1.6"
@@ -22038,7 +21726,7 @@ in
           (sources."inquirer-0.10.1" // {
             dependencies = [
               sources."ansi-escapes-1.4.0"
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
               (sources."cli-cursor-1.0.2" // {
                 dependencies = [
                   (sources."restore-cursor-1.0.1" // {
@@ -22086,8 +21774,7 @@ in
               sources."lodash._getnative-3.9.1"
             ];
           })
-          sources."node-uuid-1.4.7"
-          sources."object-assign-4.1.0"
+          sources."object-assign-4.1.1"
           (sources."os-name-1.0.3" // {
             dependencies = [
               (sources."osx-release-1.1.0" // {
@@ -22134,7 +21821,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -22163,14 +21850,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -22181,16 +21868,15 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
               sources."qs-6.3.0"
               sources."stringstream-0.0.5"
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.0"
             ];
           })
           (sources."tough-cookie-2.3.2" // {
@@ -22198,6 +21884,7 @@ in
               sources."punycode-1.4.1"
             ];
           })
+          sources."uuid-3.0.1"
         ];
       })
       (sources."nopt-3.0.1" // {
@@ -22215,12 +21902,12 @@ in
               sources."escape-string-regexp-1.0.5"
               (sources."has-ansi-2.0.0" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               sources."supports-color-2.0.0"
@@ -22234,15 +21921,15 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              sources."object-assign-4.1.0"
+              sources."object-assign-4.1.1"
               sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.3" // {
+              (sources."osenv-0.1.4" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                 ];
               })
               sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.2.0" // {
+              (sources."write-file-atomic-1.3.1" // {
                 dependencies = [
                   sources."imurmurhash-0.1.4"
                   sources."slide-1.1.6"
@@ -22355,7 +22042,7 @@ in
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
             ];
@@ -22373,14 +22060,14 @@ in
   csslint = nodeEnv.buildNodePackage {
     name = "csslint";
     packageName = "csslint";
-    version = "1.0.4";
+    version = "1.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.4.tgz";
-      sha1 = "0d3907933cc3f04b56960496d573387fbe9bb1e7";
+      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz";
+      sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9";
     };
     dependencies = [
-      sources."clone-1.0.2"
-      sources."parserlib-1.0.0"
+      sources."clone-2.1.0"
+      sources."parserlib-1.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22416,9 +22103,9 @@ in
         dependencies = [
           (sources."accepts-1.2.13" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."negotiator-0.5.3"
@@ -22483,7 +22170,7 @@ in
       (sources."hiredis-0.4.1" // {
         dependencies = [
           sources."bindings-1.2.1"
-          sources."nan-2.4.0"
+          sources."nan-2.5.0"
         ];
       })
       (sources."json-rpc2-0.8.1" // {
@@ -22602,7 +22289,7 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -22824,12 +22511,29 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."ndjson-1.4.3" // {
+      (sources."ndjson-1.5.0" // {
         dependencies = [
+          sources."json-stringify-safe-5.0.1"
           sources."minimist-1.2.0"
+          sources."split2-2.1.1"
+          (sources."through2-2.0.3" // {
+            dependencies = [
+              (sources."readable-stream-2.2.2" // {
+                dependencies = [
+                  sources."buffer-shims-1.0.0"
+                  sources."core-util-is-1.0.2"
+                  sources."isarray-1.0.0"
+                  sources."inherits-2.0.3"
+                  sources."process-nextick-args-1.0.7"
+                  sources."string_decoder-0.10.31"
+                  sources."util-deprecate-1.0.2"
+                ];
+              })
+            ];
+          })
         ];
       })
-      (sources."pump-1.0.1" // {
+      (sources."pump-1.0.2" // {
         dependencies = [
           (sources."once-1.4.0" // {
             dependencies = [
@@ -22899,20 +22603,7 @@ in
       })
       (sources."tar-stream-1.5.2" // {
         dependencies = [
-          (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."bl-1.2.0"
           (sources."readable-stream-2.2.2" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
@@ -22952,24 +22643,25 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "2.4.2";
+    version = "3.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-2.4.2.tgz";
-      sha1 = "757c98aea05ee8714f0de2a33224c4136414633e";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.0.2.tgz";
+      sha1 = "0f010dbd6e26db0270abd88e3e5403062eb4f7a4";
     };
     dependencies = [
-      (sources."JSONStream-1.1.4" // {
+      (sources."JSONStream-1.3.0" // {
         dependencies = [
-          sources."jsonparse-1.2.0"
+          sources."jsonparse-1.3.0"
           sources."through-2.3.8"
         ];
       })
-      (sources."async-2.0.1" // {
+      (sources."async-2.1.4" // {
         dependencies = [
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
         ];
       })
       sources."aws4-1.5.0"
+      sources."awscred-1.2.0"
       (sources."optimist-0.6.1" // {
         dependencies = [
           sources."wordwrap-0.0.3"
@@ -23000,12 +22692,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -23024,7 +22716,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -23053,14 +22745,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -23071,9 +22763,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -23085,7 +22777,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.0"
+          sources."uuid-3.0.1"
         ];
       })
     ];
@@ -23100,10 +22792,10 @@ in
   emoj = nodeEnv.buildNodePackage {
     name = "emoj";
     packageName = "emoj";
-    version = "0.3.0";
+    version = "1.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz";
-      sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c";
+      url = "https://registry.npmjs.org/emoj/-/emoj-1.0.0.tgz";
+      sha1 = "3cccbeec420e2b45f73b923e880c220392c055bd";
     };
     dependencies = [
       (sources."chalk-1.1.3" // {
@@ -23112,13 +22804,55 @@ in
           sources."escape-string-regexp-1.0.5"
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."got-6.6.3" // {
+      (sources."clipboardy-0.1.2" // {
+        dependencies = [
+          (sources."execa-0.5.1" // {
+            dependencies = [
+              (sources."cross-spawn-4.0.2" // {
+                dependencies = [
+                  (sources."lru-cache-4.0.2" // {
+                    dependencies = [
+                      sources."pseudomap-1.0.2"
+                      sources."yallist-2.0.0"
+                    ];
+                  })
+                  (sources."which-1.2.12" // {
+                    dependencies = [
+                      sources."isexe-1.1.2"
+                    ];
+                  })
+                ];
+              })
+              (sources."get-stream-2.3.1" // {
+                dependencies = [
+                  sources."object-assign-4.1.1"
+                  (sources."pinkie-promise-2.0.1" // {
+                    dependencies = [
+                      sources."pinkie-2.0.4"
+                    ];
+                  })
+                ];
+              })
+              sources."is-stream-1.1.0"
+              (sources."npm-run-path-2.0.2" // {
+                dependencies = [
+                  sources."path-key-2.0.1"
+                ];
+              })
+              sources."p-finally-1.0.0"
+              sources."signal-exit-3.0.2"
+              sources."strip-eof-1.0.0"
+            ];
+          })
+        ];
+      })
+      (sources."got-6.7.1" // {
         dependencies = [
           (sources."create-error-class-3.0.2" // {
             dependencies = [
@@ -23126,22 +22860,13 @@ in
             ];
           })
           sources."duplexer3-0.1.4"
-          (sources."get-stream-2.3.1" // {
-            dependencies = [
-              sources."object-assign-4.1.0"
-              (sources."pinkie-promise-2.0.1" // {
-                dependencies = [
-                  sources."pinkie-2.0.4"
-                ];
-              })
-            ];
-          })
+          sources."get-stream-3.0.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."node-status-codes-2.0.1"
-          sources."timed-out-3.0.0"
+          sources."safe-buffer-5.0.1"
+          sources."timed-out-4.0.1"
           sources."unzip-response-2.0.1"
           (sources."url-parse-lax-1.0.0" // {
             dependencies = [
@@ -23152,7 +22877,7 @@ in
       })
       (sources."has-ansi-2.0.0" // {
         dependencies = [
-          sources."ansi-regex-2.0.0"
+          sources."ansi-regex-2.1.1"
         ];
       })
       sources."lodash.debounce-4.0.8"
@@ -23171,7 +22896,11 @@ in
           })
         ];
       })
-      sources."mem-0.1.1"
+      (sources."mem-1.1.0" // {
+        dependencies = [
+          sources."mimic-fn-1.1.0"
+        ];
+      })
       (sources."meow-3.7.0" // {
         dependencies = [
           (sources."camelcase-keys-2.1.0" // {
@@ -23187,7 +22916,7 @@ in
                   sources."array-find-index-1.0.2"
                 ];
               })
-              sources."signal-exit-3.0.1"
+              sources."signal-exit-3.0.2"
             ];
           })
           sources."map-obj-1.0.1"
@@ -23213,7 +22942,7 @@ in
               })
             ];
           })
-          sources."object-assign-4.1.0"
+          sources."object-assign-4.1.1"
           (sources."read-pkg-up-1.0.1" // {
             dependencies = [
               (sources."find-up-1.1.2" // {
@@ -23305,15 +23034,15 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.10.2";
+    version = "3.13.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz";
-      sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz";
+      sha1 = "564d2646b5efded85df96985332edd91a23bff25";
     };
     dependencies = [
-      (sources."babel-code-frame-6.16.0" // {
+      (sources."babel-code-frame-6.22.0" // {
         dependencies = [
-          sources."js-tokens-2.0.0"
+          sources."js-tokens-3.0.0"
         ];
       })
       (sources."chalk-1.1.3" // {
@@ -23322,23 +23051,24 @@ in
           sources."escape-string-regexp-1.0.5"
           (sources."has-ansi-2.0.0" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."concat-stream-1.5.2" // {
+      (sources."concat-stream-1.6.0" // {
         dependencies = [
           sources."inherits-2.0.3"
           sources."typedarray-0.0.6"
-          (sources."readable-stream-2.0.6" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
+              sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
               sources."isarray-1.0.0"
               sources."process-nextick-args-1.0.7"
@@ -23348,7 +23078,7 @@ in
           })
         ];
       })
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -23381,14 +23111,14 @@ in
           (sources."esrecurse-4.1.0" // {
             dependencies = [
               sources."estraverse-4.1.1"
-              sources."object-assign-4.1.0"
+              sources."object-assign-4.1.1"
             ];
           })
         ];
       })
       (sources."espree-3.3.2" // {
         dependencies = [
-          sources."acorn-4.0.3"
+          sources."acorn-4.0.4"
           (sources."acorn-jsx-3.0.1" // {
             dependencies = [
               sources."acorn-3.3.0"
@@ -23400,7 +23130,7 @@ in
       sources."esutils-2.0.2"
       (sources."file-entry-cache-2.0.0" // {
         dependencies = [
-          (sources."flat-cache-1.2.1" // {
+          (sources."flat-cache-1.2.2" // {
             dependencies = [
               sources."circular-json-0.3.1"
               (sources."del-2.2.2" // {
@@ -23434,7 +23164,7 @@ in
               sources."write-0.2.1"
             ];
           })
-          sources."object-assign-4.1.0"
+          sources."object-assign-4.1.1"
         ];
       })
       (sources."glob-7.1.1" // {
@@ -23470,7 +23200,7 @@ in
       (sources."inquirer-0.12.0" // {
         dependencies = [
           sources."ansi-escapes-1.4.0"
-          sources."ansi-regex-2.0.0"
+          sources."ansi-regex-2.1.1"
           (sources."cli-cursor-1.0.2" // {
             dependencies = [
               (sources."restore-cursor-1.0.1" // {
@@ -23485,7 +23215,7 @@ in
           (sources."figures-1.7.0" // {
             dependencies = [
               sources."escape-string-regexp-1.0.5"
-              sources."object-assign-4.1.0"
+              sources."object-assign-4.1.1"
             ];
           })
           (sources."readline2-1.0.1" // {
@@ -23531,7 +23261,7 @@ in
               sources."is-property-1.0.2"
             ];
           })
-          sources."jsonpointer-4.0.0"
+          sources."jsonpointer-4.0.1"
           sources."xtend-4.0.1"
         ];
       })
@@ -23561,7 +23291,7 @@ in
           sources."type-check-0.3.2"
         ];
       })
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -23574,7 +23304,7 @@ in
           sources."deep-is-0.1.3"
           sources."wordwrap-1.0.0"
           sources."type-check-0.3.2"
-          sources."fast-levenshtein-2.0.5"
+          sources."fast-levenshtein-2.0.6"
         ];
       })
       sources."path-is-inside-1.0.2"
@@ -23590,33 +23320,33 @@ in
           sources."resolve-from-1.0.1"
         ];
       })
-      (sources."shelljs-0.7.5" // {
+      (sources."shelljs-0.7.6" // {
         dependencies = [
           sources."interpret-1.0.1"
           (sources."rechoir-0.6.2" // {
             dependencies = [
-              sources."resolve-1.1.7"
+              sources."resolve-1.2.0"
             ];
           })
         ];
       })
       sources."strip-bom-3.0.0"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       (sources."table-3.8.3" // {
         dependencies = [
-          (sources."ajv-4.9.0" // {
+          (sources."ajv-4.10.4" // {
             dependencies = [
               sources."co-4.6.0"
             ];
           })
-          sources."ajv-keywords-1.1.1"
+          sources."ajv-keywords-1.5.0"
           sources."slice-ansi-0.0.4"
           (sources."string-width-2.0.0" // {
             dependencies = [
               sources."is-fullwidth-code-point-2.0.0"
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
             ];
@@ -23641,10 +23371,10 @@ in
   emojione = nodeEnv.buildNodePackage {
     name = "emojione";
     packageName = "emojione";
-    version = "2.2.6";
+    version = "2.2.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-2.2.6.tgz";
-      sha1 = "67dec452937d5b14ee669207ea41cdb1f69fb8f6";
+      url = "https://registry.npmjs.org/emojione/-/emojione-2.2.7.tgz";
+      sha1 = "46457cf6b9b2f8da13ae8a2e4e547de06ee15e96";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -23733,7 +23463,7 @@ in
               sources."pkginfo-0.4.0"
               (sources."read-1.0.7" // {
                 dependencies = [
-                  sources."mute-stream-0.0.6"
+                  sources."mute-stream-0.0.7"
                 ];
               })
               sources."revalidator-0.1.8"
@@ -23788,7 +23518,7 @@ in
                                       sources."isarray-1.0.0"
                                     ];
                                   })
-                                  sources."randomatic-1.1.5"
+                                  sources."randomatic-1.1.6"
                                   sources."repeat-string-1.6.1"
                                 ];
                               })
@@ -23806,7 +23536,7 @@ in
                       sources."extglob-0.3.2"
                       sources."filename-regex-2.0.0"
                       sources."is-extglob-1.0.0"
-                      (sources."kind-of-3.0.4" // {
+                      (sources."kind-of-3.1.0" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -23843,7 +23573,7 @@ in
               sources."inherits-2.0.3"
               (sources."is-binary-path-1.0.1" // {
                 dependencies = [
-                  sources."binary-extensions-1.7.0"
+                  sources."binary-extensions-1.8.0"
                 ];
               })
               (sources."is-glob-2.0.1" // {
@@ -23867,10 +23597,10 @@ in
                   sources."set-immediate-shim-1.0.1"
                 ];
               })
-              (sources."fsevents-1.0.15" // {
+              (sources."fsevents-1.0.17" // {
                 dependencies = [
-                  sources."nan-2.4.0"
-                  (sources."node-pre-gyp-0.6.31" // {
+                  sources."nan-2.5.0"
+                  (sources."node-pre-gyp-0.6.32" // {
                     dependencies = [
                       (sources."mkdirp-0.5.1" // {
                         dependencies = [
@@ -23882,7 +23612,7 @@ in
                           sources."abbrev-1.0.9"
                         ];
                       })
-                      (sources."npmlog-4.0.1" // {
+                      (sources."npmlog-4.0.2" // {
                         dependencies = [
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
@@ -23900,13 +23630,13 @@ in
                             ];
                           })
                           sources."console-control-strings-1.1.0"
-                          (sources."gauge-2.7.1" // {
+                          (sources."gauge-2.7.2" // {
                             dependencies = [
                               sources."aproba-1.0.4"
-                              sources."has-color-0.1.7"
+                              sources."supports-color-0.2.0"
                               sources."has-unicode-2.0.1"
-                              sources."object-assign-4.1.0"
-                              sources."signal-exit-3.0.1"
+                              sources."object-assign-4.1.1"
+                              sources."signal-exit-3.0.2"
                               (sources."string-width-1.0.2" // {
                                 dependencies = [
                                   sources."code-point-at-1.1.0"
@@ -23919,7 +23649,7 @@ in
                               })
                               (sources."strip-ansi-3.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.0.0"
+                                  sources."ansi-regex-2.1.1"
                                 ];
                               })
                               sources."wide-align-1.1.0"
@@ -23961,12 +23691,12 @@ in
                                   sources."escape-string-regexp-1.0.5"
                                   (sources."has-ansi-2.0.0" // {
                                     dependencies = [
-                                      sources."ansi-regex-2.0.0"
+                                      sources."ansi-regex-2.1.1"
                                     ];
                                   })
                                   (sources."strip-ansi-3.0.1" // {
                                     dependencies = [
-                                      sources."ansi-regex-2.0.0"
+                                      sources."ansi-regex-2.1.1"
                                     ];
                                   })
                                   sources."supports-color-2.0.0"
@@ -23985,7 +23715,7 @@ in
                                       sources."is-property-1.0.2"
                                     ];
                                   })
-                                  sources."jsonpointer-4.0.0"
+                                  sources."jsonpointer-4.0.1"
                                   sources."xtend-4.0.1"
                                 ];
                               })
@@ -24014,14 +23744,14 @@ in
                                   sources."verror-1.3.6"
                                 ];
                               })
-                              (sources."sshpk-1.10.1" // {
+                              (sources."sshpk-1.10.2" // {
                                 dependencies = [
                                   sources."asn1-0.2.3"
                                   sources."assert-plus-1.0.0"
-                                  sources."dashdash-1.14.0"
+                                  sources."dashdash-1.14.1"
                                   sources."getpass-0.1.6"
                                   sources."jsbn-0.1.0"
-                                  sources."tweetnacl-0.14.3"
+                                  sources."tweetnacl-0.14.5"
                                   sources."jodid25519-1.0.2"
                                   sources."ecc-jsbn-0.1.1"
                                   sources."bcrypt-pbkdf-1.0.0"
@@ -24032,9 +23762,9 @@ in
                           sources."is-typedarray-1.0.0"
                           sources."isstream-0.1.2"
                           sources."json-stringify-safe-5.0.1"
-                          (sources."mime-types-2.1.13" // {
+                          (sources."mime-types-2.1.14" // {
                             dependencies = [
-                              sources."mime-db-1.25.0"
+                              sources."mime-db-1.26.0"
                             ];
                           })
                           sources."oauth-sign-0.8.2"
@@ -24046,7 +23776,7 @@ in
                             ];
                           })
                           sources."tunnel-agent-0.4.3"
-                          sources."uuid-3.0.0"
+                          sources."uuid-3.0.1"
                         ];
                       })
                       (sources."rimraf-2.5.4" // {
@@ -24167,7 +23897,7 @@ in
         ];
       })
       sources."path-is-absolute-1.0.1"
-      (sources."prettyjson-1.2.0" // {
+      (sources."prettyjson-1.2.1" // {
         dependencies = [
           sources."colors-1.1.2"
           sources."minimist-1.2.0"
@@ -24258,10 +23988,10 @@ in
   git-run = nodeEnv.buildNodePackage {
     name = "git-run";
     packageName = "git-run";
-    version = "0.5.2";
+    version = "0.5.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.2.tgz";
-      sha1 = "1edbc7163389067dd9f2c46ab3acff07889f8333";
+      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.3.tgz";
+      sha1 = "92005049d5514753d53c4f90fd6f2b2b29a8e08c";
     };
     dependencies = [
       (sources."minilog-2.0.8" // {
@@ -24344,11 +24074,11 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.11.1"
+      sources."coffee-script-1.12.2"
       (sources."jade-1.11.0" // {
         dependencies = [
           sources."character-parser-1.2.1"
-          (sources."clean-css-3.4.21" // {
+          (sources."clean-css-3.4.24" // {
             dependencies = [
               (sources."commander-2.8.1" // {
                 dependencies = [
@@ -24412,7 +24142,7 @@ in
               })
             ];
           })
-          (sources."uglify-js-2.7.4" // {
+          (sources."uglify-js-2.7.5" // {
             dependencies = [
               sources."async-0.2.10"
               sources."source-map-0.5.6"
@@ -24426,7 +24156,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.0.4" // {
+                              (sources."kind-of-3.1.0" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -24442,7 +24172,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.0.4" // {
+                              (sources."kind-of-3.1.0" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -24487,14 +24217,14 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.17.2"
+              sources."lodash-4.17.4"
             ];
           })
         ];
       })
       (sources."msgpack-1.0.2" // {
         dependencies = [
-          sources."nan-2.4.0"
+          sources."nan-2.5.0"
         ];
       })
     ];
@@ -24521,144 +24251,25 @@ in
           sources."escape-string-regexp-1.0.5"
           (sources."has-ansi-2.0.0" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           sources."supports-color-2.0.0"
         ];
       })
       sources."deprecated-0.0.1"
-      (sources."gulp-util-3.0.7" // {
+      (sources."gulp-util-3.0.8" // {
         dependencies = [
           sources."array-differ-1.0.0"
           sources."array-uniq-1.0.3"
           sources."beeper-1.1.1"
-          (sources."dateformat-1.0.12" // {
-            dependencies = [
-              sources."get-stdin-4.0.1"
-              (sources."meow-3.7.0" // {
-                dependencies = [
-                  (sources."camelcase-keys-2.1.0" // {
-                    dependencies = [
-                      sources."camelcase-2.1.1"
-                    ];
-                  })
-                  sources."decamelize-1.2.0"
-                  (sources."loud-rejection-1.6.0" // {
-                    dependencies = [
-                      (sources."currently-unhandled-0.4.1" // {
-                        dependencies = [
-                          sources."array-find-index-1.0.2"
-                        ];
-                      })
-                      sources."signal-exit-3.0.1"
-                    ];
-                  })
-                  sources."map-obj-1.0.1"
-                  (sources."normalize-package-data-2.3.5" // {
-                    dependencies = [
-                      sources."hosted-git-info-2.1.5"
-                      (sources."is-builtin-module-1.0.0" // {
-                        dependencies = [
-                          sources."builtin-modules-1.1.1"
-                        ];
-                      })
-                      (sources."validate-npm-package-license-3.0.1" // {
-                        dependencies = [
-                          (sources."spdx-correct-1.0.2" // {
-                            dependencies = [
-                              sources."spdx-license-ids-1.2.2"
-                            ];
-                          })
-                          sources."spdx-expression-parse-1.0.4"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."object-assign-4.1.0"
-                  (sources."read-pkg-up-1.0.1" // {
-                    dependencies = [
-                      (sources."find-up-1.1.2" // {
-                        dependencies = [
-                          sources."path-exists-2.1.0"
-                          (sources."pinkie-promise-2.0.1" // {
-                            dependencies = [
-                              sources."pinkie-2.0.4"
-                            ];
-                          })
-                        ];
-                      })
-                      (sources."read-pkg-1.1.0" // {
-                        dependencies = [
-                          (sources."load-json-file-1.1.0" // {
-                            dependencies = [
-                              sources."graceful-fs-4.1.11"
-                              (sources."parse-json-2.2.0" // {
-                                dependencies = [
-                                  (sources."error-ex-1.3.0" // {
-                                    dependencies = [
-                                      sources."is-arrayish-0.2.1"
-                                    ];
-                                  })
-                                ];
-                              })
-                              sources."pify-2.3.0"
-                              (sources."pinkie-promise-2.0.1" // {
-                                dependencies = [
-                                  sources."pinkie-2.0.4"
-                                ];
-                              })
-                              (sources."strip-bom-2.0.0" // {
-                                dependencies = [
-                                  sources."is-utf8-0.2.1"
-                                ];
-                              })
-                            ];
-                          })
-                          (sources."path-type-1.1.0" // {
-                            dependencies = [
-                              sources."graceful-fs-4.1.11"
-                              sources."pify-2.3.0"
-                              (sources."pinkie-promise-2.0.1" // {
-                                dependencies = [
-                                  sources."pinkie-2.0.4"
-                                ];
-                              })
-                            ];
-                          })
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."redent-1.0.0" // {
-                    dependencies = [
-                      (sources."indent-string-2.1.0" // {
-                        dependencies = [
-                          (sources."repeating-2.0.1" // {
-                            dependencies = [
-                              (sources."is-finite-1.0.2" // {
-                                dependencies = [
-                                  sources."number-is-nan-1.0.1"
-                                ];
-                              })
-                            ];
-                          })
-                        ];
-                      })
-                      sources."strip-indent-1.0.1"
-                    ];
-                  })
-                  sources."trim-newlines-1.0.0"
-                ];
-              })
-            ];
-          })
-          (sources."fancy-log-1.2.0" // {
+          sources."dateformat-2.0.0"
+          (sources."fancy-log-1.3.0" // {
             dependencies = [
               sources."time-stamp-1.0.1"
             ];
@@ -24720,13 +24331,14 @@ in
           })
           sources."object-assign-3.0.0"
           sources."replace-ext-0.0.1"
-          (sources."through2-2.0.1" // {
+          (sources."through2-2.0.3" // {
             dependencies = [
-              (sources."readable-stream-2.0.6" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
+                  sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
-                  sources."inherits-2.0.3"
                   sources."isarray-1.0.0"
+                  sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
                   sources."string_decoder-0.10.31"
                   sources."util-deprecate-1.0.2"
@@ -24779,7 +24391,7 @@ in
                                   sources."isarray-1.0.0"
                                 ];
                               })
-                              sources."randomatic-1.1.5"
+                              sources."randomatic-1.1.6"
                               sources."repeat-string-1.6.1"
                             ];
                           })
@@ -24797,7 +24409,7 @@ in
                   sources."extglob-0.3.2"
                   sources."filename-regex-2.0.0"
                   sources."is-extglob-1.0.0"
-                  (sources."kind-of-3.0.4" // {
+                  (sources."kind-of-3.1.0" // {
                     dependencies = [
                       sources."is-buffer-1.1.4"
                     ];
@@ -24840,15 +24452,14 @@ in
                   })
                   (sources."global-modules-0.2.3" // {
                     dependencies = [
-                      (sources."global-prefix-0.1.4" // {
+                      (sources."global-prefix-0.1.5" // {
                         dependencies = [
-                          sources."ini-1.3.4"
-                          (sources."osenv-0.1.3" // {
+                          (sources."homedir-polyfill-1.0.1" // {
                             dependencies = [
-                              sources."os-homedir-1.0.2"
-                              sources."os-tmpdir-1.0.2"
+                              sources."parse-passwd-1.0.0"
                             ];
                           })
+                          sources."ini-1.3.4"
                           (sources."which-1.2.12" // {
                             dependencies = [
                               sources."isexe-1.1.2"
@@ -24879,7 +24490,7 @@ in
                     dependencies = [
                       (sources."is-relative-0.2.1" // {
                         dependencies = [
-                          (sources."is-unc-path-0.1.1" // {
+                          (sources."is-unc-path-0.1.2" // {
                             dependencies = [
                               sources."unc-path-regex-0.1.2"
                             ];
@@ -24904,7 +24515,7 @@ in
           sources."lodash.isstring-4.0.1"
           sources."lodash.mapvalues-4.6.0"
           sources."rechoir-0.6.2"
-          sources."resolve-1.1.7"
+          sources."resolve-1.2.0"
         ];
       })
       sources."minimist-1.2.0"
@@ -25224,7 +24835,7 @@ in
               sources."deep-is-0.1.3"
               sources."type-check-0.3.2"
               sources."levn-0.3.0"
-              sources."fast-levenshtein-2.0.5"
+              sources."fast-levenshtein-2.0.6"
             ];
           })
           (sources."source-map-0.2.0" // {
@@ -25269,7 +24880,7 @@ in
               sources."amdefine-1.0.1"
             ];
           })
-          (sources."uglify-js-2.7.4" // {
+          (sources."uglify-js-2.7.5" // {
             dependencies = [
               sources."async-0.2.10"
               sources."source-map-0.5.6"
@@ -25283,7 +24894,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.0.4" // {
+                              (sources."kind-of-3.1.0" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -25299,7 +24910,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.0.4" // {
+                              (sources."kind-of-3.1.0" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -25342,7 +24953,7 @@ in
         ];
       })
       sources."resolve-1.1.7"
-      (sources."supports-color-3.1.2" // {
+      (sources."supports-color-3.2.3" // {
         dependencies = [
           sources."has-flag-1.0.0"
         ];
@@ -25521,20 +25132,20 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.3.0";
+    version = "1.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz";
-      sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f";
+      url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz";
+      sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b";
     };
     dependencies = [
-      sources."bluebird-3.4.6"
-      (sources."body-parser-1.15.2" // {
+      sources."bluebird-3.4.7"
+      (sources."body-parser-1.16.0" // {
         dependencies = [
           sources."bytes-2.4.0"
           sources."content-type-1.0.2"
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
           sources."depd-1.1.0"
@@ -25545,14 +25156,14 @@ in
               sources."statuses-1.3.1"
             ];
           })
-          sources."iconv-lite-0.4.13"
+          sources."iconv-lite-0.4.15"
           (sources."on-finished-2.3.0" // {
             dependencies = [
               sources."ee-first-1.1.1"
             ];
           })
-          sources."qs-6.2.0"
-          (sources."raw-body-2.1.7" // {
+          sources."qs-6.2.1"
+          (sources."raw-body-2.2.0" // {
             dependencies = [
               sources."unpipe-1.0.0"
             ];
@@ -25560,9 +25171,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -25594,7 +25205,7 @@ in
                                   sources."isarray-1.0.0"
                                 ];
                               })
-                              sources."randomatic-1.1.5"
+                              sources."randomatic-1.1.6"
                               sources."repeat-string-1.6.1"
                             ];
                           })
@@ -25612,7 +25223,7 @@ in
                   sources."extglob-0.3.2"
                   sources."filename-regex-2.0.0"
                   sources."is-extglob-1.0.0"
-                  (sources."kind-of-3.0.4" // {
+                  (sources."kind-of-3.1.0" // {
                     dependencies = [
                       sources."is-buffer-1.1.4"
                     ];
@@ -25649,7 +25260,7 @@ in
           sources."inherits-2.0.3"
           (sources."is-binary-path-1.0.1" // {
             dependencies = [
-              sources."binary-extensions-1.7.0"
+              sources."binary-extensions-1.8.0"
             ];
           })
           (sources."is-glob-2.0.1" // {
@@ -25673,10 +25284,10 @@ in
               sources."set-immediate-shim-1.0.1"
             ];
           })
-          (sources."fsevents-1.0.15" // {
+          (sources."fsevents-1.0.17" // {
             dependencies = [
-              sources."nan-2.4.0"
-              (sources."node-pre-gyp-0.6.31" // {
+              sources."nan-2.5.0"
+              (sources."node-pre-gyp-0.6.32" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
@@ -25688,7 +25299,7 @@ in
                       sources."abbrev-1.0.9"
                     ];
                   })
-                  (sources."npmlog-4.0.1" // {
+                  (sources."npmlog-4.0.2" // {
                     dependencies = [
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
@@ -25706,13 +25317,13 @@ in
                         ];
                       })
                       sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.7.1" // {
+                      (sources."gauge-2.7.2" // {
                         dependencies = [
                           sources."aproba-1.0.4"
-                          sources."has-color-0.1.7"
+                          sources."supports-color-0.2.0"
                           sources."has-unicode-2.0.1"
-                          sources."object-assign-4.1.0"
-                          sources."signal-exit-3.0.1"
+                          sources."object-assign-4.1.1"
+                          sources."signal-exit-3.0.2"
                           (sources."string-width-1.0.2" // {
                             dependencies = [
                               sources."code-point-at-1.1.0"
@@ -25725,7 +25336,7 @@ in
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           sources."wide-align-1.1.0"
@@ -25767,12 +25378,12 @@ in
                               sources."escape-string-regexp-1.0.5"
                               (sources."has-ansi-2.0.0" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.0.0"
+                                  sources."ansi-regex-2.1.1"
                                 ];
                               })
                               (sources."strip-ansi-3.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.0.0"
+                                  sources."ansi-regex-2.1.1"
                                 ];
                               })
                               sources."supports-color-2.0.0"
@@ -25791,7 +25402,7 @@ in
                                   sources."is-property-1.0.2"
                                 ];
                               })
-                              sources."jsonpointer-4.0.0"
+                              sources."jsonpointer-4.0.1"
                               sources."xtend-4.0.1"
                             ];
                           })
@@ -25820,14 +25431,14 @@ in
                               sources."verror-1.3.6"
                             ];
                           })
-                          (sources."sshpk-1.10.1" // {
+                          (sources."sshpk-1.10.2" // {
                             dependencies = [
                               sources."asn1-0.2.3"
                               sources."assert-plus-1.0.0"
-                              sources."dashdash-1.14.0"
+                              sources."dashdash-1.14.1"
                               sources."getpass-0.1.6"
                               sources."jsbn-0.1.0"
-                              sources."tweetnacl-0.14.3"
+                              sources."tweetnacl-0.14.5"
                               sources."jodid25519-1.0.2"
                               sources."ecc-jsbn-0.1.1"
                               sources."bcrypt-pbkdf-1.0.0"
@@ -25838,9 +25449,9 @@ in
                       sources."is-typedarray-1.0.0"
                       sources."isstream-0.1.2"
                       sources."json-stringify-safe-5.0.1"
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                       sources."oauth-sign-0.8.2"
@@ -25852,7 +25463,7 @@ in
                         ];
                       })
                       sources."tunnel-agent-0.4.3"
-                      sources."uuid-3.0.0"
+                      sources."uuid-3.0.1"
                     ];
                   })
                   sources."semver-5.3.0"
@@ -25898,7 +25509,7 @@ in
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
         dependencies = [
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
         ];
       })
       (sources."connect-3.5.0" // {
@@ -25968,13 +25579,13 @@ in
         ];
       })
       sources."graceful-fs-4.1.11"
-      (sources."http-proxy-1.15.2" // {
+      (sources."http-proxy-1.16.2" // {
         dependencies = [
           sources."eventemitter3-1.2.0"
           sources."requires-port-1.0.0"
         ];
       })
-      sources."isbinaryfile-3.0.1"
+      sources."isbinaryfile-3.0.2"
       sources."lodash-3.10.1"
       (sources."log4js-0.6.38" // {
         dependencies = [
@@ -26009,105 +25620,101 @@ in
       sources."qjobs-1.1.5"
       sources."range-parser-1.2.0"
       sources."rimraf-2.5.4"
-      (sources."socket.io-1.4.7" // {
+      sources."safe-buffer-5.0.1"
+      (sources."socket.io-1.7.2" // {
         dependencies = [
-          (sources."engine.io-1.6.10" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
-              sources."base64id-0.1.0"
-              (sources."ws-1.0.1" // {
+              sources."ms-0.7.2"
+            ];
+          })
+          (sources."engine.io-1.8.2" // {
+            dependencies = [
+              (sources."accepts-1.3.3" // {
+                dependencies = [
+                  (sources."mime-types-2.1.14" // {
+                    dependencies = [
+                      sources."mime-db-1.26.0"
+                    ];
+                  })
+                  sources."negotiator-0.6.1"
+                ];
+              })
+              sources."base64id-1.0.0"
+              (sources."engine.io-parser-1.3.2" // {
+                dependencies = [
+                  sources."after-0.8.2"
+                  sources."arraybuffer.slice-0.0.6"
+                  sources."base64-arraybuffer-0.1.5"
+                  sources."blob-0.0.4"
+                  sources."wtf-8-1.0.0"
+                ];
+              })
+              (sources."ws-1.1.1" // {
                 dependencies = [
                   sources."options-0.0.6"
                   sources."ultron-1.0.2"
                 ];
               })
-              (sources."engine.io-parser-1.2.4" // {
-                dependencies = [
-                  sources."after-0.8.1"
-                  sources."arraybuffer.slice-0.0.6"
-                  sources."base64-arraybuffer-0.1.2"
-                  sources."blob-0.0.4"
-                  (sources."has-binary-0.1.6" // {
-                    dependencies = [
-                      sources."isarray-0.0.1"
-                    ];
-                  })
-                  sources."utf8-2.1.0"
-                ];
-              })
-              (sources."accepts-1.1.4" // {
-                dependencies = [
-                  (sources."mime-types-2.0.14" // {
-                    dependencies = [
-                      sources."mime-db-1.12.0"
-                    ];
-                  })
-                  sources."negotiator-0.4.9"
-                ];
-              })
+              sources."cookie-0.3.1"
             ];
           })
-          (sources."socket.io-parser-2.2.6" // {
+          (sources."has-binary-0.1.7" // {
             dependencies = [
-              sources."json3-3.3.2"
-              sources."component-emitter-1.1.2"
               sources."isarray-0.0.1"
-              sources."benchmark-1.0.0"
             ];
           })
-          (sources."socket.io-client-1.4.6" // {
+          sources."object-assign-4.1.0"
+          sources."socket.io-adapter-0.5.0"
+          (sources."socket.io-client-1.7.2" // {
             dependencies = [
-              (sources."engine.io-client-1.6.9" // {
+              sources."backo2-1.0.2"
+              sources."component-bind-1.0.0"
+              sources."component-emitter-1.2.1"
+              (sources."engine.io-client-1.8.2" // {
                 dependencies = [
+                  sources."component-inherit-0.0.3"
+                  (sources."engine.io-parser-1.3.2" // {
+                    dependencies = [
+                      sources."after-0.8.2"
+                      sources."arraybuffer.slice-0.0.6"
+                      sources."base64-arraybuffer-0.1.5"
+                      sources."blob-0.0.4"
+                      sources."wtf-8-1.0.0"
+                    ];
+                  })
                   sources."has-cors-1.1.0"
-                  (sources."ws-1.0.1" // {
+                  (sources."parsejson-0.0.3" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."parseqs-0.0.5" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."ws-1.1.1" // {
                     dependencies = [
                       sources."options-0.0.6"
                       sources."ultron-1.0.2"
                     ];
                   })
-                  sources."xmlhttprequest-ssl-1.5.1"
-                  sources."component-emitter-1.1.2"
-                  (sources."engine.io-parser-1.2.4" // {
-                    dependencies = [
-                      sources."after-0.8.1"
-                      sources."arraybuffer.slice-0.0.6"
-                      sources."base64-arraybuffer-0.1.2"
-                      sources."blob-0.0.4"
-                      (sources."has-binary-0.1.6" // {
-                        dependencies = [
-                          sources."isarray-0.0.1"
-                        ];
-                      })
-                      sources."utf8-2.1.0"
-                    ];
-                  })
-                  (sources."parsejson-0.0.1" // {
-                    dependencies = [
-                      (sources."better-assert-1.0.2" // {
-                        dependencies = [
-                          sources."callsite-1.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."parseqs-0.0.2" // {
-                    dependencies = [
-                      (sources."better-assert-1.0.2" // {
-                        dependencies = [
-                          sources."callsite-1.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."component-inherit-0.0.3"
+                  sources."xmlhttprequest-ssl-1.5.3"
                   sources."yeast-0.1.2"
                 ];
               })
-              sources."component-bind-1.0.0"
-              sources."component-emitter-1.2.0"
-              sources."object-component-0.0.3"
               sources."indexof-0.0.1"
-              (sources."parseuri-0.0.4" // {
+              sources."object-component-0.0.3"
+              (sources."parseuri-0.0.5" // {
                 dependencies = [
                   (sources."better-assert-1.0.2" // {
                     dependencies = [
@@ -26117,32 +25724,20 @@ in
                 ];
               })
               sources."to-array-0.1.4"
-              sources."backo2-1.0.2"
             ];
           })
-          (sources."socket.io-adapter-0.4.0" // {
+          (sources."socket.io-parser-2.3.1" // {
             dependencies = [
-              (sources."socket.io-parser-2.2.2" // {
+              (sources."debug-2.2.0" // {
                 dependencies = [
-                  sources."debug-0.7.4"
-                  sources."json3-3.2.6"
-                  sources."component-emitter-1.1.2"
-                  sources."isarray-0.0.1"
-                  sources."benchmark-1.0.0"
+                  sources."ms-0.7.1"
                 ];
               })
-            ];
-          })
-          (sources."has-binary-0.1.7" // {
-            dependencies = [
+              sources."json3-3.3.2"
+              sources."component-emitter-1.1.2"
               sources."isarray-0.0.1"
             ];
           })
-          (sources."debug-2.2.0" // {
-            dependencies = [
-              sources."ms-0.7.1"
-            ];
-          })
         ];
       })
       sources."source-map-0.5.6"
@@ -26151,7 +25746,7 @@ in
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."useragent-2.1.9" // {
+      (sources."useragent-2.1.11" // {
         dependencies = [
           sources."lru-cache-2.2.4"
         ];
@@ -26204,9 +25799,9 @@ in
                 dependencies = [
                   (sources."accepts-1.2.13" // {
                     dependencies = [
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                       sources."negotiator-0.5.3"
@@ -26214,7 +25809,7 @@ in
                   })
                   (sources."compressible-2.0.9" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                 ];
@@ -26244,9 +25839,9 @@ in
                 dependencies = [
                   (sources."accepts-1.3.3" // {
                     dependencies = [
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                       sources."negotiator-0.6.1"
@@ -26335,9 +25930,9 @@ in
                   })
                   sources."batch-0.5.3"
                   sources."escape-html-1.0.3"
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                 ];
@@ -26364,9 +25959,9 @@ in
               (sources."type-is-1.6.14" // {
                 dependencies = [
                   sources."media-typer-0.3.0"
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                 ];
@@ -26438,7 +26033,7 @@ in
               (sources."passport-oauth1-1.1.0" // {
                 dependencies = [
                   sources."passport-strategy-1.0.0"
-                  sources."oauth-0.9.14"
+                  sources."oauth-0.9.15"
                   sources."utils-merge-1.0.0"
                 ];
               })
@@ -26446,11 +26041,12 @@ in
           })
           (sources."passport-google-oauth20-1.0.0" // {
             dependencies = [
-              (sources."passport-oauth2-1.3.0" // {
+              (sources."passport-oauth2-1.4.0" // {
                 dependencies = [
+                  sources."oauth-0.9.15"
                   sources."passport-strategy-1.0.0"
-                  sources."oauth-0.9.14"
                   sources."uid2-0.0.3"
+                  sources."utils-merge-1.0.0"
                 ];
               })
             ];
@@ -26463,7 +26059,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.17.2"
+              sources."lodash-4.17.4"
             ];
           })
         ];
@@ -26485,13 +26081,14 @@ in
       sha1 = "5de1e6426f885929b77357f014de5fee1dad0553";
     };
     dependencies = [
-      (sources."through2-2.0.1" // {
+      (sources."through2-2.0.3" // {
         dependencies = [
-          (sources."readable-stream-2.0.6" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
+              sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
-              sources."inherits-2.0.3"
               sources."isarray-1.0.0"
+              sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
               sources."string_decoder-0.10.31"
               sources."util-deprecate-1.0.2"
@@ -26553,11 +26150,11 @@ in
                   sources."path-is-absolute-1.0.1"
                 ];
               })
-              (sources."glob-parent-3.0.1" // {
+              (sources."glob-parent-3.1.0" // {
                 dependencies = [
                   (sources."is-glob-3.1.0" // {
                     dependencies = [
-                      sources."is-extglob-2.1.0"
+                      sources."is-extglob-2.1.1"
                     ];
                   })
                   sources."path-dirname-1.0.2"
@@ -26583,7 +26180,7 @@ in
                                   sources."isarray-1.0.0"
                                 ];
                               })
-                              sources."randomatic-1.1.5"
+                              sources."randomatic-1.1.6"
                               sources."repeat-string-1.6.1"
                             ];
                           })
@@ -26602,7 +26199,7 @@ in
                   sources."filename-regex-2.0.0"
                   sources."is-extglob-1.0.0"
                   sources."is-glob-2.0.1"
-                  (sources."kind-of-3.0.4" // {
+                  (sources."kind-of-3.1.0" // {
                     dependencies = [
                       sources."is-buffer-1.1.4"
                     ];
@@ -26682,14 +26279,14 @@ in
           })
           sources."is-valid-glob-0.3.0"
           sources."lazystream-1.0.0"
-          sources."lodash.isequal-4.4.0"
-          sources."merge-stream-1.0.0"
+          sources."lodash.isequal-4.5.0"
+          sources."merge-stream-1.0.1"
           (sources."mkdirp-0.5.1" // {
             dependencies = [
               sources."minimist-0.0.8"
             ];
           })
-          sources."object-assign-4.1.0"
+          sources."object-assign-4.1.1"
           (sources."readable-stream-2.2.2" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
@@ -26798,23 +26395,24 @@ in
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.1.0";
+    version = "1.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.0.tgz";
-      sha1 = "7e27db0eb5102dc0f1a4667d84bd5d633e19d191";
+      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.1.tgz";
+      sha1 = "f58c3157be2ffcb8253f82641b5f0473543d21e8";
     };
     dependencies = [
       sources."optparse-1.0.5"
-      sources."semver-5.0.3"
+      sources."semver-5.3.0"
       (sources."npm-registry-client-7.1.2" // {
         dependencies = [
           sources."chownr-1.0.1"
-          (sources."concat-stream-1.5.2" // {
+          (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.0.6" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
+                  sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
@@ -26853,7 +26451,6 @@ in
           (sources."npm-package-arg-4.2.0" // {
             dependencies = [
               sources."hosted-git-info-2.1.5"
-              sources."semver-5.3.0"
             ];
           })
           (sources."once-1.4.0" // {
@@ -26886,12 +26483,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -26910,7 +26507,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -26939,14 +26536,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -26957,9 +26554,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -26971,7 +26568,7 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.0"
+              sources."uuid-3.0.1"
             ];
           })
           sources."retry-0.8.0"
@@ -27026,8 +26623,8 @@ in
                   sources."aproba-1.0.4"
                   sources."has-color-0.1.7"
                   sources."has-unicode-2.0.1"
-                  sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.1"
+                  sources."object-assign-4.1.1"
+                  sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -27040,7 +26637,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."wide-align-1.1.0"
@@ -27075,7 +26672,7 @@ in
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."osenv-0.1.3" // {
+          (sources."osenv-0.1.4" // {
             dependencies = [
               sources."os-homedir-1.0.2"
               sources."os-tmpdir-1.0.2"
@@ -27172,10 +26769,10 @@ in
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
     packageName = "node-gyp";
-    version = "3.4.0";
+    version = "3.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz";
-      sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
+      sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
     };
     dependencies = [
       (sources."fstream-1.0.10" // {
@@ -27221,7 +26818,7 @@ in
           sources."abbrev-1.0.9"
         ];
       })
-      (sources."npmlog-3.1.2" // {
+      (sources."npmlog-4.0.2" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
@@ -27240,13 +26837,13 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.6.0" // {
+          (sources."gauge-2.7.2" // {
             dependencies = [
               sources."aproba-1.0.4"
-              sources."has-color-0.1.7"
+              sources."supports-color-0.2.0"
               sources."has-unicode-2.0.1"
-              sources."object-assign-4.1.0"
-              sources."signal-exit-3.0.1"
+              sources."object-assign-4.1.1"
+              sources."signal-exit-3.0.2"
               (sources."string-width-1.0.2" // {
                 dependencies = [
                   sources."code-point-at-1.1.0"
@@ -27259,7 +26856,7 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               sources."wide-align-1.1.0"
@@ -27268,35 +26865,12 @@ in
           sources."set-blocking-2.0.0"
         ];
       })
-      (sources."osenv-0.1.3" // {
+      (sources."osenv-0.1.4" // {
         dependencies = [
           sources."os-homedir-1.0.2"
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."path-array-1.0.1" // {
-        dependencies = [
-          (sources."array-index-1.0.0" // {
-            dependencies = [
-              (sources."debug-2.3.3" // {
-                dependencies = [
-                  sources."ms-0.7.2"
-                ];
-              })
-              (sources."es6-symbol-3.1.0" // {
-                dependencies = [
-                  sources."d-0.1.1"
-                  (sources."es5-ext-0.10.12" // {
-                    dependencies = [
-                      sources."es6-iterator-2.0.0"
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
-        ];
-      })
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
@@ -27322,12 +26896,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -27346,7 +26920,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -27375,14 +26949,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -27393,9 +26967,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -27407,7 +26981,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.0"
+          sources."uuid-3.0.1"
         ];
       })
       sources."rimraf-2.5.4"
@@ -27453,7 +27027,7 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."osenv-0.1.3" // {
+              (sources."osenv-0.1.4" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                   sources."os-tmpdir-1.0.2"
@@ -27467,7 +27041,7 @@ in
                       sources."lodash-3.10.1"
                     ];
                   })
-                  sources."xmldom-0.1.22"
+                  sources."xmldom-0.1.27"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -27507,7 +27081,7 @@ in
                               sources."array-find-index-1.0.2"
                             ];
                           })
-                          sources."signal-exit-3.0.1"
+                          sources."signal-exit-3.0.2"
                         ];
                       })
                       sources."map-obj-1.0.1"
@@ -27531,7 +27105,7 @@ in
                           })
                         ];
                       })
-                      sources."object-assign-4.1.0"
+                      sources."object-assign-4.1.1"
                       (sources."read-pkg-up-1.0.1" // {
                         dependencies = [
                           (sources."find-up-1.1.2" // {
@@ -27622,7 +27196,7 @@ in
           })
         ];
       })
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -27631,9 +27205,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -27669,10 +27243,10 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.2" // {
+          (sources."proxy-addr-1.1.3" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.1.1"
+              sources."ipaddr.js-1.2.0"
             ];
           })
           sources."qs-6.2.0"
@@ -27695,9 +27269,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -27756,8 +27330,8 @@ in
       })
       (sources."v8-debug-0.7.7" // {
         dependencies = [
-          sources."nan-2.4.0"
-          (sources."node-pre-gyp-0.6.31" // {
+          sources."nan-2.5.0"
+          (sources."node-pre-gyp-0.6.32" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -27769,7 +27343,7 @@ in
                   sources."abbrev-1.0.9"
                 ];
               })
-              (sources."npmlog-4.0.1" // {
+              (sources."npmlog-4.0.2" // {
                 dependencies = [
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
@@ -27788,13 +27362,13 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.1" // {
+                  (sources."gauge-2.7.2" // {
                     dependencies = [
                       sources."aproba-1.0.4"
-                      sources."has-color-0.1.7"
+                      sources."supports-color-0.2.0"
                       sources."has-unicode-2.0.1"
-                      sources."object-assign-4.1.0"
-                      sources."signal-exit-3.0.1"
+                      sources."object-assign-4.1.1"
+                      sources."signal-exit-3.0.2"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
                           sources."code-point-at-1.1.0"
@@ -27807,7 +27381,7 @@ in
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."wide-align-1.1.0"
@@ -27841,12 +27415,12 @@ in
                           sources."escape-string-regexp-1.0.5"
                           (sources."has-ansi-2.0.0" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           sources."supports-color-2.0.0"
@@ -27865,7 +27439,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-4.0.0"
+                          sources."jsonpointer-4.0.1"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -27894,14 +27468,14 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.10.1" // {
+                      (sources."sshpk-1.10.2" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.0"
+                          sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
                           sources."jsbn-0.1.0"
-                          sources."tweetnacl-0.14.3"
+                          sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.0"
@@ -27912,9 +27486,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
@@ -27926,7 +27500,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.4.3"
-                  sources."uuid-3.0.0"
+                  sources."uuid-3.0.1"
                 ];
               })
               (sources."rimraf-2.5.4" // {
@@ -28024,8 +27598,8 @@ in
       })
       (sources."v8-profiler-5.6.5" // {
         dependencies = [
-          sources."nan-2.4.0"
-          (sources."node-pre-gyp-0.6.31" // {
+          sources."nan-2.5.0"
+          (sources."node-pre-gyp-0.6.32" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -28037,7 +27611,7 @@ in
                   sources."abbrev-1.0.9"
                 ];
               })
-              (sources."npmlog-4.0.1" // {
+              (sources."npmlog-4.0.2" // {
                 dependencies = [
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
@@ -28056,13 +27630,13 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.1" // {
+                  (sources."gauge-2.7.2" // {
                     dependencies = [
                       sources."aproba-1.0.4"
-                      sources."has-color-0.1.7"
+                      sources."supports-color-0.2.0"
                       sources."has-unicode-2.0.1"
-                      sources."object-assign-4.1.0"
-                      sources."signal-exit-3.0.1"
+                      sources."object-assign-4.1.1"
+                      sources."signal-exit-3.0.2"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
                           sources."code-point-at-1.1.0"
@@ -28075,7 +27649,7 @@ in
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."wide-align-1.1.0"
@@ -28109,12 +27683,12 @@ in
                           sources."escape-string-regexp-1.0.5"
                           (sources."has-ansi-2.0.0" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           sources."supports-color-2.0.0"
@@ -28133,7 +27707,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-4.0.0"
+                          sources."jsonpointer-4.0.1"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -28162,14 +27736,14 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.10.1" // {
+                      (sources."sshpk-1.10.2" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.0"
+                          sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
                           sources."jsbn-0.1.0"
-                          sources."tweetnacl-0.14.3"
+                          sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.0"
@@ -28180,9 +27754,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
@@ -28194,7 +27768,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.4.3"
-                  sources."uuid-3.0.0"
+                  sources."uuid-3.0.1"
                 ];
               })
               (sources."rimraf-2.5.4" // {
@@ -28308,10 +27882,10 @@ in
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
-              sources."wrap-ansi-2.0.0"
+              sources."wrap-ansi-2.1.0"
             ];
           })
           sources."decamelize-1.2.0"
@@ -28334,7 +27908,7 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
             ];
@@ -28354,10 +27928,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.31";
+    version = "0.6.32";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
-      sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
+      sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
     };
     dependencies = [
       (sources."mkdirp-0.5.1" // {
@@ -28370,7 +27944,7 @@ in
           sources."abbrev-1.0.9"
         ];
       })
-      (sources."npmlog-4.0.1" // {
+      (sources."npmlog-4.0.2" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
@@ -28389,13 +27963,13 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.1" // {
+          (sources."gauge-2.7.2" // {
             dependencies = [
               sources."aproba-1.0.4"
-              sources."has-color-0.1.7"
+              sources."supports-color-0.2.0"
               sources."has-unicode-2.0.1"
-              sources."object-assign-4.1.0"
-              sources."signal-exit-3.0.1"
+              sources."object-assign-4.1.1"
+              sources."signal-exit-3.0.2"
               (sources."string-width-1.0.2" // {
                 dependencies = [
                   sources."code-point-at-1.1.0"
@@ -28408,7 +27982,7 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               sources."wide-align-1.1.0"
@@ -28450,12 +28024,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -28474,7 +28048,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -28503,14 +28077,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -28521,9 +28095,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -28535,7 +28109,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.0"
+          sources."uuid-3.0.1"
         ];
       })
       (sources."rimraf-2.5.4" // {
@@ -28671,7 +28245,7 @@ in
                                   sources."isarray-1.0.0"
                                 ];
                               })
-                              sources."randomatic-1.1.5"
+                              sources."randomatic-1.1.6"
                               sources."repeat-string-1.6.1"
                             ];
                           })
@@ -28689,7 +28263,7 @@ in
                   sources."extglob-0.3.2"
                   sources."filename-regex-2.0.0"
                   sources."is-extglob-1.0.0"
-                  (sources."kind-of-3.0.4" // {
+                  (sources."kind-of-3.1.0" // {
                     dependencies = [
                       sources."is-buffer-1.1.4"
                     ];
@@ -28726,7 +28300,7 @@ in
           sources."inherits-2.0.3"
           (sources."is-binary-path-1.0.1" // {
             dependencies = [
-              sources."binary-extensions-1.7.0"
+              sources."binary-extensions-1.8.0"
             ];
           })
           (sources."is-glob-2.0.1" // {
@@ -28751,10 +28325,10 @@ in
               sources."set-immediate-shim-1.0.1"
             ];
           })
-          (sources."fsevents-1.0.15" // {
+          (sources."fsevents-1.0.17" // {
             dependencies = [
-              sources."nan-2.4.0"
-              (sources."node-pre-gyp-0.6.31" // {
+              sources."nan-2.5.0"
+              (sources."node-pre-gyp-0.6.32" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
@@ -28766,7 +28340,7 @@ in
                       sources."abbrev-1.0.9"
                     ];
                   })
-                  (sources."npmlog-4.0.1" // {
+                  (sources."npmlog-4.0.2" // {
                     dependencies = [
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
@@ -28784,13 +28358,13 @@ in
                         ];
                       })
                       sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.7.1" // {
+                      (sources."gauge-2.7.2" // {
                         dependencies = [
                           sources."aproba-1.0.4"
-                          sources."has-color-0.1.7"
+                          sources."supports-color-0.2.0"
                           sources."has-unicode-2.0.1"
-                          sources."object-assign-4.1.0"
-                          sources."signal-exit-3.0.1"
+                          sources."object-assign-4.1.1"
+                          sources."signal-exit-3.0.2"
                           (sources."string-width-1.0.2" // {
                             dependencies = [
                               sources."code-point-at-1.1.0"
@@ -28803,7 +28377,7 @@ in
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           sources."wide-align-1.1.0"
@@ -28845,12 +28419,12 @@ in
                               sources."escape-string-regexp-1.0.5"
                               (sources."has-ansi-2.0.0" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.0.0"
+                                  sources."ansi-regex-2.1.1"
                                 ];
                               })
                               (sources."strip-ansi-3.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.0.0"
+                                  sources."ansi-regex-2.1.1"
                                 ];
                               })
                               sources."supports-color-2.0.0"
@@ -28869,7 +28443,7 @@ in
                                   sources."is-property-1.0.2"
                                 ];
                               })
-                              sources."jsonpointer-4.0.0"
+                              sources."jsonpointer-4.0.1"
                               sources."xtend-4.0.1"
                             ];
                           })
@@ -28898,14 +28472,14 @@ in
                               sources."verror-1.3.6"
                             ];
                           })
-                          (sources."sshpk-1.10.1" // {
+                          (sources."sshpk-1.10.2" // {
                             dependencies = [
                               sources."asn1-0.2.3"
                               sources."assert-plus-1.0.0"
-                              sources."dashdash-1.14.0"
+                              sources."dashdash-1.14.1"
                               sources."getpass-0.1.6"
                               sources."jsbn-0.1.0"
-                              sources."tweetnacl-0.14.3"
+                              sources."tweetnacl-0.14.5"
                               sources."jodid25519-1.0.2"
                               sources."ecc-jsbn-0.1.1"
                               sources."bcrypt-pbkdf-1.0.0"
@@ -28916,9 +28490,9 @@ in
                       sources."is-typedarray-1.0.0"
                       sources."isstream-0.1.2"
                       sources."json-stringify-safe-5.0.1"
-                      (sources."mime-types-2.1.13" // {
+                      (sources."mime-types-2.1.14" // {
                         dependencies = [
-                          sources."mime-db-1.25.0"
+                          sources."mime-db-1.26.0"
                         ];
                       })
                       sources."oauth-sign-0.8.2"
@@ -28930,7 +28504,7 @@ in
                         ];
                       })
                       sources."tunnel-agent-0.4.3"
-                      sources."uuid-3.0.0"
+                      sources."uuid-3.0.1"
                     ];
                   })
                   (sources."rimraf-2.5.4" // {
@@ -29000,7 +28574,7 @@ in
           })
         ];
       })
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -29077,12 +28651,12 @@ in
               sources."escape-string-regexp-1.0.5"
               (sources."has-ansi-2.0.0" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               sources."supports-color-2.0.0"
@@ -29096,15 +28670,15 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              sources."object-assign-4.1.0"
+              sources."object-assign-4.1.1"
               sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.3" // {
+              (sources."osenv-0.1.4" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                 ];
               })
               sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.2.0" // {
+              (sources."write-file-atomic-1.3.1" // {
                 dependencies = [
                   sources."imurmurhash-0.1.4"
                   sources."slide-1.1.6"
@@ -29217,7 +28791,7 @@ in
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
             ];
@@ -29236,14 +28810,14 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.15.2";
+    version = "0.16.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.15.2.tgz";
-      sha1 = "4533dd93f63828f8e749f0c132a793fbeb636ea6";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.16.1.tgz";
+      sha1 = "eff4162e6e08ef7e2ae9b17ad99571876f7d895d";
     };
     dependencies = [
-      sources."basic-auth-1.0.4"
-      sources."bcryptjs-2.3.0"
+      sources."basic-auth-1.1.0"
+      sources."bcryptjs-2.4.0"
       (sources."body-parser-1.15.2" // {
         dependencies = [
           sources."bytes-2.4.0"
@@ -29268,11 +28842,16 @@ in
             ];
           })
           sources."qs-6.2.0"
+          (sources."raw-body-2.1.7" // {
+            dependencies = [
+              sources."unpipe-1.0.0"
+            ];
+          })
           (sources."type-is-1.6.14" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -29331,7 +28910,7 @@ in
           sources."lodash.some-4.6.0"
         ];
       })
-      sources."clone-2.0.0"
+      sources."clone-2.1.0"
       (sources."cookie-parser-1.4.3" // {
         dependencies = [
           sources."cookie-0.3.1"
@@ -29343,11 +28922,11 @@ in
           sources."vary-1.1.0"
         ];
       })
-      (sources."cron-1.1.1" // {
+      (sources."cron-1.2.1" // {
         dependencies = [
-          (sources."moment-timezone-0.5.9" // {
+          (sources."moment-timezone-0.5.11" // {
             dependencies = [
-              sources."moment-2.17.0"
+              sources."moment-2.17.1"
             ];
           })
         ];
@@ -29356,9 +28935,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -29394,10 +28973,10 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.2" // {
+          (sources."proxy-addr-1.1.3" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.1.1"
+              sources."ipaddr.js-1.2.0"
             ];
           })
           sources."qs-6.2.0"
@@ -29419,9 +28998,9 @@ in
           sources."serve-static-1.11.1"
           (sources."type-is-1.6.14" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -29430,52 +29009,20 @@ in
           sources."vary-1.1.0"
         ];
       })
-      (sources."follow-redirects-0.2.0" // {
+      (sources."follow-redirects-1.2.1" // {
         dependencies = [
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
           })
-          sources."stream-consume-0.1.0"
         ];
       })
-      (sources."fs-extra-0.30.0" // {
+      (sources."fs-extra-1.0.0" // {
         dependencies = [
           sources."graceful-fs-4.1.11"
           sources."jsonfile-2.4.0"
           sources."klaw-1.3.1"
-          sources."path-is-absolute-1.0.1"
-          (sources."rimraf-2.5.4" // {
-            dependencies = [
-              (sources."glob-7.1.1" // {
-                dependencies = [
-                  sources."fs.realpath-1.0.0"
-                  (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."fs.notify-0.0.4" // {
@@ -29497,26 +29044,29 @@ in
         ];
       })
       sources."is-utf8-0.2.1"
+      (sources."js-yaml-3.7.0" // {
+        dependencies = [
+          (sources."argparse-1.0.9" // {
+            dependencies = [
+              sources."sprintf-js-1.0.3"
+            ];
+          })
+          sources."esprima-2.7.3"
+        ];
+      })
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonata-1.0.10"
       sources."media-typer-0.3.0"
-      (sources."mqtt-1.14.1" // {
+      (sources."mqtt-2.2.1" // {
         dependencies = [
           (sources."commist-1.0.0" // {
             dependencies = [
               sources."leven-1.0.2"
             ];
           })
-          (sources."concat-stream-1.5.2" // {
+          (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
             ];
           })
           (sources."end-of-stream-1.1.0" // {
@@ -29559,11 +29109,11 @@ in
                       sources."path-is-absolute-1.0.1"
                     ];
                   })
-                  (sources."glob-parent-3.0.1" // {
+                  (sources."glob-parent-3.1.0" // {
                     dependencies = [
                       (sources."is-glob-3.1.0" // {
                         dependencies = [
-                          sources."is-extglob-2.1.0"
+                          sources."is-extglob-2.1.1"
                         ];
                       })
                       sources."path-dirname-1.0.2"
@@ -29589,7 +29139,7 @@ in
                                       sources."isarray-1.0.0"
                                     ];
                                   })
-                                  sources."randomatic-1.1.5"
+                                  sources."randomatic-1.1.6"
                                   sources."repeat-string-1.6.1"
                                 ];
                               })
@@ -29608,7 +29158,7 @@ in
                       sources."filename-regex-2.0.0"
                       sources."is-extglob-1.0.0"
                       sources."is-glob-2.0.1"
-                      (sources."kind-of-3.0.4" // {
+                      (sources."kind-of-3.1.0" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -29645,19 +29195,19 @@ in
                   (sources."ordered-read-streams-0.3.0" // {
                     dependencies = [
                       sources."is-stream-1.1.0"
-                      (sources."readable-stream-2.2.2" // {
+                    ];
+                  })
+                  (sources."through2-0.6.5" // {
+                    dependencies = [
+                      (sources."readable-stream-1.0.34" // {
                         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."isarray-0.0.1"
                           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" // {
@@ -29676,54 +29226,35 @@ in
                       })
                       (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.3"
                         ];
                       })
                     ];
                   })
                 ];
               })
-              (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.3"
             ];
           })
           sources."inherits-2.0.3"
           sources."minimist-1.2.0"
-          (sources."mqtt-connection-2.1.1" // {
+          (sources."mqtt-packet-5.2.1" // {
             dependencies = [
-              sources."reduplexer-1.1.0"
-              sources."through2-0.6.5"
+              sources."bl-1.2.0"
+              sources."process-nextick-args-1.0.7"
             ];
           })
-          (sources."mqtt-packet-3.4.7" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
-              sources."bl-0.9.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."pump-1.0.1" // {
+          (sources."pump-1.0.2" // {
             dependencies = [
               (sources."once-1.4.0" // {
                 dependencies = [
@@ -29732,29 +29263,10 @@ in
               })
             ];
           })
-          (sources."readable-stream-1.0.34" // {
-            dependencies = [
-              sources."core-util-is-1.0.2"
-              sources."isarray-0.0.1"
-              sources."string_decoder-0.10.31"
-            ];
-          })
           sources."reinterval-1.1.0"
-          (sources."split2-2.1.0" // {
+          (sources."split2-2.1.1" // {
             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.3"
             ];
           })
           (sources."websocket-stream-3.3.3" // {
@@ -29770,54 +29282,26 @@ in
                       })
                     ];
                   })
-                  (sources."readable-stream-2.2.2" // {
-                    dependencies = [
-                      sources."buffer-shims-1.0.0"
-                      sources."core-util-is-1.0.2"
-                      sources."isarray-1.0.0"
-                      sources."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."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."ws-1.1.1" // {
-                dependencies = [
-                  sources."options-0.0.6"
-                  sources."ultron-1.0.2"
-                ];
-              })
+              sources."through2-2.0.3"
             ];
           })
           sources."xtend-4.0.1"
         ];
       })
-      sources."mustache-2.2.1"
+      sources."mustache-2.3.0"
       (sources."nopt-3.0.6" // {
         dependencies = [
           sources."abbrev-1.0.9"
         ];
       })
-      (sources."oauth2orize-1.5.0" // {
+      (sources."oauth2orize-1.7.0" // {
         dependencies = [
           sources."uid2-0.0.3"
           sources."utils-merge-1.0.0"
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -29841,25 +29325,16 @@ in
           sources."passport-strategy-1.0.0"
         ];
       })
-      (sources."raw-body-2.1.7" // {
+      (sources."raw-body-2.2.0" // {
         dependencies = [
           sources."bytes-2.4.0"
-          sources."iconv-lite-0.4.13"
+          sources."iconv-lite-0.4.15"
           sources."unpipe-1.0.0"
         ];
       })
       sources."semver-5.3.0"
-      (sources."sentiment-1.0.6" // {
-        dependencies = [
-          (sources."lodash.assign-4.0.1" // {
-            dependencies = [
-              sources."lodash.keys-4.2.0"
-              sources."lodash.rest-4.0.5"
-            ];
-          })
-        ];
-      })
-      (sources."uglify-js-2.7.3" // {
+      sources."sentiment-2.1.0"
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -29873,7 +29348,7 @@ in
                     dependencies = [
                       (sources."align-text-0.1.4" // {
                         dependencies = [
-                          (sources."kind-of-3.0.4" // {
+                          (sources."kind-of-3.1.0" // {
                             dependencies = [
                               sources."is-buffer-1.1.4"
                             ];
@@ -29889,7 +29364,7 @@ in
                     dependencies = [
                       (sources."align-text-0.1.4" // {
                         dependencies = [
-                          (sources."kind-of-3.0.4" // {
+                          (sources."kind-of-3.1.0" // {
                             dependencies = [
                               sources."is-buffer-1.1.4"
                             ];
@@ -29910,22 +29385,10 @@ in
         ];
       })
       sources."when-3.7.7"
-      (sources."ws-0.8.1" // {
+      (sources."ws-1.1.1" // {
         dependencies = [
           sources."options-0.0.6"
           sources."ultron-1.0.2"
-          (sources."bufferutil-1.2.1" // {
-            dependencies = [
-              sources."bindings-1.2.1"
-              sources."nan-2.4.0"
-            ];
-          })
-          (sources."utf-8-validate-1.2.1" // {
-            dependencies = [
-              sources."bindings-1.2.1"
-              sources."nan-2.4.0"
-            ];
-          })
         ];
       })
       (sources."xml2js-0.4.17" // {
@@ -29933,7 +29396,7 @@ in
           sources."sax-1.2.1"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
-              sources."lodash-4.17.2"
+              sources."lodash-4.17.4"
             ];
           })
         ];
@@ -29985,7 +29448,7 @@ in
                 dependencies = [
                   (sources."async-2.1.4" // {
                     dependencies = [
-                      sources."lodash-4.17.2"
+                      sources."lodash-4.17.4"
                     ];
                   })
                 ];
@@ -29998,12 +29461,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -30022,7 +29485,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -30051,14 +29514,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -30068,10 +29531,9 @@ in
               })
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
-              sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."node-uuid-1.4.7"
@@ -30088,7 +29550,7 @@ in
           })
         ];
       })
-      (sources."node-red-node-email-0.1.12" // {
+      (sources."node-red-node-email-0.1.15" // {
         dependencies = [
           (sources."nodemailer-1.11.0" // {
             dependencies = [
@@ -30108,7 +29570,7 @@ in
                       sources."libqp-1.1.0"
                       (sources."needle-0.10.0" // {
                         dependencies = [
-                          (sources."debug-2.3.3" // {
+                          (sources."debug-2.6.0" // {
                             dependencies = [
                               sources."ms-0.7.2"
                             ];
@@ -30122,7 +29584,7 @@ in
               })
               (sources."needle-0.11.0" // {
                 dependencies = [
-                  (sources."debug-2.3.3" // {
+                  (sources."debug-2.6.0" // {
                     dependencies = [
                       sources."ms-0.7.2"
                     ];
@@ -30174,7 +29636,7 @@ in
               })
             ];
           })
-          (sources."imap-0.8.18" // {
+          (sources."imap-0.8.19" // {
             dependencies = [
               sources."utf7-1.0.2"
               (sources."readable-stream-1.1.14" // {
@@ -30218,12 +29680,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -30242,7 +29704,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -30271,14 +29733,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -30288,10 +29750,9 @@ in
               })
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
-              sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -30303,315 +29764,283 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.0"
+              sources."uuid-3.0.1"
             ];
           })
         ];
       })
       sources."node-red-node-rbe-0.1.6"
-      (sources."node-red-node-serialport-0.4.1" // {
+      (sources."bcrypt-1.0.2" // {
         dependencies = [
-          (sources."serialport-4.0.6" // {
+          sources."bindings-1.2.1"
+          sources."nan-2.5.0"
+          (sources."node-pre-gyp-0.6.32" // {
             dependencies = [
-              sources."bindings-1.2.1"
-              (sources."commander-2.9.0" // {
+              (sources."mkdirp-0.5.1" // {
                 dependencies = [
-                  sources."graceful-readlink-1.0.1"
+                  sources."minimist-0.0.8"
                 ];
               })
-              (sources."debug-2.3.3" // {
+              (sources."npmlog-4.0.2" // {
                 dependencies = [
-                  sources."ms-0.7.2"
-                ];
-              })
-              (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" // {
+                  (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
-                      sources."minimist-0.0.8"
-                    ];
-                  })
-                  (sources."npmlog-4.0.1" // {
-                    dependencies = [
-                      (sources."are-we-there-yet-1.1.2" // {
-                        dependencies = [
-                          sources."delegates-1.0.0"
-                          (sources."readable-stream-2.2.2" // {
-                            dependencies = [
-                              sources."buffer-shims-1.0.0"
-                              sources."core-util-is-1.0.2"
-                              sources."isarray-1.0.0"
-                              sources."inherits-2.0.3"
-                              sources."process-nextick-args-1.0.7"
-                              sources."string_decoder-0.10.31"
-                              sources."util-deprecate-1.0.2"
-                            ];
-                          })
-                        ];
-                      })
-                      sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.7.1" // {
-                        dependencies = [
-                          sources."aproba-1.0.4"
-                          sources."has-color-0.1.7"
-                          sources."has-unicode-2.0.1"
-                          sources."object-assign-4.1.0"
-                          sources."signal-exit-3.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."wide-align-1.1.0"
-                        ];
-                      })
-                      sources."set-blocking-2.0.0"
-                    ];
-                  })
-                  (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."request-2.79.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.2" // {
-                        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."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.13" // {
-                        dependencies = [
-                          sources."mime-db-1.25.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."uuid-3.0.0"
-                    ];
-                  })
-                  (sources."rimraf-2.5.4" // {
-                    dependencies = [
-                      (sources."glob-7.1.1" // {
-                        dependencies = [
-                          sources."fs.realpath-1.0.0"
-                          (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."tar-2.2.1" // {
-                    dependencies = [
-                      sources."block-stream-0.0.9"
-                      (sources."fstream-1.0.10" // {
-                        dependencies = [
-                          sources."graceful-fs-4.1.11"
-                        ];
-                      })
-                      sources."inherits-2.0.3"
-                    ];
-                  })
-                  (sources."tar-pack-3.3.0" // {
-                    dependencies = [
-                      (sources."debug-2.2.0" // {
-                        dependencies = [
-                          sources."ms-0.7.1"
-                        ];
-                      })
-                      (sources."fstream-1.0.10" // {
-                        dependencies = [
-                          sources."graceful-fs-4.1.11"
-                          sources."inherits-2.0.3"
-                        ];
-                      })
-                      (sources."fstream-ignore-1.0.5" // {
-                        dependencies = [
-                          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.3.3" // {
-                        dependencies = [
-                          sources."wrappy-1.0.2"
-                        ];
-                      })
-                      (sources."readable-stream-2.1.5" // {
+                      sources."delegates-1.0.0"
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
-                          sources."inherits-2.0.3"
                           sources."isarray-1.0.0"
+                          sources."inherits-2.0.3"
                           sources."process-nextick-args-1.0.7"
                           sources."string_decoder-0.10.31"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
-                      sources."uid-number-0.0.6"
+                    ];
+                  })
+                  sources."console-control-strings-1.1.0"
+                  (sources."gauge-2.7.2" // {
+                    dependencies = [
+                      sources."aproba-1.0.4"
+                      sources."supports-color-0.2.0"
+                      sources."has-unicode-2.0.1"
+                      sources."object-assign-4.1.1"
+                      sources."signal-exit-3.0.2"
+                      (sources."string-width-1.0.2" // {
+                        dependencies = [
+                          sources."code-point-at-1.1.0"
+                          (sources."is-fullwidth-code-point-1.0.0" // {
+                            dependencies = [
+                              sources."number-is-nan-1.0.1"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."strip-ansi-3.0.1" // {
+                        dependencies = [
+                          sources."ansi-regex-2.1.1"
+                        ];
+                      })
+                      sources."wide-align-1.1.0"
+                    ];
+                  })
+                  sources."set-blocking-2.0.0"
+                ];
+              })
+              (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."request-2.79.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.2" // {
+                    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.1.1"
+                            ];
+                          })
+                          (sources."strip-ansi-3.0.1" // {
+                            dependencies = [
+                              sources."ansi-regex-2.1.1"
+                            ];
+                          })
+                          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.1"
+                          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.2" // {
+                        dependencies = [
+                          sources."asn1-0.2.3"
+                          sources."assert-plus-1.0.0"
+                          sources."dashdash-1.14.1"
+                          sources."getpass-0.1.6"
+                          sources."jsbn-0.1.0"
+                          sources."tweetnacl-0.14.5"
+                          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."mime-types-2.1.14" // {
+                    dependencies = [
+                      sources."mime-db-1.26.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."uuid-3.0.1"
+                ];
+              })
+              (sources."rimraf-2.5.4" // {
+                dependencies = [
+                  (sources."glob-7.1.1" // {
+                    dependencies = [
+                      sources."fs.realpath-1.0.0"
+                      (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."object.assign-4.0.4" // {
+              (sources."tar-2.2.1" // {
                 dependencies = [
-                  sources."function-bind-1.1.0"
-                  sources."object-keys-1.0.11"
-                  (sources."define-properties-1.1.2" // {
+                  sources."block-stream-0.0.9"
+                  (sources."fstream-1.0.10" // {
                     dependencies = [
-                      sources."foreach-2.0.5"
+                      sources."graceful-fs-4.1.11"
                     ];
                   })
+                  sources."inherits-2.0.3"
+                ];
+              })
+              (sources."tar-pack-3.3.0" // {
+                dependencies = [
+                  (sources."debug-2.2.0" // {
+                    dependencies = [
+                      sources."ms-0.7.1"
+                    ];
+                  })
+                  (sources."fstream-1.0.10" // {
+                    dependencies = [
+                      sources."graceful-fs-4.1.11"
+                      sources."inherits-2.0.3"
+                    ];
+                  })
+                  (sources."fstream-ignore-1.0.5" // {
+                    dependencies = [
+                      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.3.3" // {
+                    dependencies = [
+                      sources."wrappy-1.0.2"
+                    ];
+                  })
+                  (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."uid-number-0.0.6"
                 ];
               })
             ];
           })
         ];
       })
-      (sources."bcrypt-0.8.7" // {
-        dependencies = [
-          sources."bindings-1.2.1"
-          sources."nan-2.3.5"
-        ];
-      })
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -30675,7 +30104,7 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -30688,7 +30117,7 @@ in
       (sources."config-0.4.15" // {
         dependencies = [
           sources."js-yaml-0.3.7"
-          sources."coffee-script-1.11.1"
+          sources."coffee-script-1.12.2"
           (sources."vows-0.8.1" // {
             dependencies = [
               sources."eyes-0.1.8"
@@ -30749,20 +30178,21 @@ in
       sources."moment-2.1.0"
       (sources."nodemailer-0.3.35" // {
         dependencies = [
-          (sources."mailcomposer-3.12.0" // {
+          (sources."mailcomposer-4.0.1" // {
             dependencies = [
-              (sources."buildmail-3.10.0" // {
+              (sources."buildmail-4.0.1" // {
                 dependencies = [
                   sources."addressparser-1.0.1"
                   sources."libbase64-0.1.0"
                   sources."libqp-1.1.0"
                   sources."nodemailer-fetch-1.6.0"
                   sources."nodemailer-shared-1.1.0"
+                  sources."punycode-1.4.1"
                 ];
               })
-              (sources."libmime-2.1.0" // {
+              (sources."libmime-3.0.0" // {
                 dependencies = [
-                  sources."iconv-lite-0.4.13"
+                  sources."iconv-lite-0.4.15"
                   sources."libbase64-0.1.0"
                   sources."libqp-1.1.0"
                 ];
@@ -30814,15 +30244,15 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.0.2";
+    version = "4.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz";
-      sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae";
+      url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz";
+      sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4";
     };
     dependencies = [
       (sources."JSONStream-1.2.1" // {
         dependencies = [
-          sources."jsonparse-1.2.0"
+          sources."jsonparse-1.3.0"
           sources."through-2.3.8"
         ];
       })
@@ -30918,7 +30348,7 @@ in
           sources."promzard-0.3.0"
         ];
       })
-      sources."lockfile-1.0.2"
+      sources."lockfile-1.0.3"
       (sources."lodash._baseuniq-4.6.0" // {
         dependencies = [
           sources."lodash._createset-4.0.3"
@@ -30931,18 +30361,9 @@ in
       sources."lodash.without-4.4.0"
       (sources."mississippi-1.2.0" // {
         dependencies = [
-          (sources."concat-stream-1.5.2" // {
+          (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
             ];
           })
           (sources."duplexify-3.5.0" // {
@@ -30962,24 +30383,15 @@ in
           })
           sources."flush-write-stream-1.0.2"
           sources."from2-2.3.0"
-          sources."pump-1.0.1"
+          sources."pump-1.0.2"
           sources."pumpify-1.3.5"
           (sources."stream-each-1.2.0" // {
             dependencies = [
               sources."stream-shift-1.0.0"
             ];
           })
-          (sources."through2-2.0.1" // {
+          (sources."through2-2.0.3" // {
             dependencies = [
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
               sources."xtend-4.0.1"
             ];
           })
@@ -31002,6 +30414,7 @@ in
               })
             ];
           })
+          sources."nopt-3.0.6"
           (sources."npmlog-3.1.2" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
@@ -31013,8 +30426,8 @@ in
               (sources."gauge-2.6.0" // {
                 dependencies = [
                   sources."has-color-0.1.7"
-                  sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.1"
+                  sources."object-assign-4.1.1"
+                  sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -31035,7 +30448,7 @@ in
             dependencies = [
               (sources."array-index-1.0.0" // {
                 dependencies = [
-                  (sources."debug-2.3.3" // {
+                  (sources."debug-2.6.0" // {
                     dependencies = [
                       sources."ms-0.7.2"
                     ];
@@ -31056,7 +30469,7 @@ in
           })
         ];
       })
-      sources."nopt-3.0.6"
+      sources."nopt-4.0.1"
       sources."normalize-git-url-3.0.2"
       (sources."normalize-package-data-2.3.5" // {
         dependencies = [
@@ -31070,55 +30483,17 @@ in
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
       sources."npm-package-arg-4.2.0"
-      (sources."npm-registry-client-7.3.0" // {
+      (sources."npm-registry-client-7.4.5" // {
         dependencies = [
-          (sources."concat-stream-1.5.2" // {
+          (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.0.6" // {
-                dependencies = [
-                  sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
-                  sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-0.10.31"
-                  sources."util-deprecate-1.0.2"
-                ];
-              })
-            ];
-          })
-          (sources."npmlog-3.1.2" // {
-            dependencies = [
-              (sources."are-we-there-yet-1.1.2" // {
-                dependencies = [
-                  sources."delegates-1.0.0"
-                ];
-              })
-              sources."console-control-strings-1.1.0"
-              (sources."gauge-2.6.0" // {
-                dependencies = [
-                  sources."has-color-0.1.7"
-                  sources."object-assign-4.1.0"
-                  sources."signal-exit-3.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."wide-align-1.1.0"
-                ];
-              })
-              sources."set-blocking-2.0.0"
             ];
           })
         ];
       })
       sources."npm-user-validate-0.1.5"
-      (sources."npmlog-4.0.1" // {
+      (sources."npmlog-4.0.2" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
@@ -31126,11 +30501,11 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.1" // {
+          (sources."gauge-2.7.2" // {
             dependencies = [
-              sources."has-color-0.1.7"
-              sources."object-assign-4.1.0"
-              sources."signal-exit-3.0.1"
+              sources."supports-color-0.2.0"
+              sources."object-assign-4.1.1"
+              sources."signal-exit-3.0.2"
               (sources."string-width-1.0.2" // {
                 dependencies = [
                   sources."code-point-at-1.1.0"
@@ -31149,7 +30524,7 @@ in
       })
       sources."once-1.4.0"
       sources."opener-1.4.2"
-      (sources."osenv-0.1.3" // {
+      (sources."osenv-0.1.4" // {
         dependencies = [
           sources."os-homedir-1.0.2"
           sources."os-tmpdir-1.0.2"
@@ -31158,7 +30533,7 @@ in
       sources."path-is-inside-1.0.2"
       (sources."read-1.0.7" // {
         dependencies = [
-          sources."mute-stream-0.0.6"
+          sources."mute-stream-0.0.7"
         ];
       })
       sources."read-cmd-shim-1.0.1"
@@ -31192,7 +30567,7 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      (sources."readable-stream-2.1.5" // {
+      (sources."readable-stream-2.2.2" // {
         dependencies = [
           sources."buffer-shims-1.0.0"
           sources."core-util-is-1.0.2"
@@ -31203,7 +30578,7 @@ in
         ];
       })
       sources."realize-package-specifier-3.0.3"
-      (sources."request-2.78.0" // {
+      (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
           sources."aws4-1.5.0"
@@ -31243,7 +30618,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -31272,14 +30647,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -31290,12 +30665,11 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
-          sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
           sources."qs-6.3.0"
           sources."stringstream-0.0.5"
@@ -31307,7 +30681,7 @@ in
           sources."tunnel-agent-0.4.3"
         ];
       })
-      sources."retry-0.10.0"
+      sources."retry-0.10.1"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
@@ -31348,6 +30722,7 @@ in
         ];
       })
       sources."unpipe-1.0.0"
+      sources."uuid-3.0.1"
       (sources."validate-npm-package-name-2.2.2" // {
         dependencies = [
           sources."builtins-0.0.7"
@@ -31360,7 +30735,7 @@ in
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.2.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -31433,12 +30808,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -31457,7 +30832,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -31486,14 +30861,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -31504,9 +30879,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -31518,7 +30893,7 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.0"
+              sources."uuid-3.0.1"
             ];
           })
           sources."graceful-fs-2.0.3"
@@ -31559,7 +30934,7 @@ in
           })
           sources."retry-0.6.0"
           sources."couch-login-0.1.20"
-          (sources."npmlog-4.0.1" // {
+          (sources."npmlog-4.0.2" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
@@ -31578,13 +30953,13 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.1" // {
+              (sources."gauge-2.7.2" // {
                 dependencies = [
                   sources."aproba-1.0.4"
-                  sources."has-color-0.1.7"
+                  sources."supports-color-0.2.0"
                   sources."has-unicode-2.0.1"
-                  sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.1"
+                  sources."object-assign-4.1.1"
+                  sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -31597,7 +30972,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."wide-align-1.1.0"
@@ -31712,7 +31087,7 @@ in
         ];
       })
       sources."findit-1.2.0"
-      sources."coffee-script-1.11.1"
+      sources."coffee-script-1.12.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -31724,25 +31099,25 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.6";
+    version = "2.8.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.6.tgz";
-      sha1 = "9e3a0865b29dfc9af8c3d53d95b43f4bc6b1f212";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.9.tgz";
+      sha1 = "c084b087a08ecf9292352e2cd591de903f8129c3";
     };
     dependencies = [
-      sources."bluebird-3.4.6"
+      sources."bluebird-3.4.7"
       (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."ansi-regex-2.1.1"
             ];
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           sources."supports-color-2.0.0"
@@ -31776,7 +31151,7 @@ in
           sources."jju-1.3.0"
         ];
       })
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       sources."node-alias-1.0.4"
       (sources."npm-3.10.10" // {
         dependencies = [
@@ -31872,7 +31247,7 @@ in
               sources."promzard-0.3.0"
             ];
           })
-          sources."lockfile-1.0.2"
+          sources."lockfile-1.0.3"
           (sources."lodash._baseuniq-4.6.0" // {
             dependencies = [
               sources."lodash._createset-4.0.3"
@@ -31911,8 +31286,8 @@ in
                   (sources."gauge-2.6.0" // {
                     dependencies = [
                       sources."has-color-0.1.7"
-                      sources."object-assign-4.1.0"
-                      sources."signal-exit-3.0.1"
+                      sources."object-assign-4.1.1"
+                      sources."signal-exit-3.0.2"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
                           sources."code-point-at-1.1.0"
@@ -31933,7 +31308,7 @@ in
                 dependencies = [
                   (sources."array-index-1.0.0" // {
                     dependencies = [
-                      (sources."debug-2.3.3" // {
+                      (sources."debug-2.6.0" // {
                         dependencies = [
                           sources."ms-0.7.2"
                         ];
@@ -31970,11 +31345,12 @@ in
           sources."npm-package-arg-4.2.0"
           (sources."npm-registry-client-7.2.1" // {
             dependencies = [
-              (sources."concat-stream-1.5.2" // {
+              (sources."concat-stream-1.6.0" // {
                 dependencies = [
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.0.6" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
+                      sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."process-nextick-args-1.0.7"
@@ -31995,8 +31371,8 @@ in
                   (sources."gauge-2.6.0" // {
                     dependencies = [
                       sources."has-color-0.1.7"
-                      sources."object-assign-4.1.0"
-                      sources."signal-exit-3.0.1"
+                      sources."object-assign-4.1.1"
+                      sources."signal-exit-3.0.2"
                       (sources."string-width-1.0.2" // {
                         dependencies = [
                           sources."code-point-at-1.1.0"
@@ -32016,7 +31392,7 @@ in
             ];
           })
           sources."npm-user-validate-0.1.5"
-          (sources."npmlog-4.0.1" // {
+          (sources."npmlog-4.0.2" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
@@ -32024,11 +31400,11 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.1" // {
+              (sources."gauge-2.7.2" // {
                 dependencies = [
-                  sources."has-color-0.1.7"
-                  sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.1"
+                  sources."supports-color-0.2.0"
+                  sources."object-assign-4.1.1"
+                  sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -32047,7 +31423,7 @@ in
           })
           sources."once-1.4.0"
           sources."opener-1.4.2"
-          (sources."osenv-0.1.3" // {
+          (sources."osenv-0.1.4" // {
             dependencies = [
               sources."os-homedir-1.0.2"
               sources."os-tmpdir-1.0.2"
@@ -32056,7 +31432,7 @@ in
           sources."path-is-inside-1.0.2"
           (sources."read-1.0.7" // {
             dependencies = [
-              sources."mute-stream-0.0.6"
+              sources."mute-stream-0.0.7"
             ];
           })
           sources."read-cmd-shim-1.0.1"
@@ -32136,7 +31512,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -32165,14 +31541,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -32183,9 +31559,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."node-uuid-1.4.7"
@@ -32200,7 +31576,7 @@ in
               sources."tunnel-agent-0.4.3"
             ];
           })
-          sources."retry-0.10.0"
+          sources."retry-0.10.1"
           sources."rimraf-2.5.4"
           sources."sha-2.0.1"
           sources."slide-1.1.6"
@@ -32232,7 +31608,7 @@ in
           })
           sources."wrappy-1.0.2"
           sources."write-file-atomic-1.2.0"
-          sources."ansi-regex-2.0.0"
+          sources."ansi-regex-2.1.1"
           sources."debuglog-1.0.1"
           sources."imurmurhash-0.1.4"
           sources."lodash._baseindexof-3.1.0"
@@ -32263,7 +31639,7 @@ in
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
       sources."spawn-please-0.2.0"
-      (sources."update-notifier-1.0.2" // {
+      (sources."update-notifier-1.0.3" // {
         dependencies = [
           (sources."boxen-0.6.0" // {
             dependencies = [
@@ -32271,7 +31647,7 @@ in
               sources."camelcase-2.1.1"
               sources."cli-boxes-1.0.0"
               sources."filled-array-1.1.0"
-              sources."object-assign-4.1.0"
+              sources."object-assign-4.1.1"
               (sources."repeating-2.0.1" // {
                 dependencies = [
                   (sources."is-finite-1.0.2" // {
@@ -32291,7 +31667,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                 ];
@@ -32312,15 +31688,15 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              sources."object-assign-4.1.0"
+              sources."object-assign-4.1.1"
               sources."os-tmpdir-1.0.2"
-              (sources."osenv-0.1.3" // {
+              (sources."osenv-0.1.4" // {
                 dependencies = [
                   sources."os-homedir-1.0.2"
                 ];
               })
               sources."uuid-2.0.3"
-              (sources."write-file-atomic-1.2.0" // {
+              (sources."write-file-atomic-1.3.1" // {
                 dependencies = [
                   sources."imurmurhash-0.1.4"
                   sources."slide-1.1.6"
@@ -32346,7 +31722,7 @@ in
                       sources."is-stream-1.1.0"
                       sources."lowercase-keys-1.0.0"
                       sources."node-status-codes-1.0.0"
-                      sources."object-assign-4.1.0"
+                      sources."object-assign-4.1.1"
                       (sources."parse-json-2.2.0" // {
                         dependencies = [
                           (sources."error-ex-1.3.0" // {
@@ -32373,7 +31749,7 @@ in
                           sources."util-deprecate-1.0.2"
                         ];
                       })
-                      sources."timed-out-3.0.0"
+                      sources."timed-out-3.1.3"
                       sources."unzip-response-1.0.2"
                       (sources."url-parse-lax-1.0.0" // {
                         dependencies = [
@@ -32424,7 +31800,7 @@ in
     meta = {
       description = "Find newer versions of dependencies than what your package.json or bower.json allows";
       homepage = https://github.com/tjunnone/npm-check-updates;
-      license = "MIT";
+      license = "Apache-2.0";
     };
     production = true;
   };
@@ -32444,13 +31820,13 @@ in
           sources."is-arguments-1.0.2"
         ];
       })
-      (sources."body-parser-1.15.2" // {
+      (sources."body-parser-1.16.0" // {
         dependencies = [
           sources."bytes-2.4.0"
           sources."content-type-1.0.2"
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
           sources."depd-1.1.0"
@@ -32461,14 +31837,14 @@ in
               sources."statuses-1.3.1"
             ];
           })
-          sources."iconv-lite-0.4.13"
+          sources."iconv-lite-0.4.15"
           (sources."on-finished-2.3.0" // {
             dependencies = [
               sources."ee-first-1.1.1"
             ];
           })
-          sources."qs-6.2.0"
-          (sources."raw-body-2.1.7" // {
+          sources."qs-6.2.1"
+          (sources."raw-body-2.2.0" // {
             dependencies = [
               sources."unpipe-1.0.0"
             ];
@@ -32476,9 +31852,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -32489,9 +31865,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -32499,7 +31875,7 @@ in
           sources."bytes-2.3.0"
           (sources."compressible-2.0.9" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           (sources."debug-2.2.0" // {
@@ -32513,7 +31889,7 @@ in
       })
       (sources."connect-busboy-0.0.2" // {
         dependencies = [
-          (sources."busboy-0.2.13" // {
+          (sources."busboy-0.2.14" // {
             dependencies = [
               (sources."dicer-0.2.5" // {
                 dependencies = [
@@ -32541,9 +31917,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -32578,10 +31954,10 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.1.2" // {
+          (sources."proxy-addr-1.1.3" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.1.1"
+              sources."ipaddr.js-1.2.0"
             ];
           })
           sources."qs-6.2.0"
@@ -32604,9 +31980,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -32658,7 +32034,7 @@ in
                   sources."amdefine-1.0.1"
                 ];
               })
-              (sources."uglify-js-2.7.4" // {
+              (sources."uglify-js-2.7.5" // {
                 dependencies = [
                   sources."async-0.2.10"
                   sources."source-map-0.5.6"
@@ -32672,7 +32048,7 @@ in
                             dependencies = [
                               (sources."align-text-0.1.4" // {
                                 dependencies = [
-                                  (sources."kind-of-3.0.4" // {
+                                  (sources."kind-of-3.1.0" // {
                                     dependencies = [
                                       sources."is-buffer-1.1.4"
                                     ];
@@ -32688,7 +32064,7 @@ in
                             dependencies = [
                               (sources."align-text-0.1.4" // {
                                 dependencies = [
-                                  (sources."kind-of-3.0.4" // {
+                                  (sources."kind-of-3.1.0" // {
                                     dependencies = [
                                       sources."is-buffer-1.1.4"
                                     ];
@@ -32790,12 +32166,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -32814,7 +32190,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -32843,14 +32219,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -32861,9 +32237,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -32875,7 +32251,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.0"
+          sources."uuid-3.0.1"
         ];
       })
       sources."semver-5.3.0"
@@ -32887,14 +32263,14 @@ in
           sources."parseurl-1.3.1"
         ];
       })
-      (sources."service-runner-2.1.11" // {
+      (sources."service-runner-2.1.13" // {
         dependencies = [
-          sources."bluebird-3.4.6"
+          sources."bluebird-3.4.7"
           (sources."bunyan-1.8.5" // {
             dependencies = [
               (sources."dtrace-provider-0.8.0" // {
                 dependencies = [
-                  sources."nan-2.4.0"
+                  sources."nan-2.5.0"
                 ];
               })
               (sources."mv-2.1.1" // {
@@ -32938,7 +32314,7 @@ in
                 ];
               })
               sources."safe-json-stringify-1.0.3"
-              sources."moment-2.17.0"
+              sources."moment-2.17.1"
             ];
           })
           sources."bunyan-syslog-udp-0.1.0"
@@ -32968,19 +32344,7 @@ in
                   sources."ms-0.7.2"
                   (sources."msgpack5-3.4.1" // {
                     dependencies = [
-                      (sources."bl-1.1.2" // {
-                        dependencies = [
-                          (sources."readable-stream-2.0.6" // {
-                            dependencies = [
-                              sources."core-util-is-1.0.2"
-                              sources."isarray-1.0.0"
-                              sources."process-nextick-args-1.0.7"
-                              sources."string_decoder-0.10.31"
-                              sources."util-deprecate-1.0.2"
-                            ];
-                          })
-                        ];
-                      })
+                      sources."bl-1.2.0"
                       sources."inherits-2.0.3"
                     ];
                   })
@@ -33005,10 +32369,10 @@ in
                 dependencies = [
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
-                  sources."wrap-ansi-2.0.0"
+                  sources."wrap-ansi-2.1.0"
                 ];
               })
               sources."decamelize-1.2.0"
@@ -33110,7 +32474,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                 ];
@@ -33134,10 +32498,10 @@ in
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
-              sources."wrap-ansi-2.0.0"
+              sources."wrap-ansi-2.1.0"
             ];
           })
           sources."decamelize-1.2.0"
@@ -33239,7 +32603,7 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
             ];
@@ -33266,10 +32630,10 @@ in
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.36.0";
+    version = "0.36.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.0.tgz";
-      sha1 = "fe3b087f07389ca1c2fd3d71e38a7971d5508924";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.1.tgz";
+      sha1 = "7d2009b814b5b3a2ca573cabea1f2873a4be4a14";
     };
     dependencies = [
       (sources."airplayer-2.0.0" // {
@@ -33286,12 +32650,13 @@ in
                   sources."big-integer-1.6.17"
                 ];
               })
-              (sources."concat-stream-1.5.2" // {
+              (sources."concat-stream-1.6.0" // {
                 dependencies = [
                   sources."inherits-2.0.3"
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.0.6" // {
+                  (sources."readable-stream-2.2.2" // {
                     dependencies = [
+                      sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
                       sources."isarray-1.0.0"
                       sources."process-nextick-args-1.0.7"
@@ -33309,7 +32674,7 @@ in
                       sources."lodash-3.10.1"
                     ];
                   })
-                  sources."xmldom-0.1.22"
+                  sources."xmldom-0.1.27"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -33346,12 +32711,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -33369,7 +32734,7 @@ in
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                     ];
@@ -33380,7 +32745,7 @@ in
           })
           (sources."bonjour-3.5.0" // {
             dependencies = [
-              sources."array-flatten-2.1.0"
+              sources."array-flatten-2.1.1"
               sources."deep-equal-1.0.1"
               sources."dns-equal-1.0.0"
               (sources."dns-txt-2.0.2" // {
@@ -33419,7 +32784,7 @@ in
                           sources."array-find-index-1.0.2"
                         ];
                       })
-                      sources."signal-exit-3.0.1"
+                      sources."signal-exit-3.0.2"
                     ];
                   })
                   sources."map-obj-1.0.1"
@@ -33444,7 +32809,7 @@ in
                       })
                     ];
                   })
-                  sources."object-assign-4.1.0"
+                  sources."object-assign-4.1.1"
                   (sources."read-pkg-up-1.0.1" // {
                     dependencies = [
                       (sources."find-up-1.1.2" // {
@@ -33540,7 +32905,7 @@ in
               sources."escape-string-regexp-1.0.5"
               (sources."has-ansi-2.0.0" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
               sources."supports-color-2.0.0"
@@ -33562,12 +32927,13 @@ in
               sources."extend-3.0.0"
               (sources."spawn-sync-1.0.15" // {
                 dependencies = [
-                  (sources."concat-stream-1.5.2" // {
+                  (sources."concat-stream-1.6.0" // {
                     dependencies = [
                       sources."inherits-2.0.3"
                       sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.0.6" // {
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
+                          sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
                           sources."isarray-1.0.0"
                           sources."process-nextick-args-1.0.7"
@@ -33590,17 +32956,17 @@ in
           (sources."figures-1.7.0" // {
             dependencies = [
               sources."escape-string-regexp-1.0.5"
-              sources."object-assign-4.1.0"
+              sources."object-assign-4.1.1"
             ];
           })
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
           sources."mute-stream-0.0.6"
           (sources."pinkie-promise-2.0.1" // {
             dependencies = [
               sources."pinkie-2.0.4"
             ];
           })
-          (sources."run-async-2.2.0" // {
+          (sources."run-async-2.3.0" // {
             dependencies = [
               sources."is-promise-2.1.0"
             ];
@@ -33618,7 +32984,7 @@ in
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           sources."through-2.3.8"
@@ -33626,8 +32992,8 @@ in
       })
       sources."keypress-0.2.1"
       sources."mime-1.3.4"
-      sources."network-address-1.1.0"
-      sources."numeral-1.5.5"
+      sources."network-address-1.1.2"
+      sources."numeral-1.5.6"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
         dependencies = [
@@ -33645,18 +33011,18 @@ in
               sources."uniq-1.0.1"
             ];
           })
-          (sources."parse-torrent-file-4.0.0" // {
+          (sources."parse-torrent-file-4.0.1" // {
             dependencies = [
-              sources."bencode-0.10.0"
-              (sources."simple-sha1-2.0.8" // {
+              sources."bencode-0.11.0"
+              (sources."simple-sha1-2.1.0" // {
                 dependencies = [
-                  sources."rusha-0.8.4"
+                  sources."rusha-0.8.5"
                 ];
               })
               sources."uniq-1.0.1"
             ];
           })
-          (sources."simple-get-2.3.0" // {
+          (sources."simple-get-2.4.0" // {
             dependencies = [
               (sources."once-1.4.0" // {
                 dependencies = [
@@ -33669,7 +33035,7 @@ in
           })
         ];
       })
-      (sources."pump-1.0.1" // {
+      (sources."pump-1.0.2" // {
         dependencies = [
           (sources."end-of-stream-1.1.0" // {
             dependencies = [
@@ -33716,8 +33082,13 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."random-access-file-1.3.1" // {
+              (sources."random-access-file-1.4.0" // {
                 dependencies = [
+                  (sources."debug-2.6.0" // {
+                    dependencies = [
+                      sources."ms-0.7.2"
+                    ];
+                  })
                   sources."inherits-2.0.3"
                 ];
               })
@@ -33745,9 +33116,9 @@ in
               (sources."parse-torrent-file-2.1.4" // {
                 dependencies = [
                   sources."bencode-0.7.0"
-                  (sources."simple-sha1-2.0.8" // {
+                  (sources."simple-sha1-2.1.0" // {
                     dependencies = [
-                      sources."rusha-0.8.4"
+                      sources."rusha-0.8.5"
                     ];
                   })
                 ];
@@ -33833,9 +33204,9 @@ in
                           sources."randombytes-2.0.3"
                         ];
                       })
-                      (sources."k-rpc-socket-1.6.0" // {
+                      (sources."k-rpc-socket-1.6.1" // {
                         dependencies = [
-                          sources."bencode-0.10.0"
+                          sources."bencode-0.11.0"
                         ];
                       })
                     ];
@@ -33861,13 +33232,13 @@ in
                   })
                   sources."random-iterate-1.0.1"
                   sources."run-series-1.1.4"
-                  (sources."simple-get-2.3.0" // {
+                  (sources."simple-get-2.4.0" // {
                     dependencies = [
                       sources."simple-concat-1.0.0"
                       sources."unzip-response-2.0.1"
                     ];
                   })
-                  (sources."simple-peer-6.0.7" // {
+                  (sources."simple-peer-6.2.1" // {
                     dependencies = [
                       sources."get-browser-rtc-1.0.2"
                       sources."randombytes-2.0.3"
@@ -33883,7 +33254,7 @@ in
                       })
                     ];
                   })
-                  (sources."simple-websocket-4.1.0" // {
+                  (sources."simple-websocket-4.2.0" // {
                     dependencies = [
                       (sources."readable-stream-2.2.2" // {
                         dependencies = [
@@ -33912,7 +33283,7 @@ in
                   })
                 ];
               })
-              (sources."debug-2.3.3" // {
+              (sources."debug-2.6.0" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -33939,10 +33310,10 @@ in
   peerflix-server = nodeEnv.buildNodePackage {
     name = "peerflix-server";
     packageName = "peerflix-server";
-    version = "0.1.1";
+    version = "0.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz";
-      sha1 = "683d54067d44699b2eff8bfc793e780df2912666";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz";
+      sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6";
     };
     dependencies = [
       (sources."connect-multiparty-1.2.5" // {
@@ -34079,7 +33450,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."pump-1.0.1" // {
+      (sources."pump-1.0.2" // {
         dependencies = [
           (sources."end-of-stream-1.1.0" // {
             dependencies = [
@@ -34116,9 +33487,9 @@ in
               (sources."parse-torrent-file-2.1.4" // {
                 dependencies = [
                   sources."bencode-0.7.0"
-                  (sources."simple-sha1-2.0.8" // {
+                  (sources."simple-sha1-2.1.0" // {
                     dependencies = [
-                      sources."rusha-0.8.4"
+                      sources."rusha-0.8.5"
                     ];
                   })
                 ];
@@ -34159,37 +33530,32 @@ in
           sources."xtend-4.0.1"
         ];
       })
-      (sources."socket.io-1.6.0" // {
+      (sources."socket.io-1.7.2" // {
         dependencies = [
           (sources."debug-2.3.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
           })
-          (sources."engine.io-1.8.0" // {
+          (sources."engine.io-1.8.2" // {
             dependencies = [
               (sources."accepts-1.3.3" // {
                 dependencies = [
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   sources."negotiator-0.6.1"
                 ];
               })
-              sources."base64id-0.1.0"
-              (sources."engine.io-parser-1.3.1" // {
+              sources."base64id-1.0.0"
+              (sources."engine.io-parser-1.3.2" // {
                 dependencies = [
-                  sources."after-0.8.1"
+                  sources."after-0.8.2"
                   sources."arraybuffer.slice-0.0.6"
                   sources."base64-arraybuffer-0.1.5"
                   sources."blob-0.0.4"
-                  (sources."has-binary-0.1.6" // {
-                    dependencies = [
-                      sources."isarray-0.0.1"
-                    ];
-                  })
                   sources."wtf-8-1.0.0"
                 ];
               })
@@ -34209,25 +33575,20 @@ in
           })
           sources."object-assign-4.1.0"
           sources."socket.io-adapter-0.5.0"
-          (sources."socket.io-client-1.6.0" // {
+          (sources."socket.io-client-1.7.2" // {
             dependencies = [
               sources."backo2-1.0.2"
               sources."component-bind-1.0.0"
               sources."component-emitter-1.2.1"
-              (sources."engine.io-client-1.8.0" // {
+              (sources."engine.io-client-1.8.2" // {
                 dependencies = [
                   sources."component-inherit-0.0.3"
-                  (sources."engine.io-parser-1.3.1" // {
+                  (sources."engine.io-parser-1.3.2" // {
                     dependencies = [
-                      sources."after-0.8.1"
+                      sources."after-0.8.2"
                       sources."arraybuffer.slice-0.0.6"
                       sources."base64-arraybuffer-0.1.5"
                       sources."blob-0.0.4"
-                      (sources."has-binary-0.1.6" // {
-                        dependencies = [
-                          sources."isarray-0.0.1"
-                        ];
-                      })
                       sources."wtf-8-1.0.0"
                     ];
                   })
@@ -34296,7 +33657,7 @@ in
               sources."addr-to-ip-port-1.4.2"
               sources."bencode-0.7.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.3.3" // {
+              (sources."debug-2.6.0" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -34308,7 +33669,7 @@ in
                 ];
               })
               sources."k-bucket-0.5.0"
-              sources."network-address-1.1.0"
+              sources."network-address-1.1.2"
               (sources."once-1.4.0" // {
                 dependencies = [
                   sources."wrappy-1.0.2"
@@ -34333,7 +33694,7 @@ in
               sources."bencode-0.6.0"
               sources."bn.js-1.3.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.3.3" // {
+              (sources."debug-2.6.0" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -34405,9 +33766,9 @@ in
               (sources."parse-torrent-file-2.1.4" // {
                 dependencies = [
                   sources."bencode-0.7.0"
-                  (sources."simple-sha1-2.0.8" // {
+                  (sources."simple-sha1-2.1.0" // {
                     dependencies = [
-                      sources."rusha-0.8.4"
+                      sources."rusha-0.8.5"
                     ];
                   })
                 ];
@@ -34477,7 +33838,7 @@ in
         dependencies = [
           (sources."async-2.1.4" // {
             dependencies = [
-              sources."lodash-4.17.2"
+              sources."lodash-4.17.4"
             ];
           })
           (sources."which-1.2.12" // {
@@ -34612,15 +33973,15 @@ in
             dependencies = [
               (sources."async-2.1.4" // {
                 dependencies = [
-                  sources."lodash-4.17.2"
+                  sources."lodash-4.17.4"
                 ];
               })
             ];
           })
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."node-uuid-1.4.7"
@@ -34637,14 +33998,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -34678,12 +34039,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -34702,7 +34063,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -34791,10 +34152,10 @@ in
           })
           sources."private-0.1.6"
           sources."q-1.4.1"
-          (sources."recast-0.11.17" // {
+          (sources."recast-0.11.20" // {
             dependencies = [
-              sources."ast-types-0.9.2"
-              sources."esprima-3.1.1"
+              sources."ast-types-0.9.4"
+              sources."esprima-3.1.3"
               sources."source-map-0.5.6"
             ];
           })
@@ -34889,7 +34250,7 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -34943,12 +34304,12 @@ in
                           sources."escape-string-regexp-1.0.5"
                           (sources."has-ansi-2.0.0" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           (sources."strip-ansi-3.0.1" // {
                             dependencies = [
-                              sources."ansi-regex-2.0.0"
+                              sources."ansi-regex-2.1.1"
                             ];
                           })
                           sources."supports-color-2.0.0"
@@ -34967,7 +34328,7 @@ in
                               sources."is-property-1.0.2"
                             ];
                           })
-                          sources."jsonpointer-4.0.0"
+                          sources."jsonpointer-4.0.1"
                           sources."xtend-4.0.1"
                         ];
                       })
@@ -34996,14 +34357,14 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.10.1" // {
+                      (sources."sshpk-1.10.2" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
-                          sources."dashdash-1.14.0"
+                          sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
                           sources."jsbn-0.1.0"
-                          sources."tweetnacl-0.14.3"
+                          sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.0"
@@ -35014,9 +34375,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.13" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.25.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
@@ -35028,7 +34389,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.4.3"
-                  sources."uuid-3.0.0"
+                  sources."uuid-3.0.1"
                 ];
               })
             ];
@@ -35038,7 +34399,7 @@ in
               sources."sax-1.2.1"
               (sources."xmlbuilder-4.2.1" // {
                 dependencies = [
-                  sources."lodash-4.17.2"
+                  sources."lodash-4.17.4"
                 ];
               })
             ];
@@ -35090,9 +34451,9 @@ in
         dependencies = [
           (sources."accepts-1.2.13" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."negotiator-0.5.3"
@@ -35177,9 +34538,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -35198,24 +34559,24 @@ in
           })
         ];
       })
-      (sources."body-parser-1.15.2" // {
+      (sources."body-parser-1.16.0" // {
         dependencies = [
           sources."bytes-2.4.0"
           sources."content-type-1.0.2"
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
           sources."depd-1.1.0"
-          sources."iconv-lite-0.4.13"
+          sources."iconv-lite-0.4.15"
           (sources."on-finished-2.3.0" // {
             dependencies = [
               sources."ee-first-1.1.1"
             ];
           })
-          sources."qs-6.2.0"
-          (sources."raw-body-2.1.7" // {
+          sources."qs-6.2.1"
+          (sources."raw-body-2.2.0" // {
             dependencies = [
               sources."unpipe-1.0.0"
             ];
@@ -35223,9 +34584,9 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -35236,9 +34597,9 @@ in
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -35247,7 +34608,7 @@ in
           sources."bytes-2.3.0"
           (sources."compressible-2.0.9" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           (sources."debug-2.2.0" // {
@@ -35305,12 +34666,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -35324,7 +34685,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -35353,14 +34714,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -35371,9 +34732,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -35385,7 +34746,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.0"
+          sources."uuid-3.0.1"
         ];
       })
       sources."async-0.9.2"
@@ -35401,7 +34762,7 @@ in
         dependencies = [
           (sources."dtrace-provider-0.8.0" // {
             dependencies = [
-              sources."nan-2.4.0"
+              sources."nan-2.5.0"
             ];
           })
           (sources."mv-2.1.1" // {
@@ -35440,7 +34801,7 @@ in
             ];
           })
           sources."safe-json-stringify-1.0.3"
-          sources."moment-2.17.0"
+          sources."moment-2.17.1"
         ];
       })
       (sources."handlebars-2.0.0" // {
@@ -35479,7 +34840,7 @@ in
               sources."uc.micro-1.0.3"
             ];
           })
-          (sources."sanitize-html-1.13.0" // {
+          (sources."sanitize-html-1.14.1" // {
             dependencies = [
               (sources."htmlparser2-3.9.2" // {
                 dependencies = [
@@ -35515,9 +34876,9 @@ in
         ];
       })
       sources."jju-1.3.0"
-      (sources."JSONStream-1.2.1" // {
+      (sources."JSONStream-1.3.0" // {
         dependencies = [
-          sources."jsonparse-1.2.0"
+          sources."jsonparse-1.3.0"
           sources."through-2.3.8"
         ];
       })
@@ -35544,12 +34905,12 @@ in
       })
       (sources."fs-ext-0.5.0" // {
         dependencies = [
-          sources."nan-2.4.0"
+          sources."nan-2.5.0"
         ];
       })
       (sources."crypt3-0.2.0" // {
         dependencies = [
-          sources."nan-2.4.0"
+          sources."nan-2.5.0"
         ];
       })
     ];
@@ -35646,13 +35007,13 @@ in
           (sources."csv-0.4.6" // {
             dependencies = [
               sources."csv-generate-0.0.6"
-              sources."csv-parse-1.1.7"
+              sources."csv-parse-1.1.10"
               sources."stream-transform-0.1.1"
               sources."csv-stringify-0.0.8"
             ];
           })
           sources."escape-regexp-component-1.0.2"
-          sources."formidable-1.0.17"
+          sources."formidable-1.1.1"
           (sources."http-signature-0.11.0" // {
             dependencies = [
               sources."asn1-0.1.11"
@@ -35691,7 +35052,7 @@ in
           })
           (sources."dtrace-provider-0.6.0" // {
             dependencies = [
-              sources."nan-2.4.0"
+              sources."nan-2.5.0"
             ];
           })
         ];
@@ -35700,7 +35061,7 @@ in
         dependencies = [
           (sources."dtrace-provider-0.6.0" // {
             dependencies = [
-              sources."nan-2.4.0"
+              sources."nan-2.5.0"
             ];
           })
           (sources."mv-2.1.1" // {
@@ -35786,7 +35147,7 @@ in
               sources."asn1-0.2.3"
               sources."assert-plus-0.2.0"
               sources."jsbn-0.1.0"
-              sources."tweetnacl-0.14.3"
+              sources."tweetnacl-0.14.5"
               sources."jodid25519-1.0.2"
               sources."ecc-jsbn-0.1.1"
             ];
@@ -35853,7 +35214,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -35934,7 +35295,7 @@ in
       })
       (sources."csso-2.2.1" // {
         dependencies = [
-          (sources."clap-1.1.1" // {
+          (sources."clap-1.1.2" // {
             dependencies = [
               (sources."chalk-1.1.3" // {
                 dependencies = [
@@ -35942,12 +35303,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -35978,7 +35339,7 @@ in
     dependencies = [
       (sources."async-2.1.2" // {
         dependencies = [
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
         ];
       })
       sources."colors-1.1.2"
@@ -36045,7 +35406,7 @@ in
                 dependencies = [
                   (sources."async-2.1.4" // {
                     dependencies = [
-                      sources."lodash-4.17.2"
+                      sources."lodash-4.17.4"
                     ];
                   })
                 ];
@@ -36058,12 +35419,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -36082,7 +35443,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -36111,14 +35472,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -36129,9 +35490,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -36157,7 +35518,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.0.4" // {
+                              (sources."kind-of-3.1.0" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -36173,7 +35534,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.0.4" // {
+                              (sources."kind-of-3.1.0" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.4"
                                 ];
@@ -36221,12 +35582,12 @@ in
                   sources."escape-string-regexp-1.0.5"
                   (sources."has-ansi-2.0.0" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."supports-color-2.0.0"
@@ -36245,7 +35606,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -36274,14 +35635,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -36292,9 +35653,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."node-uuid-1.4.7"
@@ -36341,10 +35702,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.0.10";
+    version = "2.1.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz";
-      sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz";
+      sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -36357,10 +35718,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.7.4";
+    version = "2.7.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
-      sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
+      sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
     };
     dependencies = [
       sources."async-0.2.10"
@@ -36375,7 +35736,7 @@ in
                 dependencies = [
                   (sources."align-text-0.1.4" // {
                     dependencies = [
-                      (sources."kind-of-3.0.4" // {
+                      (sources."kind-of-3.1.0" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -36391,7 +35752,7 @@ in
                 dependencies = [
                   (sources."align-text-0.1.4" // {
                     dependencies = [
-                      (sources."kind-of-3.0.4" // {
+                      (sources."kind-of-3.1.0" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -36421,15 +35782,15 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "0.10.3";
+    version = "1.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-0.10.3.tgz";
-      sha1 = "7d4635b9a359c8db06c313374544f27a3890f63c";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz";
+      sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418";
     };
     dependencies = [
-      sources."async-2.0.1"
-      sources."bluebird-3.3.5"
-      sources."blueimp-md5-2.3.1"
+      sources."async-2.1.4"
+      sources."bluebird-3.4.7"
+      sources."blueimp-md5-2.6.0"
       (sources."body-parser-1.15.2" // {
         dependencies = [
           sources."bytes-2.4.0"
@@ -36462,26 +35823,30 @@ in
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
           })
         ];
       })
-      (sources."color-0.11.4" // {
+      (sources."color-1.0.3" // {
         dependencies = [
-          sources."clone-1.0.2"
-          (sources."color-convert-1.8.2" // {
+          (sources."color-convert-1.9.0" // {
             dependencies = [
               sources."color-name-1.1.1"
             ];
           })
-          (sources."color-string-0.3.0" // {
+          (sources."color-string-1.4.0" // {
             dependencies = [
               sources."color-name-1.1.1"
+              (sources."simple-swizzle-0.2.2" // {
+                dependencies = [
+                  sources."is-arrayish-0.3.1"
+                ];
+              })
             ];
           })
         ];
@@ -36493,27 +35858,38 @@ in
         ];
       })
       sources."crossroads-0.12.2"
-      (sources."diff2html-1.2.0" // {
+      (sources."diff2html-2.0.12" // {
         dependencies = [
-          sources."diff-2.2.3"
-        ];
-      })
-      (sources."express-4.13.4" // {
-        dependencies = [
-          (sources."accepts-1.2.13" // {
+          sources."diff-3.2.0"
+          (sources."hogan.js-3.0.2" // {
             dependencies = [
-              (sources."mime-types-2.1.13" // {
+              (sources."nopt-1.0.10" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."abbrev-1.0.9"
                 ];
               })
-              sources."negotiator-0.5.3"
+              sources."mkdirp-0.3.0"
+            ];
+          })
+          sources."whatwg-fetch-2.0.2"
+        ];
+      })
+      (sources."express-4.14.0" // {
+        dependencies = [
+          (sources."accepts-1.3.3" // {
+            dependencies = [
+              (sources."mime-types-2.1.14" // {
+                dependencies = [
+                  sources."mime-db-1.26.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.1.5"
+          sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
           (sources."debug-2.2.0" // {
             dependencies = [
@@ -36521,10 +35897,12 @@ in
             ];
           })
           sources."depd-1.1.0"
+          sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."etag-1.7.0"
-          (sources."finalhandler-0.4.1" // {
+          (sources."finalhandler-0.5.0" // {
             dependencies = [
+              sources."statuses-1.3.1"
               sources."unpipe-1.0.0"
             ];
           })
@@ -36538,46 +35916,47 @@ in
           })
           sources."parseurl-1.3.1"
           sources."path-to-regexp-0.1.7"
-          (sources."proxy-addr-1.0.10" // {
+          (sources."proxy-addr-1.1.3" // {
             dependencies = [
               sources."forwarded-0.1.0"
-              sources."ipaddr.js-1.0.5"
+              sources."ipaddr.js-1.2.0"
             ];
           })
-          sources."qs-4.0.0"
-          sources."range-parser-1.0.3"
-          (sources."send-0.13.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.3.1" // {
+              (sources."http-errors-1.5.1" // {
                 dependencies = [
                   sources."inherits-2.0.3"
+                  sources."setprototypeof-1.0.2"
                 ];
               })
               sources."mime-1.3.4"
               sources."ms-0.7.1"
-              sources."statuses-1.2.1"
+              sources."statuses-1.3.1"
             ];
           })
           (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
           })
           sources."utils-merge-1.0.0"
-          sources."vary-1.0.1"
+          sources."vary-1.1.0"
         ];
       })
-      (sources."express-session-1.13.0" // {
+      (sources."express-session-1.14.2" // {
         dependencies = [
-          sources."cookie-0.2.3"
+          sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
-          sources."crc-3.4.0"
+          sources."crc-3.4.1"
           (sources."debug-2.2.0" // {
             dependencies = [
               sources."ms-0.7.1"
@@ -36586,9 +35965,10 @@ in
           sources."depd-1.1.0"
           sources."on-headers-1.0.1"
           sources."parseurl-1.3.1"
-          (sources."uid-safe-2.0.0" // {
+          (sources."uid-safe-2.1.3" // {
             dependencies = [
-              sources."base64-url-1.2.1"
+              sources."base64-url-1.3.3"
+              sources."random-bytes-1.0.0"
             ];
           })
           sources."utils-merge-1.0.0"
@@ -36713,32 +36093,40 @@ in
             dependencies = [
               sources."eachr-3.2.0"
               sources."editions-1.3.3"
-              sources."typechecker-4.4.0"
+              sources."typechecker-4.4.1"
             ];
           })
         ];
       })
       sources."hasher-1.2.0"
+      sources."ignore-3.2.0"
       (sources."keen.io-0.1.3" // {
         dependencies = [
           sources."underscore-1.5.2"
         ];
       })
       sources."knockout-3.4.1"
-      sources."lodash-4.12.0"
+      sources."lodash-4.17.4"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.13.0"
-      (sources."npm-3.9.6" // {
+      sources."moment-2.17.1"
+      (sources."npm-4.1.2" // {
         dependencies = [
+          (sources."JSONStream-1.3.0" // {
+            dependencies = [
+              sources."jsonparse-1.3.0"
+              sources."through-2.3.8"
+            ];
+          })
           sources."abbrev-1.0.9"
           sources."ansicolors-0.3.2"
           sources."ansistyles-0.1.3"
           sources."aproba-1.0.4"
           sources."archy-1.0.0"
+          sources."asap-2.0.5"
           sources."chownr-1.0.1"
           sources."cmd-shim-2.0.2"
           (sources."columnify-1.5.4" // {
@@ -36759,16 +36147,12 @@ in
               sources."proto-list-1.2.4"
             ];
           })
-          (sources."dezalgo-1.0.3" // {
-            dependencies = [
-              sources."asap-2.0.5"
-            ];
-          })
+          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.1.1" // {
+          (sources."fstream-npm-1.2.0" // {
             dependencies = [
               (sources."fstream-ignore-1.0.5" // {
                 dependencies = [
@@ -36786,7 +36170,7 @@ in
               })
             ];
           })
-          (sources."glob-7.0.6" // {
+          (sources."glob-7.1.1" // {
             dependencies = [
               sources."fs.realpath-1.0.0"
               (sources."minimatch-3.0.3" // {
@@ -36829,83 +36213,71 @@ in
               sources."promzard-0.3.0"
             ];
           })
-          sources."lockfile-1.0.2"
+          sources."lockfile-1.0.3"
           (sources."lodash._baseuniq-4.6.0" // {
             dependencies = [
               sources."lodash._createset-4.0.3"
               sources."lodash._root-3.0.1"
             ];
           })
-          (sources."lodash.clonedeep-4.3.2" // {
+          sources."lodash.clonedeep-4.5.0"
+          sources."lodash.union-4.6.0"
+          sources."lodash.uniq-4.5.0"
+          sources."lodash.without-4.4.0"
+          (sources."mississippi-1.2.0" // {
             dependencies = [
-              sources."lodash._baseclone-4.5.7"
-            ];
-          })
-          (sources."lodash.union-4.4.0" // {
-            dependencies = [
-              sources."lodash._baseflatten-4.2.1"
-              sources."lodash.rest-4.0.5"
-            ];
-          })
-          sources."lodash.uniq-4.3.0"
-          (sources."lodash.without-4.2.0" // {
-            dependencies = [
-              (sources."lodash._basedifference-4.5.0" // {
+              (sources."concat-stream-1.6.0" // {
                 dependencies = [
-                  sources."lodash._root-3.0.1"
+                  sources."typedarray-0.0.6"
+                ];
+              })
+              (sources."duplexify-3.5.0" // {
+                dependencies = [
+                  (sources."end-of-stream-1.0.0" // {
+                    dependencies = [
+                      sources."once-1.3.3"
+                    ];
+                  })
+                  sources."stream-shift-1.0.0"
+                ];
+              })
+              (sources."end-of-stream-1.1.0" // {
+                dependencies = [
+                  sources."once-1.3.3"
+                ];
+              })
+              sources."flush-write-stream-1.0.2"
+              sources."from2-2.3.0"
+              sources."pump-1.0.2"
+              sources."pumpify-1.3.5"
+              (sources."stream-each-1.2.0" // {
+                dependencies = [
+                  sources."stream-shift-1.0.0"
+                ];
+              })
+              (sources."through2-2.0.3" // {
+                dependencies = [
+                  sources."xtend-4.0.1"
                 ];
               })
-              sources."lodash.rest-4.0.5"
             ];
           })
-          (sources."node-gyp-3.3.1" // {
+          (sources."node-gyp-3.5.0" // {
             dependencies = [
-              (sources."glob-4.5.3" // {
+              (sources."minimatch-3.0.3" // {
                 dependencies = [
-                  (sources."minimatch-2.0.10" // {
+                  (sources."brace-expansion-1.1.6" // {
                     dependencies = [
-                      (sources."brace-expansion-1.1.6" // {
-                        dependencies = [
-                          sources."balanced-match-0.4.2"
-                          sources."concat-map-0.0.1"
-                        ];
-                      })
-                    ];
-                  })
-                ];
-              })
-              (sources."minimatch-1.0.0" // {
-                dependencies = [
-                  sources."lru-cache-2.7.3"
-                  sources."sigmund-1.0.1"
-                ];
-              })
-              (sources."path-array-1.0.1" // {
-                dependencies = [
-                  (sources."array-index-1.0.0" // {
-                    dependencies = [
-                      (sources."debug-2.3.3" // {
-                        dependencies = [
-                          sources."ms-0.7.2"
-                        ];
-                      })
-                      (sources."es6-symbol-3.1.0" // {
-                        dependencies = [
-                          sources."d-0.1.1"
-                          (sources."es5-ext-0.10.12" // {
-                            dependencies = [
-                              sources."es6-iterator-2.0.0"
-                            ];
-                          })
-                        ];
-                      })
+                      sources."balanced-match-0.4.2"
+                      sources."concat-map-0.0.1"
                     ];
                   })
                 ];
               })
+              sources."nopt-3.0.6"
             ];
           })
-          sources."nopt-3.0.6"
+          sources."nopt-4.0.1"
           sources."normalize-git-url-3.0.2"
           (sources."normalize-package-data-2.3.5" // {
             dependencies = [
@@ -36918,28 +36290,40 @@ in
           })
           sources."npm-cache-filename-1.0.2"
           sources."npm-install-checks-3.0.0"
-          sources."npm-package-arg-4.1.1"
+          sources."npm-package-arg-4.2.0"
           sources."npm-user-validate-0.1.5"
-          (sources."npmlog-2.0.4" // {
+          (sources."npmlog-4.0.2" // {
             dependencies = [
-              sources."ansi-0.3.1"
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
                 ];
               })
-              (sources."gauge-1.2.7" // {
+              sources."console-control-strings-1.1.0"
+              (sources."gauge-2.7.2" // {
                 dependencies = [
-                  sources."lodash.pad-4.5.1"
-                  sources."lodash.padend-4.6.1"
-                  sources."lodash.padstart-4.6.1"
+                  sources."supports-color-0.2.0"
+                  sources."object-assign-4.1.1"
+                  sources."signal-exit-3.0.2"
+                  (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."wide-align-1.1.0"
                 ];
               })
+              sources."set-blocking-2.0.0"
             ];
           })
-          sources."once-1.3.3"
+          sources."once-1.4.0"
           sources."opener-1.4.2"
-          (sources."osenv-0.1.3" // {
+          (sources."osenv-0.1.4" // {
             dependencies = [
               sources."os-tmpdir-1.0.2"
             ];
@@ -36947,7 +36331,7 @@ in
           sources."path-is-inside-1.0.2"
           (sources."read-1.0.7" // {
             dependencies = [
-              sources."mute-stream-0.0.6"
+              sources."mute-stream-0.0.7"
             ];
           })
           sources."read-cmd-shim-1.0.1"
@@ -36981,7 +36365,7 @@ in
             ];
           })
           sources."read-package-tree-5.1.5"
-          (sources."readable-stream-2.1.5" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -36992,23 +36376,10 @@ in
             ];
           })
           sources."realize-package-specifier-3.0.3"
-          (sources."request-2.72.0" // {
+          (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
               sources."aws4-1.5.0"
-              (sources."bl-1.1.2" // {
-                dependencies = [
-                  (sources."readable-stream-2.0.6" // {
-                    dependencies = [
-                      sources."core-util-is-1.0.2"
-                      sources."isarray-1.0.0"
-                      sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-0.10.31"
-                      sources."util-deprecate-1.0.2"
-                    ];
-                  })
-                ];
-              })
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -37017,7 +36388,11 @@ in
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              sources."form-data-1.0.1"
+              (sources."form-data-2.1.2" // {
+                dependencies = [
+                  sources."asynckit-0.4.0"
+                ];
+              })
               (sources."har-validator-2.0.6" // {
                 dependencies = [
                   (sources."chalk-1.1.3" // {
@@ -37041,7 +36416,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -37070,14 +36445,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -37088,23 +36463,46 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
-              sources."node-uuid-1.4.7"
               sources."oauth-sign-0.8.2"
-              sources."qs-6.1.0"
+              sources."qs-6.3.0"
               sources."stringstream-0.0.5"
-              sources."tough-cookie-2.2.2"
+              (sources."tough-cookie-2.3.2" // {
+                dependencies = [
+                  sources."punycode-1.4.1"
+                ];
+              })
               sources."tunnel-agent-0.4.3"
             ];
           })
-          sources."retry-0.9.0"
+          sources."retry-0.10.1"
           sources."sha-2.0.1"
           sources."slide-1.1.6"
           sources."sorted-object-2.0.1"
+          (sources."sorted-union-stream-2.1.3" // {
+            dependencies = [
+              (sources."from2-1.3.0" // {
+                dependencies = [
+                  (sources."readable-stream-1.1.14" // {
+                    dependencies = [
+                      sources."core-util-is-1.0.2"
+                      sources."isarray-0.0.1"
+                      sources."string_decoder-0.10.31"
+                    ];
+                  })
+                ];
+              })
+              (sources."stream-iterate-1.2.0" // {
+                dependencies = [
+                  sources."stream-shift-1.0.0"
+                ];
+              })
+            ];
+          })
           sources."strip-ansi-3.0.1"
           (sources."tar-2.2.1" // {
             dependencies = [
@@ -37120,6 +36518,7 @@ in
             ];
           })
           sources."unpipe-1.0.0"
+          sources."uuid-3.0.1"
           (sources."validate-npm-package-name-2.2.2" // {
             dependencies = [
               sources."builtins-0.0.7"
@@ -37131,8 +36530,8 @@ in
             ];
           })
           sources."wrappy-1.0.2"
-          sources."write-file-atomic-1.1.4"
-          sources."ansi-regex-2.0.0"
+          sources."write-file-atomic-1.3.1"
+          sources."ansi-regex-2.1.1"
           sources."debuglog-1.0.1"
           sources."imurmurhash-0.1.4"
           sources."lodash._baseindexof-3.1.0"
@@ -37154,15 +36553,15 @@ in
           })
         ];
       })
-      (sources."npm-registry-client-7.1.2" // {
+      (sources."npm-registry-client-7.4.5" // {
         dependencies = [
-          sources."chownr-1.0.1"
-          (sources."concat-stream-1.5.2" // {
+          (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.0.6" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
+                  sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
@@ -37228,12 +36627,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -37252,7 +36651,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -37281,14 +36680,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -37299,9 +36698,9 @@ in
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
@@ -37313,12 +36712,12 @@ in
                 ];
               })
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.0"
+              sources."uuid-3.0.1"
             ];
           })
-          sources."retry-0.8.0"
+          sources."retry-0.10.1"
           sources."slide-1.1.6"
-          (sources."npmlog-3.1.2" // {
+          (sources."npmlog-4.0.2" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
@@ -37337,13 +36736,13 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.6.0" // {
+              (sources."gauge-2.7.2" // {
                 dependencies = [
                   sources."aproba-1.0.4"
-                  sources."has-color-0.1.7"
+                  sources."supports-color-0.2.0"
                   sources."has-unicode-2.0.1"
-                  sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.1"
+                  sources."object-assign-4.1.1"
+                  sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -37356,7 +36755,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."wide-align-1.1.0"
@@ -37381,12 +36780,13 @@ in
           sources."passport-strategy-1.0.0"
         ];
       })
-      (sources."raven-0.11.0" // {
+      (sources."raven-1.1.1" // {
         dependencies = [
-          sources."cookie-0.1.0"
+          sources."cookie-0.3.1"
+          sources."json-stringify-safe-5.0.1"
           sources."lsmod-1.0.0"
-          sources."node-uuid-1.4.7"
-          sources."stack-trace-0.0.7"
+          sources."uuid-3.0.0"
+          sources."stack-trace-0.0.9"
         ];
       })
       (sources."rc-1.1.6" // {
@@ -37428,21 +36828,23 @@ in
           })
         ];
       })
-      sources."semver-5.1.1"
-      (sources."serve-static-1.10.3" // {
+      sources."semver-5.3.0"
+      (sources."serve-static-1.11.1" // {
         dependencies = [
+          sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."parseurl-1.3.1"
-          (sources."send-0.13.2" // {
+          (sources."send-0.14.1" // {
             dependencies = [
               sources."debug-2.2.0"
               sources."depd-1.1.0"
               sources."destroy-1.0.4"
               sources."etag-1.7.0"
               sources."fresh-0.3.0"
-              (sources."http-errors-1.3.1" // {
+              (sources."http-errors-1.5.1" // {
                 dependencies = [
                   sources."inherits-2.0.3"
+                  sources."setprototypeof-1.0.2"
                 ];
               })
               sources."mime-1.3.4"
@@ -37452,8 +36854,8 @@ in
                   sources."ee-first-1.1.1"
                 ];
               })
-              sources."range-parser-1.0.3"
-              sources."statuses-1.2.1"
+              sources."range-parser-1.2.0"
+              sources."statuses-1.3.1"
             ];
           })
         ];
@@ -37464,105 +36866,100 @@ in
           sources."eve-0.4.2"
         ];
       })
-      (sources."socket.io-1.4.8" // {
+      (sources."socket.io-1.7.2" // {
         dependencies = [
-          (sources."engine.io-1.6.11" // {
+          (sources."debug-2.3.3" // {
             dependencies = [
-              sources."base64id-0.1.0"
-              (sources."ws-1.1.0" // {
+              sources."ms-0.7.2"
+            ];
+          })
+          (sources."engine.io-1.8.2" // {
+            dependencies = [
+              (sources."accepts-1.3.3" // {
+                dependencies = [
+                  (sources."mime-types-2.1.14" // {
+                    dependencies = [
+                      sources."mime-db-1.26.0"
+                    ];
+                  })
+                  sources."negotiator-0.6.1"
+                ];
+              })
+              sources."base64id-1.0.0"
+              (sources."engine.io-parser-1.3.2" // {
+                dependencies = [
+                  sources."after-0.8.2"
+                  sources."arraybuffer.slice-0.0.6"
+                  sources."base64-arraybuffer-0.1.5"
+                  sources."blob-0.0.4"
+                  sources."wtf-8-1.0.0"
+                ];
+              })
+              (sources."ws-1.1.1" // {
                 dependencies = [
                   sources."options-0.0.6"
                   sources."ultron-1.0.2"
                 ];
               })
-              (sources."engine.io-parser-1.2.4" // {
-                dependencies = [
-                  sources."after-0.8.1"
-                  sources."arraybuffer.slice-0.0.6"
-                  sources."base64-arraybuffer-0.1.2"
-                  sources."blob-0.0.4"
-                  (sources."has-binary-0.1.6" // {
-                    dependencies = [
-                      sources."isarray-0.0.1"
-                    ];
-                  })
-                  sources."utf8-2.1.0"
-                ];
-              })
-              (sources."accepts-1.1.4" // {
-                dependencies = [
-                  (sources."mime-types-2.0.14" // {
-                    dependencies = [
-                      sources."mime-db-1.12.0"
-                    ];
-                  })
-                  sources."negotiator-0.4.9"
-                ];
-              })
+              sources."cookie-0.3.1"
             ];
           })
-          (sources."socket.io-parser-2.2.6" // {
+          (sources."has-binary-0.1.7" // {
             dependencies = [
-              sources."json3-3.3.2"
-              sources."component-emitter-1.1.2"
               sources."isarray-0.0.1"
-              sources."benchmark-1.0.0"
             ];
           })
-          (sources."socket.io-client-1.4.8" // {
+          sources."object-assign-4.1.0"
+          sources."socket.io-adapter-0.5.0"
+          (sources."socket.io-client-1.7.2" // {
             dependencies = [
-              (sources."engine.io-client-1.6.11" // {
+              sources."backo2-1.0.2"
+              sources."component-bind-1.0.0"
+              sources."component-emitter-1.2.1"
+              (sources."engine.io-client-1.8.2" // {
                 dependencies = [
+                  sources."component-inherit-0.0.3"
+                  (sources."engine.io-parser-1.3.2" // {
+                    dependencies = [
+                      sources."after-0.8.2"
+                      sources."arraybuffer.slice-0.0.6"
+                      sources."base64-arraybuffer-0.1.5"
+                      sources."blob-0.0.4"
+                      sources."wtf-8-1.0.0"
+                    ];
+                  })
                   sources."has-cors-1.1.0"
-                  (sources."ws-1.0.1" // {
+                  (sources."parsejson-0.0.3" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."parseqs-0.0.5" // {
+                    dependencies = [
+                      (sources."better-assert-1.0.2" // {
+                        dependencies = [
+                          sources."callsite-1.0.0"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."ws-1.1.1" // {
                     dependencies = [
                       sources."options-0.0.6"
                       sources."ultron-1.0.2"
                     ];
                   })
-                  sources."xmlhttprequest-ssl-1.5.1"
-                  sources."component-emitter-1.1.2"
-                  (sources."engine.io-parser-1.2.4" // {
-                    dependencies = [
-                      sources."after-0.8.1"
-                      sources."arraybuffer.slice-0.0.6"
-                      sources."base64-arraybuffer-0.1.2"
-                      sources."blob-0.0.4"
-                      (sources."has-binary-0.1.6" // {
-                        dependencies = [
-                          sources."isarray-0.0.1"
-                        ];
-                      })
-                      sources."utf8-2.1.0"
-                    ];
-                  })
-                  (sources."parsejson-0.0.1" // {
-                    dependencies = [
-                      (sources."better-assert-1.0.2" // {
-                        dependencies = [
-                          sources."callsite-1.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  (sources."parseqs-0.0.2" // {
-                    dependencies = [
-                      (sources."better-assert-1.0.2" // {
-                        dependencies = [
-                          sources."callsite-1.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."component-inherit-0.0.3"
+                  sources."xmlhttprequest-ssl-1.5.3"
                   sources."yeast-0.1.2"
                 ];
               })
-              sources."component-bind-1.0.0"
-              sources."component-emitter-1.2.0"
-              sources."object-component-0.0.3"
               sources."indexof-0.0.1"
-              (sources."parseuri-0.0.4" // {
+              sources."object-component-0.0.3"
+              (sources."parseuri-0.0.5" // {
                 dependencies = [
                   (sources."better-assert-1.0.2" // {
                     dependencies = [
@@ -37572,32 +36969,20 @@ in
                 ];
               })
               sources."to-array-0.1.4"
-              sources."backo2-1.0.2"
             ];
           })
-          (sources."socket.io-adapter-0.4.0" // {
+          (sources."socket.io-parser-2.3.1" // {
             dependencies = [
-              (sources."socket.io-parser-2.2.2" // {
+              (sources."debug-2.2.0" // {
                 dependencies = [
-                  sources."debug-0.7.4"
-                  sources."json3-3.2.6"
-                  sources."component-emitter-1.1.2"
-                  sources."isarray-0.0.1"
-                  sources."benchmark-1.0.0"
+                  sources."ms-0.7.1"
                 ];
               })
-            ];
-          })
-          (sources."has-binary-0.1.7" // {
-            dependencies = [
+              sources."json3-3.3.2"
+              sources."component-emitter-1.1.2"
               sources."isarray-0.0.1"
             ];
           })
-          (sources."debug-2.2.0" // {
-            dependencies = [
-              sources."ms-0.7.1"
-            ];
-          })
         ];
       })
       (sources."superagent-0.21.0" // {
@@ -37608,7 +36993,7 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.3.3" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -37641,32 +37026,31 @@ in
           sources."rimraf-2.2.8"
         ];
       })
-      (sources."winston-2.2.0" // {
+      (sources."winston-2.3.1" // {
         dependencies = [
           sources."async-1.0.0"
           sources."colors-1.0.3"
           sources."cycle-1.0.3"
           sources."eyes-0.1.8"
           sources."isstream-0.1.2"
-          sources."pkginfo-0.3.1"
           sources."stack-trace-0.0.9"
         ];
       })
-      (sources."yargs-4.7.1" // {
+      (sources."yargs-6.6.0" // {
         dependencies = [
           sources."camelcase-3.0.0"
           (sources."cliui-3.2.0" // {
             dependencies = [
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
-              sources."wrap-ansi-2.0.0"
+              sources."wrap-ansi-2.1.0"
             ];
           })
           sources."decamelize-1.2.0"
-          sources."lodash.assign-4.2.0"
+          sources."get-caller-file-1.0.2"
           (sources."os-locale-1.4.0" // {
             dependencies = [
               (sources."lcid-1.0.0" // {
@@ -37676,47 +37060,6 @@ in
               })
             ];
           })
-          (sources."pkg-conf-1.1.3" // {
-            dependencies = [
-              (sources."find-up-1.1.2" // {
-                dependencies = [
-                  sources."path-exists-2.1.0"
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
-                    ];
-                  })
-                ];
-              })
-              (sources."load-json-file-1.1.0" // {
-                dependencies = [
-                  sources."graceful-fs-4.1.11"
-                  (sources."parse-json-2.2.0" // {
-                    dependencies = [
-                      (sources."error-ex-1.3.0" // {
-                        dependencies = [
-                          sources."is-arrayish-0.2.1"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."pify-2.3.0"
-                  (sources."pinkie-promise-2.0.1" // {
-                    dependencies = [
-                      sources."pinkie-2.0.4"
-                    ];
-                  })
-                  (sources."strip-bom-2.0.0" // {
-                    dependencies = [
-                      sources."is-utf8-0.2.1"
-                    ];
-                  })
-                ];
-              })
-              sources."object-assign-4.1.0"
-              sources."symbol-0.2.3"
-            ];
-          })
           (sources."read-pkg-up-1.0.1" // {
             dependencies = [
               (sources."find-up-1.1.2" // {
@@ -37791,8 +37134,9 @@ in
               })
             ];
           })
+          sources."require-directory-2.1.1"
           sources."require-main-filename-1.0.1"
-          sources."set-blocking-1.0.0"
+          sources."set-blocking-2.0.0"
           (sources."string-width-1.0.2" // {
             dependencies = [
               sources."code-point-at-1.1.0"
@@ -37803,14 +37147,14 @@ in
               })
               (sources."strip-ansi-3.0.1" // {
                 dependencies = [
-                  sources."ansi-regex-2.0.0"
+                  sources."ansi-regex-2.1.1"
                 ];
               })
             ];
           })
-          sources."window-size-0.2.0"
+          sources."which-module-1.0.0"
           sources."y18n-3.2.1"
-          sources."yargs-parser-2.4.1"
+          sources."yargs-parser-4.2.1"
         ];
       })
     ];
@@ -37967,15 +37311,15 @@ in
                 dependencies = [
                   (sources."async-2.1.4" // {
                     dependencies = [
-                      sources."lodash-4.17.2"
+                      sources."lodash-4.17.4"
                     ];
                   })
                 ];
               })
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.13" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.25.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."node-uuid-1.4.7"
@@ -37992,14 +37336,14 @@ in
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.1" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -38033,12 +37377,12 @@ in
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -38057,7 +37401,7 @@ in
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -38104,12 +37448,13 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "1.13.3";
+    version = "1.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-1.13.3.tgz";
-      sha1 = "e79c46fe5a37c5ca70084ba0894c595cdcb42815";
+      url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz";
+      sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823";
     };
     dependencies = [
+      sources."acorn-3.3.0"
       sources."async-1.5.2"
       sources."clone-1.0.2"
       (sources."enhanced-resolve-0.9.1" // {
@@ -38118,14 +37463,13 @@ in
           sources."graceful-fs-4.1.11"
         ];
       })
-      sources."acorn-3.3.0"
       sources."interpret-0.6.6"
       (sources."loader-utils-0.2.16" // {
         dependencies = [
           sources."big.js-3.1.3"
           sources."emojis-list-2.1.0"
-          sources."json5-0.5.0"
-          sources."object-assign-4.1.0"
+          sources."json5-0.5.1"
+          sources."object-assign-4.1.1"
         ];
       })
       (sources."memory-fs-0.3.0" // {
@@ -38153,7 +37497,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."node-libs-browser-0.6.0" // {
+      (sources."node-libs-browser-0.7.0" // {
         dependencies = [
           sources."assert-1.4.1"
           (sources."browserify-zlib-0.1.4" // {
@@ -38173,44 +37517,58 @@ in
               sources."date-now-0.1.4"
             ];
           })
-          sources."constants-browserify-0.0.1"
-          (sources."crypto-browserify-3.2.8" // {
+          sources."constants-browserify-1.0.0"
+          (sources."crypto-browserify-3.3.0" // {
             dependencies = [
               sources."pbkdf2-compat-2.0.1"
               sources."ripemd160-0.2.0"
               sources."sha.js-2.2.6"
+              (sources."browserify-aes-0.4.0" // {
+                dependencies = [
+                  sources."inherits-2.0.3"
+                ];
+              })
             ];
           })
           sources."domain-browser-1.1.7"
           sources."events-1.1.1"
-          (sources."http-browserify-1.7.0" // {
-            dependencies = [
-              sources."Base64-0.2.1"
-              sources."inherits-2.0.3"
-            ];
-          })
-          sources."https-browserify-0.0.0"
-          sources."os-browserify-0.1.2"
+          sources."https-browserify-0.0.1"
+          sources."os-browserify-0.2.1"
           sources."path-browserify-0.0.0"
           sources."process-0.11.9"
           sources."punycode-1.4.1"
           sources."querystring-es3-0.2.1"
-          (sources."readable-stream-1.1.14" // {
+          (sources."readable-stream-2.2.2" // {
             dependencies = [
+              sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
-              sources."isarray-0.0.1"
+              sources."isarray-1.0.0"
+              sources."inherits-2.0.3"
+              sources."process-nextick-args-1.0.7"
+              sources."util-deprecate-1.0.2"
+            ];
+          })
+          (sources."stream-browserify-2.0.1" // {
+            dependencies = [
               sources."inherits-2.0.3"
             ];
           })
-          (sources."stream-browserify-1.0.0" // {
+          (sources."stream-http-2.6.3" // {
             dependencies = [
+              sources."builtin-status-codes-3.0.0"
               sources."inherits-2.0.3"
+              sources."to-arraybuffer-1.0.1"
+              sources."xtend-4.0.1"
             ];
           })
           sources."string_decoder-0.10.31"
-          sources."timers-browserify-1.4.2"
+          (sources."timers-browserify-2.0.2" // {
+            dependencies = [
+              sources."setimmediate-1.0.5"
+            ];
+          })
           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"
@@ -38234,13 +37592,13 @@ in
           sources."minimist-0.0.10"
         ];
       })
-      (sources."supports-color-3.1.2" // {
+      (sources."supports-color-3.2.3" // {
         dependencies = [
           sources."has-flag-1.0.0"
         ];
       })
       sources."tapable-0.1.10"
-      (sources."uglify-js-2.7.4" // {
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -38254,7 +37612,7 @@ in
                     dependencies = [
                       (sources."align-text-0.1.4" // {
                         dependencies = [
-                          (sources."kind-of-3.0.4" // {
+                          (sources."kind-of-3.1.0" // {
                             dependencies = [
                               sources."is-buffer-1.1.4"
                             ];
@@ -38270,7 +37628,7 @@ in
                     dependencies = [
                       (sources."align-text-0.1.4" // {
                         dependencies = [
-                          (sources."kind-of-3.0.4" // {
+                          (sources."kind-of-3.1.0" // {
                             dependencies = [
                               sources."is-buffer-1.1.4"
                             ];
@@ -38318,7 +37676,7 @@ in
                                       sources."isarray-1.0.0"
                                     ];
                                   })
-                                  sources."randomatic-1.1.5"
+                                  sources."randomatic-1.1.6"
                                   sources."repeat-string-1.6.1"
                                 ];
                               })
@@ -38336,7 +37694,7 @@ in
                       sources."extglob-0.3.2"
                       sources."filename-regex-2.0.0"
                       sources."is-extglob-1.0.0"
-                      (sources."kind-of-3.0.4" // {
+                      (sources."kind-of-3.1.0" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
@@ -38373,7 +37731,7 @@ in
               sources."inherits-2.0.3"
               (sources."is-binary-path-1.0.1" // {
                 dependencies = [
-                  sources."binary-extensions-1.7.0"
+                  sources."binary-extensions-1.8.0"
                 ];
               })
               (sources."is-glob-2.0.1" // {
@@ -38407,17 +37765,17 @@ in
                   sources."set-immediate-shim-1.0.1"
                 ];
               })
-              (sources."fsevents-1.0.15" // {
+              (sources."fsevents-1.0.17" // {
                 dependencies = [
-                  sources."nan-2.4.0"
-                  (sources."node-pre-gyp-0.6.31" // {
+                  sources."nan-2.5.0"
+                  (sources."node-pre-gyp-0.6.32" // {
                     dependencies = [
                       (sources."nopt-3.0.6" // {
                         dependencies = [
                           sources."abbrev-1.0.9"
                         ];
                       })
-                      (sources."npmlog-4.0.1" // {
+                      (sources."npmlog-4.0.2" // {
                         dependencies = [
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
@@ -38435,13 +37793,13 @@ in
                             ];
                           })
                           sources."console-control-strings-1.1.0"
-                          (sources."gauge-2.7.1" // {
+                          (sources."gauge-2.7.2" // {
                             dependencies = [
                               sources."aproba-1.0.4"
-                              sources."has-color-0.1.7"
+                              sources."supports-color-0.2.0"
                               sources."has-unicode-2.0.1"
-                              sources."object-assign-4.1.0"
-                              sources."signal-exit-3.0.1"
+                              sources."object-assign-4.1.1"
+                              sources."signal-exit-3.0.2"
                               (sources."string-width-1.0.2" // {
                                 dependencies = [
                                   sources."code-point-at-1.1.0"
@@ -38454,7 +37812,7 @@ in
                               })
                               (sources."strip-ansi-3.0.1" // {
                                 dependencies = [
-                                  sources."ansi-regex-2.0.0"
+                                  sources."ansi-regex-2.1.1"
                                 ];
                               })
                               sources."wide-align-1.1.0"
@@ -38496,12 +37854,12 @@ in
                                   sources."escape-string-regexp-1.0.5"
                                   (sources."has-ansi-2.0.0" // {
                                     dependencies = [
-                                      sources."ansi-regex-2.0.0"
+                                      sources."ansi-regex-2.1.1"
                                     ];
                                   })
                                   (sources."strip-ansi-3.0.1" // {
                                     dependencies = [
-                                      sources."ansi-regex-2.0.0"
+                                      sources."ansi-regex-2.1.1"
                                     ];
                                   })
                                   sources."supports-color-2.0.0"
@@ -38520,7 +37878,7 @@ in
                                       sources."is-property-1.0.2"
                                     ];
                                   })
-                                  sources."jsonpointer-4.0.0"
+                                  sources."jsonpointer-4.0.1"
                                   sources."xtend-4.0.1"
                                 ];
                               })
@@ -38549,14 +37907,14 @@ in
                                   sources."verror-1.3.6"
                                 ];
                               })
-                              (sources."sshpk-1.10.1" // {
+                              (sources."sshpk-1.10.2" // {
                                 dependencies = [
                                   sources."asn1-0.2.3"
                                   sources."assert-plus-1.0.0"
-                                  sources."dashdash-1.14.0"
+                                  sources."dashdash-1.14.1"
                                   sources."getpass-0.1.6"
                                   sources."jsbn-0.1.0"
-                                  sources."tweetnacl-0.14.3"
+                                  sources."tweetnacl-0.14.5"
                                   sources."jodid25519-1.0.2"
                                   sources."ecc-jsbn-0.1.1"
                                   sources."bcrypt-pbkdf-1.0.0"
@@ -38567,9 +37925,9 @@ in
                           sources."is-typedarray-1.0.0"
                           sources."isstream-0.1.2"
                           sources."json-stringify-safe-5.0.1"
-                          (sources."mime-types-2.1.13" // {
+                          (sources."mime-types-2.1.14" // {
                             dependencies = [
-                              sources."mime-db-1.25.0"
+                              sources."mime-db-1.26.0"
                             ];
                           })
                           sources."oauth-sign-0.8.2"
@@ -38581,7 +37939,7 @@ in
                             ];
                           })
                           sources."tunnel-agent-0.4.3"
-                          sources."uuid-3.0.0"
+                          sources."uuid-3.0.1"
                         ];
                       })
                       (sources."rimraf-2.5.4" // {
@@ -38669,14 +38027,14 @@ in
           sources."graceful-fs-4.1.11"
         ];
       })
-      (sources."webpack-core-0.6.8" // {
+      (sources."webpack-core-0.6.9" // {
         dependencies = [
           (sources."source-map-0.4.4" // {
             dependencies = [
               sources."amdefine-1.0.1"
             ];
           })
-          sources."source-list-map-0.1.6"
+          sources."source-list-map-0.1.8"
         ];
       })
     ];
@@ -38707,16 +38065,16 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "0.17.8";
+    version = "0.19.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-0.17.8.tgz";
-      sha1 = "6a95d19aaeb891810618937db98a2080683cbbb4";
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.19.1.tgz";
+      sha1 = "102ca03ce7fc910a73f719c70bba9e9f9e3b2b4d";
     };
     dependencies = [
-      (sources."babel-runtime-6.18.0" // {
+      (sources."babel-runtime-6.22.0" // {
         dependencies = [
           sources."core-js-2.4.1"
-          sources."regenerator-runtime-0.9.6"
+          sources."regenerator-runtime-0.10.1"
         ];
       })
       sources."bytes-2.4.0"
@@ -38727,12 +38085,12 @@ in
           sources."escape-string-regexp-1.0.5"
           (sources."has-ansi-2.0.0" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           sources."supports-color-2.0.0"
@@ -38748,8 +38106,8 @@ in
           sources."graceful-readlink-1.0.1"
         ];
       })
-      sources."death-1.0.0"
-      (sources."debug-2.3.3" // {
+      sources."death-1.1.0"
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -38781,12 +38139,13 @@ in
               sources."extend-3.0.0"
               (sources."spawn-sync-1.0.15" // {
                 dependencies = [
-                  (sources."concat-stream-1.5.2" // {
+                  (sources."concat-stream-1.6.0" // {
                     dependencies = [
                       sources."inherits-2.0.3"
                       sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.0.6" // {
+                      (sources."readable-stream-2.2.2" // {
                         dependencies = [
+                          sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
                           sources."isarray-1.0.0"
                           sources."process-nextick-args-1.0.7"
@@ -38809,17 +38168,17 @@ in
           (sources."figures-1.7.0" // {
             dependencies = [
               sources."escape-string-regexp-1.0.5"
-              sources."object-assign-4.1.0"
+              sources."object-assign-4.1.1"
             ];
           })
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
           sources."mute-stream-0.0.6"
           (sources."pinkie-promise-2.0.1" // {
             dependencies = [
               sources."pinkie-2.0.4"
             ];
           })
-          (sources."run-async-2.2.0" // {
+          (sources."run-async-2.3.0" // {
             dependencies = [
               sources."is-promise-2.1.0"
             ];
@@ -38837,7 +38196,7 @@ in
           })
           (sources."strip-ansi-3.0.1" // {
             dependencies = [
-              sources."ansi-regex-2.0.0"
+              sources."ansi-regex-2.1.1"
             ];
           })
           sources."through-2.3.8"
@@ -38845,9 +38204,9 @@ in
       })
       (sources."invariant-2.2.2" // {
         dependencies = [
-          (sources."loose-envify-1.3.0" // {
+          (sources."loose-envify-1.3.1" // {
             dependencies = [
-              sources."js-tokens-2.0.0"
+              sources."js-tokens-3.0.0"
             ];
           })
         ];
@@ -38870,7 +38229,7 @@ in
               sources."array-find-index-1.0.2"
             ];
           })
-          sources."signal-exit-3.0.1"
+          sources."signal-exit-3.0.2"
         ];
       })
       (sources."minimatch-3.0.3" // {
@@ -38888,12 +38247,12 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."node-emoji-1.4.1" // {
+      (sources."node-emoji-1.5.1" // {
         dependencies = [
           sources."string.prototype.codepointat-0.2.0"
         ];
       })
-      (sources."node-gyp-3.4.0" // {
+      (sources."node-gyp-3.5.0" // {
         dependencies = [
           (sources."fstream-1.0.10" // {
             dependencies = [
@@ -38923,7 +38282,7 @@ in
               sources."abbrev-1.0.9"
             ];
           })
-          (sources."npmlog-3.1.2" // {
+          (sources."npmlog-4.0.2" // {
             dependencies = [
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
@@ -38942,13 +38301,13 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.6.0" // {
+              (sources."gauge-2.7.2" // {
                 dependencies = [
                   sources."aproba-1.0.4"
-                  sources."has-color-0.1.7"
+                  sources."supports-color-0.2.0"
                   sources."has-unicode-2.0.1"
-                  sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.1"
+                  sources."object-assign-4.1.1"
+                  sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -38961,7 +38320,7 @@ in
                   })
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
                   sources."wide-align-1.1.0"
@@ -38970,30 +38329,12 @@ in
               sources."set-blocking-2.0.0"
             ];
           })
-          (sources."osenv-0.1.3" // {
+          (sources."osenv-0.1.4" // {
             dependencies = [
               sources."os-homedir-1.0.2"
               sources."os-tmpdir-1.0.2"
             ];
           })
-          (sources."path-array-1.0.1" // {
-            dependencies = [
-              (sources."array-index-1.0.0" // {
-                dependencies = [
-                  (sources."es6-symbol-3.1.0" // {
-                    dependencies = [
-                      sources."d-0.1.1"
-                      (sources."es5-ext-0.10.12" // {
-                        dependencies = [
-                          sources."es6-iterator-2.0.0"
-                        ];
-                      })
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
           (sources."which-1.2.12" // {
             dependencies = [
               sources."isexe-1.1.2"
@@ -39002,17 +38343,15 @@ in
         ];
       })
       sources."object-path-0.11.3"
-      (sources."proper-lockfile-1.2.0" // {
+      (sources."proper-lockfile-2.0.0" // {
         dependencies = [
-          sources."err-code-1.1.1"
-          sources."extend-3.0.0"
           sources."graceful-fs-4.1.11"
-          sources."retry-0.10.0"
+          sources."retry-0.10.1"
         ];
       })
       (sources."read-1.0.7" // {
         dependencies = [
-          sources."mute-stream-0.0.6"
+          sources."mute-stream-0.0.7"
         ];
       })
       (sources."repeating-2.0.1" // {
@@ -39051,7 +38390,7 @@ in
                       sources."is-property-1.0.2"
                     ];
                   })
-                  sources."jsonpointer-4.0.0"
+                  sources."jsonpointer-4.0.1"
                   sources."xtend-4.0.1"
                 ];
               })
@@ -39080,14 +38419,14 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.10.1" // {
+              (sources."sshpk-1.10.2" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
-                  sources."dashdash-1.14.0"
+                  sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
                   sources."jsbn-0.1.0"
-                  sources."tweetnacl-0.14.3"
+                  sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.0"
@@ -39098,9 +38437,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.13" // {
+          (sources."mime-types-2.1.14" // {
             dependencies = [
-              sources."mime-db-1.25.0"
+              sources."mime-db-1.26.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -39112,7 +38451,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.0"
+          sources."uuid-3.0.1"
         ];
       })
       sources."request-capture-har-1.1.4"
@@ -39157,20 +38496,7 @@ in
       })
       (sources."tar-stream-1.5.2" // {
         dependencies = [
-          (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."bl-1.2.0"
           (sources."end-of-stream-1.1.0" // {
             dependencies = [
               (sources."once-1.3.3" // {
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 2132aff9dd0..7de48f6c175 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.1.0. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -76,13 +76,13 @@ let
         sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3";
       };
     };
-    "resolve-1.1.7" = {
+    "resolve-1.2.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.1.7";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
-        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz";
+        sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c";
       };
     };
     "global-paths-0.1.2" = {
@@ -274,13 +274,13 @@ let
         sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe";
       };
     };
-    "global-prefix-0.1.4" = {
+    "global-prefix-0.1.5" = {
       name = "global-prefix";
       packageName = "global-prefix";
-      version = "0.1.4";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.4.tgz";
-        sha1 = "05158db1cde2dd491b455e290eb3ab8bfc45c6e1";
+        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz";
+        sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f";
       };
     };
     "is-windows-0.2.0" = {
@@ -292,6 +292,15 @@ let
         sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c";
       };
     };
+    "homedir-polyfill-1.0.1" = {
+      name = "homedir-polyfill";
+      packageName = "homedir-polyfill";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz";
+        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
+      };
+    };
     "ini-1.3.4" = {
       name = "ini";
       packageName = "ini";
@@ -301,15 +310,6 @@ let
         sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
       };
     };
-    "osenv-0.1.3" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz";
-        sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217";
-      };
-    };
     "which-1.2.12" = {
       name = "which";
       packageName = "which";
@@ -319,22 +319,13 @@ let
         sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
       };
     };
-    "os-homedir-1.0.2" = {
-      name = "os-homedir";
-      packageName = "os-homedir";
-      version = "1.0.2";
+    "parse-passwd-1.0.0" = {
+      name = "parse-passwd";
+      packageName = "parse-passwd";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
-        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
-      };
-    };
-    "os-tmpdir-1.0.2" = {
-      name = "os-tmpdir";
-      packageName = "os-tmpdir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
-        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+        url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz";
+        sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
       };
     };
     "isexe-1.1.2" = {
@@ -409,13 +400,13 @@ let
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-arm-cdn-0.2.1" = {
+    "azure-arm-cdn-1.0.0" = {
       name = "azure-arm-cdn";
       packageName = "azure-arm-cdn";
-      version = "0.2.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-0.2.1.tgz";
-        sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz";
+        sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85";
       };
     };
     "azure-arm-commerce-0.2.0" = {
@@ -427,13 +418,31 @@ let
         sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
-    "azure-arm-compute-0.19.0" = {
+    "azure-arm-compute-0.19.1" = {
       name = "azure-arm-compute";
       packageName = "azure-arm-compute";
-      version = "0.19.0";
+      version = "0.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.0.tgz";
-        sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e";
+        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz";
+        sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd";
+      };
+    };
+    "azure-arm-datalake-analytics-1.0.1-preview" = {
+      name = "azure-arm-datalake-analytics";
+      packageName = "azure-arm-datalake-analytics";
+      version = "1.0.1-preview";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.1-preview.tgz";
+        sha1 = "75461904000427e12ce11d634d74c052c86de994";
+      };
+    };
+    "azure-arm-datalake-store-1.0.1-preview" = {
+      name = "azure-arm-datalake-store";
+      packageName = "azure-arm-datalake-store";
+      version = "1.0.1-preview";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.1-preview.tgz";
+        sha1 = "bd07cbeb5eb355a00b7bed69e198a1a968115dd5";
       };
     };
     "azure-arm-hdinsight-0.2.2" = {
@@ -535,24 +544,6 @@ let
         sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02";
       };
     };
-    "azure-arm-datalake-analytics-0.4.3" = {
-      name = "azure-arm-datalake-analytics";
-      packageName = "azure-arm-datalake-analytics";
-      version = "0.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-0.4.3.tgz";
-        sha1 = "10c81e59d3064289a42ab37fea805a334333ed91";
-      };
-    };
-    "azure-arm-datalake-store-0.4.2" = {
-      name = "azure-arm-datalake-store";
-      packageName = "azure-arm-datalake-store";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-0.4.2.tgz";
-        sha1 = "479f4a28986c9737b8fef14090c0c7ccc33cb123";
-      };
-    };
     "azure-arm-devtestlabs-0.1.0" = {
       name = "azure-arm-devtestlabs";
       packageName = "azure-arm-devtestlabs";
@@ -643,13 +634,13 @@ let
         sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54";
       };
     };
-    "azure-arm-resource-1.4.5-preview" = {
+    "azure-arm-resource-1.6.1-preview" = {
       name = "azure-arm-resource";
       packageName = "azure-arm-resource";
-      version = "1.4.5-preview";
+      version = "1.6.1-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.5-preview.tgz";
-        sha1 = "166934783752607e9a4128ea0ad715b9b7a9015f";
+        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz";
+        sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
       };
     };
     "azure-arm-storage-0.13.1-preview" = {
@@ -742,13 +733,13 @@ let
         sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e";
       };
     };
-    "applicationinsights-0.15.12" = {
+    "applicationinsights-0.16.0" = {
       name = "applicationinsights";
       packageName = "applicationinsights";
-      version = "0.15.12";
+      version = "0.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.15.12.tgz";
-        sha1 = "d03f282da9424f33729eb7da8279e8e8a20dc7fc";
+        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
+        sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3";
       };
     };
     "caller-id-0.1.0" = {
@@ -868,13 +859,13 @@ let
         sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
       };
     };
-    "moment-2.17.0" = {
+    "moment-2.17.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.17.0";
+      version = "2.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz";
-        sha1 = "a4c292e02aac5ddefb29a6eed24f51938dd3b74f";
+        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
+        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
       };
     };
     "ms-rest-1.15.2" = {
@@ -904,15 +895,6 @@ let
         sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
       };
     };
-    "node-uuid-1.2.0" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz";
-        sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b";
-      };
-    };
     "omelette-0.1.0" = {
       name = "omelette";
       packageName = "omelette";
@@ -1039,6 +1021,15 @@ let
         sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
       };
     };
+    "uuid-3.0.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
+        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
+      };
+    };
     "validator-5.2.0" = {
       name = "validator";
       packageName = "validator";
@@ -1120,13 +1111,13 @@ let
         sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
       };
     };
-    "xmldom-0.1.22" = {
+    "xmldom-0.1.27" = {
       name = "xmldom";
       packageName = "xmldom";
-      version = "0.1.22";
+      version = "0.1.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
-        sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz";
+        sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
       };
     };
     "xpath.js-1.0.7" = {
@@ -1147,13 +1138,13 @@ let
         sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb";
       };
     };
-    "jwa-1.1.4" = {
+    "jwa-1.1.5" = {
       name = "jwa";
       packageName = "jwa";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.4.tgz";
-        sha1 = "dbb01bd38cd409899fa715107e90d90f9bcb161e";
+        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz";
+        sha1 = "a0552ce0220742cd52e153774a32905c30e756e5";
       };
     };
     "safe-buffer-5.0.1" = {
@@ -1174,22 +1165,13 @@ let
         sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
       };
     };
-    "ecdsa-sig-formatter-1.0.7" = {
+    "ecdsa-sig-formatter-1.0.9" = {
       name = "ecdsa-sig-formatter";
       packageName = "ecdsa-sig-formatter";
-      version = "1.0.7";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.7.tgz";
-        sha1 = "3137e976a1d6232517e2513e04e32f79bcbdf126";
-      };
-    };
-    "base64-url-1.3.3" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
-        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
+        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz";
+        sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1";
       };
     };
     "xml2js-0.2.7" = {
@@ -1831,13 +1813,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.13" = {
+    "mime-types-2.1.14" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.13";
+      version = "2.1.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz";
-        sha1 = "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
+        sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -1903,13 +1885,13 @@ let
         sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
       };
     };
-    "lodash-4.17.2" = {
+    "lodash-4.17.4" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.2";
+      version = "4.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz";
-        sha1 = "34a3055babe04ce42467b607d700072c7ff6bf42";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
+        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
       };
     };
     "chalk-1.1.3" = {
@@ -1993,13 +1975,13 @@ let
         sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
       };
     };
-    "ansi-regex-2.0.0" = {
+    "ansi-regex-2.1.1" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
-        sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
       };
     };
     "graceful-readlink-1.0.1" = {
@@ -2029,13 +2011,13 @@ let
         sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
       };
     };
-    "jsonpointer-4.0.0" = {
+    "jsonpointer-4.0.1" = {
       name = "jsonpointer";
       packageName = "jsonpointer";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz";
-        sha1 = "6661e161d2fc445f19f98430231343722e1fcbd5";
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
+        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
       };
     };
     "xtend-4.0.1" = {
@@ -2119,13 +2101,13 @@ let
         sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252";
       };
     };
-    "sshpk-1.10.1" = {
+    "sshpk-1.10.2" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.10.1";
+      version = "1.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz";
-        sha1 = "30e1a5d329244974a1af61511339d595af6638b0";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz";
+        sha1 = "d5a804ce22695515638e798dbe23273de070a5fa";
       };
     };
     "extsprintf-1.0.2" = {
@@ -2173,13 +2155,13 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "dashdash-1.14.0" = {
+    "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
-      version = "1.14.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz";
-        sha1 = "29e486c5418bf0f356034a993d51686a33e84141";
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     };
     "getpass-0.1.6" = {
@@ -2200,13 +2182,13 @@ let
         sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
       };
     };
-    "tweetnacl-0.14.3" = {
+    "tweetnacl-0.14.5" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
-      version = "0.14.3";
+      version = "0.14.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz";
-        sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d";
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
     "jodid25519-1.0.2" = {
@@ -2236,13 +2218,13 @@ let
         sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
       };
     };
-    "mime-db-1.25.0" = {
+    "mime-db-1.26.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.25.0";
+      version = "1.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz";
-        sha1 = "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
+        sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
       };
     };
     "punycode-1.4.1" = {
@@ -2299,13 +2281,13 @@ let
         sha1 = "0c989774f2870c69378aa665648cdc60f343aa53";
       };
     };
-    "concat-stream-1.5.2" = {
+    "concat-stream-1.6.0" = {
       name = "concat-stream";
       packageName = "concat-stream";
-      version = "1.5.2";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
-        sha1 = "708978624d856af41a5a741defdd261da752c266";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz";
+        sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
       };
     };
     "http-response-object-1.1.0" = {
@@ -2335,6 +2317,24 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
+    "readable-stream-2.2.2" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
+        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
+      };
+    };
+    "buffer-shims-1.0.0" = {
+      name = "buffer-shims";
+      packageName = "buffer-shims";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
+        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
+      };
+    };
     "http-basic-2.5.1" = {
       name = "http-basic";
       packageName = "http-basic";
@@ -2362,6 +2362,15 @@ let
         sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
       };
     };
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+      };
+    };
     "async-1.0.0" = {
       name = "async";
       packageName = "async";
@@ -2380,13 +2389,13 @@ let
         sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
       };
     };
-    "mute-stream-0.0.6" = {
+    "mute-stream-0.0.7" = {
       name = "mute-stream";
       packageName = "mute-stream";
-      version = "0.0.6";
+      version = "0.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
-        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz";
+        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
       };
     };
     "argparse-1.0.4" = {
@@ -2677,15 +2686,6 @@ let
         sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
       };
     };
-    "readable-stream-2.2.2" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
-        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
-      };
-    };
     "stream-shift-1.0.0" = {
       name = "stream-shift";
       packageName = "stream-shift";
@@ -2704,15 +2704,6 @@ let
         sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
       };
     };
-    "buffer-shims-1.0.0" = {
-      name = "buffer-shims";
-      packageName = "buffer-shims";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
-        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
-      };
-    };
     "camelcase-keys-2.1.0" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -2767,13 +2758,13 @@ let
         sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df";
       };
     };
-    "object-assign-4.1.0" = {
+    "object-assign-4.1.1" = {
       name = "object-assign";
       packageName = "object-assign";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz";
-        sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0";
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
       };
     };
     "read-pkg-up-1.0.1" = {
@@ -2821,13 +2812,13 @@ let
         sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
       };
     };
-    "signal-exit-3.0.1" = {
+    "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz";
-        sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
     "array-find-index-1.0.2" = {
@@ -3118,13 +3109,13 @@ let
         sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
       };
     };
-    "debug-2.3.3" = {
+    "debug-2.6.0" = {
       name = "debug";
       packageName = "debug";
-      version = "2.3.3";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
-        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
+        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
       };
     };
     "ms-0.7.2" = {
@@ -3136,6 +3127,15 @@ let
         sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
       };
     };
+    "os-tmpdir-1.0.2" = {
+      name = "os-tmpdir";
+      packageName = "os-tmpdir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+      };
+    };
     "rimraf-2.2.8" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -3145,22 +3145,22 @@ let
         sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
       };
     };
-    "JSONStream-1.2.1" = {
+    "JSONStream-1.3.0" = {
       name = "JSONStream";
       packageName = "JSONStream";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
-        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
-      };
-    };
-    "assert-1.3.0" = {
-      name = "assert";
-      packageName = "assert";
       version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
-        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz";
+        sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5";
+      };
+    };
+    "assert-1.4.1" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
+        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
       };
     };
     "browser-pack-6.0.2" = {
@@ -3208,6 +3208,15 @@ let
         sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4";
       };
     };
+    "concat-stream-1.5.2" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
+        sha1 = "708978624d856af41a5a741defdd261da752c266";
+      };
+    };
     "console-browserify-1.1.0" = {
       name = "console-browserify";
       packageName = "console-browserify";
@@ -3280,15 +3289,6 @@ let
         sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
       };
     };
-    "glob-5.0.15" = {
-      name = "glob";
-      packageName = "glob";
-      version = "5.0.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
-        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
-      };
-    };
     "has-1.0.1" = {
       name = "has";
       packageName = "has";
@@ -3424,13 +3424,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.5.0" = {
+    "stream-http-2.6.3" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.5.0";
+      version = "2.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.5.0.tgz";
-        sha1 = "585eee513217ed98fe199817e7313b6f772a6802";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz";
+        sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3";
       };
     };
     "subarg-1.0.0" = {
@@ -3451,13 +3451,13 @@ let
         sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710";
       };
     };
-    "through2-2.0.1" = {
+    "through2-2.0.3" = {
       name = "through2";
       packageName = "through2";
-      version = "2.0.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz";
-        sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9";
+        url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz";
+        sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be";
       };
     };
     "timers-browserify-1.4.2" = {
@@ -3505,6 +3505,15 @@ let
         sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
       };
     };
+    "jsonparse-1.3.0" = {
+      name = "jsonparse";
+      packageName = "jsonparse";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.0.tgz";
+        sha1 = "85fc245b1d9259acc6941960b905adf64e7de0e8";
+      };
+    };
     "through-2.3.8" = {
       name = "through";
       packageName = "through";
@@ -3568,6 +3577,15 @@ let
         sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
       };
     };
+    "resolve-1.1.7" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+      };
+    };
     "pako-0.2.9" = {
       name = "pako";
       packageName = "pako";
@@ -3802,13 +3820,13 @@ let
         sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
       };
     };
-    "asn1.js-4.9.0" = {
+    "asn1.js-4.9.1" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "4.9.0";
+      version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.0.tgz";
-        sha1 = "f71a1243f3e79d46d7b07d7fbf4824ee73af054a";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz";
+        sha1 = "48ba240b45a9280e94748990ba597d216617fd40";
       };
     };
     "ripemd160-1.0.1" = {
@@ -3973,13 +3991,13 @@ let
         sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
       };
     };
-    "builtin-status-codes-2.0.0" = {
+    "builtin-status-codes-3.0.0" = {
       name = "builtin-status-codes";
       packageName = "builtin-status-codes";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz";
-        sha1 = "6f22003baacf003ccd287afe6872151fddc58579";
+        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
+        sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
       };
     };
     "to-arraybuffer-1.0.1" = {
@@ -4045,13 +4063,13 @@ let
         sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395";
       };
     };
-    "castv2-client-1.1.2" = {
+    "castv2-client-1.2.0" = {
       name = "castv2-client";
       packageName = "castv2-client";
-      version = "1.1.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.1.2.tgz";
-        sha1 = "7865eac9181cd1f419fdcee448b5793706f853ad";
+        url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.2.0.tgz";
+        sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544";
       };
     };
     "chalk-1.0.0" = {
@@ -4450,13 +4468,13 @@ let
         sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc";
       };
     };
-    "numeral-1.5.5" = {
+    "numeral-1.5.6" = {
       name = "numeral";
       packageName = "numeral";
-      version = "1.5.5";
+      version = "1.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.5.tgz";
-        sha1 = "b7515d64533626124e9196cfc68c8fd5b2dee208";
+        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz";
+        sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f";
       };
     };
     "open-0.0.5" = {
@@ -4522,13 +4540,13 @@ let
         sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
       };
     };
-    "mdns-js-0.5.1" = {
+    "mdns-js-0.5.3" = {
       name = "mdns-js";
       packageName = "mdns-js";
-      version = "0.5.1";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.1.tgz";
-        sha1 = "a7ffa47e506e1c0f39bb9cd47c8fa4999e7bc4ec";
+        url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.3.tgz";
+        sha1 = "add2958d399319b6d8f2dde29bebac5e845e8b6d";
       };
     };
     "plist-2.0.1" = {
@@ -4675,22 +4693,22 @@ let
         sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8";
       };
     };
-    "parse-torrent-file-4.0.0" = {
+    "parse-torrent-file-4.0.1" = {
       name = "parse-torrent-file";
       packageName = "parse-torrent-file";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.0.tgz";
-        sha1 = "106df57e0e509bafa6756e544d88205e52be33a6";
+        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.1.tgz";
+        sha1 = "4580c5ebb3f6e607baa02ef0ace51f627859e699";
       };
     };
-    "simple-get-2.3.0" = {
+    "simple-get-2.4.0" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.3.0.tgz";
-        sha1 = "c5fdfcce1e516ad4b2ce7b7c2bd2d710502d8ac9";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz";
+        sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2";
       };
     };
     "thirty-two-1.0.2" = {
@@ -4711,31 +4729,31 @@ let
         sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff";
       };
     };
-    "bencode-0.10.0" = {
+    "bencode-0.11.0" = {
       name = "bencode";
       packageName = "bencode";
-      version = "0.10.0";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bencode/-/bencode-0.10.0.tgz";
-        sha1 = "717b36fc61c4e9cb3755f0a9f90996ee5b46f0d0";
+        url = "https://registry.npmjs.org/bencode/-/bencode-0.11.0.tgz";
+        sha1 = "7ea65d4ce00300393a43a92d5640b6fb0204dc64";
       };
     };
-    "simple-sha1-2.0.8" = {
+    "simple-sha1-2.1.0" = {
       name = "simple-sha1";
       packageName = "simple-sha1";
-      version = "2.0.8";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.0.8.tgz";
-        sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f";
+        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz";
+        sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3";
       };
     };
-    "rusha-0.8.4" = {
+    "rusha-0.8.5" = {
       name = "rusha";
       packageName = "rusha";
-      version = "0.8.4";
+      version = "0.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rusha/-/rusha-0.8.4.tgz";
-        sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b";
+        url = "https://registry.npmjs.org/rusha/-/rusha-0.8.5.tgz";
+        sha1 = "a30ae9bd5a4e80fbc96fbe7a13232b944be24f84";
       };
     };
     "simple-concat-1.0.0" = {
@@ -4900,13 +4918,13 @@ let
         sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854";
       };
     };
-    "random-access-file-1.3.1" = {
+    "random-access-file-1.4.0" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.3.1.tgz";
-        sha1 = "5302a65a7ff2b83c50e18d79bf4cd619b520ac8d";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz";
+        sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767";
       };
     };
     "run-parallel-1.1.6" = {
@@ -5125,13 +5143,13 @@ let
         sha1 = "58cccb244f563326ba893bf5c06a35f644846daa";
       };
     };
-    "k-rpc-socket-1.6.0" = {
+    "k-rpc-socket-1.6.1" = {
       name = "k-rpc-socket";
       packageName = "k-rpc-socket";
-      version = "1.6.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.0.tgz";
-        sha1 = "28c3909cf1547aaa47d5cd924034d55720f7ba64";
+        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.1.tgz";
+        sha1 = "bf67128f89f0c62a19cec5afc3003c280111c78e";
       };
     };
     "bencode-0.8.0" = {
@@ -5170,22 +5188,22 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.0.7" = {
+    "simple-peer-6.2.1" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.0.7";
+      version = "6.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.0.7.tgz";
-        sha1 = "ccc5133b7e75e154ab17b9ccdbec91e970cc2278";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.1.tgz";
+        sha1 = "0d6bf982afb32cca2fabbb969dee4fceaceb99fb";
       };
     };
-    "simple-websocket-4.1.0" = {
+    "simple-websocket-4.2.0" = {
       name = "simple-websocket";
       packageName = "simple-websocket";
-      version = "4.1.0";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.1.0.tgz";
-        sha1 = "2b1e887e7737ae1452458ead0d0a79722901877f";
+        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.2.0.tgz";
+        sha1 = "2517742a7dafc8d44fd4e093184b6718c817f2bf";
       };
     };
     "string2compact-1.2.2" = {
@@ -5512,13 +5530,13 @@ let
         sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c";
       };
     };
-    "exit-on-epipe-0.1.0" = {
+    "exit-on-epipe-1.0.0" = {
       name = "exit-on-epipe";
       packageName = "exit-on-epipe";
-      version = "0.1.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.1.0.tgz";
-        sha1 = "aa2f0155b78b34fe60dd2b462e84637ba5ed0697";
+        url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.0.tgz";
+        sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc";
       };
     };
     "sax-1.2.1" = {
@@ -5557,13 +5575,13 @@ let
         sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33";
       };
     };
-    "insight-0.8.3" = {
+    "insight-0.8.4" = {
       name = "insight";
       packageName = "insight";
-      version = "0.8.3";
+      version = "0.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insight/-/insight-0.8.3.tgz";
-        sha1 = "72d1e1b4da6c8b405db25043f9d86900f8cbf59d";
+        url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz";
+        sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884";
       };
     };
     "nopt-3.0.1" = {
@@ -5638,6 +5656,24 @@ let
         sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
       };
     };
+    "glob-5.0.15" = {
+      name = "glob";
+      packageName = "glob";
+      version = "5.0.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
+        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
+      };
+    };
+    "osenv-0.1.4" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz";
+        sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644";
+      };
+    };
     "plist-1.2.0" = {
       name = "plist";
       packageName = "plist";
@@ -5746,13 +5782,13 @@ let
         sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980";
       };
     };
-    "cordova-serve-1.0.0" = {
+    "cordova-serve-1.0.1" = {
       name = "cordova-serve";
       packageName = "cordova-serve";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.0.tgz";
-        sha1 = "7fa1c40183d2b82adb792f9cb9e0d554a23eed85";
+        url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.1.tgz";
+        sha1 = "895c7fb4bbe630fa1c89feaf6d74779cbff66da7";
       };
     };
     "dep-graph-1.1.0" = {
@@ -5926,13 +5962,13 @@ let
         sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26";
       };
     };
-    "shelljs-0.7.5" = {
+    "shelljs-0.7.6" = {
       name = "shelljs";
       packageName = "shelljs";
-      version = "0.7.5";
+      version = "0.7.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz";
-        sha1 = "2eef7a50a21e1ccf37da00df767ec69e30ad0675";
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz";
+        sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad";
       };
     };
     "interpret-1.0.1" = {
@@ -5971,6 +6007,15 @@ let
         sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae";
       };
     };
+    "assert-1.3.0" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
+        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
+      };
+    };
     "compression-1.6.2" = {
       name = "compression";
       packageName = "compression";
@@ -6205,13 +6250,13 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "proxy-addr-1.1.2" = {
+    "proxy-addr-1.1.3" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz";
-        sha1 = "b4cc5f22610d9535824c123aef9d3cf73c40ba37";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.3.tgz";
+        sha1 = "dc97502f5722e888467b3fa2297a7b1ff47df074";
       };
     };
     "qs-6.2.0" = {
@@ -6286,15 +6331,6 @@ let
         sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
       };
     };
-    "ipaddr.js-1.1.1" = {
-      name = "ipaddr.js";
-      packageName = "ipaddr.js";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz";
-        sha1 = "c791d95f52b29c1247d5df80ada39b8a73647230";
-      };
-    };
     "destroy-1.0.4" = {
       name = "destroy";
       packageName = "destroy";
@@ -6592,22 +6628,22 @@ let
         sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
       };
     };
-    "lockfile-1.0.2" = {
+    "lockfile-1.0.3" = {
       name = "lockfile";
       packageName = "lockfile";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz";
-        sha1 = "97e1990174f696cbe0a3acd58a43b84aa30c7c83";
+        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz";
+        sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79";
       };
     };
-    "lru-cache-4.0.1" = {
+    "lru-cache-4.0.2" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz";
-        sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz";
+        sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
       };
     };
     "node-gyp-3.4.0" = {
@@ -6718,13 +6754,13 @@ let
         sha1 = "d0def882952b8de3f67eba5e91199661271f41f4";
       };
     };
-    "retry-0.10.0" = {
+    "retry-0.10.1" = {
       name = "retry";
       packageName = "retry";
-      version = "0.10.0";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz";
-        sha1 = "649e15ca408422d98318161935e7f7d652d435dd";
+        url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz";
+        sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
       };
     };
     "sha-2.0.1" = {
@@ -6961,15 +6997,6 @@ let
         sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442";
       };
     };
-    "uuid-3.0.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
-        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
-      };
-    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -7573,13 +7600,22 @@ let
         sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
       };
     };
-    "parserlib-1.0.0" = {
+    "clone-2.1.0" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz";
+        sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6";
+      };
+    };
+    "parserlib-1.1.1" = {
       name = "parserlib";
       packageName = "parserlib";
-      version = "1.0.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.0.0.tgz";
-        sha1 = "88340e7e8d95bac9e09236742eef53bec1e4b30f";
+        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz";
+        sha1 = "a64cfa724062434fdfc351c9a4ec2d92b94c06f4";
       };
     };
     "bluebird-2.9.9" = {
@@ -7979,13 +8015,13 @@ let
         sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       };
     };
-    "nan-2.4.0" = {
+    "nan-2.5.0" = {
       name = "nan";
       packageName = "nan";
-      version = "2.4.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz";
-        sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232";
+        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
+        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
       };
     };
     "jsonparse-0.0.6" = {
@@ -8342,22 +8378,22 @@ let
         sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
       };
     };
-    "ndjson-1.4.3" = {
+    "ndjson-1.5.0" = {
       name = "ndjson";
       packageName = "ndjson";
-      version = "1.4.3";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ndjson/-/ndjson-1.4.3.tgz";
-        sha1 = "7aa026fe3ab38a7da1a2b4ad07b1008e733eb239";
+        url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz";
+        sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8";
       };
     };
-    "pump-1.0.1" = {
+    "pump-1.0.2" = {
       name = "pump";
       packageName = "pump";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pump/-/pump-1.0.1.tgz";
-        sha1 = "f1f1409fb9bd1085bbdb576b43b84ec4b5eadc1a";
+        url = "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz";
+        sha1 = "3b3ee6512f94f0e575538c17995f9f16990a5d51";
       };
     };
     "pumpify-1.3.5" = {
@@ -8693,6 +8729,15 @@ let
         sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3";
       };
     };
+    "split2-2.1.1" = {
+      name = "split2";
+      packageName = "split2";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz";
+        sha1 = "7a1f551e176a90ecd3345f7246a0cfe175ef4fd0";
+      };
+    };
     "murl-0.4.1" = {
       name = "murl";
       packageName = "murl";
@@ -8711,31 +8756,40 @@ let
         sha1 = "80ab4e919749351263ef14500d684e57c4202840";
       };
     };
-    "JSONStream-1.1.4" = {
-      name = "JSONStream";
-      packageName = "JSONStream";
-      version = "1.1.4";
+    "bl-1.2.0" = {
+      name = "bl";
+      packageName = "bl";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz";
-        sha1 = "be11a495938e882d277773d11986f3974a8ba37a";
+        url = "https://registry.npmjs.org/bl/-/bl-1.2.0.tgz";
+        sha1 = "1397e7ec42c5f5dc387470c500e34a9f6be9ea98";
       };
     };
-    "async-2.0.1" = {
-      name = "async";
-      packageName = "async";
-      version = "2.0.1";
+    "awscred-1.2.0" = {
+      name = "awscred";
+      packageName = "awscred";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz";
-        sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
+        url = "https://registry.npmjs.org/awscred/-/awscred-1.2.0.tgz";
+        sha1 = "9ba714a0d2feb625b848f15c62746c07aebdc3b5";
       };
     };
-    "got-6.6.3" = {
+    "clipboardy-0.1.2" = {
+      name = "clipboardy";
+      packageName = "clipboardy";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipboardy/-/clipboardy-0.1.2.tgz";
+        sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc";
+      };
+    };
+    "got-6.7.1" = {
       name = "got";
       packageName = "got";
-      version = "6.6.3";
+      version = "6.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-6.6.3.tgz";
-        sha1 = "ff72c56d7f040eb8918ffb80fb62bcaf489d4eec";
+        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
+        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
       };
     };
     "lodash.debounce-4.0.8" = {
@@ -8756,13 +8810,76 @@ let
         sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1";
       };
     };
-    "mem-0.1.1" = {
+    "mem-1.1.0" = {
       name = "mem";
       packageName = "mem";
-      version = "0.1.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz";
-        sha1 = "24df988c3102b03c074c1b296239c5b2e6647825";
+        url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz";
+        sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
+      };
+    };
+    "execa-0.5.1" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz";
+        sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36";
+      };
+    };
+    "cross-spawn-4.0.2" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz";
+        sha1 = "7b9247621c23adfdd3856004a823cbe397424d41";
+      };
+    };
+    "get-stream-2.3.1" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
+        sha1 = "5f38f93f346009666ee0150a054167f91bdd95de";
+      };
+    };
+    "npm-run-path-2.0.2" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
+        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+      };
+    };
+    "p-finally-1.0.0" = {
+      name = "p-finally";
+      packageName = "p-finally";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
+        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+      };
+    };
+    "strip-eof-1.0.0" = {
+      name = "strip-eof";
+      packageName = "strip-eof";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
+        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
+      };
+    };
+    "path-key-2.0.1" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
+        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     };
     "create-error-class-3.0.2" = {
@@ -8783,13 +8900,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "get-stream-2.3.1" = {
+    "get-stream-3.0.0" = {
       name = "get-stream";
       packageName = "get-stream";
-      version = "2.3.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
-        sha1 = "5f38f93f346009666ee0150a054167f91bdd95de";
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
+        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
       };
     };
     "is-retry-allowed-1.1.0" = {
@@ -8801,22 +8918,13 @@ let
         sha1 = "11a060568b67339444033d0125a61a20d564fb34";
       };
     };
-    "node-status-codes-2.0.1" = {
-      name = "node-status-codes";
-      packageName = "node-status-codes";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz";
-        sha1 = "298067659cb68a2b4670abbefde02a3819981f5b";
-      };
-    };
-    "timed-out-3.0.0" = {
+    "timed-out-4.0.1" = {
       name = "timed-out";
       packageName = "timed-out";
-      version = "3.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.0.0.tgz";
-        sha1 = "ff88de96030ce960eabd42487db61d3add229273";
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz";
+        sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
       };
     };
     "url-parse-lax-1.0.0" = {
@@ -8837,13 +8945,22 @@ let
         sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
       };
     };
-    "babel-code-frame-6.16.0" = {
+    "mimic-fn-1.1.0" = {
+      name = "mimic-fn";
+      packageName = "mimic-fn";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz";
+        sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18";
+      };
+    };
+    "babel-code-frame-6.22.0" = {
       name = "babel-code-frame";
       packageName = "babel-code-frame";
-      version = "6.16.0";
+      version = "6.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz";
-        sha1 = "f90e60da0862909d3ce098733b5d3987c97cb8de";
+        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz";
+        sha1 = "027620bee567a88c32561574e7fd0801d33118e4";
       };
     };
     "doctrine-1.5.0" = {
@@ -9008,6 +9125,15 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
+    "strip-json-comments-2.0.1" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
+      };
+    };
     "table-3.8.3" = {
       name = "table";
       packageName = "table";
@@ -9017,13 +9143,13 @@ let
         sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
       };
     };
-    "js-tokens-2.0.0" = {
+    "js-tokens-3.0.0" = {
       name = "js-tokens";
       packageName = "js-tokens";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz";
-        sha1 = "79903f5563ee778cc1162e6dcf1a0027c97f9cb5";
+        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.0.tgz";
+        sha1 = "a2f2a969caae142fb3cd56228358c89366957bd1";
       };
     };
     "es6-map-0.1.4" = {
@@ -9080,13 +9206,13 @@ let
         sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
       };
     };
-    "acorn-4.0.3" = {
+    "acorn-4.0.4" = {
       name = "acorn";
       packageName = "acorn";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz";
-        sha1 = "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1";
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz";
+        sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a";
       };
     };
     "acorn-jsx-3.0.1" = {
@@ -9098,13 +9224,13 @@ let
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
-    "flat-cache-1.2.1" = {
+    "flat-cache-1.2.2" = {
       name = "flat-cache";
       packageName = "flat-cache";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.1.tgz";
-        sha1 = "6c837d6225a7de5659323740b36d5361f71691ff";
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz";
+        sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96";
       };
     };
     "circular-json-0.3.1" = {
@@ -9278,13 +9404,13 @@ let
         sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
       };
     };
-    "fast-levenshtein-2.0.5" = {
+    "fast-levenshtein-2.0.6" = {
       name = "fast-levenshtein";
       packageName = "fast-levenshtein";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz";
-        sha1 = "bd33145744519ab1c36c3ee9f31f08e9079b67f2";
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
     "caller-path-0.1.0" = {
@@ -9314,22 +9440,22 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.9.0" = {
+    "ajv-4.10.4" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.9.0";
+      version = "4.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.9.0.tgz";
-        sha1 = "5a358085747b134eb567d6d15e015f1d7802f45c";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz";
+        sha1 = "c0974dd00b3464984892d6010aa9c2c945933254";
       };
     };
-    "ajv-keywords-1.1.1" = {
+    "ajv-keywords-1.5.0" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "1.1.1";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz";
-        sha1 = "02550bc605a3e576041565628af972e06c549d50";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz";
+        sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c";
       };
     };
     "slice-ansi-0.0.4" = {
@@ -9440,13 +9566,13 @@ let
         sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d";
       };
     };
-    "prettyjson-1.2.0" = {
+    "prettyjson-1.2.1" = {
       name = "prettyjson";
       packageName = "prettyjson";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.0.tgz";
-        sha1 = "2a109cdf14c957896bbad8b77ef5de5db2c691bf";
+        url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz";
+        sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289";
       };
     };
     "shush-1.0.0" = {
@@ -9584,13 +9710,13 @@ let
         sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
       };
     };
-    "fsevents-1.0.15" = {
+    "fsevents-1.0.17" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.0.15";
+      version = "1.0.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz";
-        sha1 = "fa63f590f3c2ad91275e4972a6cea545fb0aae44";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.17.tgz";
+        sha1 = "8537f3f12272678765b4fd6528c0f1f66f8f4558";
       };
     };
     "micromatch-2.3.11" = {
@@ -9656,13 +9782,13 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
-    "kind-of-3.0.4" = {
+    "kind-of-3.1.0" = {
       name = "kind-of";
       packageName = "kind-of";
-      version = "3.0.4";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz";
-        sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74";
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz";
+        sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47";
       };
     };
     "normalize-path-2.0.1" = {
@@ -9764,13 +9890,13 @@ let
         sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
       };
     };
-    "randomatic-1.1.5" = {
+    "randomatic-1.1.6" = {
       name = "randomatic";
       packageName = "randomatic";
-      version = "1.1.5";
+      version = "1.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz";
-        sha1 = "5e9ef5f2d573c67bd2b8124ae90b5156e457840b";
+        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz";
+        sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb";
       };
     };
     "repeat-string-1.6.1" = {
@@ -9854,13 +9980,13 @@ let
         sha1 = "207bab91638499c07b2adf240a41a87210034575";
       };
     };
-    "binary-extensions-1.7.0" = {
+    "binary-extensions-1.8.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz";
-        sha1 = "6c1610db163abfb34edfe42fa423343a1e01185d";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz";
+        sha1 = "48ec8d16df4377eae5fa5884682480af4d95c774";
       };
     };
     "set-immediate-shim-1.0.1" = {
@@ -9872,22 +9998,22 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.31" = {
+    "node-pre-gyp-0.6.32" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.31";
+      version = "0.6.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
-        sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
+        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
       };
     };
-    "npmlog-4.0.1" = {
+    "npmlog-4.0.2" = {
       name = "npmlog";
       packageName = "npmlog";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.1.tgz";
-        sha1 = "d14f503b4cd79710375553004ba96e6662fbc0b8";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
+        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
       };
     };
     "tar-pack-3.3.0" = {
@@ -9908,13 +10034,13 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
-    "gauge-2.7.1" = {
+    "gauge-2.7.2" = {
       name = "gauge";
       packageName = "gauge";
-      version = "2.7.1";
+      version = "2.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.1.tgz";
-        sha1 = "388473894fe8be5e13ffcdb8b93e4ed0616428c7";
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz";
+        sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774";
       };
     };
     "set-blocking-2.0.0" = {
@@ -10071,13 +10197,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.11.1" = {
+    "coffee-script-1.12.2" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.11.1";
+      version = "1.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
-        sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
+        sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
       };
     };
     "jade-1.11.0" = {
@@ -10116,13 +10242,13 @@ let
         sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
       };
     };
-    "clean-css-3.4.21" = {
+    "clean-css-3.4.24" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "3.4.21";
+      version = "3.4.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.21.tgz";
-        sha1 = "2101d5dbd19d63dbc16a75ebd570e7c33948f65b";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.24.tgz";
+        sha1 = "89f5a5e9da37ae02394fe049a41388abbe72c3b5";
       };
     };
     "commander-2.6.0" = {
@@ -10161,13 +10287,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.7.4" = {
+    "uglify-js-2.7.5" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.7.4";
+      version = "2.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
-        sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
+        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
       };
     };
     "void-elements-2.0.1" = {
@@ -10404,13 +10530,13 @@ let
         sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19";
       };
     };
-    "gulp-util-3.0.7" = {
+    "gulp-util-3.0.8" = {
       name = "gulp-util";
       packageName = "gulp-util";
-      version = "3.0.7";
+      version = "3.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz";
-        sha1 = "78925c4b8f8b49005ac01a011c557e6218941cbb";
+        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz";
+        sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f";
       };
     };
     "liftoff-2.3.0" = {
@@ -10485,22 +10611,22 @@ let
         sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809";
       };
     };
-    "dateformat-1.0.12" = {
+    "dateformat-2.0.0" = {
       name = "dateformat";
       packageName = "dateformat";
-      version = "1.0.12";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz";
-        sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9";
+        url = "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz";
+        sha1 = "2743e3abb5c3fc2462e527dca445e04e9f4dee17";
       };
     };
-    "fancy-log-1.2.0" = {
+    "fancy-log-1.3.0" = {
       name = "fancy-log";
       packageName = "fancy-log";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.2.0.tgz";
-        sha1 = "d5a51b53e9ab22ca07d558f2b67ae55fdb5fcbd8";
+        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz";
+        sha1 = "45be17d02bb9917d60ccffd4995c999e6c8c9948";
       };
     };
     "gulplog-1.0.0" = {
@@ -10890,13 +11016,13 @@ let
         sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5";
       };
     };
-    "is-unc-path-0.1.1" = {
+    "is-unc-path-0.1.2" = {
       name = "is-unc-path";
       packageName = "is-unc-path";
-      version = "0.1.1";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.1.tgz";
-        sha1 = "ab2533d77ad733561124c3dc0f5cd8b90054c86b";
+        url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz";
+        sha1 = "6ab053a72573c10250ff416a3814c35178af39b9";
       };
     };
     "unc-path-regex-0.1.2" = {
@@ -11304,13 +11430,13 @@ let
         sha1 = "2ce4484850537f9c97a8026d5399b935c4ed4ed7";
       };
     };
-    "supports-color-3.1.2" = {
+    "supports-color-3.2.3" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "3.1.2";
+      version = "3.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz";
-        sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz";
+        sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6";
       };
     };
     "estraverse-1.9.3" = {
@@ -11358,22 +11484,22 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "bluebird-3.4.6" = {
+    "bluebird-3.4.7" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.4.6";
+      version = "3.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz";
-        sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz";
+        sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
       };
     };
-    "body-parser-1.15.2" = {
+    "body-parser-1.16.0" = {
       name = "body-parser";
       packageName = "body-parser";
-      version = "1.15.2";
+      version = "1.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz";
-        sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67";
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.0.tgz";
+        sha1 = "924a5e472c6229fb9d69b85a20d5f2532dec788b";
       };
     };
     "combine-lists-1.0.1" = {
@@ -11430,22 +11556,22 @@ let
         sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea";
       };
     };
-    "http-proxy-1.15.2" = {
+    "http-proxy-1.16.2" = {
       name = "http-proxy";
       packageName = "http-proxy";
-      version = "1.15.2";
+      version = "1.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz";
-        sha1 = "642fdcaffe52d3448d2bda3b0079e9409064da31";
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz";
+        sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742";
       };
     };
-    "isbinaryfile-3.0.1" = {
+    "isbinaryfile-3.0.2" = {
       name = "isbinaryfile";
       packageName = "isbinaryfile";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.1.tgz";
-        sha1 = "6e99573675372e841a0520c036b41513d783e79e";
+        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz";
+        sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621";
       };
     };
     "log4js-0.6.38" = {
@@ -11466,13 +11592,13 @@ let
         sha1 = "659de9f2cf8dcc27a1481276f205377272382e73";
       };
     };
-    "socket.io-1.4.7" = {
+    "socket.io-1.7.2" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "1.4.7";
+      version = "1.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.7.tgz";
-        sha1 = "92b7f7cb88c5797d4daee279fe8075dbe6d3fa1c";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.2.tgz";
+        sha1 = "83bbbdf2e79263b378900da403e7843e05dc3b71";
       };
     };
     "tmp-0.0.28" = {
@@ -11484,13 +11610,13 @@ let
         sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120";
       };
     };
-    "useragent-2.1.9" = {
+    "useragent-2.1.11" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.1.9";
+      version = "2.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.9.tgz";
-        sha1 = "4dba2bc4dad1875777ab15de3ff8098b475000b7";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.11.tgz";
+        sha1 = "6a026e6a6c619b46ca7a0b2fdef6c1ac3da8ca29";
       };
     };
     "bytes-2.4.0" = {
@@ -11502,22 +11628,22 @@ let
         sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339";
       };
     };
-    "iconv-lite-0.4.13" = {
+    "iconv-lite-0.4.15" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
-      version = "0.4.13";
+      version = "0.4.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz";
-        sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
+        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
       };
     };
-    "raw-body-2.1.7" = {
+    "raw-body-2.2.0" = {
       name = "raw-body";
       packageName = "raw-body";
-      version = "2.1.7";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz";
-        sha1 = "adfeace2e4fb3098058014d08c072dcc59758774";
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz";
+        sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96";
       };
     };
     "custom-event-1.0.1" = {
@@ -11601,40 +11727,22 @@ let
         sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
       };
     };
-    "engine.io-1.6.10" = {
+    "debug-2.3.3" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
+        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
+      };
+    };
+    "engine.io-1.8.2" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "1.6.10";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.10.tgz";
-        sha1 = "f87d84e1bd21d1a2ec7f8deef0c62054acdfb27a";
-      };
-    };
-    "socket.io-parser-2.2.6" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz";
-        sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99";
-      };
-    };
-    "socket.io-client-1.4.6" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.4.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz";
-        sha1 = "49b0ba537efd15b8297c84016e642e1c7c752c3d";
-      };
-    };
-    "socket.io-adapter-0.4.0" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz";
-        sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.2.tgz";
+        sha1 = "6b59be730b348c0125b0a4589de1c355abcf7a7e";
       };
     };
     "has-binary-0.1.7" = {
@@ -11646,49 +11754,67 @@ let
         sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
       };
     };
-    "base64id-0.1.0" = {
+    "object-assign-4.1.0" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz";
+        sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0";
+      };
+    };
+    "socket.io-adapter-0.5.0" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
+        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
+      };
+    };
+    "socket.io-client-1.7.2" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "1.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.2.tgz";
+        sha1 = "39fdb0c3dd450e321b7e40cfd83612ec533dd644";
+      };
+    };
+    "socket.io-parser-2.3.1" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
+        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
+      };
+    };
+    "base64id-1.0.0" = {
       name = "base64id";
       packageName = "base64id";
-      version = "0.1.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
-        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+        url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz";
+        sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
       };
     };
-    "ws-1.0.1" = {
-      name = "ws";
-      packageName = "ws";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz";
-        sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9";
-      };
-    };
-    "engine.io-parser-1.2.4" = {
+    "engine.io-parser-1.3.2" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
-      version = "1.2.4";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz";
-        sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42";
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz";
+        sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a";
       };
     };
-    "accepts-1.1.4" = {
-      name = "accepts";
-      packageName = "accepts";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
-        sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
-      };
-    };
-    "after-0.8.1" = {
+    "after-0.8.2" = {
       name = "after";
       packageName = "after";
-      version = "0.8.1";
+      version = "0.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz";
-        sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627";
+        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
+        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
       };
     };
     "arraybuffer.slice-0.0.6" = {
@@ -11700,13 +11826,13 @@ let
         sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
       };
     };
-    "base64-arraybuffer-0.1.2" = {
+    "base64-arraybuffer-0.1.5" = {
       name = "base64-arraybuffer";
       packageName = "base64-arraybuffer";
-      version = "0.1.2";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
-        sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154";
+        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
+        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
       };
     };
     "blob-0.0.4" = {
@@ -11718,103 +11844,13 @@ let
         sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
       };
     };
-    "has-binary-0.1.6" = {
-      name = "has-binary";
-      packageName = "has-binary";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz";
-        sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10";
-      };
-    };
-    "utf8-2.1.0" = {
-      name = "utf8";
-      packageName = "utf8";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz";
-        sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5";
-      };
-    };
-    "negotiator-0.4.9" = {
-      name = "negotiator";
-      packageName = "negotiator";
-      version = "0.4.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
-        sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f";
-      };
-    };
-    "json3-3.3.2" = {
-      name = "json3";
-      packageName = "json3";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
-        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
-      };
-    };
-    "benchmark-1.0.0" = {
-      name = "benchmark";
-      packageName = "benchmark";
+    "wtf-8-1.0.0" = {
+      name = "wtf-8";
+      packageName = "wtf-8";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
-        sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73";
-      };
-    };
-    "engine.io-client-1.6.9" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.6.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz";
-        sha1 = "1d6ad48048a5083c95096943b29d36efdb212401";
-      };
-    };
-    "component-bind-1.0.0" = {
-      name = "component-bind";
-      packageName = "component-bind";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
-        sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
-      };
-    };
-    "component-emitter-1.2.0" = {
-      name = "component-emitter";
-      packageName = "component-emitter";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz";
-        sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe";
-      };
-    };
-    "object-component-0.0.3" = {
-      name = "object-component";
-      packageName = "object-component";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
-        sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
-      };
-    };
-    "parseuri-0.0.4" = {
-      name = "parseuri";
-      packageName = "parseuri";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz";
-        sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350";
-      };
-    };
-    "to-array-0.1.4" = {
-      name = "to-array";
-      packageName = "to-array";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
-        sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
+        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
+        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
       };
     };
     "backo2-1.0.2" = {
@@ -11826,40 +11862,58 @@ let
         sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
       };
     };
-    "has-cors-1.1.0" = {
-      name = "has-cors";
-      packageName = "has-cors";
-      version = "1.1.0";
+    "component-bind-1.0.0" = {
+      name = "component-bind";
+      packageName = "component-bind";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
-        sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+        url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
+        sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
       };
     };
-    "xmlhttprequest-ssl-1.5.1" = {
-      name = "xmlhttprequest-ssl";
-      packageName = "xmlhttprequest-ssl";
-      version = "1.5.1";
+    "component-emitter-1.2.1" = {
+      name = "component-emitter";
+      packageName = "component-emitter";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz";
-        sha1 = "3b7741fea4a86675976e908d296d4445961faa67";
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
       };
     };
-    "parsejson-0.0.1" = {
-      name = "parsejson";
-      packageName = "parsejson";
-      version = "0.0.1";
+    "engine.io-client-1.8.2" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
-        sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc";
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.2.tgz";
+        sha1 = "c38767547f2a7d184f5752f6f0ad501006703766";
       };
     };
-    "parseqs-0.0.2" = {
-      name = "parseqs";
-      packageName = "parseqs";
-      version = "0.0.2";
+    "object-component-0.0.3" = {
+      name = "object-component";
+      packageName = "object-component";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
-        sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7";
+        url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
+        sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
+      };
+    };
+    "parseuri-0.0.5" = {
+      name = "parseuri";
+      packageName = "parseuri";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
+        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+      };
+    };
+    "to-array-0.1.4" = {
+      name = "to-array";
+      packageName = "to-array";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
+        sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
       };
     };
     "component-inherit-0.0.3" = {
@@ -11871,6 +11925,42 @@ let
         sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
       };
     };
+    "has-cors-1.1.0" = {
+      name = "has-cors";
+      packageName = "has-cors";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
+        sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+      };
+    };
+    "parsejson-0.0.3" = {
+      name = "parsejson";
+      packageName = "parsejson";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
+        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
+      };
+    };
+    "parseqs-0.0.5" = {
+      name = "parseqs";
+      packageName = "parseqs";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
+        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
+      };
+    };
+    "xmlhttprequest-ssl-1.5.3" = {
+      name = "xmlhttprequest-ssl";
+      packageName = "xmlhttprequest-ssl";
+      version = "1.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
+        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
+      };
+    };
     "yeast-0.1.2" = {
       name = "yeast";
       packageName = "yeast";
@@ -11898,22 +11988,13 @@ let
         sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
       };
     };
-    "socket.io-parser-2.2.2" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz";
-        sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417";
-      };
-    };
-    "json3-3.2.6" = {
+    "json3-3.3.2" = {
       name = "json3";
       packageName = "json3";
-      version = "3.2.6";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
-        sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
+        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
+        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
       };
     };
     "lru-cache-2.2.4" = {
@@ -12213,6 +12294,24 @@ let
         sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade";
       };
     };
+    "raw-body-2.1.7" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz";
+        sha1 = "adfeace2e4fb3098058014d08c072dcc59758774";
+      };
+    };
+    "iconv-lite-0.4.13" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz";
+        sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
+      };
+    };
     "csrf-3.0.4" = {
       name = "csrf";
       packageName = "csrf";
@@ -12222,6 +12321,15 @@ let
         sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
       };
     };
+    "base64-url-1.3.3" = {
+      name = "base64-url";
+      packageName = "base64-url";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
+        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
+      };
+    };
     "rndm-1.2.0" = {
       name = "rndm";
       packageName = "rndm";
@@ -12366,22 +12474,22 @@ let
         sha1 = "a7de988a211f9cf4687377130ea74df32730c918";
       };
     };
-    "oauth-0.9.14" = {
+    "oauth-0.9.15" = {
       name = "oauth";
       packageName = "oauth";
-      version = "0.9.14";
+      version = "0.9.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
-        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz";
+        sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1";
       };
     };
-    "passport-oauth2-1.3.0" = {
+    "passport-oauth2-1.4.0" = {
       name = "passport-oauth2";
       packageName = "passport-oauth2";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.3.0.tgz";
-        sha1 = "d72b4bd62eeb807a4089ff3071a22c26c382dc0c";
+        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz";
+        sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad";
       };
     };
     "uid2-0.0.3" = {
@@ -12447,22 +12555,22 @@ let
         sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
       };
     };
-    "lodash.isequal-4.4.0" = {
+    "lodash.isequal-4.5.0" = {
       name = "lodash.isequal";
       packageName = "lodash.isequal";
-      version = "4.4.0";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.4.0.tgz";
-        sha1 = "6295768e98e14dc15ce8d362ef6340db82852031";
+        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
+        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
       };
     };
-    "merge-stream-1.0.0" = {
+    "merge-stream-1.0.1" = {
       name = "merge-stream";
       packageName = "merge-stream";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz";
-        sha1 = "9cfd156fef35421e2b5403ce11dc6eb1962b026e";
+        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz";
+        sha1 = "4041202d508a342ba00174008df0c251b8c135e1";
       };
     };
     "strip-bom-stream-1.0.0" = {
@@ -12492,13 +12600,13 @@ let
         sha1 = "1b904a59609fb328ef078138420934f6b86709a6";
       };
     };
-    "glob-parent-3.0.1" = {
+    "glob-parent-3.1.0" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "3.0.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.1.tgz";
-        sha1 = "60021327cc963ddc3b5f085764f500479ecd82ff";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
+        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     };
     "ordered-read-streams-0.3.0" = {
@@ -12546,13 +12654,13 @@ let
         sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
       };
     };
-    "is-extglob-2.1.0" = {
+    "is-extglob-2.1.1" = {
       name = "is-extglob";
       packageName = "is-extglob";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.0.tgz";
-        sha1 = "33411a482b046bf95e6b0cb27ee2711af4cf15ad";
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
       };
     };
     "extend-shallow-2.0.1" = {
@@ -12708,15 +12816,6 @@ let
         sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
       };
     };
-    "semver-5.0.3" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz";
-        sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
-      };
-    };
     "npm-registry-client-7.1.2" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
@@ -12942,15 +13041,6 @@ let
         sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103";
       };
     };
-    "after-0.8.2" = {
-      name = "after";
-      packageName = "after";
-      version = "0.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
-        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
-      };
-    };
     "yargs-1.3.3" = {
       name = "yargs";
       packageName = "yargs";
@@ -13023,13 +13113,13 @@ let
         sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
       };
     };
-    "wrap-ansi-2.0.0" = {
+    "wrap-ansi-2.1.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz";
-        sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f";
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
       };
     };
     "lcid-1.0.0" = {
@@ -13158,22 +13248,31 @@ let
         sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     };
-    "write-file-atomic-1.2.0" = {
+    "write-file-atomic-1.3.1" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
-      version = "1.2.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
-        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.1.tgz";
+        sha1 = "7d45ba32316328dd1ec7d90f60ebc0d845bb759a";
       };
     };
-    "bcryptjs-2.3.0" = {
+    "bcryptjs-2.4.0" = {
       name = "bcryptjs";
       packageName = "bcryptjs";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz";
-        sha1 = "5826900cfef7abaf3425c72e4d464de509b8c2ec";
+        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.0.tgz";
+        sha1 = "fb7f4a0b133854503fe1b2da3f25db834cf0e678";
+      };
+    };
+    "body-parser-1.15.2" = {
+      name = "body-parser";
+      packageName = "body-parser";
+      version = "1.15.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz";
+        sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67";
       };
     };
     "cheerio-0.22.0" = {
@@ -13185,15 +13284,6 @@ let
         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" = {
       name = "cookie-parser";
       packageName = "cookie-parser";
@@ -13203,31 +13293,31 @@ let
         sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
       };
     };
-    "cron-1.1.1" = {
+    "cron-1.2.1" = {
       name = "cron";
       packageName = "cron";
-      version = "1.1.1";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.1.1.tgz";
-        sha1 = "02719d4ef480dfc8ee24d81a3603460ba39013ce";
+        url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz";
+        sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2";
       };
     };
-    "follow-redirects-0.2.0" = {
+    "follow-redirects-1.2.1" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "0.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.2.0.tgz";
-        sha1 = "e0229d7a388bb5ff7b29f44fc1e1b62e921272df";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.1.tgz";
+        sha1 = "796c716970df4fb0096165393545040f61b00f59";
       };
     };
-    "fs-extra-0.30.0" = {
+    "fs-extra-1.0.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
-      version = "0.30.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz";
-        sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
+        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
       };
     };
     "fs.notify-0.0.4" = {
@@ -13248,31 +13338,40 @@ let
         sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
-    "mqtt-1.14.1" = {
+    "jsonata-1.0.10" = {
+      name = "jsonata";
+      packageName = "jsonata";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.0.10.tgz";
+        sha1 = "5177b5aa3ec66e7b5894412b2f9ad170c6107b96";
+      };
+    };
+    "mqtt-2.2.1" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-1.14.1.tgz";
-        sha1 = "7e376987153d01793e946d26d46122ebf0c03554";
-      };
-    };
-    "mustache-2.2.1" = {
-      name = "mustache";
-      packageName = "mustache";
       version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-2.2.1.tgz";
-        sha1 = "2c40ca21c278f53150682bcf9090e41a3339b876";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.2.1.tgz";
+        sha1 = "b3efff8adff78dee07e09cfe89e2d2fb364a1852";
       };
     };
-    "oauth2orize-1.5.0" = {
+    "mustache-2.3.0" = {
+      name = "mustache";
+      packageName = "mustache";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz";
+        sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0";
+      };
+    };
+    "oauth2orize-1.7.0" = {
       name = "oauth2orize";
       packageName = "oauth2orize";
-      version = "1.5.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.5.0.tgz";
-        sha1 = "e352ff4f1b5bf08f0ee94a09757f8f640eb8e0a6";
+        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.7.0.tgz";
+        sha1 = "94c2a511cd0b58bde548548ffcde14fd81f257cc";
       };
     };
     "passport-http-bearer-1.0.1" = {
@@ -13293,22 +13392,13 @@ let
         sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba";
       };
     };
-    "sentiment-1.0.6" = {
+    "sentiment-2.1.0" = {
       name = "sentiment";
       packageName = "sentiment";
-      version = "1.0.6";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sentiment/-/sentiment-1.0.6.tgz";
-        sha1 = "f6096c6271f020f490d58b54a8afd598db8acbb1";
-      };
-    };
-    "uglify-js-2.7.3" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz";
-        sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868";
+        url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz";
+        sha1 = "33279100c35c38519ca5e435245186c512fe0fdc";
       };
     };
     "when-3.7.7" = {
@@ -13320,15 +13410,6 @@ let
         sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
       };
     };
-    "ws-0.8.1" = {
-      name = "ws";
-      packageName = "ws";
-      version = "0.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-0.8.1.tgz";
-        sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759";
-      };
-    };
     "node-red-node-feedparser-0.1.7" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
@@ -13338,13 +13419,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.12" = {
+    "node-red-node-email-0.1.15" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.12";
+      version = "0.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.12.tgz";
-        sha1 = "ada28233b92e60907ab53a6edc0bb4c17d27d4f5";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz";
+        sha1 = "7a528596d3b693a077b1ee293300299855537142";
       };
     };
     "node-red-node-twitter-0.1.9" = {
@@ -13365,22 +13446,13 @@ let
         sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539";
       };
     };
-    "node-red-node-serialport-0.4.1" = {
-      name = "node-red-node-serialport";
-      packageName = "node-red-node-serialport";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.1.tgz";
-        sha1 = "1c59ea7d2b25612dd0cb53956ab8edf28c74d45c";
-      };
-    };
-    "bcrypt-0.8.7" = {
+    "bcrypt-1.0.2" = {
       name = "bcrypt";
       packageName = "bcrypt";
-      version = "0.8.7";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz";
-        sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093";
+        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.2.tgz";
+        sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736";
       };
     };
     "css-select-1.2.0" = {
@@ -13527,13 +13599,13 @@ let
         sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
       };
     };
-    "moment-timezone-0.5.9" = {
+    "moment-timezone-0.5.11" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.9";
+      version = "0.5.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.9.tgz";
-        sha1 = "e0ea82036d67d21d793544a91b5057f480eda2dd";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz";
+        sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f";
       };
     };
     "retry-0.6.1" = {
@@ -13599,22 +13671,13 @@ let
         sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a";
       };
     };
-    "mqtt-connection-2.1.1" = {
-      name = "mqtt-connection";
-      packageName = "mqtt-connection";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-connection/-/mqtt-connection-2.1.1.tgz";
-        sha1 = "7b2e985a74e196619430bebd35da162c34c4e56a";
-      };
-    };
-    "mqtt-packet-3.4.7" = {
+    "mqtt-packet-5.2.1" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "3.4.7";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-3.4.7.tgz";
-        sha1 = "be8c267be7f0bf6a2a2d4f6de28307b6e0940e5f";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.1.tgz";
+        sha1 = "876e35ed616a8e348ac0283b4922039872458b58";
       };
     };
     "reinterval-1.1.0" = {
@@ -13626,15 +13689,6 @@ let
         sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
       };
     };
-    "split2-2.1.0" = {
-      name = "split2";
-      packageName = "split2";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split2/-/split2-2.1.0.tgz";
-        sha1 = "7382c148cb622c4b28af7c727f9673730b73f474";
-      };
-    };
     "websocket-stream-3.3.3" = {
       name = "websocket-stream";
       packageName = "websocket-stream";
@@ -13662,60 +13716,6 @@ let
         sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
       };
     };
-    "reduplexer-1.1.0" = {
-      name = "reduplexer";
-      packageName = "reduplexer";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/reduplexer/-/reduplexer-1.1.0.tgz";
-        sha1 = "7dfed18a679e749c1d7ad36de01acb515f08e140";
-      };
-    };
-    "lodash.assign-4.0.1" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.0.1.tgz";
-        sha1 = "8e7ff0206897a99dca32fc8123309f5c4c2c731e";
-      };
-    };
-    "lodash.keys-4.2.0" = {
-      name = "lodash.keys";
-      packageName = "lodash.keys";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz";
-        sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205";
-      };
-    };
-    "lodash.rest-4.0.5" = {
-      name = "lodash.rest";
-      packageName = "lodash.rest";
-      version = "4.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.5.tgz";
-        sha1 = "954ef75049262038c96d1fc98b28fdaf9f0772aa";
-      };
-    };
-    "bufferutil-1.2.1" = {
-      name = "bufferutil";
-      packageName = "bufferutil";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz";
-        sha1 = "37be5d36e1e06492221e68d474b1ac58e510cbd7";
-      };
-    };
-    "utf-8-validate-1.2.1" = {
-      name = "utf-8-validate";
-      packageName = "utf-8-validate";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz";
-        sha1 = "44cb7c6eead73d6b40448f71f745904357b9f72c";
-      };
-    };
     "feedparser-1.1.3" = {
       name = "feedparser";
       packageName = "feedparser";
@@ -13779,13 +13779,13 @@ let
         sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3";
       };
     };
-    "imap-0.8.18" = {
+    "imap-0.8.19" = {
       name = "imap";
       packageName = "imap";
-      version = "0.8.18";
+      version = "0.8.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/imap/-/imap-0.8.18.tgz";
-        sha1 = "4a7cdd0ff276efa0298708bb2c6d0db0b77f7a3f";
+        url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz";
+        sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5";
       };
     };
     "libmime-1.2.0" = {
@@ -13941,58 +13941,13 @@ let
         sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
       };
     };
-    "serialport-4.0.6" = {
-      name = "serialport";
-      packageName = "serialport";
-      version = "4.0.6";
+    "oauth-0.9.14" = {
+      name = "oauth";
+      packageName = "oauth";
+      version = "0.9.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialport/-/serialport-4.0.6.tgz";
-        sha1 = "2ea4c1a2b6ad91d9cacd78e8e530f8969ac650ae";
-      };
-    };
-    "lie-3.1.0" = {
-      name = "lie";
-      packageName = "lie";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lie/-/lie-3.1.0.tgz";
-        sha1 = "65e0139eaef9ae791a1f5c8c53692c8d3b4718f4";
-      };
-    };
-    "object.assign-4.0.4" = {
-      name = "object.assign";
-      packageName = "object.assign";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz";
-        sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
-      };
-    };
-    "immediate-3.0.6" = {
-      name = "immediate";
-      packageName = "immediate";
-      version = "3.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz";
-        sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b";
-      };
-    };
-    "define-properties-1.1.2" = {
-      name = "define-properties";
-      packageName = "define-properties";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
-        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
-      };
-    };
-    "nan-2.3.5" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
-        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
+        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
       };
     };
     "mongoose-3.6.7" = {
@@ -14373,6 +14328,15 @@ let
         sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d";
       };
     };
+    "base64id-0.1.0" = {
+      name = "base64id";
+      packageName = "base64id";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+      };
+    };
     "redis-0.7.3" = {
       name = "redis";
       packageName = "redis";
@@ -14454,13 +14418,13 @@ let
         sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
       };
     };
-    "mailcomposer-3.12.0" = {
+    "mailcomposer-4.0.1" = {
       name = "mailcomposer";
       packageName = "mailcomposer";
-      version = "3.12.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz";
-        sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9";
+        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz";
+        sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4";
       };
     };
     "simplesmtp-0.3.35" = {
@@ -14472,22 +14436,22 @@ let
         sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03";
       };
     };
-    "buildmail-3.10.0" = {
+    "buildmail-4.0.1" = {
       name = "buildmail";
       packageName = "buildmail";
-      version = "3.10.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz";
-        sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159";
+        url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz";
+        sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72";
       };
     };
-    "libmime-2.1.0" = {
+    "libmime-3.0.0" = {
       name = "libmime";
       packageName = "libmime";
-      version = "2.1.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz";
-        sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd";
+        url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz";
+        sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6";
       };
     };
     "addressparser-1.0.1" = {
@@ -14544,6 +14508,15 @@ let
         sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528";
       };
     };
+    "nan-2.3.5" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
+        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
+      };
+    };
     "argparse-0.1.16" = {
       name = "argparse";
       packageName = "argparse";
@@ -14571,6 +14544,15 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
+    "JSONStream-1.2.1" = {
+      name = "JSONStream";
+      packageName = "JSONStream";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz";
+        sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9";
+      };
+    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14634,6 +14616,15 @@ let
         sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
       };
     };
+    "nopt-4.0.1" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
+        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+      };
+    };
     "npm-install-checks-3.0.0" = {
       name = "npm-install-checks";
       packageName = "npm-install-checks";
@@ -14643,13 +14634,13 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-registry-client-7.3.0" = {
+    "npm-registry-client-7.4.5" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "7.3.0";
+      version = "7.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.3.0.tgz";
-        sha1 = "f2a390e8b13b78fafe26e9fa9d8bc74e17bcaa50";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.5.tgz";
+        sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df";
       };
     };
     "opener-1.4.2" = {
@@ -14679,15 +14670,6 @@ let
         sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
       };
     };
-    "request-2.78.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.78.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
-        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
-      };
-    };
     "sorted-union-stream-2.1.3" = {
       name = "sorted-union-stream";
       packageName = "sorted-union-stream";
@@ -14706,6 +14688,15 @@ let
         sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
+    "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";
+      };
+    };
     "lodash._baseindexof-3.1.0" = {
       name = "lodash._baseindexof";
       packageName = "lodash._baseindexof";
@@ -15048,13 +15039,13 @@ let
         sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d";
       };
     };
-    "update-notifier-1.0.2" = {
+    "update-notifier-1.0.3" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.2.tgz";
-        sha1 = "27c90519196dc15015be02a34ea52986feab8877";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz";
+        sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a";
       };
     };
     "request-2.75.0" = {
@@ -15201,6 +15192,15 @@ let
         sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
       };
     };
+    "timed-out-3.1.3" = {
+      name = "timed-out";
+      packageName = "timed-out";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
+        sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217";
+      };
+    };
     "unzip-response-1.0.2" = {
       name = "unzip-response";
       packageName = "unzip-response";
@@ -15321,13 +15321,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.1.11" = {
+    "service-runner-2.1.13" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.1.11";
+      version = "2.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz";
-        sha1 = "1b0c83666beef6cc0637f0573a5107d107eac5bb";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz";
+        sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb";
       };
     };
     "simplediff-0.1.1" = {
@@ -15357,13 +15357,13 @@ let
         sha1 = "07e30ad79531844179b642d2d8399435182c8727";
       };
     };
-    "busboy-0.2.13" = {
+    "busboy-0.2.14" = {
       name = "busboy";
       packageName = "busboy";
-      version = "0.2.13";
+      version = "0.2.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz";
-        sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6";
+        url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz";
+        sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453";
       };
     };
     "dicer-0.2.5" = {
@@ -15384,6 +15384,24 @@ let
         sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
       };
     };
+    "object.assign-4.0.4" = {
+      name = "object.assign";
+      packageName = "object.assign";
+      version = "4.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz";
+        sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc";
+      };
+    };
+    "define-properties-1.1.2" = {
+      name = "define-properties";
+      packageName = "define-properties";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
+        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
+      };
+    };
     "gelfling-0.2.0" = {
       name = "gelfling";
       packageName = "gelfling";
@@ -15682,13 +15700,13 @@ let
         sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918";
       };
     };
-    "network-address-1.1.0" = {
+    "network-address-1.1.2" = {
       name = "network-address";
       packageName = "network-address";
-      version = "1.1.0";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/network-address/-/network-address-1.1.0.tgz";
-        sha1 = "74d577b0dea652284659079fc8d7010b72f01092";
+        url = "https://registry.npmjs.org/network-address/-/network-address-1.1.2.tgz";
+        sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e";
       };
     };
     "airplay-protocol-2.0.2" = {
@@ -15808,13 +15826,13 @@ let
         sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364";
       };
     };
-    "array-flatten-2.1.0" = {
+    "array-flatten-2.1.1" = {
       name = "array-flatten";
       packageName = "array-flatten";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.0.tgz";
-        sha1 = "26a692c83881fc68dac3ec5d1f0c1b49bf2304d9";
+        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz";
+        sha1 = "426bb9da84090c1838d812c8150af20a8331e296";
       };
     };
     "dns-equal-1.0.0" = {
@@ -15871,13 +15889,22 @@ let
         sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
       };
     };
-    "run-async-2.2.0" = {
+    "mute-stream-0.0.6" = {
+      name = "mute-stream";
+      packageName = "mute-stream";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
+        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
+      };
+    };
+    "run-async-2.3.0" = {
       name = "run-async";
       packageName = "run-async";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.2.0.tgz";
-        sha1 = "8783abd83c7bb86f41ee0602fc82404b3bd6e8b9";
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
+        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
       };
     };
     "rx-4.1.0" = {
@@ -15934,15 +15961,6 @@ let
         sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
       };
     };
-    "socket.io-1.6.0" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz";
-        sha1 = "3e40d932637e6bd923981b25caf7c53e83b6e2e1";
-      };
-    };
     "torrent-stream-0.18.1" = {
       name = "torrent-stream";
       packageName = "torrent-stream";
@@ -16312,123 +16330,6 @@ let
         sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
       };
     };
-    "engine.io-1.8.0" = {
-      name = "engine.io";
-      packageName = "engine.io";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz";
-        sha1 = "3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa";
-      };
-    };
-    "socket.io-adapter-0.5.0" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
-        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
-      };
-    };
-    "socket.io-client-1.6.0" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz";
-        sha1 = "5b668f4f771304dfeed179064708386fa6717853";
-      };
-    };
-    "socket.io-parser-2.3.1" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
-        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
-      };
-    };
-    "engine.io-parser-1.3.1" = {
-      name = "engine.io-parser";
-      packageName = "engine.io-parser";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz";
-        sha1 = "9554f1ae33107d6fbd170ca5466d2f833f6a07cf";
-      };
-    };
-    "base64-arraybuffer-0.1.5" = {
-      name = "base64-arraybuffer";
-      packageName = "base64-arraybuffer";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
-        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
-      };
-    };
-    "wtf-8-1.0.0" = {
-      name = "wtf-8";
-      packageName = "wtf-8";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
-        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
-      };
-    };
-    "component-emitter-1.2.1" = {
-      name = "component-emitter";
-      packageName = "component-emitter";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
-        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
-      };
-    };
-    "engine.io-client-1.8.0" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz";
-        sha1 = "7b730e4127414087596d9be3c88d2bc5fdb6cf5c";
-      };
-    };
-    "parseuri-0.0.5" = {
-      name = "parseuri";
-      packageName = "parseuri";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
-        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
-      };
-    };
-    "parsejson-0.0.3" = {
-      name = "parsejson";
-      packageName = "parsejson";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
-        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
-      };
-    };
-    "parseqs-0.0.5" = {
-      name = "parseqs";
-      packageName = "parseqs";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
-        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
-      };
-    };
-    "xmlhttprequest-ssl-1.5.3" = {
-      name = "xmlhttprequest-ssl";
-      packageName = "xmlhttprequest-ssl";
-      version = "1.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
-        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
-      };
-    };
     "bittorrent-dht-3.2.6" = {
       name = "bittorrent-dht";
       packageName = "bittorrent-dht";
@@ -16699,15 +16600,6 @@ let
         sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
       };
     };
-    "iconv-lite-0.4.15" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
-        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
-      };
-    };
     "private-0.1.6" = {
       name = "private";
       packageName = "private";
@@ -16717,31 +16609,31 @@ let
         sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
       };
     };
-    "recast-0.11.17" = {
+    "recast-0.11.20" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.17";
+      version = "0.11.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.17.tgz";
-        sha1 = "67e829df49ef8ea822381cc516d305411e60bad8";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.20.tgz";
+        sha1 = "2cb9bec269c03b36d0598118a936cd0a293ca3f3";
       };
     };
-    "ast-types-0.9.2" = {
+    "ast-types-0.9.4" = {
       name = "ast-types";
       packageName = "ast-types";
-      version = "0.9.2";
+      version = "0.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.2.tgz";
-        sha1 = "2cc19979d15c655108bf565323b8e7ee38751f6b";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.4.tgz";
+        sha1 = "410d1f81890aeb8e0a38621558ba5869ae53c91b";
       };
     };
-    "esprima-3.1.1" = {
+    "esprima-3.1.3" = {
       name = "esprima";
       packageName = "esprima";
-      version = "3.1.1";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.1.tgz";
-        sha1 = "02dbcc5ac3ece81070377f99158ec742ab5dda06";
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
       };
     };
     "base62-0.1.1" = {
@@ -16927,11 +16819,11 @@ let
     "oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" = {
       name = "oauth";
       packageName = "oauth";
-      version = "0.9.14";
+      version = "0.9.15";
       src = fetchurl {
-        name = "oauth-0.9.14.tar.gz";
+        name = "oauth-0.9.15.tar.gz";
         url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master;
-        sha256 = "abd0d7be4fb10804e5a38ee66a4db5fc36d2ed045be52e7c8b7e19e4c9e16bd8";
+        sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947";
       };
     };
     "connect-2.3.9" = {
@@ -17213,13 +17105,13 @@ let
         sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414";
       };
     };
-    "sanitize-html-1.13.0" = {
+    "sanitize-html-1.14.1" = {
       name = "sanitize-html";
       packageName = "sanitize-html";
-      version = "1.13.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz";
-        sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631";
+        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz";
+        sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8";
       };
     };
     "linkify-it-1.2.4" = {
@@ -17366,6 +17258,15 @@ let
         sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2";
       };
     };
+    "formidable-1.1.1" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz";
+        sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9";
+      };
+    };
     "http-signature-0.11.0" = {
       name = "http-signature";
       packageName = "http-signature";
@@ -17438,13 +17339,13 @@ let
         sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
       };
     };
-    "csv-parse-1.1.7" = {
+    "csv-parse-1.1.10" = {
       name = "csv-parse";
       packageName = "csv-parse";
-      version = "1.1.7";
+      version = "1.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.7.tgz";
-        sha1 = "6e4678f7967013ac823929a4303a3ce177115abc";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.10.tgz";
+        sha1 = "767340d0d1f26d05434c798b7132222c669189de";
       };
     };
     "stream-transform-0.1.1" = {
@@ -17636,13 +17537,13 @@ let
         sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2";
       };
     };
-    "clap-1.1.1" = {
+    "clap-1.1.2" = {
       name = "clap";
       packageName = "clap";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clap/-/clap-1.1.1.tgz";
-        sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d";
+        url = "https://registry.npmjs.org/clap/-/clap-1.1.2.tgz";
+        sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed";
       };
     };
     "async-2.1.2" = {
@@ -17699,6 +17600,15 @@ let
         sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4";
       };
     };
+    "request-2.78.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.78.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz";
+        sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc";
+      };
+    };
     "sprintf-0.1.5" = {
       name = "sprintf";
       packageName = "sprintf";
@@ -17798,6 +17708,15 @@ let
         sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
       };
     };
+    "xmldom-0.1.22" = {
+      name = "xmldom";
+      packageName = "xmldom";
+      version = "0.1.22";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
+        sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
+      };
+    };
     "qs-6.0.2" = {
       name = "qs";
       packageName = "qs";
@@ -17807,31 +17726,22 @@ let
         sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
       };
     };
-    "bluebird-3.3.5" = {
-      name = "bluebird";
-      packageName = "bluebird";
-      version = "3.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.3.5.tgz";
-        sha1 = "5ee747f1c7bd967658b683936430aee753955a34";
-      };
-    };
-    "blueimp-md5-2.3.1" = {
+    "blueimp-md5-2.6.0" = {
       name = "blueimp-md5";
       packageName = "blueimp-md5";
-      version = "2.3.1";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz";
-        sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a";
+        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.6.0.tgz";
+        sha1 = "c96dd67f57db522da9a0c49b464ca44e20c04e0f";
       };
     };
-    "color-0.11.4" = {
+    "color-1.0.3" = {
       name = "color";
       packageName = "color";
-      version = "0.11.4";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz";
-        sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764";
+        url = "https://registry.npmjs.org/color/-/color-1.0.3.tgz";
+        sha1 = "e48e832d85f14ef694fb468811c2d5cfe729b55d";
       };
     };
     "crossroads-0.12.2" = {
@@ -17843,31 +17753,22 @@ let
         sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2";
       };
     };
-    "diff2html-1.2.0" = {
+    "diff2html-2.0.12" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "1.2.0";
+      version = "2.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-1.2.0.tgz";
-        sha1 = "8b54af41c180befd9cb1caa130a3d76081ae4a07";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.0.12.tgz";
+        sha1 = "20eda2f1ffd14027716485c938e3fe21dc379455";
       };
     };
-    "express-4.13.4" = {
-      name = "express";
-      packageName = "express";
-      version = "4.13.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.13.4.tgz";
-        sha1 = "3c0b76f3c77590c8345739061ec0bd3ba067ec24";
-      };
-    };
-    "express-session-1.13.0" = {
+    "express-session-1.14.2" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.13.0";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.13.0.tgz";
-        sha1 = "8ac3b5c0188b48382851d88207b8e7746efb4011";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz";
+        sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275";
       };
     };
     "forever-monitor-1.1.0" = {
@@ -17915,31 +17816,13 @@ let
         sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
       };
     };
-    "lodash-4.12.0" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz";
-        sha1 = "2bd6dc46a040f59e686c972ed21d93dc59053258";
-      };
-    };
-    "moment-2.13.0" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.13.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.13.0.tgz";
-        sha1 = "24162d99521e6d40f99ae6939e806d2139eaac52";
-      };
-    };
-    "npm-3.9.6" = {
+    "npm-4.1.2" = {
       name = "npm";
       packageName = "npm";
-      version = "3.9.6";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-3.9.6.tgz";
-        sha1 = "0ef1d272a069ad95bdca8b2dfe6fcd82f4b461d7";
+        url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
+        sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
       };
     };
     "octicons-3.5.0" = {
@@ -17960,13 +17843,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-0.11.0" = {
+    "raven-1.1.1" = {
       name = "raven";
       packageName = "raven";
-      version = "0.11.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-0.11.0.tgz";
-        sha1 = "32981138a93e4c8ad08cfc17e46b85b453dc107b";
+        url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz";
+        sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42";
       };
     };
     "signals-1.0.0" = {
@@ -17987,49 +17870,40 @@ let
         sha1 = "e0767014167825957de7e125c29b0fa89796ea03";
       };
     };
-    "socket.io-1.4.8" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "1.4.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.8.tgz";
-        sha1 = "e576f330cd0bed64e55b3fd26df991141884867b";
-      };
-    };
-    "winston-2.2.0" = {
+    "winston-2.3.1" = {
       name = "winston";
       packageName = "winston";
-      version = "2.2.0";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.2.0.tgz";
-        sha1 = "2c853dd87ab552a8e8485d72cbbf9a2286f029b7";
+        url = "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz";
+        sha1 = "0b48420d978c01804cf0230b648861598225a119";
       };
     };
-    "yargs-4.7.1" = {
+    "yargs-6.6.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "4.7.1";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-4.7.1.tgz";
-        sha1 = "e60432658a3387ff269c028eacde4a512e438dff";
+        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
       };
     };
-    "color-convert-1.8.2" = {
+    "color-convert-1.9.0" = {
       name = "color-convert";
       packageName = "color-convert";
-      version = "1.8.2";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.8.2.tgz";
-        sha1 = "be868184d7c8631766d54e7078e2672d7c7e3339";
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
+        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
       };
     };
-    "color-string-0.3.0" = {
+    "color-string-1.4.0" = {
       name = "color-string";
       packageName = "color-string";
-      version = "0.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz";
-        sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991";
+        url = "https://registry.npmjs.org/color-string/-/color-string-1.4.0.tgz";
+        sha1 = "2b47f8565fb0eb52f9f77c801992b8ca55d6e898";
       };
     };
     "color-name-1.1.1" = {
@@ -18041,58 +17915,58 @@ let
         sha1 = "4b1415304cf50028ea81643643bd82ea05803689";
       };
     };
-    "diff-2.2.3" = {
+    "simple-swizzle-0.2.2" = {
+      name = "simple-swizzle";
+      packageName = "simple-swizzle";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz";
+        sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a";
+      };
+    };
+    "is-arrayish-0.3.1" = {
+      name = "is-arrayish";
+      packageName = "is-arrayish";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz";
+        sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd";
+      };
+    };
+    "diff-3.2.0" = {
       name = "diff";
       packageName = "diff";
-      version = "2.2.3";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
-        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
+        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
+        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
       };
     };
-    "cookie-0.1.5" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.1.5";
+    "hogan.js-3.0.2" = {
+      name = "hogan.js";
+      packageName = "hogan.js";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.5.tgz";
-        sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c";
+        url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz";
+        sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd";
       };
     };
-    "finalhandler-0.4.1" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.4.1";
+    "whatwg-fetch-2.0.2" = {
+      name = "whatwg-fetch";
+      packageName = "whatwg-fetch";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
-        sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
+        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz";
+        sha1 = "fe294d1d89e36c5be8b3195057f2e4bc74fc980e";
       };
     };
-    "send-0.13.1" = {
-      name = "send";
-      packageName = "send";
-      version = "0.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.13.1.tgz";
-        sha1 = "a30d5f4c82c8a9bae9ad00a1d9b1bdbe6f199ed7";
-      };
-    };
-    "cookie-0.2.3" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.2.3.tgz";
-        sha1 = "1a59536af68537a21178a01346f87cb059d2ae5c";
-      };
-    };
-    "crc-3.4.0" = {
+    "crc-3.4.1" = {
       name = "crc";
       packageName = "crc";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz";
-        sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f";
+        url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz";
+        sha1 = "65d5830b1a2569557cfb324c0e679998521473ee";
       };
     };
     "broadway-0.2.10" = {
@@ -18203,13 +18077,13 @@ let
         sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b";
       };
     };
-    "typechecker-4.4.0" = {
+    "typechecker-4.4.1" = {
       name = "typechecker";
       packageName = "typechecker";
-      version = "4.4.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.0.tgz";
-        sha1 = "efc56882d36e435c6eb978200e22b88278a3f7fc";
+        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.1.tgz";
+        sha1 = "f97b95f51b038417212d677d45a373ee7bced7e6";
       };
     };
     "underscore-1.5.2" = {
@@ -18221,103 +18095,13 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "lodash.clonedeep-4.3.2" = {
-      name = "lodash.clonedeep";
-      packageName = "lodash.clonedeep";
-      version = "4.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz";
-        sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de";
-      };
-    };
-    "lodash.union-4.4.0" = {
-      name = "lodash.union";
-      packageName = "lodash.union";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz";
-        sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38";
-      };
-    };
-    "lodash.uniq-4.3.0" = {
-      name = "lodash.uniq";
-      packageName = "lodash.uniq";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz";
-        sha1 = "dcad810876841447d8f3ec662323c86a6d938227";
-      };
-    };
-    "lodash.without-4.2.0" = {
-      name = "lodash.without";
-      packageName = "lodash.without";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz";
-        sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6";
-      };
-    };
-    "node-gyp-3.3.1" = {
+    "node-gyp-3.5.0" = {
       name = "node-gyp";
       packageName = "node-gyp";
-      version = "3.3.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz";
-        sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0";
-      };
-    };
-    "request-2.72.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.72.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz";
-        sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1";
-      };
-    };
-    "retry-0.9.0" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz";
-        sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d";
-      };
-    };
-    "lodash._baseclone-4.5.7" = {
-      name = "lodash._baseclone";
-      packageName = "lodash._baseclone";
-      version = "4.5.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz";
-        sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
-      };
-    };
-    "lodash._baseflatten-4.2.1" = {
-      name = "lodash._baseflatten";
-      packageName = "lodash._baseflatten";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz";
-        sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208";
-      };
-    };
-    "lodash._basedifference-4.5.0" = {
-      name = "lodash._basedifference";
-      packageName = "lodash._basedifference";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz";
-        sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938";
-      };
-    };
-    "qs-6.1.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz";
-        sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26";
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
+        sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
       };
     };
     "lsmod-1.0.0" = {
@@ -18329,13 +18113,13 @@ let
         sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b";
       };
     };
-    "stack-trace-0.0.7" = {
-      name = "stack-trace";
-      packageName = "stack-trace";
-      version = "0.0.7";
+    "uuid-3.0.0" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
-        sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
+        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
       };
     };
     "eve-0.4.2" = {
@@ -18347,67 +18131,13 @@ let
         sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
       };
     };
-    "engine.io-1.6.11" = {
-      name = "engine.io";
-      packageName = "engine.io";
-      version = "1.6.11";
+    "yargs-parser-4.2.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.11.tgz";
-        sha1 = "2533a97a65876c40ffcf95397b7ef9b495c423fe";
-      };
-    };
-    "socket.io-client-1.4.8" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.4.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.8.tgz";
-        sha1 = "481b241e73df140ea1a4fb03486a85ad097f5558";
-      };
-    };
-    "ws-1.1.0" = {
-      name = "ws";
-      packageName = "ws";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.1.0.tgz";
-        sha1 = "c1d6fd1515d3ceff1f0ae2759bf5fd77030aad1d";
-      };
-    };
-    "engine.io-client-1.6.11" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.6.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.11.tgz";
-        sha1 = "7d250d8fa1c218119ecde51390458a57d5171376";
-      };
-    };
-    "pkg-conf-1.1.3" = {
-      name = "pkg-conf";
-      packageName = "pkg-conf";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-1.1.3.tgz";
-        sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b";
-      };
-    };
-    "set-blocking-1.0.0" = {
-      name = "set-blocking";
-      packageName = "set-blocking";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-1.0.0.tgz";
-        sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5";
-      };
-    };
-    "symbol-0.2.3" = {
-      name = "symbol";
-      packageName = "symbol";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/symbol/-/symbol-0.2.3.tgz";
-        sha1 = "3b9873b8a901e47c6efe21526a3ac372ef28bbc7";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
       };
     };
     "kew-0.1.7" = {
@@ -18491,13 +18221,13 @@ let
         sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
       };
     };
-    "node-libs-browser-0.6.0" = {
+    "node-libs-browser-0.7.0" = {
       name = "node-libs-browser";
       packageName = "node-libs-browser";
-      version = "0.6.0";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.6.0.tgz";
-        sha1 = "244806d44d319e048bc8607b5cc4eaf9a29d2e3c";
+        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz";
+        sha1 = "3e272c0819e308935e26674408d7af0e1491b83b";
       };
     };
     "tapable-0.1.10" = {
@@ -18518,13 +18248,13 @@ let
         sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b";
       };
     };
-    "webpack-core-0.6.8" = {
+    "webpack-core-0.6.9" = {
       name = "webpack-core";
       packageName = "webpack-core";
-      version = "0.6.8";
+      version = "0.6.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz";
-        sha1 = "edf9135de00a6a3c26dd0f14b208af0aa4af8d0a";
+        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz";
+        sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2";
       };
     };
     "memory-fs-0.2.0" = {
@@ -18554,76 +18284,40 @@ let
         sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
-    "json5-0.5.0" = {
+    "json5-0.5.1" = {
       name = "json5";
       packageName = "json5";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz";
-        sha1 = "9b20715b026cbe3778fd769edccd822d8332a5b2";
+        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
+        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
       };
     };
-    "assert-1.4.1" = {
-      name = "assert";
-      packageName = "assert";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
-        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" = {
+    "crypto-browserify-3.3.0" = {
       name = "crypto-browserify";
       packageName = "crypto-browserify";
-      version = "3.2.8";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz";
-        sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189";
+        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz";
+        sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c";
       };
     };
-    "http-browserify-1.7.0" = {
-      name = "http-browserify";
-      packageName = "http-browserify";
-      version = "1.7.0";
+    "os-browserify-0.2.1" = {
+      name = "os-browserify";
+      packageName = "os-browserify";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
-        sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
+        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz";
+        sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f";
       };
     };
-    "https-browserify-0.0.0" = {
-      name = "https-browserify";
-      packageName = "https-browserify";
-      version = "0.0.0";
+    "timers-browserify-2.0.2" = {
+      name = "timers-browserify";
+      packageName = "timers-browserify";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
-        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";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz";
+        sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86";
       };
     };
     "pbkdf2-compat-2.0.1" = {
@@ -18653,40 +18347,49 @@ let
         sha1 = "17ddeddc5f722fb66501658895461977867315ba";
       };
     };
-    "Base64-0.2.1" = {
-      name = "Base64";
-      packageName = "Base64";
-      version = "0.2.1";
+    "browserify-aes-0.4.0" = {
+      name = "browserify-aes";
+      packageName = "browserify-aes";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
-        sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
+        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz";
+        sha1 = "067149b668df31c4b58533e02d01e806d8608e2c";
       };
     };
-    "source-list-map-0.1.6" = {
+    "setimmediate-1.0.5" = {
+      name = "setimmediate";
+      packageName = "setimmediate";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz";
+        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
+      };
+    };
+    "source-list-map-0.1.8" = {
       name = "source-list-map";
       packageName = "source-list-map";
-      version = "0.1.6";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.6.tgz";
-        sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f";
+        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz";
+        sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106";
       };
     };
-    "babel-runtime-6.18.0" = {
+    "babel-runtime-6.22.0" = {
       name = "babel-runtime";
       packageName = "babel-runtime";
-      version = "6.18.0";
+      version = "6.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz";
-        sha1 = "0f4177ffd98492ef13b9f823e9994a02584c9078";
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.22.0.tgz";
+        sha1 = "1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611";
       };
     };
-    "death-1.0.0" = {
+    "death-1.1.0" = {
       name = "death";
       packageName = "death";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/death/-/death-1.0.0.tgz";
-        sha1 = "4d46e15488d4b636b699f0671b04632d752fd2de";
+        url = "https://registry.npmjs.org/death/-/death-1.1.0.tgz";
+        sha1 = "01aa9c401edd92750514470b8266390c66c67318";
       };
     };
     "detect-indent-4.0.0" = {
@@ -18698,6 +18401,15 @@ let
         sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
       };
     };
+    "diff-2.2.3" = {
+      name = "diff";
+      packageName = "diff";
+      version = "2.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
+        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
+      };
+    };
     "invariant-2.2.2" = {
       name = "invariant";
       packageName = "invariant";
@@ -18725,13 +18437,13 @@ let
         sha1 = "74c45744439550da185801912829f61d22071bc1";
       };
     };
-    "node-emoji-1.4.1" = {
+    "node-emoji-1.5.1" = {
       name = "node-emoji";
       packageName = "node-emoji";
-      version = "1.4.1";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.4.1.tgz";
-        sha1 = "c9fa0cf91094335bcb967a6f42b2305c15af2ebc";
+        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.5.1.tgz";
+        sha1 = "fd918e412769bf8c448051238233840b2aff16a1";
       };
     };
     "object-path-0.11.3" = {
@@ -18743,13 +18455,13 @@ let
         sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554";
       };
     };
-    "proper-lockfile-1.2.0" = {
+    "proper-lockfile-2.0.0" = {
       name = "proper-lockfile";
       packageName = "proper-lockfile";
-      version = "1.2.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz";
-        sha1 = "ceff5dd89d3e5f10fb75e1e8e76bc75801a59c34";
+        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.0.tgz";
+        sha1 = "b21f5e79bcbb6b4e23eeeced15cfc7f63e8a2e55";
       };
     };
     "request-capture-har-1.1.4" = {
@@ -18770,22 +18482,22 @@ let
         sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
       };
     };
-    "regenerator-runtime-0.9.6" = {
+    "regenerator-runtime-0.10.1" = {
       name = "regenerator-runtime";
       packageName = "regenerator-runtime";
-      version = "0.9.6";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz";
-        sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029";
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz";
+        sha1 = "257f41961ce44558b18f7814af48c17559f9faeb";
       };
     };
-    "loose-envify-1.3.0" = {
+    "loose-envify-1.3.1" = {
       name = "loose-envify";
       packageName = "loose-envify";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz";
-        sha1 = "6b26248c42f6d4fa4b0d8542f78edfcde35642a8";
+        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz";
+        sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848";
       };
     };
     "ci-info-1.0.0" = {
@@ -18806,25 +18518,16 @@ let
         sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78";
       };
     };
-    "err-code-1.1.1" = {
-      name = "err-code";
-      packageName = "err-code";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.1.tgz";
-        sha1 = "739d71b6851f24d050ea18c79a5b722420771d59";
-      };
-    };
   };
 in
 {
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.4";
+    version = "1.9.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.4.tgz";
-      sha1 = "8f85b28758ed0e7a251a635cd2e6a73ce92e9dde";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz";
+      sha1 = "78be031931f4b9012f6085e1544069c56dcba233";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -18839,7 +18542,7 @@ in
           sources."source-map-0.1.34"
         ];
       })
-      sources."resolve-1.1.7"
+      sources."resolve-1.2.0"
       sources."global-paths-0.1.2"
       sources."source-map-0.1.9"
       sources."xml2tss-0.0.5"
@@ -18864,16 +18567,15 @@ in
         ];
       })
       sources."is-windows-0.1.1"
-      (sources."global-prefix-0.1.4" // {
+      (sources."global-prefix-0.1.5" // {
         dependencies = [
           sources."is-windows-0.2.0"
         ];
       })
+      sources."homedir-polyfill-1.0.1"
       sources."ini-1.3.4"
-      sources."osenv-0.1.3"
       sources."which-1.2.12"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
+      sources."parse-passwd-1.0.0"
       sources."isexe-1.1.2"
       sources."xml2js-0.2.8"
       sources."sax-0.5.8"
@@ -18890,17 +18592,13 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.7";
+    version = "0.10.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.7.tgz";
-      sha1 = "48e59f6be202122c0d71153efab4f924065da586";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz";
+      sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc";
     };
     dependencies = [
-      (sources."adal-node-0.1.21" // {
-        dependencies = [
-          sources."node-uuid-1.4.7"
-        ];
-      })
+      sources."adal-node-0.1.21"
       sources."async-1.4.2"
       (sources."azure-common-0.9.18" // {
         dependencies = [
@@ -18909,9 +18607,11 @@ in
         ];
       })
       sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-cdn-0.2.1"
+      sources."azure-arm-cdn-1.0.0"
       sources."azure-arm-commerce-0.2.0"
-      sources."azure-arm-compute-0.19.0"
+      sources."azure-arm-compute-0.19.1"
+      sources."azure-arm-datalake-analytics-1.0.1-preview"
+      sources."azure-arm-datalake-store-1.0.1-preview"
       sources."azure-arm-hdinsight-0.2.2"
       sources."azure-arm-hdinsight-jobs-0.1.0"
       sources."azure-arm-insights-0.11.3"
@@ -18923,8 +18623,6 @@ in
       sources."azure-arm-dns-0.11.1"
       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"
@@ -18939,7 +18637,7 @@ in
         ];
       })
       sources."azure-asm-network-0.13.0"
-      sources."azure-arm-resource-1.4.5-preview"
+      sources."azure-arm-resource-1.6.1-preview"
       sources."azure-arm-storage-0.13.1-preview"
       sources."azure-asm-sb-0.10.1"
       sources."azure-asm-sql-0.10.1"
@@ -18952,7 +18650,6 @@ in
       })
       (sources."azure-storage-1.3.0" // {
         dependencies = [
-          sources."node-uuid-1.4.7"
           sources."readable-stream-2.0.6"
           sources."validator-3.22.2"
           sources."xml2js-0.2.7"
@@ -18961,7 +18658,7 @@ in
       sources."azure-arm-batch-0.3.0"
       sources."azure-batch-0.5.2"
       sources."azure-servicefabric-0.1.4"
-      sources."applicationinsights-0.15.12"
+      sources."applicationinsights-0.16.0"
       sources."caller-id-0.1.0"
       sources."colors-1.1.2"
       sources."commander-1.0.4"
@@ -18980,16 +18677,16 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.17.0"
+      sources."moment-2.17.1"
       sources."ms-rest-1.15.2"
       (sources."ms-rest-azure-1.15.2" // {
         dependencies = [
           sources."async-0.2.7"
+          sources."uuid-2.0.1"
           sources."azure-arm-resource-1.4.4-preview"
         ];
       })
       sources."node-forge-0.6.23"
-      sources."node-uuid-1.2.0"
       sources."omelette-0.1.0"
       sources."openssl-wrapper-0.2.1"
       sources."progress-1.1.8"
@@ -19012,7 +18709,6 @@ in
       (sources."request-2.74.0" // {
         dependencies = [
           sources."extend-3.0.0"
-          sources."node-uuid-1.4.7"
         ];
       })
       (sources."ssh-key-to-pem-0.11.0" // {
@@ -19027,6 +18723,7 @@ in
       sources."tunnel-0.0.2"
       sources."underscore-1.4.4"
       sources."user-home-2.0.0"
+      sources."uuid-3.0.1"
       sources."validator-5.2.0"
       (sources."winston-2.1.1" // {
         dependencies = [
@@ -19041,14 +18738,14 @@ in
       sources."read-1.0.7"
       sources."date-utils-1.2.21"
       sources."jws-3.1.4"
-      sources."xmldom-0.1.22"
+      sources."node-uuid-1.4.7"
+      sources."xmldom-0.1.27"
       sources."xpath.js-1.0.7"
       sources."base64url-2.0.0"
-      sources."jwa-1.1.4"
+      sources."jwa-1.1.5"
       sources."safe-buffer-5.0.1"
       sources."buffer-equal-constant-time-1.0.1"
-      sources."ecdsa-sig-formatter-1.0.7"
-      sources."base64-url-1.3.3"
+      sources."ecdsa-sig-formatter-1.0.9"
       sources."dateformat-1.0.2-1.2.3"
       sources."envconf-0.0.4"
       sources."duplexer-0.1.1"
@@ -19080,7 +18777,6 @@ in
       sources."has-color-0.1.7"
       sources."ansi-styles-1.0.0"
       sources."strip-ansi-0.1.1"
-      sources."uuid-2.0.1"
       sources."debug-0.7.4"
       sources."q-0.9.7"
       sources."pkginfo-0.4.0"
@@ -19135,24 +18831,24 @@ in
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.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"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -19162,7 +18858,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -19171,7 +18867,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -19182,30 +18878,31 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."ctype-0.5.2"
       sources."source-map-0.1.43"
       sources."fibers-1.0.15"
       sources."galaxy-0.1.12"
       sources."amdefine-1.0.1"
-      (sources."concat-stream-1.5.2" // {
+      (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.0.6"
+          sources."readable-stream-2.2.2"
         ];
       })
       sources."http-response-object-1.1.0"
       sources."then-request-2.2.0"
       sources."typedarray-0.0.6"
+      sources."buffer-shims-1.0.0"
       sources."http-basic-2.5.1"
       sources."promise-7.1.1"
       sources."asap-2.0.5"
       sources."os-homedir-1.0.2"
-      sources."mute-stream-0.0.6"
+      sources."mute-stream-0.0.7"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -19268,7 +18965,7 @@ in
       sources."ext-list-2.2.0"
       (sources."meow-3.7.0" // {
         dependencies = [
-          sources."object-assign-4.1.0"
+          sources."object-assign-4.1.1"
         ];
       })
       sources."sort-keys-length-1.0.1"
@@ -19306,7 +19003,7 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -19368,7 +19065,7 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."q-1.4.1"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -19388,16 +19085,20 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "13.1.1";
+    version = "13.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-13.1.1.tgz";
-      sha1 = "72a2310e2f706ed87db929cf0ee73a5e195d9bb0";
+      url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
+      sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
     };
     dependencies = [
-      sources."JSONStream-1.2.1"
-      sources."assert-1.3.0"
+      sources."JSONStream-1.3.0"
+      sources."assert-1.4.1"
       sources."browser-pack-6.0.2"
-      sources."browser-resolve-1.11.2"
+      (sources."browser-resolve-1.11.2" // {
+        dependencies = [
+          sources."resolve-1.1.7"
+        ];
+      })
       sources."browserify-zlib-0.1.4"
       sources."buffer-4.9.1"
       sources."cached-path-relative-1.0.0"
@@ -19414,7 +19115,7 @@ in
       sources."domain-browser-1.1.7"
       sources."duplexer2-0.1.4"
       sources."events-1.1.1"
-      sources."glob-5.0.15"
+      sources."glob-7.1.1"
       sources."has-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-0.0.1"
@@ -19434,11 +19135,11 @@ in
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
       sources."readable-stream-2.2.2"
-      sources."resolve-1.1.7"
+      sources."resolve-1.2.0"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.5.0"
+      sources."stream-http-2.6.3"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       (sources."syntax-error-1.1.6" // {
@@ -19446,11 +19147,7 @@ in
           sources."acorn-2.7.0"
         ];
       })
-      (sources."through2-2.0.1" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
       sources."tty-browserify-0.0.0"
       (sources."url-0.11.0" // {
@@ -19465,7 +19162,7 @@ in
       })
       sources."vm-browserify-0.0.4"
       sources."xtend-4.0.1"
-      sources."jsonparse-1.2.0"
+      sources."jsonparse-1.3.0"
       sources."through-2.3.8"
       sources."combine-source-map-0.7.2"
       sources."umd-3.0.1"
@@ -19504,10 +19201,11 @@ in
       sources."parse-asn1-5.0.0"
       sources."brorand-1.0.6"
       sources."hash.js-1.0.3"
-      sources."asn1.js-4.9.0"
+      sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
       sources."sha.js-2.4.8"
       sources."miller-rabin-4.0.0"
+      sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.3"
       sources."once-1.4.0"
@@ -19535,7 +19233,7 @@ in
       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."builtin-status-codes-3.0.0"
       sources."to-arraybuffer-1.0.1"
       sources."minimist-1.2.0"
       sources."querystring-0.2.0"
@@ -19559,11 +19257,11 @@ in
     };
     dependencies = [
       sources."array-loop-1.0.0"
-      sources."castv2-client-1.1.2"
+      sources."castv2-client-1.2.0"
       sources."chalk-1.0.0"
       sources."chromecast-player-0.2.3"
       sources."debounced-seeker-1.0.0"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       sources."fs-extended-0.2.1"
       sources."got-1.2.2"
       sources."internal-ip-1.2.0"
@@ -19602,7 +19300,7 @@ in
       (sources."xml2js-0.4.17" // {
         dependencies = [
           sources."xmlbuilder-4.2.1"
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
         ];
       })
       sources."xtend-4.0.1"
@@ -19635,7 +19333,7 @@ in
       sources."object-assign-1.0.0"
       (sources."meow-3.7.0" // {
         dependencies = [
-          sources."object-assign-4.1.0"
+          sources."object-assign-4.1.1"
         ];
       })
       sources."camelcase-keys-2.1.0"
@@ -19648,7 +19346,7 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -19681,7 +19379,7 @@ in
       sources."clivas-0.1.4"
       sources."inquirer-0.8.5"
       sources."network-address-0.0.5"
-      sources."numeral-1.5.5"
+      sources."numeral-1.5.6"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
         dependencies = [
@@ -19715,7 +19413,7 @@ in
         ];
       })
       sources."windows-no-runnable-0.0.6"
-      (sources."mdns-js-0.5.1" // {
+      (sources."mdns-js-0.5.3" // {
         dependencies = [
           sources."semver-5.1.1"
         ];
@@ -19725,11 +19423,11 @@ in
       sources."qap-3.1.3"
       sources."base64-js-1.1.2"
       sources."xmlbuilder-8.2.2"
-      sources."xmldom-0.1.22"
+      sources."xmldom-0.1.27"
       sources."cli-width-1.1.1"
       (sources."figures-1.7.0" // {
         dependencies = [
-          sources."object-assign-4.1.0"
+          sources."object-assign-4.1.1"
         ];
       })
       sources."lodash-3.10.1"
@@ -19740,13 +19438,13 @@ in
       sources."wordwrap-0.0.3"
       sources."blob-to-buffer-1.2.6"
       sources."magnet-uri-5.1.5"
-      sources."parse-torrent-file-4.0.0"
-      sources."simple-get-2.3.0"
+      sources."parse-torrent-file-4.0.1"
+      sources."simple-get-2.4.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."bencode-0.11.0"
+      sources."simple-sha1-2.1.0"
+      sources."rusha-0.8.5"
       sources."once-1.4.0"
       sources."simple-concat-1.0.0"
       sources."unzip-response-2.0.1"
@@ -19776,7 +19474,7 @@ in
       sources."rimraf-2.5.4"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.0"
-      (sources."random-access-file-1.3.1" // {
+      (sources."random-access-file-1.4.0" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.1"
@@ -19829,18 +19527,18 @@ in
       })
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
-      sources."k-rpc-socket-1.6.0"
+      sources."k-rpc-socket-1.6.1"
       sources."bn.js-4.11.6"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      (sources."simple-peer-6.0.7" // {
+      (sources."simple-peer-6.2.1" // {
         dependencies = [
           sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
-      (sources."simple-websocket-4.1.0" // {
+      (sources."simple-websocket-4.2.0" // {
         dependencies = [
           sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
@@ -19887,13 +19585,13 @@ in
       sources."codepage-1.4.0"
       sources."utfx-1.0.1"
       sources."voc-0.5.0"
-      (sources."concat-stream-1.5.2" // {
+      (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.0.6"
+          sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
-      sources."exit-on-epipe-0.1.0"
+      sources."exit-on-epipe-1.0.0"
       sources."commander-2.9.0"
       sources."typedarray-0.0.6"
       sources."graceful-readlink-1.0.1"
@@ -19910,10 +19608,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.11.1";
+    version = "1.12.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz";
-      sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz";
+      sha1 = "0d4cbdee183f650da95419570c4929d08ef91376";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -19946,7 +19644,7 @@ in
           sources."unorm-1.3.3"
         ];
       })
-      (sources."insight-0.8.3" // {
+      (sources."insight-0.8.4" // {
         dependencies = [
           sources."async-1.5.2"
           sources."request-2.79.0"
@@ -19963,7 +19661,7 @@ in
       sources."elementtree-0.1.6"
       sources."glob-5.0.15"
       sources."minimatch-3.0.3"
-      sources."osenv-0.1.3"
+      sources."osenv-0.1.4"
       sources."plist-1.2.0"
       sources."semver-5.3.0"
       sources."shelljs-0.5.3"
@@ -19982,14 +19680,14 @@ in
       sources."os-tmpdir-1.0.2"
       sources."base64-js-0.0.8"
       sources."xmlbuilder-4.0.0"
-      sources."xmldom-0.1.22"
+      sources."xmldom-0.1.27"
       sources."util-deprecate-1.0.2"
       sources."lodash-3.10.1"
       sources."aliasify-1.9.0"
       (sources."cordova-fetch-1.0.1" // {
         dependencies = [
           sources."q-1.4.1"
-          sources."shelljs-0.7.5"
+          sources."shelljs-0.7.6"
           sources."glob-7.1.1"
         ];
       })
@@ -19999,7 +19697,7 @@ in
         ];
       })
       sources."cordova-js-4.2.0"
-      (sources."cordova-serve-1.0.0" // {
+      (sources."cordova-serve-1.0.1" // {
         dependencies = [
           sources."q-1.4.1"
         ];
@@ -20073,13 +19771,17 @@ in
       sources."interpret-1.0.1"
       sources."rechoir-0.6.2"
       sources."fs.realpath-1.0.0"
-      sources."resolve-1.1.7"
+      sources."resolve-1.2.0"
       sources."cordova-app-hello-world-3.11.0"
       sources."browserify-13.1.0"
-      sources."JSONStream-1.2.1"
+      sources."JSONStream-1.3.0"
       sources."assert-1.3.0"
       sources."browser-pack-6.0.2"
-      sources."browser-resolve-1.11.2"
+      (sources."browser-resolve-1.11.2" // {
+        dependencies = [
+          sources."resolve-1.1.7"
+        ];
+      })
       sources."browserify-zlib-0.1.4"
       (sources."buffer-4.9.1" // {
         dependencies = [
@@ -20122,7 +19824,7 @@ in
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.5.0"
+      sources."stream-http-2.6.3"
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       (sources."syntax-error-1.1.6" // {
@@ -20130,12 +19832,7 @@ in
           sources."acorn-2.7.0"
         ];
       })
-      (sources."through2-2.0.1" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-          sources."isarray-1.0.0"
-        ];
-      })
+      sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
       sources."tty-browserify-0.0.0"
       (sources."url-0.11.0" // {
@@ -20150,7 +19847,7 @@ in
       })
       sources."vm-browserify-0.0.4"
       sources."xtend-4.0.1"
-      sources."jsonparse-1.2.0"
+      sources."jsonparse-1.3.0"
       sources."combine-source-map-0.7.2"
       sources."umd-3.0.1"
       sources."convert-source-map-1.1.3"
@@ -20185,7 +19882,7 @@ in
       sources."parse-asn1-5.0.0"
       sources."brorand-1.0.6"
       sources."hash.js-1.0.3"
-      sources."asn1.js-4.9.0"
+      sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
       sources."sha.js-2.4.8"
       sources."miller-rabin-4.0.0"
@@ -20208,7 +19905,7 @@ in
       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."builtin-status-codes-3.0.0"
       sources."to-arraybuffer-1.0.1"
       sources."minimist-1.2.0"
       sources."querystring-0.2.0"
@@ -20221,16 +19918,16 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."accepts-1.3.3"
       sources."bytes-2.3.0"
       sources."compressible-2.0.9"
       sources."debug-2.2.0"
       sources."on-headers-1.0.1"
       sources."vary-1.1.0"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."ms-0.7.1"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
@@ -20248,7 +19945,7 @@ in
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.2"
+      sources."proxy-addr-1.1.3"
       sources."qs-6.2.0"
       sources."range-parser-1.2.0"
       sources."send-0.14.1"
@@ -20259,7 +19956,7 @@ in
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.1.1"
+      sources."ipaddr.js-1.2.0"
       sources."destroy-1.0.4"
       sources."http-errors-1.5.1"
       sources."mime-1.3.4"
@@ -20276,7 +19973,7 @@ in
       sources."validate-npm-package-license-3.0.1"
       sources."validate-npm-package-name-2.2.2"
       sources."hosted-git-info-2.1.5"
-      sources."mute-stream-0.0.6"
+      sources."mute-stream-0.0.7"
       sources."json-parse-helpfulerror-1.0.3"
       sources."normalize-package-data-2.3.5"
       sources."graceful-fs-4.1.11"
@@ -20308,8 +20005,8 @@ in
       sources."github-url-from-git-1.4.0"
       sources."github-url-from-username-repo-1.0.2"
       sources."ini-1.3.4"
-      sources."lockfile-1.0.2"
-      sources."lru-cache-4.0.1"
+      sources."lockfile-1.0.3"
+      sources."lru-cache-4.0.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -20335,7 +20032,7 @@ in
       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."retry-0.10.1"
       (sources."rimraf-2.5.4" // {
         dependencies = [
           sources."glob-7.1.1"
@@ -20382,7 +20079,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."commander-2.9.0"
@@ -20391,7 +20088,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -20400,7 +20097,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20409,7 +20106,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20420,7 +20117,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -20443,7 +20140,7 @@ in
       sources."node-uuid-1.4.7"
       (sources."async-2.1.4" // {
         dependencies = [
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
         ];
       })
       sources."isexe-1.1.2"
@@ -20463,7 +20160,7 @@ in
       })
       sources."inquirer-0.10.1"
       sources."lodash.debounce-3.1.1"
-      sources."object-assign-4.1.0"
+      sources."object-assign-4.1.1"
       sources."os-name-1.0.3"
       sources."xdg-basedir-2.0.0"
       sources."ansi-escapes-1.4.0"
@@ -20528,14 +20225,14 @@ in
   csslint = nodeEnv.buildNodePackage {
     name = "csslint";
     packageName = "csslint";
-    version = "1.0.4";
+    version = "1.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.4.tgz";
-      sha1 = "0d3907933cc3f04b56960496d573387fbe9bb1e7";
+      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz";
+      sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9";
     };
     dependencies = [
-      sources."clone-1.0.2"
-      sources."parserlib-1.0.0"
+      sources."clone-2.1.0"
+      sources."parserlib-1.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -20624,9 +20321,9 @@ in
       sources."cookie-0.1.2"
       sources."merge-descriptors-0.0.2"
       sources."utils-merge-1.0.0"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."ms-0.7.0"
       sources."crc-3.2.1"
       sources."ee-first-1.1.0"
@@ -20635,7 +20332,7 @@ in
       sources."destroy-1.0.3"
       sources."mime-1.2.11"
       sources."bindings-1.2.1"
-      sources."nan-2.4.0"
+      sources."nan-2.5.0"
       sources."jsonparse-0.0.6"
       sources."es5class-2.3.1"
       sources."faye-websocket-0.11.0"
@@ -20733,12 +20430,16 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."ndjson-1.4.3" // {
+      (sources."ndjson-1.5.0" // {
         dependencies = [
           sources."minimist-1.2.0"
+          sources."split2-2.1.1"
+          sources."through2-2.0.3"
+          sources."readable-stream-2.2.2"
+          sources."isarray-1.0.0"
         ];
       })
-      sources."pump-1.0.1"
+      sources."pump-1.0.2"
       sources."pumpify-1.3.5"
       sources."relative-date-1.1.3"
       sources."root-2.0.0"
@@ -20747,11 +20448,7 @@ in
       sources."stream-collector-1.0.1"
       (sources."tar-stream-1.5.2" // {
         dependencies = [
-          (sources."bl-1.1.2" // {
-            dependencies = [
-              sources."readable-stream-2.0.6"
-            ];
-          })
+          sources."bl-1.2.0"
           sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
@@ -20821,6 +20518,7 @@ in
       sources."looper-2.0.0"
       sources."bindings-1.2.1"
       sources."nan-2.1.0"
+      sources."json-stringify-safe-5.0.1"
       sources."murl-0.4.1"
       sources."protein-0.5.0"
       sources."network-address-0.0.5"
@@ -20836,20 +20534,21 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "2.4.2";
+    version = "3.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-2.4.2.tgz";
-      sha1 = "757c98aea05ee8714f0de2a33224c4136414633e";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.0.2.tgz";
+      sha1 = "0f010dbd6e26db0270abd88e3e5403062eb4f7a4";
     };
     dependencies = [
-      sources."JSONStream-1.1.4"
-      sources."async-2.0.1"
+      sources."JSONStream-1.3.0"
+      sources."async-2.1.4"
       sources."aws4-1.5.0"
+      sources."awscred-1.2.0"
       sources."optimist-0.6.1"
       sources."request-2.79.0"
-      sources."jsonparse-1.2.0"
+      sources."jsonparse-1.3.0"
       sources."through-2.3.8"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
       sources."aws-sign2-0.6.0"
@@ -20864,13 +20563,13 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -20882,11 +20581,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -20896,7 +20595,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20905,7 +20604,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20916,11 +20615,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
     ];
     buildInputs = globalBuildInputs;
@@ -20934,45 +20633,63 @@ in
   emoj = nodeEnv.buildNodePackage {
     name = "emoj";
     packageName = "emoj";
-    version = "0.3.0";
+    version = "1.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz";
-      sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c";
+      url = "https://registry.npmjs.org/emoj/-/emoj-1.0.0.tgz";
+      sha1 = "3cccbeec420e2b45f73b923e880c220392c055bd";
     };
     dependencies = [
       sources."chalk-1.1.3"
-      sources."got-6.6.3"
+      sources."clipboardy-0.1.2"
+      (sources."got-6.7.1" // {
+        dependencies = [
+          sources."get-stream-3.0.0"
+        ];
+      })
       sources."has-ansi-2.0.0"
       sources."lodash.debounce-4.0.8"
       sources."log-update-1.0.2"
-      sources."mem-0.1.1"
+      sources."mem-1.1.0"
       sources."meow-3.7.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
+      sources."execa-0.5.1"
+      sources."cross-spawn-4.0.2"
+      sources."get-stream-2.3.1"
+      sources."is-stream-1.1.0"
+      sources."npm-run-path-2.0.2"
+      sources."p-finally-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."strip-eof-1.0.0"
+      sources."lru-cache-4.0.2"
+      sources."which-1.2.12"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.0.0"
+      sources."isexe-1.1.2"
+      sources."object-assign-4.1.1"
+      sources."pinkie-promise-2.0.1"
+      sources."pinkie-2.0.4"
+      sources."path-key-2.0.1"
       sources."create-error-class-3.0.2"
       sources."duplexer3-0.1.4"
-      sources."get-stream-2.3.1"
       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."node-status-codes-2.0.1"
-      sources."timed-out-3.0.0"
+      sources."safe-buffer-5.0.1"
+      sources."timed-out-4.0.1"
       sources."unzip-response-2.0.1"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
-      sources."object-assign-4.1.0"
-      sources."pinkie-promise-2.0.1"
-      sources."pinkie-2.0.4"
       sources."prepend-http-1.0.4"
       sources."ansi-escapes-1.4.0"
       sources."cli-cursor-1.0.2"
       sources."restore-cursor-1.0.1"
       sources."exit-hook-1.1.1"
       sources."onetime-1.1.0"
+      sources."mimic-fn-1.1.0"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
@@ -20984,7 +20701,6 @@ in
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -21024,16 +20740,16 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.10.2";
+    version = "3.13.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.10.2.tgz";
-      sha1 = "c9a10e8bf6e9d65651204778c503341f1eac3ce7";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz";
+      sha1 = "564d2646b5efded85df96985332edd91a23bff25";
     };
     dependencies = [
-      sources."babel-code-frame-6.16.0"
+      sources."babel-code-frame-6.22.0"
       sources."chalk-1.1.3"
-      sources."concat-stream-1.5.2"
-      sources."debug-2.3.3"
+      sources."concat-stream-1.6.0"
+      sources."debug-2.6.0"
       sources."doctrine-1.5.0"
       sources."escope-3.6.0"
       sources."espree-3.3.2"
@@ -21050,7 +20766,7 @@ in
       sources."js-yaml-3.7.0"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       sources."mkdirp-0.5.1"
       sources."natural-compare-1.4.0"
       sources."optionator-0.8.2"
@@ -21058,9 +20774,9 @@ in
       sources."pluralize-1.2.1"
       sources."progress-1.1.8"
       sources."require-uncached-1.0.3"
-      sources."shelljs-0.7.5"
+      sources."shelljs-0.7.6"
       sources."strip-bom-3.0.0"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       (sources."table-3.8.3" // {
         dependencies = [
           sources."string-width-2.0.0"
@@ -21069,16 +20785,17 @@ in
       })
       sources."text-table-0.2.0"
       sources."user-home-2.0.0"
-      sources."js-tokens-2.0.0"
+      sources."js-tokens-3.0.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.0.6"
+      sources."readable-stream-2.2.2"
+      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"
@@ -21098,14 +20815,14 @@ in
       sources."es6-set-0.1.4"
       sources."es6-symbol-3.1.0"
       sources."event-emitter-0.3.4"
-      sources."object-assign-4.1.0"
-      sources."acorn-4.0.3"
+      sources."object-assign-4.1.1"
+      sources."acorn-4.0.4"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
           sources."acorn-3.3.0"
         ];
       })
-      sources."flat-cache-1.2.1"
+      sources."flat-cache-1.2.2"
       sources."circular-json-0.3.1"
       sources."del-2.2.2"
       sources."graceful-fs-4.1.11"
@@ -21148,7 +20865,7 @@ in
       sources."number-is-nan-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."tryit-1.0.3"
@@ -21161,15 +20878,15 @@ in
       sources."minimist-0.0.8"
       sources."deep-is-0.1.3"
       sources."wordwrap-1.0.0"
-      sources."fast-levenshtein-2.0.5"
+      sources."fast-levenshtein-2.0.6"
       sources."caller-path-0.1.0"
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
       sources."interpret-1.0.1"
       sources."rechoir-0.6.2"
-      sources."resolve-1.1.7"
-      sources."ajv-4.9.0"
-      sources."ajv-keywords-1.1.1"
+      sources."resolve-1.2.0"
+      sources."ajv-4.10.4"
+      sources."ajv-keywords-1.5.0"
       sources."slice-ansi-0.0.4"
       sources."co-4.6.0"
       sources."os-homedir-1.0.2"
@@ -21185,10 +20902,10 @@ in
   emojione = nodeEnv.buildNodePackage {
     name = "emojione";
     packageName = "emojione";
-    version = "2.2.6";
+    version = "2.2.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-2.2.6.tgz";
-      sha1 = "67dec452937d5b14ee669207ea41cdb1f69fb8f6";
+      url = "https://registry.npmjs.org/emojione/-/emojione-2.2.7.tgz";
+      sha1 = "46457cf6b9b2f8da13ae8a2e4e547de06ee15e96";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -21254,7 +20971,7 @@ in
       sources."object-assign-3.0.0"
       sources."optimist-0.6.1"
       sources."path-is-absolute-1.0.1"
-      (sources."prettyjson-1.2.0" // {
+      (sources."prettyjson-1.2.1" // {
         dependencies = [
           sources."colors-1.1.2"
           sources."minimist-1.2.0"
@@ -21286,7 +21003,7 @@ in
       sources."minimist-0.0.10"
       sources."read-1.0.7"
       sources."revalidator-0.1.8"
-      sources."mute-stream-0.0.6"
+      sources."mute-stream-0.0.7"
       sources."chokidar-1.6.1"
       sources."minimatch-3.0.3"
       sources."ps-tree-0.0.3"
@@ -21297,7 +21014,7 @@ in
       sources."is-binary-path-1.0.1"
       sources."is-glob-2.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.15"
+      sources."fsevents-1.0.17"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -21307,7 +21024,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."normalize-path-2.0.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
@@ -21319,7 +21036,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
@@ -21331,7 +21048,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.7.0"
+      sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
       sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
@@ -21340,15 +21057,15 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.4.0"
-      sources."node-pre-gyp-0.6.31"
+      sources."nan-2.5.0"
+      sources."node-pre-gyp-0.6.32"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -21367,24 +21084,24 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.1" // {
+      (sources."gauge-2.7.2" // {
         dependencies = [
-          sources."object-assign-4.1.0"
+          sources."object-assign-4.1.1"
         ];
       })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
+      sources."supports-color-0.2.0"
       sources."has-unicode-2.0.1"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -21401,27 +21118,30 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -21431,7 +21151,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -21440,7 +21160,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -21451,11 +21171,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -21498,10 +21218,10 @@ in
   git-run = nodeEnv.buildNodePackage {
     name = "git-run";
     packageName = "git-run";
-    version = "0.5.2";
+    version = "0.5.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.2.tgz";
-      sha1 = "1edbc7163389067dd9f2c46ab3acff07889f8333";
+      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.3.tgz";
+      sha1 = "92005049d5514753d53c4f90fd6f2b2b29a8e08c";
     };
     dependencies = [
       sources."minilog-2.0.8"
@@ -21559,7 +21279,7 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.11.1"
+      sources."coffee-script-1.12.2"
       sources."jade-1.11.0"
       (sources."q-2.0.3" // {
         dependencies = [
@@ -21569,7 +21289,7 @@ in
       sources."xml2js-0.4.17"
       sources."msgpack-1.0.2"
       sources."character-parser-1.2.1"
-      (sources."clean-css-3.4.21" // {
+      (sources."clean-css-3.4.24" // {
         dependencies = [
           sources."commander-2.8.1"
         ];
@@ -21586,7 +21306,7 @@ in
           sources."source-map-0.1.43"
         ];
       })
-      (sources."uglify-js-2.7.4" // {
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
@@ -21625,7 +21345,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -21634,8 +21354,8 @@ in
       sources."weak-map-1.0.5"
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
-      sources."lodash-4.17.2"
-      sources."nan-2.4.0"
+      sources."lodash-4.17.4"
+      sources."nan-2.5.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -21656,7 +21376,7 @@ in
       sources."archy-1.0.0"
       sources."chalk-1.1.3"
       sources."deprecated-0.0.1"
-      sources."gulp-util-3.0.7"
+      sources."gulp-util-3.0.8"
       sources."interpret-1.0.1"
       sources."liftoff-2.3.0"
       sources."minimist-1.2.0"
@@ -21667,8 +21387,6 @@ in
       sources."v8flags-2.0.11"
       (sources."vinyl-fs-0.3.14" // {
         dependencies = [
-          sources."graceful-fs-3.0.11"
-          sources."strip-bom-1.0.0"
           sources."through2-0.6.5"
           sources."vinyl-0.4.6"
           sources."readable-stream-1.0.34"
@@ -21680,12 +21398,12 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."array-differ-1.0.0"
       sources."array-uniq-1.0.3"
       sources."beeper-1.1.1"
-      sources."dateformat-1.0.12"
-      sources."fancy-log-1.2.0"
+      sources."dateformat-2.0.0"
+      sources."fancy-log-1.3.0"
       sources."gulplog-1.0.0"
       sources."has-gulplog-0.1.0"
       sources."lodash._reescape-3.0.0"
@@ -21695,57 +21413,13 @@ in
       sources."multipipe-0.1.2"
       sources."object-assign-3.0.0"
       sources."replace-ext-0.0.1"
-      (sources."through2-2.0.1" // {
+      (sources."through2-2.0.3" // {
         dependencies = [
-          sources."readable-stream-2.0.6"
+          sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
       sources."vinyl-0.5.3"
-      sources."get-stdin-4.0.1"
-      (sources."meow-3.7.0" // {
-        dependencies = [
-          sources."object-assign-4.1.0"
-        ];
-      })
-      sources."camelcase-keys-2.1.0"
-      sources."decamelize-1.2.0"
-      sources."loud-rejection-1.6.0"
-      sources."map-obj-1.0.1"
-      sources."normalize-package-data-2.3.5"
-      sources."read-pkg-up-1.0.1"
-      sources."redent-1.0.0"
-      sources."trim-newlines-1.0.0"
-      sources."camelcase-2.1.1"
-      sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
-      sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.1.5"
-      sources."is-builtin-module-1.0.0"
-      sources."validate-npm-package-license-3.0.1"
-      sources."builtin-modules-1.1.1"
-      sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.4"
-      sources."spdx-license-ids-1.2.2"
-      sources."find-up-1.1.2"
-      sources."read-pkg-1.1.0"
-      sources."path-exists-2.1.0"
-      sources."pinkie-promise-2.0.1"
-      sources."pinkie-2.0.4"
-      sources."load-json-file-1.1.0"
-      sources."path-type-1.1.0"
-      sources."graceful-fs-4.1.11"
-      sources."parse-json-2.2.0"
-      sources."pify-2.3.0"
-      sources."strip-bom-2.0.0"
-      sources."error-ex-1.3.0"
-      sources."is-arrayish-0.2.1"
-      sources."is-utf8-0.2.1"
-      sources."indent-string-2.1.0"
-      sources."strip-indent-1.0.1"
-      sources."repeating-2.0.1"
-      sources."is-finite-1.0.2"
-      sources."number-is-nan-1.0.1"
       sources."time-stamp-1.0.1"
       sources."glogg-1.0.0"
       sources."sparkles-1.0.0"
@@ -21768,6 +21442,7 @@ in
       sources."string_decoder-0.10.31"
       sources."inherits-2.0.3"
       sources."xtend-4.0.1"
+      sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
       sources."clone-1.0.2"
@@ -21780,7 +21455,7 @@ in
       sources."lodash.isstring-4.0.1"
       sources."lodash.mapvalues-4.6.0"
       sources."rechoir-0.6.2"
-      sources."resolve-1.1.7"
+      sources."resolve-1.2.0"
       sources."detect-file-0.1.0"
       sources."is-glob-2.0.1"
       sources."micromatch-2.3.11"
@@ -21793,7 +21468,7 @@ in
       sources."expand-brackets-0.1.5"
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."normalize-path-2.0.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
@@ -21809,7 +21484,7 @@ in
           sources."isarray-1.0.0"
         ];
       })
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
@@ -21824,12 +21499,12 @@ in
       sources."expand-tilde-1.2.2"
       sources."global-modules-0.2.3"
       sources."os-homedir-1.0.2"
-      sources."global-prefix-0.1.4"
+      sources."global-prefix-0.1.5"
       sources."is-windows-0.2.0"
+      sources."homedir-polyfill-1.0.1"
       sources."ini-1.3.4"
-      sources."osenv-0.1.3"
       sources."which-1.2.12"
-      sources."os-tmpdir-1.0.2"
+      sources."parse-passwd-1.0.0"
       sources."isexe-1.1.2"
       sources."lodash.assignwith-4.2.0"
       sources."lodash.isempty-4.4.0"
@@ -21839,7 +21514,7 @@ in
       sources."map-cache-0.2.2"
       sources."path-root-0.1.1"
       sources."is-relative-0.2.1"
-      sources."is-unc-path-0.1.1"
+      sources."is-unc-path-0.1.2"
       sources."unc-path-regex-0.1.2"
       sources."path-root-regex-0.1.2"
       sources."end-of-stream-0.1.5"
@@ -21856,11 +21531,13 @@ in
         ];
       })
       sources."glob-watcher-0.0.6"
+      sources."graceful-fs-3.0.11"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
+      sources."strip-bom-1.0.0"
       sources."glob-4.5.3"
       sources."minimatch-2.0.10"
       sources."ordered-read-streams-0.1.0"
@@ -21885,6 +21562,7 @@ in
       sources."sigmund-1.0.1"
       sources."natives-1.1.0"
       sources."first-chunk-stream-1.0.0"
+      sources."is-utf8-0.2.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22019,7 +21697,7 @@ in
       sources."nopt-3.0.6"
       sources."once-1.4.0"
       sources."resolve-1.1.7"
-      sources."supports-color-3.1.2"
+      sources."supports-color-3.2.3"
       sources."which-1.2.12"
       sources."wordwrap-1.0.0"
       sources."estraverse-1.9.3"
@@ -22030,7 +21708,7 @@ in
       sources."deep-is-0.1.3"
       sources."type-check-0.3.2"
       sources."levn-0.3.0"
-      sources."fast-levenshtein-2.0.5"
+      sources."fast-levenshtein-2.0.6"
       sources."amdefine-1.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -22045,7 +21723,7 @@ in
           sources."wordwrap-0.0.3"
         ];
       })
-      (sources."uglify-js-2.7.4" // {
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -22066,7 +21744,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -22207,22 +21885,27 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.3.0";
+    version = "1.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz";
-      sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f";
+      url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz";
+      sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b";
     };
     dependencies = [
-      sources."bluebird-3.4.6"
-      sources."body-parser-1.15.2"
+      sources."bluebird-3.4.7"
+      sources."body-parser-1.16.0"
       sources."chokidar-1.6.1"
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
         dependencies = [
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
+        ];
+      })
+      (sources."connect-3.5.0" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
         ];
       })
-      sources."connect-3.5.0"
       sources."core-js-2.4.1"
       sources."di-0.0.1"
       sources."dom-serialize-2.2.1"
@@ -22236,8 +21919,8 @@ in
       })
       sources."glob-7.1.1"
       sources."graceful-fs-4.1.11"
-      sources."http-proxy-1.15.2"
-      sources."isbinaryfile-3.0.1"
+      sources."http-proxy-1.16.2"
+      sources."isbinaryfile-3.0.2"
       sources."lodash-3.10.1"
       (sources."log4js-0.6.38" // {
         dependencies = [
@@ -22252,29 +21935,35 @@ in
       sources."qjobs-1.1.5"
       sources."range-parser-1.2.0"
       sources."rimraf-2.5.4"
-      sources."socket.io-1.4.7"
+      sources."safe-buffer-5.0.1"
+      (sources."socket.io-1.7.2" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."object-assign-4.1.0"
+        ];
+      })
       sources."source-map-0.5.6"
       sources."tmp-0.0.28"
-      sources."useragent-2.1.9"
+      sources."useragent-2.1.11"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
-      sources."debug-2.2.0"
+      sources."debug-2.6.0"
       sources."depd-1.1.0"
       sources."http-errors-1.5.1"
-      sources."iconv-lite-0.4.13"
+      sources."iconv-lite-0.4.15"
       sources."on-finished-2.3.0"
-      sources."qs-6.2.0"
-      sources."raw-body-2.1.7"
+      sources."qs-6.2.1"
+      sources."raw-body-2.2.0"
       sources."type-is-1.6.14"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.2"
       sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.13"
-      sources."mime-db-1.25.0"
+      sources."mime-types-2.1.14"
+      sources."mime-db-1.26.0"
       sources."anymatch-1.3.0"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
@@ -22282,7 +21971,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.15"
+      sources."fsevents-1.0.17"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -22292,7 +21981,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."normalize-path-2.0.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
@@ -22304,7 +21993,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
@@ -22316,7 +22005,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.7.0"
+      sources."binary-extensions-1.8.0"
       sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
@@ -22324,11 +22013,11 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.4.0"
-      sources."node-pre-gyp-0.6.31"
+      sources."nan-2.5.0"
+      sources."node-pre-gyp-0.6.32"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -22343,28 +22032,30 @@ in
       sources."tar-2.2.1"
       (sources."tar-pack-3.3.0" // {
         dependencies = [
+          sources."debug-2.2.0"
           sources."readable-stream-2.1.5"
+          sources."ms-0.7.1"
         ];
       })
       sources."minimist-0.0.8"
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      sources."gauge-2.7.2"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
+      sources."supports-color-0.2.0"
       sources."has-unicode-2.0.1"
-      sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."object-assign-4.1.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -22385,21 +22076,24 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -22409,7 +22103,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22418,7 +22112,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22429,7 +22123,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -22440,7 +22134,12 @@ in
       sources."once-1.3.3"
       sources."uid-number-0.0.6"
       sources."wrappy-1.0.2"
-      sources."finalhandler-0.5.0"
+      (sources."finalhandler-0.5.0" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
+        ];
+      })
       sources."parseurl-1.3.1"
       sources."utils-merge-1.0.0"
       sources."escape-html-1.0.3"
@@ -22456,26 +22155,9 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."wordwrap-0.0.3"
-      sources."engine.io-1.6.10"
-      (sources."socket.io-parser-2.2.6" // {
+      (sources."engine.io-1.8.2" // {
         dependencies = [
-          sources."isarray-0.0.1"
-        ];
-      })
-      (sources."socket.io-client-1.4.6" // {
-        dependencies = [
-          sources."component-emitter-1.2.0"
-        ];
-      })
-      (sources."socket.io-adapter-0.4.0" // {
-        dependencies = [
-          (sources."socket.io-parser-2.2.2" // {
-            dependencies = [
-              sources."debug-0.7.4"
-            ];
-          })
-          sources."json3-3.2.6"
-          sources."isarray-0.0.1"
+          sources."debug-2.3.3"
         ];
       })
       (sources."has-binary-0.1.7" // {
@@ -22483,46 +22165,58 @@ in
           sources."isarray-0.0.1"
         ];
       })
-      sources."base64id-0.1.0"
-      sources."ws-1.0.1"
-      (sources."engine.io-parser-1.2.4" // {
+      (sources."socket.io-adapter-0.5.0" // {
         dependencies = [
-          sources."has-binary-0.1.6"
+          sources."debug-2.3.3"
+        ];
+      })
+      (sources."socket.io-client-1.7.2" // {
+        dependencies = [
+          sources."debug-2.3.3"
+        ];
+      })
+      (sources."socket.io-parser-2.3.1" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."component-emitter-1.1.2"
           sources."isarray-0.0.1"
+          sources."ms-0.7.1"
         ];
       })
-      (sources."accepts-1.1.4" // {
-        dependencies = [
-          sources."mime-types-2.0.14"
-          sources."mime-db-1.12.0"
-        ];
-      })
+      sources."accepts-1.3.3"
+      sources."base64id-1.0.0"
+      sources."engine.io-parser-1.3.2"
+      sources."ws-1.1.1"
+      sources."cookie-0.3.1"
+      sources."negotiator-0.6.1"
+      sources."after-0.8.2"
+      sources."arraybuffer.slice-0.0.6"
+      sources."base64-arraybuffer-0.1.5"
+      sources."blob-0.0.4"
+      sources."wtf-8-1.0.0"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
-      sources."after-0.8.1"
-      sources."arraybuffer.slice-0.0.6"
-      sources."base64-arraybuffer-0.1.2"
-      sources."blob-0.0.4"
-      sources."utf8-2.1.0"
-      sources."negotiator-0.4.9"
-      sources."json3-3.3.2"
-      sources."component-emitter-1.1.2"
-      sources."benchmark-1.0.0"
-      sources."engine.io-client-1.6.9"
-      sources."component-bind-1.0.0"
-      sources."object-component-0.0.3"
-      sources."indexof-0.0.1"
-      sources."parseuri-0.0.4"
-      sources."to-array-0.1.4"
       sources."backo2-1.0.2"
-      sources."has-cors-1.1.0"
-      sources."xmlhttprequest-ssl-1.5.1"
-      sources."parsejson-0.0.1"
-      sources."parseqs-0.0.2"
+      sources."component-bind-1.0.0"
+      sources."component-emitter-1.2.1"
+      (sources."engine.io-client-1.8.2" // {
+        dependencies = [
+          sources."debug-2.3.3"
+        ];
+      })
+      sources."indexof-0.0.1"
+      sources."object-component-0.0.3"
+      sources."parseuri-0.0.5"
+      sources."to-array-0.1.4"
       sources."component-inherit-0.0.3"
+      sources."has-cors-1.1.0"
+      sources."parsejson-0.0.3"
+      sources."parseqs-0.0.5"
+      sources."xmlhttprequest-ssl-1.5.3"
       sources."yeast-0.1.2"
       sources."better-assert-1.0.2"
       sources."callsite-1.0.0"
+      sources."json3-3.3.2"
       sources."os-tmpdir-1.0.2"
       sources."lru-cache-2.2.4"
     ];
@@ -22650,9 +22344,9 @@ in
       sources."unpipe-1.0.0"
       sources."accepts-1.2.13"
       sources."compressible-2.0.9"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."ms-0.7.1"
       sources."csrf-3.0.4"
       sources."base64-url-1.3.3"
@@ -22679,12 +22373,12 @@ in
       sources."passport-google-oauth1-1.0.0"
       sources."passport-google-oauth20-1.0.0"
       sources."passport-oauth1-1.1.0"
-      sources."oauth-0.9.14"
-      sources."passport-oauth2-1.3.0"
+      sources."oauth-0.9.15"
+      sources."passport-oauth2-1.4.0"
       sources."uid2-0.0.3"
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22702,14 +22396,15 @@ in
       sha1 = "5de1e6426f885929b77357f014de5fee1dad0553";
     };
     dependencies = [
-      sources."through2-2.0.1"
+      sources."through2-2.0.3"
       sources."vinyl-1.2.0"
       sources."vinyl-fs-2.4.4"
-      sources."readable-stream-2.0.6"
+      sources."readable-stream-2.2.2"
       sources."xtend-4.0.1"
+      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
-      sources."inherits-2.0.3"
       sources."isarray-1.0.0"
+      sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
@@ -22728,10 +22423,10 @@ in
       sources."gulp-sourcemaps-1.6.0"
       sources."is-valid-glob-0.3.0"
       sources."lazystream-1.0.0"
-      sources."lodash.isequal-4.4.0"
-      sources."merge-stream-1.0.0"
+      sources."lodash.isequal-4.5.0"
+      sources."merge-stream-1.0.1"
       sources."mkdirp-0.5.1"
-      sources."object-assign-4.1.0"
+      sources."object-assign-4.1.1"
       sources."strip-bom-2.0.0"
       sources."strip-bom-stream-1.0.0"
       sources."through2-filter-2.0.0"
@@ -22742,7 +22437,7 @@ in
       sources."wrappy-1.0.2"
       sources."extend-3.0.0"
       sources."glob-5.0.15"
-      sources."glob-parent-3.0.1"
+      sources."glob-parent-3.1.0"
       (sources."micromatch-2.3.11" // {
         dependencies = [
           sources."is-extglob-1.0.0"
@@ -22760,7 +22455,7 @@ in
       sources."concat-map-0.0.1"
       sources."is-glob-3.1.0"
       sources."path-dirname-1.0.2"
-      sources."is-extglob-2.1.0"
+      sources."is-extglob-2.1.1"
       sources."arr-diff-2.0.0"
       sources."array-unique-0.2.1"
       sources."braces-1.8.5"
@@ -22771,7 +22466,7 @@ in
         ];
       })
       sources."filename-regex-2.0.0"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."normalize-path-2.0.1"
       sources."object.omit-2.0.1"
       (sources."parse-glob-3.0.4" // {
@@ -22788,7 +22483,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
@@ -22880,14 +22575,14 @@ in
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.1.0";
+    version = "1.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.0.tgz";
-      sha1 = "7e27db0eb5102dc0f1a4667d84bd5d633e19d191";
+      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.1.tgz";
+      sha1 = "f58c3157be2ffcb8253f82641b5f0473543d21e8";
     };
     dependencies = [
       sources."optparse-1.0.5"
-      sources."semver-5.0.3"
+      sources."semver-5.3.0"
       sources."npm-registry-client-7.1.2"
       (sources."npmconf-2.0.9" // {
         dependencies = [
@@ -22910,15 +22605,11 @@ in
       sources."slasp-0.0.4"
       sources."nijs-0.0.23"
       sources."chownr-1.0.1"
-      sources."concat-stream-1.5.2"
+      sources."concat-stream-1.6.0"
       sources."graceful-fs-4.1.11"
       sources."mkdirp-0.5.1"
       sources."normalize-package-data-2.3.5"
-      (sources."npm-package-arg-4.2.0" // {
-        dependencies = [
-          sources."semver-5.3.0"
-        ];
-      })
+      sources."npm-package-arg-4.2.0"
       sources."once-1.4.0"
       sources."request-2.79.0"
       sources."retry-0.8.0"
@@ -22927,7 +22618,8 @@ in
       sources."npmlog-3.1.2"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.0.6"
+      sources."readable-stream-2.2.2"
+      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"
@@ -22955,13 +22647,13 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -22973,11 +22665,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -22987,7 +22679,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22996,7 +22688,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23007,11 +22699,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -23029,8 +22721,8 @@ in
       sources."aproba-1.0.4"
       sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
-      sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."object-assign-4.1.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
@@ -23039,7 +22731,7 @@ in
       sources."config-chain-1.1.11"
       sources."ini-1.3.4"
       sources."nopt-3.0.6"
-      sources."osenv-0.1.3"
+      sources."osenv-0.1.4"
       sources."uid-number-0.0.5"
       sources."proto-list-1.2.4"
       sources."abbrev-1.0.9"
@@ -23069,10 +22761,10 @@ in
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
     packageName = "node-gyp";
-    version = "3.4.0";
+    version = "3.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz";
-      sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz";
+      sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a";
     };
     dependencies = [
       sources."fstream-1.0.10"
@@ -23081,9 +22773,8 @@ in
       sources."minimatch-3.0.3"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-3.1.2"
-      sources."osenv-0.1.3"
-      sources."path-array-1.0.1"
+      sources."npmlog-4.0.2"
+      sources."osenv-0.1.4"
       sources."request-2.79.0"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
@@ -23102,7 +22793,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
+      sources."gauge-2.7.2"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -23113,26 +22804,19 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
+      sources."supports-color-0.2.0"
       sources."has-unicode-2.0.1"
-      sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."object-assign-4.1.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."array-index-1.0.0"
-      sources."debug-2.3.3"
-      sources."es6-symbol-3.1.0"
-      sources."ms-0.7.2"
-      sources."d-0.1.1"
-      sources."es5-ext-0.10.12"
-      sources."es6-iterator-2.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       sources."caseless-0.11.0"
@@ -23146,27 +22830,30 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -23176,7 +22863,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23185,7 +22872,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23196,11 +22883,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."isexe-1.1.2"
@@ -23224,7 +22911,7 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."biased-opener-0.2.8"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       (sources."express-4.14.0" // {
         dependencies = [
           sources."debug-2.2.0"
@@ -23252,7 +22939,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."osenv-0.1.3"
+      sources."osenv-0.1.4"
       sources."plist-1.2.0"
       (sources."win-detect-browsers-1.0.2" // {
         dependencies = [
@@ -23269,7 +22956,7 @@ in
           sources."lodash-3.10.1"
         ];
       })
-      sources."xmldom-0.1.22"
+      sources."xmldom-0.1.27"
       sources."util-deprecate-1.0.2"
       sources."after-0.8.2"
       sources."xtend-4.0.1"
@@ -23283,13 +22970,13 @@ in
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
       sources."normalize-package-data-2.3.5"
-      sources."object-assign-4.1.0"
+      sources."object-assign-4.1.1"
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -23341,7 +23028,7 @@ in
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.2"
+      sources."proxy-addr-1.1.3"
       sources."qs-6.2.0"
       sources."range-parser-1.2.0"
       (sources."send-0.14.1" // {
@@ -23354,14 +23041,14 @@ in
       sources."type-is-1.6.14"
       sources."utils-merge-1.0.0"
       sources."vary-1.1.0"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."negotiator-0.6.1"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."statuses-1.3.1"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.1.1"
+      sources."ipaddr.js-1.2.0"
       sources."destroy-1.0.4"
       sources."http-errors-1.5.1"
       sources."mime-1.3.4"
@@ -23379,8 +23066,8 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."truncate-1.0.5"
-      sources."nan-2.4.0"
-      (sources."node-pre-gyp-0.6.31" // {
+      sources."nan-2.5.0"
+      (sources."node-pre-gyp-0.6.32" // {
         dependencies = [
           sources."rimraf-2.5.4"
           sources."semver-5.3.0"
@@ -23388,7 +23075,7 @@ in
         ];
       })
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       (sources."request-2.79.0" // {
         dependencies = [
           sources."qs-6.3.0"
@@ -23408,7 +23095,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      sources."gauge-2.7.2"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -23418,14 +23105,14 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
+      sources."supports-color-0.2.0"
       sources."has-unicode-2.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       sources."caseless-0.11.0"
@@ -23443,20 +23130,23 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.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"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
       sources."hoek-2.16.3"
       sources."boom-2.10.1"
@@ -23464,7 +23154,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23473,7 +23163,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23484,7 +23174,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -23501,7 +23191,7 @@ in
       sources."os-locale-1.4.0"
       sources."window-size-0.1.4"
       sources."y18n-3.2.1"
-      sources."wrap-ansi-2.0.0"
+      sources."wrap-ansi-2.1.0"
       sources."lcid-1.0.0"
       sources."invert-kv-1.0.0"
     ];
@@ -23515,15 +23205,15 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.31";
+    version = "0.6.32";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz";
-      sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
+      sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
     };
     dependencies = [
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -23543,7 +23233,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      sources."gauge-2.7.2"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -23555,17 +23245,17 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
+      sources."supports-color-0.2.0"
       sources."has-unicode-2.0.1"
-      sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."object-assign-4.1.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -23582,27 +23272,30 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -23612,7 +23305,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23621,7 +23314,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23632,11 +23325,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -23674,7 +23367,7 @@ in
     };
     dependencies = [
       sources."chokidar-1.6.1"
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -23699,7 +23392,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.15"
+      sources."fsevents-1.0.17"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -23709,7 +23402,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.0"
       sources."is-extglob-1.0.0"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."normalize-path-2.0.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
@@ -23721,7 +23414,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
@@ -23733,7 +23426,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.7.0"
+      sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
       sources."readable-stream-2.2.2"
       sources."set-immediate-shim-1.0.1"
@@ -23742,11 +23435,11 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."nan-2.4.0"
-      sources."node-pre-gyp-0.6.31"
+      sources."nan-2.5.0"
+      sources."node-pre-gyp-0.6.32"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -23767,21 +23460,21 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      sources."gauge-2.7.2"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
+      sources."supports-color-0.2.0"
       sources."has-unicode-2.0.1"
-      sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."object-assign-4.1.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -23798,27 +23491,30 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -23828,7 +23524,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23837,7 +23533,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23848,11 +23544,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -23897,8 +23593,8 @@ in
       sources."semver-diff-2.1.0"
       sources."string-length-1.0.1"
       sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.3"
-      sources."write-file-atomic-1.2.0"
+      sources."osenv-0.1.4"
+      sources."write-file-atomic-1.3.1"
       sources."xdg-basedir-2.0.0"
       sources."os-homedir-1.0.2"
       sources."imurmurhash-0.1.4"
@@ -23938,53 +23634,64 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.15.2";
+    version = "0.16.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.15.2.tgz";
-      sha1 = "4533dd93f63828f8e749f0c132a793fbeb636ea6";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.16.1.tgz";
+      sha1 = "eff4162e6e08ef7e2ae9b17ad99571876f7d895d";
     };
     dependencies = [
-      sources."basic-auth-1.0.4"
-      sources."bcryptjs-2.3.0"
-      sources."body-parser-1.15.2"
+      sources."basic-auth-1.1.0"
+      sources."bcryptjs-2.4.0"
+      (sources."body-parser-1.15.2" // {
+        dependencies = [
+          sources."raw-body-2.1.7"
+        ];
+      })
       sources."cheerio-0.22.0"
-      sources."clone-2.0.0"
+      sources."clone-2.1.0"
       sources."cookie-parser-1.4.3"
       sources."cors-2.8.1"
-      sources."cron-1.1.1"
+      sources."cron-1.2.1"
       sources."express-4.14.0"
-      sources."follow-redirects-0.2.0"
-      sources."fs-extra-0.30.0"
+      (sources."follow-redirects-1.2.1" // {
+        dependencies = [
+          sources."debug-2.6.0"
+          sources."ms-0.7.2"
+        ];
+      })
+      sources."fs-extra-1.0.0"
       sources."fs.notify-0.0.4"
       sources."i18next-1.10.6"
       sources."is-utf8-0.2.1"
+      sources."js-yaml-3.7.0"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonata-1.0.10"
       sources."media-typer-0.3.0"
-      (sources."mqtt-1.14.1" // {
-        dependencies = [
-          sources."readable-stream-1.0.34"
-          sources."isarray-0.0.1"
-        ];
-      })
-      sources."mustache-2.2.1"
+      sources."mqtt-2.2.1"
+      sources."mustache-2.3.0"
       sources."nopt-3.0.6"
-      sources."oauth2orize-1.5.0"
+      sources."oauth2orize-1.7.0"
       sources."on-headers-1.0.1"
       sources."passport-0.3.2"
       sources."passport-http-bearer-1.0.1"
       sources."passport-oauth2-client-password-0.1.2"
-      sources."raw-body-2.1.7"
+      (sources."raw-body-2.2.0" // {
+        dependencies = [
+          sources."iconv-lite-0.4.15"
+        ];
+      })
       sources."semver-5.3.0"
-      sources."sentiment-1.0.6"
-      (sources."uglify-js-2.7.3" // {
+      sources."sentiment-2.1.0"
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
         ];
       })
       sources."when-3.7.7"
-      sources."ws-0.8.1"
+      sources."ws-1.1.1"
       sources."xml2js-0.4.17"
       sources."node-red-node-feedparser-0.1.7"
-      sources."node-red-node-email-0.1.12"
+      sources."node-red-node-email-0.1.15"
       (sources."node-red-node-twitter-0.1.9" // {
         dependencies = [
           sources."request-2.79.0"
@@ -23993,12 +23700,7 @@ in
         ];
       })
       sources."node-red-node-rbe-0.1.6"
-      sources."node-red-node-serialport-0.4.1"
-      (sources."bcrypt-0.8.7" // {
-        dependencies = [
-          sources."nan-2.3.5"
-        ];
-      })
+      sources."bcrypt-1.0.2"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.2.0"
@@ -24013,8 +23715,9 @@ in
       sources."setprototypeof-1.0.2"
       sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
-      sources."mime-types-2.1.13"
-      sources."mime-db-1.25.0"
+      sources."unpipe-1.0.0"
+      sources."mime-types-2.1.14"
+      sources."mime-db-1.26.0"
       sources."css-select-1.2.0"
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
@@ -24051,8 +23754,8 @@ in
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."vary-1.1.0"
-      sources."moment-timezone-0.5.9"
-      sources."moment-2.17.0"
+      sources."moment-timezone-0.5.11"
+      sources."moment-2.17.1"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
@@ -24065,86 +23768,55 @@ in
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.2"
+      sources."proxy-addr-1.1.3"
       sources."range-parser-1.2.0"
       sources."send-0.14.1"
       sources."serve-static-1.11.1"
       sources."utils-merge-1.0.0"
       sources."negotiator-0.6.1"
-      sources."unpipe-1.0.0"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.1.1"
+      sources."ipaddr.js-1.2.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
-      sources."stream-consume-0.1.0"
       sources."graceful-fs-4.1.11"
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
-      sources."path-is-absolute-1.0.1"
-      sources."rimraf-2.5.4"
-      sources."glob-7.1.1"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
-      sources."once-1.4.0"
-      sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.6"
-      sources."balanced-match-0.4.2"
-      sources."concat-map-0.0.1"
       sources."async-0.1.22"
       sources."retry-0.6.1"
       sources."cookies-0.6.2"
       sources."i18next-client-1.10.3"
       sources."json5-0.2.0"
       sources."keygrip-1.0.1"
+      sources."argparse-1.0.9"
+      sources."esprima-2.7.3"
+      sources."sprintf-js-1.0.3"
       sources."commist-1.0.0"
-      (sources."concat-stream-1.5.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
-      (sources."end-of-stream-1.1.0" // {
-        dependencies = [
-          sources."once-1.3.3"
-        ];
-      })
+      sources."concat-stream-1.6.0"
+      sources."end-of-stream-1.1.0"
       sources."help-me-1.0.1"
       sources."minimist-1.2.0"
-      (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."mqtt-packet-5.2.1"
+      sources."pump-1.0.2"
       sources."reinterval-1.1.0"
-      sources."split2-2.1.0"
-      (sources."websocket-stream-3.3.3" // {
-        dependencies = [
-          sources."ws-1.1.1"
-        ];
-      })
+      sources."split2-2.1.1"
+      sources."websocket-stream-3.3.3"
       sources."xtend-4.0.1"
       sources."leven-1.0.2"
       sources."typedarray-0.0.6"
+      sources."once-1.3.3"
+      sources."wrappy-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."through2-2.0.3"
       sources."extend-3.0.0"
-      sources."glob-parent-3.0.1"
+      sources."glob-5.0.15"
+      sources."glob-parent-3.1.0"
       (sources."micromatch-2.3.11" // {
         dependencies = [
           sources."is-extglob-1.0.0"
@@ -24154,9 +23826,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.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.1.0"
       sources."path-dirname-1.0.2"
-      sources."is-extglob-2.1.0"
+      sources."is-extglob-2.1.1"
       sources."arr-diff-2.0.0"
       sources."array-unique-0.2.1"
       sources."braces-1.8.5"
@@ -24167,7 +23845,7 @@ in
         ];
       })
       sources."filename-regex-2.0.0"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."normalize-path-2.0.1"
       sources."object.omit-2.0.1"
       (sources."parse-glob-3.0.4" // {
@@ -24184,7 +23862,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
@@ -24206,34 +23884,17 @@ in
       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."isarray-0.0.1"
-        ];
-      })
-      (sources."bl-0.9.5" // {
-        dependencies = [
-          sources."readable-stream-1.0.34"
-          sources."isarray-0.0.1"
-        ];
-      })
+      sources."bl-1.2.0"
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
-          sources."once-1.3.3"
         ];
       })
       sources."stream-shift-1.0.0"
-      sources."options-0.0.6"
-      sources."ultron-1.0.2"
       sources."abbrev-1.0.9"
       sources."uid2-0.0.3"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
-      sources."lodash.assign-4.0.1"
-      sources."lodash.keys-4.2.0"
-      sources."lodash.rest-4.0.5"
       sources."source-map-0.5.6"
       sources."uglify-to-browserify-1.0.2"
       sources."yargs-3.10.0"
@@ -24247,13 +23908,11 @@ in
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
       sources."longest-1.0.1"
-      sources."bufferutil-1.2.1"
-      sources."utf-8-validate-1.2.1"
-      sources."bindings-1.2.1"
-      sources."nan-2.4.0"
+      sources."options-0.0.6"
+      sources."ultron-1.0.2"
       sources."sax-1.2.1"
       sources."xmlbuilder-4.2.1"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       (sources."feedparser-1.1.3" // {
         dependencies = [
           sources."sax-0.6.1"
@@ -24284,7 +23943,6 @@ in
       sources."http-signature-1.1.1"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
-      sources."json-stringify-safe-5.0.1"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
@@ -24300,11 +23958,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -24313,7 +23971,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24322,7 +23980,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24333,7 +23991,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -24341,7 +23999,7 @@ in
       sources."nodemailer-1.11.0"
       sources."poplib-0.1.7"
       sources."mailparser-0.6.1"
-      (sources."imap-0.8.18" // {
+      (sources."imap-0.8.19" // {
         dependencies = [
           sources."readable-stream-1.1.14"
           sources."isarray-0.0.1"
@@ -24381,48 +24039,48 @@ in
       sources."utf7-1.0.2"
       sources."twitter-ng-0.6.2"
       sources."oauth-0.9.14"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."asynckit-0.4.0"
-      (sources."serialport-4.0.6" // {
-        dependencies = [
-          sources."debug-2.3.3"
-          sources."ms-0.7.2"
-        ];
-      })
-      sources."lie-3.1.0"
-      (sources."node-pre-gyp-0.6.31" // {
+      sources."bindings-1.2.1"
+      sources."nan-2.5.0"
+      (sources."node-pre-gyp-0.6.32" // {
         dependencies = [
           sources."request-2.79.0"
           sources."form-data-2.1.2"
           sources."qs-6.3.0"
         ];
       })
-      sources."object.assign-4.0.4"
-      sources."immediate-3.0.6"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       sources."rc-1.1.6"
+      (sources."rimraf-2.5.4" // {
+        dependencies = [
+          sources."glob-7.1.1"
+        ];
+      })
       sources."tar-2.2.1"
       (sources."tar-pack-3.3.0" // {
         dependencies = [
-          sources."once-1.3.3"
           sources."readable-stream-2.1.5"
         ];
       })
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      (sources."gauge-2.7.2" // {
+        dependencies = [
+          sources."supports-color-0.2.0"
+        ];
+      })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
-      sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."object-assign-4.1.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
@@ -24431,14 +24089,11 @@ in
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
+      sources."fs.realpath-1.0.0"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.10"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
-      sources."function-bind-1.1.0"
-      sources."object-keys-1.0.11"
-      sources."define-properties-1.1.2"
-      sources."foreach-2.0.5"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -24502,7 +24157,7 @@ in
       sources."methods-0.0.1"
       sources."send-0.1.0"
       sources."cookie-signature-1.0.1"
-      (sources."debug-2.3.3" // {
+      (sources."debug-2.6.0" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -24512,7 +24167,7 @@ in
       sources."bytes-0.2.0"
       sources."pause-0.0.1"
       sources."mime-1.2.6"
-      sources."coffee-script-1.11.1"
+      sources."coffee-script-1.12.2"
       sources."vows-0.8.1"
       sources."eyes-0.1.8"
       sources."diff-1.0.8"
@@ -24541,17 +24196,18 @@ in
       sources."tinycolor-0.0.1"
       sources."options-0.0.6"
       sources."zeparser-0.0.5"
-      sources."mailcomposer-3.12.0"
+      sources."mailcomposer-4.0.1"
       sources."simplesmtp-0.3.35"
       sources."optimist-0.6.1"
-      sources."buildmail-3.10.0"
-      sources."libmime-2.1.0"
+      sources."buildmail-4.0.1"
+      sources."libmime-3.0.0"
       sources."addressparser-1.0.1"
       sources."libbase64-0.1.0"
       sources."libqp-1.1.0"
       sources."nodemailer-fetch-1.6.0"
       sources."nodemailer-shared-1.1.0"
-      sources."iconv-lite-0.4.13"
+      sources."punycode-1.4.1"
+      sources."iconv-lite-0.4.15"
       sources."rai-0.1.12"
       sources."xoauth2-0.1.8"
       sources."wordwrap-0.0.3"
@@ -24576,10 +24232,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.0.2";
+    version = "4.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.0.2.tgz";
-      sha1 = "fe6cb3c202145151459e74a2919060fb659e2dae";
+      url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz";
+      sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4";
     };
     dependencies = [
       sources."JSONStream-1.2.1"
@@ -24612,7 +24268,7 @@ in
           sources."glob-6.0.4"
         ];
       })
-      sources."lockfile-1.0.2"
+      sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.union-4.6.0"
@@ -24622,29 +24278,26 @@ in
       sources."mkdirp-0.5.1"
       (sources."node-gyp-3.4.0" // {
         dependencies = [
+          sources."nopt-3.0.6"
           sources."npmlog-3.1.2"
         ];
       })
-      sources."nopt-3.0.6"
+      sources."nopt-4.0.1"
       sources."normalize-git-url-3.0.2"
       sources."normalize-package-data-2.3.5"
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
       sources."npm-package-arg-4.2.0"
-      (sources."npm-registry-client-7.3.0" // {
-        dependencies = [
-          sources."npmlog-3.1.2"
-        ];
-      })
+      sources."npm-registry-client-7.4.5"
       sources."npm-user-validate-0.1.5"
-      (sources."npmlog-4.0.1" // {
+      (sources."npmlog-4.0.2" // {
         dependencies = [
-          sources."gauge-2.7.1"
+          sources."gauge-2.7.2"
         ];
       })
       sources."once-1.4.0"
       sources."opener-1.4.2"
-      sources."osenv-0.1.3"
+      sources."osenv-0.1.4"
       sources."path-is-inside-1.0.2"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
@@ -24655,10 +24308,10 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."realize-package-specifier-3.0.3"
-      sources."request-2.78.0"
-      sources."retry-0.10.0"
+      sources."request-2.79.0"
+      sources."retry-0.10.1"
       sources."rimraf-2.5.4"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
@@ -24678,11 +24331,12 @@ in
       sources."umask-1.1.0"
       sources."unique-filename-1.1.0"
       sources."unpipe-1.0.0"
+      sources."uuid-3.0.1"
       sources."validate-npm-package-name-2.2.2"
       sources."which-1.2.12"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.2.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -24693,7 +24347,7 @@ in
       sources."lodash.restparam-3.6.1"
       sources."readdir-scoped-modules-1.0.2"
       sources."validate-npm-package-license-3.0.1"
-      sources."jsonparse-1.2.0"
+      sources."jsonparse-1.3.0"
       sources."through-2.3.8"
       sources."wcwidth-1.0.1"
       sources."defaults-1.0.3"
@@ -24709,11 +24363,7 @@ in
       sources."promzard-0.3.0"
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
-      (sources."concat-stream-1.5.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."concat-stream-1.6.0"
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
@@ -24727,20 +24377,11 @@ in
       })
       sources."flush-write-stream-1.0.2"
       sources."from2-2.3.0"
-      sources."pump-1.0.1"
+      sources."pump-1.0.2"
       sources."pumpify-1.3.5"
       sources."stream-each-1.2.0"
-      (sources."through2-2.0.1" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
+      sources."through2-2.0.3"
       sources."typedarray-0.0.6"
-      sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-0.10.31"
-      sources."util-deprecate-1.0.2"
       sources."stream-shift-1.0.0"
       sources."xtend-4.0.1"
       sources."minimist-0.0.8"
@@ -24751,15 +24392,15 @@ in
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."has-color-0.1.7"
-      sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."object-assign-4.1.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-index-1.0.0"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       sources."es6-symbol-3.1.0"
       sources."ms-0.7.2"
       sources."d-0.1.1"
@@ -24767,13 +24408,19 @@ in
       sources."es6-iterator-2.0.0"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
+      sources."supports-color-0.2.0"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."mute-stream-0.0.6"
+      sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
       sources."json-parse-helpfulerror-1.0.3"
       sources."jju-1.3.0"
       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."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       sources."caseless-0.11.0"
@@ -24787,8 +24434,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
-      sources."node-uuid-1.4.7"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
@@ -24796,18 +24442,21 @@ in
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."chalk-1.1.3"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -24816,7 +24465,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24825,7 +24474,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24836,11 +24485,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
@@ -24896,7 +24545,7 @@ in
       })
       sources."fs.extra-1.3.2"
       sources."findit-1.2.0"
-      sources."coffee-script-1.11.1"
+      sources."coffee-script-1.12.2"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
       sources."request-2.79.0"
@@ -24907,7 +24556,7 @@ in
       sources."rimraf-2.5.4"
       sources."retry-0.6.0"
       sources."couch-login-0.1.20"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       sources."caseless-0.11.0"
@@ -24921,13 +24570,13 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -24939,11 +24588,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -24953,7 +24602,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24962,7 +24611,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24973,11 +24622,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -24992,7 +24641,11 @@ in
       sources."concat-map-0.0.1"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      (sources."gauge-2.7.2" // {
+        dependencies = [
+          sources."supports-color-0.2.0"
+        ];
+      })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -25003,10 +24656,9 @@ in
       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"
-      sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."object-assign-4.1.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
@@ -25051,13 +24703,13 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.6";
+    version = "2.8.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.6.tgz";
-      sha1 = "9e3a0865b29dfc9af8c3d53d95b43f4bc6b1f212";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.9.tgz";
+      sha1 = "c084b087a08ecf9292352e2cd591de903f8129c3";
     };
     dependencies = [
-      sources."bluebird-3.4.6"
+      sources."bluebird-3.4.7"
       sources."chalk-1.1.3"
       sources."cint-8.2.1"
       sources."cli-table-0.3.1"
@@ -25066,7 +24718,7 @@ in
       sources."find-up-1.1.2"
       sources."get-stdin-5.0.1"
       sources."json-parse-helpfulerror-1.0.3"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       sources."node-alias-1.0.4"
       sources."npm-3.10.10"
       (sources."npmi-2.0.1" // {
@@ -25078,13 +24730,13 @@ in
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
       sources."spawn-please-0.2.0"
-      sources."update-notifier-1.0.2"
+      sources."update-notifier-1.0.3"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."colors-1.0.3"
       sources."graceful-readlink-1.0.1"
       sources."path-exists-2.1.0"
@@ -25120,7 +24772,7 @@ in
           sources."glob-6.0.4"
         ];
       })
-      sources."lockfile-1.0.2"
+      sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.union-4.6.0"
@@ -25144,14 +24796,15 @@ in
         ];
       })
       sources."npm-user-validate-0.1.5"
-      (sources."npmlog-4.0.1" // {
+      (sources."npmlog-4.0.2" // {
         dependencies = [
-          sources."gauge-2.7.1"
+          sources."gauge-2.7.2"
+          sources."supports-color-0.2.0"
         ];
       })
       sources."once-1.4.0"
       sources."opener-1.4.2"
-      sources."osenv-0.1.3"
+      sources."osenv-0.1.4"
       sources."path-is-inside-1.0.2"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
@@ -25165,7 +24818,7 @@ in
       sources."readable-stream-2.1.5"
       sources."realize-package-specifier-3.0.3"
       sources."request-2.75.0"
-      sources."retry-0.10.0"
+      sources."retry-0.10.1"
       sources."rimraf-2.5.4"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
@@ -25212,15 +24865,15 @@ in
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."has-color-0.1.7"
-      sources."object-assign-4.1.0"
-      sources."signal-exit-3.0.1"
+      sources."object-assign-4.1.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-index-1.0.0"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       sources."es6-symbol-3.1.0"
       sources."ms-0.7.2"
       sources."d-0.1.1"
@@ -25228,12 +24881,13 @@ in
       sources."es6-iterator-2.0.0"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
-      (sources."concat-stream-1.5.2" // {
+      (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.0.6"
+          sources."readable-stream-2.2.2"
         ];
       })
       sources."typedarray-0.0.6"
+      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"
@@ -25241,9 +24895,8 @@ in
       sources."util-deprecate-1.0.2"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."mute-stream-0.0.6"
+      sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
-      sources."buffer-shims-1.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
       (sources."bl-1.1.2" // {
@@ -25262,7 +24915,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
       sources."qs-6.2.1"
@@ -25274,7 +24927,7 @@ in
       sources."is-my-json-valid-2.15.0"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."hoek-2.16.3"
@@ -25283,7 +24936,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25292,7 +24945,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25303,11 +24956,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
@@ -25346,7 +24999,7 @@ in
       sources."node-status-codes-1.0.0"
       sources."parse-json-2.2.0"
       sources."read-all-stream-3.1.0"
-      sources."timed-out-3.0.0"
+      sources."timed-out-3.1.3"
       sources."unzip-response-1.0.2"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
@@ -25365,7 +25018,7 @@ in
     meta = {
       description = "Find newer versions of dependencies than what your package.json or bower.json allows";
       homepage = https://github.com/tjunnone/npm-check-updates;
-      license = "MIT";
+      license = "Apache-2.0";
     };
     production = true;
   };
@@ -25380,7 +25033,7 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."babybird-0.0.1"
-      (sources."body-parser-1.15.2" // {
+      (sources."body-parser-1.16.0" // {
         dependencies = [
           sources."content-type-1.0.2"
         ];
@@ -25388,6 +25041,8 @@ in
       (sources."compression-1.6.2" // {
         dependencies = [
           sources."bytes-2.3.0"
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
         ];
       })
       sources."connect-busboy-0.0.2"
@@ -25399,11 +25054,19 @@ in
       (sources."express-4.14.0" // {
         dependencies = [
           sources."content-type-1.0.2"
+          sources."debug-2.2.0"
           sources."finalhandler-0.5.0"
+          sources."qs-6.2.0"
+          sources."ms-0.7.1"
         ];
       })
       sources."express-handlebars-3.0.0"
-      sources."finalhandler-0.5.1"
+      (sources."finalhandler-0.5.1" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
+        ];
+      })
       sources."gelf-stream-0.2.4"
       sources."js-yaml-3.7.0"
       sources."mediawiki-title-0.5.6"
@@ -25417,12 +25080,8 @@ in
         ];
       })
       sources."semver-5.3.0"
-      (sources."serve-favicon-2.3.2" // {
-        dependencies = [
-          sources."ms-0.7.2"
-        ];
-      })
-      (sources."service-runner-2.1.11" // {
+      sources."serve-favicon-2.3.2"
+      (sources."service-runner-2.1.13" // {
         dependencies = [
           sources."gelf-stream-1.1.1"
           sources."yargs-5.0.0"
@@ -25443,28 +25102,28 @@ in
       sources."asap-2.0.5"
       sources."is-arguments-1.0.2"
       sources."bytes-2.4.0"
-      sources."debug-2.2.0"
+      sources."debug-2.6.0"
       sources."depd-1.1.0"
       sources."http-errors-1.5.1"
-      sources."iconv-lite-0.4.13"
+      sources."iconv-lite-0.4.15"
       sources."on-finished-2.3.0"
-      sources."qs-6.2.0"
-      sources."raw-body-2.1.7"
+      sources."qs-6.2.1"
+      sources."raw-body-2.2.0"
       sources."type-is-1.6.14"
-      sources."ms-0.7.1"
+      sources."ms-0.7.2"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.2"
       sources."statuses-1.3.1"
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.13"
-      sources."mime-db-1.25.0"
+      sources."mime-types-2.1.14"
+      sources."mime-db-1.26.0"
       sources."accepts-1.3.3"
       sources."compressible-2.0.9"
       sources."on-headers-1.0.1"
       sources."vary-1.1.0"
-      sources."busboy-0.2.13"
+      sources."busboy-0.2.14"
       sources."dicer-0.2.5"
       sources."readable-stream-1.1.14"
       sources."streamsearch-0.1.2"
@@ -25483,13 +25142,18 @@ in
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.1.2"
+      sources."proxy-addr-1.1.3"
       sources."range-parser-1.2.0"
-      sources."send-0.14.1"
+      (sources."send-0.14.1" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
+        ];
+      })
       sources."serve-static-1.11.1"
       sources."utils-merge-1.0.0"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.1.1"
+      sources."ipaddr.js-1.2.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
       sources."glob-6.0.4"
@@ -25511,7 +25175,7 @@ in
       sources."concat-map-0.0.1"
       sources."optimist-0.6.1"
       sources."source-map-0.4.4"
-      (sources."uglify-js-2.7.4" // {
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
           sources."source-map-0.5.6"
@@ -25534,7 +25198,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -25563,7 +25227,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -25575,11 +25239,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -25589,7 +25253,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25598,7 +25262,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25609,12 +25273,12 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
       sources."punycode-1.4.1"
-      sources."bluebird-3.4.6"
+      sources."bluebird-3.4.7"
       sources."bunyan-1.8.5"
       sources."bunyan-syslog-udp-0.1.0"
       sources."hot-shots-4.3.1"
@@ -25627,8 +25291,8 @@ in
       sources."dtrace-provider-0.8.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
-      sources."moment-2.17.0"
-      sources."nan-2.4.0"
+      sources."moment-2.17.1"
+      sources."nan-2.5.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -25665,9 +25329,9 @@ in
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
       sources."dom-storage-2.0.2"
-      (sources."bl-1.1.2" // {
+      (sources."bl-1.2.0" // {
         dependencies = [
-          sources."readable-stream-2.0.6"
+          sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
@@ -25686,7 +25350,7 @@ in
           sources."camelcase-3.0.0"
         ];
       })
-      sources."wrap-ansi-2.0.0"
+      sources."wrap-ansi-2.1.0"
       sources."lcid-1.0.0"
       sources."invert-kv-1.0.0"
       sources."find-up-1.1.2"
@@ -25723,23 +25387,23 @@ in
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.36.0";
+    version = "0.36.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.0.tgz";
-      sha1 = "fe3b087f07389ca1c2fd3d71e38a7971d5508924";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.1.tgz";
+      sha1 = "7d2009b814b5b3a2ca573cabea1f2873a4be4a14";
     };
     dependencies = [
       sources."airplayer-2.0.0"
       sources."clivas-0.2.0"
       (sources."inquirer-1.2.3" // {
         dependencies = [
-          sources."lodash-4.17.2"
+          sources."lodash-4.17.4"
         ];
       })
       sources."keypress-0.2.1"
       sources."mime-1.3.4"
-      sources."network-address-1.1.0"
-      sources."numeral-1.5.5"
+      sources."network-address-1.1.2"
+      sources."numeral-1.5.6"
       sources."open-0.0.5"
       (sources."optimist-0.6.1" // {
         dependencies = [
@@ -25751,7 +25415,7 @@ in
           sources."get-stdin-5.0.1"
         ];
       })
-      sources."pump-1.0.1"
+      sources."pump-1.0.2"
       sources."range-parser-1.2.0"
       sources."rc-1.1.6"
       (sources."torrent-stream-1.0.3" // {
@@ -25775,14 +25439,15 @@ in
       sources."server-destroy-1.0.1"
       sources."bplist-creator-0.0.6"
       sources."bplist-parser-0.1.1"
-      sources."concat-stream-1.5.2"
+      sources."concat-stream-1.6.0"
       sources."plist-1.2.0"
       sources."reverse-http-1.2.0"
       sources."stream-buffers-2.2.0"
       sources."big-integer-1.6.17"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.0.6"
+      sources."readable-stream-2.2.2"
+      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"
@@ -25790,7 +25455,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."base64-js-0.0.8"
       sources."xmlbuilder-4.0.0"
-      sources."xmldom-0.1.22"
+      sources."xmldom-0.1.27"
       sources."lodash-3.10.1"
       sources."consume-http-header-1.0.0"
       sources."once-1.4.0"
@@ -25806,12 +25471,12 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."string-width-1.0.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."array-flatten-2.1.0"
+      sources."array-flatten-2.1.1"
       sources."deep-equal-1.0.1"
       sources."dns-equal-1.0.0"
       sources."dns-txt-2.0.2"
@@ -25827,13 +25492,13 @@ in
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
       sources."normalize-package-data-2.3.5"
-      sources."object-assign-4.1.0"
+      sources."object-assign-4.1.1"
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.1.5"
       sources."is-builtin-module-1.0.0"
@@ -25868,7 +25533,7 @@ in
       sources."external-editor-1.1.1"
       sources."figures-1.7.0"
       sources."mute-stream-0.0.6"
-      sources."run-async-2.2.0"
+      sources."run-async-2.3.0"
       sources."rx-4.1.0"
       sources."through-2.3.8"
       sources."restore-cursor-1.0.1"
@@ -25883,13 +25548,13 @@ in
       sources."wordwrap-0.0.3"
       sources."blob-to-buffer-1.2.6"
       sources."magnet-uri-5.1.5"
-      sources."parse-torrent-file-4.0.0"
-      sources."simple-get-2.3.0"
+      sources."parse-torrent-file-4.0.1"
+      sources."simple-get-2.4.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."bencode-0.11.0"
+      sources."simple-sha1-2.1.0"
+      sources."rusha-0.8.5"
       sources."simple-concat-1.0.0"
       sources."unzip-response-2.0.1"
       (sources."end-of-stream-1.1.0" // {
@@ -25917,7 +25582,7 @@ in
       sources."rimraf-2.5.4"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.0"
-      (sources."random-access-file-1.3.1" // {
+      (sources."random-access-file-1.4.0" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.1"
@@ -25926,6 +25591,8 @@ in
       })
       sources."randombytes-2.0.3"
       sources."run-parallel-1.1.6"
+      sources."debug-2.6.0"
+      sources."ms-0.7.2"
       sources."flatten-0.0.1"
       sources."fifo-0.1.4"
       (sources."peer-wire-protocol-0.7.0" // {
@@ -25956,7 +25623,6 @@ in
           sources."bencode-0.8.0"
         ];
       })
-      sources."debug-2.3.3"
       sources."re-emitter-1.1.3"
       sources."buffer-equals-1.0.4"
       sources."k-bucket-0.6.0"
@@ -25967,13 +25633,13 @@ in
       })
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
-      sources."k-rpc-socket-1.6.0"
+      sources."k-rpc-socket-1.6.1"
       sources."bn.js-4.11.6"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      sources."simple-peer-6.0.7"
-      sources."simple-websocket-4.1.0"
+      sources."simple-peer-6.2.1"
+      sources."simple-websocket-4.2.0"
       sources."string2compact-1.2.2"
       sources."ws-1.1.1"
       sources."ipaddr.js-1.2.0"
@@ -25981,7 +25647,6 @@ in
       sources."addr-to-ip-port-1.4.2"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
-      sources."ms-0.7.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -25994,10 +25659,10 @@ in
   peerflix-server = nodeEnv.buildNodePackage {
     name = "peerflix-server";
     packageName = "peerflix-server";
-    version = "0.1.1";
+    version = "0.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.1.tgz";
-      sha1 = "683d54067d44699b2eff8bfc793e780df2912666";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz";
+      sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6";
     };
     dependencies = [
       sources."connect-multiparty-1.2.5"
@@ -26009,10 +25674,10 @@ in
       })
       sources."lodash-2.4.2"
       sources."mkdirp-0.5.1"
-      sources."pump-1.0.1"
+      sources."pump-1.0.2"
       sources."range-parser-1.2.0"
       sources."read-torrent-1.3.0"
-      (sources."socket.io-1.6.0" // {
+      (sources."socket.io-1.7.2" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -26131,8 +25796,8 @@ in
       sources."parse-torrent-file-2.1.4"
       sources."flatten-0.0.1"
       sources."bencode-0.7.0"
-      sources."simple-sha1-2.0.8"
-      sources."rusha-0.8.4"
+      sources."simple-sha1-2.1.0"
+      sources."rusha-0.8.5"
       sources."form-data-0.0.10"
       sources."hawk-0.10.2"
       sources."node-uuid-1.4.7"
@@ -26149,7 +25814,7 @@ in
       sources."boom-0.3.8"
       sources."cryptiles-0.1.3"
       sources."sntp-0.1.4"
-      (sources."engine.io-1.8.0" // {
+      (sources."engine.io-1.8.2" // {
         dependencies = [
           sources."debug-2.3.3"
           sources."cookie-0.3.1"
@@ -26162,7 +25827,7 @@ in
           sources."debug-2.3.3"
         ];
       })
-      (sources."socket.io-client-1.6.0" // {
+      (sources."socket.io-client-1.7.2" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -26177,19 +25842,15 @@ in
       sources."ms-0.7.2"
       (sources."accepts-1.3.3" // {
         dependencies = [
-          sources."mime-types-2.1.13"
+          sources."mime-types-2.1.14"
           sources."negotiator-0.6.1"
-          sources."mime-db-1.25.0"
-        ];
-      })
-      sources."base64id-0.1.0"
-      (sources."engine.io-parser-1.3.1" // {
-        dependencies = [
-          sources."has-binary-0.1.6"
+          sources."mime-db-1.26.0"
         ];
       })
+      sources."base64id-1.0.0"
+      sources."engine.io-parser-1.3.2"
       sources."ws-1.1.1"
-      sources."after-0.8.1"
+      sources."after-0.8.2"
       sources."arraybuffer.slice-0.0.6"
       sources."base64-arraybuffer-0.1.5"
       sources."blob-0.0.4"
@@ -26199,7 +25860,7 @@ in
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
-      (sources."engine.io-client-1.8.0" // {
+      (sources."engine.io-client-1.8.2" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -26220,13 +25881,13 @@ in
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-3.2.6" // {
         dependencies = [
-          sources."debug-2.3.3"
+          sources."debug-2.6.0"
         ];
       })
       (sources."bittorrent-tracker-2.12.1" // {
         dependencies = [
           sources."bencode-0.6.0"
-          sources."debug-2.3.3"
+          sources."debug-2.6.0"
         ];
       })
       sources."bncode-0.5.3"
@@ -26246,7 +25907,7 @@ in
       sources."buffer-equal-0.0.1"
       sources."is-ip-1.0.0"
       sources."k-bucket-0.5.0"
-      sources."network-address-1.1.0"
+      sources."network-address-1.1.2"
       sources."run-parallel-1.1.6"
       sources."simple-get-1.4.3"
       sources."string2compact-1.2.2"
@@ -26342,7 +26003,7 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."node-uuid-1.4.7"
       sources."qs-5.2.1"
       sources."tunnel-agent-0.4.3"
@@ -26357,11 +26018,11 @@ in
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
       sources."async-2.1.4"
-      sources."lodash-4.17.2"
-      sources."mime-db-1.25.0"
+      sources."lodash-4.17.4"
+      sources."mime-db-1.26.0"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26370,7 +26031,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26381,7 +26042,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -26398,11 +26059,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."throttleit-1.0.0"
@@ -26439,7 +26100,7 @@ in
       sources."mkdirp-0.5.1"
       sources."private-0.1.6"
       sources."q-1.4.1"
-      sources."recast-0.11.17"
+      sources."recast-0.11.20"
       sources."graceful-readlink-1.0.1"
       sources."acorn-3.3.0"
       sources."defined-1.0.0"
@@ -26453,8 +26114,8 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
-      sources."ast-types-0.9.2"
-      sources."esprima-3.1.1"
+      sources."ast-types-0.9.4"
+      sources."esprima-3.1.3"
       sources."source-map-0.5.6"
       sources."base62-0.1.1"
       sources."esprima-fb-13001.1001.0-dev-harmony-fb"
@@ -26518,7 +26179,7 @@ in
       sources."methods-0.1.0"
       sources."send-0.1.4"
       sources."cookie-signature-1.0.1"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       sources."qs-0.6.5"
       sources."bytes-0.2.1"
       sources."pause-0.0.1"
@@ -26564,12 +26225,12 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -26580,11 +26241,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -26594,7 +26255,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26603,7 +26264,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26614,11 +26275,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."events.node-0.4.9"
     ];
@@ -26654,13 +26315,15 @@ in
     dependencies = [
       sources."express-5.0.0-alpha.2"
       sources."express-json5-0.1.0"
-      (sources."body-parser-1.15.2" // {
+      (sources."body-parser-1.16.0" // {
         dependencies = [
           sources."bytes-2.4.0"
+          sources."debug-2.6.0"
           sources."depd-1.1.0"
-          sources."iconv-lite-0.4.13"
-          sources."qs-6.2.0"
-          sources."raw-body-2.1.7"
+          sources."iconv-lite-0.4.15"
+          sources."qs-6.2.1"
+          sources."raw-body-2.2.0"
+          sources."ms-0.7.2"
         ];
       })
       (sources."compression-1.6.2" // {
@@ -26693,7 +26356,7 @@ in
       sources."lunr-0.7.2"
       sources."render-readme-1.3.1"
       sources."jju-1.3.0"
-      sources."JSONStream-1.2.1"
+      sources."JSONStream-1.3.0"
       sources."mkdirp-0.5.1"
       sources."sinopia-htpasswd-0.4.5"
       (sources."http-errors-1.5.1" // {
@@ -26753,9 +26416,9 @@ in
       sources."type-is-1.6.14"
       sources."vary-1.0.1"
       sources."utils-merge-1.0.0"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."negotiator-0.5.3"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."ms-0.7.1"
       sources."unpipe-1.0.0"
       sources."ee-first-1.1.1"
@@ -26794,7 +26457,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
@@ -26805,10 +26468,10 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -26818,7 +26481,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26827,7 +26490,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26838,7 +26501,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -26848,8 +26511,8 @@ in
       sources."dtrace-provider-0.8.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
-      sources."moment-2.17.0"
-      sources."nan-2.4.0"
+      sources."moment-2.17.1"
+      sources."nan-2.5.0"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
       (sources."glob-6.0.4" // {
@@ -26873,7 +26536,7 @@ in
       sources."source-map-0.1.43"
       sources."amdefine-1.0.1"
       sources."markdown-it-4.4.0"
-      sources."sanitize-html-1.13.0"
+      sources."sanitize-html-1.14.1"
       sources."entities-1.1.1"
       sources."linkify-it-1.2.4"
       sources."mdurl-1.0.1"
@@ -26898,7 +26561,7 @@ in
       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."jsonparse-1.3.0"
       sources."through-2.3.8"
       sources."minimist-0.0.8"
     ];
@@ -27012,7 +26675,7 @@ in
       sources."backoff-2.5.0"
       sources."csv-0.4.6"
       sources."escape-regexp-component-1.0.2"
-      sources."formidable-1.0.17"
+      sources."formidable-1.1.1"
       sources."http-signature-0.11.0"
       sources."keep-alive-agent-0.0.1"
       sources."mime-1.3.4"
@@ -27031,7 +26694,7 @@ in
       sources."dtrace-provider-0.6.0"
       sources."precond-0.2.3"
       sources."csv-generate-0.0.6"
-      sources."csv-parse-1.1.7"
+      sources."csv-parse-1.1.10"
       sources."stream-transform-0.1.1"
       sources."csv-stringify-0.0.8"
       sources."asn1-0.1.11"
@@ -27039,7 +26702,7 @@ in
       sources."wrappy-1.0.2"
       sources."extsprintf-1.2.0"
       sources."core-util-is-1.0.2"
-      sources."nan-2.4.0"
+      sources."nan-2.5.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
       sources."mkdirp-0.5.1"
@@ -27059,7 +26722,7 @@ in
         dependencies = [
           sources."asn1-0.2.3"
           sources."assert-plus-0.2.0"
-          (sources."dashdash-1.14.0" // {
+          (sources."dashdash-1.14.1" // {
             dependencies = [
               sources."assert-plus-1.0.0"
             ];
@@ -27080,7 +26743,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
     ];
@@ -27102,7 +26765,7 @@ in
     dependencies = [
       sources."css-parse-1.7.0"
       sources."mkdirp-0.5.1"
-      sources."debug-2.3.3"
+      sources."debug-2.6.0"
       sources."sax-0.5.8"
       sources."glob-7.0.6"
       sources."source-map-0.1.43"
@@ -27149,7 +26812,7 @@ in
       sources."esprima-2.7.3"
       sources."sprintf-js-1.0.3"
       sources."minimist-0.0.8"
-      sources."clap-1.1.1"
+      sources."clap-1.1.2"
       sources."source-map-0.5.6"
       sources."chalk-1.1.3"
       sources."ansi-styles-2.2.1"
@@ -27157,7 +26820,7 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -27211,7 +26874,7 @@ in
         ];
       })
       sources."wrench-1.5.9"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       sources."keypress-0.2.1"
       sources."source-map-support-0.3.2"
       sources."source-map-0.1.32"
@@ -27243,7 +26906,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.0.2"
       sources."stringstream-0.0.5"
@@ -27266,11 +26929,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
@@ -27280,7 +26943,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27289,7 +26952,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27300,11 +26963,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."uglify-to-browserify-1.0.2"
       sources."yargs-3.10.0"
       sources."camelcase-1.2.1"
@@ -27319,7 +26982,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -27343,10 +27006,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.0.10";
+    version = "2.1.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz";
-      sha1 = "ccdd4ed86fd5550a407101a0814012e1b3fac3dd";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz";
+      sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -27359,10 +27022,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.7.4";
+    version = "2.7.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz";
-      sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
+      sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
     };
     dependencies = [
       sources."async-0.2.10"
@@ -27378,7 +27041,7 @@ 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."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -27394,53 +27057,46 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "0.10.3";
+    version = "1.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-0.10.3.tgz";
-      sha1 = "7d4635b9a359c8db06c313374544f27a3890f63c";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz";
+      sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418";
     };
     dependencies = [
-      sources."async-2.0.1"
-      sources."bluebird-3.3.5"
-      sources."blueimp-md5-2.3.1"
+      sources."async-2.1.4"
+      sources."bluebird-3.4.7"
+      sources."blueimp-md5-2.6.0"
       sources."body-parser-1.15.2"
-      sources."color-0.11.4"
+      sources."color-1.0.3"
       sources."cookie-parser-1.4.3"
       sources."crossroads-0.12.2"
-      sources."diff2html-1.2.0"
-      (sources."express-4.13.4" // {
-        dependencies = [
-          sources."cookie-0.1.5"
-          sources."qs-4.0.0"
-        ];
-      })
-      (sources."express-session-1.13.0" // {
-        dependencies = [
-          sources."cookie-0.2.3"
-        ];
-      })
+      sources."diff2html-2.0.12"
+      sources."express-4.14.0"
+      sources."express-session-1.14.2"
       sources."forever-monitor-1.1.0"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
+      sources."ignore-3.2.0"
       sources."keen.io-0.1.3"
       sources."knockout-3.4.1"
-      sources."lodash-4.12.0"
+      sources."lodash-4.17.4"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.13.0"
-      (sources."npm-3.9.6" // {
+      sources."moment-2.17.1"
+      (sources."npm-4.1.2" // {
         dependencies = [
-          sources."request-2.72.0"
+          sources."nopt-4.0.1"
+          sources."request-2.79.0"
           sources."combined-stream-1.0.5"
           sources."forever-agent-0.6.1"
-          sources."form-data-1.0.1"
+          sources."form-data-2.1.2"
           sources."hawk-3.1.3"
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.1.0"
+          sources."qs-6.3.0"
           sources."tunnel-agent-0.4.3"
           sources."delayed-stream-1.0.0"
           sources."hoek-2.16.3"
@@ -27449,10 +27105,9 @@ in
           sources."sntp-1.0.9"
         ];
       })
-      (sources."npm-registry-client-7.1.2" // {
+      (sources."npm-registry-client-7.4.5" // {
         dependencies = [
           sources."request-2.79.0"
-          sources."retry-0.8.0"
           sources."combined-stream-1.0.5"
           sources."forever-agent-0.6.1"
           sources."form-data-2.1.2"
@@ -27460,7 +27115,6 @@ in
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
           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"
@@ -27474,10 +27128,10 @@ in
       sources."os-homedir-1.0.2"
       sources."passport-0.3.2"
       sources."passport-local-1.0.0"
-      (sources."raven-0.11.0" // {
+      (sources."raven-1.1.1" // {
         dependencies = [
-          sources."cookie-0.1.0"
-          sources."stack-trace-0.0.7"
+          sources."json-stringify-safe-5.0.1"
+          sources."uuid-3.0.0"
         ];
       })
       (sources."rc-1.1.6" // {
@@ -27486,21 +27140,22 @@ in
         ];
       })
       sources."rimraf-2.5.4"
-      sources."semver-5.1.1"
-      (sources."serve-static-1.10.3" // {
-        dependencies = [
-          sources."send-0.13.2"
-          sources."http-errors-1.3.1"
-          sources."statuses-1.2.1"
-        ];
-      })
+      sources."semver-5.3.0"
+      sources."serve-static-1.11.1"
       sources."signals-1.0.0"
       sources."snapsvg-0.4.0"
-      sources."socket.io-1.4.8"
+      (sources."socket.io-1.7.2" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."object-assign-4.1.0"
+          sources."ms-0.7.2"
+        ];
+      })
       (sources."superagent-0.21.0" // {
         dependencies = [
           sources."qs-1.2.0"
           sources."mime-1.2.11"
+          sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."extend-1.2.1"
           sources."form-data-0.1.3"
@@ -27514,14 +27169,13 @@ in
           sources."rimraf-2.2.8"
         ];
       })
-      (sources."winston-2.2.0" // {
+      (sources."winston-2.3.1" // {
         dependencies = [
           sources."async-1.0.0"
           sources."colors-1.0.3"
-          sources."pkginfo-0.3.1"
         ];
       })
-      sources."yargs-4.7.1"
+      sources."yargs-6.6.0"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
       sources."debug-2.2.0"
@@ -27539,45 +27193,51 @@ in
       sources."ee-first-1.1.1"
       sources."unpipe-1.0.0"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.1.13"
-      sources."mime-db-1.25.0"
-      sources."clone-1.0.2"
-      sources."color-convert-1.8.2"
-      sources."color-string-0.3.0"
+      sources."mime-types-2.1.14"
+      sources."mime-db-1.26.0"
+      sources."color-convert-1.9.0"
+      sources."color-string-1.4.0"
       sources."color-name-1.1.1"
+      sources."simple-swizzle-0.2.2"
+      sources."is-arrayish-0.3.1"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."diff-2.2.3"
-      sources."accepts-1.2.13"
+      sources."diff-3.2.0"
+      (sources."hogan.js-3.0.2" // {
+        dependencies = [
+          sources."mkdirp-0.3.0"
+        ];
+      })
+      sources."whatwg-fetch-2.0.2"
+      sources."nopt-1.0.10"
+      sources."abbrev-1.0.9"
+      sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.1"
+      sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.7.0"
-      sources."finalhandler-0.4.1"
+      sources."finalhandler-0.5.0"
       sources."fresh-0.3.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."parseurl-1.3.1"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-1.0.10"
-      sources."range-parser-1.0.3"
-      (sources."send-0.13.1" // {
-        dependencies = [
-          sources."http-errors-1.3.1"
-          sources."statuses-1.2.1"
-        ];
-      })
+      sources."proxy-addr-1.1.3"
+      sources."range-parser-1.2.0"
+      sources."send-0.14.1"
       sources."utils-merge-1.0.0"
-      sources."vary-1.0.1"
-      sources."negotiator-0.5.3"
+      sources."vary-1.1.0"
+      sources."negotiator-0.6.1"
       sources."forwarded-0.1.0"
-      sources."ipaddr.js-1.0.5"
+      sources."ipaddr.js-1.2.0"
       sources."destroy-1.0.4"
       sources."mime-1.3.4"
-      sources."crc-3.4.0"
+      sources."crc-3.4.1"
       sources."on-headers-1.0.1"
-      sources."uid-safe-2.0.0"
-      sources."base64-url-1.2.1"
+      sources."uid-safe-2.1.3"
+      sources."base64-url-1.3.3"
+      sources."random-bytes-1.0.0"
       (sources."broadway-0.2.10" // {
         dependencies = [
           sources."winston-0.7.2"
@@ -27654,13 +27314,14 @@ in
       sources."extract-opts-3.3.1"
       sources."eachr-3.2.0"
       sources."editions-1.3.3"
-      sources."typechecker-4.4.0"
+      sources."typechecker-4.4.1"
       sources."underscore-1.5.2"
-      sources."abbrev-1.0.9"
+      sources."JSONStream-1.3.0"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."aproba-1.0.4"
       sources."archy-1.0.0"
+      sources."asap-2.0.5"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
@@ -27670,8 +27331,8 @@ in
       sources."fs-vacuum-1.2.9"
       sources."fs-write-stream-atomic-1.0.8"
       sources."fstream-1.0.10"
-      sources."fstream-npm-1.1.1"
-      (sources."glob-7.0.6" // {
+      sources."fstream-npm-1.2.0"
+      (sources."glob-7.1.1" // {
         dependencies = [
           sources."minimatch-3.0.3"
         ];
@@ -27687,34 +27348,29 @@ in
           sources."minimatch-3.0.3"
         ];
       })
-      sources."lockfile-1.0.2"
+      sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
-      sources."lodash.clonedeep-4.3.2"
-      sources."lodash.union-4.4.0"
-      sources."lodash.uniq-4.3.0"
-      sources."lodash.without-4.2.0"
-      (sources."node-gyp-3.3.1" // {
+      sources."lodash.clonedeep-4.5.0"
+      sources."lodash.union-4.6.0"
+      sources."lodash.uniq-4.5.0"
+      sources."lodash.without-4.4.0"
+      sources."mississippi-1.2.0"
+      (sources."node-gyp-3.5.0" // {
         dependencies = [
-          (sources."glob-4.5.3" // {
-            dependencies = [
-              sources."minimatch-2.0.10"
-            ];
-          })
-          sources."minimatch-1.0.0"
-          sources."lru-cache-2.7.3"
+          sources."minimatch-3.0.3"
+          sources."nopt-3.0.6"
         ];
       })
-      sources."nopt-3.0.6"
       sources."normalize-git-url-3.0.2"
       sources."normalize-package-data-2.3.5"
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
-      sources."npm-package-arg-4.1.1"
+      sources."npm-package-arg-4.2.0"
       sources."npm-user-validate-0.1.5"
-      sources."npmlog-2.0.4"
-      sources."once-1.3.3"
+      sources."npmlog-4.0.2"
+      sources."once-1.4.0"
       sources."opener-1.4.2"
-      sources."osenv-0.1.3"
+      sources."osenv-0.1.4"
       sources."path-is-inside-1.0.2"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
@@ -27726,23 +27382,31 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.1.5"
+      sources."readable-stream-2.2.2"
       sources."realize-package-specifier-3.0.3"
-      sources."retry-0.9.0"
+      sources."retry-0.10.1"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
       sources."sorted-object-2.0.1"
+      (sources."sorted-union-stream-2.1.3" // {
+        dependencies = [
+          sources."from2-1.3.0"
+          sources."readable-stream-1.1.14"
+          sources."isarray-0.0.1"
+        ];
+      })
       sources."strip-ansi-3.0.1"
       sources."tar-2.2.1"
       sources."text-table-0.2.0"
       sources."uid-number-0.0.6"
       sources."umask-1.1.0"
       sources."unique-filename-1.1.0"
+      sources."uuid-3.0.1"
       sources."validate-npm-package-name-2.2.2"
       sources."which-1.2.12"
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-1.1.4"
-      sources."ansi-regex-2.0.0"
+      sources."write-file-atomic-1.3.1"
+      sources."ansi-regex-2.1.1"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -27753,10 +27417,12 @@ in
       sources."lodash.restparam-3.6.1"
       sources."readdir-scoped-modules-1.0.2"
       sources."validate-npm-package-license-3.0.1"
+      sources."jsonparse-1.3.0"
+      sources."through-2.3.8"
       sources."wcwidth-1.0.1"
       sources."defaults-1.0.3"
+      sources."clone-1.0.2"
       sources."proto-list-1.2.4"
-      sources."asap-2.0.5"
       (sources."fstream-ignore-1.0.5" // {
         dependencies = [
           sources."minimatch-3.0.3"
@@ -27770,28 +27436,44 @@ in
       sources."promzard-0.3.0"
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
-      sources."lodash._baseclone-4.5.7"
-      sources."lodash._baseflatten-4.2.1"
-      sources."lodash.rest-4.0.5"
-      sources."lodash._basedifference-4.5.0"
-      sources."path-array-1.0.1"
-      sources."sigmund-1.0.1"
-      sources."array-index-1.0.0"
-      sources."es6-symbol-3.1.0"
-      sources."d-0.1.1"
-      sources."es5-ext-0.10.12"
-      sources."es6-iterator-2.0.0"
+      sources."concat-stream-1.6.0"
+      (sources."duplexify-3.5.0" // {
+        dependencies = [
+          sources."end-of-stream-1.0.0"
+          sources."once-1.3.3"
+        ];
+      })
+      (sources."end-of-stream-1.1.0" // {
+        dependencies = [
+          sources."once-1.3.3"
+        ];
+      })
+      sources."flush-write-stream-1.0.2"
+      sources."from2-2.3.0"
+      sources."pump-1.0.2"
+      sources."pumpify-1.3.5"
+      sources."stream-each-1.2.0"
+      sources."through2-2.0.3"
+      sources."typedarray-0.0.6"
+      sources."stream-shift-1.0.0"
+      sources."xtend-4.0.1"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
-      sources."ansi-0.3.1"
       sources."are-we-there-yet-1.1.2"
-      sources."gauge-1.2.7"
+      sources."console-control-strings-1.1.0"
+      sources."gauge-2.7.2"
+      sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."lodash.pad-4.5.1"
-      sources."lodash.padend-4.6.1"
-      sources."lodash.padstart-4.6.1"
+      sources."supports-color-0.2.0"
+      sources."object-assign-4.1.1"
+      sources."signal-exit-3.0.2"
+      sources."string-width-1.0.2"
+      sources."wide-align-1.1.0"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."number-is-nan-1.0.1"
       sources."os-tmpdir-1.0.2"
-      sources."mute-stream-0.0.6"
+      sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
       sources."json-parse-helpfulerror-1.0.3"
       sources."jju-1.3.0"
@@ -27803,11 +27485,6 @@ in
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
-      (sources."bl-1.1.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
       sources."caseless-0.11.0"
       sources."extend-3.0.0"
       sources."har-validator-2.0.6"
@@ -27815,25 +27492,28 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.2.2"
-      sources."chalk-1.1.3"
+      sources."tough-cookie-2.3.2"
+      sources."asynckit-0.4.0"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
-      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
-      sources."xtend-4.0.1"
+      sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27842,7 +27522,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27853,10 +27533,12 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
+      sources."punycode-1.4.1"
+      sources."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
       sources."builtins-0.0.7"
@@ -27864,48 +27546,16 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      (sources."concat-stream-1.5.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-        ];
-      })
-      sources."typedarray-0.0.6"
-      sources."uuid-3.0.0"
-      sources."asynckit-0.4.0"
-      sources."punycode-1.4.1"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
       sources."lsmod-1.0.0"
       sources."deep-extend-0.4.1"
       sources."strip-json-comments-1.0.4"
       sources."eve-0.4.2"
-      (sources."engine.io-1.6.11" // {
+      (sources."engine.io-1.8.2" // {
         dependencies = [
-          sources."accepts-1.1.4"
-          sources."mime-types-2.0.14"
-          sources."negotiator-0.4.9"
-          sources."mime-db-1.12.0"
-        ];
-      })
-      (sources."socket.io-parser-2.2.6" // {
-        dependencies = [
-          sources."isarray-0.0.1"
-        ];
-      })
-      (sources."socket.io-client-1.4.8" // {
-        dependencies = [
-          sources."component-emitter-1.2.0"
-        ];
-      })
-      (sources."socket.io-adapter-0.4.0" // {
-        dependencies = [
-          (sources."socket.io-parser-2.2.2" // {
-            dependencies = [
-              sources."debug-0.7.4"
-            ];
-          })
-          sources."json3-3.2.6"
-          sources."isarray-0.0.1"
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
       (sources."has-binary-0.1.7" // {
@@ -27913,78 +27563,87 @@ in
           sources."isarray-0.0.1"
         ];
       })
-      sources."base64id-0.1.0"
-      sources."ws-1.1.0"
-      (sources."engine.io-parser-1.2.4" // {
+      (sources."socket.io-adapter-0.5.0" // {
         dependencies = [
-          sources."has-binary-0.1.6"
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
+      (sources."socket.io-client-1.7.2" // {
+        dependencies = [
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
+        ];
+      })
+      (sources."socket.io-parser-2.3.1" // {
+        dependencies = [
+          sources."component-emitter-1.1.2"
           sources."isarray-0.0.1"
         ];
       })
+      sources."base64id-1.0.0"
+      sources."engine.io-parser-1.3.2"
+      sources."ws-1.1.1"
+      sources."after-0.8.2"
+      sources."arraybuffer.slice-0.0.6"
+      sources."base64-arraybuffer-0.1.5"
+      sources."blob-0.0.4"
+      sources."wtf-8-1.0.0"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
-      sources."after-0.8.1"
-      sources."arraybuffer.slice-0.0.6"
-      sources."base64-arraybuffer-0.1.2"
-      sources."blob-0.0.4"
-      sources."utf8-2.1.0"
-      sources."json3-3.3.2"
-      sources."component-emitter-1.1.2"
-      sources."benchmark-1.0.0"
-      (sources."engine.io-client-1.6.11" // {
+      sources."backo2-1.0.2"
+      sources."component-bind-1.0.0"
+      sources."component-emitter-1.2.1"
+      (sources."engine.io-client-1.8.2" // {
         dependencies = [
-          sources."ws-1.0.1"
+          sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
-      sources."component-bind-1.0.0"
-      sources."object-component-0.0.3"
       sources."indexof-0.0.1"
-      sources."parseuri-0.0.4"
+      sources."object-component-0.0.3"
+      sources."parseuri-0.0.5"
       sources."to-array-0.1.4"
-      sources."backo2-1.0.2"
-      sources."has-cors-1.1.0"
-      sources."xmlhttprequest-ssl-1.5.1"
-      sources."parsejson-0.0.1"
-      sources."parseqs-0.0.2"
       sources."component-inherit-0.0.3"
+      sources."has-cors-1.1.0"
+      sources."parsejson-0.0.3"
+      sources."parseqs-0.0.5"
+      sources."xmlhttprequest-ssl-1.5.3"
       sources."yeast-0.1.2"
       sources."better-assert-1.0.2"
       sources."callsite-1.0.0"
+      sources."json3-3.3.2"
       sources."formidable-1.0.14"
       sources."cookiejar-2.0.1"
       sources."reduce-component-1.0.1"
       sources."camelcase-3.0.0"
       sources."cliui-3.2.0"
       sources."decamelize-1.2.0"
-      sources."lodash.assign-4.2.0"
+      sources."get-caller-file-1.0.2"
       sources."os-locale-1.4.0"
-      sources."pkg-conf-1.1.3"
       sources."read-pkg-up-1.0.1"
+      sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."set-blocking-1.0.0"
-      sources."string-width-1.0.2"
-      sources."window-size-0.2.0"
+      sources."which-module-1.0.0"
       sources."y18n-3.2.1"
-      sources."yargs-parser-2.4.1"
-      sources."wrap-ansi-2.0.0"
+      sources."yargs-parser-4.2.1"
+      sources."wrap-ansi-2.1.0"
       sources."lcid-1.0.0"
       sources."invert-kv-1.0.0"
       sources."find-up-1.1.2"
-      sources."load-json-file-1.1.0"
-      sources."object-assign-4.1.0"
-      sources."symbol-0.2.3"
+      sources."read-pkg-1.1.0"
       sources."path-exists-2.1.0"
+      sources."load-json-file-1.1.0"
+      sources."path-type-1.1.0"
       sources."parse-json-2.2.0"
       sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
-      sources."error-ex-1.3.0"
-      sources."is-arrayish-0.2.1"
+      (sources."error-ex-1.3.0" // {
+        dependencies = [
+          sources."is-arrayish-0.2.1"
+        ];
+      })
       sources."is-utf8-0.2.1"
-      sources."read-pkg-1.1.0"
-      sources."path-type-1.1.0"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."number-is-nan-1.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -28073,7 +27732,7 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."node-uuid-1.4.7"
       sources."qs-5.2.1"
       sources."tunnel-agent-0.4.3"
@@ -28088,11 +27747,11 @@ in
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
       sources."async-2.1.4"
-      sources."lodash-4.17.2"
-      sources."mime-db-1.25.0"
+      sources."lodash-4.17.4"
+      sources."mime-db-1.26.0"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28101,7 +27760,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28112,7 +27771,7 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
@@ -28129,11 +27788,11 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."throttleit-1.0.0"
@@ -28152,12 +27811,13 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "1.13.3";
+    version = "1.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-1.13.3.tgz";
-      sha1 = "e79c46fe5a37c5ca70084ba0894c595cdcb42815";
+      url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz";
+      sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823";
     };
     dependencies = [
+      sources."acorn-3.3.0"
       sources."async-1.5.2"
       sources."clone-1.0.2"
       (sources."enhanced-resolve-0.9.1" // {
@@ -28165,21 +27825,15 @@ in
           sources."memory-fs-0.2.0"
         ];
       })
-      sources."acorn-3.3.0"
       sources."interpret-0.6.6"
       sources."loader-utils-0.2.16"
       sources."memory-fs-0.3.0"
       sources."mkdirp-0.5.1"
-      (sources."node-libs-browser-0.6.0" // {
-        dependencies = [
-          sources."readable-stream-1.1.14"
-          sources."isarray-0.0.1"
-        ];
-      })
+      sources."node-libs-browser-0.7.0"
       sources."optimist-0.6.1"
-      sources."supports-color-3.1.2"
+      sources."supports-color-3.2.3"
       sources."tapable-0.1.10"
-      (sources."uglify-js-2.7.4" // {
+      (sources."uglify-js-2.7.5" // {
         dependencies = [
           sources."async-0.2.10"
         ];
@@ -28189,7 +27843,7 @@ in
           sources."async-0.9.2"
         ];
       })
-      (sources."webpack-core-0.6.8" // {
+      (sources."webpack-core-0.6.9" // {
         dependencies = [
           sources."source-map-0.4.4"
         ];
@@ -28197,8 +27851,8 @@ in
       sources."graceful-fs-4.1.11"
       sources."big.js-3.1.3"
       sources."emojis-list-2.1.0"
-      sources."json5-0.5.0"
-      sources."object-assign-4.1.0"
+      sources."json5-0.5.1"
+      sources."object-assign-4.1.1"
       sources."errno-0.1.4"
       sources."readable-stream-2.2.2"
       sources."prr-0.0.0"
@@ -28214,26 +27868,21 @@ in
       sources."browserify-zlib-0.1.4"
       sources."buffer-4.9.1"
       sources."console-browserify-1.1.0"
-      sources."constants-browserify-0.0.1"
-      sources."crypto-browserify-3.2.8"
+      sources."constants-browserify-1.0.0"
+      sources."crypto-browserify-3.3.0"
       sources."domain-browser-1.1.7"
       sources."events-1.1.1"
-      sources."http-browserify-1.7.0"
-      sources."https-browserify-0.0.0"
-      sources."os-browserify-0.1.2"
+      sources."https-browserify-0.0.1"
+      sources."os-browserify-0.2.1"
       sources."path-browserify-0.0.0"
       sources."process-0.11.9"
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
-      (sources."stream-browserify-1.0.0" // {
-        dependencies = [
-          sources."readable-stream-1.1.14"
-          sources."isarray-0.0.1"
-        ];
-      })
-      sources."timers-browserify-1.4.2"
+      sources."stream-browserify-2.0.1"
+      sources."stream-http-2.6.3"
+      sources."timers-browserify-2.0.2"
       sources."tty-browserify-0.0.0"
-      (sources."url-0.10.3" // {
+      (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
         ];
@@ -28251,7 +27900,11 @@ in
       sources."pbkdf2-compat-2.0.1"
       sources."ripemd160-0.2.0"
       sources."sha.js-2.2.6"
-      sources."Base64-0.2.1"
+      sources."browserify-aes-0.4.0"
+      sources."builtin-status-codes-3.0.0"
+      sources."to-arraybuffer-1.0.1"
+      sources."xtend-4.0.1"
+      sources."setimmediate-1.0.5"
       sources."querystring-0.2.0"
       sources."indexof-0.0.1"
       sources."wordwrap-0.0.3"
@@ -28271,7 +27924,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.0.4"
+      sources."kind-of-3.1.0"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.4"
@@ -28283,7 +27936,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.15"
+      sources."fsevents-1.0.17"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -28304,7 +27957,7 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.5"
+      sources."randomatic-1.1.6"
       sources."is-posix-bracket-0.1.1"
       sources."for-own-0.1.4"
       sources."is-extendable-0.1.1"
@@ -28313,16 +27966,16 @@ in
       sources."is-dotfile-1.0.2"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
-      sources."binary-extensions-1.7.0"
+      sources."binary-extensions-1.8.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.31"
+      sources."nan-2.5.0"
+      sources."node-pre-gyp-0.6.32"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.1"
+      sources."npmlog-4.0.2"
       (sources."rc-1.1.6" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -28341,20 +27994,23 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.1"
+      (sources."gauge-2.7.2" // {
+        dependencies = [
+          sources."supports-color-0.2.0"
+        ];
+      })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."wide-align-1.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
@@ -28371,13 +28027,13 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       (sources."chalk-1.1.3" // {
@@ -28394,8 +28050,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."jsonpointer-4.0.0"
-      sources."xtend-4.0.1"
+      sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
       sources."pinkie-2.0.4"
       sources."hoek-2.16.3"
@@ -28404,7 +28059,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28413,7 +28068,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28424,11 +28079,11 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -28440,7 +28095,7 @@ in
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
       sources."ms-0.7.1"
-      sources."source-list-map-0.1.6"
+      sources."source-list-map-0.1.8"
       sources."amdefine-1.0.1"
     ];
     buildInputs = globalBuildInputs;
@@ -28470,20 +28125,20 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "0.17.8";
+    version = "0.19.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-0.17.8.tgz";
-      sha1 = "6a95d19aaeb891810618937db98a2080683cbbb4";
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.19.1.tgz";
+      sha1 = "102ca03ce7fc910a73f719c70bba9e9f9e3b2b4d";
     };
     dependencies = [
-      sources."babel-runtime-6.18.0"
+      sources."babel-runtime-6.22.0"
       sources."bytes-2.4.0"
       sources."camelcase-3.0.0"
       sources."chalk-1.1.3"
       sources."cmd-shim-2.0.2"
       sources."commander-2.9.0"
-      sources."death-1.0.0"
-      sources."debug-2.3.3"
+      sources."death-1.1.0"
+      sources."debug-2.6.0"
       sources."defaults-1.0.3"
       sources."detect-indent-4.0.0"
       sources."diff-2.2.3"
@@ -28496,10 +28151,10 @@ in
       sources."loud-rejection-1.6.0"
       sources."minimatch-3.0.3"
       sources."mkdirp-0.5.1"
-      sources."node-emoji-1.4.1"
-      sources."node-gyp-3.4.0"
+      sources."node-emoji-1.5.1"
+      sources."node-gyp-3.5.0"
       sources."object-path-0.11.3"
-      sources."proper-lockfile-1.2.0"
+      sources."proper-lockfile-2.0.0"
       sources."read-1.0.7"
       sources."repeating-2.0.1"
       sources."request-2.79.0"
@@ -28513,13 +28168,13 @@ in
       sources."user-home-2.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."core-js-2.4.1"
-      sources."regenerator-runtime-0.9.6"
+      sources."regenerator-runtime-0.10.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."ansi-regex-2.0.0"
+      sources."ansi-regex-2.1.1"
       sources."graceful-fs-4.1.11"
       sources."graceful-readlink-1.0.1"
       sources."ms-0.7.2"
@@ -28529,10 +28184,10 @@ in
       sources."cli-width-2.1.0"
       sources."external-editor-1.1.1"
       sources."figures-1.7.0"
-      sources."lodash-4.17.2"
+      sources."lodash-4.17.4"
       sources."mute-stream-0.0.6"
       sources."pinkie-promise-2.0.1"
-      sources."run-async-2.2.0"
+      sources."run-async-2.3.0"
       sources."rx-4.1.0"
       sources."string-width-1.0.2"
       sources."through-2.3.8"
@@ -28542,29 +28197,30 @@ in
       sources."extend-3.0.0"
       sources."spawn-sync-1.0.15"
       sources."tmp-0.0.29"
-      sources."concat-stream-1.5.2"
+      sources."concat-stream-1.6.0"
       sources."os-shim-0.1.3"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.0.6"
+      sources."readable-stream-2.2.2"
+      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."os-tmpdir-1.0.2"
-      sources."object-assign-4.1.0"
+      sources."object-assign-4.1.1"
       sources."pinkie-2.0.4"
       sources."is-promise-2.1.0"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."loose-envify-1.3.0"
-      sources."js-tokens-2.0.0"
+      sources."loose-envify-1.3.1"
+      sources."js-tokens-3.0.0"
       sources."builtin-modules-1.1.1"
       sources."ci-info-1.0.0"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.1"
+      sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
@@ -28574,9 +28230,8 @@ in
       sources."fstream-1.0.10"
       sources."glob-7.1.1"
       sources."nopt-3.0.6"
-      sources."npmlog-3.1.2"
-      sources."osenv-0.1.3"
-      sources."path-array-1.0.1"
+      sources."npmlog-4.0.2"
+      sources."osenv-0.1.4"
       sources."which-1.2.12"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -28586,22 +28241,19 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.6.0"
+      (sources."gauge-2.7.2" // {
+        dependencies = [
+          sources."supports-color-0.2.0"
+        ];
+      })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."aproba-1.0.4"
-      sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."wide-align-1.1.0"
       sources."os-homedir-1.0.2"
-      sources."array-index-1.0.0"
-      sources."es6-symbol-3.1.0"
-      sources."d-0.1.1"
-      sources."es5-ext-0.10.12"
-      sources."es6-iterator-2.0.0"
       sources."isexe-1.1.2"
-      sources."err-code-1.1.1"
-      sources."retry-0.10.0"
+      sources."retry-0.10.1"
       sources."is-finite-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.5.0"
@@ -28615,19 +28267,19 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.13"
+      sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
       sources."qs-6.3.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
-      sources."uuid-3.0.0"
+      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.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-4.0.0"
+      sources."jsonpointer-4.0.1"
       sources."xtend-4.0.1"
       sources."is-property-1.0.2"
       sources."hoek-2.16.3"
@@ -28636,7 +28288,7 @@ in
       sources."sntp-1.0.9"
       sources."assert-plus-0.2.0"
       sources."jsprim-1.3.1"
-      (sources."sshpk-1.10.1" // {
+      (sources."sshpk-1.10.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28645,7 +28297,7 @@ in
       sources."json-schema-0.2.3"
       sources."verror-1.3.6"
       sources."asn1-0.2.3"
-      (sources."dashdash-1.14.0" // {
+      (sources."dashdash-1.14.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28656,15 +28308,15 @@ in
         ];
       })
       sources."jsbn-0.1.0"
-      sources."tweetnacl-0.14.3"
+      sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.0"
-      sources."mime-db-1.25.0"
+      sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
       sources."is-utf8-0.2.1"
       sources."block-stream-0.0.9"
-      sources."bl-1.1.2"
+      sources."bl-1.2.0"
       (sources."end-of-stream-1.1.0" // {
         dependencies = [
           sources."once-1.3.3"
diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix
index f6b9f901ec8..7e8a3160b31 100644
--- a/pkgs/development/web/remarkjs/node-packages.nix
+++ b/pkgs/development/web/remarkjs/node-packages.nix
@@ -1,34 +1,34 @@
-# This file has been generated by node2nix 1.0.1. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "JSONStream-1.1.4" = {
+    "JSONStream-1.3.0" = {
       name = "JSONStream";
       packageName = "JSONStream";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz";
-        sha1 = "be11a495938e882d277773d11986f3974a8ba37a";
-      };
-    };
-    "assert-1.3.0" = {
-      name = "assert";
-      packageName = "assert";
       version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
-        sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz";
+        sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5";
       };
     };
-    "browser-pack-6.0.1" = {
+    "assert-1.4.1" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
+        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
+      };
+    };
+    "browser-pack-6.0.2" = {
       name = "browser-pack";
       packageName = "browser-pack";
-      version = "6.0.1";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.1.tgz";
-        sha1 = "779887c792eaa1f64a46a22c8f1051cdcd96755f";
+        url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz";
+        sha1 = "f86cd6cef4f5300c8e63e07a4d512f65fbff4531";
       };
     };
     "browser-resolve-1.11.2" = {
@@ -58,6 +58,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";
@@ -139,13 +148,13 @@ let
         sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
       };
     };
-    "glob-5.0.15" = {
+    "glob-7.1.1" = {
       name = "glob";
       packageName = "glob";
-      version = "5.0.15";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
-        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz";
+        sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8";
       };
     };
     "has-1.0.1" = {
@@ -175,13 +184,13 @@ let
         sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82";
       };
     };
-    "inherits-2.0.1" = {
+    "inherits-2.0.3" = {
       name = "inherits";
       packageName = "inherits";
-      version = "2.0.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
-        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
       };
     };
     "insert-module-globals-7.0.1" = {
@@ -202,13 +211,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" = {
@@ -274,22 +283,22 @@ let
         sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0";
       };
     };
-    "readable-stream-2.1.5" = {
+    "readable-stream-2.2.2" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.1.5";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz";
-        sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
+        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
       };
     };
-    "resolve-1.1.7" = {
+    "resolve-1.2.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.1.7";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
-        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz";
+        sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c";
       };
     };
     "shasum-1.0.2" = {
@@ -319,13 +328,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.3.1" = {
+    "stream-http-2.6.3" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.3.1";
+      version = "2.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.3.1.tgz";
-        sha1 = "7e1dc87102c3e31b32e660f04ca31f23ddbd1d52";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz";
+        sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3";
       };
     };
     "string_decoder-0.10.31" = {
@@ -355,13 +364,13 @@ let
         sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710";
       };
     };
-    "through2-2.0.1" = {
+    "through2-2.0.3" = {
       name = "through2";
       packageName = "through2";
-      version = "2.0.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz";
-        sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9";
+        url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz";
+        sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be";
       };
     };
     "timers-browserify-1.4.2" = {
@@ -418,13 +427,13 @@ let
         sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
       };
     };
-    "jsonparse-1.2.0" = {
+    "jsonparse-1.3.0" = {
       name = "jsonparse";
       packageName = "jsonparse";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz";
-        sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd";
+        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.0.tgz";
+        sha1 = "85fc245b1d9259acc6941960b905adf64e7de0e8";
       };
     };
     "through-2.3.8" = {
@@ -490,6 +499,15 @@ let
         sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
       };
     };
+    "resolve-1.1.7" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+      };
+    };
     "pako-0.2.9" = {
       name = "pako";
       packageName = "pako";
@@ -499,22 +517,22 @@ let
         sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75";
       };
     };
-    "base64-js-1.1.2" = {
+    "base64-js-1.2.0" = {
       name = "base64-js";
       packageName = "base64-js";
-      version = "1.1.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz";
-        sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz";
+        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";
       };
     };
     "isarray-1.0.0" = {
@@ -634,13 +652,13 @@ let
         sha1 = "b5835739270cfe26acf632099fded2a07f209e5e";
       };
     };
-    "pbkdf2-3.0.4" = {
+    "pbkdf2-3.0.9" = {
       name = "pbkdf2";
       packageName = "pbkdf2";
-      version = "3.0.4";
+      version = "3.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz";
-        sha1 = "12c8bfaf920543786a85150b03f68d5f1aa982fc";
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.9.tgz";
+        sha1 = "f2c4b25a600058b3c3773c086c37dbbee1ffe693";
       };
     };
     "public-encrypt-4.0.0" = {
@@ -697,13 +715,13 @@ let
         sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9";
       };
     };
-    "cipher-base-1.0.2" = {
+    "cipher-base-1.0.3" = {
       name = "cipher-base";
       packageName = "cipher-base";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz";
-        sha1 = "54ac1d1ebdf6a1bcd3559e6f369d72697f2cab8f";
+        url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz";
+        sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07";
       };
     };
     "des.js-1.0.0" = {
@@ -742,13 +760,13 @@ let
         sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
       };
     };
-    "elliptic-6.3.1" = {
+    "elliptic-6.3.2" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.3.1";
+      version = "6.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.1.tgz";
-        sha1 = "17781f2109ab0ec686b146bdcff5d2e8c6aeceda";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz";
+        sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48";
       };
     };
     "parse-asn1-5.0.0" = {
@@ -760,13 +778,13 @@ let
         sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23";
       };
     };
-    "brorand-1.0.5" = {
+    "brorand-1.0.6" = {
       name = "brorand";
       packageName = "brorand";
-      version = "1.0.5";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz";
-        sha1 = "07b54ca30286abd1718a0e2a830803efdc9bfa04";
+        url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz";
+        sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5";
       };
     };
     "hash.js-1.0.3" = {
@@ -778,13 +796,13 @@ let
         sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
       };
     };
-    "asn1.js-4.8.0" = {
+    "asn1.js-4.9.1" = {
       name = "asn1.js";
       packageName = "asn1.js";
-      version = "4.8.0";
+      version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.0.tgz";
-        sha1 = "e0e04e9923319163be46aed9e5378973b161ef13";
+        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz";
+        sha1 = "48ba240b45a9280e94748990ba597d216617fd40";
       };
     };
     "ripemd160-1.0.1" = {
@@ -796,13 +814,13 @@ let
         sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e";
       };
     };
-    "sha.js-2.4.5" = {
+    "sha.js-2.4.8" = {
       name = "sha.js";
       packageName = "sha.js";
-      version = "2.4.5";
+      version = "2.4.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz";
-        sha1 = "27d171efcc82a118b99639ff581660242b506e7c";
+        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz";
+        sha1 = "37068c2c476b6baf402d14a49c67f597921f634f";
       };
     };
     "miller-rabin-4.0.0" = {
@@ -814,13 +832,22 @@ let
         sha1 = "4a62fb1d42933c05583982f4c716f6fb9e6c6d3d";
       };
     };
-    "inflight-1.0.5" = {
+    "fs.realpath-1.0.0" = {
+      name = "fs.realpath";
+      packageName = "fs.realpath";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+      };
+    };
+    "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" = {
@@ -832,22 +859,22 @@ let
         sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774";
       };
     };
-    "once-1.3.3" = {
+    "once-1.4.0" = {
       name = "once";
       packageName = "once";
-      version = "1.3.3";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz";
-        sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
+        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
-    "path-is-absolute-1.0.0" = {
+    "path-is-absolute-1.0.1" = {
       name = "path-is-absolute";
       packageName = "path-is-absolute";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz";
-        sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912";
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
       };
     };
     "wrappy-1.0.2" = {
@@ -949,13 +976,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" = {
@@ -967,6 +994,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";
@@ -1030,13 +1066,13 @@ let
         sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
       };
     };
-    "builtin-status-codes-2.0.0" = {
+    "builtin-status-codes-3.0.0" = {
       name = "builtin-status-codes";
       packageName = "builtin-status-codes";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz";
-        sha1 = "6f22003baacf003ccd287afe6872151fddc58579";
+        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
+        sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
       };
     };
     "to-arraybuffer-1.0.1" = {
@@ -1084,6 +1120,15 @@ let
         sha1 = "b209849203bb25df820da756e747005878521620";
       };
     };
+    "inherits-2.0.1" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+      };
+    };
     "indexof-0.0.1" = {
       name = "indexof";
       packageName = "indexof";
@@ -1201,13 +1246,13 @@ let
         sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
       };
     };
-    "kind-of-3.0.4" = {
+    "kind-of-3.1.0" = {
       name = "kind-of";
       packageName = "kind-of";
-      version = "3.0.4";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz";
-        sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74";
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz";
+        sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47";
       };
     };
     "longest-1.0.1" = {
@@ -1219,13 +1264,13 @@ let
         sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
       };
     };
-    "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";
       };
     };
     "errno-0.1.4" = {
@@ -1237,22 +1282,22 @@ let
         sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d";
       };
     };
-    "graceful-fs-4.1.6" = {
+    "graceful-fs-4.1.11" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.1.6";
+      version = "4.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz";
-        sha1 = "514c38772b31bee2e08bedc21a0aeb3abf54c19e";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
+        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
       };
     };
-    "image-size-0.5.0" = {
+    "image-size-0.5.1" = {
       name = "image-size";
       packageName = "image-size";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/image-size/-/image-size-0.5.0.tgz";
-        sha1 = "be7aed1c37b5ac3d9ba1d66a24b4c47ff8397651";
+        url = "https://registry.npmjs.org/image-size/-/image-size-0.5.1.tgz";
+        sha1 = "28eea8548a4b1443480ddddc1e083ae54652439f";
       };
     };
     "mime-1.3.4" = {
@@ -1282,6 +1327,15 @@ let
         sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf";
       };
     };
+    "request-2.79.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.79.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
+        sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
+      };
+    };
     "prr-0.0.0" = {
       name = "prr";
       packageName = "prr";
@@ -1300,22 +1354,220 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "asap-2.0.4" = {
+    "asap-2.0.5" = {
       name = "asap";
       packageName = "asap";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asap/-/asap-2.0.4.tgz";
-        sha1 = "b391bf7f6bfbc65706022fec8f49c4b07fecf589";
+        url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz";
+        sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
       };
     };
-    "browser-stdout-1.3.0" = {
-      name = "browser-stdout";
-      packageName = "browser-stdout";
-      version = "1.3.0";
+    "aws-sign2-0.6.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz";
-        sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f";
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
+        sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
+      };
+    };
+    "aws4-1.5.0" = {
+      name = "aws4";
+      packageName = "aws4";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz";
+        sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755";
+      };
+    };
+    "caseless-0.11.0" = {
+      name = "caseless";
+      packageName = "caseless";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
+        sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
+      };
+    };
+    "combined-stream-1.0.5" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
+        sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
+      };
+    };
+    "extend-3.0.0" = {
+      name = "extend";
+      packageName = "extend";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
+        sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4";
+      };
+    };
+    "forever-agent-0.6.1" = {
+      name = "forever-agent";
+      packageName = "forever-agent";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+      };
+    };
+    "form-data-2.1.2" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz";
+        sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
+      };
+    };
+    "har-validator-2.0.6" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
+        sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
+      };
+    };
+    "hawk-3.1.3" = {
+      name = "hawk";
+      packageName = "hawk";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
+      };
+    };
+    "http-signature-1.1.1" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
+        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
+      };
+    };
+    "is-typedarray-1.0.0" = {
+      name = "is-typedarray";
+      packageName = "is-typedarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
+        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+      };
+    };
+    "isstream-0.1.2" = {
+      name = "isstream";
+      packageName = "isstream";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+      };
+    };
+    "json-stringify-safe-5.0.1" = {
+      name = "json-stringify-safe";
+      packageName = "json-stringify-safe";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+      };
+    };
+    "mime-types-2.1.14" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "2.1.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
+        sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
+      };
+    };
+    "oauth-sign-0.8.2" = {
+      name = "oauth-sign";
+      packageName = "oauth-sign";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
+        sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
+      };
+    };
+    "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";
+      };
+    };
+    "stringstream-0.0.5" = {
+      name = "stringstream";
+      packageName = "stringstream";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
+        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
+      };
+    };
+    "tough-cookie-2.3.2" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz";
+        sha1 = "f081f76e4c85720e6c37a5faced737150d84072a";
+      };
+    };
+    "tunnel-agent-0.4.3" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz";
+        sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
+      };
+    };
+    "uuid-3.0.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
+        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
+      };
+    };
+    "delayed-stream-1.0.0" = {
+      name = "delayed-stream";
+      packageName = "delayed-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+    };
+    "asynckit-0.4.0" = {
+      name = "asynckit";
+      packageName = "asynckit";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+      };
+    };
+    "chalk-1.1.3" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
       };
     };
     "commander-2.9.0" = {
@@ -1327,6 +1579,321 @@ let
         sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
       };
     };
+    "is-my-json-valid-2.15.0" = {
+      name = "is-my-json-valid";
+      packageName = "is-my-json-valid";
+      version = "2.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz";
+        sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b";
+      };
+    };
+    "pinkie-promise-2.0.1" = {
+      name = "pinkie-promise";
+      packageName = "pinkie-promise";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+      };
+    };
+    "ansi-styles-2.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+      };
+    };
+    "escape-string-regexp-1.0.5" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+      };
+    };
+    "has-ansi-2.0.0" = {
+      name = "has-ansi";
+      packageName = "has-ansi";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+      };
+    };
+    "strip-ansi-3.0.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+      };
+    };
+    "supports-color-2.0.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+      };
+    };
+    "ansi-regex-2.1.1" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+      };
+    };
+    "graceful-readlink-1.0.1" = {
+      name = "graceful-readlink";
+      packageName = "graceful-readlink";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+      };
+    };
+    "generate-function-2.0.0" = {
+      name = "generate-function";
+      packageName = "generate-function";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+        sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
+      };
+    };
+    "generate-object-property-1.2.0" = {
+      name = "generate-object-property";
+      packageName = "generate-object-property";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
+        sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
+      };
+    };
+    "jsonpointer-4.0.1" = {
+      name = "jsonpointer";
+      packageName = "jsonpointer";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
+        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
+      };
+    };
+    "is-property-1.0.2" = {
+      name = "is-property";
+      packageName = "is-property";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+        sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
+      };
+    };
+    "pinkie-2.0.4" = {
+      name = "pinkie";
+      packageName = "pinkie";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+      };
+    };
+    "hoek-2.16.3" = {
+      name = "hoek";
+      packageName = "hoek";
+      version = "2.16.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
+        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
+      };
+    };
+    "boom-2.10.1" = {
+      name = "boom";
+      packageName = "boom";
+      version = "2.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
+      };
+    };
+    "cryptiles-2.0.5" = {
+      name = "cryptiles";
+      packageName = "cryptiles";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
+      };
+    };
+    "sntp-1.0.9" = {
+      name = "sntp";
+      packageName = "sntp";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
+      };
+    };
+    "assert-plus-0.2.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
+      };
+    };
+    "jsprim-1.3.1" = {
+      name = "jsprim";
+      packageName = "jsprim";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz";
+        sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252";
+      };
+    };
+    "sshpk-1.10.2" = {
+      name = "sshpk";
+      packageName = "sshpk";
+      version = "1.10.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz";
+        sha1 = "d5a804ce22695515638e798dbe23273de070a5fa";
+      };
+    };
+    "extsprintf-1.0.2" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
+        sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
+      };
+    };
+    "json-schema-0.2.3" = {
+      name = "json-schema";
+      packageName = "json-schema";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
+        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
+      };
+    };
+    "verror-1.3.6" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
+        sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
+      };
+    };
+    "asn1-0.2.3" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
+        sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
+      };
+    };
+    "assert-plus-1.0.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+      };
+    };
+    "dashdash-1.14.1" = {
+      name = "dashdash";
+      packageName = "dashdash";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+      };
+    };
+    "getpass-0.1.6" = {
+      name = "getpass";
+      packageName = "getpass";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz";
+        sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6";
+      };
+    };
+    "jsbn-0.1.0" = {
+      name = "jsbn";
+      packageName = "jsbn";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz";
+        sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
+      };
+    };
+    "tweetnacl-0.14.5" = {
+      name = "tweetnacl";
+      packageName = "tweetnacl";
+      version = "0.14.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+      };
+    };
+    "jodid25519-1.0.2" = {
+      name = "jodid25519";
+      packageName = "jodid25519";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz";
+        sha1 = "06d4912255093419477d425633606e0e90782967";
+      };
+    };
+    "ecc-jsbn-0.1.1" = {
+      name = "ecc-jsbn";
+      packageName = "ecc-jsbn";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
+        sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
+      };
+    };
+    "bcrypt-pbkdf-1.0.0" = {
+      name = "bcrypt-pbkdf";
+      packageName = "bcrypt-pbkdf";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz";
+        sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
+      };
+    };
+    "mime-db-1.26.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
+        sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
+      };
+    };
+    "browser-stdout-1.3.0" = {
+      name = "browser-stdout";
+      packageName = "browser-stdout";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz";
+        sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f";
+      };
+    };
     "debug-2.2.0" = {
       name = "debug";
       packageName = "debug";
@@ -1345,15 +1912,6 @@ let
         sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
       };
     };
-    "escape-string-regexp-1.0.5" = {
-      name = "escape-string-regexp";
-      packageName = "escape-string-regexp";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
-      };
-    };
     "glob-7.0.5" = {
       name = "glob";
       packageName = "glob";
@@ -1399,15 +1957,6 @@ let
         sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5";
       };
     };
-    "graceful-readlink-1.0.1" = {
-      name = "graceful-readlink";
-      packageName = "graceful-readlink";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
-        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
-      };
-    };
     "ms-0.7.1" = {
       name = "ms";
       packageName = "ms";
@@ -1417,15 +1966,6 @@ let
         sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
       };
     };
-    "fs.realpath-1.0.0" = {
-      name = "fs.realpath";
-      packageName = "fs.realpath";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
-        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
-      };
-    };
     "lodash._baseassign-3.2.0" = {
       name = "lodash._baseassign";
       packageName = "lodash._baseassign";
@@ -1615,13 +2155,13 @@ let
         sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
       };
     };
-    "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";
       };
     };
     "inherits-1.0.2" = {
@@ -1714,15 +2254,6 @@ let
         sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
       };
     };
-    "json-stringify-safe-5.0.1" = {
-      name = "json-stringify-safe";
-      packageName = "json-stringify-safe";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
-        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
-      };
-    };
     "mime-1.2.11" = {
       name = "mime";
       packageName = "mime";
@@ -1750,15 +2281,6 @@ let
         sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
       };
     };
-    "tough-cookie-2.3.1" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz";
-        sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd";
-      };
-    };
     "form-data-0.1.4" = {
       name = "form-data";
       packageName = "form-data";
@@ -1768,15 +2290,6 @@ let
         sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
       };
     };
-    "tunnel-agent-0.4.3" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz";
-        sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
-      };
-    };
     "http-signature-0.10.1" = {
       name = "http-signature";
       packageName = "http-signature";
@@ -1921,13 +2434,13 @@ let
         sha1 = "0b6e9516f2601a9fb0bb2dcc369afa1c7e200af7";
       };
     };
-    "should-format-3.0.1" = {
+    "should-format-3.0.2" = {
       name = "should-format";
       packageName = "should-format";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/should-format/-/should-format-3.0.1.tgz";
-        sha1 = "3249b719c0921b4d7b26d347d1b0cc6e232ad324";
+        url = "https://registry.npmjs.org/should-format/-/should-format-3.0.2.tgz";
+        sha1 = "1a543ad3abfea5dc2bea4a0ba875ede60fe22b19";
       };
     };
     "should-type-1.4.0" = {
@@ -1939,13 +2452,13 @@ let
         sha1 = "0756d8ce846dfd09843a6947719dfa0d4cff5cf3";
       };
     };
-    "should-type-adaptors-1.0.0" = {
+    "should-type-adaptors-1.0.1" = {
       name = "should-type-adaptors";
       packageName = "should-type-adaptors";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.0.0.tgz";
-        sha1 = "034b2843b8c151bb7b66e6350eba00543e797500";
+        url = "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.0.1.tgz";
+        sha1 = "efe5553cdf68cff66e5c5f51b712dc351c77beaa";
       };
     };
     "should-util-1.0.0" = {
@@ -1984,13 +2497,13 @@ let
         sha1 = "bec11fdc83a9fda063401210e40176c3024d1567";
       };
     };
-    "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";
       };
     };
     "exit-0.1.2" = {
@@ -2038,15 +2551,6 @@ let
         sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45";
       };
     };
-    "glob-7.0.6" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz";
-        sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
-      };
-    };
     "domhandler-2.3.0" = {
       name = "domhandler";
       packageName = "domhandler";
@@ -2148,6 +2652,7 @@ in
       url = "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz";
       sha1 = "b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7";
     };
+    buildInputs = globalBuildInputs;
     meta = {
       description = "A markdown parser built for speed";
       homepage = https://github.com/chjj/marked;
@@ -2158,20 +2663,20 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "13.1.0";
+    version = "13.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz";
-      sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae";
+      url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
+      sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
     };
     dependencies = [
-      (sources."JSONStream-1.1.4" // {
+      (sources."JSONStream-1.3.0" // {
         dependencies = [
-          sources."jsonparse-1.2.0"
+          sources."jsonparse-1.3.0"
           sources."through-2.3.8"
         ];
       })
-      sources."assert-1.3.0"
-      (sources."browser-pack-6.0.1" // {
+      sources."assert-1.4.1"
+      (sources."browser-pack-6.0.2" // {
         dependencies = [
           (sources."combine-source-map-0.7.2" // {
             dependencies = [
@@ -2184,7 +2689,11 @@ in
           sources."umd-3.0.1"
         ];
       })
-      sources."browser-resolve-1.11.2"
+      (sources."browser-resolve-1.11.2" // {
+        dependencies = [
+          sources."resolve-1.1.7"
+        ];
+      })
       (sources."browserify-zlib-0.1.4" // {
         dependencies = [
           sources."pako-0.2.9"
@@ -2192,11 +2701,12 @@ in
       })
       (sources."buffer-4.9.1" // {
         dependencies = [
-          sources."base64-js-1.1.2"
-          sources."ieee754-1.1.6"
+          sources."base64-js-1.2.0"
+          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"
@@ -2223,12 +2733,12 @@ in
               (sources."browserify-aes-1.0.6" // {
                 dependencies = [
                   sources."buffer-xor-1.0.3"
-                  sources."cipher-base-1.0.2"
+                  sources."cipher-base-1.0.3"
                 ];
               })
               (sources."browserify-des-1.0.0" // {
                 dependencies = [
-                  sources."cipher-base-1.0.2"
+                  sources."cipher-base-1.0.3"
                   (sources."des.js-1.0.0" // {
                     dependencies = [
                       sources."minimalistic-assert-1.0.0"
@@ -2243,15 +2753,15 @@ in
             dependencies = [
               sources."bn.js-4.11.6"
               sources."browserify-rsa-4.0.1"
-              (sources."elliptic-6.3.1" // {
+              (sources."elliptic-6.3.2" // {
                 dependencies = [
-                  sources."brorand-1.0.5"
+                  sources."brorand-1.0.6"
                   sources."hash.js-1.0.3"
                 ];
               })
               (sources."parse-asn1-5.0.0" // {
                 dependencies = [
-                  (sources."asn1.js-4.8.0" // {
+                  (sources."asn1.js-4.9.1" // {
                     dependencies = [
                       sources."minimalistic-assert-1.0.0"
                     ];
@@ -2259,7 +2769,7 @@ in
                   (sources."browserify-aes-1.0.6" // {
                     dependencies = [
                       sources."buffer-xor-1.0.3"
-                      sources."cipher-base-1.0.2"
+                      sources."cipher-base-1.0.3"
                     ];
                   })
                   sources."evp_bytestokey-1.0.0"
@@ -2270,9 +2780,9 @@ in
           (sources."create-ecdh-4.0.0" // {
             dependencies = [
               sources."bn.js-4.11.6"
-              (sources."elliptic-6.3.1" // {
+              (sources."elliptic-6.3.2" // {
                 dependencies = [
-                  sources."brorand-1.0.5"
+                  sources."brorand-1.0.6"
                   sources."hash.js-1.0.3"
                 ];
               })
@@ -2280,9 +2790,9 @@ in
           })
           (sources."create-hash-1.1.2" // {
             dependencies = [
-              sources."cipher-base-1.0.2"
+              sources."cipher-base-1.0.3"
               sources."ripemd160-1.0.1"
-              sources."sha.js-2.4.5"
+              sources."sha.js-2.4.8"
             ];
           })
           sources."create-hmac-1.1.4"
@@ -2291,19 +2801,19 @@ in
               sources."bn.js-4.11.6"
               (sources."miller-rabin-4.0.0" // {
                 dependencies = [
-                  sources."brorand-1.0.5"
+                  sources."brorand-1.0.6"
                 ];
               })
             ];
           })
-          sources."pbkdf2-3.0.4"
+          sources."pbkdf2-3.0.9"
           (sources."public-encrypt-4.0.0" // {
             dependencies = [
               sources."bn.js-4.11.6"
               sources."browserify-rsa-4.0.1"
               (sources."parse-asn1-5.0.0" // {
                 dependencies = [
-                  (sources."asn1.js-4.8.0" // {
+                  (sources."asn1.js-4.9.1" // {
                     dependencies = [
                       sources."minimalistic-assert-1.0.0"
                     ];
@@ -2311,7 +2821,7 @@ in
                   (sources."browserify-aes-1.0.6" // {
                     dependencies = [
                       sources."buffer-xor-1.0.3"
-                      sources."cipher-base-1.0.2"
+                      sources."cipher-base-1.0.3"
                     ];
                   })
                   sources."evp_bytestokey-1.0.0"
@@ -2327,9 +2837,10 @@ in
       sources."domain-browser-1.1.7"
       sources."duplexer2-0.1.4"
       sources."events-1.1.1"
-      (sources."glob-5.0.15" // {
+      (sources."glob-7.1.1" // {
         dependencies = [
-          (sources."inflight-1.0.5" // {
+          sources."fs.realpath-1.0.0"
+          (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
@@ -2344,12 +2855,12 @@ in
               })
             ];
           })
-          (sources."once-1.3.3" // {
+          (sources."once-1.4.0" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
           })
-          sources."path-is-absolute-1.0.0"
+          sources."path-is-absolute-1.0.1"
         ];
       })
       (sources."has-1.0.1" // {
@@ -2359,7 +2870,7 @@ in
       })
       sources."htmlescape-1.1.1"
       sources."https-browserify-0.0.1"
-      sources."inherits-2.0.1"
+      sources."inherits-2.0.3"
       (sources."insert-module-globals-7.0.1" // {
         dependencies = [
           (sources."combine-source-map-0.7.2" // {
@@ -2388,11 +2899,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"
@@ -2409,7 +2920,7 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.1.5" // {
+      (sources."readable-stream-2.2.2" // {
         dependencies = [
           sources."buffer-shims-1.0.0"
           sources."core-util-is-1.0.2"
@@ -2418,7 +2929,7 @@ in
           sources."util-deprecate-1.0.2"
         ];
       })
-      sources."resolve-1.1.7"
+      sources."resolve-1.2.0"
       (sources."shasum-1.0.2" // {
         dependencies = [
           (sources."json-stable-stringify-0.0.1" // {
@@ -2426,7 +2937,7 @@ in
               sources."jsonify-0.0.0"
             ];
           })
-          sources."sha.js-2.4.5"
+          sources."sha.js-2.4.8"
         ];
       })
       (sources."shell-quote-1.6.1" // {
@@ -2438,9 +2949,9 @@ in
         ];
       })
       sources."stream-browserify-2.0.1"
-      (sources."stream-http-2.3.1" // {
+      (sources."stream-http-2.6.3" // {
         dependencies = [
-          sources."builtin-status-codes-2.0.0"
+          sources."builtin-status-codes-3.0.0"
           sources."to-arraybuffer-1.0.1"
         ];
       })
@@ -2455,18 +2966,7 @@ in
           sources."acorn-2.7.0"
         ];
       })
-      (sources."through2-2.0.1" // {
-        dependencies = [
-          (sources."readable-stream-2.0.6" // {
-            dependencies = [
-              sources."core-util-is-1.0.2"
-              sources."isarray-1.0.0"
-              sources."process-nextick-args-1.0.7"
-              sources."util-deprecate-1.0.2"
-            ];
-          })
-        ];
-      })
+      sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
       sources."tty-browserify-0.0.0"
       (sources."url-0.11.0" // {
@@ -2475,7 +2975,11 @@ in
           sources."querystring-0.2.0"
         ];
       })
-      sources."util-0.10.3"
+      (sources."util-0.10.3" // {
+        dependencies = [
+          sources."inherits-2.0.1"
+        ];
+      })
       (sources."vm-browserify-0.0.4" // {
         dependencies = [
           sources."indexof-0.0.1"
@@ -2483,6 +2987,7 @@ in
       })
       sources."xtend-4.0.1"
     ];
+    buildInputs = globalBuildInputs;
     meta = {
       description = "browser-side require() the node way";
       homepage = "https://github.com/substack/node-browserify#readme";
@@ -2493,10 +2998,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.7.3";
+    version = "2.7.5";
     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.5.tgz";
+      sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
     };
     dependencies = [
       sources."async-0.2.10"
@@ -2511,13 +3016,13 @@ in
                 dependencies = [
                   (sources."align-text-0.1.4" // {
                     dependencies = [
-                      (sources."kind-of-3.0.4" // {
+                      (sources."kind-of-3.1.0" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
                       })
                       sources."longest-1.0.1"
-                      sources."repeat-string-1.5.4"
+                      sources."repeat-string-1.6.1"
                     ];
                   })
                   sources."lazy-cache-1.0.4"
@@ -2527,13 +3032,13 @@ in
                 dependencies = [
                   (sources."align-text-0.1.4" // {
                     dependencies = [
-                      (sources."kind-of-3.0.4" // {
+                      (sources."kind-of-3.1.0" // {
                         dependencies = [
                           sources."is-buffer-1.1.4"
                         ];
                       })
                       sources."longest-1.0.1"
-                      sources."repeat-string-1.5.4"
+                      sources."repeat-string-1.6.1"
                     ];
                   })
                 ];
@@ -2546,6 +3051,7 @@ in
         ];
       })
     ];
+    buildInputs = globalBuildInputs;
     meta = {
       description = "JavaScript parser, mangler/compressor and beautifier toolkit";
       homepage = http://lisperator.net/uglifyjs;
@@ -2556,10 +3062,10 @@ in
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "2.7.1";
+    version = "2.7.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-2.7.1.tgz";
-      sha1 = "6cbfea22b3b830304e9a5fb371d54fa480c9d7cf";
+      url = "https://registry.npmjs.org/less/-/less-2.7.2.tgz";
+      sha1 = "368d6cc73e1fb03981183280918743c5dcf9b3df";
     };
     dependencies = [
       (sources."errno-0.1.4" // {
@@ -2567,8 +3073,8 @@ in
           sources."prr-0.0.0"
         ];
       })
-      sources."graceful-fs-4.1.6"
-      sources."image-size-0.5.0"
+      sources."graceful-fs-4.1.11"
+      sources."image-size-0.5.1"
       sources."mime-1.3.4"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -2577,11 +3083,125 @@ in
       })
       (sources."promise-7.1.1" // {
         dependencies = [
-          sources."asap-2.0.4"
+          sources."asap-2.0.5"
         ];
       })
       sources."source-map-0.5.6"
+      (sources."request-2.79.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.2" // {
+            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.1.1"
+                    ];
+                  })
+                  (sources."strip-ansi-3.0.1" // {
+                    dependencies = [
+                      sources."ansi-regex-2.1.1"
+                    ];
+                  })
+                  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.1"
+                  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.2" // {
+                dependencies = [
+                  sources."asn1-0.2.3"
+                  sources."assert-plus-1.0.0"
+                  sources."dashdash-1.14.1"
+                  sources."getpass-0.1.6"
+                  sources."jsbn-0.1.0"
+                  sources."tweetnacl-0.14.5"
+                  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.14" // {
+            dependencies = [
+              sources."mime-db-1.26.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."uuid-3.0.1"
+        ];
+      })
     ];
+    buildInputs = globalBuildInputs;
     meta = {
       description = "Leaner CSS";
       homepage = http://lesscss.org/;
@@ -2592,10 +3212,10 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "3.0.2";
+    version = "3.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-3.0.2.tgz";
-      sha1 = "63a97f3e18f4d3e659d47a617677d089874557f0";
+      url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz";
+      sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3";
     };
     dependencies = [
       sources."browser-stdout-1.3.0"
@@ -2614,12 +3234,12 @@ in
       (sources."glob-7.0.5" // {
         dependencies = [
           sources."fs.realpath-1.0.0"
-          (sources."inflight-1.0.5" // {
+          (sources."inflight-1.0.6" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
           })
-          sources."inherits-2.0.1"
+          sources."inherits-2.0.3"
           (sources."minimatch-3.0.3" // {
             dependencies = [
               (sources."brace-expansion-1.1.6" // {
@@ -2630,12 +3250,12 @@ in
               })
             ];
           })
-          (sources."once-1.3.3" // {
+          (sources."once-1.4.0" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
           })
-          sources."path-is-absolute-1.0.0"
+          sources."path-is-absolute-1.0.1"
         ];
       })
       sources."growl-1.9.2"
@@ -2669,6 +3289,7 @@ in
         ];
       })
     ];
+    buildInputs = globalBuildInputs;
     meta = {
       description = "simple, flexible, fun test framework";
       homepage = https://mochajs.org/;
@@ -2692,7 +3313,7 @@ in
           sources."ncp-0.4.2"
           (sources."npmconf-0.0.24" // {
             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"
@@ -2719,7 +3340,11 @@ in
               sources."mime-1.2.11"
               sources."forever-agent-0.5.2"
               sources."node-uuid-1.4.7"
-              sources."tough-cookie-2.3.1"
+              (sources."tough-cookie-2.3.2" // {
+                dependencies = [
+                  sources."punycode-1.4.1"
+                ];
+              })
               (sources."form-data-0.1.4" // {
                 dependencies = [
                   (sources."combined-stream-0.0.7" // {
@@ -2766,6 +3391,7 @@ in
         ];
       })
     ];
+    buildInputs = globalBuildInputs;
     meta = {
       description = "Run mocha browser tests in phantomjs via the command line";
       homepage = "https://github.com/nathanboktae/mocha-phantomjs#readme";
@@ -2775,18 +3401,19 @@ in
   should = nodeEnv.buildNodePackage {
     name = "should";
     packageName = "should";
-    version = "11.1.0";
+    version = "11.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/should/-/should-11.1.0.tgz";
-      sha1 = "1d2ee7d3b150e965611ebe37be7dcf0fe2075a8e";
+      url = "https://registry.npmjs.org/should/-/should-11.1.2.tgz";
+      sha1 = "3cad9c6fc600ffe2e1547d948be3284e984da946";
     };
     dependencies = [
       sources."should-equal-1.0.1"
-      sources."should-format-3.0.1"
+      sources."should-format-3.0.2"
       sources."should-type-1.4.0"
-      sources."should-type-adaptors-1.0.0"
+      sources."should-type-adaptors-1.0.1"
       sources."should-util-1.0.0"
     ];
+    buildInputs = globalBuildInputs;
     meta = {
       description = "test framework agnostic BDD-style assertions";
       homepage = https://github.com/shouldjs/should.js;
@@ -2797,10 +3424,10 @@ in
   sinon = nodeEnv.buildNodePackage {
     name = "sinon";
     packageName = "sinon";
-    version = "1.17.5";
+    version = "1.17.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sinon/-/sinon-1.17.5.tgz";
-      sha1 = "1038cba830e37012e99a64837ecd3b67200c058c";
+      url = "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz";
+      sha1 = "4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf";
     };
     dependencies = [
       sources."formatio-1.1.1"
@@ -2812,6 +3439,7 @@ in
       sources."lolex-1.3.2"
       sources."samsam-1.1.2"
     ];
+    buildInputs = globalBuildInputs;
     meta = {
       description = "JavaScript test spies, stubs and mocks.";
       homepage = http://sinonjs.org/;
@@ -2822,29 +3450,29 @@ 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.0.6" // {
+          (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."inherits-2.0.1"
-              (sources."once-1.3.3" // {
+              sources."inherits-2.0.3"
+              (sources."once-1.4.0" // {
                 dependencies = [
                   sources."wrappy-1.0.2"
                 ];
               })
-              sources."path-is-absolute-1.0.0"
+              sources."path-is-absolute-1.0.1"
             ];
           })
         ];
@@ -2874,7 +3502,7 @@ in
               sources."core-util-is-1.0.2"
               sources."isarray-0.0.1"
               sources."string_decoder-0.10.31"
-              sources."inherits-2.0.1"
+              sources."inherits-2.0.3"
             ];
           })
           sources."entities-1.0.0"
@@ -2894,6 +3522,7 @@ in
       sources."strip-json-comments-1.0.4"
       sources."lodash-3.7.0"
     ];
+    buildInputs = globalBuildInputs;
     meta = {
       description = "Static analysis tool for JavaScript";
       homepage = http://jshint.com/;
@@ -2904,21 +3533,21 @@ in
   shelljs = nodeEnv.buildNodePackage {
     name = "shelljs";
     packageName = "shelljs";
-    version = "0.7.4";
+    version = "0.7.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.4.tgz";
-      sha1 = "b8f04b3a74ddfafea22acf98e0be45ded53d59c8";
+      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz";
+      sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad";
     };
     dependencies = [
-      (sources."glob-7.0.6" // {
+      (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."inherits-2.0.1"
+          sources."inherits-2.0.3"
           (sources."minimatch-3.0.3" // {
             dependencies = [
               (sources."brace-expansion-1.1.6" // {
@@ -2929,21 +3558,22 @@ in
               })
             ];
           })
-          (sources."once-1.3.3" // {
+          (sources."once-1.4.0" // {
             dependencies = [
               sources."wrappy-1.0.2"
             ];
           })
-          sources."path-is-absolute-1.0.0"
+          sources."path-is-absolute-1.0.1"
         ];
       })
       sources."interpret-1.0.1"
       (sources."rechoir-0.6.2" // {
         dependencies = [
-          sources."resolve-1.1.7"
+          sources."resolve-1.2.0"
         ];
       })
     ];
+    buildInputs = globalBuildInputs;
     meta = {
       description = "Portable Unix shell commands for Node.js";
       homepage = http://github.com/shelljs/shelljs;
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index 4d6c2d6662c..54f8fe0c728 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.0.1. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,7 +6,7 @@
 
 let
   nodeEnv = import ../../node-packages/node-env.nix {
-    inherit (pkgs) stdenv utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in
diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix
index 644d9e6e9e5..d413475389f 100644
--- a/pkgs/servers/web-apps/pump.io/composition.nix
+++ b/pkgs/servers/web-apps/pump.io/composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.1.0. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,11 +6,11 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix
index ec05cc8c13b..ab3022b9512 100644
--- a/pkgs/servers/web-apps/pump.io/node-packages.nix
+++ b/pkgs/servers/web-apps/pump.io/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.1.0. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -13,13 +13,13 @@ let
         sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093";
       };
     };
-    "bunyan-1.8.1" = {
+    "bunyan-1.8.5" = {
       name = "bunyan";
       packageName = "bunyan";
-      version = "1.8.1";
+      version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.1.tgz";
-        sha1 = "68c6a4a502d5620bc9f72d6736810c1b1898097f";
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz";
+        sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a";
       };
     };
     "connect-2.30.2" = {
@@ -85,13 +85,13 @@ let
         sha1 = "051806a88a6cc18ffb25adf13eda232e354ebcb6";
       };
     };
-    "dompurify-0.8.3" = {
+    "dompurify-0.8.4" = {
       name = "dompurify";
       packageName = "dompurify";
-      version = "0.8.3";
+      version = "0.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.3.tgz";
-        sha1 = "06bdc074b91306d09f7f150bfeb96a11e0be64c1";
+        url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.4.tgz";
+        sha1 = "93cabe8b6b84f3cf83f63b985ff71ef05f8cdeb6";
       };
     };
     "emailjs-1.0.8" = {
@@ -112,13 +112,13 @@ let
         sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0";
       };
     };
-    "express-session-1.14.1" = {
+    "express-session-1.14.2" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.14.1";
+      version = "1.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.14.1.tgz";
-        sha1 = "600364f0f6bf5dce32649e006770bdeee80aec99";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz";
+        sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275";
       };
     };
     "gm-1.23.0" = {
@@ -130,13 +130,13 @@ let
         sha1 = "80a2fe9cbf131515024846444658461269f52661";
       };
     };
-    "helmet-2.2.0" = {
+    "helmet-2.3.0" = {
       name = "helmet";
       packageName = "helmet";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/helmet/-/helmet-2.2.0.tgz";
-        sha1 = "fa0737d113fba4bd29d1b39650ac679ad673b948";
+        url = "https://registry.npmjs.org/helmet/-/helmet-2.3.0.tgz";
+        sha1 = "d655c85b55b0a3bf722a4c2c66e48b78b4161b91";
       };
     };
     "jankyqueue-0.1.1" = {
@@ -202,13 +202,13 @@ let
         sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04";
       };
     };
-    "sanitize-html-1.13.0" = {
+    "sanitize-html-1.14.1" = {
       name = "sanitize-html";
       packageName = "sanitize-html";
-      version = "1.13.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz";
-        sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631";
+        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz";
+        sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8";
       };
     };
     "schlock-0.2.1" = {
@@ -229,22 +229,22 @@ let
         sha1 = "765e7607c8055452bba6f0b052595350986036de";
       };
     };
-    "showdown-1.4.3" = {
+    "showdown-1.6.0" = {
       name = "showdown";
       packageName = "showdown";
-      version = "1.4.3";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/showdown/-/showdown-1.4.3.tgz";
-        sha1 = "91d29f4728dbdf76034b7555355e9b30974df447";
+        url = "https://registry.npmjs.org/showdown/-/showdown-1.6.0.tgz";
+        sha1 = "4a3cd2b73c45914f8cc00a388303be78b9f3e2a4";
       };
     };
-    "sockjs-0.3.17" = {
+    "sockjs-0.3.18" = {
       name = "sockjs";
       packageName = "sockjs";
-      version = "0.3.17";
+      version = "0.3.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.17.tgz";
-        sha1 = "ef1b88f5d73e6278fad8e9476ac91064382f3b44";
+        url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz";
+        sha1 = "d9b289316ca7df77595ef299e075f0f937eb4207";
       };
     };
     "step-0.0.6" = {
@@ -256,13 +256,13 @@ let
         sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2";
       };
     };
-    "ua-parser-js-0.7.10" = {
+    "ua-parser-js-0.7.12" = {
       name = "ua-parser-js";
       packageName = "ua-parser-js";
-      version = "0.7.10";
+      version = "0.7.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.10.tgz";
-        sha1 = "917559ddcce07cbc09ece7d80495e4c268f4ef9f";
+        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz";
+        sha1 = "04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb";
       };
     };
     "underscore-1.8.3" = {
@@ -364,13 +364,13 @@ let
         sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
       };
     };
-    "dtrace-provider-0.6.0" = {
+    "dtrace-provider-0.8.0" = {
       name = "dtrace-provider";
       packageName = "dtrace-provider";
-      version = "0.6.0";
+      version = "0.8.0";
       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.8.0.tgz";
+        sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625";
       };
     };
     "mv-2.1.1" = {
@@ -391,22 +391,22 @@ let
         sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e";
       };
     };
-    "moment-2.15.0" = {
+    "moment-2.17.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.15.0";
+      version = "2.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.15.0.tgz";
-        sha1 = "cc9e33958bf4a99dea7111d5e62ed3c13fc96440";
+        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
+        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
       };
     };
-    "nan-2.4.0" = {
+    "nan-2.5.0" = {
       name = "nan";
       packageName = "nan";
-      version = "2.4.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz";
-        sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232";
+        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
+        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
       };
     };
     "ncp-2.0.0" = {
@@ -436,13 +436,13 @@ let
         sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22";
       };
     };
-    "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";
       };
     };
     "inherits-2.0.3" = {
@@ -472,13 +472,13 @@ let
         sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
-    "path-is-absolute-1.0.0" = {
+    "path-is-absolute-1.0.1" = {
       name = "path-is-absolute";
       packageName = "path-is-absolute";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz";
-        sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912";
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
       };
     };
     "wrappy-1.0.2" = {
@@ -670,13 +670,13 @@ let
         sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
       };
     };
-    "method-override-2.3.6" = {
+    "method-override-2.3.7" = {
       name = "method-override";
       packageName = "method-override";
-      version = "2.3.6";
+      version = "2.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz";
-        sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e";
+        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz";
+        sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5";
       };
     };
     "morgan-1.6.1" = {
@@ -733,22 +733,22 @@ let
         sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
       };
     };
-    "response-time-2.3.1" = {
+    "response-time-2.3.2" = {
       name = "response-time";
       packageName = "response-time";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz";
-        sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797";
+        url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz";
+        sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a";
       };
     };
-    "serve-favicon-2.3.0" = {
+    "serve-favicon-2.3.2" = {
       name = "serve-favicon";
       packageName = "serve-favicon";
-      version = "2.3.0";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz";
-        sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39";
+        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz";
+        sha1 = "dd419e268de012ab72b319d337f2105013f9381f";
       };
     };
     "serve-index-1.7.3" = {
@@ -769,13 +769,13 @@ let
         sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535";
       };
     };
-    "type-is-1.6.13" = {
+    "type-is-1.6.14" = {
       name = "type-is";
       packageName = "type-is";
-      version = "1.6.13";
+      version = "1.6.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz";
-        sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08";
+        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz";
+        sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2";
       };
     };
     "utils-merge-1.0.0" = {
@@ -868,13 +868,13 @@ let
         sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea";
       };
     };
-    "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";
       };
     };
     "vary-1.0.1" = {
@@ -886,13 +886,13 @@ let
         sha1 = "99e4981566a286118dfb2b817357df7993376d10";
       };
     };
-    "mime-types-2.1.11" = {
+    "mime-types-2.1.14" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.11";
+      version = "2.1.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz";
-        sha1 = "c259c471bda808a85d6cd193b430a5fae4473b3c";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz";
+        sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee";
       };
     };
     "negotiator-0.5.3" = {
@@ -904,13 +904,13 @@ let
         sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
       };
     };
-    "mime-db-1.23.0" = {
+    "mime-db-1.26.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.23.0";
+      version = "1.26.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz";
-        sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz";
+        sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff";
       };
     };
     "ms-0.7.1" = {
@@ -922,22 +922,22 @@ let
         sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
       };
     };
-    "csrf-3.0.3" = {
+    "csrf-3.0.4" = {
       name = "csrf";
       packageName = "csrf";
-      version = "3.0.3";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz";
-        sha1 = "69d13220de95762808bb120f7533a994fc4293b5";
+        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz";
+        sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
       };
     };
-    "base64-url-1.2.2" = {
+    "base64-url-1.3.3" = {
       name = "base64-url";
       packageName = "base64-url";
-      version = "1.2.2";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz";
-        sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3";
+        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz";
+        sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f";
       };
     };
     "rndm-1.2.0" = {
@@ -958,13 +958,13 @@ let
         sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97";
       };
     };
-    "uid-safe-2.1.1" = {
+    "uid-safe-2.1.3" = {
       name = "uid-safe";
       packageName = "uid-safe";
-      version = "2.1.1";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz";
-        sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666";
+        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz";
+        sha1 = "077e264a00b3187936b270bb7376a26473631071";
       };
     };
     "random-bytes-1.0.0" = {
@@ -1039,13 +1039,22 @@ let
         sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c";
       };
     };
-    "statuses-1.3.0" = {
+    "statuses-1.3.1" = {
       name = "statuses";
       packageName = "statuses";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz";
-        sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a";
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz";
+        sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e";
+      };
+    };
+    "debug-2.3.3" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
+        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
       };
     };
     "methods-1.1.2" = {
@@ -1066,6 +1075,15 @@ let
         sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140";
       };
     };
+    "ms-0.7.2" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
+        sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
+      };
+    };
     "basic-auth-1.0.4" = {
       name = "basic-auth";
       packageName = "basic-auth";
@@ -1120,6 +1138,15 @@ let
         sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
       };
     };
+    "depd-1.1.0" = {
+      name = "depd";
+      packageName = "depd";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz";
+        sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3";
+      };
+    };
     "etag-1.7.0" = {
       name = "etag";
       packageName = "etag";
@@ -1255,6 +1282,15 @@ let
         sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
       };
     };
+    "debug-2.6.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
+        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
+      };
+    };
     "mime-1.2.11" = {
       name = "mime";
       packageName = "mime";
@@ -1399,13 +1435,13 @@ let
         sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df";
       };
     };
-    "object-assign-4.1.0" = {
+    "object-assign-4.1.1" = {
       name = "object-assign";
       packageName = "object-assign";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz";
-        sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0";
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
       };
     };
     "read-pkg-up-1.0.1" = {
@@ -1453,22 +1489,22 @@ let
         sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
       };
     };
-    "signal-exit-3.0.1" = {
+    "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz";
-        sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
-    "array-find-index-1.0.1" = {
+    "array-find-index-1.0.2" = {
       name = "array-find-index";
       packageName = "array-find-index";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz";
-        sha1 = "0bc25ddac941ec8a496ae258fd4ac188003ef3af";
+        url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz";
+        sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
     "hosted-git-info-2.1.5" = {
@@ -1525,13 +1561,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" = {
@@ -1606,13 +1642,13 @@ let
         sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
       };
     };
-    "graceful-fs-4.1.6" = {
+    "graceful-fs-4.1.11" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.1.6";
+      version = "4.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz";
-        sha1 = "514c38772b31bee2e08bedc21a0aeb3abf54c19e";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
+        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
       };
     };
     "parse-json-2.2.0" = {
@@ -1696,22 +1732,22 @@ let
         sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
       };
     };
-    "is-finite-1.0.1" = {
+    "is-finite-1.0.2" = {
       name = "is-finite";
       packageName = "is-finite";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz";
-        sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b";
+        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
+        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
       };
     };
-    "number-is-nan-1.0.0" = {
+    "number-is-nan-1.0.1" = {
       name = "number-is-nan";
       packageName = "number-is-nan";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz";
-        sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b";
+        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
       };
     };
     "underscore-1.5.2" = {
@@ -1786,6 +1822,15 @@ let
         sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607";
       };
     };
+    "iconv-lite-0.4.15" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
+        sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
+      };
+    };
     "connect-1.9.2" = {
       name = "connect";
       packageName = "connect";
@@ -1840,40 +1885,13 @@ let
         sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb";
       };
     };
-    "crc-3.4.0" = {
+    "crc-3.4.1" = {
       name = "crc";
       packageName = "crc";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz";
-        sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f";
-      };
-    };
-    "depd-1.1.0" = {
-      name = "depd";
-      packageName = "depd";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz";
-        sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3";
-      };
-    };
-    "uid-safe-2.1.2" = {
-      name = "uid-safe";
-      packageName = "uid-safe";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.2.tgz";
-        sha1 = "c934b3caead0fdcd0fb2cff3a8876d06fe0ee0fd";
-      };
-    };
-    "base64-url-1.3.2" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.2.tgz";
-        sha1 = "4b08113b49d23889f306be64372762d31412f7a8";
+        url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz";
+        sha1 = "65d5830b1a2569557cfb324c0e679998521473ee";
       };
     };
     "array-parallel-0.1.3" = {
@@ -1894,31 +1912,31 @@ let
         sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f";
       };
     };
-    "cross-spawn-4.0.0" = {
+    "cross-spawn-4.0.2" = {
       name = "cross-spawn";
       packageName = "cross-spawn";
-      version = "4.0.0";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.0.tgz";
-        sha1 = "8254774ab4786b8c5b3cf4dfba66ce563932c252";
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz";
+        sha1 = "7b9247621c23adfdd3856004a823cbe397424d41";
       };
     };
-    "lru-cache-4.0.1" = {
+    "lru-cache-4.0.2" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz";
-        sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz";
+        sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
       };
     };
-    "which-1.2.11" = {
+    "which-1.2.12" = {
       name = "which";
       packageName = "which";
-      version = "1.2.11";
+      version = "1.2.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz";
-        sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b";
+        url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz";
+        sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192";
       };
     };
     "pseudomap-1.0.2" = {
@@ -2002,13 +2020,13 @@ let
         sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b";
       };
     };
-    "hpkp-1.1.0" = {
+    "hpkp-1.2.0" = {
       name = "hpkp";
       packageName = "hpkp";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hpkp/-/hpkp-1.1.0.tgz";
-        sha1 = "77bdff1f331847fb9f40839d00a45032baed4df4";
+        url = "https://registry.npmjs.org/hpkp/-/hpkp-1.2.0.tgz";
+        sha1 = "83f2cb38b26cff21daf26e2ff4b57126921dec65";
       };
     };
     "hsts-1.0.0" = {
@@ -2164,13 +2182,13 @@ let
         sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018";
       };
     };
-    "nwmatcher-1.3.8" = {
+    "nwmatcher-1.3.9" = {
       name = "nwmatcher";
       packageName = "nwmatcher";
-      version = "1.3.8";
+      version = "1.3.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.8.tgz";
-        sha1 = "34edb93de1aa6cb4448b573c9f2a059300241157";
+        url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.9.tgz";
+        sha1 = "8bab486ff7fa3dfd086656bbe8b17116d3692d2a";
       };
     };
     "parse5-1.5.1" = {
@@ -2182,13 +2200,13 @@ let
         sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
       };
     };
-    "request-2.74.0" = {
+    "request-2.79.0" = {
       name = "request";
       packageName = "request";
-      version = "2.74.0";
+      version = "2.79.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz";
-        sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab";
+        url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
+        sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
       };
     };
     "sax-1.2.1" = {
@@ -2200,22 +2218,22 @@ let
         sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
       };
     };
-    "symbol-tree-3.1.4" = {
+    "symbol-tree-3.2.1" = {
       name = "symbol-tree";
       packageName = "symbol-tree";
-      version = "3.1.4";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.1.4.tgz";
-        sha1 = "02b279348d337debc39694c5c95f882d448a312a";
+        url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.1.tgz";
+        sha1 = "8549dd1d01fa9f893c18cc9ab0b106b4d9b168cb";
       };
     };
-    "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";
       };
     };
     "webidl-conversions-2.0.1" = {
@@ -2272,13 +2290,13 @@ let
         sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581";
       };
     };
-    "optionator-0.8.1" = {
+    "optionator-0.8.2" = {
       name = "optionator";
       packageName = "optionator";
-      version = "0.8.1";
+      version = "0.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.1.tgz";
-        sha1 = "e31b4932cdd5fb862a8b0d10bc63d3ee1ec7d78b";
+        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz";
+        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
       };
     };
     "source-map-0.2.0" = {
@@ -2335,22 +2353,22 @@ let
         sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
       };
     };
-    "fast-levenshtein-1.1.4" = {
+    "fast-levenshtein-2.0.6" = {
       name = "fast-levenshtein";
       packageName = "fast-levenshtein";
-      version = "1.1.4";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz";
-        sha1 = "e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9";
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
-    "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";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -2362,22 +2380,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";
-      };
-    };
-    "bl-1.1.2" = {
-      name = "bl";
-      packageName = "bl";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz";
-        sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz";
+        sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755";
       };
     };
     "caseless-0.11.0" = {
@@ -2416,13 +2425,13 @@ let
         sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
       };
     };
-    "form-data-1.0.1" = {
+    "form-data-2.1.2" = {
       name = "form-data";
       packageName = "form-data";
-      version = "1.0.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz";
-        sha1 = "ae315db9a4907fa065502304a66d7733475ee37c";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz";
+        sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
       };
     };
     "har-validator-2.0.6" = {
@@ -2488,13 +2497,13 @@ let
         sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
       };
     };
-    "qs-6.2.1" = {
+    "qs-6.3.0" = {
       name = "qs";
       packageName = "qs";
-      version = "6.2.1";
+      version = "6.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz";
-        sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625";
+        url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz";
+        sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442";
       };
     };
     "stringstream-0.0.5" = {
@@ -2515,40 +2524,13 @@ let
         sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
       };
     };
-    "readable-stream-2.0.6" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.0.6";
+    "uuid-3.0.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
-        sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
-      };
-    };
-    "isarray-1.0.0" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
-        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
-      };
-    };
-    "process-nextick-args-1.0.7" = {
-      name = "process-nextick-args";
-      packageName = "process-nextick-args";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
-        sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
-      };
-    };
-    "util-deprecate-1.0.2" = {
-      name = "util-deprecate";
-      packageName = "util-deprecate";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
-        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
+        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
       };
     };
     "delayed-stream-1.0.0" = {
@@ -2560,22 +2542,13 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "async-2.0.1" = {
-      name = "async";
-      packageName = "async";
-      version = "2.0.1";
+    "asynckit-0.4.0" = {
+      name = "asynckit";
+      packageName = "asynckit";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz";
-        sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25";
-      };
-    };
-    "lodash-4.15.0" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.15.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.15.0.tgz";
-        sha1 = "3162391d8f0140aa22cf8f6b3c34d6b7f63d3aa9";
+        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
     "chalk-1.1.3" = {
@@ -2596,13 +2569,13 @@ let
         sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
       };
     };
-    "is-my-json-valid-2.13.1" = {
+    "is-my-json-valid-2.15.0" = {
       name = "is-my-json-valid";
       packageName = "is-my-json-valid";
-      version = "2.13.1";
+      version = "2.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz";
-        sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707";
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz";
+        sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b";
       };
     };
     "ansi-styles-2.2.1" = {
@@ -2650,13 +2623,13 @@ let
         sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
       };
     };
-    "ansi-regex-2.0.0" = {
+    "ansi-regex-2.1.1" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
-      version = "2.0.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
-        sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
       };
     };
     "graceful-readlink-1.0.1" = {
@@ -2686,13 +2659,13 @@ let
         sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
       };
     };
-    "jsonpointer-2.0.0" = {
+    "jsonpointer-4.0.1" = {
       name = "jsonpointer";
       packageName = "jsonpointer";
-      version = "2.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz";
-        sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9";
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
+        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
       };
     };
     "xtend-4.0.1" = {
@@ -2767,13 +2740,13 @@ let
         sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252";
       };
     };
-    "sshpk-1.10.0" = {
+    "sshpk-1.10.2" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.10.0";
+      version = "1.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.0.tgz";
-        sha1 = "104d6ba2afb2ac099ab9567c0d193977f29c6dfa";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz";
+        sha1 = "d5a804ce22695515638e798dbe23273de070a5fa";
       };
     };
     "extsprintf-1.0.2" = {
@@ -2821,13 +2794,13 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "dashdash-1.14.0" = {
+    "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
-      version = "1.14.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz";
-        sha1 = "29e486c5418bf0f356034a993d51686a33e84141";
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
       };
     };
     "getpass-0.1.6" = {
@@ -2848,13 +2821,13 @@ let
         sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
       };
     };
-    "tweetnacl-0.13.3" = {
+    "tweetnacl-0.14.5" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
-      version = "0.13.3";
+      version = "0.14.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz";
-        sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56";
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
     "jodid25519-1.0.2" = {
@@ -2884,13 +2857,13 @@ let
         sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
       };
     };
-    "tweetnacl-0.14.3" = {
-      name = "tweetnacl";
-      packageName = "tweetnacl";
-      version = "0.14.3";
+    "punycode-1.4.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz";
-        sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d";
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
       };
     };
     "tr46-0.0.3" = {
@@ -2929,13 +2902,13 @@ let
         sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
       };
     };
-    "glob-7.0.6" = {
+    "glob-7.1.1" = {
       name = "glob";
       packageName = "glob";
-      version = "7.0.6";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz";
-        sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz";
+        sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8";
       };
     };
     "fs.realpath-1.0.0" = {
@@ -2947,13 +2920,13 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "htmlparser2-3.9.1" = {
+    "htmlparser2-3.9.2" = {
       name = "htmlparser2";
       packageName = "htmlparser2";
-      version = "3.9.1";
+      version = "3.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.1.tgz";
-        sha1 = "621b7a58bc9acd003f7af0a2c9a00aa67c8505d2";
+        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz";
+        sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338";
       };
     };
     "regexp-quote-0.0.0" = {
@@ -3001,13 +2974,13 @@ let
         sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
       };
     };
-    "readable-stream-2.1.5" = {
+    "readable-stream-2.2.2" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.1.5";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz";
-        sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
+        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
       };
     };
     "dom-serializer-0.1.0" = {
@@ -3037,6 +3010,33 @@ let
         sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
       };
     };
+    "isarray-1.0.0" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+      };
+    };
+    "process-nextick-args-1.0.7" = {
+      name = "process-nextick-args";
+      packageName = "process-nextick-args";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
+        sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
+      };
+    };
+    "util-deprecate-1.0.2" = {
+      name = "util-deprecate";
+      packageName = "util-deprecate";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+      };
+    };
     "destroy-1.0.4" = {
       name = "destroy";
       packageName = "destroy";
@@ -3073,13 +3073,22 @@ let
         sha1 = "dded45cc18256d51ed40aec142489d5c61026d28";
       };
     };
-    "yargs-3.32.0" = {
+    "yargs-6.6.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "3.32.0";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz";
-        sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995";
+        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
+      };
+    };
+    "camelcase-3.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
       };
     };
     "cliui-3.2.0" = {
@@ -3091,6 +3100,15 @@ let
         sha1 = "120601537a916d29940f934da3b48d585a39213d";
       };
     };
+    "get-caller-file-1.0.2" = {
+      name = "get-caller-file";
+      packageName = "get-caller-file";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz";
+        sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
+      };
+    };
     "os-locale-1.4.0" = {
       name = "os-locale";
       packageName = "os-locale";
@@ -3100,6 +3118,33 @@ let
         sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9";
       };
     };
+    "require-directory-2.1.1" = {
+      name = "require-directory";
+      packageName = "require-directory";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
+        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+      };
+    };
+    "require-main-filename-1.0.1" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+      };
+    };
+    "set-blocking-2.0.0" = {
+      name = "set-blocking";
+      packageName = "set-blocking";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
+        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+      };
+    };
     "string-width-1.0.2" = {
       name = "string-width";
       packageName = "string-width";
@@ -3109,13 +3154,13 @@ let
         sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
       };
     };
-    "window-size-0.1.4" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.1.4";
+    "which-module-1.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz";
-        sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876";
+        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
+        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
       };
     };
     "y18n-3.2.1" = {
@@ -3127,13 +3172,22 @@ let
         sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
       };
     };
-    "wrap-ansi-2.0.0" = {
+    "yargs-parser-4.2.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
+      };
+    };
+    "wrap-ansi-2.1.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz";
-        sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f";
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
       };
     };
     "lcid-1.0.0" = {
@@ -3154,13 +3208,13 @@ let
         sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
       };
     };
-    "code-point-at-1.0.0" = {
+    "code-point-at-1.1.0" = {
       name = "code-point-at";
       packageName = "code-point-at";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz";
-        sha1 = "f69b192d3f7d91e382e4b71bddb77878619ab0c6";
+        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
+        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
       };
     };
     "is-fullwidth-code-point-1.0.0" = {
@@ -3181,13 +3235,13 @@ let
         sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
       };
     };
-    "uuid-2.0.2" = {
+    "uuid-2.0.3" = {
       name = "uuid";
       packageName = "uuid";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.2.tgz";
-        sha1 = "48bd5698f0677e3c7901a1c46ef15b1643794726";
+        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz";
+        sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
       };
     };
     "websocket-driver-0.6.5" = {
@@ -3226,13 +3280,13 @@ let
         sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c";
       };
     };
-    "mongodb-2.2.10" = {
+    "mongodb-2.2.21" = {
       name = "mongodb";
       packageName = "mongodb";
-      version = "2.2.10";
+      version = "2.2.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.10.tgz";
-        sha1 = "d11273a5a53b08e17bcc4c8a295ded0f151ccae6";
+        url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.21.tgz";
+        sha1 = "f7ee56489600e0ac8024c062c0857ac04ddb5f48";
       };
     };
     "es6-promise-3.2.1" = {
@@ -3244,22 +3298,31 @@ let
         sha1 = "ec56233868032909207170c39448e24449dd1fc4";
       };
     };
-    "mongodb-core-2.0.12" = {
+    "mongodb-core-2.1.6" = {
       name = "mongodb-core";
       packageName = "mongodb-core";
-      version = "2.0.12";
+      version = "2.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.12.tgz";
-        sha1 = "bb66aad550e252731f8ad49276815264a91c337c";
+        url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.6.tgz";
+        sha1 = "9d179e7487767c58993bb7c8d6685d035c346a42";
       };
     };
-    "bson-0.5.5" = {
+    "readable-stream-2.1.5" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz";
+        sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
+      };
+    };
+    "bson-1.0.4" = {
       name = "bson";
       packageName = "bson";
-      version = "0.5.5";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bson/-/bson-0.5.5.tgz";
-        sha1 = "1d6725d400f0fbf0271bf6bafc8fa1126c29983b";
+        url = "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz";
+        sha1 = "93c10d39eaa5b58415cbc4052f3e53e562b0b72c";
       };
     };
     "require_optional-1.0.0" = {
@@ -3392,11 +3455,11 @@ let
           sources."nan-2.3.5"
         ];
       })
-      (sources."bunyan-1.8.1" // {
+      (sources."bunyan-1.8.5" // {
         dependencies = [
-          (sources."dtrace-provider-0.6.0" // {
+          (sources."dtrace-provider-0.8.0" // {
             dependencies = [
-              sources."nan-2.4.0"
+              sources."nan-2.5.0"
             ];
           })
           (sources."mv-2.1.1" // {
@@ -3406,7 +3469,7 @@ let
                 dependencies = [
                   (sources."glob-6.0.4" // {
                     dependencies = [
-                      (sources."inflight-1.0.5" // {
+                      (sources."inflight-1.0.6" // {
                         dependencies = [
                           sources."wrappy-1.0.2"
                         ];
@@ -3427,7 +3490,7 @@ let
                           sources."wrappy-1.0.2"
                         ];
                       })
-                      sources."path-is-absolute-1.0.0"
+                      sources."path-is-absolute-1.0.1"
                     ];
                   })
                 ];
@@ -3435,7 +3498,7 @@ let
             ];
           })
           sources."safe-json-stringify-1.0.3"
-          sources."moment-2.15.0"
+          sources."moment-2.17.1"
         ];
       })
       (sources."connect-2.30.2" // {
@@ -3466,17 +3529,17 @@ let
             dependencies = [
               (sources."accepts-1.2.13" // {
                 dependencies = [
-                  (sources."mime-types-2.1.11" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.23.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   sources."negotiator-0.5.3"
                 ];
               })
-              (sources."compressible-2.0.8" // {
+              (sources."compressible-2.0.9" // {
                 dependencies = [
-                  sources."mime-db-1.23.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."vary-1.0.1"
@@ -3490,12 +3553,12 @@ let
           sources."content-type-1.0.2"
           (sources."csurf-1.8.3" // {
             dependencies = [
-              (sources."csrf-3.0.3" // {
+              (sources."csrf-3.0.4" // {
                 dependencies = [
-                  sources."base64-url-1.2.2"
+                  sources."base64-url-1.3.3"
                   sources."rndm-1.2.0"
                   sources."tsscmp-1.0.5"
-                  (sources."uid-safe-2.1.1" // {
+                  (sources."uid-safe-2.1.3" // {
                     dependencies = [
                       sources."random-bytes-1.0.0"
                     ];
@@ -3514,9 +3577,9 @@ let
             dependencies = [
               (sources."accepts-1.3.3" // {
                 dependencies = [
-                  (sources."mime-types-2.1.11" // {
+                  (sources."mime-types-2.1.14" // {
                     dependencies = [
-                      sources."mime-db-1.23.0"
+                      sources."mime-db-1.26.0"
                     ];
                   })
                   sources."negotiator-0.6.1"
@@ -3550,11 +3613,16 @@ let
           (sources."http-errors-1.3.1" // {
             dependencies = [
               sources."inherits-2.0.3"
-              sources."statuses-1.3.0"
+              sources."statuses-1.3.1"
             ];
           })
-          (sources."method-override-2.3.6" // {
+          (sources."method-override-2.3.7" // {
             dependencies = [
+              (sources."debug-2.3.3" // {
+                dependencies = [
+                  sources."ms-0.7.2"
+                ];
+              })
               sources."methods-1.1.2"
               sources."vary-1.1.0"
             ];
@@ -3586,11 +3654,15 @@ let
           sources."parseurl-1.3.1"
           sources."pause-0.1.0"
           sources."qs-4.0.0"
-          sources."response-time-2.3.1"
-          (sources."serve-favicon-2.3.0" // {
+          (sources."response-time-2.3.2" // {
+            dependencies = [
+              sources."depd-1.1.0"
+            ];
+          })
+          (sources."serve-favicon-2.3.2" // {
             dependencies = [
               sources."etag-1.7.0"
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
           (sources."serve-index-1.7.3" // {
@@ -3602,9 +3674,9 @@ let
               })
               sources."batch-0.5.3"
               sources."escape-html-1.0.3"
-              (sources."mime-types-2.1.11" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.23.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -3614,12 +3686,12 @@ let
               sources."escape-html-1.0.3"
             ];
           })
-          (sources."type-is-1.6.13" // {
+          (sources."type-is-1.6.14" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.11" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.23.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
             ];
@@ -3646,9 +3718,9 @@ let
               sources."bytes-0.2.0"
               sources."fresh-0.1.0"
               sources."pause-0.0.1"
-              (sources."debug-2.2.0" // {
+              (sources."debug-2.6.0" // {
                 dependencies = [
-                  sources."ms-0.7.1"
+                  sources."ms-0.7.2"
                 ];
               })
             ];
@@ -3690,10 +3762,10 @@ let
                 dependencies = [
                   (sources."currently-unhandled-0.4.1" // {
                     dependencies = [
-                      sources."array-find-index-1.0.1"
+                      sources."array-find-index-1.0.2"
                     ];
                   })
-                  sources."signal-exit-3.0.1"
+                  sources."signal-exit-3.0.2"
                 ];
               })
               sources."map-obj-1.0.1"
@@ -3714,12 +3786,12 @@ let
                           sources."spdx-license-ids-1.2.2"
                         ];
                       })
-                      sources."spdx-expression-parse-1.0.3"
+                      sources."spdx-expression-parse-1.0.4"
                     ];
                   })
                 ];
               })
-              sources."object-assign-4.1.0"
+              sources."object-assign-4.1.1"
               (sources."read-pkg-up-1.0.1" // {
                 dependencies = [
                   (sources."find-up-1.1.2" // {
@@ -3736,7 +3808,7 @@ let
                     dependencies = [
                       (sources."load-json-file-1.1.0" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.6"
+                          sources."graceful-fs-4.1.11"
                           (sources."parse-json-2.2.0" // {
                             dependencies = [
                               (sources."error-ex-1.3.0" // {
@@ -3761,7 +3833,7 @@ let
                       })
                       (sources."path-type-1.1.0" // {
                         dependencies = [
-                          sources."graceful-fs-4.1.6"
+                          sources."graceful-fs-4.1.11"
                           sources."pify-2.3.0"
                           (sources."pinkie-promise-2.0.1" // {
                             dependencies = [
@@ -3780,9 +3852,9 @@ let
                     dependencies = [
                       (sources."repeating-2.0.1" // {
                         dependencies = [
-                          (sources."is-finite-1.0.1" // {
+                          (sources."is-finite-1.0.2" // {
                             dependencies = [
-                              sources."number-is-nan-1.0.0"
+                              sources."number-is-nan-1.0.1"
                             ];
                           })
                         ];
@@ -3802,7 +3874,7 @@ let
           sources."underscore-1.5.2"
         ];
       })
-      sources."dompurify-0.8.3"
+      sources."dompurify-0.8.4"
       (sources."emailjs-1.0.8" // {
         dependencies = [
           sources."addressparser-0.3.2"
@@ -3810,7 +3882,7 @@ let
             dependencies = [
               (sources."encoding-0.1.12" // {
                 dependencies = [
-                  sources."iconv-lite-0.4.13"
+                  sources."iconv-lite-0.4.15"
                 ];
               })
               sources."addressparser-0.2.1"
@@ -3833,11 +3905,11 @@ let
           sources."mkdirp-0.3.0"
         ];
       })
-      (sources."express-session-1.14.1" // {
+      (sources."express-session-1.14.2" // {
         dependencies = [
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
-          sources."crc-3.4.0"
+          sources."crc-3.4.1"
           (sources."debug-2.2.0" // {
             dependencies = [
               sources."ms-0.7.1"
@@ -3846,9 +3918,9 @@ let
           sources."depd-1.1.0"
           sources."on-headers-1.0.1"
           sources."parseurl-1.3.1"
-          (sources."uid-safe-2.1.2" // {
+          (sources."uid-safe-2.1.3" // {
             dependencies = [
-              sources."base64-url-1.3.2"
+              sources."base64-url-1.3.3"
               sources."random-bytes-1.0.0"
             ];
           })
@@ -3859,15 +3931,15 @@ let
         dependencies = [
           sources."array-parallel-0.1.3"
           sources."array-series-0.1.5"
-          (sources."cross-spawn-4.0.0" // {
+          (sources."cross-spawn-4.0.2" // {
             dependencies = [
-              (sources."lru-cache-4.0.1" // {
+              (sources."lru-cache-4.0.2" // {
                 dependencies = [
                   sources."pseudomap-1.0.2"
                   sources."yallist-2.0.0"
                 ];
               })
-              (sources."which-1.2.11" // {
+              (sources."which-1.2.12" // {
                 dependencies = [
                   sources."isexe-1.1.2"
                 ];
@@ -3881,7 +3953,7 @@ let
           })
         ];
       })
-      (sources."helmet-2.2.0" // {
+      (sources."helmet-2.3.0" // {
         dependencies = [
           (sources."connect-3.4.1" // {
             dependencies = [
@@ -3921,7 +3993,7 @@ let
             ];
           })
           sources."hide-powered-by-1.0.0"
-          sources."hpkp-1.1.0"
+          sources."hpkp-1.2.0"
           (sources."hsts-1.0.0" // {
             dependencies = [
               sources."core-util-is-1.0.2"
@@ -3950,43 +4022,29 @@ let
               sources."estraverse-1.9.3"
               sources."esutils-2.0.2"
               sources."esprima-2.7.3"
-              (sources."optionator-0.8.1" // {
+              (sources."optionator-0.8.2" // {
                 dependencies = [
                   sources."prelude-ls-1.1.2"
                   sources."deep-is-0.1.3"
                   sources."wordwrap-1.0.0"
                   sources."type-check-0.3.2"
                   sources."levn-0.3.0"
-                  sources."fast-levenshtein-1.1.4"
+                  sources."fast-levenshtein-2.0.6"
                 ];
               })
               (sources."source-map-0.2.0" // {
                 dependencies = [
-                  sources."amdefine-1.0.0"
+                  sources."amdefine-1.0.1"
                 ];
               })
             ];
           })
-          sources."nwmatcher-1.3.8"
+          sources."nwmatcher-1.3.9"
           sources."parse5-1.5.1"
-          (sources."request-2.74.0" // {
+          (sources."request-2.79.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 = [
@@ -3995,13 +4053,9 @@ let
               })
               sources."extend-3.0.0"
               sources."forever-agent-0.6.1"
-              (sources."form-data-1.0.1" // {
+              (sources."form-data-2.1.2" // {
                 dependencies = [
-                  (sources."async-2.0.1" // {
-                    dependencies = [
-                      sources."lodash-4.15.0"
-                    ];
-                  })
+                  sources."asynckit-0.4.0"
                 ];
               })
               (sources."har-validator-2.0.6" // {
@@ -4012,12 +4066,12 @@ let
                       sources."escape-string-regexp-1.0.5"
                       (sources."has-ansi-2.0.0" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       (sources."strip-ansi-3.0.1" // {
                         dependencies = [
-                          sources."ansi-regex-2.0.0"
+                          sources."ansi-regex-2.1.1"
                         ];
                       })
                       sources."supports-color-2.0.0"
@@ -4028,7 +4082,7 @@ let
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.13.1" // {
+                  (sources."is-my-json-valid-2.15.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -4036,7 +4090,7 @@ let
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-2.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -4065,21 +4119,17 @@ let
                       sources."verror-1.3.6"
                     ];
                   })
-                  (sources."sshpk-1.10.0" // {
+                  (sources."sshpk-1.10.2" // {
                     dependencies = [
                       sources."asn1-0.2.3"
                       sources."assert-plus-1.0.0"
-                      sources."dashdash-1.14.0"
+                      sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.13.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
-                      (sources."bcrypt-pbkdf-1.0.0" // {
-                        dependencies = [
-                          sources."tweetnacl-0.14.3"
-                        ];
-                      })
+                      sources."bcrypt-pbkdf-1.0.0"
                     ];
                   })
                 ];
@@ -4087,20 +4137,25 @@ let
               sources."is-typedarray-1.0.0"
               sources."isstream-0.1.2"
               sources."json-stringify-safe-5.0.1"
-              (sources."mime-types-2.1.11" // {
+              (sources."mime-types-2.1.14" // {
                 dependencies = [
-                  sources."mime-db-1.23.0"
+                  sources."mime-db-1.26.0"
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.2.1"
+              sources."qs-6.3.0"
               sources."stringstream-0.0.5"
               sources."tunnel-agent-0.4.3"
+              sources."uuid-3.0.1"
             ];
           })
           sources."sax-1.2.1"
-          sources."symbol-tree-3.1.4"
-          sources."tough-cookie-2.3.1"
+          sources."symbol-tree-3.2.1"
+          (sources."tough-cookie-2.3.2" // {
+            dependencies = [
+              sources."punycode-1.4.1"
+            ];
+          })
           sources."webidl-conversions-2.0.1"
           (sources."whatwg-url-compat-0.6.5" // {
             dependencies = [
@@ -4125,10 +4180,10 @@ let
       })
       (sources."rimraf-2.5.4" // {
         dependencies = [
-          (sources."glob-7.0.6" // {
+          (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"
                 ];
@@ -4149,14 +4204,14 @@ let
                   sources."wrappy-1.0.2"
                 ];
               })
-              sources."path-is-absolute-1.0.0"
+              sources."path-is-absolute-1.0.1"
             ];
           })
         ];
       })
-      (sources."sanitize-html-1.13.0" // {
+      (sources."sanitize-html-1.14.1" // {
         dependencies = [
-          (sources."htmlparser2-3.9.1" // {
+          (sources."htmlparser2-3.9.2" // {
             dependencies = [
               sources."domelementtype-1.3.0"
               sources."domhandler-2.3.0"
@@ -4171,7 +4226,7 @@ let
               })
               sources."entities-1.1.1"
               sources."inherits-2.0.3"
-              (sources."readable-stream-2.1.5" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -4212,22 +4267,23 @@ let
           sources."statuses-1.2.1"
         ];
       })
-      (sources."showdown-1.4.3" // {
+      (sources."showdown-1.6.0" // {
         dependencies = [
-          (sources."yargs-3.32.0" // {
+          (sources."yargs-6.6.0" // {
             dependencies = [
-              sources."camelcase-2.1.1"
+              sources."camelcase-3.0.0"
               (sources."cliui-3.2.0" // {
                 dependencies = [
                   (sources."strip-ansi-3.0.1" // {
                     dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      sources."ansi-regex-2.1.1"
                     ];
                   })
-                  sources."wrap-ansi-2.0.0"
+                  sources."wrap-ansi-2.1.0"
                 ];
               })
               sources."decamelize-1.2.0"
+              sources."get-caller-file-1.0.2"
               (sources."os-locale-1.4.0" // {
                 dependencies = [
                   (sources."lcid-1.0.0" // {
@@ -4237,32 +4293,107 @@ let
                   })
                 ];
               })
-              (sources."string-width-1.0.2" // {
+              (sources."read-pkg-up-1.0.1" // {
                 dependencies = [
-                  (sources."code-point-at-1.0.0" // {
+                  (sources."find-up-1.1.2" // {
                     dependencies = [
-                      sources."number-is-nan-1.0.0"
+                      sources."path-exists-2.1.0"
+                      (sources."pinkie-promise-2.0.1" // {
+                        dependencies = [
+                          sources."pinkie-2.0.4"
+                        ];
+                      })
                     ];
                   })
-                  (sources."is-fullwidth-code-point-1.0.0" // {
+                  (sources."read-pkg-1.1.0" // {
                     dependencies = [
-                      sources."number-is-nan-1.0.0"
-                    ];
-                  })
-                  (sources."strip-ansi-3.0.1" // {
-                    dependencies = [
-                      sources."ansi-regex-2.0.0"
+                      (sources."load-json-file-1.1.0" // {
+                        dependencies = [
+                          sources."graceful-fs-4.1.11"
+                          (sources."parse-json-2.2.0" // {
+                            dependencies = [
+                              (sources."error-ex-1.3.0" // {
+                                dependencies = [
+                                  sources."is-arrayish-0.2.1"
+                                ];
+                              })
+                            ];
+                          })
+                          sources."pify-2.3.0"
+                          (sources."pinkie-promise-2.0.1" // {
+                            dependencies = [
+                              sources."pinkie-2.0.4"
+                            ];
+                          })
+                          (sources."strip-bom-2.0.0" // {
+                            dependencies = [
+                              sources."is-utf8-0.2.1"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."normalize-package-data-2.3.5" // {
+                        dependencies = [
+                          sources."hosted-git-info-2.1.5"
+                          (sources."is-builtin-module-1.0.0" // {
+                            dependencies = [
+                              sources."builtin-modules-1.1.1"
+                            ];
+                          })
+                          sources."semver-5.3.0"
+                          (sources."validate-npm-package-license-3.0.1" // {
+                            dependencies = [
+                              (sources."spdx-correct-1.0.2" // {
+                                dependencies = [
+                                  sources."spdx-license-ids-1.2.2"
+                                ];
+                              })
+                              sources."spdx-expression-parse-1.0.4"
+                            ];
+                          })
+                        ];
+                      })
+                      (sources."path-type-1.1.0" // {
+                        dependencies = [
+                          sources."graceful-fs-4.1.11"
+                          sources."pify-2.3.0"
+                          (sources."pinkie-promise-2.0.1" // {
+                            dependencies = [
+                              sources."pinkie-2.0.4"
+                            ];
+                          })
+                        ];
+                      })
                     ];
                   })
                 ];
               })
-              sources."window-size-0.1.4"
+              sources."require-directory-2.1.1"
+              sources."require-main-filename-1.0.1"
+              sources."set-blocking-2.0.0"
+              (sources."string-width-1.0.2" // {
+                dependencies = [
+                  sources."code-point-at-1.1.0"
+                  (sources."is-fullwidth-code-point-1.0.0" // {
+                    dependencies = [
+                      sources."number-is-nan-1.0.1"
+                    ];
+                  })
+                  (sources."strip-ansi-3.0.1" // {
+                    dependencies = [
+                      sources."ansi-regex-2.1.1"
+                    ];
+                  })
+                ];
+              })
+              sources."which-module-1.0.0"
               sources."y18n-3.2.1"
+              sources."yargs-parser-4.2.1"
             ];
           })
         ];
       })
-      (sources."sockjs-0.3.17" // {
+      (sources."sockjs-0.3.18" // {
         dependencies = [
           (sources."faye-websocket-0.10.0" // {
             dependencies = [
@@ -4273,11 +4404,11 @@ let
               })
             ];
           })
-          sources."uuid-2.0.2"
+          sources."uuid-2.0.3"
         ];
       })
       sources."step-0.0.6"
-      sources."ua-parser-js-0.7.10"
+      sources."ua-parser-js-0.7.12"
       sources."underscore-1.8.3"
       (sources."underscore-contrib-0.3.0" // {
         dependencies = [
@@ -4297,17 +4428,17 @@ let
       })
       (sources."databank-mongodb-0.19.0" // {
         dependencies = [
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.6.0" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
-          (sources."mongodb-2.2.10" // {
+          (sources."mongodb-2.2.21" // {
             dependencies = [
               sources."es6-promise-3.2.1"
-              (sources."mongodb-core-2.0.12" // {
+              (sources."mongodb-core-2.1.6" // {
                 dependencies = [
-                  sources."bson-0.5.5"
+                  sources."bson-1.0.4"
                   (sources."require_optional-1.0.0" // {
                     dependencies = [
                       sources."semver-5.3.0"
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index fea6de2ea7c..d413475389f 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.0.1. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -6,11 +6,11 @@
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix
index 79a52d54ca2..74707ae015f 100644
--- a/pkgs/tools/package-management/nixui/node-packages.nix
+++ b/pkgs/tools/package-management/nixui/node-packages.nix
@@ -1,6 +1,6 @@
-# This file has been generated by node2nix 1.0.1. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit}:
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
@@ -91,6 +91,7 @@ in
       })
       sources."underscore-1.8.3"
     ];
+    buildInputs = globalBuildInputs;
     meta = {
       description = "nix-env frontend written with Polymer";
       homepage = https://github.com/matejc/nixui;

From ba4687c3ea12b4c6c86fadae9d6b1835de571150 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 20 Jan 2017 21:22:03 +0100
Subject: [PATCH 434/727] radeontop: 2016-07-04 -> 2016-10-28

This is actually version 1.0 but to support `nix-env -u` we continue
using the release date.
---
 pkgs/os-specific/linux/radeontop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix
index adf02dfa9d7..cb720c20634 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/pkgs/os-specific/linux/radeontop/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "radeontop-${version}";
-  version = "2016-07-04";
+  version = "2016-10-28";
 
   src = fetchFromGitHub {
-    sha256 = "07pj5c3shnxljwq0hkksw7qnp8kb3n5ngihdmi4fqbmyz8in2vm5";
-    rev = "bb3ed18aa8877f2816348ca9f016bb61d67e636f";
+    sha256 = "0y4rl8pm7p22s1ipyb75mlsk9qb6j4rd6nlqb3digmimnyxda1q3";
+    rev = "v1.0";
     repo = "radeontop";
     owner = "clbr";
   };

From c7d49e5f6940d10d81523e9cbb62788485a205b6 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 21 Jan 2017 01:00:10 +0100
Subject: [PATCH 435/727] darwin: fixed eval of frameworks

---
 pkgs/os-specific/darwin/apple-sdk/frameworks.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index 3ecb3511422..9a3c3c556e3 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -104,6 +104,7 @@ with frameworks; with libs; {
   VideoDecodeAcceleration = [ CF CoreVideo ];
   VideoToolbox            = [ CF CoreMedia CoreVideo ];
   WebKit                  = [ ApplicationServices Carbon JavaScriptCore OpenGL ];
+  X11                     = []; # used by Tk, should this exist?
 
   # Umbrellas
   Accelerate          = [ CoreWLAN IOBluetooth ];

From 7ceca3dbbc70bdd84d7e3f4219cf5a5dd31576a4 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <skosyrev@ptsecurity.com>
Date: Thu, 12 Jan 2017 00:17:46 +0300
Subject: [PATCH 436/727] irony-server:  init at
 'same-version-irony-of-chosen-elpa`

---
 .../tools/irony-server/default.nix            | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 ++++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/tools/irony-server/default.nix

diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix
new file mode 100644
index 00000000000..ac5495b98d9
--- /dev/null
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, cmake, llvmPackages, irony }:
+
+stdenv.mkDerivation rec {
+  name = "irony-server-${version}";
+  inherit (irony) version;
+
+  buildInputs = [ cmake llvmPackages.clang ];
+
+  dontUseCmakeBuildDir = true;
+
+  cmakeDir = "server";
+
+  cmakeFlags = [
+    ''-DCMAKE_PREFIX_PATH=${llvmPackages.clang.cc}''
+  ];
+
+  src = irony.src;
+
+  meta = {
+    description = "The server part of irony.";
+    homepage = "https://melpa.org/#/irony";
+    maintainers = [ stdenv.lib.maintainers.deepfire ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.free;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c148094f31..9b1d4405ebc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5094,6 +5094,14 @@ in
 
   intercal = callPackage ../development/compilers/intercal { };
 
+  irony-server = callPackage ../development/tools/irony-server/default.nix {
+    # The repository of irony to use -- must match the version of the employed emacs
+    # package.  Wishing we could merge it into one irony package, to avoid this issue,
+    # but its emacs-side expression is autogenerated, and we can't hook into it (other
+    # than peek into its version).
+    inherit (emacsPackagesNg.melpaStablePackages) irony;
+  };
+
   hugs = callPackage ../development/interpreters/hugs { };
 
   openjdk7 =

From 1e266dac0d98368c8f253341fb175f1b65f402e3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 20 Jan 2017 18:50:52 -0600
Subject: [PATCH 437/727] ibus: make panel configurable

---
 nixos/modules/i18n/input-method/ibus.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix
index e23e28aa25e..3eaf9e2ab37 100644
--- a/nixos/modules/i18n/input-method/ibus.nix
+++ b/nixos/modules/i18n/input-method/ibus.nix
@@ -10,6 +10,11 @@ let
     check = x: (lib.types.package.check x) && (attrByPath ["meta" "isIbusEngine"] false x);
   };
 
+  impanel =
+    if cfg.panel != null
+    then "--panel=${cfg.panel}"
+    else "";
+
   ibusAutostart = pkgs.writeTextFile {
     name = "autostart-ibus-daemon";
     destination = "/etc/xdg/autostart/ibus-daemon.desktop";
@@ -17,7 +22,7 @@ let
       [Desktop Entry]
       Name=IBus
       Type=Application
-      Exec=${ibusPackage}/bin/ibus-daemon --daemonize --xim
+      Exec=${ibusPackage}/bin/ibus-daemon --daemonize --xim ${impanel}
     '';
   };
 in
@@ -36,6 +41,12 @@ in
           in
             "Enabled IBus engines. Available engines are: ${engines}.";
       };
+      panel = mkOption {
+        type = with types; nullOr path;
+        default = null;
+        example = literalExample "${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
+        description = "Replace the IBus panel with another panel.";
+      };
     };
   };
 

From 8a89d8935228efc673dccc88d240e4acbe14864f Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Sat, 21 Jan 2017 11:58:25 +0800
Subject: [PATCH 438/727] haskellPackages.tinc: 20161102 -> 20161119

---
 pkgs/development/tools/haskell/tinc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix
index 82d6492ce18..c35002c3311 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 = "20161102";
+  version = "20161119";
   src = fetchFromGitHub {
     owner = "sol";
     repo = "tinc";
-    rev = "411d0f319717d01dc71bd5c1faef8035656eaf3d";
-    sha256 = "040vyg9n7ihnqs6fyhhr5p4xscfxhji02wsfw4nncpxflzaciji5";
+    rev = "8e31ed920ad1660b3bc458b4f6b281bacaf4bd14";
+    sha256 = "0y9pvr20p9z4dddbfxgy9hl3ny7pxixxjg8ij7g8l14br6mcak30";
   };
   isLibrary = false;
   isExecutable = true;

From dc6413399c0f18d5ae6cfa514ea2582f4d9388de Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 21 Jan 2017 08:55:17 +0100
Subject: [PATCH 439/727] eudev: fix build with a fresh gperf

---
 pkgs/os-specific/linux/eudev/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index 772e69ac390..54ca7d9e324 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -18,6 +18,14 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
+  patches = [
+    (fetchurl {
+       # for new gperf
+       url = "https://github.com/gentoo/eudev/commit/5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60.patch";
+       sha256 = "097pjmgq243mz3vfxndwmm37prmacgq2f4r4gb47whfkbd6syqcw";
+    })
+  ];
+
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"

From 655a3012217b23ede3e7739a00a82248eda1af4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 21 Jan 2017 09:17:52 +0100
Subject: [PATCH 440/727] opentsdb: fixup sandboxed builds

http://hydra.nixos.org/build/46688690
/cc maintainer @rickynils.
---
 pkgs/tools/misc/opentsdb/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index 672ec52c076..31375eeaf85 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ autoconf automake curl jdk makeWrapper nettools python git ];
 
   preConfigure = ''
+    patchShebangs ./build-aux/
     ./bootstrap
   '';
 

From 81d9893bcd9d96b4c7aabea4381f6765289ef722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 21 Jan 2017 09:19:34 +0100
Subject: [PATCH 441/727] rpm-ostree: fix build by using older gperf for now

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77fd61549f0..3e0545dbd27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3659,7 +3659,9 @@ in
 
   rpm = callPackage ../tools/package-management/rpm { };
 
-  rpm-ostree = callPackage ../tools/misc/rpm-ostree { };
+  rpm-ostree = callPackage ../tools/misc/rpm-ostree {
+    gperf = gperf_3_0;
+  };
 
   rpmextract = callPackage ../tools/archivers/rpmextract { };
 

From 72a002f9d617caa26617570cf00afe0ce748cb4b Mon Sep 17 00:00:00 2001
From: Ollie Charles <ollie@ocharles.org.uk>
Date: Sat, 21 Jan 2017 12:26:30 +0000
Subject: [PATCH 442/727] golden-cheetah: Switch to 3.4 stable

---
 .../misc/golden-cheetah/default.nix           | 24 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 5a149657931..68c9246c24b 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,34 +1,30 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia
-, qttools, yacc, flex, zlib, config, qmakeHook, makeQtWrapper }:
+{ stdenv, fetchurl
+, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
+, yacc, flex, zlib, config, qmakeHook, makeQtWrapper
+}:
 stdenv.mkDerivation rec {
   name = "golden-cheetah-${version}";
-  version = "4.0-DEV1603";
+  version = "3.4";
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz";
-    sha256 = "12knlzqmq8b3nyl3kvcsnzrbjksgd83mzwzj97wccyfiffjl4wah";
+    sha256 = "0fiz2pj155cd357kph50lc6rjyzwp045glfv4y68qls9j7m9ayaf";
   };
-  buildInputs = [
+  qtInputs = [
     qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib
+    qtconnectivity
   ];
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ makeQtWrapper qmakeHook ] ++ qtInputs;
   preConfigure = ''
     cp src/gcconfig.pri.in src/gcconfig.pri
     cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
     echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri
     sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
   '';
-  #postConfigure =
-    #  + (
-    # with (config.golden-cheetah);
-    # stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) ''
-    #   echo 'DEFINES += GC_DROPBOX_CLIENT_ID=\\\"${config.golden-cheetah.dropbox-client-id}\\\"' >>  src/gcconfig.pri
-    #   echo 'DEFINES += GC_DROPBOX_CLIENT_SECRET=\\\"${config.golden-cheetah.dropbox-client-secret}\\\"' >>  src/gcconfig.pri
-    # '');
   installPhase = ''
     mkdir -p $out/bin
     cp src/GoldenCheetah $out/bin
-    wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" # patchelf doesn't seem to work
+    wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
   '';
   meta = {
     description = "Performance software for cyclists, runners and triathletes";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72c0a6012d7..677def448a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18001,7 +18001,7 @@ in
 
   discord = callPackage ../applications/networking/instant-messengers/discord { };
 
-  golden-cheetah = qt55.callPackage ../applications/misc/golden-cheetah {};
+  golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {};
 
   linkchecker = callPackage ../tools/networking/linkchecker { };
 

From 67c4512060057bd1413d03c7535ed6d52351b115 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sun, 9 Oct 2016 19:04:42 +0200
Subject: [PATCH 443/727] gogs service: init

---
 nixos/modules/misc/ids.nix           |   2 +
 nixos/modules/module-list.nix        |   1 +
 nixos/modules/services/misc/gogs.nix | 215 +++++++++++++++++++++++++++
 3 files changed, 218 insertions(+)
 create mode 100644 nixos/modules/services/misc/gogs.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index de69ada5bfe..5058d41bf75 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -283,6 +283,7 @@
       keystone = 265;
       glance = 266;
       couchpotato = 267;
+      gogs = 268;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -536,6 +537,7 @@
       keystone = 265;
       glance = 266;
       couchpotato = 267;
+      gogs = 268;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c63acfabb77..e99e344b932 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -258,6 +258,7 @@
   #./services/misc/gitit.nix
   ./services/misc/gitlab.nix
   ./services/misc/gitolite.nix
+  ./services/misc/gogs.nix
   ./services/misc/gpsd.nix
   ./services/misc/ihaskell.nix
   ./services/misc/leaps.nix
diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix
new file mode 100644
index 00000000000..09e5c4fe1ff
--- /dev/null
+++ b/nixos/modules/services/misc/gogs.nix
@@ -0,0 +1,215 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.gogs;
+  configFile = pkgs.writeText "app.ini" ''
+    APP_NAME = ${cfg.appName}
+    RUN_USER = ${cfg.user}
+    RUN_MODE = prod
+
+    [database]
+    DB_TYPE = ${cfg.database.type}
+    HOST = ${cfg.database.host}:${toString cfg.database.port}
+    NAME = ${cfg.database.name}
+    USER = ${cfg.database.user}
+    PASSWD = ${cfg.database.password}
+    PATH = ${cfg.database.path}
+
+    [repository]
+    ROOT = ${cfg.repositoryRoot}
+
+    [server]
+    DOMAIN = ${cfg.domain}
+    HTTP_ADDR = ${cfg.httpAddress}
+    HTTP_PORT = ${toString cfg.httpPort}
+    ROOT_URL = ${cfg.rootUrl}
+
+    [security]
+    SECRET_KEY = #secretkey#
+    INSTALL_LOCK = true
+
+    ${cfg.extraConfig}
+  '';
+in
+
+{
+  options = {
+    services.gogs = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Enable Go Git Service.";
+      };
+
+      useWizard = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Do not generate a configuration and use Gogs' installation wizard instead. The first registered user will be administrator.";
+      };
+
+      stateDir = mkOption {
+        default = "/var/lib/gogs";
+        type = types.str;
+        description = "Gogs data directory.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "gogs";
+        description = "User account under which Gogs runs.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "gogs";
+        description = "Group account under which Gogs runs.";
+      };
+
+      database = {
+        type = mkOption {
+          type = types.enum [ "sqlite3" "mysql" "postgres" ];
+          example = "mysql";
+          default = "sqlite3";
+          description = "Database engine to use.";
+        };
+
+        host = mkOption {
+          type = types.str;
+          default = "127.0.0.1";
+          description = "Database host address.";
+        };
+
+        port = mkOption {
+          type = types.int;
+          default = 3306;
+          description = "Database host port.";
+        };
+
+        name = mkOption {
+          type = types.str;
+          default = "gogs";
+          description = "Database name.";
+        };
+
+        user = mkOption {
+          type = types.str;
+          default = "gogs";
+          description = "Database user.";
+        };
+
+        password = mkOption {
+          type = types.str;
+          default = "";
+          description = "Database password.";
+        };
+
+        path = mkOption {
+          type = types.str;
+          default = "${cfg.stateDir}/data/gogs.db";
+          description = "Path to the sqlite3 database file.";
+        };
+      };
+
+      appName = mkOption {
+        type = types.str;
+        default = "Gogs: Go Git Service";
+        description = "Application name.";
+      };
+
+      repositoryRoot = mkOption {
+        type = types.str;
+        default = "${cfg.stateDir}/repositories";
+        description = "Path to the git repositories.";
+      };
+
+      domain = mkOption {
+        type = types.str;
+        default = "localhost";
+        description = "Domain name of your server.";
+      };
+
+      rootUrl = mkOption {
+        type = types.str;
+        default = "http://localhost:3000/";
+        description = "Full public URL of Gogs server.";
+      };
+
+      httpAddress = mkOption {
+        type = types.str;
+        default = "0.0.0.0";
+        description = "HTTP listen address.";
+      };
+
+      httpPort = mkOption {
+        type = types.int;
+        default = 3000;
+        description = "HTTP listen port.";
+      };
+
+      extraConfig = mkOption {
+        type = types.str;
+        default = "";
+        description = "Configuration lines appended to the generated Gogs configuration file.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.services.gogs = {
+      description = "Gogs (Go Git Service)";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.gogs.bin ];
+
+      preStart = ''
+        # copy custom configuration and generate a random secret key if needed
+        ${optionalString (cfg.useWizard == false) ''
+          mkdir -p ${cfg.stateDir}/custom/conf
+          cp -f ${configFile} ${cfg.stateDir}/custom/conf/app.ini
+          KEY=$(head -c 16 /dev/urandom | tr -dc A-Za-z0-9)
+          sed -i "s,#secretkey#,$KEY,g" ${cfg.stateDir}/custom/conf/app.ini
+        ''}
+
+        mkdir -p ${cfg.repositoryRoot}
+        # update all hooks' binary paths
+        HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*")
+        if [ "$HOOKS" ]
+        then
+          sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs.bin}/bin/gogs,g' $HOOKS
+          sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS
+          sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS
+          sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS
+        fi
+      '';
+
+      serviceConfig = {
+        Type = "simple";
+        User = cfg.user;
+        Group = cfg.group;
+        WorkingDirectory = cfg.stateDir;
+        ExecStart = "${pkgs.gogs.bin}/bin/gogs web";
+        Restart = "always";
+      };
+
+      environment = {
+        USER = cfg.user;
+        HOME = cfg.stateDir;
+        GOGS_WORK_DIR = cfg.stateDir;
+      };
+    };
+
+    users = {
+      extraUsers.gogs = {
+        description = "Go Git Service";
+        uid = config.ids.uids.gogs;
+        group = "gogs";
+        home = cfg.stateDir;
+        createHome = true;
+      };
+      extraGroups.gogs.gid = config.ids.gids.gogs;
+    };
+  };
+}

From 09b3df542d2cac5b444e6077d9486fb2e944a6f7 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Sat, 21 Jan 2017 15:02:02 +0200
Subject: [PATCH 444/727] w3m: fix package name

nix-repl> builtins.parseDrvName "w3m-v0.5.3+git20161120"
{ name = "w3m-v0.5.3+git20161120"; version = ""; }

nix-repl> builtins.parseDrvName "w3m-0.5.3+git20161120"
{ name = "w3m"; version = "0.5.3+git20161120"; }
---
 pkgs/applications/networking/browsers/w3m/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index f07668756ad..637041379db 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -15,7 +15,7 @@ assert mouseSupport -> gpm-ncurses != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "w3m-v0.5.3+git20161120";
+  name = "w3m-0.5.3+git20161120";
 
   src = fetchFromGitHub {
     owner = "tats";

From 140d135ee2e2f2ea538591fe25719c9c91d4651e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 21 Jan 2017 07:57:15 +0100
Subject: [PATCH 445/727] libopus: add patch to fix CVE-2017-0381

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

diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 82bf9a48679..559caf8928b 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, fixedPoint ? false, withCustomModes ? true }:
+{ stdenv, fetchurl, fetchpatch
+, fixedPoint ? false, withCustomModes ? true }:
 
 let
   version = "1.1.3";
@@ -11,6 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "0cxnd7pjxbgh6l3cbzsw29phpr5cq28fikfhjlp1hc3y5s0gxdjq";
   };
 
+  patches = [
+    (fetchpatch { # CVE-2017-0381
+      url = "https://github.com/xiph/opus/commit/79e8f527b0344b0897a65be35e77f7885bd99409.patch";
+      sha256 = "0clm4ixqkaj0a6i5rhaqfv3nnxyk33b2b8xlm7vyfd0y8kbh996q";
+    })
+  ];
+
   outputs = [ "out" "dev" ];
 
   configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point"

From 98bd722d1dae747c5786497b8689415d2bebf78f Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sat, 21 Jan 2017 13:24:26 +0000
Subject: [PATCH 446/727] systemd-boot: allow setting editor security option
 (#21853)

---
 .../loader/systemd-boot/systemd-boot-builder.py  |  2 ++
 .../boot/loader/systemd-boot/systemd-boot.nix    | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index 515136c904c..b91d64bb0a7 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -28,6 +28,8 @@ def write_loader_conf(generation):
         if "@timeout@" != "":
             f.write("timeout @timeout@\n")
         f.write("default nixos-generation-%d\n" % generation)
+        if not @editor@:
+            f.write("editor 0");
     os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf")
 
 def copy_from_profile(generation, name, dry_run=False):
diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
index cc43fb8bab4..39a9ffdb7a3 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@@ -20,6 +20,8 @@ let
 
     timeout = if config.boot.loader.timeout != null then config.boot.loader.timeout else "";
 
+    editor = if cfg.editor then "True" else "False";
+
     inherit (efi) efiSysMountPoint canTouchEfiVariables;
   };
 in {
@@ -36,6 +38,20 @@ in {
 
       description = "Whether to enable the systemd-boot (formerly gummiboot) EFI boot manager";
     };
+
+    editor = mkOption {
+      default = true;
+
+      type = types.bool;
+
+      description = ''
+        Whether to allow editing the kernel command-line before
+        boot. It is recommended to set this to false, as it allows
+        gaining root access by passing init=/bin/sh as a kernel
+        parameter. However, it is enabled by default for backwards
+        compatibility.
+      ''
+    };
   };
 
   config = mkIf cfg.enable {

From 8c928cd55ab53332734abd89471091d324db73ae Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 21 Jan 2017 13:31:10 +0000
Subject: [PATCH 447/727] why3: 0.87.1 -> 0.87.3

---
 pkgs/applications/science/logic/why3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 3891f3ca6d1..6363afb7a66 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "why3-${version}";
-  version = "0.87.1";
+  version = "0.87.3";
 
   src = fetchurl {
-    url    = https://gforge.inria.fr/frs/download.php/file/35893/why3-0.87.1.tar.gz;
-    sha256 = "1ssik2f6fkpvwpdmxz8hrm3p62qas3sjlqya0r57s60ilpkgiwwb";
+    url    = https://gforge.inria.fr/frs/download.php/file/36398/why3-0.87.3.tar.gz;
+    sha256 = "1fn9v6w1ilkrm2n4rz31w8qvjnchyvwxiqs67z3f59b5k99wb2ka";
   };
 
   buildInputs = (with ocamlPackages; [

From 068dad3a218ac06640e4cf9d0c550cc96162070a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 21 Jan 2017 14:42:10 +0100
Subject: [PATCH 448/727] systemd-boot: fix evaluation

---
 nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
index 39a9ffdb7a3..ec02f73cada 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@@ -50,7 +50,7 @@ in {
         gaining root access by passing init=/bin/sh as a kernel
         parameter. However, it is enabled by default for backwards
         compatibility.
-      ''
+      '';
     };
   };
 

From 86b74fb76b41b34279118c0909504d81a094d967 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 21 Jan 2017 13:43:04 +0000
Subject: [PATCH 449/727] alt-ergo: 0.99.1 -> 1.30

---
 pkgs/applications/science/logic/alt-ergo/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                      | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index 45e6674439e..7cf0aeb203d 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "alt-ergo-${version}";
-  version = "0.99.1";
+  version = "1.30";
 
   src = fetchurl {
     url    = "http://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz";
     name   = "${name}.tar.gz";
-    sha256 = "0lnlf56ysisa45dxvbwzhl4fgyxyfz35psals2kv9x8gyq54zwpm";
+    sha256 = "025pacb4ax864fn5x8k78mw6hiig4jcazblj18gzxspg4f1l5n1g";
   };
 
   buildInputs = with ocamlPackages;
-    [ ocaml findlib ocamlgraph zarith lablgtk ];
+    [ ocaml findlib camlzip ocamlgraph zarith lablgtk ocplib-simplex ];
 
   meta = {
     description = "High-performance theorem prover and SMT solver";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 677def448a6..ec04e8e85c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16980,7 +16980,9 @@ in
 
   abella = callPackage ../applications/science/logic/abella {};
 
-  alt-ergo = callPackage ../applications/science/logic/alt-ergo {};
+  alt-ergo = callPackage ../applications/science/logic/alt-ergo {
+    ocamlPackages = ocamlPackages_4_02;
+  };
 
   aspino = callPackage ../applications/science/logic/aspino {};
 

From 9ffd864e01a9f907c32de5cffa75fd8338547b8f Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Wed, 18 Jan 2017 19:53:06 +0100
Subject: [PATCH 450/727] vim plugins: added gruvbox

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index cc7be114224..560aa3ff079 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1621,6 +1621,17 @@ rec {
 
   };
 
+  gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "gruvbox-2016-09-28";
+    src = fetchgit {
+      url = "git://github.com/morhetz/gruvbox";
+      rev = "127c9d14d4bac1bac31e328b835a8919a255789c";
+      sha256 = "19wg9143wvlynblpxm0cnk3ars2hgss3y745hligqgvfy308f7sm";
+    };
+    dependencies = [];
+
+  };
+
   matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "matchit-zip";
     src = fetchurl {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index ed14d8d2559..cd22f63d562 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,6 +1,7 @@
 "CSApprox"
 "CheckAttach"
 "Gist"
+"gruvbox"
 "Hoogle"
 "Solarized"
 "Supertab"

From fb92916df8e5586b3cc1c4bd867f22d007570e3c Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 21 Jan 2017 16:14:45 +0100
Subject: [PATCH 451/727] wallabag: 2.1.4 -> 2.1.6

---
 pkgs/servers/web-apps/wallabag/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index 4eed952f804..4efb1ca9de6 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wallabag-${version}";
-  version = "2.1.4";
+  version = "2.1.6";
 
   # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur
 
   src = fetchurl {
     url = "https://framabag.org/wallabag-release-${version}.tar.gz";
-    sha256 = "0s4p9jls7jqq9jbcac21ibz9k5yxx0ifv2yhxlkia5kw9md20r7b";
+    sha256 = "0znywkrjlmxhacfkdyba2cjhgmrh509mayrfsrnc0rx3haxam7fx";
   };
 
   outputs = [ "out" "doc" ];

From 8eb7c70da8b61063d8218b4b705af39774de7b9f Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 21 Jan 2017 16:13:07 +0100
Subject: [PATCH 452/727] nextcloud: 11.0.0 -> 11.0.1

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 0d5d0a46e4e..d37b53398b6 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "11.0.0";
+  version = "11.0.1";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "0a8lc85jihlw326w0irykw5fbwcbz2mlq0vrcsd0niygqlvcppsv";
+    sha256 = "0aa6gzcbpjkk7ss3c1sg0scinhczvg4lgb59wv5jljliaks2n5h0";
   };
 
   installPhase = ''

From 754a9cf69804ec00527f4703806282c16179c589 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 20 Jan 2017 21:33:12 +0100
Subject: [PATCH 453/727] gnome3.20: remove

closes #19745
---
 .../gnome-3/3.20/apps/accerciser/default.nix  |  28 --
 .../gnome-3/3.20/apps/bijiben/default.nix     |  36 --
 .../gnome-3/3.20/apps/bijiben/src.nix         |  10 -
 .../gnome-3/3.20/apps/cheese/default.nix      |  26 --
 .../desktops/gnome-3/3.20/apps/cheese/src.nix |  10 -
 .../gnome-3/3.20/apps/evolution/default.nix   |  47 --
 .../gnome-3/3.20/apps/evolution/src.nix       |  10 -
 .../gnome-3/3.20/apps/file-roller/default.nix |  21 -
 .../gnome-3/3.20/apps/file-roller/src.nix     |  10 -
 .../gnome-3/3.20/apps/gedit/default.nix       |  31 --
 pkgs/desktops/gnome-3/3.20/apps/gedit/src.nix |  10 -
 .../gnome-3/3.20/apps/glade/default.nix       |  30 --
 pkgs/desktops/gnome-3/3.20/apps/glade/src.nix |  10 -
 .../gnome-3/3.20/apps/gnome-boxes/default.nix |  42 --
 .../gnome-3/3.20/apps/gnome-boxes/src.nix     |  10 -
 .../3.20/apps/gnome-calendar/default.nix      |  22 -
 .../gnome-3/3.20/apps/gnome-calendar/src.nix  |  10 -
 .../3.20/apps/gnome-characters/default.nix    |  19 -
 .../3.20/apps/gnome-characters/src.nix        |  10 -
 .../3.20/apps/gnome-clocks/default.nix        |  27 --
 .../gnome-3/3.20/apps/gnome-clocks/src.nix    |  10 -
 .../3.20/apps/gnome-documents/default.nix     |  39 --
 .../gnome-3/3.20/apps/gnome-documents/src.nix |  10 -
 .../gnome-getting-started-docs/default.nix    |  15 -
 .../apps/gnome-getting-started-docs/src.nix   |  10 -
 .../gnome-3/3.20/apps/gnome-logs/default.nix  |  21 -
 .../gnome-3/3.20/apps/gnome-logs/src.nix      |  10 -
 .../gnome-3/3.20/apps/gnome-maps/default.nix  |  28 --
 .../gnome-3/3.20/apps/gnome-maps/soup.patch   |  12 -
 .../gnome-3/3.20/apps/gnome-maps/src.nix      |  10 -
 .../gnome-3/3.20/apps/gnome-music/default.nix |  30 --
 .../gnome-3/3.20/apps/gnome-music/src.nix     |  10 -
 .../3.20/apps/gnome-nettool/default.nix       |  26 --
 .../3.20/apps/gnome-photos/default.nix        |  31 --
 .../gnome-3/3.20/apps/gnome-photos/src.nix    |  10 -
 .../3.20/apps/gnome-weather/default.nix       |  19 -
 .../gnome-3/3.20/apps/gnome-weather/src.nix   |  10 -
 .../3.20/apps/nautilus-sendto/default.nix     |  22 -
 .../gnome-3/3.20/apps/polari/default.nix      |  22 -
 .../desktops/gnome-3/3.20/apps/polari/src.nix |  10 -
 .../gnome-3/3.20/apps/seahorse/default.nix    |  35 --
 .../gnome-3/3.20/apps/seahorse/src.nix        |  10 -
 .../gnome-3/3.20/apps/vinagre/default.nix     |  21 -
 .../gnome-3/3.20/apps/vinagre/src.nix         |  10 -
 .../3.20/core/adwaita-icon-theme/default.nix  |  21 -
 .../3.20/core/adwaita-icon-theme/src.nix      |  10 -
 .../gnome-3/3.20/core/baobab/default.nix      |  32 --
 .../desktops/gnome-3/3.20/core/baobab/src.nix |  10 -
 .../gnome-3/3.20/core/caribou/default.nix     |  31 --
 .../3.20/core/dconf-editor/default.nix        |  16 -
 .../gnome-3/3.20/core/dconf-editor/src.nix    |  10 -
 .../gnome-3/3.20/core/dconf/default.nix       |  23 -
 .../gnome-3/3.20/core/empathy/default.nix     |  57 ---
 .../gnome-3/3.20/core/eog/default.nix         |  20 -
 pkgs/desktops/gnome-3/3.20/core/eog/src.nix   |  10 -
 .../gnome-3/3.20/core/epiphany/default.nix    |  37 --
 .../gnome-3/3.20/core/epiphany/src.nix        |  10 -
 .../gnome-3/3.20/core/evince/default.nix      |  63 ---
 .../desktops/gnome-3/3.20/core/evince/src.nix |  10 -
 .../core/evolution-data-server/default.nix    |  30 --
 .../3.20/core/evolution-data-server/src.nix   |  10 -
 .../gnome-3/3.20/core/folks/default.nix       |  43 --
 .../gnome-3/3.20/core/gconf/default.nix       |  32 --
 .../gnome-3/3.20/core/gcr/default.nix         |  28 --
 pkgs/desktops/gnome-3/3.20/core/gcr/src.nix   |  10 -
 .../3.20/core/gdm/3.16-wip/default.nix        |  41 --
 .../3.16-wip/disable_x_access_control.patch   |  15 -
 .../3.20/core/gdm/3.16-wip/sessions_dir.patch |  17 -
 .../3.20/core/gdm/3.16-wip/xserver_path.patch |  83 ----
 .../gnome-3/3.20/core/gdm/default.nix         |  47 --
 .../core/gdm/disable_x_access_control.patch   |  13 -
 .../gnome-3/3.20/core/gdm/libsystemd.patch    |  21 -
 .../3.20/core/gdm/no-dbus-launch.patch        |  20 -
 .../gnome-3/3.20/core/gdm/sessions_dir.patch  |  17 -
 pkgs/desktops/gnome-3/3.20/core/gdm/src.nix   |  10 -
 .../gnome-3/3.20/core/gdm/xserver_path.patch  |  15 -
 .../3.20/core/geocode-glib/default.nix        |  14 -
 .../gnome-3/3.20/core/geocode-glib/src.nix    |  10 -
 .../gnome-3/3.20/core/gjs/default.nix         |  20 -
 pkgs/desktops/gnome-3/3.20/core/gjs/src.nix   |  10 -
 .../3.20/core/gnome-backgrounds/default.nix   |  12 -
 .../3.20/core/gnome-backgrounds/src.nix       |  10 -
 .../3.20/core/gnome-bluetooth/default.nix     |  23 -
 .../gnome-3/3.20/core/gnome-bluetooth/src.nix |  10 -
 .../3.20/core/gnome-calculator/default.nix    |  46 --
 .../3.20/core/gnome-calculator/src.nix        |  10 -
 .../3.20/core/gnome-common/default.nix        |  17 -
 .../gnome-3/3.20/core/gnome-common/src.nix    |  10 -
 .../3.20/core/gnome-contacts/default.nix      |  47 --
 .../3.20/core/gnome-contacts/gio_unix.patch   |  10 -
 .../gnome-3/3.20/core/gnome-contacts/src.nix  |  10 -
 .../core/gnome-control-center/default.nix     |  56 ---
 .../3.20/core/gnome-control-center/src.nix    |  10 -
 .../3.20/core/gnome-desktop/default.nix       |  24 --
 .../gnome-3/3.20/core/gnome-desktop/src.nix   |  10 -
 .../3.20/core/gnome-dictionary/default.nix    |  32 --
 .../3.20/core/gnome-dictionary/src.nix        |  10 -
 .../3.20/core/gnome-disk-utility/default.nix  |  35 --
 .../3.20/core/gnome-disk-utility/src.nix      |  10 -
 .../3.20/core/gnome-font-viewer/default.nix   |  31 --
 .../3.20/core/gnome-font-viewer/src.nix       |  10 -
 .../3.20/core/gnome-keyring/default.nix       |  33 --
 .../gnome-3/3.20/core/gnome-keyring/src.nix   |  10 -
 .../gnome-3/3.20/core/gnome-menus/default.nix |  22 -
 .../core/gnome-online-accounts/default.nix    |  28 --
 .../3.20/core/gnome-online-accounts/src.nix   |  10 -
 .../3.20/core/gnome-online-miners/default.nix |  28 --
 .../3.20/core/gnome-online-miners/src.nix     |  10 -
 .../3.20/core/gnome-screenshot/default.nix    |  31 --
 .../3.20/core/gnome-screenshot/src.nix        |  10 -
 .../3.20/core/gnome-session/default.nix       |  27 --
 .../gnome-3/3.20/core/gnome-session/src.nix   |  11 -
 .../core/gnome-settings-daemon/default.nix    |  32 --
 .../3.20/core/gnome-settings-daemon/src.nix   |  10 -
 .../core/gnome-shell-extensions/default.nix   |  19 -
 .../3.20/core/gnome-shell-extensions/src.nix  |  10 -
 .../gnome-3/3.20/core/gnome-shell/default.nix |  63 ---
 .../gnome-3/3.20/core/gnome-shell/src.nix     |  10 -
 .../3.20/core/gnome-software/default.nix      |  27 --
 .../gnome-3/3.20/core/gnome-software/src.nix  |  10 -
 .../3.20/core/gnome-system-log/default.nix    |  36 --
 .../core/gnome-system-monitor/default.nix     |  32 --
 .../3.20/core/gnome-system-monitor/src.nix    |  10 -
 .../3.20/core/gnome-terminal/default.nix      |  30 --
 .../gnome-3/3.20/core/gnome-terminal/src.nix  |  10 -
 .../core/gnome-themes-standard/default.nix    |  14 -
 .../3.20/core/gnome-themes-standard/src.nix   |  10 -
 .../3.20/core/gnome-user-docs/default.nix     |  15 -
 .../gnome-3/3.20/core/gnome-user-docs/src.nix |  10 -
 .../3.20/core/gnome-user-share/default.nix    |  45 --
 .../3.20/core/gnome-user-share/src.nix        |  12 -
 .../3.20/core/grilo-plugins/default.nix       |  29 --
 .../gnome-3/3.20/core/grilo/default.nix       |  37 --
 .../gnome-3/3.20/core/grilo/setup-hook.sh     |   7 -
 .../gsettings-desktop-schemas/default.nix     |  22 -
 .../core/gsettings-desktop-schemas/src.nix    |  10 -
 .../gnome-3/3.20/core/gsound/default.nix      |  22 -
 .../3.20/core/gtksourceview/default.nix       |  22 -
 .../core/gtksourceview/nix_share_path.patch   |  11 -
 .../gnome-3/3.20/core/gtksourceview/src.nix   |  10 -
 .../3.20/core/gtksourceviewmm/default.nix     |  16 -
 .../gnome-3/3.20/core/gtksourceviewmm/src.nix |  11 -
 .../gnome-3/3.20/core/gucharmap/default.nix   |  33 --
 .../gnome-3/3.20/core/gucharmap/src.nix       |  10 -
 .../gnome-3/3.20/core/libcroco/default.nix    |  21 -
 .../gnome-3/3.20/core/libgdata/default.nix    |  30 --
 .../gnome-3/3.20/core/libgee/default.nix      |  26 --
 .../core/libgee/fix_introspection_paths.patch |  13 -
 .../gnome-3/3.20/core/libgee/libgee-1.nix     |  26 --
 .../3.20/core/libgnome-keyring/default.nix    |  26 --
 .../gnome-3/3.20/core/libgnomekbd/default.nix |  24 --
 .../gnome-3/3.20/core/libgweather/default.nix |  17 -
 .../gnome-3/3.20/core/libgweather/src.nix     |  10 -
 .../gnome-3/3.20/core/libgxps/default.nix     |  21 -
 .../gnome-3/3.20/core/libpeas/default.nix     |  19 -
 .../gnome-3/3.20/core/libpeas/src.nix         |  13 -
 .../gnome-3/3.20/core/libzapojit/default.nix  |  16 -
 .../gnome-3/3.20/core/mutter/default.nix      |  31 --
 .../gnome-3/3.20/core/mutter/math.patch       |  10 -
 .../desktops/gnome-3/3.20/core/mutter/src.nix |  10 -
 .../gnome-3/3.20/core/mutter/x86.patch        |  33 --
 .../gnome-3/3.20/core/nautilus/default.nix    |  22 -
 .../3.20/core/nautilus/extension_dir.patch    |  24 --
 .../gnome-3/3.20/core/nautilus/src.nix        |  10 -
 .../gnome-3/3.20/core/rest/default.nix        |  19 -
 .../gnome-3/3.20/core/sushi/default.nix       |  40 --
 pkgs/desktops/gnome-3/3.20/core/sushi/src.nix |  10 -
 .../3.20/core/totem-pl-parser/default.nix     |  20 -
 .../gnome-3/3.20/core/totem/default.nix       |  43 --
 pkgs/desktops/gnome-3/3.20/core/totem/src.nix |  10 -
 .../gnome-3/3.20/core/totem/x86.patch         |  11 -
 .../gnome-3/3.20/core/tracker/default.nix     |  48 ---
 .../gnome-3/3.20/core/tracker/src.nix         |  11 -
 .../gnome-3/3.20/core/vino/default.nix        |  39 --
 pkgs/desktops/gnome-3/3.20/core/vino/src.nix  |  10 -
 pkgs/desktops/gnome-3/3.20/core/vte/2.90.nix  |  40 --
 .../gnome-3/3.20/core/vte/default.nix         |  55 ---
 pkgs/desktops/gnome-3/3.20/core/vte/src.nix   |  10 -
 .../gnome-3/3.20/core/yelp-tools/default.nix  |  17 -
 .../gnome-3/3.20/core/yelp-tools/src.nix      |  10 -
 .../gnome-3/3.20/core/yelp-xsl/default.nix    |  18 -
 .../gnome-3/3.20/core/yelp-xsl/src.nix        |  10 -
 .../gnome-3/3.20/core/yelp/default.nix        |  26 --
 pkgs/desktops/gnome-3/3.20/core/yelp/src.nix  |  10 -
 .../gnome-3/3.20/core/zenity/default.nix      |  19 -
 .../desktops/gnome-3/3.20/core/zenity/src.nix |  10 -
 pkgs/desktops/gnome-3/3.20/default.nix        | 401 ------------------
 .../gnome-3/3.20/desktop/rarian/default.nix   |  16 -
 .../gnome-3/3.20/devtools/anjuta/default.nix  |  26 --
 .../gnome-3/3.20/devtools/anjuta/src.nix      |  10 -
 .../gnome-3/3.20/devtools/devhelp/default.nix |  19 -
 .../gnome-3/3.20/devtools/devhelp/src.nix     |  10 -
 .../gnome-3/3.20/devtools/gdl/default.nix     |  15 -
 .../gnome-3/3.20/devtools/gdl/src.nix         |  10 -
 .../devtools/gnome-devel-docs/default.nix     |  15 -
 .../3.20/devtools/gnome-devel-docs/src.nix    |  10 -
 .../3.20/devtools/nemiver/bool_slot.patch     |  13 -
 .../gnome-3/3.20/devtools/nemiver/default.nix |  23 -
 .../3.20/devtools/nemiver/safe_ptr.patch      |  10 -
 .../gnome-3/3.20/devtools/nemiver/src.nix     |  11 -
 .../gnome-3/3.20/games/aisleriot/default.nix  |  20 -
 .../gnome-3/3.20/games/aisleriot/src.nix      |  10 -
 .../3.20/games/five-or-more/default.nix       |  19 -
 .../gnome-3/3.20/games/five-or-more/src.nix   |  10 -
 .../3.20/games/four-in-a-row/default.nix      |  19 -
 .../gnome-3/3.20/games/four-in-a-row/src.nix  |  10 -
 .../3.20/games/gnome-chess/default.nix        |  19 -
 .../gnome-3/3.20/games/gnome-chess/src.nix    |  10 -
 .../3.20/games/gnome-klotski/default.nix      |  19 -
 .../gnome-3/3.20/games/gnome-klotski/src.nix  |  10 -
 .../3.20/games/gnome-mahjongg/default.nix     |  19 -
 .../gnome-3/3.20/games/gnome-mahjongg/src.nix |  10 -
 .../3.20/games/gnome-mines/default.nix        |  19 -
 .../gnome-3/3.20/games/gnome-mines/src.nix    |  10 -
 .../3.20/games/gnome-nibbles/default.nix      |  21 -
 .../gnome-3/3.20/games/gnome-nibbles/src.nix  |  10 -
 .../3.20/games/gnome-robots/default.nix       |  20 -
 .../gnome-3/3.20/games/gnome-robots/src.nix   |  10 -
 .../3.20/games/gnome-sudoku/default.nix       |  17 -
 .../gnome-3/3.20/games/gnome-sudoku/src.nix   |  11 -
 .../3.20/games/gnome-taquin/default.nix       |  19 -
 .../gnome-3/3.20/games/gnome-taquin/src.nix   |  10 -
 .../3.20/games/gnome-tetravex/default.nix     |  18 -
 .../gnome-3/3.20/games/gnome-tetravex/src.nix |  10 -
 .../gnome-3/3.20/games/hitori/default.nix     |  24 --
 .../gnome-3/3.20/games/hitori/src.nix         |  10 -
 .../gnome-3/3.20/games/iagno/default.nix      |  19 -
 .../desktops/gnome-3/3.20/games/iagno/src.nix |  10 -
 .../gnome-3/3.20/games/lightsoff/default.nix  |  19 -
 .../gnome-3/3.20/games/lightsoff/src.nix      |  10 -
 .../3.20/games/quadrapassel/default.nix       |  21 -
 .../gnome-3/3.20/games/quadrapassel/src.nix   |  10 -
 .../gnome-3/3.20/games/swell-foop/default.nix |  19 -
 .../gnome-3/3.20/games/swell-foop/src.nix     |  10 -
 .../gnome-3/3.20/games/tali/default.nix       |  19 -
 pkgs/desktops/gnome-3/3.20/games/tali/src.nix |  10 -
 pkgs/desktops/gnome-3/3.20/installer.nix      |  15 -
 ...d-with-evolution-data-server-3.13.90.patch |  39 --
 .../gnome-3/3.20/misc/california/default.nix  |  39 --
 .../gnome-3/3.20/misc/geary/default.nix       |  49 ---
 .../gnome-3/3.20/misc/gexiv2/default.nix      |  28 --
 .../gnome-3/3.20/misc/gfbgraph/default.nix    |  23 -
 .../gnome-3/3.20/misc/gitg/default.nix        |  40 --
 pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix  |  10 -
 .../3.20/misc/gnome-packagekit/default.nix    |  20 -
 .../3.20/misc/gnome-packagekit/src.nix        |  10 -
 ...themes-and-icons-in-system-data-dirs.patch | 120 ------
 ...-multiple-entries-for-a-single-theme.patch | 100 -----
 ...reate-config-dir-if-it-doesn-t-exist.patch |  29 --
 .../3.20/misc/gnome-tweak-tool/default.nix    |  44 --
 .../gnome-tweak-tool/find_gsettings.patch     |  22 -
 .../3.20/misc/gnome-tweak-tool/src.nix        |  10 -
 .../3.20/misc/gnome-video-effects/default.nix |  20 -
 .../gnome-3/3.20/misc/gpaste/default.nix      |  45 --
 .../gnome-3/3.20/misc/gspell/default.nix      |  11 -
 .../desktops/gnome-3/3.20/misc/gspell/src.nix |  10 -
 .../gnome-3/3.20/misc/gtkhtml/default.nix     |  16 -
 .../gnome-3/3.20/misc/gtkhtml/src.nix         |  10 -
 .../3.20/misc/libgames-support/default.nix    |  22 -
 .../gnome-3/3.20/misc/libgda/default.nix      |  22 -
 .../desktops/gnome-3/3.20/misc/libgda/src.nix |  10 -
 .../3.20/misc/libgit2-glib/default.nix        |  13 -
 .../gnome-3/3.20/misc/libgit2-glib/src.nix    |  12 -
 .../gnome-3/3.20/misc/libmediaart/default.nix |  22 -
 .../gnome-3/3.20/misc/pidgin/default.nix      |  42 --
 .../gnome-3/3.20/misc/pomodoro/default.nix    |  50 ---
 .../gnome-3/3.22/core/epiphany/src.nix        |   6 +-
 .../core/gnome-control-center/default.nix     |   2 +-
 268 files changed, 4 insertions(+), 5929 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/accerciser/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/bijiben/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/bijiben/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/cheese/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/file-roller/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/file-roller/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gedit/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gedit/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/glade/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/glade/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-characters/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-characters/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-documents/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-logs/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-logs/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-maps/soup.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-music/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-music/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-nettool/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-photos/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-weather/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/gnome-weather/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/nautilus-sendto/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/polari/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/polari/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/seahorse/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/vinagre/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/apps/vinagre/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/baobab/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/baobab/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/caribou/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/dconf-editor/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/dconf/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/empathy/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/eog/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/eog/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/evince/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/evince/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/evolution-data-server/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/folks/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gconf/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gcr/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gcr/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/disable_x_access_control.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/sessions_dir.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/xserver_path.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gdm/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gdm/disable_x_access_control.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gdm/libsystemd.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gdm/no-dbus-launch.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gdm/sessions_dir.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gdm/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gdm/xserver_path.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/geocode-glib/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/geocode-glib/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gjs/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gjs/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-common/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-common/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-contacts/gio_unix.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-contacts/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-control-center/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-desktop/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-keyring/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-menus/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-session/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-shell/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-software/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-terminal/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gnome-user-share/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/grilo-plugins/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/grilo/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/grilo/setup-hook.sh
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gsound/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gtksourceview/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gtksourceview/nix_share_path.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gtksourceview/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gucharmap/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/gucharmap/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/libgdata/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/libgee/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/libgee/fix_introspection_paths.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/libgnome-keyring/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/libgnomekbd/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/libgweather/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/libgweather/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/libgxps/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/libpeas/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/libpeas/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/libzapojit/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/mutter/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/mutter/math.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/mutter/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/mutter/x86.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/nautilus/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/nautilus/extension_dir.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/rest/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/sushi/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/sushi/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/totem-pl-parser/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/totem/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/totem/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/totem/x86.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/tracker/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/tracker/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/vino/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/vino/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/vte/2.90.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/vte/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/vte/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/yelp-tools/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/yelp-tools/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/yelp-xsl/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/yelp-xsl/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/yelp/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/yelp/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/zenity/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/core/zenity/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/desktop/rarian/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/devtools/anjuta/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/devtools/devhelp/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/devtools/gdl/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/devtools/gdl/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/devtools/nemiver/bool_slot.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/devtools/nemiver/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/devtools/nemiver/safe_ptr.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/devtools/nemiver/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/aisleriot/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/aisleriot/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/five-or-more/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/four-in-a-row/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/four-in-a-row/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-chess/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-chess/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-klotski/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-klotski/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-mines/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-mines/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-robots/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-robots/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-taquin/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-taquin/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/hitori/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/hitori/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/iagno/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/iagno/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/lightsoff/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/lightsoff/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/quadrapassel/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/quadrapassel/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/swell-foop/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/swell-foop/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/tali/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/games/tali/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/installer.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/california/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/geary/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gexiv2/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gfbgraph/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/find_gsettings.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gnome-video-effects/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gspell/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gspell/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gtkhtml/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/gtkhtml/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/libgames-support/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/libgda/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/libgda/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/libmediaart/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix

diff --git a/pkgs/desktops/gnome-3/3.20/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.20/apps/accerciser/default.nix
deleted file mode 100644
index f8856ca7130..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/accerciser/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, itstool, libxml2, python3Packages, at_spi2_core
-, dbus, intltool, libwnck3 }:
-
-stdenv.mkDerivation rec {
-  name = "accerciser-3.14.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/accerciser/3.14/${name}.tar.xz";
-    sha256 = "0x05gpajpcs01g7m34g6fxz8122cf9kx3k0lchwl34jy8xfr39gm";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi
-    python3Packages.pygobject3 python3Packages.ipython
-    at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme
-  ];
-
-  wrapPrefixVariables = [ "PYTHONPATH" ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Accerciser;
-    description = "Interactive Python accessibility explorer";
-    maintainers = gnome3.maintainers;
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.20/apps/bijiben/default.nix
deleted file mode 100644
index 00895f9a2bb..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/bijiben/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, glib
-, evolution_data_server, evolution, sqlite
-, makeWrapper, itstool, desktop_file_utils
-, clutter_gtk, libuuid, webkitgtk, zeitgeist
-, gnome3, librsvg, gdk_pixbuf, libxml2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig glib intltool itstool libxml2
-                  clutter_gtk libuuid webkitgtk gnome3.tracker
-                  gnome3.gnome_online_accounts zeitgeist desktop_file_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  evolution_data_server evolution sqlite ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/bijiben" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Bijiben;
-    description = "Note editor designed to remain simple to use";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/3.20/apps/bijiben/src.nix
deleted file mode 100644
index 83961869826..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/bijiben/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "bijiben-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/bijiben/3.20/bijiben-3.20.2.tar.xz;
-    sha256 = "5774dfdedb79f5ffe5bac3cebe0816dc7e6410381744dcb999815061dee6a981";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix
deleted file mode 100644
index b5f70d84e52..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3
-, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool
-, libgudev
-, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool
-                  gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2
-                  gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop
-                  gst_all_1.gst-plugins-bad clutter_gtk clutter-gst
-                  libcanberra_gtk3 libgudev ];
-
-  enableParallelBuilding = true;
-
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Cheese;
-    description = "Take photos and videos with your webcam, with fun graphical effects";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/cheese/src.nix b/pkgs/desktops/gnome-3/3.20/apps/cheese/src.nix
deleted file mode 100644
index 3ca8c8c73c8..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/cheese/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "cheese-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/cheese/3.20/cheese-3.20.2.tar.xz;
-    sha256 = "b7c18719b708e039c063ef09278ee813923556e06af4a7e9598c5d3bdeb83775";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix
deleted file mode 100644
index 095c6e7814e..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
-, pkgconfig, gtk3, glib, libnotify, gtkspell3
-, wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite
-, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
-, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf }:
-
-let
-  majVer = gnome3.version;
-in stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
-                            gnome3.evolution_data_server ];
-
-  propagatedBuildInputs = [ gnome3.gtkhtml ];
-
-  buildInputs = [ gtk3 glib intltool itstool libxml2 libtool
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
-                  gnome3.evolution_data_server libsecret libical gcr
-                  webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
-                  libcanberra_gtk3 bogofilter gnome3.libgdata sqlite
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
-                  nss nspr libnotify procps highlight gnome3.libgweather
-                  gnome3.gsettings_desktop_schemas dconf
-                  gnome3.libgnome_keyring gnome3.glib_networking ];
-
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
-                     "--disable-libcryptui" ];
-
-  NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  requiredSystemFeatures = [ "big-parallel" ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Evolution;
-    description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix
deleted file mode 100644
index b43dc9c505d..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "evolution-3.20.5";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/evolution/3.20/evolution-3.20.5.tar.xz;
-    sha256 = "2e13551ce0996963506f0bdde5e01c3b8aa0622849a272ff12877cd595baeb6e";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.20/apps/file-roller/default.nix
deleted file mode 100644
index 18188829377..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/file-roller/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
-, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf, libnotify, nautilus }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive
-                  gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg
-                  gnome3.dconf libnotify nautilus ];
-
-  installFlags = [ "nautilus_extensiondir=$(out)/lib/nautilus/extensions-3.0" ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/FileRoller;
-    description = "Archive manager for the GNOME desktop environment";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/3.20/apps/file-roller/src.nix
deleted file mode 100644
index 37595ae27d7..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/file-roller/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "file-roller-3.20.3";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/file-roller/3.20/file-roller-3.20.3.tar.xz;
-    sha256 = "6b5c2de4c6bd52318cacd2a398cdfa45a5f1df8a77c6652a38a6a1d3e53644e9";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gedit/default.nix
deleted file mode 100644
index 69056e28c26..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gedit/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, intltool, fetchurl, enchant, isocodes
-, pkgconfig, gtk3, glib
-, bash, wrapGAppsHook, itstool, libsoup, libxml2
-, gnome3, librsvg, gdk_pixbuf, file, gspell }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = [ gtk3 glib intltool itstool enchant isocodes
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup
-                  gnome3.libpeas gnome3.gtksourceview libxml2
-                  gnome3.gsettings_desktop_schemas gnome3.dconf file gspell ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.libpeas gnome3.gtksourceview ]}")
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Gedit;
-    description = "Official text editor of the GNOME desktop environment";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gedit/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gedit/src.nix
deleted file mode 100644
index c511bc663a5..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gedit/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gedit-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gedit/3.20/gedit-3.20.2.tar.xz;
-    sha256 = "32a1276a71a0d4a5af4e20a87bc273170ba8e075fc1ca7f51c8d3a6c150463f8";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.20/apps/glade/default.nix
deleted file mode 100644
index a0f8d966955..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/glade/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, intltool, fetchurl, python
-, pkgconfig, gtk3, glib
-, makeWrapper, itstool, libxml2, docbook_xsl
-, gnome3, librsvg, gdk_pixbuf, libxslt }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python
-                  gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/glade" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Glade;
-    description = "User interface designer for GTK+ applications";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/glade/src.nix b/pkgs/desktops/gnome-3/3.20/apps/glade/src.nix
deleted file mode 100644
index d32dbd94d05..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/glade/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "glade-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/glade/3.20/glade-3.20.0.tar.xz;
-    sha256 = "82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix
deleted file mode 100644
index edb0075fdae..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
-, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
-, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32
-, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
-, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
-, libusb, libarchive, acl, libgudev, qemu
-}:
-
-# TODO: ovirt (optional)
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  buildInputs = [
-    makeWrapper pkgconfig intltool itstool libvirt-glib glib
-    gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
-    libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp
-    gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
-    librsvg desktop_file_utils acl libgudev numactl xen
-  ];
-
-  preFixup = ''
-    for prog in "$out/bin/"*; do
-        wrapProgram "$prog" \
-            --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-            --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-            --prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Simple GNOME 3 application to access remote or virtual systems";
-    homepage = https://wiki.gnome.org/action/show/Apps/Boxes;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/src.nix
deleted file mode 100644
index 1d53821b13a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-boxes-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-boxes/3.20/gnome-boxes-3.20.2.tar.xz;
-    sha256 = "c0379ce1de9d2a43a6875cbe1f2ef7ef69161b284926d59c44246a9142130fc5";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/default.nix
deleted file mode 100644
index 5fe6583660c..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, evolution_data_server, sqlite, libxml2, libsoup
-, glib, gnome_online_accounts }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server
-    sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Calendar;
-    description = "Simple and beautiful calendar application for GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/src.nix
deleted file mode 100644
index 4871139a6f3..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-calendar/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-calendar-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-calendar/3.20/gnome-calendar-3.20.2.tar.xz;
-    sha256 = "f132cff56310b83cf086628e949685b04cdaf872e989d67dbb8a3e4e9943deee";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-characters/default.nix
deleted file mode 100644
index 4571a5d50e8..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-characters/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, gjs, gdk_pixbuf, librsvg }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
-    librsvg gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Design/Apps/CharacterMap;
-    description = "Simple utility application to find and insert unusual characters";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-characters/src.nix
deleted file mode 100644
index d29173c23ff..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-characters/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-characters-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-characters/3.20/gnome-characters-3.20.1.tar.xz;
-    sha256 = "6891eed27a5b023200992540266a9216d081eef890d6d0836380dc3c0033857c";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/default.nix
deleted file mode 100644
index e39614e765d..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, intltool, fetchurl, libgweather, libnotify
-, pkgconfig, gtk3, glib, gsound
-, makeWrapper, itstool, libcanberra_gtk3, libtool
-, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
-                  gnome3.gsettings_desktop_schemas makeWrapper
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gnome_desktop gnome3.geocode_glib geoclue2
-                  libgweather libnotify libtool gsound
-                  wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Clocks;
-    description = "Clock application designed for GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/src.nix
deleted file mode 100644
index 30fccb61d34..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-clocks/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-clocks-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-clocks/3.20/gnome-clocks-3.20.1.tar.xz;
-    sha256 = "92ad7b409c5118464af49ca28262ae43e9d377435ad2b10048b23e6e11ae476f";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix
deleted file mode 100644
index 5daa7277f7b..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, intltool, fetchurl, evince, gjs
-, pkgconfig, gtk3, glib
-, makeWrapper, itstool, libxslt, webkitgtk
-, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
-, gobjectIntrospection, json_glib, inkscape, poppler_utils
-, gmp, desktop_file_utils, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  configureFlags = [ "--enable-getting-started" ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
-                  docbook_xsl desktop_file_utils inkscape poppler_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper gmp
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg evince
-                  libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
-                  gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
-                  gnome3.gnome_desktop gnome3.libzapojit json_glib
-                  wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication"
-
-    gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi')
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Documents;
-    description = "Document manager application designed to work with GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/src.nix
deleted file mode 100644
index db5d2c610c9..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-documents-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-documents/3.20/gnome-documents-3.20.0.tar.xz;
-    sha256 = "a5fa496c5e80eccb8d2e5bba7f4d7dc4cc6c9f53d5bc028402428771be1237d2";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/default.nix
deleted file mode 100644
index 0c75ebd7c78..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ intltool itstool libxml2 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://live.gnome.org/DocumentationProject;
-    description = "Help a new user get started in GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.cc-by-sa-30;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/src.nix
deleted file mode 100644
index 2550b1a46b4..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-getting-started-docs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-getting-started-docs-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-getting-started-docs/3.20/gnome-getting-started-docs-3.20.0.tar.xz;
-    sha256 = "0dc3a69d646c3ee3c6ef1a34dbc7f469d66275bd20215071fd495ae5900fcfdc";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-logs/default.nix
deleted file mode 100644
index d4135fdb1ba..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-logs/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libxml2, systemd }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  configureFlags = [ "--disable-tests" ];
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    systemd gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Logs;
-    description = "A log viewer for the systemd journal";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-logs/src.nix
deleted file mode 100644
index 81f5c29d7ca..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-logs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-logs-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-logs/3.20/gnome-logs-3.20.1.tar.xz;
-    sha256 = "b797841faac4e176c64497837de27b1b953d16d2482e8a773a48b38117b1367e";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix
deleted file mode 100644
index 8625f21f3db..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
-, gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook
-, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup
-, webkitgtk }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook
-                  gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
-                  gnome3.geocode_glib libchamplain file libsoup
-                  gdk_pixbuf librsvg autoreconfHook
-                  gnome3.gsettings_desktop_schemas gnome3.evolution_data_server
-                  gnome3.gnome_online_accounts gnome3.defaultIconTheme
-                  webkitgtk ];
-
-  patches = [ ./soup.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Maps;
-    description = "A map application for GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/soup.patch b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/soup.patch
deleted file mode 100644
index ef8c7a1287d..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/soup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gnome-maps-3.18.0/configure.ac.orig	2015-09-24 18:38:31.912498368 +0200
-+++ gnome-maps-3.18.0/configure.ac	2015-09-24 18:38:40.783320413 +0200
-@@ -50,8 +50,9 @@
-     folks                        >= $FOLKS_MIN_VERSION
-     geocode-glib-1.0             >= $GEOCODE_MIN_VERSION
-     champlain-0.12               >= $CHAMPLAIN_MIN_VERSION
-     libxml-2.0
-     rest-0.7
-+    libsoup-2.4
- ])
- AC_SUBST(GNOME_MAPS_LIB_CFLAGS)
- AC_SUBST(GNOME_MAPS_LIB_LIBS)
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix
deleted file mode 100644
index 054f340bf42..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-maps-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-maps/3.20/gnome-maps-3.20.2.tar.xz;
-    sha256 = "e860144795339fdbb2f1239c4db092ad12beb9acaa3f3f8aa1d935c36d86bc3f";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-music/default.nix
deleted file mode 100644
index ea8f15fd4e5..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-music/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker
-, libxml2, python3Packages, libnotify, wrapGAppsHook
-, pkgconfig, gtk3, glib, cairo
-, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python
-                  gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify
-                  python3Packages.pycairo python3Packages.dbus-python python3Packages.requests2
-                  python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook
-                  gnome3.gsettings_desktop_schemas makeWrapper tracker ];
-
-  wrapPrefixVariables = [ "PYTHONPATH" ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Music;
-    description = "Music player and management application for the GNOME desktop environment";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-music/src.nix
deleted file mode 100644
index 43cec97929c..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-music/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-music-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-music/3.20/gnome-music-3.20.2.tar.xz;
-    sha256 = "ca328bfd85ba8cb651e4e3c5d56499b111cb95b4f3e9b2e482cca7830213c7a0";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-nettool/default.nix
deleted file mode 100644
index 4c152777f2c..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-nettool/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libgtop, intltool, itstool, libxml2, nmap, inetutils }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-nettool-3.8.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz";
-    sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  propagatedUserEnvPkgs = [ nmap inetutils ];
-
-  meta = with stdenv.lib; {
-    homepage = http://projects.gnome.org/gnome-network;
-    description = "A collection of networking tools";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/default.nix
deleted file mode 100644
index df7e23ef9d4..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, intltool, fetchurl, exempi, libxml2
-, pkgconfig, gtk3, glib
-, makeWrapper, itstool, gegl, babl, lcms2
-, desktop_file_utils, gmp, libmediaart, wrapGAppsHook
-, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  # doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata
-                  gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg exempi
-                  gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
-                  gnome3.gnome_online_accounts gnome3.gnome_desktop
-                  lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
-                  wrapGAppsHook gexiv2 ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Photos;
-    description = "Photos is an application to access, organize and share your photos with GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix
deleted file mode 100644
index e8569dc5433..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-photos-3.20.3";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-photos/3.20/gnome-photos-3.20.3.tar.xz;
-    sha256 = "d1dd8bd8178dd1d0120abd2ff3e959fb1199f4e1751558f925ce7f1278548996";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-weather/default.nix
deleted file mode 100644
index 599bed87d6e..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-weather/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs
-, libgweather, intltool, itstool, geoclue2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook gjs intltool itstool
-    libgweather gnome3.defaultIconTheme geoclue2
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Weather;
-    description = "Access current weather conditions and forecasts";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-weather/src.nix
deleted file mode 100644
index 8229ad4dc04..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-weather/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-weather-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-weather/3.20/gnome-weather-3.20.1.tar.xz;
-    sha256 = "e310ecd56f396ac0e8e5652ac8b63258720034e23afbf32fbb2d509f25bbb2b6";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.20/apps/nautilus-sendto/default.nix
deleted file mode 100644
index 093900dcb7a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/nautilus-sendto/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
-, gobjectIntrospection, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "nautilus-sendto-${version}";
-
-  version = "3.8.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
-    sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
-  };
-
-  buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ];
-
-  meta = with stdenv.lib; {
-    description = "Integrates Evolution and Pidgin into the Nautilus file manager";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.20/apps/polari/default.nix
deleted file mode 100644
index 8efaa4e4aac..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/polari/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
-, telepathy_glib, gjs, itstool, telepathy_idle
-, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  propagatedUserEnvPkgs = [ telepathy_idle ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook
-                  telepathy_glib gjs gdk_pixbuf librsvg ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Polari;
-    description = "IRC chat client designed to integrate with the GNOME desktop";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/polari/src.nix b/pkgs/desktops/gnome-3/3.20/apps/polari/src.nix
deleted file mode 100644
index 3585deac26f..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/polari/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "polari-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/polari/3.20/polari-3.20.2.tar.xz;
-    sha256 = "4b7641e54ee8a2e6018e1b4cea4802d94d90c2f09b9558e0a767838effd1347f";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix
deleted file mode 100644
index e59df06f8a0..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/seahorse/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, intltool, fetchurl, vala_0_32
-, pkgconfig, gtk3, glib
-, makeWrapper, itstool, gnupg, libsoup
-, gnome3, librsvg, gdk_pixbuf, gpgme
-, libsecret, avahi, p11_kit, openssh }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
-                  gnome3.gsettings_desktop_schemas makeWrapper gnupg
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
-                  libsecret avahi libsoup p11_kit vala_0_32 gnome3.gcr
-                  openssh ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/seahorse" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Seahorse;
-    description = "Application for managing encryption keys and passwords in the GnomeKeyring";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/3.20/apps/seahorse/src.nix
deleted file mode 100644
index 0ae195a0a7b..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/seahorse/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "seahorse-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/seahorse/3.20/seahorse-3.20.0.tar.xz;
-    sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.20/apps/vinagre/default.nix
deleted file mode 100644
index 8b8b6248642..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/vinagre/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool
-, libsecret, itstool, makeWrapper, librsvg }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret
-                  itstool makeWrapper gnome3.defaultIconTheme librsvg ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/vinagre" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Vinagre;
-    description = "Remote desktop viewer for GNOME";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/3.20/apps/vinagre/src.nix
deleted file mode 100644
index ceb419cfdee..00000000000
--- a/pkgs/desktops/gnome-3/3.20/apps/vinagre/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "vinagre-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/vinagre/3.20/vinagre-3.20.2.tar.xz;
-    sha256 = "5fc78ef9ab9ee7d4e3c50d38d82d9bcbd915191bcf0349d55a2fd56eaa87eaa0";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/default.nix
deleted file mode 100644
index 3c3a05dc3af..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3
-, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  # For convenience, we can specify adwaita-icon-theme only in packages
-  propagatedBuildInputs = [ hicolor_icon_theme ];
-
-  buildInputs = [ gdk_pixbuf librsvg ];
-
-  nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
-
-  # remove a tree of dirs with no files within
-  postInstall = '' rm -rf "$out/locale" '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/src.nix
deleted file mode 100644
index e7eba88d2a3..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/adwaita-icon-theme/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "adwaita-icon-theme-3.20";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/adwaita-icon-theme/3.20/adwaita-icon-theme-3.20.tar.xz;
-    sha256 = "7a0a887349f340dd644032f89d81264b694c4b006bd51af1c2c368d431e7ae35";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.20/core/baobab/default.nix
deleted file mode 100644
index f7a0ff473cc..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/baobab/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, intltool, fetchurl, vala_0_32, libgtop
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ vala_0_32 pkgconfig gtk3 glib libgtop intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/baobab" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Baobab;
-    description = "Graphical application to analyse disk usage in any Gnome environment";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/baobab/src.nix b/pkgs/desktops/gnome-3/3.20/core/baobab/src.nix
deleted file mode 100644
index c72e5428c09..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/baobab/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "baobab-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/baobab/3.20/baobab-3.20.1.tar.xz;
-    sha256 = "e9dff12a76b0d730ce224215860512eb0188280c622faf186937563b96249d1f";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.20/core/caribou/default.nix
deleted file mode 100644
index c2cb6a661ab..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/caribou/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf
-, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake114x }:
-
-let
-  majorVersion = "0.4";
-in
-stdenv.mkDerivation rec {
-  name = "caribou-${majorVersion}.18.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/caribou/${majorVersion}/${name}.tar.xz";
-    sha256 = "0l1ikx56ddgayvny3s2xv8hs3p23xsclw4zljs3cczv4b89dzymf";
-  };
-
-  buildInputs = with gnome3;
-    [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake114x
-      pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ];
-
-  propagatedBuildInputs = [ gnome3.libgee libxklavier ];
-
-  preBuild = ''
-    patchShebangs .
-    substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix
deleted file mode 100644
index 6e0184e134e..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/dconf-editor/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
-                  intltool docbook_xsl docbook_xsl_ns gnome3.dconf ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/3.20/core/dconf-editor/src.nix
deleted file mode 100644
index ee04b9cd463..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/dconf-editor/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "dconf-editor-3.20.3";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/dconf-editor/3.20/dconf-editor-3.20.3.tar.xz;
-    sha256 = "a8721499a277550b28d8dd94dafbea6efeb95fa153020da10603d0d4d628c579";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.20/core/dconf/default.nix
deleted file mode 100644
index 598d60dd8b7..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/dconf/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
-
-let
-  majorVersion = "0.24";
-in
-stdenv.mkDerivation rec {
-  name = "dconf-${version}";
-  version = "${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz";
-    sha256 = "4373e0ced1f4d7d68d518038796c073696280e22957babb29feb0267c630fec2";
-  };
-
-  buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
-                  intltool docbook_xsl docbook_xsl_ns makeWrapper ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.20/core/empathy/default.nix
deleted file mode 100644
index 9a29d11f1ae..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/empathy/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, gnome3, gdk_pixbuf
-, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
-, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
-, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control
-, telepathy_logger, libnotify, clutter, libsoup, gnutls
-, evolution_data_server
-, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
-, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee  }:
-
-# TODO: enable more features
-
-let
-  majorVersion = "3.12";
-in
-stdenv.mkDerivation rec {
-  name = "empathy-${majorVersion}.11";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz";
-    sha256 = "11yl8msyf017197fm6h15yw159yjp9i08566l967yashbx7gzr6i";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
-                            gnome_online_accounts shared_mime_info ];
-  propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
-                            telepathy_mission_control ];
-  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
-                  libxml2 libxslt icu file makeWrapper
-                  telepathy_glib clutter_gtk clutter-gst cogl
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf
-                  libnotify clutter libsoup gnutls libgee p11_kit
-                  libcanberra_gtk3 telepathy_farstream farstream
-                  gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas
-                  file libtool librsvg ];
-
-  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
-                         "-I${dbus_libs.dev}/include/dbus-1.0"
-                         "-I${dbus_libs.dev}/lib/dbus-1.0/include" ];
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Empathy;
-    description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
-    maintainers = gnome3.maintainers;
-    # TODO: license = [ licenses.gpl2 licenses.lgpl2 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/eog/default.nix b/pkgs/desktops/gnome-3/3.20/core/eog/default.nix
deleted file mode 100644
index 5f36f25e095..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/eog/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
-, shared_mime_info, wrapGAppsHook, librsvg, libexif }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = with gnome3;
-    [ intltool itstool libxml2 libjpeg gtk glib libpeas librsvg
-      gsettings_desktop_schemas shared_mime_info adwaita-icon-theme
-      gnome_desktop libexif dconf ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/EyeOfGnome; 
-    platforms = platforms.linux;
-    description = "GNOME image viewer";
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/eog/src.nix b/pkgs/desktops/gnome-3/3.20/core/eog/src.nix
deleted file mode 100644
index d6962861e5c..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/eog/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "eog-3.20.4";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/eog/3.20/eog-3.20.4.tar.xz;
-    sha256 = "1qsv3brhi8l8fr22nd3d0fwq5xhwspqw0bammhkkq3ga0z6791wn";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
deleted file mode 100644
index e472014e38f..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
-, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool
-, webkitgtk214x, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
-, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
-, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  # Tests need an X display
-  configureFlags = [ "--disable-static --disable-tests" ];
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  nativeBuildInputs = [ pkgconfig file wrapGAppsHook ];
-
-  buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file
-                  webkitgtk214x libsoup libsecret gnome_desktop libnotify libtool
-                  sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
-                  gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf
-                  gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
-                  gst_all_1.gst-libav];
-
-  NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Epiphany;
-    description = "WebKit based web browser for GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix
deleted file mode 100644
index 84c94b45a59..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "epiphany-3.20.4";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/epiphany/3.20/epiphany-3.20.4.tar.xz;
-    sha256 = "051av2xcg7ii2y273vqmdkzanygws9qsaq7ks0070y06d4rhl6xy";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/evince/default.nix b/pkgs/desktops/gnome-3/3.20/core/evince/default.nix
deleted file mode 100644
index 7629e5b5655..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/evince/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
-, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
-, poppler, ghostscriptX, djvulibre, libspectre, libsecret , wrapGAppsHook
-, librsvg, gobjectIntrospection
-, recentListSize ? null # 5 is not enough, allow passing a different number
-, supportXPS ? false    # Open XML Paper Specification via libgxps
-}:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = [
-    intltool perl perlXMLParser libxml2
-    glib gtk3 pango atk gdk_pixbuf gobjectIntrospection
-    itstool gnome3.adwaita-icon-theme
-    gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
-    poppler ghostscriptX djvulibre libspectre
-    libsecret librsvg gnome3.adwaita-icon-theme gnome3.dconf
-  ] ++ stdenv.lib.optional supportXPS gnome3.libgxps;
-
-  configureFlags = [
-    "--disable-nautilus" # Do not use nautilus
-    "--enable-introspection"
-    (if supportXPS then "--enable-xps" else "--disable-xps")
-  ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  preConfigure = with stdenv.lib;
-    optionalString doCheck ''
-      for file in test/*.py; do
-        echo "patching $file"
-        sed '1s,/usr,${python},' -i "$file"
-      done
-    '' + optionalString (recentListSize != null) ''
-      sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
-      sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
-    '';
-
-  preFixup = ''
-    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share")
-  '';
-
-  doCheck = false; # would need pythonPackages.dogTail, which is missing
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/projects/evince/;
-    description = "GNOME's document viewer";
-
-    longDescription = ''
-      Evince is a document viewer for multiple document formats.  It
-      currently supports PDF, PostScript, DjVu, TIFF and DVI.  The goal
-      of Evince is to replace the multiple document viewers that exist
-      on the GNOME Desktop with a single simple application.
-    '';
-
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.vcunat ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/evince/src.nix b/pkgs/desktops/gnome-3/3.20/core/evince/src.nix
deleted file mode 100644
index 6f924bbbc1b..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/evince/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "evince-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/evince/3.20/evince-3.20.1.tar.xz;
-    sha256 = "fc7ac23036939c24f02e9fed6dd6e28a85b4b00b60fa4b591b86443251d20055";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/default.nix
deleted file mode 100644
index 6b13b726296..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python
-, intltool, libsoup, libxml2, libsecret, icu, sqlite
-, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = with gnome3;
-    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
-      gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ]
-    ++ stdenv.lib.optional valaSupport vala_0_32;
-
-  propagatedBuildInputs = [ libsecret nss nspr libical db ];
-
-  # uoa irrelevant for now
-  configureFlags = [ "--disable-uoa" "--disable-google-auth" ]
-                   ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
-
-  preFixup = ''
-    for f in "$out/libexec/"*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix
deleted file mode 100644
index eaeece5baf2..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "evolution-data-server-3.20.5";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/evolution-data-server/3.20/evolution-data-server-3.20.5.tar.xz;
-    sha256 = "0d1586cd326d997497a2a6fddd939a83892be07cb20f8c88fda5013f8c5bbe7e";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/folks/default.nix b/pkgs/desktops/gnome-3/3.20/core/folks/default.nix
deleted file mode 100644
index 8327f9d31cc..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/folks/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
-, vala_0_32, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
-, telepathy_glib, evolution_data_server, libsecret, db }:
-
-# TODO: enable more folks backends
-
-let
-  majorVersion = "0.11";
-in
-stdenv.mkDerivation rec {
-  name = "folks-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz";
-    sha256 = "0q9hny6a38zn0gamv0ji0pn3jw6bpn2i0fr6vbzkhm9h9ws0cqvz";
-  };
-
-  propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
-  # dbus_daemon needed for tests
-  buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
-                  vala_0_32 libsecret libxml2 libsoup nspr nss intltool db ];
-  nativeBuildInputs = [ pkgconfig ];
-
-  configureFlags = "--disable-fatal-warnings";
-
-  NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss"
-                        "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"];
-
-  enableParallelBuilding = true;
-
-  postBuild = "rm -rf $out/share/gtk-doc";
-
-  meta = {
-    description = "Folks";
-
-    homepage = https://wiki.gnome.org/Projects/Folks;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = gnome3.maintainers;
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.20/core/gconf/default.nix
deleted file mode 100644
index a4cb3e8c146..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gconf/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2
-, intltool, polkit, orbit, withGtk ? false }:
-
-assert withGtk -> (gnome3 != null);
-
-stdenv.mkDerivation rec {
-
-  versionMajor = "3.2";
-  versionMinor = "6";
-  moduleName   = "GConf";
-
-  origName = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  name = "gconf-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
-    sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
-  };
-
-  buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk;
-  propagatedBuildInputs = [ glib dbus_glib  ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  # ToDo: ldap reported as not found but afterwards reported as supported
-
-  meta = with stdenv.lib; {
-    homepage = http://projects.gnome.org/gconf/;
-    description = "A system for storing application preferences";
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.20/core/gcr/default.nix
deleted file mode 100644
index 55eebf77be5..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gcr/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
-, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
-, gobjectIntrospection, makeWrapper, libxslt, vala_0_32, gnome3 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig intltool gnupg glib gobjectIntrospection libxslt
-    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32
-  ];
-
-  propagatedBuildInputs = [ p11_kit ];
-
-  #doCheck = true;
-
-  #enableParallelBuilding = true; issues on hydra
-
-  preFixup = ''
-    wrapProgram "$out/bin/gcr-viewer" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gcr/src.nix b/pkgs/desktops/gnome-3/3.20/core/gcr/src.nix
deleted file mode 100644
index d166f033266..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gcr/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gcr-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gcr/3.20/gcr-3.20.0.tar.xz;
-    sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/default.nix
deleted file mode 100644
index 51b67afb01f..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
-, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gdm-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3";
-  };
-
-  preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
-    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
-    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
-    substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
-    sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in
- '';
-
-  configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth"
-                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-                     "--with-initial-vt=10" ];
-
-  buildInputs = [ pkgconfig glib itstool libxml2 intltool
-                  accountsservice gnome3.dconf systemd
-                  gobjectIntrospection libX11 gtk
-                  libcanberra_gtk3 pam libtool ];
-
-  #enableParallelBuilding = true; # problems compiling
-
-  # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GDM;
-    description = "A program that manages graphical display servers and handles graphical user logins";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/disable_x_access_control.patch
deleted file mode 100644
index 7691a9e86f0..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/disable_x_access_control.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gdm-3.16.0/daemon/gdm-display.c.orig	2015-04-08 13:53:14.370274369 +0200
-+++ gdm-3.16.0/daemon/gdm-display.c	2015-04-08 13:53:36.287520435 +0200
-@@ -1706,9 +1706,10 @@
- 
-                 gdm_error_trap_push ();
- 
--                for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
-+                /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
-                         XAddHost (self->priv->x11_display, &host_entries[i]);
--                }
-+                }*/
-+                XDisableAccessControl(self->priv->x11_display);
- 
-                 XSync (self->priv->x11_display, False);
-                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/sessions_dir.patch
deleted file mode 100644
index b8fbad4d731..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/sessions_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index f759d2d..d154716 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -373,9 +373,12 @@ get_system_session_dirs (void)
- #ifdef ENABLE_WAYLAND_SUPPORT
-                 DATADIR "/wayland-sessions/",
- #endif
-+                NULL,
-                 NULL
-         };
- 
-+        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
-+
-         return search_dirs;
- }
- 
diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/xserver_path.patch
deleted file mode 100644
index b451d129391..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gdm/3.16-wip/xserver_path.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
-+++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
-@@ -322,7 +322,11 @@
- fallback:
- #endif
- 
--        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+        } else {
-+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        }
- }
- 
- static gboolean
---- gdm-3.16.0/daemon/gdm-x-session.c.orig	2015-04-15 18:44:16.875743928 +0200
-+++ gdm-3.16.0/daemon/gdm-x-session.c	2015-04-16 13:34:02.335708638 +0200
-@@ -207,6 +207,8 @@
-         char     *display_fd_string = NULL;
-         char     *vt_string = NULL;
-         char     *display_number;
-+        int nixos_argc = 0;
-+        char **nixos_argv = NULL;
-         gsize     display_number_size;
- 
-         auth_file = prepare_auth_file ();
-@@ -236,7 +238,15 @@
- 
-         display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
- 
--        g_ptr_array_add (arguments, X_SERVER);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+                int i = 0;
-+                g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL);
-+                for (i = 0; i < nixos_argc; i++) {
-+                        g_ptr_array_add (arguments, nixos_argv[i]);
-+                }
-+        } else {
-+                g_ptr_array_add (arguments, X_SERVER);
-+        }
- 
-         if (vt_string != NULL) {
-                 g_ptr_array_add (arguments, vt_string);
-@@ -259,12 +269,12 @@
-         g_ptr_array_add (arguments, "-noreset");
-         g_ptr_array_add (arguments, "-keeptty");
- 
--        g_ptr_array_add (arguments, "-verbose");
-+        /*g_ptr_array_add (arguments, "-verbose");
-         if (state->debug_enabled) {
-                 g_ptr_array_add (arguments, "7");
-         } else {
-                 g_ptr_array_add (arguments, "3");
--        }
-+        }*/
- 
-         if (state->debug_enabled) {
-                 g_ptr_array_add (arguments, "-core");
-@@ -275,6 +285,9 @@
-                                                    (const char * const *) arguments->pdata,
-                                                    &error);
-         g_free (display_fd_string);
-+        if (nixos_argv) {
-+                 g_strfreev (nixos_argv);
-+        }
-         g_clear_object (&launcher);
-         g_ptr_array_free (arguments, TRUE);
- 
---- gdm-3.16.0/daemon/gdm-session.c.orig	2015-04-16 14:19:01.392802683 +0200
-+++ gdm-3.16.0/daemon/gdm-session.c	2015-04-16 14:20:36.012296764 +0200
-@@ -2359,6 +2359,12 @@
-         gchar *desktop_names;
-         const char *locale;
- 
-+        if (g_getenv ("GDM_X_SERVER") != NULL) {
-+                gdm_session_set_environment_variable (self,
-+                                                      "GDM_X_SERVER",
-+                                                      g_getenv ("GDM_X_SERVER"));
-+        }
-+
-         gdm_session_set_environment_variable (self,
-                                               "GDMSESSION",
-                                               get_session_name (self));
diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.20/core/gdm/default.nix
deleted file mode 100644
index 25a44d90a5b..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gdm/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
-, intltool, accountsservice, libX11, gnome3, systemd, gnome_session, autoreconfHook
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  # Only needed to make it build
-  preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
-  '';
-
-  configureFlags = [ "--sysconfdir=/etc"
-                     "--localstatedir=/var"
-                     "--with-systemd=yes"
-                     "--with-plymouth=yes"
-                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
-
-  buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook
-                  accountsservice gnome3.dconf systemd
-                  gobjectIntrospection libX11 gtk
-                  libcanberra_gtk3 pam libtool plymouth ];
-
-  #enableParallelBuilding = true; # problems compiling
-
-  preBuild = ''
-    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
-  '';
-
-  # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch ./sessions_dir.patch
-              ./disable_x_access_control.patch ./no-dbus-launch.patch
-              ./libsystemd.patch ];
-
-  installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
-
-  postInstall = ''
-    mv $out/share/gdm/greeter/applications/gnome-shell.desktop $out/share/gdm/greeter/applications/org.gnome.Shell.desktop
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GDM;
-    description = "A program that manages graphical display servers and handles graphical user logins";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/disable_x_access_control.patch
deleted file mode 100644
index e100e013b78..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gdm/disable_x_access_control.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gdm-3.14.2/daemon/gdm-slave.c.orig	2015-04-16 15:05:27.844353079 +0200
-+++ gdm-3.14.2/daemon/gdm-slave.c	2015-04-16 15:05:40.240417915 +0200
-@@ -369,8 +369,9 @@
-                 gdm_error_trap_push ();
- 
-                 for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
--                        XAddHost (slave->priv->server_display, &host_entries[i]);
-+                        //XAddHost (slave->priv->server_display, &host_entries[i]);
-                 }
-+                XDisableAccessControl(slave->priv->server_display);
- 
-                 XSync (slave->priv->server_display, False);
-                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/libsystemd.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/libsystemd.patch
deleted file mode 100644
index 4556f418cc8..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gdm/libsystemd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/GNOME/gdm/commit/eee5bf72c9bb1c1d62eb0e7102088ae3b9a188cd
---- a/configure.ac	2016-05-27 11:10:44.589740789 +0200
-+++ b/configure.ac	2016-05-27 11:11:00.146427723 +0200
-@@ -888,7 +888,7 @@
- dnl ---------------------------------------------------------------------------
- 
- PKG_CHECK_MODULES(SYSTEMD,
--                  [libsystemd-login >= 186 libsystemd-daemon],
-+                  [libsystemd],
-                   [have_systemd=yes], [have_systemd=no])
- 
- if test "x$with_systemd" = "xauto" ; then
-@@ -912,7 +912,7 @@
- AC_SUBST(SYSTEMD_LIBS)
- 
- PKG_CHECK_MODULES(JOURNALD,
--                  [libsystemd-journal],
-+                  [libsystemd],
-                   [have_journald=yes], [have_journald=no])
- 
- if test "x$enable_systemd_journal" = "xauto" ; then
diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/no-dbus-launch.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/no-dbus-launch.patch
deleted file mode 100644
index c87554078c7..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gdm/no-dbus-launch.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/daemon/gdm-launch-environment.c	2015-06-22 15:11:07.277474398 +0000
-+++ b/daemon/gdm-launch-environment.c	2015-06-22 15:12:31.301157665 +0000
-@@ -48,8 +48,6 @@
- #include "gdm-session-enum-types.h"
- #include "gdm-launch-environment.h"
- 
--#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session"
--
- extern char **environ;
- 
- #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate))
-@@ -512,7 +510,7 @@
-                 gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command);
-         } else {
-                 /* wrap it in dbus-launch */
--                char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command);
-+                char *command = g_strdup (launch_environment->priv->command);
- 
-                 gdm_session_select_program (launch_environment->priv->session, command);
-                 g_free (command);
diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/sessions_dir.patch
deleted file mode 100644
index b8fbad4d731..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gdm/sessions_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index f759d2d..d154716 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -373,9 +373,12 @@ get_system_session_dirs (void)
- #ifdef ENABLE_WAYLAND_SUPPORT
-                 DATADIR "/wayland-sessions/",
- #endif
-+                NULL,
-                 NULL
-         };
- 
-+        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
-+
-         return search_dirs;
- }
- 
diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/src.nix b/pkgs/desktops/gnome-3/3.20/core/gdm/src.nix
deleted file mode 100644
index acd46534e14..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gdm/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gdm-3.14.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gdm/3.14/gdm-3.14.2.tar.xz;
-    sha256 = "e20eb61496161ad95b1058dbf8aea9b7b004df4d0ea6b0fab4401397d9db5930";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.20/core/gdm/xserver_path.patch
deleted file mode 100644
index 412daee9f27..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gdm/xserver_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
-+++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
-@@ -322,7 +322,11 @@
- fallback:
- #endif
- 
--        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+        } else {
-+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        }
- }
- 
- static gboolean
diff --git a/pkgs/desktops/gnome-3/3.20/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.20/core/geocode-glib/default.nix
deleted file mode 100644
index 4d75bdc4996..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/geocode-glib/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig glib libsoup json_glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.20/core/geocode-glib/src.nix
deleted file mode 100644
index 135e05e90e9..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/geocode-glib/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "geocode-glib-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/geocode-glib/3.20/geocode-glib-3.20.1.tar.xz;
-    sha256 = "669fc832cabf8cc2f0fc4194a8fa464cdb9c03ebf9aca5353d7cf935ba8637a2";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.20/core/gjs/default.nix
deleted file mode 100644
index 20c3d4c9956..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gjs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-, spidermonkey_24, pango, readline, glib, libxml2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline ];
-
-  propagatedBuildInputs = [ spidermonkey_24 ];
-
-  postInstall = ''
-    sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
-  '';
-
-  meta = with stdenv.lib; {
-    maintainers = gnome3.maintainers;
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.20/core/gjs/src.nix
deleted file mode 100644
index 4f63d858d7d..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gjs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gjs-1.44.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gjs/1.44/gjs-1.44.0.tar.xz;
-    sha256 = "88c960f6ad47a6931d123f5d6317d13704f58572f68a4391913a254ff27dce80";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/default.nix
deleted file mode 100644
index 32d6d6e7535..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, intltool }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/src.nix
deleted file mode 100644
index 23a31263bcf..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-backgrounds/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-backgrounds-3.20";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-backgrounds/3.20/gnome-backgrounds-3.20.tar.xz;
-    sha256 = "d66c6e165e5c16b79ee4ab83102fa73fa20ce4e14191036ee68e8e82cf537127";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/default.nix
deleted file mode 100644
index 7fae0b5c67f..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, gnome3, pkgconfig, gtk3, intltool, glib
-, udev, itstool, libxml2, makeWrapper, libnotify, libcanberra_gtk3 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
-                  makeWrapper gnome3.gsettings_desktop_schemas itstool
-                  libnotify libcanberra_gtk3 ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/bluetooth-sendto" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
-    description = "Application that let you manage Bluetooth in the GNOME destkop";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/src.nix
deleted file mode 100644
index 474d4722b4a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-bluetooth/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-bluetooth-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.0.tar.xz;
-    sha256 = "93b3ca16b348a168d044b3f777049b7dba2a9292c4adb2751a771e3bc5e4eb53";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
deleted file mode 100644
index 3df800f402d..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libxml2
-, bash, gtk3, glib, wrapGAppsHook
-, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  # Fix for  https://github.com/NixOS/nixpkgs/issues/17912
-  # See also https://bugzilla.gnome.org/show_bug.cgi?id=673101
-  # Should be removed when next release comes out
-  srcHistoryEntry = fetchurl {
-    url = "https://raw.githubusercontent.com/GNOME/gnome-calculator/9bb6936ba74602ec891c1ffecdf1665dba1a1be4/data/history-entry.ui";
-    sha256 = "0a6d6anwrg5l3kc7i8jyky4idnzi9bhjv9awi6615505pjhcxnaj";
-  };
-
-  srcHistoryView = fetchurl {
-    url = "https://raw.githubusercontent.com/GNOME/gnome-calculator/b87b4f5cd0cff0b9cf9e9cd2a056c56be653cab1/data/history-view.ui";
-    sha256 = "0zyq1mcxsh707jhh3vfqplk5s83lb26gvjz62l5l6rq5yrd43fyw";
-  };
-
-  prePatch = ''
-    [ -f data/history-entry.ui ] && echo Remove the fix && exit 1
-    [ -f data/history-view.ui ]  && echo Remove the fix && exit 1
-    cp -v ${srcHistoryEntry} data/history-entry.ui
-    cp -v ${srcHistoryView}  data/history-view.ui
-  '';
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = [ bash gtk3 glib intltool itstool
-                  libxml2 gnome3.gtksourceview mpfr gmp
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
-    description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix
deleted file mode 100644
index 60270be06b7..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-calculator-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-calculator/3.20/gnome-calculator-3.20.2.tar.xz;
-    sha256 = "2af1c12a12a230f90fc221ff908efd80fe7eebfeaad56cd698c393d2fc34a8fb";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-common/default.nix
deleted file mode 100644
index f9261e183ef..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-common/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, which, gnome3, autoconf, automake }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  patches = [(fetchurl {
-    name = "gnome-common-patch";
-    url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
-    sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
-  })];
-
-  propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
-
-  meta = with stdenv.lib; {
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-common/src.nix
deleted file mode 100644
index 8ffe7e20e1a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-common/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-common-3.18.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz;
-    sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix
deleted file mode 100644
index 8097cf32ba6..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, intltool, fetchurl, evolution_data_server, db
-, pkgconfig, gtk3, glib, libsecret
-, libchamplain, clutter_gtk, geocode_glib
-, bash, makeWrapper, itstool, folks, libnotify, libxml2
-, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
-, libsoup, vala_0_32, dbus_glib, automake115x, autoconf }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ];
-
-  # force build from vala
-  preBuild = ''
-   touch src/*.vala
-  '';
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
-                  gnome3.gsettings_desktop_schemas makeWrapper file libnotify
-                  folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
-                  libxml2 libsoup gnome3.gnome_online_accounts nspr nss
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  libchamplain clutter_gtk geocode_glib
-                  vala_0_32 automake115x autoconf db ];
-
-  preFixup = ''
-    for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  patches = [ ./gio_unix.patch ];
-
-  patchFlags = "-p0";
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Contacts;
-    description = "Contacts is GNOME's integrated address book";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/gio_unix.patch
deleted file mode 100644
index f1b3d3c94ac..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/gio_unix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig	2015-04-09 18:45:50.581232289 +0200
-+++ configure.ac	2015-04-09 18:45:59.744280137 +0200
-@@ -54,6 +54,7 @@
- 	     champlain-0.12
- 	     clutter-gtk-1.0
- 	     geocode-glib-1.0 >= 3.15.3
-+	     gio-unix-2.0
- 	     "
- PKG_CHECK_MODULES(CONTACTS, [$pkg_modules])
- 
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/src.nix
deleted file mode 100644
index f483acaa441..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-contacts/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-contacts-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-contacts/3.20/gnome-contacts-3.20.0.tar.xz;
-    sha256 = "bef88dc728aa7bb058c530fd936b262d96bbc17e73d640279842371bb3ad1588";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix
deleted file mode 100644
index 726f47d0cde..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
-, libcanberra_gtk2, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
-, gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev
-, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
-, cracklib, python, libkrb5, networkmanagerapplet, networkmanager
-, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
-, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk
-, fontconfig, sound-theme-freedesktop, grilo }:
-
-# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
-# TODO: bluetooth, wacom, printers
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  propagatedUserEnvPkgs =
-    [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=752596
-  enableParallelBuilding = false;
-
-  buildInputs = with gnome3;
-    [ pkgconfig intltool ibus gtk glib upower libcanberra_gtk2 gsettings_desktop_schemas
-      libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
-      gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality
-      accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
-      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
-      gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
-      gnome3.vino udev libcanberra_gtk3 libgudev
-      networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ];
-
-  preBuild = ''
-    substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
-
-    # hack to make test-endianess happy
-    mkdir -p $out/share/locale
-    substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/"
-  '';
-
-  preFixup = with gnome3; ''
-    wrapProgram $out/bin/gnome-control-center \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    for i in $out/share/applications/*; do
-      substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Utilities to configure the GNOME desktop";
-    license = licenses.gpl2Plus;
-    maintainers = gnome3.maintainers;
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/src.nix
deleted file mode 100644
index 83c6e04d243..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-control-center-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-control-center/3.20/gnome-control-center-3.20.1.tar.xz;
-    sha256 = "ce6474fc60f78ed3cfaf555e55a52ec3ebb6437fa184e08ad6077bbec380a1ed";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix
deleted file mode 100644
index 7265f09731f..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
-, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
-, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  # this should probably be setuphook for glib
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ pkgconfig python libxml2Python libxslt which libX11
-                  xkeyboard_config isocodes itstool wayland
-                  gtk3 glib intltool gnome_doc_utils libxkbfile
-                  gobjectIntrospection ];
-
-  propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/src.nix
deleted file mode 100644
index 1388a51aa78..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-desktop-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-desktop/3.20/gnome-desktop-3.20.2.tar.xz;
-    sha256 = "492c2da7aa8c3a8b65796e8171fc8f0dfb5d322dd2799c0d76392e1fb061e2b2";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix
deleted file mode 100644
index c94c178558d..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-dictionary" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Dictionary;
-    description = "Dictionary is the GNOME application to look up definitions";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/src.nix
deleted file mode 100644
index 249cb314c2a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-dictionary-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-dictionary/3.20/gnome-dictionary-3.20.0.tar.xz;
-    sha256 = "efb36377d46eff9291d3b8fec37baab2355f9dc8bc7edb791b6a625574716121";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/default.nix
deleted file mode 100644
index c329d68674a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
-, bash, gtk3, glib, makeWrapper, cracklib, libnotify
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
-, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  libxslt libtool libsecret libpwquality cracklib
-                  libnotify libdvdread libcanberra_gtk3 docbook_xsl
-                  gdk_pixbuf gnome3.defaultIconTheme
-                  librsvg udisks2 gnome3.gnome_settings_daemon
-                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-disks" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
-    description = "A udisks graphical front-end";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/src.nix
deleted file mode 100644
index fd49e82e8c3..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-disk-utility/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-disk-utility-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-disk-utility/3.20/gnome-disk-utility-3.20.2.tar.xz;
-    sha256 = "ad12ae0f3a2ae9c690ca799dd1f690a8eb238575e0fd8f328b66a96eb9bf2c3d";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/default.nix
deleted file mode 100644
index d0ec2307a85..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool
-, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-font-viewer" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Program that can preview fonts and create thumbnails for fonts";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/src.nix
deleted file mode 100644
index 7fc8110f3d8..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-font-viewer/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-font-viewer-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-font-viewer/3.20/gnome-font-viewer-3.20.2.tar.xz;
-    sha256 = "c95b336c15fade23ce239087897d91abcd3ae3776cd15b0c71321629a94abe8e";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix
deleted file mode 100644
index 3ea108808f5..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
-, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
-, docbook_xsl_ns, docbook_xsl, gnome3 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = with gnome3; [
-    dbus libgcrypt pam python gtk3 gconf libgnome_keyring
-    pango gcr gdk_pixbuf atk p11_kit makeWrapper
-  ];
-
-  propagatedBuildInputs = [ glib libtasn1 libxslt ];
-
-  nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
-
-  configureFlags = [
-    "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
-    "--with-pkcs11-modules=$$out/lib/pkcs11/"
-  ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-keyring" \
-      --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    wrapProgram "$out/bin/gnome-keyring-daemon" \
-      --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/src.nix
deleted file mode 100644
index 88179fff3c7..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-keyring/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-keyring-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.0.tar.xz;
-    sha256 = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-menus/default.nix
deleted file mode 100644
index 90209634fbf..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-menus/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-menus-${version}";
-  version = "3.10.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz";
-    sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
-  };
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
-
-  meta = {
-    homepage = "http://www.gnome.org";
-    description = "Gnome menu specification";
-
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix
deleted file mode 100644
index 85c15042614..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper
-, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
-, telepathy_glib, intltool, dbus_libs, icu
-, libsoup, docbook_xsl_ns, docbook_xsl, gnome3
-}:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper
-                  libsecret dbus_glib telepathy_glib intltool icu libsoup
-                  docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ];
-
-  preFixup = ''
-    for f in "$out/libexec/"*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix
deleted file mode 100644
index 088c4127b80..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-online-accounts-3.20.3";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-online-accounts/3.20/gnome-online-accounts-3.20.3.tar.xz;
-    sha256 = "094fc04cf3e0b4ace667fce3b5bdcca5093e0c93f9184439e663c69546c1e046";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/default.nix
deleted file mode 100644
index 90fc3a8737a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
-, libsoup, json_glib, gmp, openssl, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
-                  gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
-                  gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
-                  gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    for f in $out/libexec/*; do
-      wrapProgram "$f" \
-        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-${gnome3.grilo-plugins.major}"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
-    description = "A set of crawlers that go through your online content and index them locally in Tracker";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/src.nix
deleted file mode 100644
index 185a8e2bc6d..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-online-miners/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-online-miners-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-online-miners/3.20/gnome-online-miners-3.20.0.tar.xz;
-    sha256 = "f46dac7743283385d2aeea588eeead216274d9f365e323b90f586de982336e36";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix
deleted file mode 100644
index 29ebe8b0ca6..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
-, bash, gtk3, glib, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-screenshot" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot;
-    description = "Utility used in the GNOME desktop environment for taking screenshots";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/src.nix
deleted file mode 100644
index d6b0e28a0c2..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-screenshot-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-screenshot/3.20/gnome-screenshot-3.20.1.tar.xz;
-    sha256 = "06a89b6887146cdbbeb64adf11bdae21acf22b0422337041c66eedb21ef7e143";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix
deleted file mode 100644
index 69b908ec01e..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  configureFlags = "--enable-systemd";
-
-  buildInputs = with gnome3;
-    [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt 
-      gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
-      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
-
-  # FIXME: glib binaries shouldn't be in .dev!
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-session" \
-      --prefix PATH : "${glib.dev}/bin" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-session/src.nix
deleted file mode 100644
index 06c40b6c2cf..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-session/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  major = "3.20";
-  name = "gnome-session-${major}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-session/${major}/${name}.tar.xz";
-    sha256 = "1npnjm6wirz2v0liv7n23ivp2w0y1q230qcdb681hhzmp7h9fpq2";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix
deleted file mode 100644
index 00999353c2f..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
-, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
-, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager
-, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
-      libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
-      libcanberra_gtk3 upower colord libgweather xkeyboard_config
-      polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
-      libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
-
-  # FIXME: glib binaries shouldn't be in .dev!
-  preFixup = ''
-    wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix PATH : "${glib.dev}/bin" \
-      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/src.nix
deleted file mode 100644
index 9091f2eb361..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-settings-daemon-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-settings-daemon/3.20/gnome-settings-daemon-3.20.1.tar.xz;
-    sha256 = "e84a075d895ca3baeefb8508e0a901027b66f7d5a7ee8c966e31d301b38e78e7";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/default.nix
deleted file mode 100644
index e9eae87f14e..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, gnome3, file }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool
-                  makeWrapper file ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;
-    description = "Modify and extend GNOME Shell functionality and behavior";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/src.nix
deleted file mode 100644
index 5ad056ba156..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell-extensions/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-shell-extensions-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-shell-extensions/3.20/gnome-shell-extensions-3.20.1.tar.xz;
-    sha256 = "bc432ec163c79794331290d7a9321bee184be077d348faf3b7a1639b672939a3";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix
deleted file mode 100644
index cf781d24b6f..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
-, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core
-, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
-, sqlite, libgweather, libcanberra_gtk3
-, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
-, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
-
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  # Needed to find /etc/NetworkManager/VPN
-  configureFlags = [ "--sysconfdir=/etc" ];
-
-  buildInputs = with gnome3;
-    [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
-      libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf librsvg
-      clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
-      libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
-      libical libtool nss gtk gstreamer makeWrapper gdm
-      libcanberra_gtk3 gnome_control_center
-      defaultIconTheme sqlite gnome3.gnome-bluetooth
-      libgweather # not declared at build time, but typelib is needed at runtime
-      gnome3.gnome-clocks # schemas needed
-      at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
-
-  propagatedBuildInputs = [ python3Packages.pygobject3 python3Packages.python gobjectIntrospection ];
-
-  installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
-
-  preBuild = ''
-    patchShebangs src/data-to-c.pl
-    substituteInPlace data/Makefile --replace " install-keysDATA" ""
-  '';
-
-  preFixup = with gnome3; ''
-    wrapProgram "$out/bin/gnome-shell" \
-      --prefix PATH : "${unzip}/bin" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
-      --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-
-    wrapProgram "$out/bin/gnome-shell-extension-tool" \
-      --prefix PYTHONPATH : "${python3Packages.pygobject3}/${python3Packages.python.sitePackages}:$PYTHONPATH"
-
-    wrapProgram "$out/libexec/gnome-shell-calendar-server" \
-      --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
-    echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
-  '';
-
-  passthru = {
-    mozillaPlugin = "/lib/mozilla/plugins";
-  };
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/src.nix
deleted file mode 100644
index df4994cead0..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-shell-3.20.3";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-shell/3.20/gnome-shell-3.20.3.tar.xz;
-    sha256 = "b23fd558623bfdc726066be3f47bb5fb8ed9c0ad980a95d6afc6397b6d41171e";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-software/default.nix
deleted file mode 100644
index 7c258e9cf21..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-software/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit
-, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3
-, json_glib }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
-  buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup
-                  gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
-		  gtkspell3 json_glib
-                  polkit attr acl libyaml ];
-  propagatedBuildInputs = [ isocodes ];
-
-  postInstall = ''
-    mkdir -p $out/share/xml/
-    ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://www.freedesktop.org/software/PackageKit/;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    description = "GNOME Software lets you install and update applications and system extensions.";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix
deleted file mode 100644
index ea9378fcd3c..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-software-3.20.4";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-software/3.20/gnome-software-3.20.4.tar.xz;
-    sha256 = "d6a2794348e2c543218e3efb01105a7e6d51e93ad3055a2482e3104ca75345f2";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix
deleted file mode 100644
index 50ee229cfa4..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig
-, bash, gtk3, glib, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-system-log-3.9.90";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz";
-    sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-system-log" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-system-log/3.9/;
-    description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/default.nix
deleted file mode 100644
index bdbdefecf22..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
-, bash, gtk3, glib, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
-                  gtkmm3 libgtop makeWrapper
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-system-monitor" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/;
-    description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/src.nix
deleted file mode 100644
index 3dd167ce5f7..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-system-monitor/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-system-monitor-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-system-monitor/3.20/gnome-system-monitor-3.20.1.tar.xz;
-    sha256 = "9b23ab443fd92050b95c03a0ab321bbd41696a0ffc89c06e79c8798dca0a44f9";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix
deleted file mode 100644
index beb019947ce..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, libuuid, vala_0_32
-, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
-                  gnome3.dconf itstool gnome3.nautilus vala_0_32 ];
-
-  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2
-                        desktop_file_utils wrapGAppsHook ];
-
-  # Silly ./configure, it looks for dbus file from gnome-shell in the
-  # installation tree of the package it is configuring.
-  preConfigure = ''
-    mkdir -p "$out/share/dbus-1/interfaces"
-    cp "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" "$out/share/dbus-1/interfaces"
-  '';
-
-  # FIXME: enable for gnome3
-  configureFlags = [ "--disable-migration" ];
-
-  meta = with stdenv.lib; {
-    description = "The GNOME Terminal Emulator";
-    homepage = https://wiki.gnome.org/Apps/Terminal/;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/src.nix
deleted file mode 100644
index 9fa8e510ad8..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-terminal/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-terminal-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-terminal/3.20/gnome-terminal-3.20.2.tar.xz;
-    sha256 = "f5383060730f1de70af35e917f82d5b6a14d963ad9cfd6a0e705f90011645a23";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/default.nix
deleted file mode 100644
index a33252a934c..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2
-, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-  
-  buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf
-                  gnome3.defaultIconTheme ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/src.nix
deleted file mode 100644
index 8388bd61221..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-themes-standard/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-themes-standard-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-themes-standard/3.20/gnome-themes-standard-3.20.2.tar.xz;
-    sha256 = "9d0d9c4b2c9f9008301c3c1878ebb95859a735b7fd4a6a518802b9637e4a7915";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/default.nix
deleted file mode 100644
index 4f02673e036..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}";
-    description = "User and system administration help for the GNOME desktop";
-    maintainers = gnome3.maintainers;
-    license = licenses.cc-by-30;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/src.nix
deleted file mode 100644
index 4c12fa6e043..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-user-docs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-user-docs-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-user-docs/3.20/gnome-user-docs-3.20.2.tar.xz;
-    sha256 = "3e998ba05956582219b068e7f7abd9baebf8bc4067c9618d6d0be92c68a5bf32";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix
deleted file mode 100644
index a405751a963..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus
-, pkgconfig, gtk3, glib, libxml2, gnused
-, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd
-, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  preConfigure = ''
-    sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf 
-  '';
-
-  configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd"
-                     "--with-modules-path=${apacheHttpd_2_2.dev}/modules"
-                     "--disable-bluetooth"
-                     "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
-                  makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  nautilus libnotify libcanberra_gtk3 ];
-
-  postInstall = ''
-    mkdir -p $out/share/gsettings-schemas/$name
-    mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
-    ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
-  '';
-
-  preFixup = ''
-    wrapProgram "$out/libexec/gnome-user-share-webdav" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-user-share/3.8;
-    description = "Service that exports the contents of the Public folder in your home directory on the local network";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/src.nix
deleted file mode 100644
index b748091af68..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/src.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  major = "3.18";
-  minor = "1";
-  name = "gnome-user-share-${major}.${minor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-share/${major}/${name}.tar.xz";
-    sha256 = "1p9cz93jbfx4a5gxfk54jm0sxddm73lrag92h3qgpgfrmp7xlr1y";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.20/core/grilo-plugins/default.nix
deleted file mode 100644
index caa0176036f..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/grilo-plugins/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite
-, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av
-, gmime, json_glib, avahi, tracker, itstool }:
-
-stdenv.mkDerivation rec {
-  major = "0.3";
-  minor = "2";
-  name = "grilo-plugins-${major}.${minor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz";
-    sha256 = "1z8s62a29zidm35ajf708r7d36glb27im4s52l02q9w1jwl8j6vr";
-  };
-
-  installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ];
-
-  buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
-                  lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts
-                  gnome3.totem-pl-parser gnome3.rest gmime json_glib
-                  avahi gnome3.libmediaart tracker intltool itstool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
-    description = "A collection of plugins for the Grilo framework";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.20/core/grilo/default.nix
deleted file mode 100644
index 0bae28387bb..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/grilo/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib
-, libxml2, gnome3, gobjectIntrospection, libsoup, python3Packages }:
-
-stdenv.mkDerivation rec {
-  major = "0.3"; # if you change this, also change ./setup-hook.sh
-  minor = "1";
-  name = "grilo-${major}.${minor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz";
-    sha256 = "0k6d8drgh7inbpxqfa9m9dm4vrhfb9ifi5b88fn8q2ljqwfwdggb";
-  };
-
-  setupHook = ./setup-hook.sh;
-
-  configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
-
-  preConfigure = ''
-    for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
-       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
-       substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
-    done
-  '';
-
-  buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
-                  gnome3.totem-pl-parser ];
-
-  propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
-    description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.20/core/grilo/setup-hook.sh
deleted file mode 100644
index 3291e38addb..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/grilo/setup-hook.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-make_grilo_find_plugins() {
-    if [ -d "$1"/lib/grilo-0.3 ]; then
-        addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.3"
-    fi
-}
-
-envHooks+=(make_grilo_find_plugins)
diff --git a/pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/default.nix
deleted file mode 100644
index 5123cadbdaf..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
-  # just for passthru
-, gnome3, gtk3, gsettings_desktop_schemas }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  postPatch = ''
-    for file in "background" "screensaver"; do
-      substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \
-        --replace "@datadir@" "${gnome3.gnome-backgrounds}/share/"
-    done
-  '';
-
-  buildInputs = [ glib gobjectIntrospection ];
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/src.nix
deleted file mode 100644
index 14199e47dbb..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gsettings-desktop-schemas/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gsettings-desktop-schemas-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gsettings-desktop-schemas/3.20/gsettings-desktop-schemas-3.20.0.tar.xz;
-    sha256 = "55a41b533c0ab955e0a36a84d73829451c88b027d8d719955d8f695c35c6d9c1";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix
deleted file mode 100644
index 95785d9ed4d..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libcanberra_gtk2, gobjectIntrospection, libtool, gnome3 }:
-
-let
-  majVer = "1.0";
-in stdenv.mkDerivation rec {
-  name = "gsound-${majVer}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz";
-    sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29";
-  };
-
-  buildInputs = [ pkgconfig glib libcanberra_gtk2 gobjectIntrospection libtool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GSound;
-    description = "Small library for playing system sounds";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceview/default.nix
deleted file mode 100644
index ea95e39e5b2..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
-, libxml2Python, perl, intltool, gettext, gnome3 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  propagatedBuildInputs = [ gtk3 ];
-
-  buildInputs = [ pkgconfig atk cairo glib pango
-                  libxml2Python perl intltool gettext ];
-
-  preBuild = ''
-    substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
-  ''; 
-
-  patches = [ ./nix_share_path.patch ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.20/core/gtksourceview/nix_share_path.patch
deleted file mode 100644
index c87350167c2..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/nix_share_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gtksourceview/gtksourceview-utils.c	2014-07-13 16:13:57.418687726 +0200
-+++ b/gtksourceview/gtksourceview-utils.c	2014-07-13 16:14:20.550847767 +0200
-@@ -68,6 +68,8 @@
- 							 basename,
- 							 NULL));
- 
-+        g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL));
-+
- 	g_ptr_array_add (dirs, NULL);
- 
- 	return (gchar**) g_ptr_array_free (dirs, FALSE);
diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceview/src.nix
deleted file mode 100644
index 4f80104cc3b..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gtksourceview/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gtksourceview-3.20.4";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gtksourceview/3.20/gtksourceview-3.20.4.tar.xz;
-    sha256 = "7a0e6ac95ff3862bd8ef77a40e95a942939e73cb407f2eb67af600d7ce533d01";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix
deleted file mode 100644
index d0453ba8ebb..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig glibmm gtkmm gtksourceview ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    homepage = "https://developer.gnome.org/gtksourceviewmm/";
-    description = "C++ wrapper for gtksourceview";
-    license = licenses.lgpl2;
-    maintainers = [ maintainers.juliendehos ];
-  };
-}
-
diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix
deleted file mode 100644
index 21fecfdc48a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gtksourceviewmm-3.18.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gtksourceviewmm/3.18/gtksourceviewmm-3.18.0.tar.xz;
-    sha256 = "51081ae3d37975dae33d3f6a40621d85cb68f4b36ae3835eec1513482aacfb39";
-  };
-}
-
diff --git a/pkgs/desktops/gnome-3/3.20/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.20/core/gucharmap/default.nix
deleted file mode 100644
index a43d3c570ce..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gucharmap/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3
-, glib, desktop_file_utils, bash, appdata-tools
-, makeWrapper, gnome3, file, itstool, libxml2 }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.adwaita-icon-theme 
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
-  buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools
-                  gnome3.yelp_tools libxml2 file desktop_file_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gucharmap" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Gucharmap;
-    description = "GNOME Character Map, based on the Unicode Character Database";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/3.20/core/gucharmap/src.nix
deleted file mode 100644
index 69c0dd60025..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/gucharmap/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gucharmap-3.18.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gucharmap/3.18/gucharmap-3.18.2.tar.xz;
-    sha256 = "80141d3e892c3c4812c1a8fad8f89978559ef19e933843267e6e9a5524c09ec9";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix
deleted file mode 100644
index a4c46ef85d4..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/libcroco/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, glib }:
-
-stdenv.mkDerivation rec {
-  name = "libcroco-0.6.11";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
-    sha256 = "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk";
-  };
-
-  outputs = [ "out" "dev" ];
-  outputBin = "dev";
-
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
-
-  buildInputs = [ pkgconfig libxml2 glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgdata/default.nix
deleted file mode 100644
index e455be07bdf..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/libgdata/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib
-, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl, uhttpmock }:
-
-let
-  majorVersion = "0.17";
-in
-stdenv.mkDerivation rec {
-  name = "libgdata-${majorVersion}.4";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz";
-    sha256 = "1xniw4y90hbk9fa548pa9pfclibw7amr2f458lfh16jdzq7gw5cz";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
-
-  buildInputs = with gnome3;
-    [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection
-      liboauth gcr gnome_online_accounts p11_kit openssl uhttpmock ];
-
-  propagatedBuildInputs = [ json_glib ];
-
-  meta = with stdenv.lib; {
-    description = "GData API library";
-    maintainers = with maintainers; [ raskin lethalman ];
-    platforms = platforms.linux;
-    license = licenses.lgpl21Plus;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgee/default.nix
deleted file mode 100644
index 0eaa7132e68..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/libgee/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }:
-let
-  ver_maj = "0.16";
-  ver_min = "1";
-in
-stdenv.mkDerivation rec {
-  name = "libgee-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
-    sha256 = "d95f8ea8e78f843c71b1958fa2fb445e4a325e4821ec23d0d5108d8170e564a5";
-  };
-
-  doCheck = true;
-
-  patches = [ ./fix_introspection_paths.patch ];
-
-  buildInputs = [ autoconf vala_0_32 pkgconfig glib gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.20/core/libgee/fix_introspection_paths.patch
deleted file mode 100644
index 67003f45164..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/libgee/fix_introspection_paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- fix_introspection_paths.patch/configure	2014-01-07 17:43:53.521339338 +0000
-+++ fix_introspection_paths.patch/configure-fix	2014-01-07 17:45:11.068635069 +0000
-@@ -12085,8 +12085,8 @@
-        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
--       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
--       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+       INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
-+       INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
-        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix b/pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix
deleted file mode 100644
index 0bfc617fac6..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/libgee/libgee-1.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }:
-let
-  ver_maj = "0.6";
-  ver_min = "8";
-in
-stdenv.mkDerivation rec {
-  name = "libgee-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
-    sha256 = "1lzmxgz1bcs14ghfp8qqzarhn7s64ayx8c508ihizm3kc5wqs7x6";
-  };
-
-  doCheck = true;
-
-  patches = [ ./fix_introspection_paths.patch ];
-
-  buildInputs = [ autoconf vala_0_32 pkgconfig glib gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.spacefrogg ] ++ gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgnome-keyring/default.nix
deleted file mode 100644
index c6c9323c010..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/libgnome-keyring/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "libgnome-keyring-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz";
-    sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
-  };
-
-  propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = {
-    description = "Framework for managing passwords and other secrets";
-    homepage = http://live.gnome.org/GnomeKeyring;
-    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
-    inherit (glib.meta) platforms maintainers;
-
-    longDescription = ''
-      gnome-keyring is a program that keeps password and other secrets for
-      users. The library libgnome-keyring is used by applications to integrate
-      with the gnome-keyring system.
-    '';
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgnomekbd/default.nix
deleted file mode 100644
index 4939a4ff728..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/libgnomekbd/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "libgnomekbd-3.6.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz";
-    sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09";
-  };
-
-  buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ];
-
-  preFixup = ''
-    wrapProgram $out/bin/gkbd-keyboard-display \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Keyboard management library";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgweather/default.nix
deleted file mode 100644
index 79ede15df8f..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/libgweather/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
-, pango, gdk_pixbuf, atk, tzdata, gnome3 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
-  propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/libgweather/src.nix b/pkgs/desktops/gnome-3/3.20/core/libgweather/src.nix
deleted file mode 100644
index ddded9a28d7..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/libgweather/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "libgweather-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libgweather/3.20/libgweather-3.20.1.tar.xz;
-    sha256 = "81eb829fab6375cc9a4d448ae0f790e48f9720e91eb74678b22264cfbc8938d0";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgxps/default.nix
deleted file mode 100644
index b39e1f6fa56..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/libgxps/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
-, openssl, bzip2, acl, attr, libxml2
-}:
-
-stdenv.mkDerivation rec {
-  name = "libgxps-0.2.2";
-
-  src = fetchurl {
-    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
-    sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
-  };
-
-  buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ];
-  propagatedBuildInputs = [ libarchive ];
-
-  configureFlags = "--without-liblcms2";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.20/core/libpeas/default.nix
deleted file mode 100644
index 1ba143539d4..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/libpeas/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3
-, glib, gtk3, gobjectIntrospection, python3Packages, ncurses
-}:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  configureFlags = [ "--enable-python3" ];
-
-  buildInputs =  [ intltool pkgconfig glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    description = "A GObject-based plugins engine";
-    homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/libpeas/src.nix b/pkgs/desktops/gnome-3/3.20/core/libpeas/src.nix
deleted file mode 100644
index cd440858946..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/libpeas/src.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  major = "1.18";
-  minor = "0";
-  version = "${major}.${minor}";
-  name = "libpeas-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz";
-    sha256 = "09jy2rwwgp0xx7cnypxl56m7zzxnj3j4v58xqjxjasf3chn88jdz";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.20/core/libzapojit/default.nix
deleted file mode 100644
index 5a8117528b6..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/libzapojit/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }:
-
-stdenv.mkDerivation rec {
-  name = "libzapojit-0.0.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz";
-    sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
-  };
-
-  buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix
deleted file mode 100644
index 8b992d30e80..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
-, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
-, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; 
-
-  buildInputs = with gnome3;
-    [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
-      gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2
-      gnome3.geocode_glib
-      libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/mutter" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  patches = [ ./x86.patch ./math.patch ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/mutter/math.patch b/pkgs/desktops/gnome-3/3.20/core/mutter/math.patch
deleted file mode 100644
index dbdfd93f5e1..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/mutter/math.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mutter-3.18.0/src/backends/meta-cursor-renderer.c.orig	2015-09-23 13:54:31.297523343 +0200
-+++ mutter-3.18.0/src/backends/meta-cursor-renderer.c	2015-09-23 13:54:43.728271766 +0200
-@@ -31,6 +31,7 @@
- 
- #include <cogl/cogl.h>
- #include <clutter/clutter.h>
-+#include <math.h>
- 
- #include "meta-stage.h"
- 
diff --git a/pkgs/desktops/gnome-3/3.20/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.20/core/mutter/src.nix
deleted file mode 100644
index 89f05f8ed1b..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/mutter/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "mutter-3.20.3";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/mutter/3.20/mutter-3.20.3.tar.xz;
-    sha256 = "142c5271df4bde968c725ed09026173292c07b4dd7ba75f19c4b14fc363af916";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.20/core/mutter/x86.patch
deleted file mode 100644
index a997b27540e..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/mutter/x86.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/core/window.c	2015-05-26 10:52:41.382834963 +0200
-+++ b/src/core/window.c	2015-05-26 10:53:03.039948034 +0200
-@@ -3499,7 +3499,7 @@
- 
- static MetaMonitorInfo *
- find_monitor_by_winsys_id (MetaWindow *window,
--                           guint       winsys_id)
-+                           gint       winsys_id)
- {
-   int i;
- 
-@@ -3618,7 +3618,7 @@
-    */
- 
-   gboolean did_placement;
--  guint old_output_winsys_id;
-+  gint old_output_winsys_id;
-   MetaRectangle unconstrained_rect;
-   MetaRectangle constrained_rect;
-   MetaMoveResizeResultFlags result = 0;
---- a/src/core/startup-notification.c	2016-06-06 12:13:27.100251933 +0200
-+++ b/src/core/startup-notification.c	2016-06-06 12:13:42.554956773 +0200
-@@ -418,7 +418,7 @@
-   elapsed = ctod->now - timestamp;
- 
-   meta_topic (META_DEBUG_STARTUP,
--              "Sequence used %ld ms vs. %d max: %s\n",
-+              "Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s\n",
-               elapsed, STARTUP_TIMEOUT,
-               meta_startup_notification_sequence_get_id (sequence));
- 
-[?25l[?25h[?1049h[?1h=[?25h[?25l~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              [?25h[?25lType  :quit<Enter>  to exit Vim[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h
-[?1l>[?1049l
diff --git a/pkgs/desktops/gnome-3/3.20/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.20/core/nautilus/default.nix
deleted file mode 100644
index 4cb0b7fb35c..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/nautilus/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
-, gtk, gnome3, libunique, intltool, gobjectIntrospection
-, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = [ libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
-                  gnome3.gnome_desktop gnome3.adwaita-icon-theme
-                  gnome3.gsettings_desktop_schemas gnome3.dconf libnotify tracker libselinux ];
-
-  hardeningDisable = [ "format" ];
-
-  patches = [ ./extension_dir.patch ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.20/core/nautilus/extension_dir.patch
deleted file mode 100644
index 317b8257992..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/nautilus/extension_dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c
-index 6273a76..4adcc8a 100644
---- a/libnautilus-private/nautilus-module.c
-+++ b/libnautilus-private/nautilus-module.c
-@@ -242,11 +242,17 @@ void
- nautilus_module_setup (void)
- {
- 	static gboolean initialized = FALSE;
-+	const gchar* extensiondir = NULL;
- 
- 	if (!initialized) {
- 		initialized = TRUE;
--		
--		load_module_dir (NAUTILUS_EXTENSIONDIR);
-+	
-+		extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
-+		if (extensiondir == NULL) {
-+			extensiondir = NAUTILUS_EXTENSIONDIR;
-+		}
-+	
-+		load_module_dir (extensiondir);
- 
- 		eel_debug_call_at_shutdown (free_module_objects);
- 	}
diff --git a/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix
deleted file mode 100644
index 5592e3bd7f8..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "nautilus-3.20.3";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/nautilus/3.20/nautilus-3.20.3.tar.xz;
-    sha256 = "46600a2361a022a0170304aef7167caa29c0d52232063a3556bec6a77881310e";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/rest/default.nix b/pkgs/desktops/gnome-3/3.20/core/rest/default.nix
deleted file mode 100644
index 344bc00780f..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/rest/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "rest-0.7.93";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
-    sha256 = "05mj10hhiik23ai8w4wkk5vhsp7hcv24bih5q3fl82ilam268467";
-  };
-
-  buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
-
-  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.20/core/sushi/default.nix
deleted file mode 100644
index fb010756f29..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/sushi/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
-, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz
-, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
-, gdk_pixbuf, librsvg, gtk3, harfbuzz }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
-
-  buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3
-                  clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf
-                  librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk
-                  gnome3.evince icu makeWrapper harfbuzz ];
-
-  enableParallelBuilding = true;
-
-  postConfigure = ''
-    substituteInPlace src/libsushi/sushi-font-widget.h \
-        --replace "<hb-ft.h>" "<harfbuzz/hb-ft.h>"
-    substituteInPlace src/libsushi/sushi-font-widget.c \
-        --replace "<hb-glib.h>" "<harfbuzz/hb-glib.h>"
-  '';
-
-  preFixup = ''
-    wrapProgram $out/libexec/sushi-start \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "http://en.wikipedia.org/wiki/Sushi_(software)";
-    description = "A quick previewer for Nautilus";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/sushi/src.nix b/pkgs/desktops/gnome-3/3.20/core/sushi/src.nix
deleted file mode 100644
index f972b22fae6..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/sushi/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "sushi-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/sushi/3.20/sushi-3.20.0.tar.xz;
-    sha256 = "6e729c789e9e7f02505e25d4ac6cfed47e676366f0942fca740094f7fe9eae9e";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.20/core/totem-pl-parser/default.nix
deleted file mode 100644
index 63f36004bcd..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/totem-pl-parser/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "totem-pl-parser-3.10.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";
-    sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
-  };
-
-  buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Videos;
-    description = "Simple GObject-based library to parse and save a host of playlist formats";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/totem/default.nix b/pkgs/desktops/gnome-3/3.20/core/totem/default.nix
deleted file mode 100644
index 884b328dbe7..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/totem/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, intltool, fetchurl, gst_all_1
-, clutter_gtk, clutter-gst, python3Packages, shared_mime_info
-, pkgconfig, gtk3, glib, gobjectIntrospection
-, bash, wrapGAppsHook, itstool, libxml2, dbus_glib
-, gnome3, librsvg, gdk_pixbuf, file, tracker, nautilus }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  enableParallelBuilding = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
-                  clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav
-                  gnome3.libpeas shared_mime_info dbus_glib
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop
-                  gnome3.gsettings_desktop_schemas wrapGAppsHook file tracker nautilus ];
-
-  patches = [ ./x86.patch ];
-
-  propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ];
-
-  configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
-
-  GI_TYPELIB_PATH = "$out/lib/girepository-1.0";
-
-  wrapPrefixVariables = [ "PYTHONPATH" ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Videos;
-    description = "Movie player for the GNOME desktop based on GStreamer";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/totem/src.nix b/pkgs/desktops/gnome-3/3.20/core/totem/src.nix
deleted file mode 100644
index 244549c4e26..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/totem/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "totem-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/totem/3.20/totem-3.20.1.tar.xz;
-    sha256 = "6f22480361ae869fd336854b4f83614fde528aff4e808eb716de33432eb45c27";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/totem/x86.patch b/pkgs/desktops/gnome-3/3.20/core/totem/x86.patch
deleted file mode 100644
index ada6d59e8e0..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/totem/x86.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/backend/bacon-video-widget.c	2016-06-07 20:47:22.981213063 +0200
-+++ b/src/backend/bacon-video-widget.c	2016-06-07 20:47:44.065781036 +0200
-@@ -2334,7 +2334,7 @@
-     if (!gst_toc_entry_get_start_stop_times (entry, &start, &stop)) {
-       GST_DEBUG ("Chapter #%d (couldn't get times)", i);
-     } else {
--      GST_DEBUG ("Chapter #%d (start: %li stop: %li)", i, start, stop);
-+      GST_DEBUG ("Chapter #%d (start: %" G_GINT64_FORMAT " stop: %" G_GINT64_FORMAT ")", i, start, stop);
-     }
-   }
- 
diff --git a/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix
deleted file mode 100644
index 72ebd543e90..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/tracker/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, intltool, fetchurl, libxml2, upower
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, vala_0_32, sqlite, libxslt
-, gnome3, librsvg, gdk_pixbuf, file, libnotify
-, evolution_data_server, gst_all_1, poppler
-, icu, taglib, libjpeg, libtiff, giflib, libcue
-, libvorbis, flac, exempi, networkmanager
-, libpng, libexif, libgsf, libuuid, bzip2 }:
-
-stdenv.mkDerivation rec {
-
-  inherit (import ./src.nix fetchurl) name src;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -I${poppler.dev}/include/poppler";
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2
-                  bzip2 gnome3.totem-pl-parser libxslt
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite
-                  upower libnotify evolution_data_server gnome3.libgee
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
-                  poppler icu taglib libjpeg libtiff giflib libvorbis
-                  exempi networkmanager libpng libexif libgsf libuuid ];
-
-  preConfigure = ''
-    substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql"
-  '';
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/Tracker;
-    description = "Desktop-neutral user information store, search tool and indexer";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/tracker/src.nix b/pkgs/desktops/gnome-3/3.20/core/tracker/src.nix
deleted file mode 100644
index 0ac540f4249..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/tracker/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-fetchurl: rec {
-  major = "1.8";
-  minor = "0";
-  name = "tracker-${major}.${minor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/tracker/${major}/${name}.tar.xz";
-    sha256 = "0zchaahk4w7dwanqk1vx0qgnyrlzlp81krwawfx3mv5zffik27x1";
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/vino/default.nix b/pkgs/desktops/gnome-3/3.20/core/vino/default.nix
deleted file mode 100644
index 52481395756..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/vino/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, lib, makeWrapper
-, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup
-, telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null
-, libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null
-, zlib ? null, libjpeg ? null
-, libXdamage ? null, libXfixes ? null, libXext ? null
-, gnomeKeyringSupport ? false, libgnome_keyring3 ? null
-, networkmanager ? null }:
-
-with lib;
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  buildInputs = [
-    makeWrapper
-    pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup
-  ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ]
-    ++ optional gnomeKeyringSupport libgnome_keyring3
-    ++ filter (p: p != null) [
-      libsecret gnutls libgcrypt avahi zlib libjpeg
-      libXdamage libXfixes libXext networkmanager
-    ];
-
-  preFixup = ''
-    wrapProgram "$out/libexec/vino-server" \
-      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Vino;
-    description = "GNOME desktop sharing server";
-    maintainers = with maintainers; [ lethalman domenkozar ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/vino/src.nix b/pkgs/desktops/gnome-3/3.20/core/vino/src.nix
deleted file mode 100644
index 140a85d7d19..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/vino/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "vino-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/vino/3.20/vino-3.20.2.tar.xz;
-    sha256 = "660488adc1bf577958e783d13f61dbd99c1d9c4e81d2ca063437ea81d39e4413";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.20/core/vte/2.90.nix
deleted file mode 100644
index cbb52c9aaa1..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/vte/2.90.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  versionMajor = "0.36";
-  versionMinor = "3";
-  moduleName   = "vte";
-
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
-  };
-
-  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
-
-  configureFlags = [ "--enable-introspection" ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/;
-    description = "A library implementing a terminal emulator widget for GTK+";
-    longDescription = ''
-      VTE is a library (libvte) implementing a terminal emulator widget for
-      GTK+, and a minimal sample application (vte) using that.  Vte is
-      mainly used in gnome-terminal, but can also be used to embed a
-      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
-      character set conversion, as well as emulating any terminal known to
-      the system's terminfo database.
-    '';
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ astsmtl antono lethalman ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/vte/default.nix b/pkgs/desktops/gnome-3/3.20/core/vte/default.nix
deleted file mode 100644
index 7d2f0434641..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/vte/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig
-, gnome3, ncurses, gobjectIntrospection, vala_0_32, libxml2, gnutls
-
-, selectTextPatch ? false
-, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf
-}:
-
-let baseAttrs = rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib
-                  gnome3.gtk3 ncurses vala_0_32 libxml2 ];
-
-  propagatedBuildInputs = [ gnutls ];
-
-  preConfigure = "patchShebangs .";
-
-  configureFlags = [ "--enable-introspection" ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/;
-    description = "A library implementing a terminal emulator widget for GTK+";
-    longDescription = ''
-      VTE is a library (libvte) implementing a terminal emulator widget for
-      GTK+, and a minimal sample application (vte) using that.  Vte is
-      mainly used in gnome-terminal, but can also be used to embed a
-      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
-      character set conversion, as well as emulating any terminal known to
-      the system's terminfo database.
-    '';
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ astsmtl antono lethalman ];
-    platforms = platforms.linux;
-  };
-};
-
-in stdenv.mkDerivation ( baseAttrs
-  // stdenv.lib.optionalAttrs selectTextPatch rec {
-      name = "vte-ng-${version}";
-      version = "0.44.1b-ng";
-      src = fetchFromGitHub {
-        owner = "thestinger";
-        repo = "vte-ng";
-        rev = version;
-        sha256 = "0p61znma9742fd3c6b44rq7j6mhpr6gx2b9rldm3jhb62ss4vsyy";
-      };
-      # slightly hacky; I couldn't make it work with autoreconfHook
-      configureScript = "./autogen.sh";
-      nativeBuildInputs = (baseAttrs.nativeBuildInputs or [])
-        ++ [ gtk_doc autoconf automake libtool gperf ];
-  }
-)
-
diff --git a/pkgs/desktops/gnome-3/3.20/core/vte/src.nix b/pkgs/desktops/gnome-3/3.20/core/vte/src.nix
deleted file mode 100644
index 0b45aa24112..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/vte/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "vte-0.44.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/vte/0.44/vte-0.44.2.tar.xz;
-    sha256 = "a1ea594814bb136a3a9a6c7656b46240571f6a198825c1111007fe99194b0949";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.20/core/yelp-tools/default.nix
deleted file mode 100644
index 9111802eb6a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/yelp-tools/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp/Tools;
-    description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
-    maintainers = with maintainers; [ domenkozar ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/3.20/core/yelp-tools/src.nix
deleted file mode 100644
index f03c6d1bc31..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/yelp-tools/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "yelp-tools-3.18.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz;
-    sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.20/core/yelp-xsl/default.nix
deleted file mode 100644
index 0a3976f35a1..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/yelp-xsl/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, bash
-, itstool, libxml2, libxslt, gnome3 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp;
-    description = "Yelp's universal stylesheets for Mallard and DocBook";
-    maintainers = gnome3.maintainers;
-    license = [licenses.gpl2 licenses.lgpl2];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/3.20/core/yelp-xsl/src.nix
deleted file mode 100644
index de5d68d1fab..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/yelp-xsl/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "yelp-xsl-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz;
-    sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix
deleted file mode 100644
index 4ee79bbc3dc..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, gnome3, gdk_pixbuf, sqlite, groff
-, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1
-, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
-  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite
-                  libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
-                  librsvg gdk_pixbuf gnome3.defaultIconTheme groff
-                  gnome3.gsettings_desktop_schemas wrapGAppsHook
-                  gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp;
-    description = "The help viewer in Gnome";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp/src.nix b/pkgs/desktops/gnome-3/3.20/core/yelp/src.nix
deleted file mode 100644
index a6cc7522c65..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/yelp/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "yelp-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/yelp/3.20/yelp-3.20.1.tar.xz;
-    sha256 = "dda0b051ad32908cb9d894d1db3ffdac69b21849b8a6a9a74d9669b017f608c2";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.20/core/zenity/default.nix
deleted file mode 100644
index 8f525945a6a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/zenity/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, itstool }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  preBuild = ''
-    mkdir -p $out/include
-  '';
-
-  buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
-
-  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/core/zenity/src.nix b/pkgs/desktops/gnome-3/3.20/core/zenity/src.nix
deleted file mode 100644
index 7b32e88a2c0..00000000000
--- a/pkgs/desktops/gnome-3/3.20/core/zenity/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "zenity-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/zenity/3.20/zenity-3.20.0.tar.xz;
-    sha256 = "02e8759397f813c0a620b93ebeacdab9956191c9dc0d0fcba1815c5ea3f15a48";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix
deleted file mode 100644
index e935552b9f5..00000000000
--- a/pkgs/desktops/gnome-3/3.20/default.nix
+++ /dev/null
@@ -1,401 +0,0 @@
-{ pkgs }:
-
-let
-
-  pkgsFun = overrides:
-    let
-      self = self_ // overrides;
-      self_ = with self; {
-
-  overridePackages = f:
-    let newself = pkgsFun (f newself self);
-    in newself;
-
-  callPackage = pkgs.newScope self;
-
-  version = "3.20";
-  maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds DamienCassou ];
-
-  corePackages = with gnome3; [
-    pkgs.desktop_file_utils pkgs.ibus
-    pkgs.shared_mime_info # for update-mime-database
-    glib # for gsettings
-    gtk3 # for gtk-update-icon-cache
-    glib_networking gvfs dconf gnome-backgrounds gnome_control_center
-    gnome-menus gnome_settings_daemon gnome_shell
-    gnome_themes_standard defaultIconTheme gnome-shell-extensions
-    pkgs.hicolor_icon_theme
-  ];
-
-  optionalPackages = with gnome3; [ baobab eog epiphany evince
-    gucharmap nautilus totem vino yelp gnome-bluetooth
-    gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
-    gnome-system-log gnome-system-monitor
-    gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
-    gnome-clocks gnome-music gnome-tweak-tool gnome-photos
-    nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
-    gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
-    gnome-getting-started-docs gnome-packagekit gnome-software
-  ];
-
-  gamesPackages = with gnome3; [ swell-foop lightsoff iagno
-    tali quadrapassel gnome-sudoku aisleriot five-or-more
-    four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
-    gnome-mines gnome-nibbles gnome-robots gnome-tetravex
-    hitori gnome-taquin
-  ];
-
-  inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2
-    clutter clutter-gst clutter_gtk cogl gtkvnc;
-  inherit (pkgs.gnome2) ORBit2;
-  libsoup = pkgs.libsoup.override { gnomeSupport = true; };
-  libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
-  orbit = ORBit2;
-  gnome3 = self // { recurseForDerivations = false; };
-  gtk = gtk3;
-  gtkmm = gtkmm3;
-  vala = pkgs.vala_0_32;
-  gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
-  webkitgtk = webkitgtk212x;
-
-# Simplify the nixos module and gnome packages
-  defaultIconTheme = adwaita-icon-theme;
-
-# ISO installer
-# installerIso = callPackage ./installer.nix {};
-
-#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
-
-  adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { };
-
-  baobab = callPackage ./core/baobab { };
-
-  caribou = callPackage ./core/caribou { };
-
-  dconf = callPackage ./core/dconf { };
-  dconf-editor = callPackage ./core/dconf-editor { };
-
-  # empathy = callPackage ./core/empathy {
-  #   webkitgtk = webkitgtk24x;
-  #   clutter-gst = pkgs.clutter-gst;
-  # };
-
-  epiphany = callPackage ./core/epiphany { };
-
-  evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
-
-  evolution_data_server = callPackage ./core/evolution-data-server { };
-
-  gconf = callPackage ./core/gconf { };
-
-  geocode_glib = callPackage ./core/geocode-glib { };
-
-  gcr = callPackage ./core/gcr { }; # ToDo: tests fail
-
-  gdm = callPackage ./core/gdm { };
-
-  gjs = callPackage ./core/gjs { };
-
-  glib_networking = pkgs.glib_networking.override {
-    inherit gsettings_desktop_schemas;
-  };
-
-  gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
-
-  gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
-
-  gnome-contacts = callPackage ./core/gnome-contacts { };
-
-  gnome_control_center = callPackage ./core/gnome-control-center { };
-
-  gnome-calculator = callPackage ./core/gnome-calculator { };
-
-  gnome_common = callPackage ./core/gnome-common { };
-
-  gnome_desktop = callPackage ./core/gnome-desktop { };
-
-  gnome-dictionary = callPackage ./core/gnome-dictionary { };
-
-  gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
-
-  gnome-font-viewer = callPackage ./core/gnome-font-viewer { };
-
-  gnome-menus = callPackage ./core/gnome-menus { };
-
-  gnome_keyring = callPackage ./core/gnome-keyring { };
-
-  libgnome_keyring = callPackage ./core/libgnome-keyring { };
-
-  libgnomekbd = callPackage ./core/libgnomekbd { };
-
-  folks = callPackage ./core/folks { };
-
-  gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
-
-  gnome-online-miners = callPackage ./core/gnome-online-miners { };
-
-  gnome_session = callPackage ./core/gnome-session { };
-
-  gnome_shell = callPackage ./core/gnome-shell { };
-
-  gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
-
-  gnome-screenshot = callPackage ./core/gnome-screenshot { };
-
-  gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
-
-  gnome-software = callPackage ./core/gnome-software { };
-
-  gnome-system-log = callPackage ./core/gnome-system-log { };
-
-  gnome-system-monitor = callPackage ./core/gnome-system-monitor { };
-
-  gnome_terminal = callPackage ./core/gnome-terminal { };
-
-  gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
-
-  gnome-user-docs = callPackage ./core/gnome-user-docs { };
-
-  gnome-user-share = callPackage ./core/gnome-user-share { };
-
-  grilo = callPackage ./core/grilo { };
-
-  grilo-plugins = callPackage ./core/grilo-plugins { };
-
-  gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
-
-  gsound = callPackage ./core/gsound { };
-
-  gtksourceview = callPackage ./core/gtksourceview { };
-
-  gtksourceviewmm = callPackage ./core/gtksourceviewmm { };
-
-  gucharmap = callPackage ./core/gucharmap { };
-
-  gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
-
-  eog = callPackage ./core/eog { };
-
-  libcroco = callPackage ./core/libcroco {};
-
-  libgee = callPackage ./core/libgee { };
-  libgee_1 = callPackage ./core/libgee/libgee-1.nix { };
-
-  libgdata = callPackage ./core/libgdata { };
-
-  libgxps = callPackage ./core/libgxps { };
-
-  libpeas = callPackage ./core/libpeas {};
-
-  libgweather = callPackage ./core/libgweather { };
-
-  libzapojit = callPackage ./core/libzapojit { };
-
-  mutter = callPackage ./core/mutter { };
-
-  nautilus = callPackage ./core/nautilus { };
-
-  networkmanager_openvpn = pkgs.networkmanager_openvpn.override {
-    inherit gnome3;
-  };
-
-  networkmanager_pptp = pkgs.networkmanager_pptp.override {
-    inherit gnome3;
-  };
-
-  networkmanager_vpnc = pkgs.networkmanager_vpnc.override {
-    inherit gnome3;
-  };
-
-  networkmanager_openconnect = pkgs.networkmanager_openconnect.override {
-    inherit gnome3;
-  };
-
-  networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
-    inherit gnome3;
-  };
-
-  networkmanagerapplet = pkgs.networkmanagerapplet.override {
-    inherit gnome3 gsettings_desktop_schemas glib_networking;
-  };
-
-  rest = callPackage ./core/rest { };
-
-  sushi = callPackage ./core/sushi { };
-
-  totem = callPackage ./core/totem { };
-
-  totem-pl-parser = callPackage ./core/totem-pl-parser { };
-
-  tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; };
-
-  vte = callPackage ./core/vte { };
-
-  vte_290 = callPackage ./core/vte/2.90.nix { };
-
-  vte-select-text = vte.override { selectTextPatch = true; };
-
-  vino = callPackage ./core/vino { };
-
-  yelp = callPackage ./core/yelp { };
-
-  yelp_xsl = callPackage ./core/yelp-xsl { };
-
-  yelp_tools = callPackage ./core/yelp-tools { };
-
-  zenity = callPackage ./core/zenity { };
-
-
-#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
-
-  accerciser = callPackage ./apps/accerciser { };
-
-  bijiben = callPackage ./apps/bijiben {
-    webkitgtk = webkitgtk24x;
-  };
-
-  cheese = callPackage ./apps/cheese { };
-
-  evolution = callPackage ./apps/evolution {
-    webkitgtk = webkitgtk24x;
-  };
-
-  file-roller = callPackage ./apps/file-roller { };
-
-  gedit = callPackage ./apps/gedit { };
-
-  glade = callPackage ./apps/glade { };
-
-  gnome-boxes = callPackage ./apps/gnome-boxes {
-    spice_gtk = pkgs.spice_gtk;
-  };
-
-  gnome-calendar = callPackage ./apps/gnome-calendar { };
-
-  gnome-characters = callPackage ./apps/gnome-characters { };
-
-  gnome-clocks = callPackage ./apps/gnome-clocks { };
-
-  gnome-documents = callPackage ./apps/gnome-documents { };
-
-  gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { };
-
-  gnome-logs = callPackage ./apps/gnome-logs { };
-
-  gnome-maps = callPackage ./apps/gnome-maps { };
-
-  gnome-music = callPackage ./apps/gnome-music { };
-
-  gnome-nettool = callPackage ./apps/gnome-nettool { };
-
-  gnome-photos = callPackage ./apps/gnome-photos {
-    gegl = gegl_0_3;
-  };
-
-  gnome-weather = callPackage ./apps/gnome-weather { };
-
-  nautilus-sendto = callPackage ./apps/nautilus-sendto { };
-
-  polari = callPackage ./apps/polari { };
-
-  # scrollkeeper replacement
-  rarian = callPackage ./desktop/rarian { };
-
-  seahorse = callPackage ./apps/seahorse { };
-
-  vinagre = callPackage ./apps/vinagre { };
-
-#### Dev http://ftp.gnome.org/pub/GNOME/devtools/
-
-  anjuta = callPackage ./devtools/anjuta { };
-
-  devhelp = callPackage ./devtools/devhelp { };
-
-  gdl = callPackage ./devtools/gdl { };
-
-  gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };
-
-  nemiver = callPackage ./devtools/nemiver { };
-
-#### Games
-
-  aisleriot = callPackage ./games/aisleriot { };
-
-  five-or-more = callPackage ./games/five-or-more { };
-
-  four-in-a-row = callPackage ./games/four-in-a-row { };
-
-  gnome-chess = callPackage ./games/gnome-chess { };
-
-  gnome-klotski = callPackage ./games/gnome-klotski { };
-
-  gnome-mahjongg = callPackage ./games/gnome-mahjongg { };
-
-  gnome-mines = callPackage ./games/gnome-mines { };
-
-  gnome-nibbles = callPackage ./games/gnome-nibbles { };
-
-  gnome-robots = callPackage ./games/gnome-robots { };
-
-  gnome-sudoku = callPackage ./games/gnome-sudoku { };
-
-  gnome-taquin = callPackage ./games/gnome-taquin { };
-
-  gnome-tetravex = callPackage ./games/gnome-tetravex { };
-
-  hitori = callPackage ./games/hitori { };
-
-  iagno = callPackage ./games/iagno { };
-
-  lightsoff = callPackage ./games/lightsoff { };
-
-  swell-foop = callPackage ./games/swell-foop { };
-
-  tali = callPackage ./games/tali { };
-
-  quadrapassel = callPackage ./games/quadrapassel { };
-
-#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
-
-  california = callPackage ./misc/california { };
-
-  geary = callPackage ./misc/geary {
-    webkitgtk = webkitgtk24x;
-  };
-
-  gfbgraph = callPackage ./misc/gfbgraph { };
-
-  gitg = callPackage ./misc/gitg {
-    webkitgtk = webkitgtk24x;
-  };
-
-  gspell = callPackage ./misc/gspell { };
-
-  libgames-support = callPackage ./misc/libgames-support { };
-
-  libgda = callPackage ./misc/libgda { };
-
-  libgit2-glib = callPackage ./misc/libgit2-glib { };
-
-  libmediaart = callPackage ./misc/libmediaart { };
-
-  gexiv2 = callPackage ./misc/gexiv2 { };
-
-  gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
-
-  gpaste = callPackage ./misc/gpaste { };
-
-  pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { };
-
-  gtkhtml = callPackage ./misc/gtkhtml { };
-
-  pomodoro = callPackage ./misc/pomodoro { };
-
-  gnome-video-effects = callPackage ./misc/gnome-video-effects { };
-
-  gnome-packagekit = callPackage ./misc/gnome-packagekit { };
-
-    };
-  in self; # pkgsFun
-
-in pkgsFun {}
diff --git a/pkgs/desktops/gnome-3/3.20/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.20/desktop/rarian/default.nix
deleted file mode 100644
index a1b38b21869..00000000000
--- a/pkgs/desktops/gnome-3/3.20/desktop/rarian/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
-
-stdenv.mkDerivation rec {
-  name = "rarian-0.8.1";
-  src = fetchurl {
-    url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
-    sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
-  };
-
-  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
-  configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix
deleted file mode 100644
index 6a50834f105..00000000000
--- a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
-  itstool, python2, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
-    gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper
-    gnome3.gsettings_desktop_schemas
-  ];
-
-  preFixup = ''
-    wrapProgram $out/bin/anjuta \
-      --prefix XDG_DATA_DIRS : \
-        "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Software development studio";
-    homepage = http://anjuta.org/;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/3.20/devtools/anjuta/src.nix
deleted file mode 100644
index 75b5eaa9342..00000000000
--- a/pkgs/desktops/gnome-3/3.20/devtools/anjuta/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "anjuta-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/anjuta/3.20/anjuta-3.20.0.tar.xz;
-    sha256 = "a676c587a28f784ec2096775460cd29fafc3f0216c53e0821641bcd9126b6935";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix
deleted file mode 100644
index f6e67be8d53..00000000000
--- a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, webkitgtk, intltool, gsettings_desktop_schemas }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
-    gsettings_desktop_schemas
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://live.gnome.org/devhelp;
-    description = "API documentation browser for GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/3.20/devtools/devhelp/src.nix
deleted file mode 100644
index cde66aa5d98..00000000000
--- a/pkgs/desktops/gnome-3/3.20/devtools/devhelp/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "devhelp-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/devhelp/3.20/devhelp-3.20.0.tar.xz;
-    sha256 = "a23375c2e2b2ef6240994bc2327fcacfd42403af6d872d0cba2e16dd45ca1f1d";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/gdl/default.nix
deleted file mode 100644
index 156d91b3eae..00000000000
--- a/pkgs/desktops/gnome-3/3.20/devtools/gdl/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig libxml2 gtk3 intltool ];
-
-  meta = with stdenv.lib; {
-    description = "Gnome docking library";
-    homepage = https://developer.gnome.org/gdl/;
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/3.20/devtools/gdl/src.nix
deleted file mode 100644
index f9c8802218c..00000000000
--- a/pkgs/desktops/gnome-3/3.20/devtools/gdl/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gdl-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gdl/3.20/gdl-3.20.0.tar.xz;
-    sha256 = "53d3a3bb9b9be25b3a40c644fdbbb57a5a63ee1f5f839c2266d1cd9779360e8b";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/default.nix
deleted file mode 100644
index 50960f41a31..00000000000
--- a/pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ intltool itstool libxml2 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/GNOME/gnome-devel-docs;
-    description = "Developer documentation for GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.fdl12;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/src.nix
deleted file mode 100644
index 7822034a86a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/devtools/gnome-devel-docs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-devel-docs-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-devel-docs/3.20/gnome-devel-docs-3.20.2.tar.xz;
-    sha256 = "b7aa49980920c6cbedfac65a2faa7d5da70a408c731be47bf924a7c85d373db1";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/bool_slot.patch b/pkgs/desktops/gnome-3/3.20/devtools/nemiver/bool_slot.patch
deleted file mode 100644
index 83423122110..00000000000
--- a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/bool_slot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/dbgengine/nmv-dbg-common.h	2014-07-09 10:36:05.000000000 +0200
-+++ b/src/dbgengine/nmv-dbg-common.h	2016-08-04 22:40:28.447842746 +0200
-@@ -171,7 +171,9 @@
- 
-     bool has_slot () const
-     {
--        return m_slot;
-+        //return m_slot;
-+        // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822502
-+        return static_cast<bool> (m_slot);
-     }
- 
-     template<class T>
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/3.20/devtools/nemiver/default.nix
deleted file mode 100644
index c4645b67fb9..00000000000
--- a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb,
-  boost, sqlite, gconf, libgtop, glibmm, gtkmm, vte, gtksourceview, 
-  gtksourceviewmm, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = [ gtk3 libxml2 intltool itstool gdb boost sqlite gconf libgtop 
-    glibmm gtkmm vte gtksourceview gtksourceviewmm ];
-
-  patches = [ ./bool_slot.patch ./safe_ptr.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://wiki.gnome.org/Apps/Nemiver";
-    description = "Easy to use standalone C/C++ debugger";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.juliendehos ];
-  };
-}
-
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/safe_ptr.patch b/pkgs/desktops/gnome-3/3.20/devtools/nemiver/safe_ptr.patch
deleted file mode 100644
index e3413b22497..00000000000
--- a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/safe_ptr.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/confmgr/nmv-gconf-mgr.cc	2014-07-08 10:24:06.000000000 +0200
-+++ b/src/confmgr/nmv-gconf-mgr.cc	2016-08-04 23:50:08.143060464 +0200
-@@ -32,6 +32,7 @@
- NEMIVER_BEGIN_NAMESPACE (nemiver)
- 
- using nemiver::common::GCharSafePtr;
-+using nemiver::common::GErrorSafePtr;
- 
- class GConfMgr : public IConfMgr {
-     GConfMgr (const GConfMgr &);
diff --git a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/src.nix b/pkgs/desktops/gnome-3/3.20/devtools/nemiver/src.nix
deleted file mode 100644
index 2fcf639fe1b..00000000000
--- a/pkgs/desktops/gnome-3/3.20/devtools/nemiver/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "nemiver-0.9.6";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/nemiver/0.9/nemiver-0.9.6.tar.xz;
-    sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
-  };
-}
-
diff --git a/pkgs/desktops/gnome-3/3.20/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.20/games/aisleriot/default.nix
deleted file mode 100644
index e149a0b3126..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/aisleriot/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3
-, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils
-, guile, libcanberra_gtk3 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  configureFlags = [ "--with-card-theme-formats=svg" ];
-
-  buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf
-                  librsvg libxml2 desktop_file_utils guile libcanberra_gtk3 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Aisleriot;
-    description = "A collection of patience games written in guile scheme";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/3.20/games/aisleriot/src.nix
deleted file mode 100644
index 7895db29658..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/aisleriot/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "aisleriot-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/aisleriot/3.20/aisleriot-3.20.2.tar.xz;
-    sha256 = "62036bdc69f8ae63a4405b4dd530a3def2958d5075b4e0a7caeb91fad789176e";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.20/games/five-or-more/default.nix
deleted file mode 100644
index 50a7d2906a7..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/five-or-more/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Five_or_more;
-    description = "Remove colored balls from the board by forming lines";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix
deleted file mode 100644
index 3bdd6e27645..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "five-or-more-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/five-or-more/3.20/five-or-more-3.20.1.tar.xz;
-    sha256 = "9f6dff43b6511b12ef062f4dc4d9ab8de2579676747f0ead4802e0f166a5e85f";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.20/games/four-in-a-row/default.nix
deleted file mode 100644
index 68228750cd8..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/four-in-a-row/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg
-    libxml2 gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Four-in-a-row;
-    description = "Make lines of the same color to win";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/3.20/games/four-in-a-row/src.nix
deleted file mode 100644
index f87fdc57736..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/four-in-a-row/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "four-in-a-row-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/four-in-a-row/3.20/four-in-a-row-3.20.1.tar.xz;
-    sha256 = "3f3689fbbc25a91deb4af277cdc20e8db0e5aecfd17dc1376ad4b8d993ab7cf7";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-chess/default.nix
deleted file mode 100644
index a96dae3c12c..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-chess/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, librsvg, libxml2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Chess;
-    description = "Play the classic two-player boardgame of chess";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-chess/src.nix
deleted file mode 100644
index 2c683bb5db4..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-chess/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-chess-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-chess/3.20/gnome-chess-3.20.1.tar.xz;
-    sha256 = "4715349339491bd7a1072d5d362b5df76efa2067f4363c4b37d9579201d8c66d";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-klotski/default.nix
deleted file mode 100644
index dc2289daff8..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-klotski/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libxml2, intltool, itstool, libgee, libgames-support }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Klotski;
-    description = "Slide blocks to solve the puzzle";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-klotski/src.nix
deleted file mode 100644
index aa84ac9b763..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-klotski/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-klotski-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-klotski/3.20/gnome-klotski-3.20.2.tar.xz;
-    sha256 = "5c517534da14bb9b8c90dd76b8c7169557a6876318780677a0e451f982028493";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/default.nix
deleted file mode 100644
index 43db32e8857..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Mahjongg;
-    description = "Disassemble a pile of tiles by removing matching pairs";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/src.nix
deleted file mode 100644
index 10c022db04d..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-mahjongg/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-mahjongg-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-mahjongg/3.20/gnome-mahjongg-3.20.0.tar.xz;
-    sha256 = "d09bb1923636dfd05b6f3a5af8d6fe7b6daa1434e2c06188dd27c96a61cea00a";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-mines/default.nix
deleted file mode 100644
index 4d703bb37a7..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-mines/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Mines;
-    description = "Clear hidden mines from a minefield";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-mines/src.nix
deleted file mode 100644
index 9894d501122..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-mines/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-mines-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-mines/3.20/gnome-mines-3.20.1.tar.xz;
-    sha256 = "5815e886d92817d4127b9e94bf63cb91e2bf371029d18efdf9f195e2400e2b3b";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/default.nix
deleted file mode 100644
index cf228218878..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool
-, libxml2, libgee, libgames-support }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme
-    libgee libgames-support
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Nibbles;
-    description = "Guide a worm around a maze";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/src.nix
deleted file mode 100644
index 1070aa59194..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-nibbles/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-nibbles-3.20.2.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-nibbles/3.20/gnome-nibbles-3.20.2.1.tar.xz;
-    sha256 = "9253431072e3dff89cc13582c815cc9ed9d7c2d7a10321418a2e7416c1ef7e67";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-robots/default.nix
deleted file mode 100644
index 9eafb166eee..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-robots/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra_gtk3, intltool, itstool, libxml2, libgames-support
-, libgee}:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3
-    libxml2 gnome3.defaultIconTheme libgames-support libgee
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Robots;
-    description = "Avoid the robots and make them crash into each other";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-robots/src.nix
deleted file mode 100644
index 397fc74bb83..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-robots/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-robots-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-robots/3.20/gnome-robots-3.20.2.tar.xz;
-    sha256 = "d98f2ba5a7086e2dc3f3754819b557c12a98a0fb2492efd9912d9dd34ad9cfce";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/default.nix
deleted file mode 100644
index c8ba82c7246..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook
-, json_glib, qqwing, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee
-                  json_glib qqwing itstool libxml2 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Sudoku;
-    description = "Test your logic skills in this number grid puzzle";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/src.nix
deleted file mode 100644
index 8cc9731e370..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-sudoku/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  major = "3.20";
-  name = "gnome-sudoku-${major}.4";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-sudoku/${major}/${name}.tar.xz";
-    sha256 = "1hw6r0yfg60ynp4gxnqm6zrsklzn0d6lb88vybdbifzrlaww8xwh";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-taquin/default.nix
deleted file mode 100644
index 78eaa23e63b..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-taquin/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3
-    intltool itstool libxml2 gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Taquin;
-    description = "Move tiles so that they reach their places";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-taquin/src.nix
deleted file mode 100644
index 3059e8400e0..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-taquin/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-taquin-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-taquin/3.20/gnome-taquin-3.20.2.tar.xz;
-    sha256 = "95a9c5ebc7fc87b58cd08b978acc09071da9b274934e0ec2abe9b5439554b3a2";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/default.nix
deleted file mode 100644
index d6feab93dba..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libxml2, intltool, itstool }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Tetravex;
-    description = "Complete the puzzle by matching numbered tiles";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/src.nix
deleted file mode 100644
index 5920c0f6bbf..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/gnome-tetravex/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-tetravex-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-tetravex/3.20/gnome-tetravex-3.20.0.tar.xz;
-    sha256 = "a1bdfa4233484566a01373b19f8c0fb126b7c5728227916a48d2ee012c3cbd62";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.20/games/hitori/default.nix
deleted file mode 100644
index bd6be7d43c5..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/hitori/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libxml2, intltool, itstool }:
-
-stdenv.mkDerivation rec {
-  name = "hitori-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz";
-    sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Hitori;
-    description = "GTK+ application to generate and let you play games of Hitori";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/hitori/src.nix b/pkgs/desktops/gnome-3/3.20/games/hitori/src.nix
deleted file mode 100644
index 7319968d551..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/hitori/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "hitori-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/hitori/3.20/hitori-3.20.0.tar.xz;
-    sha256 = "877cae48144b7f6908fde55104f589788b42acaa5956d62fd32b4026fde3769d";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.20/games/iagno/default.nix
deleted file mode 100644
index 1b6f08d1fd6..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/iagno/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
-, intltool, itstool, libcanberra_gtk3, libxml2, dconf }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Iagno;
-    description = "Computer version of the game Reversi, more popularly called Othello";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/iagno/src.nix b/pkgs/desktops/gnome-3/3.20/games/iagno/src.nix
deleted file mode 100644
index ceeaf353f6e..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/iagno/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "iagno-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/iagno/3.20/iagno-3.20.2.tar.xz;
-    sha256 = "73f0f201ebf12b88e05cdefbaa72ccd5309bb592a9690d076285dbb800e965d2";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.20/games/lightsoff/default.nix
deleted file mode 100644
index 8ec54b48972..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/lightsoff/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
-, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf
-                  libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Lightsoff;
-    description = "Puzzle game, where the objective is to turn off all of the tiles on the board";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/3.20/games/lightsoff/src.nix
deleted file mode 100644
index 6c6fc3cc8b3..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/lightsoff/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "lightsoff-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/lightsoff/3.20/lightsoff-3.20.0.tar.xz;
-    sha256 = "d3603891afe7ca3b3b2c509cad3e32ef6cdac3a7e80fff3b48ca72ea739852bf";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.20/games/quadrapassel/default.nix
deleted file mode 100644
index f319608764d..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/quadrapassel/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
-, librsvg, libcanberra_gtk3
-, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  libcanberra_gtk3 itstool intltool clutter
-                  libxml2 clutter_gtk wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Quadrapassel;
-    description = "Classic falling-block game, Tetris";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/3.20/games/quadrapassel/src.nix
deleted file mode 100644
index adb9253a7ca..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/quadrapassel/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "quadrapassel-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/quadrapassel/3.20/quadrapassel-3.20.0.tar.xz;
-    sha256 = "e6fdd182b15aaef5af06604eb48ad883ac19977f2fcf6ebb43b41d9ed13f1eb0";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.20/games/swell-foop/default.nix
deleted file mode 100644
index 3d3e424d0da..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/swell-foop/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf
-, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = "https://wiki.gnome.org/Apps/Swell%20Foop";
-    description = "Puzzle game, previously known as Same GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/3.20/games/swell-foop/src.nix
deleted file mode 100644
index e26f8475f59..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/swell-foop/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "swell-foop-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/swell-foop/3.20/swell-foop-3.20.0.tar.xz;
-    sha256 = "40532a734dcae6d42a1e4692fd94e395442ff07c134acacf5fce3396c1e352a4";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/tali/default.nix b/pkgs/desktops/gnome-3/3.20/games/tali/default.nix
deleted file mode 100644
index c2b1f585712..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/tali/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
-, librsvg, intltool, itstool, libxml2, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  libxml2 itstool intltool wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Tali;
-    description = "Sort of poker with dice and less money";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/games/tali/src.nix b/pkgs/desktops/gnome-3/3.20/games/tali/src.nix
deleted file mode 100644
index e589b7d8057..00000000000
--- a/pkgs/desktops/gnome-3/3.20/games/tali/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "tali-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/tali/3.20/tali-3.20.0.tar.xz;
-    sha256 = "6437ab66672c331098e6df44ad708397b6363182d5c08c9ededf711cbf5cb818";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/installer.nix b/pkgs/desktops/gnome-3/3.20/installer.nix
deleted file mode 100644
index e4d64ac9e88..00000000000
--- a/pkgs/desktops/gnome-3/3.20/installer.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ isoBaseName ? "nixos-graphical-gnome", system ? builtins.currentSystem
-, extraModules ? [] }:
-    
-let
-
-  module = ../../../../nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix;
-
-  config = (import ../../../../nixos/lib/eval-config.nix {
-    inherit system;
-    modules = [ module { isoImage.isoBaseName = isoBaseName; } ] ++ extraModules;
-  }).config;
-
-in
-  config.system.build.isoImage
-
diff --git a/pkgs/desktops/gnome-3/3.20/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/3.20/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
deleted file mode 100644
index c229cc96094..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8a94642..1ca6426 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS)
- GLIB_REQUIRED=2.38.0
- GTK_REQUIRED=3.12.2
- GEE_REQUIRED=0.10.5
--ECAL_REQUIRED=3.8.5
-+ECAL_REQUIRED=3.13.90
- LIBSOUP_REQUIRED=2.44
- GDATA_REQUIRED=0.14.0
- GOA_REQUIRED=3.8.3
-diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala
-index ee6a572..5009b5d 100644
---- a/src/backing/eds/backing-eds-calendar-source.vala
-+++ b/src/backing/eds/backing-eds-calendar-source.vala
-@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource {
-
-     // Invoked by EdsStore prior to making it available outside of unit
-     internal async void open_async(Cancellable? cancellable) throws Error {
--        client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS,
-+        client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1,
-             cancellable);
-
-         client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE);
-diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi
-index 6ead3ec..46fd711 100644
---- a/vapi/libecal-1.2.vapi
-+++ b/vapi/libecal-1.2.vapi
-@@ -23,7 +23,7 @@ namespace E {
-		public bool check_save_schedules ();
-		public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error;
-		[CCode (finish_name = "e_cal_client_connect_finish")]
--		public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
-+		public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error;
-		public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
-		[CCode (finish_name = "e_cal_client_create_object_finish")]
-		public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error;
diff --git a/pkgs/desktops/gnome-3/3.20/misc/california/default.nix b/pkgs/desktops/gnome-3/3.20/misc/california/default.nix
deleted file mode 100644
index ca0450dc7f9..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/california/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, makeWrapper
-, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }:
-
-let
-  majorVersion = "0.4";
-in
-stdenv.mkDerivation rec {
-  name = "california-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz";
-    sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ makeWrapper intltool pkgconfig vala_0_32 glib gtk3 gnome3.libgee
-    libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server
-    sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/california" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share"
-  '';
-
-  enableParallelBuilding = true;
-
-  # Apply fedoras patch to build with evolution-data-server >3.13
-  patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/California;
-    description = "Calendar application for GNOME 3";
-    maintainers = with maintainers; [ pSub ];
-    license = licenses.lgpl21;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix
deleted file mode 100644
index 71bb11d4853..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32
-, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
-, libnotify, libcanberra_gtk3, libsecret, gmime
-, libpthreadstubs, sqlite
-, gnome3, librsvg, gnome_doc_utils, webkitgtk }:
-
-let
-  majorVersion = "0.10";
-in
-stdenv.mkDerivation rec {
-  name = "geary-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
-    sha256 = "19dwpla35cch5rd0bw1v9s0cmygzv6zjs24rxvf0l14b3dd7l6a6";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
-                  vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite
-                  libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr
-                  gdk_pixbuf librsvg gnome3.defaultIconTheme ];
-
-  preConfigure = ''
-    substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0'
-  '';
-
-  postInstall = ''
-    mkdir -p $out/share/gsettings-schemas/${name}/
-    mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name}
-  '';
-
-  preFixup = ''
-    wrapProgram "$out/bin/geary" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Geary;
-    description = "Mail client for GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gexiv2/default.nix
deleted file mode 100644
index 7cea9cd8d15..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gexiv2/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }:
-
-let
-  majorVersion = "0.10";
-in
-stdenv.mkDerivation rec {
-  name = "gexiv2-${version}";
-  version = "${majorVersion}.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz";
-    sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988";
-  };
-
-  preConfigure = ''
-    patchShebangs .
-  '';
-
-  buildInputs = [ pkgconfig glib libtool m4 ];
-  propagatedBuildInputs = [ exiv2 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/gexiv2;
-    description = "GObject wrapper around the Exiv2 photo metadata library";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gfbgraph/default.nix
deleted file mode 100644
index e85b087fa41..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gfbgraph/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, glib
-, gnome3, libsoup, json_glib }:
-
-stdenv.mkDerivation rec {
-  name = "gfbgraph-0.2.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz";
-    sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4";
-  };
-
-  buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ];
-  propagatedBuildInputs = [ libsoup json_glib gnome3.rest ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "GLib/GObject wrapper for the Facebook Graph API";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix
deleted file mode 100644
index 27d5bc91b9f..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib
-, json_glib, webkitgtk, wrapGAppsHook, libpeas, bash, gobjectIntrospection
-, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret
-, dconf}:
-
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.adwaita-icon-theme 
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  preCheck = ''
-    substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
-  '';
-  doCheck = true;
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  propagatedUserEnvPkgs = [ shared_mime_info
-                            gnome3.gnome_themes_standard ];
-
-  buildInputs = [ vala_0_32 intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
-                  libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview
-                  librsvg libsecret dconf
-                  gobjectIntrospection gnome3.adwaita-icon-theme ];
-
-  nativeBuildInputs = [ wrapGAppsHook ];
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=758240
-  preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir'';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
-    description = "GNOME GUI client to view git repositories";
-    maintainers = with maintainers; [ domenkozar ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix
deleted file mode 100644
index 805380c9d60..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gitg/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gitg-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gitg/3.20/gitg-3.20.1.tar.xz;
-    sha256 = "104420bcdd765fa2196a7b146ba1e0fa82a5686ed5ba9af40e31e88e601aa585";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/default.nix
deleted file mode 100644
index ee3dd60e59a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3, libxslt, packagekit
-, fontconfig, libcanberra_gtk3, libnotify, wrapGAppsHook, dbus_glib, dbus_libs }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
-
-  nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
-  buildInputs = [ libxslt gnome3.gtk packagekit fontconfig
-                  libcanberra_gtk3 libnotify dbus_glib dbus_libs ];
-
-  meta = with stdenv.lib; {
-    homepage = https://www.freedesktop.org/software/PackageKit/;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    description = "Tools for installing software on the GNOME desktop using PackageKit";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/src.nix
deleted file mode 100644
index 71de360f24f..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gnome-packagekit/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-packagekit-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-packagekit/3.20/gnome-packagekit-3.20.0.tar.xz;
-    sha256 = "0wf5r0qrdlalbr73fpfaapq61vlya3nwygsv4wm2bxaf56v5sjmq";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
deleted file mode 100644
index 7a16d2c24e5..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From bdbbe312e6520ce70e91319162e85367a69ce044 Mon Sep 17 00:00:00 2001
-From: Jascha Geerds <jascha@jgeerds.name>
-Date: Sat, 1 Aug 2015 21:01:11 +0200
-Subject: [PATCH 1/3] Search for themes and icons in system data dirs
-
----
- gtweak/tweaks/tweak_group_interface.py | 17 ++++-------------
- gtweak/tweaks/tweak_group_keymouse.py  |  7 ++-----
- gtweak/utils.py                        | 17 +++++++++++++++++
- 3 files changed, 23 insertions(+), 18 deletions(-)
-
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
-@@ -26,7 +26,7 @@ from gi.repository import Gtk
- from gi.repository import GLib
- 
- import gtweak
--from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file
-+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
- from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
- from gtweak.gshellwrapper import GnomeShellFactory
- from gtweak.gsettings import GSettingsSetting
-@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTwe
-         if gtk_ver % 2: # Want even number
-             gtk_ver += 1
- 
--        dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
--                 os.path.join(GLib.get_user_data_dir(), "themes"),
--                 os.path.join(os.path.expanduser("~"), ".themes"))
--        valid = walk_directories(dirs, lambda d:
-+        valid = walk_directories(get_resource_dirs("themes"), lambda d:
-                     os.path.exists(os.path.join(d, "gtk-2.0")) and \
-                         (os.path.exists(os.path.join(d, "gtk-3.0")) or \
-                          os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
-@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTw
-             **options)
- 
-     def _get_valid_icon_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
--                 os.path.join(GLib.get_user_data_dir(), "icons"),
--                 os.path.join(os.path.expanduser("~"), ".icons"))
--        valid = walk_directories(dirs, lambda d:
-+        valid = walk_directories(get_resource_dirs("icons"), lambda d:
-                     os.path.isdir(d) and \
- 			os.path.exists(os.path.join(d, "index.theme")))
-         return valid
-@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsCombo
-             **options)
- 
-     def _get_valid_cursor_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
--                 os.path.join(GLib.get_user_data_dir(), "icons"),
--                 os.path.join(os.path.expanduser("~"), ".icons"))
--        valid = walk_directories(dirs, lambda d:
-+        valid = walk_directories(get_resource_dirs("icons"), lambda d:
-                     os.path.isdir(d) and \
-                         os.path.exists(os.path.join(d, "cursors")))
-         return valid
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-@@ -20,7 +20,7 @@ import os.path
- from gi.repository import GLib
- 
- import gtweak
--from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default
-+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
- from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
- 
- class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -48,10 +48,7 @@ class KeyThemeSwitcher(GSettingsComboTwe
-             **options)
- 
-     def _get_valid_key_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
--                 os.path.join(GLib.get_user_data_dir(), "themes"),
--                 os.path.join(os.path.expanduser("~"), ".themes"))
--        valid = walk_directories(dirs, lambda d:
-+        valid = walk_directories(get_resource_dirs("themes"), lambda d:
-                     os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
-                     os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
-         return valid
-Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py
-+++ gnome-tweak-tool-3.20.1/gtweak/utils.py
-@@ -21,6 +21,7 @@ import tempfile
- import shutil
- import subprocess
- import glob
-+import itertools
- 
- import gtweak
- from gtweak.gsettings import GSettingsSetting
-@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, bl
-         stdout, stderr = p.communicate()
-         return stdout, stderr, p.returncode
- 
-+def get_resource_dirs(resource):
-+    """Returns a list of all known resource dirs for a given resource.
-+
-+    :param str resource:
-+        Name of the resource (e.g. "themes")
-+    :return:
-+        A list of resource dirs
-+    """
-+    dirs = [os.path.join(dir, resource)
-+            for dir in itertools.chain(GLib.get_system_data_dirs(),
-+                                       (gtweak.DATA_DIR,
-+                                        GLib.get_user_data_dir()))]
-+    dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))]
-+
-+    return [dir for dir in dirs if os.path.isdir(dir)]
-+
- @singleton
- class AutostartManager:
- 
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
deleted file mode 100644
index 5ddc13949cb..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 22b948c39b32fb45066c4f5a9f99082094fea3d1 Mon Sep 17 00:00:00 2001
-From: Jascha Geerds <jascha@jgeerds.name>
-Date: Sat, 1 Aug 2015 21:26:57 +0200
-Subject: [PATCH 2/3] Don't show multiple entries for a single theme
-
----
- gtweak/tweaks/tweak_group_interface.py |  8 ++++----
- gtweak/tweaks/tweak_group_keymouse.py  |  4 ++--
- gtweak/utils.py                        | 16 ++++++++++++++++
- 3 files changed, 22 insertions(+), 6 deletions(-)
-
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
-@@ -26,7 +26,7 @@ from gi.repository import Gtk
- from gi.repository import GLib
- 
- import gtweak
--from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
-+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources
- from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
- from gtweak.gshellwrapper import GnomeShellFactory
- from gtweak.gsettings import GSettingsSetting
-@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTwe
-                     os.path.exists(os.path.join(d, "gtk-2.0")) and \
-                         (os.path.exists(os.path.join(d, "gtk-3.0")) or \
-                          os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
--        return valid
-+        return get_unique_resources(valid)
- 
- class IconThemeSwitcher(GSettingsComboTweak):
-     def __init__(self, **options):
-@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTw
-         valid = walk_directories(get_resource_dirs("icons"), lambda d:
-                     os.path.isdir(d) and \
- 			os.path.exists(os.path.join(d, "index.theme")))
--        return valid
-+        return get_unique_resources(valid)
- 
- class CursorThemeSwitcher(GSettingsComboTweak):
-     def __init__(self, **options):
-@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsCombo
-         valid = walk_directories(get_resource_dirs("icons"), lambda d:
-                     os.path.isdir(d) and \
-                         os.path.exists(os.path.join(d, "cursors")))
--        return valid
-+        return get_unique_resources(valid)
- 
- class ShellThemeTweak(Gtk.Box, Tweak):
- 
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-@@ -20,7 +20,7 @@ import os.path
- from gi.repository import GLib
- 
- import gtweak
--from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
-+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources
- from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
- 
- class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -51,7 +51,7 @@ class KeyThemeSwitcher(GSettingsComboTwe
-         valid = walk_directories(get_resource_dirs("themes"), lambda d:
-                     os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
-                     os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
--        return valid
-+        return get_unique_resources(valid)
- 
- TWEAK_GROUPS = [
-     ListBoxTweakGroup(_("Keyboard and Mouse"),
-Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py
-+++ gnome-tweak-tool-3.20.1/gtweak/utils.py
-@@ -133,6 +133,22 @@ def get_resource_dirs(resource):
- 
-     return [dir for dir in dirs if os.path.isdir(dir)]
- 
-+def get_unique_resources(dirs):
-+    """Filter out duplicated resources.
-+
-+    :param list dirs:
-+        List of resource dirs (e.g. /usr/share/themes/Adwaita)
-+    :return:
-+        List of dirs without duplicated resources
-+    """
-+    unique_dirs = {}
-+    for dir in dirs:
-+        basename = os.path.basename(dir)
-+        if basename not in unique_dirs:
-+            unique_dirs[basename] = dir
-+
-+    return unique_dirs
-+
- @singleton
- class AutostartManager:
- 
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
deleted file mode 100644
index b25b2d6dc4a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cdafa01dc90da486d0114b423e3e467f7b083d1b Mon Sep 17 00:00:00 2001
-From: Jascha Geerds <jascha@jgeerds.name>
-Date: Sun, 2 Aug 2015 12:01:20 +0200
-Subject: [PATCH 3/3] Create config dir if it doesn't exist
-
-Otherwise gnome-tweak-tool can't enable the dark theme and fails
-without a clear error message.
----
- gtweak/gtksettings.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py
-index bcec9f1..f39991b 100644
---- a/gtweak/gtksettings.py
-+++ b/gtweak/gtksettings.py
-@@ -35,6 +35,10 @@ class GtkSettingsManager:
-     def _get_keyfile(self):
-         keyfile = None
-         try:
-+            config_dir = os.path.dirname(self._path)
-+            if not os.path.isdir(config_dir):
-+                os.makedirs(config_dir)
-+
-             keyfile = GLib.KeyFile()
-             keyfile.load_from_file(self._path, 0)
-         except MemoryError:
--- 
-2.7.0
-
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/default.nix
deleted file mode 100644
index e6c4b8c8202..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, intltool, fetchurl, atk
-, pkgconfig, gtk3, glib, libsoup
-, bash, makeWrapper, itstool, libxml2, python2Packages
-, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
-
-let
-  python = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
-in stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  makeFlags = [ "DESTDIR=/" ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  libnotify gnome3.gnome_shell
-                  libsoup gnome3.gnome_settings_daemon gnome3.nautilus
-                  gnome3.gnome_desktop wrapGAppsHook ];
-
-  propagatedBuildInputs = [ python gobjectIntrospection ];
-
-  PYTHONPATH = "$out/${python.python.sitePackages}";
-
-  wrapPrefixVariables = [ "PYTHONPATH" ];
-
-  patches = [
-    ./find_gsettings.patch
-    ./0001-Search-for-themes-and-icons-in-system-data-dirs.patch
-    ./0002-Don-t-show-multiple-entries-for-a-single-theme.patch
-    ./0003-Create-config-dir-if-it-doesn-t-exist.patch
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
-    description = "A tool to customize advanced GNOME 3 options";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/find_gsettings.patch
deleted file mode 100644
index 3e68c04cb3a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/find_gsettings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
-index a00fe19..dce74b2 100644
---- a/gtweak/gsettings.py
-+++ b/gtweak/gsettings.py
-@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception):
- 
- class _GSettingsSchema:
-     def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options):
--        if not schema_dir:
--            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
-         if not schema_filename:
-             schema_filename = schema_name + ".gschema.xml"
-+        if not schema_dir:
-+            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
-+            for xdg_dir in GLib.get_system_data_dirs():
-+                dir = os.path.join(xdg_dir, "glib-2.0", "schemas")
-+                if os.path.exists(os.path.join(dir, schema_filename)):
-+                    schema_dir = dir
-+                    break
- 
-         schema_path = os.path.join(schema_dir, schema_filename)
-         if not os.path.exists(schema_path):
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/src.nix
deleted file mode 100644
index 18183b8d400..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gnome-tweak-tool/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-tweak-tool-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-tweak-tool/3.20/gnome-tweak-tool-3.20.1.tar.xz;
-    sha256 = "5171b2f75ceeea9455543e999a83a71e8566947f89eb9157aaff7969b7e446ba";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gnome-video-effects/default.nix
deleted file mode 100644
index c0bd2fed3f2..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gnome-video-effects/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-video-effects-${version}";
-  version = "0.4.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz";
-    sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil";
-  };
-
-  buildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix
deleted file mode 100644
index 2550c7e42e6..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gpaste/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala_0_32, glib
-, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper, systemd, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  version = "${gnome3.version}.4";
-  name = "gpaste-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "08h1igdgapz7px12r7mrfcxmz68g9ijg73w69j75spg0yc6f4xax";
-  };
-
-  buildInputs = [ intltool autoreconfHook pkgconfig vala_0_32 glib
-                  gtk3 gnome3.gnome_control_center dbus
-                  clutter pango appstream-glib makeWrapper systemd gobjectIntrospection ];
-
-  preConfigure = "intltoolize -f";
-
-  configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
-                     "--with-dbusservicesdir=$(out)/share/dbus-1/services"
-                     "--with-systemduserunitdir=$(out)/etc/systemd/user" ];
-
-  enableParallelBuilding = true;
-
-  preFixup = 
-    let
-      libPath = stdenv.lib.makeLibraryPath
-        [ glib gtk3 clutter pango ];
-    in
-    ''
-      for i in $out/libexec/gpaste/*; do
-        wrapProgram $i \
-          --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
-      done
-    '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/Keruspe/GPaste;
-    description = "Clipboard management system with GNOME3 integration";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gspell/default.nix
deleted file mode 100644
index fbb95efb27a..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gspell/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig glib gtk3 enchant isocodes ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gspell/src.nix b/pkgs/desktops/gnome-3/3.20/misc/gspell/src.nix
deleted file mode 100644
index 248e3915152..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gspell/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-fetchurl: rec {
-  major = "1.0";
-  minor = "3";
-  name = "gspell-${major}.${minor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz";
-    sha256 = "1m8v4rqaxjsblccc3nnirkbkzgqm90vfpzp3x08lkqriqvk0anfr";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.20/misc/gtkhtml/default.nix
deleted file mode 100644
index 89703b61932..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gtkhtml/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, intltool
-, gnome3, enchant, isocodes }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme
-                  gnome3.gsettings_desktop_schemas ];
-
-  propagatedBuildInputs = [ enchant isocodes ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/3.20/misc/gtkhtml/src.nix
deleted file mode 100644
index 21876ec9c39..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/gtkhtml/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gtkhtml-4.10.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz;
-    sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/3.20/misc/libgames-support/default.nix
deleted file mode 100644
index 06937c74c65..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/libgames-support/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool }:
-
-let
-  major = "1";
-  minor = "0";
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "libgames-support-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgames-support/${version}/${name}.tar.xz";
-    sha256 = "02qn009m1i07nh8wnyrrjf7kbbapk814ap5pvin5ka5sj996cyqq";
-  };
-
-  buildInputs = [ pkgconfig glib gtk3 libgee intltool ];
-
-  meta = with stdenv.lib; {
-    description = "Small library intended for internal use by GNOME Games, but it may be used by others";
-    homepage = https://github.com/GNOME/libgames-support;
-    license = licenses.gpl3;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.20/misc/libgda/default.nix
deleted file mode 100644
index 2e5b0a4af84..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/libgda/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  configureFlags = [
-    "--enable-gi-system-install=no"
-  ];
-
-  enableParallelBuilding = true;
-
-  hardeningDisable = [ "format" ];
-
-  buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ];
-
-  meta = with stdenv.lib; {
-    description = "Database access library";
-    homepage = http://www.gnome-db.org/;
-    license = [ licenses.lgpl2 licenses.gpl2 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/libgda/src.nix b/pkgs/desktops/gnome-3/3.20/misc/libgda/src.nix
deleted file mode 100644
index 8812ccc8ccd..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/libgda/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "libgda-5.2.4";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libgda/5.2/libgda-5.2.4.tar.xz;
-    sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix
deleted file mode 100644
index 6915ede4ad5..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala_0_32, libssh2
-, gtk_doc, gobjectIntrospection, libgit2, glib }:
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  buildInputs = [ gnome3.gnome_common libtool pkgconfig vala_0_32 libssh2
-                  gtk_doc gobjectIntrospection libgit2 glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/src.nix
deleted file mode 100644
index 422fdaf1a2c..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/libgit2-glib/src.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  major = "0.24";
-  minor = "0";
-  name = "libgit2-glib-${major}.${minor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgit2-glib/${major}/${name}.tar.xz";
-    sha256 = "0ia81xlyf6qmyl89ql663piliyjmhnzrshd6q66zya0wh9lc45nn";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.20/misc/libmediaart/default.nix
deleted file mode 100644
index b8648012573..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/libmediaart/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }:
-
-let
-  majorVersion = "1.9";
-in
-stdenv.mkDerivation rec {
-  name = "libmediaart-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz";
-    sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll";
-  };
-
-  buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    description = "Library tasked with managing, extracting and handling media art caches";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix
deleted file mode 100644
index e3f6bca10a4..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchFromGitHub, glib }:
-
-stdenv.mkDerivation rec {
-  version = "1.0.1";
-  basename = "pidgin-im-gnome-shell-extension";
-  name = "${basename}-${version}";
-
-  src = fetchFromGitHub {
-    owner = "muffinmad";
-    repo = "${basename}";
-    rev = "v${version}";
-    sha256 = "1567s2sfqig4jw0nrn134f5vkx0yq31q044grv3xk4vpl1f3z2lr";
-  };
-
-  buildInputs = [ glib ];
-
-  configurePhase = "";
-  buildPhase = "";
-  installPhase = ''
-    share_dir="$prefix/share"
-    extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad"
-    mkdir -p "$extensions_dir"
-    mv *.js metadata.json dbus.xml gnome-shell-extension-pidgin.pot "$extensions_dir"
-
-    schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas"
-    mkdir -p "$schemas_dir"
-    mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */
-    ${glib.dev}/bin/glib-compile-schemas "$schemas_dir"
-
-    locale_dir="$share_dir/locale"
-    mkdir -p "$locale_dir"
-    mv locale/* $locale_dir # fix Emacs syntax highlighting: */
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/muffinmad/pidgin-im-gnome-shell-extension;
-    description = "Make Pidgin IM conversations appear in the Gnome Shell message tray";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ DamienCassou ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix
deleted file mode 100644
index 1c7f712b12c..00000000000
--- a/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
-  dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base,
-  glib, gobjectIntrospection, telepathy_glib
-}:
-
-stdenv.mkDerivation rec {
-  version = "0.11.2";
-  name = "gnome-shell-pomodoro-${version}";
-
-  src = fetchFromGitHub {
-      owner = "codito";
-      repo = "gnome-pomodoro";
-      rev = "${version}";
-      sha256 = "0x656drq8vnvdj1x6ghnglgpa0z8yd2yj9dh5iqprwjv0z3qkw4l";
-  };
-
-  configureScript = ''./autogen.sh'';
-
-  buildInputs = [
-    which automake113x intltool glib gobjectIntrospection pkgconfig libtool
-    makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
-    gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
-    gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib
-    gnome3.defaultIconTheme
-  ];
-
-  preBuild = ''
-    sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \
-      vapi/Makefile
-  '';
-
-  preFixup = ''
-    wrapProgram $out/bin/gnome-pomodoro \
-        --prefix XDG_DATA_DIRS : \
-        "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/codito/gnome-shell-pomodoro;
-    description = "A time management utility for GNOME based on the pomodoro technique";
-    longDescription = ''
-      This GNOME utility helps to manage time according to Pomodoro Technique.
-      It intends to improve productivity and focus by taking short breaks.
-    '';
-    maintainers = with maintainers; [ DamienCassou jgeerds ];
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
index 09ea2baf197..c3256288057 100644
--- a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "epiphany-3.22.0";
+  name = "epiphany-3.22.4";
 
   src = fetchurl {
-    url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.0.tar.xz;
-    sha256 = "a645d17c10a1c266d4647306ea3e5496d3ca575d2ed8152947ed77e9eb623a27";
+    url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.4.tar.xz;
+    sha256 = "051av2xcg7ii2y273vqmdkzanygws9qsaq7ks0070y06d4rhl6xy";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
index 17a4514d6f8..726f47d0cde 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
       gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality
       accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
-      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns
+      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
       gnome3.vino udev libcanberra_gtk3 libgudev
       networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ];

From 189f64d8e7f6a5213ba639bd48638f1db057eaa9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 21 Jan 2017 17:41:12 +0100
Subject: [PATCH 454/727] gnome3.20: fixup removal, mark termite as broken

---
 pkgs/applications/misc/termite/default.nix | 1 +
 pkgs/top-level/all-packages.nix            | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 837d736d10d..850512a837d 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -35,6 +35,7 @@ let
       homepage = https://github.com/thestinger/termite/;
       maintainers = with maintainers; [ koral garbas ];
       platforms = platforms.all;
+      broken = true;
     };
   };
 in if configFile == null then termite else symlinkJoin {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec04e8e85c2..e00b2dc311e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15199,9 +15199,7 @@ in
     vte = gnome2.vte.override { pythonSupport = true; };
   };
 
-  termite = callPackage ../applications/misc/termite {
-    vte = gnome3_20.vte-select-text;
-  };
+  termite = callPackage ../applications/misc/termite { };
 
   tesseract = callPackage ../applications/graphics/tesseract { };
 
@@ -16517,8 +16515,6 @@ in
     libcanberra = self.libcanberra_gtk2;
   });
 
-  gnome3_20 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.20 { });
-
   gnome3_22 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.22 { });
 
   gnome3 = gnome3_22;

From afb3d5c9cb190d92f546711a3e4f4b2b914d92fe Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 21 Jan 2017 16:11:40 +0100
Subject: [PATCH 455/727] pythonPackages.discordpy: 0.16.0 -> 0.16.4

---
 pkgs/development/python-modules/discordpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix
index 6025956261e..c4f92caf8d5 100644
--- a/pkgs/development/python-modules/discordpy/default.nix
+++ b/pkgs/development/python-modules/discordpy/default.nix
@@ -11,13 +11,13 @@
 
 let
   pname = "discord.py";
-  version = "0.16.0";
+  version = "0.16.4";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "0r3qqvx36vywjyjk1nh11ymmr8y81sb45nk63665kcjagx8qnmfx";
+    sha256 = "04q4gknv9lb8r2sdnsqs5nfcyyl850j4pcqcs0xjvmqhd7axa5ai";
   };
 
   propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ];

From c33e1e06fa25720fd2ffa2cae7c89ff86dcfe54b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 21 Jan 2017 15:19:46 +0100
Subject: [PATCH 456/727] zfsUnstable: 0.7.0-rc2 -> 0.7.0-rc3

---
 pkgs/os-specific/linux/zfs/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index bd2767a66b4..40781c76961 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -139,21 +139,16 @@ in
     };
     zfsUnstable = common {
       # comment/uncomment if breaking kernel versions are known
-      inkompatibleKernelVersion = "4.10";
+      inkompatibleKernelVersion = null;
 
-      version = "0.7.0-rc2";
+      version = "0.7.0-rc3";
 
       # this package should point to a version / git revision compatible with the latest kernel release
-      sha256 = "197y2jyav9h1ksri9kzqvrwmzpb58mlgw27vfvgd4bvxpwfxq53s";
+      sha256 = "0js3lazqq8wb4nklqxd6sgbvwqgwnjgz3xi3mm33xf4284gia6pc";
       extraPatches = [
         (fetchpatch {
-          url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc2...nixos-zfs-0.7.0-rc2.patch";
-          sha256 = "1p33bwd6p5r5phbqb657x8h9x3bd012k2mdmbzgnb09drh9v0r82";
-        })
-        (fetchpatch {
-          name = "Kernel_4.9_zfs_aio_fsync_removal.patch";
-          url = "https://github.com/zfsonlinux/zfs/commit/99ca173929cb693012dabe98bcee4f12ec7e6e92.patch";
-          sha256 = "10npvpj52rpq88vdsn7zkdhx2lphzvqypsd9abdadjbqkwxld9la";
+          url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";
+          sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh";
         })
       ];
       spl = splUnstable;

From adecd56871325c16a303904c8f3c8f72de42efad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 21 Jan 2017 18:04:42 +0100
Subject: [PATCH 457/727] splUnstable: 0.7.0-rc2 -> 0.7.0-rc3

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

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 06ad440c775..f4f39451220 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -66,7 +66,7 @@ in
       sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s";
     };
     splUnstable = common {
-      version = "0.7.0-rc2";
-      sha256 = "1y7jlyj8jwgrgnd6hiabms5h9430b6wjbnr3pwb16mv40wns1i65";
+      version = "0.7.0-rc3";
+      sha256 = "09v5gh7mqdl3bfq5an9iiw9fw3l1skprclxdz7r19bw3ids3lfja";
     };
   }

From 843de208986d6fba4f690aad65552c996586bc61 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Jan 2017 18:28:13 +0100
Subject: [PATCH 458/727] Fix evaluation presumably broken in
 754a9cf69804ec00527f4703806282c16179c589 by @globin.

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e00b2dc311e..996b7ecb735 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15199,7 +15199,7 @@ in
     vte = gnome2.vte.override { pythonSupport = true; };
   };
 
-  termite = callPackage ../applications/misc/termite { };
+  termite = callPackage ../applications/misc/termite { vte = null; };
 
   tesseract = callPackage ../applications/graphics/tesseract { };
 

From 4b1da9ba674b5d7a41617047b5c93ccb69a842b3 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@skami.org>
Date: Sat, 21 Jan 2017 13:31:44 -0400
Subject: [PATCH 459/727] Postiats version 0.3.0

The attached patch updates the Postiats nixpkgs expression to the
latest released 0.3.0 version.

From c89bfabd847ebd62c8dd77cb7385ea4effa929be Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sat, 21 Jan 2017 13:28:23 -0400
Subject: [PATCH] ats2 : update Postiats to the latest released 0.3.0 version.
---
 pkgs/development/compilers/ats2/default.nix   |  8 +++++---
 .../ats2/install-postiats-contrib.patch       | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/ats2/install-postiats-contrib.patch

diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 59ce006e835..3abd5c8c82a 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -3,11 +3,11 @@
 , withContrib ? true }:
 
 let
-  versionPkg = "0.2.13" ;
+  versionPkg = "0.3.0" ;
 
   contrib = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
-    sha256 = "1hsqvdwiydks46sfjmm04rmjcx5v25xpjgnq0b96psrdbd0ky2kf" ;
+    sha256 = "1s4yscisn9gsr692jmh4y5mz03012pv84cm7l5n51v83wc08fks0" ;
   };
 
   postInstallContrib = stdenv.lib.optionalString withContrib
@@ -31,9 +31,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "01rkybkwgbpx6blv72n46ml9ii3p6kpxbpczsrpbjkqmf22b4vii";
+    sha256 = "1knf03r8a5sis7n8rw54flf1lxfbr3prywxb1czcdp6hsbcd1v1d";
   };
 
+  patches = [ ./install-postiats-contrib.patch ];
+
   buildInputs = [ gmp ];
 
   setupHook = with stdenv.lib;
diff --git a/pkgs/development/compilers/ats2/install-postiats-contrib.patch b/pkgs/development/compilers/ats2/install-postiats-contrib.patch
new file mode 100644
index 00000000000..cb280d028b5
--- /dev/null
+++ b/pkgs/development/compilers/ats2/install-postiats-contrib.patch
@@ -0,0 +1,19 @@
+Install the parts of the contrib that have been moved to Postiats.
+diff -Naur ATS2-Postiats-0.3.0-upstream/Makefile_dist ATS2-Postiats-0.3.0/Makefile_dist
+--- ATS2-Postiats-0.3.0-upstream/Makefile_dist	2017-01-20 10:23:54.000000000 -0400
++++ ATS2-Postiats-0.3.0/Makefile_dist	2017-01-21 13:14:27.614723335 -0400
+@@ -124,12 +124,12 @@
+   cd "$(abs_top_srcdir)" && \
+   $(MKDIR_P) $(PATSLIBHOME2)/bin && \
+   if [ ! -d $(bindir2) ] ; then $(MKDIR_P) $(bindir2) ; fi && \
+-  for x in share ccomp prelude libc libats ; do \
++  for x in share ccomp prelude libc libats contrib atscntrb ; do \
+     find "$$x" -type d -exec $(MKDIR_P) $(PATSLIBHOME2)/\{} \; -print; \
+   done
+ 
+ install_files_0: install_dirs ; \
+-  for x in share ccomp/runtime prelude libc libats ; do \
++  for x in share ccomp/runtime prelude libc libats contrib atscntrb ; do \
+     cd "$(abs_top_srcdir)" && \
+     $(INSTALL) -d $(PATSLIBHOME2)/"$$x" && \
+     find "$$x" -type l -exec cp -d \{} $(PATSLIBHOME2)/\{} \; -print && \

From 1f0d5bfcf953f9602e70379e72f91ced206390b3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 21 Jan 2017 19:46:07 +0100
Subject: [PATCH 460/727] smplayer: 16.11.0 -> 17.1.0

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

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 118d416df05..0801dc8573d 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmakeHook, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-16.11.0";
+  name = "smplayer-17.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0nhbr33p21qb7n6wry0nkavl5nfjzl5yylrhnxz0pyv69n5msfp5";
+    sha256 = "0wgw940gxf3gqh6xzxvz037ipvr1xcw86gf0myvpb4lkwqh5jds0";
   };
 
   buildInputs = [ qtscript ];

From 0d6d18c098e1eca6017dba76db38c2a392069d96 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2017 19:34:47 +0100
Subject: [PATCH 461/727] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/6d0e8a7e4b1e260c382179c46472518a91f528a5.
---
 .../haskell-modules/hackage-packages.nix      | 623 ++++++++++++++----
 1 file changed, 498 insertions(+), 125 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 4648208c2af..056a98727c1 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10887,6 +10887,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ListLike_4_5_1" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "ListLike";
+       version = "4.5.1";
+       sha256 = "b70745335b563cd9039bb17a1e2faf7edb1b68febdd19586b28ab67c55562a8d";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq dlist fmlist text
+         utf8-string vector
+       ];
+       testHaskellDepends = [
+         array base bytestring containers dlist fmlist HUnit QuickCheck
+         random text utf8-string vector
+       ];
+       homepage = "http://github.com/JohnLato/listlike";
+       description = "Generic support for list-like structures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ListTree" = callPackage
     ({ mkDerivation, base, directory, filepath, List, transformers }:
      mkDerivation {
@@ -14290,8 +14313,8 @@ self: {
      }:
      mkDerivation {
        pname = "RNAlien";
-       version = "1.2.9";
-       sha256 = "0de399df27f15301d7074ec5b1b4dcf6712bb7878573183edc300c19ee172f25";
+       version = "1.3.0";
+       sha256 = "43d4b160cab7a7c39e4c21744637752beb527ebcb9f12ca674c18fb84135dfab";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -17383,14 +17406,14 @@ self: {
        license = "GPL";
      }) {};
 
-  "ViennaRNAParser_1_3_1" = callPackage
+  "ViennaRNAParser_1_3_2" = callPackage
     ({ mkDerivation, base, hspec, parsec, ParsecTools, process
      , transformers
      }:
      mkDerivation {
        pname = "ViennaRNAParser";
-       version = "1.3.1";
-       sha256 = "a113dd5673a20802e3377ee1682c901c898e341a3cc0175e619c92eb96e49247";
+       version = "1.3.2";
+       sha256 = "daff4df1a477ee3df01b30cda344e889818b761748e2b9aee0b8e2f46e0fa844";
        libraryHaskellDepends = [
          base parsec ParsecTools process transformers
        ];
@@ -20564,6 +20587,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "aeson-quick" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
+     , microlens, tasty, tasty-hunit, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-quick";
+       version = "0.1.1.2";
+       sha256 = "e666a7f2caad674fa95774beebacb4a8edd8bb0801b30aa7ac77904221b8372c";
+       libraryHaskellDepends = [
+         aeson attoparsec base deepseq text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring microlens tasty tasty-hunit text
+       ];
+       homepage = "https://github.com/libscott/aeson-quick";
+       description = "Quick JSON extractions with Aeson";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aeson-schema" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , directory, filepath, ghc-prim, hashable, hint, HUnit, mtl
@@ -29599,6 +29641,18 @@ self: {
        broken = true;
      }) {control-invariants = null;};
 
+  "azubi" = callPackage
+    ({ mkDerivation, base, filepath, options }:
+     mkDerivation {
+       pname = "azubi";
+       version = "0.1.0.1";
+       sha256 = "b75133db17e6dfe66593dca1e2809e096a8473463950826c31c8ac9a1497468e";
+       libraryHaskellDepends = [ base filepath options ];
+       homepage = "http://palovandalo.com/azubi";
+       description = "A simple DevOps tool which will never \"reach\" enterprice level";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "azure-acs" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit
      , conduit-extra, connection, http-conduit, http-types, network
@@ -31764,6 +31818,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binary-orphans_0_1_6_0" = callPackage
+    ({ mkDerivation, aeson, base, binary, case-insensitive, hashable
+     , QuickCheck, quickcheck-instances, scientific, tagged, tasty
+     , tasty-quickcheck, text, text-binary, time, unordered-containers
+     , vector, vector-binary-instances
+     }:
+     mkDerivation {
+       pname = "binary-orphans";
+       version = "0.1.6.0";
+       sha256 = "e0e1dc7e5f00feb225efde400988d5e0e199cc910446f05a40fecba7d55684a5";
+       libraryHaskellDepends = [
+         aeson base binary case-insensitive hashable scientific tagged text
+         text-binary time unordered-containers vector
+         vector-binary-instances
+       ];
+       testHaskellDepends = [
+         aeson base binary case-insensitive hashable QuickCheck
+         quickcheck-instances scientific tagged tasty tasty-quickcheck text
+         time unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/binary-orphans#readme";
+       description = "Orphan instances for binary";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "binary-parser" = callPackage
     ({ mkDerivation, base-prelude, bytestring, success, text
      , transformers
@@ -34002,14 +34082,14 @@ self: {
     ({ mkDerivation, base, containers, directory, filepath, tagsoup }:
      mkDerivation {
        pname = "blaze-from-html";
-       version = "0.3.2.1";
-       sha256 = "9ae029aee30ae8f3c4649e51b9e797ae956ebbe33f3592d07cb948fe72ff23d2";
+       version = "0.4.0.1";
+       sha256 = "88fcd55af8a8c4fa611ee28adc27210f7de12556a9099aa702e98f176d461a15";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base containers directory filepath tagsoup
        ];
-       homepage = "http://jaspervdj.be/blaze";
+       homepage = "http://jaspervdj.be/blaze-html";
        description = "Tool to convert HTML to BlazeHtml code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35400,6 +35480,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "brick_0_15_2" = callPackage
+    ({ mkDerivation, base, containers, contravariant, data-default
+     , deepseq, microlens, microlens-mtl, microlens-th, template-haskell
+     , text, text-zipper, transformers, vector, vty
+     }:
+     mkDerivation {
+       pname = "brick";
+       version = "0.15.2";
+       sha256 = "7407473d133588df46c43480a2b41a50a04a7f0e63a996c6422a07592b8ca85e";
+       libraryHaskellDepends = [
+         base containers contravariant data-default deepseq microlens
+         microlens-mtl microlens-th template-haskell text text-zipper
+         transformers vector vty
+       ];
+       homepage = "https://github.com/jtdaugherty/brick/";
+       description = "A declarative terminal user interface library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "brick" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-default
      , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
@@ -35417,7 +35517,6 @@ self: {
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brillig" = callPackage
@@ -41723,12 +41822,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "clay_0_12" = callPackage
+  "clay_0_12_1" = callPackage
     ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
      mkDerivation {
        pname = "clay";
-       version = "0.12";
-       sha256 = "7bef7e086e7e3cd9f35c2e9b8ea7f6e7428e65090ea824cf680c645a350825e9";
+       version = "0.12.1";
+       sha256 = "ede3726dd63325e491fec82490929f2d084442290251f4b978293df1e42b867a";
        libraryHaskellDepends = [ base mtl text ];
        testHaskellDepends = [ base hspec hspec-expectations mtl text ];
        homepage = "http://fvisser.nl/clay";
@@ -42280,17 +42379,17 @@ self: {
   "clit" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
      , data-default, http-client, http-client-tls, http-types, lens
-     , optparse-applicative, split
+     , optparse-applicative, split, text
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.2.0.2";
-       sha256 = "f8c363812b610c79d0fe7275404fca65e073c4bcd11c53afafcffd485c4e47db";
+       version = "0.2.2.3";
+       sha256 = "ae1261e3bec1ff034b9fa5fea1be1592f0a32d4581d96d9b4c834554d839c1fc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring data-default http-client
-         http-client-tls http-types lens optparse-applicative split
+         http-client-tls http-types lens optparse-applicative split text
        ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
@@ -65923,15 +66022,16 @@ self: {
      }) {};
 
   "fltkhs" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, directory, filepath, mtl
-     , parsec, text
+    ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
+     , mtl, parsec, text
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.0.1";
-       sha256 = "440e605c927bbd10b5b6bb17d2b608797747f6780eb7014eb29998519fd3b495";
+       version = "0.5.0.2";
+       sha256 = "a8f848eb6d47d1ce3e6d102ec61137737371fb68a112155696629d53f81e2cab";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base bytestring text ];
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base directory filepath mtl parsec ];
@@ -66621,6 +66721,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "format-numbers" = callPackage
+    ({ mkDerivation, base, hspec, text }:
+     mkDerivation {
+       pname = "format-numbers";
+       version = "0.1.0.0";
+       sha256 = "0ca4561b55c888552f7bf0eb68e97b62acedcb0d5e5e1cc4afd94402d01231a6";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base hspec text ];
+       homepage = "https://github.com/agrafix/format-numbers#readme";
+       description = "Various number formatting functions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "format-status" = callPackage
     ({ mkDerivation, base, data-concurrent-queue, old-locale, stm, text
      , time
@@ -69116,6 +69229,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {genders = null;};
 
+  "gendocs" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, safe, text
+     }:
+     mkDerivation {
+       pname = "gendocs";
+       version = "0.1.0.0";
+       sha256 = "5ed453b7811e8b43ff5d660acbf6f75e6022a63c546ca282b2ea9b3474e762f0";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring safe text
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/seanhess/gendocs#readme";
+       description = "Library for generating interface documentation from types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "general-prelude" = callPackage
     ({ mkDerivation, base, lens, pointless-fun, strict, system-filepath
      }:
@@ -69667,17 +69796,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity_0_3_0_0" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, validity }:
+     mkDerivation {
+       pname = "genvalidity";
+       version = "0.3.0.0";
+       sha256 = "22c279c1409fbb0b9c9d709873c0639f555c34c8919cd481e2eb6fcab729ccff";
+       revision = "1";
+       editedCabalFile = "fbaf3c842ce3316d3fef10d69dcf9a0279aa0d35be0f420da4749c6cdca1528a";
+       libraryHaskellDepends = [ base QuickCheck validity ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Testing utilities for the validity library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-containers" = callPackage
-    ({ mkDerivation, base, containers, genvalidity, QuickCheck
-     , validity, validity-containers
+    ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
+     , hspec, QuickCheck, validity, validity-containers
      }:
      mkDerivation {
        pname = "genvalidity-containers";
-       version = "0.1.0.2";
-       sha256 = "f26522673e67c3780662bbce48734a4e955d6fbc5dd7e8c701866180cbf7b8bb";
+       version = "0.2.0.0";
+       sha256 = "79cccb5ac44193287e65aaf751617e213e71b012cc96e31e42428cdfd9c63ce1";
        libraryHaskellDepends = [
          base containers genvalidity QuickCheck validity validity-containers
        ];
+       testHaskellDepends = [
+         base containers genvalidity genvalidity-hspec hspec
+       ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for containers";
        license = stdenv.lib.licenses.mit;
@@ -69703,14 +69851,83 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity-hspec_0_3_0_0" = callPackage
+    ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck
+     , validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-hspec";
+       version = "0.3.0.0";
+       sha256 = "0d25376307b9bbbf8a7d438f0e9252e86f1f3227c356a2979f002ebb711d612d";
+       revision = "1";
+       editedCabalFile = "cd36781a3c2aa0a77ed801ae246560f8e04901bfae7cf88139fa68eb3c5e0e25";
+       libraryHaskellDepends = [
+         base genvalidity hspec QuickCheck validity
+       ];
+       testHaskellDepends = [ base doctest genvalidity hspec ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Standard spec's for GenValidity instances";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "genvalidity-hspec-aeson" = callPackage
+    ({ mkDerivation, aeson, base, deepseq, doctest, genvalidity
+     , genvalidity-hspec, hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "genvalidity-hspec-aeson";
+       version = "0.0.0.0";
+       sha256 = "c33756346e6435553f938caa6ed0886852495ebc2cd458badd35d87d76fd00de";
+       libraryHaskellDepends = [
+         aeson base deepseq genvalidity genvalidity-hspec hspec QuickCheck
+       ];
+       testHaskellDepends = [ base doctest genvalidity hspec ];
+       homepage = "http://cs-syd.eu";
+       description = "Standard spec's for aeson-related instances";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "genvalidity-hspec-cereal" = callPackage
+    ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
+     , genvalidity-hspec, hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "genvalidity-hspec-cereal";
+       version = "0.0.0.0";
+       sha256 = "1cbb1d37aed02b8aa75092b0ff7065bdd0238a02fd735a2b1e548be9e11e48de";
+       libraryHaskellDepends = [
+         base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
+       ];
+       testHaskellDepends = [ base doctest genvalidity hspec ];
+       homepage = "http://cs-syd.eu";
+       description = "Standard spec's for cereal-related instances";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "genvalidity-path" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, path
+     , validity-path
+     }:
+     mkDerivation {
+       pname = "genvalidity-path";
+       version = "0.1.0.0";
+       sha256 = "0b955a1e244c9fa2915212447b75ec862c3677a43e8b2654e368568ef6244b38";
+       libraryHaskellDepends = [ base genvalidity path validity-path ];
+       testHaskellDepends = [ base genvalidity-hspec hspec path ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for Path";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "genvalidity-text" = callPackage
     ({ mkDerivation, array, base, genvalidity, hspec, QuickCheck, text
      , validity, validity-text
      }:
      mkDerivation {
        pname = "genvalidity-text";
-       version = "0.1.0.1";
-       sha256 = "1906c0df7b65355f38ce1c13b1e1094a5f9d6da2c4c432ceee74523154814b54";
+       version = "0.2.0.0";
+       sha256 = "93f5a28f1dcb08bbfd65c58764ee73df2cd49b74150b5e4657313048ab08bf0b";
        libraryHaskellDepends = [
          array base genvalidity QuickCheck text validity validity-text
        ];
@@ -77507,6 +77724,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "graflog" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, mtl, test-fixture
+     , text, text-conversions
+     }:
+     mkDerivation {
+       pname = "graflog";
+       version = "1.0.0";
+       sha256 = "fcc205034be28055c3f6550e09a94bec4561530926151d7710001b53293c17c0";
+       libraryHaskellDepends = [
+         aeson base bytestring text text-conversions
+       ];
+       testHaskellDepends = [ base hspec mtl test-fixture ];
+       homepage = "https://github.com/m-arnold/graflog#readme";
+       description = "Monadic correlated log events";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "grammar-combinators" = callPackage
     ({ mkDerivation, base, containers, enumerable, fgl, graphviz
      , MaybeT, mtl, multirec, parsec, template-haskell, text
@@ -79843,6 +80077,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "habit" = callPackage
+    ({ mkDerivation, base, containers, cryptonite, http-client
+     , http-client-tls, monad-control, monad-logger, persistent
+     , persistent-mysql, persistent-postgresql, persistent-sqlite
+     , persistent-template, pipes, resourcet, telegram-api, text
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "habit";
+       version = "0.2.1.2";
+       sha256 = "d15b24cf6c949469fecaa0e3da8faab350626b260c1dfbce915ba1be4c5e4bea";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers cryptonite http-client http-client-tls
+         monad-control monad-logger persistent persistent-mysql
+         persistent-postgresql persistent-sqlite persistent-template pipes
+         resourcet telegram-api text transformers transformers-base
+       ];
+       executableHaskellDepends = [ base text ];
+       homepage = "https://github.com/airalab/habit#readme";
+       description = "Haskell message bot framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hable" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -81382,8 +81641,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-agda";
-       version = "0.1.10";
-       sha256 = "0b9f9ead899ca7fc33b75c8f1838d219143357b892b5132e559e65c1efa14198";
+       version = "0.1.10.1";
+       sha256 = "83fa165cc9e485f8a84a73ff754e7315efdad7fb5c5a27c7798c89002d1a0c4d";
        libraryHaskellDepends = [
          Agda base containers directory filepath hakyll mtl pandoc
          transformers xhtml
@@ -83473,6 +83732,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hashflare" = callPackage
+    ({ mkDerivation, base, containers, simple-money }:
+     mkDerivation {
+       pname = "hashflare";
+       version = "0.1.0.0";
+       sha256 = "2a58cbb78bf8263dc80d384264ba969edb91d4685e87c01b62a48d12fb60e82b";
+       revision = "2";
+       editedCabalFile = "accd8a66c743cbd6580182c1a85916dd6422d67a1587b7e2927849cd53e38f9a";
+       libraryHaskellDepends = [ base containers simple-money ];
+       description = "A library for working with HashFlare.io contracts and hashrates";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "hashids" = callPackage
     ({ mkDerivation, base, bytestring, containers, split }:
      mkDerivation {
@@ -91493,8 +91765,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.1";
-       sha256 = "2a059c50a02a360b5fa501fcb4a29ad5197b763a5e38572405a3c3a380cf6ea3";
+       version = "1.1.1";
+       sha256 = "fea7b5bee2611dee3fac71bfdfcbd5bf80ec7396a45c67e804e880c6d6729d2d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -99032,7 +99304,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "http-api-data_0_3_4" = callPackage
+  "http-api-data_0_3_5" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , doctest, filepath, hashable, hspec, HUnit, QuickCheck
      , quickcheck-instances, text, time, time-locale-compat
@@ -99040,8 +99312,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-api-data";
-       version = "0.3.4";
-       sha256 = "aaf5faa89d51e93e4d238fd43c5ad12bf798b948bd13b9304d7104ff05166bc3";
+       version = "0.3.5";
+       sha256 = "3711ac5f97afe8e89d1f8959138de8f2b3afd8ec30f9c6f3eebbfb2caa2fbc45";
        setupHaskellDepends = [ base Cabal directory filepath ];
        libraryHaskellDepends = [
          base bytestring containers hashable text time time-locale-compat
@@ -104390,7 +104662,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "inline-c_0_5_6_0" = callPackage
+  "inline-c_0_5_6_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
      , containers, cryptohash, directory, filepath, hashable, hspec, mtl
      , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix
@@ -104398,8 +104670,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.5.6.0";
-       sha256 = "ea9ae36f9716f714d8a6b9d758c1f839862e5ced38c265d9fd7e65051d04d554";
+       version = "0.5.6.1";
+       sha256 = "2daf717e6fc0046ccb6563557825fe26fcdc327c55b9771aa7b4c51473e6eb4e";
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring containers cryptohash
          directory filepath hashable mtl parsec parsers QuickCheck
@@ -105182,8 +105454,8 @@ self: {
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.1.0.3";
-       sha256 = "ad0f8df58a00d0e4c905e73e5c7f97efc9efa495bd8ebc77ecd3d104653e183d";
+       version = "0.1.0.4";
+       sha256 = "a8475b8a72bbd9ef8b712defc8206c3eac6dbb3917d52a57e4175b363acf1f84";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
          hashable mtl safe string-conversions tagged text transformers
@@ -110599,18 +110871,14 @@ self: {
      }) {};
 
   "labels" = callPackage
-    ({ mkDerivation, base, bytestring, cassava, template-haskell
-     , unordered-containers
-     }:
+    ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "labels";
-       version = "0.1.0";
-       sha256 = "cdd74a8e902b00fa74ee20bf895f39616b3325ba72197dd87e80299947bec8ca";
-       libraryHaskellDepends = [
-         base bytestring cassava template-haskell unordered-containers
-       ];
+       version = "0.1.2";
+       sha256 = "d124f63d08ef1f80bff8094ce89261b84afada48bc1e851ed007ae4e257d2486";
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/chrisdone/labels#readme";
-       description = "Declare and access tuple fields with labels";
+       description = "Anonymous records via named tuples";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -118664,8 +118932,8 @@ self: {
      }:
      mkDerivation {
        pname = "machines-directory";
-       version = "0.2.0.9";
-       sha256 = "38e1e5874431f8cad71b3067bc16258e3dfa13b09bf9d8698d6e28d5e0fabf24";
+       version = "0.2.0.10";
+       sha256 = "2ee750f86d1658635095c35e94799d06a921e641bf4daa55676fd06e8e9a98a4";
        libraryHaskellDepends = [
          base directory filepath machines machines-io transformers
        ];
@@ -118809,8 +119077,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "0.1.0.1";
-       sha256 = "b0df75127de969328701adb376673409c82b37c1f3c92b2b0d84b5de2be80ae6";
+       version = "0.1.0.2";
+       sha256 = "8ce44a28bff7b1c22554719aa94adb529482745a2ddc0efd5e06bff4f77ad53c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124519,6 +124787,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mono-traversable_1_0_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, foldl, hashable
+     , hspec, HUnit, QuickCheck, semigroups, split, text, transformers
+     , unordered-containers, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "mono-traversable";
+       version = "1.0.1.1";
+       sha256 = "3afa27672db118c215dca1233d7c0cdb9c3ba7f6e4fb4d56e9c75deebb3dde57";
+       libraryHaskellDepends = [
+         base bytestring containers hashable split text transformers
+         unordered-containers vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec HUnit QuickCheck semigroups
+         text transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "Type classes for mapping, folding, and traversing monomorphic containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mono-traversable-instances" = callPackage
     ({ mkDerivation, base, comonad, containers, dlist, dlist-instances
      , mono-traversable, semigroupoids, semigroups, transformers
@@ -135462,18 +135753,18 @@ self: {
     ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
      , bytestring, containers, directory, filepath, highlighting-kate
      , mtl, optparse-applicative, pandoc, terminal-size, text, time
-     , yaml
+     , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.4.6.0";
-       sha256 = "166d22f0e1cc2c3e965b84556c07a8ce51537b36aa5ff07d7fd4893a5bcdfd01";
+       version = "0.4.7.0";
+       sha256 = "f0e1dafb87d6a09c9cc3dae0dfab740c7b387327c913e2512a4aae9feb5d4f3c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson ansi-terminal ansi-wl-pprint base bytestring containers
          directory filepath highlighting-kate mtl optparse-applicative
-         pandoc terminal-size text time yaml
+         pandoc terminal-size text time unordered-containers yaml
        ];
        homepage = "http://github.com/jaspervdj/patat";
        description = "Terminal-based presentations using Pandoc";
@@ -138100,6 +138391,8 @@ self: {
        pname = "pipes-aeson";
        version = "0.4.1.7";
        sha256 = "c7cfb199fe3160e3b87f70017050dec94451a4cbc56d3956c91ca007ce5cb8cd";
+       revision = "1";
+       editedCabalFile = "7ce776e074de974988cd06b5b26062b4f5f1647c07fc2ecdd2992c482c0d286d";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring pipes pipes-attoparsec
          pipes-bytestring pipes-parse transformers
@@ -138139,6 +138432,8 @@ self: {
        pname = "pipes-attoparsec";
        version = "0.5.1.4";
        sha256 = "fab0a84f9f81e6ae06eae85fd895f0cb8c698723cab7f33addaf5d14cd553507";
+       revision = "1";
+       editedCabalFile = "c90218d8e50e98ed17267f3f96a6e0382fd20c6143892470a6eeb6eda4f34edd";
        libraryHaskellDepends = [
          attoparsec base bytestring pipes pipes-parse text transformers
        ];
@@ -138277,17 +138572,15 @@ self: {
      }) {};
 
   "pipes-category" = callPackage
-    ({ mkDerivation, base, lens, mtl, pipes, pipes-extras, transformers
+    ({ mkDerivation, base, hspec, lens, mtl, pipes, pipes-extras
+     , transformers
      }:
      mkDerivation {
        pname = "pipes-category";
-       version = "0.1.0.0";
-       sha256 = "eb8c49adca4d6787232d36e045fb8c415f195afa5f75e0846bfbef1e67456329";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.0.0";
+       sha256 = "bc8d268cc35a14ec5ef317e2dfd6551d76269e706477bccc03b7d884be779bf7";
        libraryHaskellDepends = [ base lens mtl pipes pipes-extras ];
-       executableHaskellDepends = [ base pipes transformers ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec pipes transformers ];
        homepage = "https://github.com/louispan/pipes-category#readme";
        description = "Allows instances for Category, Arrow and ArrowChoice for Pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -138595,6 +138888,8 @@ self: {
        pname = "pipes-interleave";
        version = "1.1.0";
        sha256 = "bd083ec1cc9f35ee393763b18581835d8124b358480ae91c6473308af642d8c4";
+       revision = "1";
+       editedCabalFile = "d198f42613a501edcdd6f66ad1991b0ba0a2de01453b001e95b0627f87a5853c";
        libraryHaskellDepends = [ base containers heaps pipes ];
        homepage = "http://github.com/bgamari/pipes-interleave";
        description = "Interleave and merge streams of elements";
@@ -138661,6 +138956,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-misc" = callPackage
+    ({ mkDerivation, base, hspec, lens, mtl, pipes, pipes-category
+     , pipes-concurrency, semigroups, stm, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-misc";
+       version = "0.2.0.0";
+       sha256 = "d8c56177820ec3d4f7532f98f98026b2e8c9b618572d8fcd97fc4b7446c4e992";
+       libraryHaskellDepends = [
+         base lens mtl pipes pipes-category pipes-concurrency semigroups stm
+         transformers
+       ];
+       testHaskellDepends = [ base hspec lens pipes transformers ];
+       homepage = "https://github.com/louispan/pipes-misc#readme";
+       description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-mongodb" = callPackage
     ({ mkDerivation, base, monad-control, mongoDB, pipes, text }:
      mkDerivation {
@@ -138683,6 +138996,8 @@ self: {
        pname = "pipes-network";
        version = "0.6.4.1";
        sha256 = "a8624aec78e2d2a814956d6759a8d3e18811a82d245480f0404fe408f951a0af";
+       revision = "1";
+       editedCabalFile = "304e9345c02354da6a7a559e335531bffcd3e6c333b36ccc3c5d4123f5f7f144";
        libraryHaskellDepends = [
          base bytestring network network-simple pipes pipes-safe
          transformers
@@ -141169,49 +141484,43 @@ self: {
      }) {};
 
   "postgrest" = callPackage
-    ({ mkDerivation, aeson, async, base, base64-string, bytestring
-     , bytestring-tree-builder, case-insensitive, cassava, containers
-     , contravariant, errors, hasql, hasql-pool, hasql-transaction
-     , heredoc, hspec, hspec-wai, hspec-wai-json, HTTP, http-types
-     , interpolatedstring-perl6, jwt, microlens, microlens-aeson
-     , monad-control, mtl, optparse-applicative, parsec
-     , postgresql-binary, process, Ranged-sets, regex-tdfa, safe
-     , scientific, string-conversions, text, time, transformers
+    ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async
+     , auto-update, base, base64-bytestring, bytestring
+     , case-insensitive, cassava, configurator, containers
+     , contravariant, either, hasql, hasql-pool, hasql-transaction
+     , heredoc, hjsonpointer, hjsonschema, hspec, hspec-wai
+     , hspec-wai-json, HTTP, http-types, insert-ordered-containers
+     , interpolatedstring-perl6, jwt, lens, lens-aeson, monad-control
+     , network-uri, optparse-applicative, parsec, process, protolude
+     , Ranged-sets, regex-tdfa, safe, scientific, swagger2, text, time
      , transformers-base, unix, unordered-containers, vector, wai
      , wai-cors, wai-extra, wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "postgrest";
-       version = "0.3.2.0";
-       sha256 = "671b5458b373c1bf78508661eaecad6e39f4baaaa997d26ce074b100f6657184";
+       version = "0.4.0.0";
+       sha256 = "781c074cb47aa26d8d5de520113b23bad9be729057f87375f11a8abc2bb3489b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring case-insensitive cassava containers
-         contravariant errors hasql hasql-pool hasql-transaction HTTP
-         http-types interpolatedstring-perl6 jwt microlens microlens-aeson
-         mtl optparse-applicative parsec Ranged-sets regex-tdfa safe
-         scientific string-conversions text time unordered-containers vector
-         wai wai-cors wai-extra wai-middleware-static warp
+         aeson ansi-wl-pprint base bytestring case-insensitive cassava
+         configurator containers contravariant either hasql hasql-pool
+         hasql-transaction heredoc HTTP http-types insert-ordered-containers
+         interpolatedstring-perl6 jwt lens lens-aeson network-uri
+         optparse-applicative parsec protolude Ranged-sets regex-tdfa safe
+         scientific swagger2 text time unordered-containers vector wai
+         wai-cors wai-extra wai-middleware-static
        ];
        executableHaskellDepends = [
-         aeson base bytestring bytestring-tree-builder case-insensitive
-         cassava containers contravariant errors hasql hasql-pool
-         hasql-transaction HTTP http-types interpolatedstring-perl6 jwt
-         microlens microlens-aeson mtl optparse-applicative parsec
-         postgresql-binary Ranged-sets regex-tdfa safe scientific
-         string-conversions text time transformers unix unordered-containers
-         vector wai wai-cors wai-extra wai-middleware-static warp
+         auto-update base base64-bytestring bytestring hasql hasql-pool
+         protolude text time unix warp
        ];
        testHaskellDepends = [
-         aeson async base base64-string bytestring case-insensitive cassava
-         containers contravariant errors hasql hasql-pool hasql-transaction
-         heredoc hspec hspec-wai hspec-wai-json HTTP http-types
-         interpolatedstring-perl6 jwt microlens microlens-aeson
-         monad-control mtl optparse-applicative parsec process Ranged-sets
-         regex-tdfa safe scientific string-conversions text time
-         transformers transformers-base unordered-containers vector wai
-         wai-cors wai-extra wai-middleware-static warp
+         aeson aeson-qq async auto-update base base64-bytestring bytestring
+         case-insensitive cassava containers contravariant hasql hasql-pool
+         heredoc hjsonpointer hjsonschema hspec hspec-wai hspec-wai-json
+         http-types lens lens-aeson monad-control process protolude
+         regex-tdfa time transformers-base wai wai-extra
        ];
        homepage = "https://github.com/begriffs/postgrest";
        description = "REST API for any Postgres database";
@@ -141499,8 +141808,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.18";
-       sha256 = "9b88a25950cda8f7335ce9132b84afc21a14b052ba09709e315e7201c26ffb06";
+       version = "0.0.19";
+       sha256 = "7946241c38661d637d83ad4a5bb624636c9b81770458a5c640be97523e1775d1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -152731,8 +153040,8 @@ self: {
      }:
      mkDerivation {
        pname = "roundtrip";
-       version = "0.2.0.3";
-       sha256 = "11f24fceb9bf3a9c419ed0b8242e3ef2b743861e4ad47b88216f2647ad43f6e0";
+       version = "0.2.0.5";
+       sha256 = "caf5b343ba025da9d61190d6a9b55f1c1a02bdb5313ed9489ff969cb9c3f6581";
        libraryHaskellDepends = [
          base containers pretty safe template-haskell text xml-types
        ];
@@ -156914,6 +157223,8 @@ self: {
        pname = "servant";
        version = "0.9.1.1";
        sha256 = "fb3372f676ab07dfab1695ccd0e23d98c948318f4b4d5ae827a6fa5284c4e5fa";
+       revision = "1";
+       editedCabalFile = "a9be93ef6e6464dc76f4572fe372095b9e77fdbaf92966569b5a50ee4829de4d";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring case-insensitive
          http-api-data http-media http-types mmorph mtl network-uri
@@ -157249,6 +157560,8 @@ self: {
        pname = "servant-client";
        version = "0.9.1.1";
        sha256 = "6e085faa1a8ecab076ffdec61b97b6e7c8fff7eb18a9a4cf3538c26b7b99c724";
+       revision = "1";
+       editedCabalFile = "d3ac72d1b11dd6ebf86076237d8ffab3b87e8b6f04d2af1b28a2c5506faa82c5";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat base64-bytestring bytestring
          exceptions http-api-data http-client http-client-tls http-media
@@ -157906,6 +158219,8 @@ self: {
        pname = "servant-server";
        version = "0.9.1.1";
        sha256 = "1e0683557ece1f7a8a7b11e5c7cd1fd042783777157d95a67e28a0518c91bdd1";
+       revision = "1";
+       editedCabalFile = "0fd5137ad4ab43f5a6fde1a944eb23ce6d75c42fb909e4a82b579ab1c3739771";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158056,6 +158371,8 @@ self: {
        pname = "servant-swagger-ui";
        version = "0.2.1.2.2.8";
        sha256 = "21a25df5c3527a859a14ae2edf12116d8634e7be1587357f4545f31fc5acb3a4";
+       revision = "1";
+       editedCabalFile = "3ad40d23f60d1d80d877914691e7e4adbbd129cc62f411494f144f19b9d82ac8";
        libraryHaskellDepends = [
          base blaze-markup bytestring directory file-embed filepath
          http-media servant servant-blaze servant-server servant-swagger
@@ -159012,8 +159329,8 @@ self: {
     ({ mkDerivation, base, basic-prelude, directory, shake }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.15";
-       sha256 = "056d96901beef17cdb4f7fd45777b096ef64c77944ecd0cef195ae0da499b645";
+       version = "0.0.16";
+       sha256 = "d6f7d889b2030acbc12a233d1666828559c5c6d35ec688b9fc62ebed86eafeef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base basic-prelude directory shake ];
@@ -160333,15 +160650,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "simple-log_0_5_0" = callPackage
+  "simple-log_0_5_1" = callPackage
     ({ mkDerivation, async, base, containers, deepseq, directory
      , exceptions, filepath, mtl, SafeSemaphore, text, time
      , transformers
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.5.0";
-       sha256 = "b46bdde8b3177b187339b741da3400c6b6a3f790f00bfd1ddf0bda34e301da9d";
+       version = "0.5.1";
+       sha256 = "d1b7cd207877886538332e10b80ae39815e418474c5431b80bc9aa10df2edbf6";
        libraryHaskellDepends = [
          async base containers deepseq directory exceptions filepath mtl
          SafeSemaphore text time transformers
@@ -160382,8 +160699,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "simple-money";
-       version = "0.1.0.1";
-       sha256 = "482631afc85ad0f176886a7c39093937ebd048b0a2396e9a3661ab7bb2700701";
+       version = "0.2.0.1";
+       sha256 = "8ebb01c9704377dcc0a945218ff9038fcda3ecf36ecd7f26265e407ba6c5112e";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/nbrk/simple-money";
        description = "Simple library to handle and interexchange money";
@@ -167697,15 +168014,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_3_1" = callPackage
+  "stratosphere_0_4_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.3.1";
-       sha256 = "dc72586e7cc78d9be49afc9ae99a9713933fd10fa524d55e22ce9ee34e399130";
+       version = "0.4.0";
+       sha256 = "27c7b48ff3f78231711eab021b4a54b82b3b58e0dfa43e02b8c41a8be9c4527d";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring hashable lens template-haskell
          text unordered-containers
@@ -171902,8 +172219,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-discover";
-       version = "1.0.1";
-       sha256 = "d64eb1d6f2d21de2e55fc21cb666423a35d79c4732cc7a0931d6995bbd58adbd";
+       version = "1.1.0";
+       sha256 = "023568259c04b596fdd6c8030667b08d2a17f50cbc2cd514595ddd635ca8a3c5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -172534,8 +172851,8 @@ self: {
      }:
      mkDerivation {
        pname = "telegram-api";
-       version = "0.5.1.2";
-       sha256 = "f13c9ce45a3d3a7bf52f4fadd8e1410ba64e3015ace00a6f82b2d4adf7e2410c";
+       version = "0.5.2.0";
+       sha256 = "17df43de078fb793454c13b8a1226525f8e1c189ef2162f147817f60229a8c32";
        libraryHaskellDepends = [
          aeson base bytestring http-api-data http-client http-media
          http-types mime-types mtl servant servant-client string-conversions
@@ -183491,18 +183808,55 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity_0_3_1_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "validity";
+       version = "0.3.1.1";
+       sha256 = "c5ba39b30af35e275467bf016d9df71f3368abaaeb0d47c0cbbdbf78de627b0c";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity typeclass";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "validity-bytestring" = callPackage
+    ({ mkDerivation, base, bytestring, validity }:
+     mkDerivation {
+       pname = "validity-bytestring";
+       version = "0.1.0.0";
+       sha256 = "1322e47ffd6e192b9b322799c8fd8218e3de07274b5263cbd503f280f1a5d9a3";
+       libraryHaskellDepends = [ base bytestring validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for bytestring";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "validity-containers" = callPackage
     ({ mkDerivation, base, containers, validity }:
      mkDerivation {
        pname = "validity-containers";
-       version = "0.1.0.1";
-       sha256 = "ae626d963b2caca9f385cf65eb793fb41441ec93a4d8e937c24dc44a64a88829";
+       version = "0.1.0.2";
+       sha256 = "22f2084de274b01e0d0dc42fc609b651b979e899123b84a8702a2fca61468cdd";
        libraryHaskellDepends = [ base containers validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for containers";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-path" = callPackage
+    ({ mkDerivation, base, filepath, path, validity }:
+     mkDerivation {
+       pname = "validity-path";
+       version = "0.1.0.0";
+       sha256 = "cb93616b60ba80dc051474f8dd0a67c605d4388a316561b29bf0d56117fb32e0";
+       libraryHaskellDepends = [ base filepath path validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for Path";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "validity-text" = callPackage
     ({ mkDerivation, base, text, validity }:
      mkDerivation {
@@ -184547,6 +184901,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "viewprof" = callPackage
+    ({ mkDerivation, base, brick, containers, ghc-prof, lens
+     , scientific, text, vector, vector-algorithms, vty
+     }:
+     mkDerivation {
+       pname = "viewprof";
+       version = "0.0.0";
+       sha256 = "6e518c06c289d01e82a8c7a360e0467ffba419781d4f394c7b8c608bc9303445";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base brick containers ghc-prof lens scientific text vector
+         vector-algorithms vty
+       ];
+       description = "Text-based interactive GHC .prof viewer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "views" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -187401,8 +187773,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.5.2.0";
-       sha256 = "cabc70b3db50df42644d0806def72838b5d7f20bcc6ddefec48e42acda417c4e";
+       version = "0.5.2.1";
+       sha256 = "816e5e766e16b3c6aee00eb70a6e967582a782ddca557533afca68a01a8bd2b9";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring cryptonite
          http-client http-client-tls memory template-haskell text
@@ -189890,8 +190262,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, pretty, xml }:
      mkDerivation {
        pname = "xcb-types";
-       version = "0.7.1";
-       sha256 = "5927e720e4dee26b1bf8a24fb07e47e6a22f9d78fc87aab8d752f207c1566782";
+       version = "0.8.0";
+       sha256 = "6db5df1acf5c52cf18df0084ff325e665d37eba3eb8ca40ffc2b9a52b220d50b";
        libraryHaskellDepends = [ base containers mtl pretty xml ];
        homepage = "http://community.haskell.org/~aslatter/code/xcb-types";
        description = "Parses XML files used by the XCB project";
@@ -189900,23 +190272,24 @@ self: {
 
   "xcffib" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
-     , directory, filemanip, filepath, HUnit, language-python, mtl
-     , optparse-applicative, split, test-framework, test-framework-hunit
-     , xcb-types
+     , directory, either, filemanip, filepath, HUnit, language-python
+     , mtl, optparse-applicative, semigroups, split, test-framework
+     , test-framework-hunit, xcb-types
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.4.2";
-       sha256 = "ccaafda9d2e55fb079e5f2bcac74264a0c3c97f6488b49f8a81eae9a66e556b2";
+       version = "0.5.0";
+       sha256 = "e12cfb879cc022f80b3d05ab0dcbf080005b2d27eb0a07ea56d4481c3afb0879";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring containers filemanip filepath
+         attoparsec base bytestring containers either filemanip filepath
          language-python mtl split xcb-types
        ];
        executableHaskellDepends = [
-         attoparsec base bytestring containers directory filemanip filepath
-         language-python mtl optparse-applicative split xcb-types
+         attoparsec base bytestring containers directory either filemanip
+         filepath language-python mtl optparse-applicative semigroups split
+         xcb-types
        ];
        testHaskellDepends = [
          base filepath HUnit language-python test-framework

From f0314dea93cfae2ecaa19e8d6b13c111f152852c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Jan 2017 12:39:31 +0100
Subject: [PATCH 462/727] haskell-http-api-data: update overrides for latest
 version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f019567f5f2..90e80e21406 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1076,14 +1076,14 @@ self: super: {
 
   # 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_4 = dontCheck super.http-api-data_0_3_4;
+  http-api-data_0_3_5 = dontCheck super.http-api-data_0_3_5;
 
   # 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_4;
+    http-api-data = self.http-api-data_0_3_5;
   });
   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_4;
+    http-api-data = self.http-api-data_0_3_5;
     servant-server = self.servant-server_0_9_1_1;
     servant = self.servant_0_9_1_1;
   });

From ab90eac835487f93c2c4b433d67c59035eec3e0e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 21 Jan 2017 14:58:25 +0100
Subject: [PATCH 463/727] networking: fix typo in resolvconf option edns0

---
 nixos/modules/config/networking.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 9e7cfbd686c..426aaa34885 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -13,7 +13,7 @@ let
 
   resolvconfOptions = cfg.resolvconfOptions
     ++ optional cfg.dnsSingleRequest "single-request"
-    ++ optional cfg.dnsExtensionMechanism "ends0";
+    ++ optional cfg.dnsExtensionMechanism "edns0";
 in
 
 {

From ce3b98d08bbe9ef12829e9578ee6eb82dacda860 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 21 Jan 2017 20:39:34 +0100
Subject: [PATCH 464/727] linux: 3.18.45 -> 3.18.47

---
 pkgs/os-specific/linux/kernel/linux-3.18.nix | 4 ++--
 pkgs/top-level/all-packages.nix              | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 727126de388..5ecfdefa97d 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.45";
+  version = "3.18.47";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1qwvqrlzpf57zvh57dsdk4c4swgbasf2ab75vcn2py8l7jl6rxf0";
+    sha256 = "1d9gcr08i6jlm4h6gxmhkq3hjm2ysd1587wffj10ky7y6428dpdi";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54a4ea580bc..a0c255b29fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11214,7 +11214,6 @@ in
   linux_3_18 = callPackage ../os-specific/linux/kernel/linux-3.18.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
-        kernelPatches.packet_fix_race_condition_CVE_2016_8655
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From 61caacbf47fd7aaef8ca5d21cc4b5b8998e4ed8e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 21 Jan 2017 20:39:55 +0100
Subject: [PATCH 465/727] linux: 4.1.36 -> 4.1.38

---
 pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index b7f98829931..fd171eae001 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1.36";
+  version = "4.1.38";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "140my5r39w795gsaglqxaw97hwpy8qf95c6hy2cr7a122bgnslp1";
+    sha256 = "0mmx11z1wlnlaw2nhpdw76xzmqmfr8q52dv0jvy0pjq8rcbk3hmq";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0c255b29fb..fbf1abba565 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11225,7 +11225,6 @@ in
   linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
-        kernelPatches.packet_fix_race_condition_CVE_2016_8655
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From c796bfc0ba9fadf39e30d8e032f7a64c1549d177 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 21 Jan 2017 20:42:41 +0100
Subject: [PATCH 466/727] libmd: clean up autoreconfHook usage

---
 pkgs/development/libraries/libmd/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix
index 989670bc059..8951017a4b5 100644
--- a/pkgs/development/libraries/libmd/default.nix
+++ b/pkgs/development/libraries/libmd/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "121s73pgbqsnmy6xblbrkj9y44c5zzzpf2hcmh6zvcvg4dk26gzx";
   };
 
-  buildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   # Writing the version to a .dist-version file is required for the get-version
   # shell script because fetchgit removes the .git directory.
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
     echo '${version}' > .dist-version;
   '';
 
-  autoreconfPhase = "./autogen";
-
   meta = with stdenv.lib; {
     homepage = "https://www.hadrons.org/software/${pname}/";
     description = "Message Digest functions from BSD systems";

From 3c49d9788cb489c76eeeea00511d55a76e5bff92 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 21 Jan 2017 20:43:26 +0100
Subject: [PATCH 467/727] signing-party: 2.2 -> 2.5, install all tools

---
 pkgs/tools/security/signing-party/default.nix | 52 ++++++++++++++---
 pkgs/top-level/perl-packages.nix              | 56 +++++++++++++++++++
 2 files changed, 100 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
index e2e3955628d..ea6b7411c4e 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -1,16 +1,25 @@
-{stdenv, fetchurl, gnupg, perl, automake111x, autoconf}:
+{ stdenv, fetchurl, makeWrapper, autoconf, automake
+, gnupg, perl, python, libmd, qprint, coreutils, gnused, glibc, gnupg1compat
+, perlPackages }:
 
 stdenv.mkDerivation rec {
-  version = "2.2";
+  version = "2.5";
   basename = "signing-party";
   name = "${basename}-${version}";
+
   src = fetchurl {
     url = "mirror://debian/pool/main/s/${basename}/${basename}_${version}.orig.tar.gz";
-    sha256 = "13qncdyadw1cnslc2xss9s2rpkalm7rz572b23p7mqcdqp30cpdd";
+    sha256 = "1y2bxk01qiwaqaily0s6zi10ssv7l35vksib6fxzyl76pp693nv2";
   };
 
   sourceRoot = ".";
 
+  patches = [ ./gpgwrap_makefile.patch ];
+
+  postPatch = ''
+    substituteInPlace gpg-mailkeys/gpg-mailkeys --replace "/usr/sbin/sendmail" "sendmail"
+  '';
+
   preBuild = ''
     substituteInPlace sig2dot/Makefile --replace "\$(DESTDIR)/usr" "$out"
     substituteInPlace gpgsigs/Makefile --replace "\$(DESTDIR)/usr" "$out"
@@ -19,19 +28,46 @@ stdenv.mkDerivation rec {
     substituteInPlace keyanalyze/Makefile --replace "\$(DESTDIR)/usr" "$out"
   '';
 
-  # - perl is required for its pod2man (used in caff)
-  buildInputs = [ automake111x autoconf perl gnupg ];
-
-  patches = [ ./gpgwrap_makefile.patch ];
+  nativeBuildInputs = [ autoconf automake makeWrapper ];
+  buildInputs = [ gnupg perl python libmd ] ++
+    (with perlPackages; [ GnuPGInterface TextTemplate MIMEtools NetIDNEncode MailTools ]);
 
   installFlags = [ "DESTDIR=\${out}" ];
 
-  doCheck = false; # no check rule
+  postInstall = ''
+    install -m 755 \
+      caff/caff caff/pgp-clean caff/pgp-fixkey \
+      gpglist/gpglist \
+      gpgparticipants/gpgparticipants \
+      gpgparticipants/gpgparticipants-prefill \
+      gpgsigs/gpgsigs \
+      gpg-key2ps/gpg-key2ps \
+      gpg-mailkeys/gpg-mailkeys \
+      keyart/keyart \
+      $out/bin
+
+    install -m 644 \
+      caff/caff.1 caff/pgp-clean.1 caff/pgp-fixkey.1 \
+      gpglist/gpglist.1 \
+      gpgparticipants/gpgparticipants-prefill.1 \
+      gpgparticipants/gpgparticipants.1 \
+      gpgsigs/gpgsigs.1 \
+      gpg-key2ps/gpg-key2ps.1 \
+      gpg-mailkeys/gpg-mailkeys.1 \
+      $out/share/man/man1
+
+    wrapProgram $out/bin/caff --prefix PERL5LIB ":" "$PERL5LIB" \
+      --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat ]}"
+    wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" "${stdenv.lib.makeBinPath [ qprint coreutils gnused glibc gnupg1compat ]}"
+  '';
+
+  doCheck = false; # no tests
 
   meta = {
     description = "A collection for all kinds of pgp related things, including signing scripts, party preparation scripts etc";
     homepage = http://pgp-tools.alioth.debian.org;
     platforms = gnupg.meta.platforms;
     license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ fpletz ];
   };
 }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3e3bc8f3b45..0b4f53ac861 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2959,6 +2959,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DataPerl = buildPerlPackage rec {
+    name = "Data-Perl-0.002009";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MA/MATTP/${name}.tar.gz";
+      sha256 = "b62b2225870c2c3b16fb78c429f8729ddb8ed0e342f4209ec3c261b764c36f8b";
+    };
+    buildInputs = [ TestDeep TestFatal TestOutput ];
+    propagatedBuildInputs = [ ClassMethodModifiers ListMoreUtils ModuleRuntime RoleTiny strictures ];
+    meta = {
+      homepage = https://github.com/mattp-/Data-Perl;
+      description = "Base classes wrapping fundamental Perl data types";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   DataSection = buildPerlPackage rec {
     name = "Data-Section-0.200006";
     src = fetchurl {
@@ -5687,6 +5702,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  GnuPGInterface = buildPerlPackage rec {
+    name = "GnuPG-Interface-0.52";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AL/ALEXMV/${name}.tar.gz";
+      sha256 = "247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35";
+    };
+    buildInputs = with pkgs; [ which gnupg1compat ];
+    propagatedBuildInputs = [ Moo MooXHandlesVia MooXlate ];
+    doCheck = false;
+    meta = {
+      description = "Supply object methods for interacting with GnuPG";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   GoferTransporthttp = buildPerlPackage {
     name = "GoferTransport-http-1.017";
     src = fetchurl {
@@ -8545,6 +8575,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  MooXHandlesVia = buildPerlPackage rec {
+    name = "MooX-HandlesVia-0.001008";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MA/MATTP/${name}.tar.gz";
+      sha256 = "b0946f23b3537763b8a96b8a83afcdaa64fce4b45235e98064845729acccfe8c";
+    };
+    buildInputs = [ MooXTypesMooseLike TestException TestFatal ];
+    propagatedBuildInputs = [ ClassMethodModifiers DataPerl ModuleRuntime Moo RoleTiny ];
+    meta = {
+      description = "NativeTrait-like behavior for Moo";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   MooXTypesMooseLike = buildPerlPackage rec {
     name = "MooX-Types-MooseLike-0.27";
     src = fetchurl {
@@ -9571,6 +9615,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  NetIDNEncode = buildPerlPackage {
+    name = "Net-IDN-Encode-2.400";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.400.tar.gz;
+      sha256 = "0a9knav5f9kjldrkxx1k47ivd3p23zkmi8aqgyhnxidhgasz1dlq";
+    };
+    buildInputs = [ TestNoWarnings ];
+    meta = {
+      description = "Internationalizing Domain Names in Applications (IDNA)";
+    };
+  };
+
   NetIP = buildPerlPackage {
     name = "Net-IP-1.26";
     src = fetchurl {

From 39f08c746517382cb7d8cf94a622958364b6834a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 21 Jan 2017 22:00:35 +0100
Subject: [PATCH 468/727] gajim: fix patch url

---
 .../networking/instant-messengers/gajim/default.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 3041d6e045e..52d1e3d7933 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   patches = [
     (fetchurl {
       name = "gajim-icon-index.patch";
-      url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb";
+      url = "https://dev.gajim.org/gajim/gajim/commit/7d20ed2b98a3070add188efab7308a5a06d9f4a2.diff";
       sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv";
     })
   ];

From 6bf6026b651c0d740d74356bb41fc559fee7488c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 21 Jan 2017 22:56:15 +0100
Subject: [PATCH 469/727] filezilla: 3.23.0.2 -> 3.24.0

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

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index c0951d97990..984616173cb 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
 
-let version = "3.23.0.2"; in
+let version = "3.24.0"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "0bq22nq2g1b0x5msm9if74ync2qk13n2782mwj2r1r7hsmx4liiz";
+    sha256 = "1bacrl8lj90hqbh129hpbgqj78k1i84j83rkzn507jnykj4x8p9x";
   };
 
   configureFlags = [

From 56c6a4391f25bce8ccff890decc0e00d6ba6ea5f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 21 Jan 2017 23:35:55 +0100
Subject: [PATCH 470/727] zfs: add hint to try unstable version, fix typo

---
 pkgs/os-specific/linux/zfs/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 40781c76961..7fda9b884d8 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -13,11 +13,11 @@ let
   buildKernel = any (n: n == configFile) [ "kernel" "all" ];
   buildUser = any (n: n == configFile) [ "user" "all" ];
 
-  common = { version, sha256, extraPatches, spl, inkompatibleKernelVersion ? null } @ args:
+  common = { version, sha256, extraPatches, spl, incompatibleKernelVersion ? null } @ args:
     if buildKernel &&
-       (inkompatibleKernelVersion != null) &&
-       versionAtLeast kernel.version inkompatibleKernelVersion then
-      throw "linux v${kernel.version} is not yet supported by zfsonlinux v${version}"
+       (incompatibleKernelVersion != null) &&
+       versionAtLeast kernel.version incompatibleKernelVersion then
+      throw "Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."
     else stdenv.mkDerivation rec {
       name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
 
@@ -123,7 +123,7 @@ in
     # to be adapted
     zfsStable = common {
       # comment/uncomment if breaking kernel versions are known
-      inkompatibleKernelVersion = "4.9";
+      incompatibleKernelVersion = "4.9";
 
       version = "0.6.5.8";
 
@@ -139,7 +139,7 @@ in
     };
     zfsUnstable = common {
       # comment/uncomment if breaking kernel versions are known
-      inkompatibleKernelVersion = null;
+      incompatibleKernelVersion = null;
 
       version = "0.7.0-rc3";
 

From 57f1198bbc93b1e131101bb33b29dbd353b28654 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 21 Jan 2017 23:13:33 +0100
Subject: [PATCH 471/727] udunits: 2.2.21 -> 2.2.23

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

diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix
index 74b89fbe48c..09909f6546a 100644
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/pkgs/development/libraries/udunits/default.nix
@@ -3,10 +3,10 @@
 }:
 
 stdenv.mkDerivation rec {
-    name = "udunits-2.2.21";
+    name = "udunits-2.2.23";
     src = fetchurl {
         url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz";
-        sha256 = "0z8sglqc3d409cylqln53jrv97rw7npyh929y2xdvbc40kzzaxcv";
+        sha256 = "0ya93jrv8qzfkdj77grl4dpyb0ap4jccmqx3rkkgaggnklhjfwkr";
     };
 
     nativeBuildInputs = [ bison flex file ];

From 280750c37dae13624cb222e4cdf7e6382b5d945d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 21 Jan 2017 23:19:32 +0100
Subject: [PATCH 472/727] datamash: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix
index e19d0613635..b1e0bb52a51 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/pkgs/tools/misc/datamash/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "datamash-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchurl {
     url = "mirror://gnu/datamash/${name}.tar.gz";
-    sha256 = "1c2bj0jrm4fxkf0ykxkzgyk1l9s0idqm8rbzmk3n9pgldb4arrd9";
+    sha256 = "06w0pc828qsabmrlh7bc2zwc823xzxy89paaf37f6bipsyrij222";
   };
 
   meta = with stdenv.lib; {

From 487f2cfef8b6a1b7b011d0a1af6244a0d28f877b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 21 Jan 2017 23:40:13 +0100
Subject: [PATCH 473/727] groovy: 2.4.7 -> 2.4.8

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

diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index a883080f58e..b4a9282e185 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "groovy-${version}";
-  version = "2.4.7";
+  version = "2.4.8";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
-    sha256 = "1mgvpqxc99057szfhhjfirmf3xyhs0vmgb0jzy47wr2jh84xd3a3";
+    sha256 = "1zcdkarz9mbx9k5sl69nbphjjcy0xd15zjicjnhp2wq32zm6b2k6";
   };
 
   buildInputs = [ unzip makeWrapper ];

From 71f92bc8a386bcd05f74d56113fd2f408145ad7e Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sat, 4 Jul 2015 18:45:36 -0400
Subject: [PATCH 474/727] nixos: provide default console_cmd for slim

This provides a default console_cmd for the slim display-manager.

When the user enters "console" as the user name, slim will run this
command.

Having a default is rather important; the virtual terminals don't work
with some display drivers, so having a broken X session can leave you
locked out of your machine.
---
 .../modules/services/x11/display-managers/slim.nix  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index c7fbfa85e33..1cef242dae6 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -19,6 +19,7 @@ let
       reboot_cmd ${config.systemd.package}/sbin/shutdown -r now
       ${optionalString (cfg.defaultUser != null) ("default_user " + cfg.defaultUser)}
       ${optionalString cfg.autoLogin "auto_login yes"}
+      ${optionalString (cfg.consoleCmd != null) "console_cmd ${cfg.consoleCmd}"}
       ${cfg.extraConfig}
     '';
 
@@ -99,6 +100,18 @@ in
         '';
       };
 
+      consoleCmd = mkOption {
+        type = types.nullOr types.str;
+        default = ''
+          ${pkgs.xterm}/bin/xterm -C -fg white -bg black +sb -T "Console login" -e ${pkgs.shadow}/bin/login
+        '';
+        defaultText = ''
+          ''${pkgs.xterm}/bin/xterm -C -fg white -bg black +sb -T "Console login" -e ''${pkgs.shadow}/bin/login
+        '';
+        description = ''
+          The command to run when "console" is given as the username.
+        '';
+      };
     };
 
   };

From 4b2f2ccf16f0e231de4edc6b199ed0895df4864f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 22 Jan 2017 01:08:14 +0100
Subject: [PATCH 475/727] pencil: 2.0.18 -> 2.0.21

---
 pkgs/applications/graphics/pencil/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index 7d9b77e9661..5b1f79a6c4f 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, xulrunner }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.18";
+  version = "2.0.21";
   name = "pencil-${version}";
 
   src = fetchurl {
     url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz";
-    sha256 = "0x0kibb2na12fwl0x68xhkjpbm5h2widm346cx2r29gp1kq9kklc";
+    sha256 = "0xq3gczqy7gzf1997qxdql5z7qqk1vabr0rzgakmsi4dq2q4d3kq";
   };
 
   buildPhase = "";
@@ -32,8 +32,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2; # Commercial license is also available
     maintainers = with maintainers; [ bjornfor prikhi ];
     platforms = platforms.linux;
-    # See https://github.com/prikhi/pencil/issues/840
-    # ("Error: Platform version '47.0' is not compatible with minVersion >= 36.0 maxVersion <= 46.*")
-    broken = true;
   };
 }

From 79a7729338d4e175a3bd249b88647b5e89132457 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 21 Jan 2017 17:00:48 +0100
Subject: [PATCH 476/727] go_bootstrap: fix tests on darwin

---
 pkgs/development/compilers/go/1.4.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index eb4c64ed334..b703a92f3ea 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -77,6 +77,29 @@ stdenv.mkDerivation rec {
     # fails when running inside tmux
     sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
 
+    # unix socket tests fail on darwin
+    sed -i '/TestConnAndListener/areturn' src/net/conn_test.go
+    sed -i '/TestPacketConn/areturn' src/net/conn_test.go
+    sed -i '/TestPacketConn/areturn' src/net/packetconn_test.go
+    sed -i '/TestConnAndPacketConn/areturn' src/net/packetconn_test.go
+    sed -i '/TestUnixListenerSpecificMethods/areturn' src/net/packetconn_test.go
+    sed -i '/TestUnixConnSpecificMethods/areturn' src/net/packetconn_test.go
+    sed -i '/TestUnixListenerSpecificMethods/areturn' src/net/protoconn_test.go
+    sed -i '/TestUnixConnSpecificMethods/areturn' src/net/protoconn_test.go
+    sed -i '/TestStreamConnServer/areturn' src/net/server_test.go
+    sed -i '/TestReadUnixgramWithUnnamedSocket/areturn' src/net/unix_test.go
+    sed -i '/TestReadUnixgramWithZeroBytesBuffer/areturn' src/net/unix_test.go
+    sed -i '/TestUnixgramWrite/areturn' src/net/unix_test.go
+    sed -i '/TestUnixConnLocalAndRemoteNames/areturn' src/net/unix_test.go
+    sed -i '/TestUnixgramConnLocalAndRemoteNames/areturn' src/net/unix_test.go
+    sed -i '/TestWithSimulated/areturn' src/log/syslog/syslog_test.go
+    sed -i '/TestFlap/areturn' src/log/syslog/syslog_test.go
+    sed -i '/TestNew/areturn' src/log/syslog/syslog_test.go
+    sed -i '/TestNewLogger/areturn' src/log/syslog/syslog_test.go
+    sed -i '/TestDial/areturn' src/log/syslog/syslog_test.go
+    sed -i '/TestWrite/areturn' src/log/syslog/syslog_test.go
+    sed -i '/TestConcurrentWrite/areturn' src/log/syslog/syslog_test.go
+    sed -i '/TestConcurrentReconnect/areturn' src/log/syslog/syslog_test.go
 
     # remove IP resolving tests, on darwin they can find fe80::1%lo while expecting ::1
     sed -i '/TestResolveIPAddr/areturn' src/net/ipraw_test.go

From 99f8e2c9cb13a030dbb94e3ad33db129faaafe19 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 22 Jan 2017 01:58:45 +0100
Subject: [PATCH 477/727] go_1_6: disable x509 tests on darwin

---
 pkgs/development/compilers/go/1.6.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index 982446f4fdb..7d78f5efd10 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
     sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
     sed -i '/TestRead0/areturn' src/os/os_test.go
     sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
-    sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
+    rm src/crypto/x509/root_darwin_test.go src/crypto/x509/verify_test.go
 
     sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
     sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go

From 0d785c5986164afcb21895e279556f292c611472 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 21 Jan 2017 14:15:00 +0800
Subject: [PATCH 478/727] supertuxkart: 0.9 -> 0.9.2

Also known as the "get ready for babysitting the nieces" release.
---
 pkgs/games/super-tux-kart/default.nix | 52 +++++++++++++++------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index a1778cc69d7..4d2db9d293f 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -1,45 +1,51 @@
-{ fetchgit, fetchsvn, cmake, stdenv, plib, SDL, openal, freealut, mesa
-, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig
-, fribidi, autoconf, automake, libtool, bluez, libjpeg, libpng }:
+{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig
+, openal, freealut, mesa, libvorbis, libogg, gettext, curl, freetype
+, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr }:
 
-stdenv.mkDerivation rec {
+let
+  dir = "stk-code";
+
+in stdenv.mkDerivation rec {
   name = "supertuxkart-${version}";
 
-  version = "0.9";
+  version = "0.9.2";
   srcs = [
-    (fetchgit {
-      url = "https://github.com/supertuxkart/stk-code";
-      rev = "28a525f6d4aba2667c41a549b027149fcceda97e";
-      sha256 = "0b5izr7j3clm6pcxanwwaas06f17wi454s6hwmgv1mg48aay2v97";
-      name = "stk-code";
+    (fetchFromGitHub {
+      owner  = "supertuxkart";
+      repo   = "stk-code";
+      rev    = version;
+      sha256 = "1zsc5nw8il8xwppk624jampfk6qhqzjnni8zicrhqix0xg07nxca";
+      name   = dir;
     })
     (fetchsvn {
-      url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
-      rev = "16293";
-      sha256 = "07jdkli28xr3rcxvixyy5bwi26n5i7dkhd9q0j4wifgs4pymm8r5";
-      name = "stk-assets";
+      url    = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
+      rev    = "16503"; # 0.9.2 crashes with 16937. Refer to stk-code/doc/assets_version
+      sha256 = "0j1dy27gxm4hx26xddr2ak6vw0lim0nqmjnszfb4c61y92j12cqp";
+      name   = "stk-assets";
     })
   ];
-  
+
   buildInputs = [
-    plib SDL openal freealut mesa libvorbis libogg gettext
-    libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez libjpeg libpng
+    cmake libtool pkgconfig
+    libX11 libXrandr
+    openal freealut mesa libvorbis libogg gettext zlib freetype
+    curl fribidi bluez libjpeg libpng
   ];
 
   enableParallelBuilding = true;
 
-  sourceRoot = "stk-code";
+  sourceRoot = dir;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A Free 3D kart racing game";
     longDescription = ''
       SuperTuxKart is a Free 3D kart racing game, with many tracks,
       characters and items for you to try, similar in spirit to Mario
       Kart.
     '';
-    homepage = http://supertuxkart.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ c0dehero fuuzetsu ];
-    platforms = with stdenv.lib.platforms; linux;
+    homepage = https://supertuxkart.net/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ c0dehero fuuzetsu peterhoeg ];
+    platforms = with platforms; linux;
   };
 }

From 6db593164add0146469755025908f0361ae7441e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 22 Jan 2017 11:46:24 +0100
Subject: [PATCH 479/727] epiphany: 3.22.4 -> 3.22.5 (fixes source hash)

I don't know what happened in 754a9cf69804ec00527f4703806282c16179c589
("gnome3.20: remove"), but that hash doesn't work. (Did gnome update
tarball in place?)

I ran "./maintainers/scripts/gnome.sh update epiphany" and selected the
current major.minor version. Now the hash is working.
---
 pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
index c3256288057..dbb162dc432 100644
--- a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "epiphany-3.22.4";
+  name = "epiphany-3.22.5";
 
   src = fetchurl {
-    url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.4.tar.xz;
-    sha256 = "051av2xcg7ii2y273vqmdkzanygws9qsaq7ks0070y06d4rhl6xy";
+    url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.5.tar.xz;
+    sha256 = "e9c307b3f53a77c16ca698fb62fbb8d9b16773702d8163d83699bd623afa6745";
   };
 }

From a9c1d92695838faf5eb9e4e4b44ef58e0af3bc1a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 01:38:10 +0100
Subject: [PATCH 480/727] varnish: 4.0.3 -> 5.0.0

---
 pkgs/servers/varnish/default.nix | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index fb333176801..fc5a744ad46 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -1,25 +1,30 @@
-{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, python
-, pythonPackages }:
+{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit
+, python, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.3";
+  version = "5.0.0";
   name = "varnish-${version}";
 
   src = fetchurl {
     url = "http://repo.varnish-cache.org/source/${name}.tar.gz";
-    sha256 = "01l2iypajkdanxpbvzfxm6vs4jay4dgw7lmchqidnivz15sa3fcl";
+    sha256 = "0jizha1mwqk42zmkrh80y07vfl78mg1d9pp5w83qla4xn9ras0ai";
   };
 
-  buildInputs = [ pcre libxslt groff ncurses pkgconfig readline python
-    pythonPackages.docutils];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    pcre libxslt groff ncurses readline python libedit
+    pythonPackages.docutils
+  ];
 
   buildFlags = "localstatedir=/var/spool";
 
-  meta = {
+  outputs = [ "out" "dev" "man" ];
+
+  meta = with stdenv.lib; {
     description = "Web application accelerator also known as a caching HTTP reverse proxy";
     homepage = "https://www.varnish-cache.org";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ garbas fpletz ];
+    platforms = platforms.linux;
   };
 }

From 77c891f55c2ec01d9e77e80e6abb797f28e55cf2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 01:38:29 +0100
Subject: [PATCH 481/727] rrdtool: 1.5.5 -> 1.5.6

---
 pkgs/tools/misc/rrdtool/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index 2db91549104..98bf6a9cfc2 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -2,14 +2,16 @@
 , tcl-8_5 }:
 
 stdenv.mkDerivation rec {
-  name = "rrdtool-1.5.5";
+  name = "rrdtool-1.5.6";
+
   src = fetchurl {
     url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz";
-    sha256 = "1xm6ikzx8iaa6r7v292k8s7srkzhnifamp1szkimgmh5ki26sa1s";
+    sha256 = "1s2cci80g6kbp5p77mkxpfxwvjm1802fw0bjfsa8yjv8g5a7fclq";
   };
+
   buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ]
     ++ stdenv.lib.optional stdenv.isDarwin tcl-8_5;
-  
+
   postInstall = ''
     # for munin and rrdtool support
     mkdir -p $out/lib/perl5/site_perl/

From 281a56af4aa2805c46fca819eba8943340503420 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 01:38:50 +0100
Subject: [PATCH 482/727] collectd: 5.6.0 -> 5.7.0

---
 pkgs/tools/system/collectd/default.nix       | 12 ++---
 pkgs/tools/system/collectd/readdir-fix.patch | 55 --------------------
 2 files changed, 4 insertions(+), 63 deletions(-)
 delete mode 100644 pkgs/tools/system/collectd/readdir-fix.patch

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index fb2a66ecf37..7d649256f86 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -9,6 +9,7 @@
 , libdbi ? null
 , libgcrypt ? null
 , libmemcached ? null, cyrus_sasl ? null
+, libmicrohttpd ? null
 , libmodbus ? null
 , libnotify ? null, gdk_pixbuf ? null
 , liboping ? null
@@ -34,24 +35,19 @@
 , libmnl ? null
 }:
 stdenv.mkDerivation rec {
-  version = "5.6.0";
+  version = "5.7.0";
   name = "collectd-${version}";
 
   src = fetchurl {
     url = "http://collectd.org/files/${name}.tar.bz2";
-    sha256 = "08w6fjzczi2psk7va0xkjh9pigpar6sbjx2a6ayq4dmc3zcvpzzh";
+    sha256 = "1cpjkv4d0iifngihxikzljavya0r2k3blarlahamgbdsqsymz815";
   };
 
   buildInputs = [
     pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
     cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
     lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool
-    varnish yajl jdk libtool python udev net_snmp hiredis libmnl
-  ];
-
-  patches = [
-    # Replace deprecated readdir_r() with readdir() to avoid a fatal warning.
-    ./readdir-fix.patch
+    varnish yajl jdk libtool python udev net_snmp hiredis libmnl libmicrohttpd
   ];
 
   # for some reason libsigrok isn't auto-detected
diff --git a/pkgs/tools/system/collectd/readdir-fix.patch b/pkgs/tools/system/collectd/readdir-fix.patch
deleted file mode 100644
index 171dfc689a4..00000000000
--- a/pkgs/tools/system/collectd/readdir-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur collectd-5.6.0/src/vserver.c collectd-5.6.0/src/vserver.c
---- collectd-5.6.0/src/vserver.c	2016-09-11 01:10:25.279038699 -0700
-+++ collectd-5.6.0/src/vserver.c	2016-09-25 07:44:40.771177458 -0700
-@@ -132,15 +132,8 @@
- 
- static int vserver_read (void)
- {
--#if NAME_MAX < 1024
--# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + 1024 + 1)
--#else
--# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + NAME_MAX + 1)
--#endif
--
- 	DIR 			*proc;
- 	struct dirent 	*dent; /* 42 */
--	char dirent_buffer[DIRENT_BUFFER_SIZE];
- 
- 	errno = 0;
- 	proc = opendir (PROCDIR);
-@@ -165,19 +158,23 @@
- 
- 		int status;
- 
--		status = readdir_r (proc, (struct dirent *) dirent_buffer, &dent);
--		if (status != 0)
--		{
--			char errbuf[4096];
--			ERROR ("vserver plugin: readdir_r failed: %s",
--					sstrerror (errno, errbuf, sizeof (errbuf)));
--			closedir (proc);
--			return (-1);
--		}
--		else if (dent == NULL)
-+		errno = 0;
-+		dent = readdir (proc);
-+		if (dent == NULL)
- 		{
--			/* end of directory */
--			break;
-+			if (errno != 0)
-+			{
-+				char errbuf[4096];
-+				ERROR ("vserver plugin: readdir failed: %s",
-+						sstrerror (errno, errbuf, sizeof (errbuf)));
-+				closedir (proc);
-+				return (-1);
-+			}
-+			else
-+			{
-+				/* end of directory */
-+				break;
-+			}
- 		}
- 
- 		if (dent->d_name[0] == '.')

From 608c167f951cdbafb110291e7d6daa513879a05e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 01:39:07 +0100
Subject: [PATCH 483/727] libmicrohttpd: 0.9.50 -> 0.9.52

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

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index b53c8da3f54..c38d5c82570 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-0.9.50";
+  name = "libmicrohttpd-0.9.52";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "1mzbqr6sqisppz88mh73bbh5sw57g8l87qvhcjdx5pmbd183idni";
+    sha256 = "1smgxw6jv81yybg86bzr4c2sn7a31apf8q4zz0kpch9xfrp7yyal";
   };
 
   outputs = [ "out" "dev" "devdoc" "info" ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/libmicrohttpd/;
 
-    maintainers = [ maintainers.eelco maintainers.vrthra ];
+    maintainers = with maintainers; [ eelco vrthra fpletz ];
     platforms = platforms.linux;
   };
 }

From f3f5045432bd5ebded5cffc5f9a42620eac2965a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 01:43:07 +0100
Subject: [PATCH 484/727] libpcap: 1.7.4 -> 1.8.1

---
 pkgs/development/libraries/libpcap/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index d23d123a99c..14567c0daf4 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "libpcap-1.7.4";
-  
+  name = "libpcap-1.8.1";
+
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "1c28ykkizd7jqgzrfkg7ivqjlqs9p6lygp26bsw2i0z8hwhi3lvs";
+    sha256 = "07jlhc66z76dipj4j5v3dig8x6h3k6cb36kmnmpsixf3zmlvqgb7";
   };
-  
+
   nativeBuildInputs = [ flex bison ];
-  
+
   # We need to force the autodetection because detection doesn't
   # work in pure build enviroments.
   configureFlags =
@@ -22,16 +22,17 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = ''mkdir -p $out/bin'';
-  
+
   crossAttrs = {
     # Stripping hurts in static libraries
     dontStrip = true;
     configureFlags = configureFlags ++ [ "ac_cv_linux_vers=2" ];
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.tcpdump.org;
     description = "Packet Capture Library";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ fpletz ];
   };
 }

From 9156d932b6383c0c213d069cd09916a0995db944 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 01:44:38 +0100
Subject: [PATCH 485/727] tcpdump: 4.7.4 -> 4.8.1

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

diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index a50fad8b374..f51f345d1dd 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpcap, enableStatic ? false }:
 
 stdenv.mkDerivation rec {
-  name = "tcpdump-4.7.4";
+  name = "tcpdump-4.8.1";
 
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "1byr8w6grk08fsq0444jmcz9ar89lq9nf4mjq2cny0w9k8k21rbb";
+    sha256 = "0743ipl0l7ymjss3ybvvc5cbk9kb7s8yl4p3ramp5kwgqhg39r10";
   };
 
   buildInputs = [ libpcap ];

From 57145c6251d6366caed87d3b24e1c858d7f1a516 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 02:16:46 +0100
Subject: [PATCH 486/727] libnetfilter_conntrack: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 75cca9a028e..a94bf28cd97 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libnetfilter_conntrack-${version}";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchurl {
     url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
-    sha256 = "0fnpja3g8s38cp7ipija5pvhfgna1gybn0z2bl276nk08fppv7gw";
+    sha256 = "1svzyf3rq9nbrcw1jsricgyhh7x1am8iqn6kjr6mzrw42810ik7g";
   };
 
   buildInputs = [ libmnl ];

From 8a7407e881829ec2ac3b365bc78c721c3ff79875 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 02:17:16 +0100
Subject: [PATCH 487/727] libnftnl: 1.0.6 -> 1.0.7

---
 pkgs/development/libraries/libnftnl/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix
index a043d36ff4d..074c1a9dfd2 100644
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ b/pkgs/development/libraries/libnftnl/default.nix
@@ -1,20 +1,21 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "libnftnl-1.0.6";
+  name = "libnftnl-1.0.7";
 
   src = fetchurl {
     url = "http://netfilter.org/projects/libnftnl/files/${name}.tar.bz2";
-    sha256 = "0zmh190c7212zvzjsn5lm6pf399r4arq7dliiqq6grd174m96fxd";
+    sha256 = "10irjrylcfkbp11617yr19vpfhgl54w0kw02jhj0i1abqv5nxdlv";
   };
 
-  buildInputs = [ pkgconfig libmnl ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libmnl ];
 
   meta = with stdenv.lib; {
     description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem";
     homepage = http://netfilter.org/projects/libnftnl;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ wkennington ];
+    maintainers = with maintainers; [ wkennington fpletz ];
   };
 }

From 016a194ac832af15367a7167f36d869ebd420c1a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 02:17:35 +0100
Subject: [PATCH 488/727] conntrack_tools: 1.4.3 -> 1.4.4

---
 pkgs/os-specific/linux/conntrack-tools/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix
index f0988759bc4..ea09050fc60 100644
--- a/pkgs/os-specific/linux/conntrack-tools/default.nix
+++ b/pkgs/os-specific/linux/conntrack-tools/default.nix
@@ -1,18 +1,20 @@
 { fetchurl, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink
 , libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout
-, libnetfilter_cthelper }:
+, libnetfilter_cthelper, systemd }:
 
 stdenv.mkDerivation rec {
   name = "conntrack-tools-${version}";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchurl {
     url = "http://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2";
-    sha256 = "0mrzrzp6y41pmxc6ixc4fkgz6layrpwsmzb522adzzkc6mhcqg5g";
+    sha256 = "0v5spmlcw5n6va8z34f82vcpynadb0b54pnjazgpadf0qkyg9jmp";
   };
 
-  buildInputs = [ libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue
-    libnetfilter_cttimeout libnetfilter_cthelper ];
+  buildInputs = [
+    libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue
+    libnetfilter_cttimeout libnetfilter_cthelper systemd
+  ];
   nativeBuildInputs = [ flex bison pkgconfig ];
 
   meta = with stdenv.lib; {
@@ -20,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "Connection tracking userspace tools";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ nckx ];
+    maintainers = with maintainers; [ nckx fpletz ];
   };
 }

From 210f894c12ed975dba5c8e500237440c8c744326 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 02:20:00 +0100
Subject: [PATCH 489/727] iptables: split out dev output

---
 pkgs/os-specific/linux/iptables/default.nix | 14 +++++++++-----
 pkgs/top-level/all-packages.nix             |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index 8c815029661..bbc63d31a13 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, bison, flex, libnetfilter_conntrack, libnftnl, libmnl}:
+{ stdenv, fetchurl, bison, flex
+, libnetfilter_conntrack, libnftnl, libmnl }:
 
 stdenv.mkDerivation rec {
   name = "iptables-${version}";
@@ -9,9 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb";
   };
 
-  nativeBuildInputs = [bison flex];
+  nativeBuildInputs = [ bison flex ];
 
-  buildInputs = [libnetfilter_conntrack libnftnl libmnl];
+  buildInputs = [ libnetfilter_conntrack libnftnl libmnl ];
 
   preConfigure = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl"
@@ -22,10 +23,13 @@ stdenv.mkDerivation rec {
     --enable-shared
   '';
 
-  meta = {
+  outputs = [ "out" "dev" ];
+
+  meta = with stdenv.lib; {
     description = "A program to configure the Linux IP packet filtering ruleset";
     homepage = http://www.netfilter.org/projects/iptables/index.html;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fpletz ];
     downloadPage = "http://www.netfilter.org/projects/iptables/files/";
     updateWalker = true;
     inherit version;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbf1abba565..0cf4923a3fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11087,7 +11087,9 @@ in
     inherit (perlPackages) SGMLSpm;
   };
 
-  iptables = callPackage ../os-specific/linux/iptables { };
+  iptables = callPackage ../os-specific/linux/iptables {
+    flex = flex_2_5_35;
+  };
 
   ipset = callPackage ../os-specific/linux/ipset { };
 

From f09c5c9c453e0c303f1d334fd6419688eaafdce8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 02:21:07 +0100
Subject: [PATCH 490/727] nftables: 0.6 -> 0.7, enable xtables support

---
 pkgs/os-specific/linux/nftables/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 3557c1f05af..78b13b902c8 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -1,22 +1,24 @@
 { stdenv, fetchurl, pkgconfig, docbook2x, docbook_xml_dtd_45
-, flex, bison, libmnl, libnftnl, gmp, readline }:
+, flex, bison, libmnl, libnftnl, gmp, readline, iptables }:
 
 stdenv.mkDerivation rec {
-  name = "nftables-0.6";
+  name = "nftables-0.7";
 
   src = fetchurl {
     url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2";
-    sha256 = "0bbcrn9nz75daic8bq7rspvcw3ck7l82vqcvkyyg4mhwbxjn5pny";
+    sha256 = "0hzdqigdx4i6jbpxbdyq4zy4p4waqn8l6vvz7685ikh1v0wr4qzy";
   };
 
   configureFlags = [
     "CONFIG_MAN=y"
     "DB2MAN=docbook2man"
+    "--with-xtables"
   ];
 
   XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
 
-  buildInputs = [ pkgconfig docbook2x flex bison libmnl libnftnl gmp readline ];
+  nativeBuildInputs = [ pkgconfig docbook2x flex bison ];
+  buildInputs = [ libmnl libnftnl gmp readline iptables ];
 
   meta = with stdenv.lib; {
     description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework";

From 152f1131c447a95473294350f7dd11c7b5e4dd1d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 02:28:28 +0100
Subject: [PATCH 491/727] liboping: 1.8.0 -> 1.9.0

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

diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix
index 83903002c97..435f593b597 100644
--- a/pkgs/development/libraries/liboping/default.nix
+++ b/pkgs/development/libraries/liboping/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses ? null, perl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "liboping-1.8.0";
+  name = "liboping-1.9.0";
 
   src = fetchurl {
     url = "http://verplant.org/liboping/files/${name}.tar.bz2";
-    sha256 = "1nsvlsvapc64h0anip2hz5ydbgk3an94xqiaa9kivcw1r6193jqx";
+    sha256 = "0c1mdx9ixqypayhm617jjv9kr6y60nh3mnryafjzv23bnn41vfs4";
   };
 
   buildInputs = [ ncurses perl ];

From a50ff980be5171db9382938e88ad178e482f5a30 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 10:31:26 +0100
Subject: [PATCH 492/727] libvirt: 2.5.0 -> 3.0.0

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 658a2e37883..5fcdd153c99 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -9,11 +9,11 @@
 # if you update, also bump pythonPackages.libvirt or it will break
 stdenv.mkDerivation rec {
   name = "libvirt-${version}";
-  version = "2.5.0";
+  version = "3.0.0";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.xz";
-    sha256 = "07nbh6zhaxx5i1s1acnppf8rzkzb2ppgv35jw7grbbnnpzpzz7c1";
+    sha256 = "0php6wxjcilpir0miwg06yd2ha25zi9fv2apvvgv5c8k1svjd7cx";
   };
 
   patches = [ ./build-on-bsd.patch ];

From 4d8dbb63d7c8015fdeb48fbec2c5db47202f0903 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 10:31:46 +0100
Subject: [PATCH 493/727] pythonPackages.libvirt: 2.5.0 -> 3.0.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 03977936121..ffb1aefdd33 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28779,13 +28779,13 @@ EOF
   };
 
   libvirt = let
-    version = "2.5.0";
+    version = "3.0.0";
   in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
 
     src = pkgs.fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";
-      sha256 = "1lanyrk4invs5j4jrd7yvy7g8kilihjbcrgs5arx8k3bs9x7izgl";
+      sha256 = "1ha4bqf029si1lla1z7ca786w571fh3wfs4h7zaglfk4gb2w39wl";
     };
 
     buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];

From 268e57bcc57bea218789d72d05a1d724bdc77686 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 10:32:05 +0100
Subject: [PATCH 494/727] libvirt-glib: 0.2.3 -> 1.0.0

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

diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 6bd0ec52f27..0018e38a9f9 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -6,11 +6,11 @@
 let
   inherit (pythonPackages) python pygobject2;
 in stdenv.mkDerivation rec {
-  name = "libvirt-glib-0.2.3";
+  name = "libvirt-glib-1.0.0";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/glib/${name}.tar.gz";
-    sha256 = "1pahj8qa7k2307sd57rwqwq1hijya02v0sxk91hl3cw48niimcf3";
+    sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa";
   };
 
   buildInputs = [

From 733365b22f5351494ae1fc5fd8e708ddf4890c6d Mon Sep 17 00:00:00 2001
From: Alexander Batischev <eual.jp@gmail.com>
Date: Mon, 16 Jan 2017 03:21:36 +0400
Subject: [PATCH 495/727] paratype-pt-sane: s/sane/sans/

---
 pkgs/data/fonts/paratype-pt/sans.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix
index 2958611e474..fe9d3085470 100644
--- a/pkgs/data/fonts/paratype-pt/sans.nix
+++ b/pkgs/data/fonts/paratype-pt/sans.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "paratype-pt-sane";
+  name = "paratype-pt-sans";
 
   src = fetchurl rec {
     url = "http://www.paratype.ru/uni/public/PTSans.zip";

From dabedc40a9925b05426c34a2900aee343dc5a8cb Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 14:09:50 +0100
Subject: [PATCH 496/727] ngrep: fix build due to new libpcap, use debian
 patches

---
 pkgs/tools/networking/ngrep/default.nix | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix
index 3c0b0d9278a..dcc0e8596e9 100644
--- a/pkgs/tools/networking/ngrep/default.nix
+++ b/pkgs/tools/networking/ngrep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libpcap, gnumake3 }:
+{ stdenv, fetchurl, fetchpatch, libpcap, gnumake3, pcre }:
 
 stdenv.mkDerivation rec {
   name = "ngrep-1.45";
@@ -8,13 +8,32 @@ stdenv.mkDerivation rec {
     sha256 = "19rg8339z5wscw877mz0422wbsadds3mnfsvqx3ihy58glrxv9mf";
   };
 
-  buildInputs = [ gnumake3 libpcap ];
+  patches = [
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_debian-build.diff?h=debian/1.45.ds2-14";
+      sha256 = "1p359k54xjbh6r0d0lv1l679n250wxk6j8yyz23gn54kwdc29zfy";
+    })
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_man-fixes.diff?h=debian/1.45.ds2-14";
+      sha256 = "1b66zfbsrsvg60j988i6ga9iif1c34fsbq3dp1gi993xy4va8m5k";
+    })
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/20_setlocale.diff?h=debian/1.45.ds2-14";
+      sha256 = "16xbmnmvw5sjidz2qhay68k3xad05g74nrccflavxbi0jba52fdq";
+    })
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/40_ipv6-offsets.diff?h=debian/1.45.ds2-14";
+      sha256 = "0fjlk1sav5nnjapvsa8mvdwjkhgm3kgc6dw7r9h1qx6d3b8cgl76";
+    })
+  ];
+
+  buildInputs = [ gnumake3 libpcap pcre ];
 
   preConfigure = ''
     # Fix broken test for BPF header file
     sed -i "s|BPF=.*|BPF=${libpcap}/include/pcap/bpf.h|" configure
 
-    configureFlags="$configureFlags --with-pcap-includes=${libpcap}/include"
+    configureFlags="$configureFlags --enable-ipv6 --enable-pcre --disable-pcap-restart --with-pcap-includes=${libpcap}/include"
   '';
 
   meta = with stdenv.lib; {

From 8d4fc1a65e33d75ad9b237050c166bf45886c31a Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 22 Jan 2017 17:14:14 +0100
Subject: [PATCH 497/727] qgis: 2.16.2 -> 2.18.3

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

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 680cf921ce2..d32aaba8468 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.16.2";
+  name = "qgis-2.18.3";
 
   buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
     fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "0dll8klz0qfba4c1y7mp9k4y4azlay0sypvryicggllk1hna4w0n";
+    sha256 = "155kz7fizhkmgc4lsmk1cph1zar03pdd8pjpmv81yyx1z0i4ygvl";
   };
 
   cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";

From 632934862b61ed9bd761a14fc2633d1281e8652f Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 22 Jan 2017 17:15:24 +0100
Subject: [PATCH 498/727] qgis: enableParallelBuilding

---
 pkgs/applications/gis/qgis/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index d32aaba8468..a4d0d21ef40 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake makeWrapper ];
 
-  # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory
-  #enableParallelBuilding = true;
+  enableParallelBuilding = true;
 
   # To handle the lack of 'local' RPATH; required, as they call one of
   # their built binaries requiring their libs, in the build process.

From 01fef925fc6c7562e782e2c46b65c341803b825c Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@mayflower.de>
Date: Sun, 15 Jan 2017 18:26:36 +0100
Subject: [PATCH 499/727] rtags: 2.3 -> 2.8-p1

---
 pkgs/development/tools/rtags/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index f8f9646182b..44f922906e8 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "rtags-${version}";
-  version = "2.3";
+  version = "2.8-p1";
 
   buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ]
-    ++ lib.optional stdenv.isDarwin apple_sdk.sdk;
+    ++ lib.optionals stdenv.isDarwin [ apple_sdk.sdk apple_sdk.frameworks.CoreServices ];
 
   preConfigure = ''
-    export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) " \
+    export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \
            LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" \
 
   '' + lib.optionalString stdenv.isDarwin ''
@@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchgit {
-    rev = "refs/tags/v${version}";
+    # rev = "refs/tags/v${version}"; # TODO Renable if sha1 below is tagged as release
+    rev = "f85bd60f00d51748ea159b00fda7b5bfa78ef571";
     fetchSubmodules = true;
     url = "https://github.com/andersbakken/rtags.git";
-    sha256 = "05kzch88x2wiimygfli6vsr9i5hzgkybsya8qx4zvb6daip4b7yf";
+    sha256 = "0g9sgc763c5d695hjffhis19sbaqk8z4884szljf7kbrjxl17y78";
   };
 
   meta = {

From fc8233a64f49207bcb7a1774eba4e1384dfce200 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Jan 2017 12:11:50 -0500
Subject: [PATCH 500/727] kernel: 4.4.43 -> 4.4.44

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 2d2f4d924db..0eb87a8dd9e 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.43";
+  version = "4.4.44";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1yzphiznkwambniq21fiw0vw1fgql4cwcxjlp290y8cf3b3704qb";
+    sha256 = "0j779p83w4i9vj7l23rx1ihymplgy44pjh53lf55napj0ckwzggs";
   };
 
   kernelPatches = args.kernelPatches;

From df0301f59bd0f7749541c50538c5b1aeaf444900 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 20:29:41 +0100
Subject: [PATCH 501/727] nixos/networkmanager: trigger assertion instead of
 error

---
 nixos/modules/services/networking/networkmanager.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 8f353979d3f..c11d4434c20 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -174,7 +174,7 @@ in {
 
     assertions = [{
       assertion = config.networking.wireless.enable == false;
-      message = "You can not use networking.networkmanager with services.networking.wireless";
+      message = "You can not use networking.networkmanager with networking.wireless";
     }];
 
     boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections.
@@ -239,7 +239,8 @@ in {
     # Turn off NixOS' network management
     networking = {
       useDHCP = false;
-      wireless.enable = false;
+      # use mkDefault to trigger the assertion about the conflict above
+      wireless.enable = lib.mkDefault false;
     };
 
     powerManagement.resumeCommands = ''

From 15b4a3702714043c0f5d4b273bd1cbbde2dccf72 Mon Sep 17 00:00:00 2001
From: Alistair Bill <alistair.bill@gmail.com>
Date: Sun, 22 Jan 2017 20:46:31 +0000
Subject: [PATCH 502/727] neofetch: init at 2.0.2

---
 lib/maintainers.nix                  |  1 +
 pkgs/tools/misc/neofetch/default.nix | 33 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 3 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/misc/neofetch/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 58c8fc0f1d8..1e9a6fe0f0d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -27,6 +27,7 @@
   akaWolf = "Artjom Vejsel <akawolf0@gmail.com>";
   akc = "Anders Claesson <akc@akc.is>";
   algorith = "Dries Van Daele <dries_van_daele@telenet.be>";
+  alibabzo = "Alistair Bill <alistair.bill@gmail.com>";
   all = "Nix Committers <nix-commits@lists.science.uu.nl>";
   ambrop72 = "Ambroz Bizjak <ambrop7@gmail.com>";
   amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
new file mode 100644
index 00000000000..0e992f49c7a
--- /dev/null
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "neofetch-${version}";
+  version = "2.0.2";
+  src = fetchFromGitHub {
+    owner = "dylanaraps";
+    repo = "neofetch";
+    rev = version;
+    sha256 = "15fpm6nflf6w0c758xizfifvvxrkmcc2hpzrnfw6fcngfqcvajmd";
+  };
+
+  patchPhase = ''
+    substituteInPlace ./neofetch \
+    --replace "/usr/share" "$out/share"
+  '';
+
+  dontBuild = true;
+
+
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX="
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A fast, highly customizable system info script";
+    homepage = https://github.com/dylanaraps/neofetch;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ alibabzo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbf1abba565..50dc44fc906 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2933,6 +2933,8 @@ in
 
   ndjbdns = callPackage ../tools/networking/ndjbdns { };
 
+  neofetch = callPackage ../tools/misc/neofetch { };
+
   nerdfonts = callPackage ../data/fonts/nerdfonts { };
 
   nestopia = callPackage ../misc/emulators/nestopia { };

From cd9f709582632038119a6d8abfd1b3108994b85e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 22 Jan 2017 21:58:39 +0100
Subject: [PATCH 503/727] flannel service: fix enable expression

Need to surround the equality check in parentheses.
---
 nixos/modules/services/networking/flannel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix
index ca47a18bc1f..b93e28e34ef 100644
--- a/nixos/modules/services/networking/flannel.nix
+++ b/nixos/modules/services/networking/flannel.nix
@@ -149,6 +149,6 @@ in {
       serviceConfig.ExecStart = "${cfg.package}/bin/flannel";
     };
 
-    services.etcd.enable = mkDefault cfg.etcd.endpoints == ["http://127.0.0.1:2379"];
+    services.etcd.enable = mkDefault (cfg.etcd.endpoints == ["http://127.0.0.1:2379"]);
   };
 }

From 6a8790429692280998801c96660dcc85e30fb759 Mon Sep 17 00:00:00 2001
From: Alistair Bill <alistair.bill@gmail.com>
Date: Sun, 22 Jan 2017 21:09:16 +0000
Subject: [PATCH 504/727] msgpack-tools: init at 0.6

---
 .../tools/msgpack-tools/default.nix           | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/tools/msgpack-tools/default.nix

diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix
new file mode 100644
index 00000000000..d83be1c1431
--- /dev/null
+++ b/pkgs/development/tools/msgpack-tools/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "msgpack-tools-${version}";
+  version = "v0.6";
+
+  src = fetchFromGitHub {
+    owner = "ludocode";
+    repo = "msgpack-tools";
+    rev = version;
+    sha256 = "1ygjk25zlpqjckxgqmahnz999704zy2bd9id6hp5jych1szkjgs5";
+  };
+
+  buildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Command-line tools for converting between MessagePack and JSON";
+    homepage = https://github.com/ludocode/msgpack-tools;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ alibabzo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50dc44fc906..2195db9bb7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6480,6 +6480,8 @@ in
 
   mk = callPackage ../development/tools/build-managers/mk { };
 
+  msgpack-tools = callPackage ../development/tools/msgpack-tools { };
+
   msitools = callPackage ../development/tools/misc/msitools { };
 
   multi-ghc-travis = callPackage ../development/tools/haskell/multi-ghc-travis { };

From 654167e17fc0d4d4dc25c1b3a801eda7b65abfe3 Mon Sep 17 00:00:00 2001
From: Jonathan Haddock <joncojonathan@gmail.com>
Date: Sun, 22 Jan 2017 14:41:38 +0000
Subject: [PATCH 505/727] Updated versions of various Jetbrains applications,
 including PHPStorm, IntelliJ, PyCharm.

clion                 2016.3   -> 2016.3.2
datagrip	      2016.3.2 -> 2016.3.2
idea-community        2016.3.2 -> 2016.3.3
idea-ultimate         2016.3.2 -> 2016.3.3
pycharm-community     2016.3   -> 2016.3.2
pycharm-professional  2016.3   -> 2016.3.2
phpstorm              2016.3   -> 2016.3.2
ruby-mine              2016.2.5 -> 2016.3.1
webstorm              2016.3.1 -> 2016.3.2
---
 pkgs/applications/editors/idea/default.nix | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 204fd60d2bc..12ca97e12c5 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -136,12 +136,12 @@ in
 {
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2016.3";
+    version = "2016.3.2";
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "16nszamr0bxg8aghyrg4wzxbp9158kjzhr957ljpbipz0rlixf31";
+      sha256 = "0ygnj3yszgd1si1qgx7m4n7smm583l5pww8xhx8n86mvz7ywdhbn";
     };
     wmClass = "jetbrains-clion";
   };
@@ -172,12 +172,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2016.3.2";
+    version = "2016.3.3";
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "0ngign34gq7i121ss2s9wfziy3vkv1jb79pw8nf1qp7rb15xn4vc";
+      sha256 = "1v9rzfj84fyz3m3b6bh45jns8wcil9n8f8mfha0x8m8534r6w368";
     };
     wmClass = "jetbrains-idea-ce";
   };
@@ -208,24 +208,24 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2016.3.2";
+    version = "2016.3.3";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "13pd95zad29c3i9qpwhjii601ixb4dgcld0kxk3liq4zmnv6wqxa";
+      sha256 = "1bwy86rm0mifizmhkm9wxwc4nrrizk2zp4zl5ycxh6zdiad1r1wm";
     };
     wmClass = "jetbrains-idea";
   };
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2016.2.5";
+    version = "2016.3.1";
     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 = "1rncnm5dvhpfb7l5p2k0hs4yqzp8n1c4rvz9vldlf5k7mvwggp7p";
+      sha256 = "10d1ba6qpizhz4d7fz0ya565pdvkgcmsdgs7b8dv98s9hxfjsldy";
     };
     wmClass = "jetbrains-rubymine";
   };
@@ -256,36 +256,36 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2016.3";
+    version = "2016.3.2";
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1pi822ihzy58jszdy7y2pyni6pki9ih8s9xdbwlbwg9vck1iqprs";
+      sha256 = "0fag5ng9n953mnf3gmxpac1icnb1qz6dybhqwjbr13qij8v2s2g1";
     };
     wmClass = "jetbrains-pycharm-ce";
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2016.3";
+    version = "2016.3.2";
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1b4ib77wzg0y12si8zqrfwbhv4kvmy9nm5dsrdr3k7f89dqg3279";
+      sha256 = "1nylq0fyvix68l4dp9852dak58dbiamjphx2hin087cadaji6r63";
     };
     wmClass = "jetbrains-pycharm";
   };
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2016.3";
+    version = "2016.3.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 = "0hzjhwij2x3b5fqwyd69h24ld13bpc2bf9wdcd1jy758waf0d91y";
+      sha256 = "05ylhpn1mijjphcmv6ay3123xp72yypw19430dgr8101zpsnifa5";
     };
     wmClass = "jetbrains-phpstorm";
   };
@@ -304,12 +304,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2016.3.1";
+    version = "2016.3.2";
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "10za4d6w9yns7kclbviizslq2y7zas9rkmvs3xwrfw1rdw2b69af";
+      sha256 = "1h3kjvd10j48n9ch2ldqjsizq5n8gkm0vrrvznayc1bz2kjvhavn";
     };
     wmClass = "jetbrains-webstorm";
   };

From df67f58fbfde8bfe5f1e6659c18b0953558cd534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 22 Jan 2017 22:55:39 +0100
Subject: [PATCH 506/727] gtk3: move gtk-update-icon-cache to the main output

This is basically what aa0fa193734a was for gtk2 and Xfce.
Fixes #20874, though I haven't tested it directly.
---
 pkgs/desktops/gnome-3/3.22/default.nix  | 2 +-
 pkgs/development/libraries/gtk+/3.x.nix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix
index 3b76ac80fdb..b5e19e5a1b5 100644
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/default.nix
@@ -20,7 +20,7 @@ let
     pkgs.desktop_file_utils pkgs.ibus
     pkgs.shared_mime_info # for update-mime-database
     glib # for gsettings
-    gtk3 # for gtk-update-icon-cache
+    gtk3.out # for gtk-update-icon-cache
     glib_networking gvfs dconf gnome-backgrounds gnome_control_center
     gnome-menus gnome_settings_daemon gnome_shell
     gnome_themes_standard defaultIconTheme gnome-shell-extensions
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 64f5a1e3bdd..45c21df4696 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -63,6 +63,8 @@ stdenv.mkDerivation rec {
   postInstall = optionalString (!stdenv.isDarwin) ''
     substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \
       --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib'
+    # The updater is needed for nixos env and it's tiny.
+    moveToOutput bin/gtk-update-icon-cache "$out"
   '';
 
   meta = with stdenv.lib; {

From 0ff6b6fc0fe0d4f75c97bc1d63770346fe5a4a4c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 22 Jan 2017 17:05:19 -0500
Subject: [PATCH 507/727] (haskellPackages.callPackage foo).env: Set the right
 env vars when cross-compiling

---
 pkgs/development/haskell-modules/generic-builder.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a7696dfc2e3..43676f1e72e 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -148,8 +148,10 @@ let
 
   setupBuilder = if isCross || isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand;
   setupCommand = "./Setup";
-  ghcCommand = if isGhcjs then "ghcjs" else if isCross then "${ghc.cross.config}-ghc" else "ghc";
-  ghcCommandCaps = toUpper ghcCommand;
+  ghcCommand' = if isGhcjs then "ghcjs" else "ghc";
+  crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else "";
+  ghcCommand = "${crossPrefix}${ghcCommand'}";
+  ghcCommandCaps= lib.toUpper ghcCommand';
 
 in
 

From 13d6681ce72ac265f03013247f60ab3d001779e0 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 18 Jan 2017 08:54:08 -0500
Subject: [PATCH 508/727] release.nix: Only build Only build bootstrap tools
 when their system is supported

---
 pkgs/top-level/release.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 2052957edd6..c301ceb1530 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -67,13 +67,13 @@ let
               jobs.vim.x86_64-darwin
             ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
         };
-
+    } // (lib.optionalAttrs (builtins.elem "i686-linux" supportedSystems) {
       stdenvBootstrapTools.i686-linux =
         { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; };
-
+    }) // (lib.optionalAttrs (builtins.elem "x86_64-linux" supportedSystems) {
       stdenvBootstrapTools.x86_64-linux =
         { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; };
-
+    }) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" supportedSystems) {
       stdenvBootstrapTools.x86_64-darwin =
         let
           bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };
@@ -83,8 +83,7 @@ let
           # Test a full stdenv bootstrap from the bootstrap tools definition
           inherit (bootstrap.test-pkgs) stdenv;
         };
-
-    } // (mapTestOn ((packagePlatforms pkgs) // rec {
+    }) // (mapTestOn ((packagePlatforms pkgs) // rec {
       haskell.compiler = packagePlatforms pkgs.haskell.compiler;
       haskellPackages = packagePlatforms pkgs.haskellPackages;
 

From 32ae22b387ac38c333819976757c313eb0ec8838 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Jan 2017 19:21:01 -0500
Subject: [PATCH 509/727] zulu: init at 8.19.0.1

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

diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
new file mode 100644
index 00000000000..657f5274d00
--- /dev/null
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, pkgs, fetchurl, unzip, makeWrapper, setJavaClassPath, swingSupport ? true }:
+
+with pkgs;
+
+let
+  version = "8.19.0.1";
+  openjdk = "8.0.112";
+
+  sha256_linux = "1icb6in1197n44wk2cqnrxr7w0bd5abxxysfrhbg56jlb9nzmp4x";
+  sha256_darwin = "0kxwh62a6kckc9l9jkgakf86lqkqazp3dwfwaxqc4cg5zczgbhmd";
+
+  platform = if stdenv.isDarwin then "macosx" else "linux";
+  hash = if stdenv.isDarwin then sha256_darwin else sha256_linux;
+  extension = if stdenv.isDarwin then "zip" else "tar.gz";
+in stdenv.mkDerivation rec {
+  inherit version openjdk platform hash extension;
+
+  name = "zulu-${version}";
+
+  src = fetchurl {
+    url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}";
+    sha256 = hash;
+  };
+
+  buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin [ unzip ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r ./* "$out/"
+
+    jrePath="$out/jre"
+
+    rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/jli
+    rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/server
+    rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/xawt
+    rpath=$rpath''${rpath:+:}$jrePath/lib/amd64
+
+    # set all the dynamic linkers
+    find $out -type f -perm -0100 \
+        -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "$rpath" {} \;
+
+    find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
+
+    mkdir -p $out/nix-support
+    echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
+
+    # Set JAVA_HOME automatically.
+    cat <<EOF >> $out/nix-support/setup-hook
+    if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+    EOF
+  '';
+
+  libraries = [ stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk ]
+      ++ (if swingSupport then [ xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc ] else [ ]);
+
+  rpath = stdenv.lib.strings.makeLibraryPath libraries;
+
+  meta = with stdenv.lib; {
+    homepage = https://www.azul.com/products/zulu/;
+    license = licenses.gpl2;
+    description = "Certified builds of OpenJDK";
+    longDescription = "Certified builds of OpenJDK that can be deployed across multiple operating systems, containers, hypervisors and Cloud platforms";
+    maintainers = with maintainers; [ nequissimus ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbf1abba565..659b0649f2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5511,6 +5511,8 @@ in
 
   yosys = callPackage ../development/compilers/yosys { };
 
+  zulu = callPackage ../development/compilers/zulu { };
+
 
   ### DEVELOPMENT / INTERPRETERS
 

From 9f2bb2ed42d77ce5d524e1d189ae4063e6d0e570 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Fri, 20 Jan 2017 01:36:55 +0100
Subject: [PATCH 510/727] dnscrypt-wrapper: add service

---
 nixos/modules/module-list.nix                 |   1 +
 .../services/networking/dnscrypt-wrapper.nix  | 187 ++++++++++++++++++
 2 files changed, 188 insertions(+)
 create mode 100644 nixos/modules/services/networking/dnscrypt-wrapper.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e99e344b932..4ec4c5a6f5b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -370,6 +370,7 @@
   ./services/networking/dhcpd.nix
   ./services/networking/dnschain.nix
   ./services/networking/dnscrypt-proxy.nix
+  ./services/networking/dnscrypt-wrapper.nix
   ./services/networking/dnsmasq.nix
   ./services/networking/ejabberd.nix
   ./services/networking/fan.nix
diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix
new file mode 100644
index 00000000000..85fac660d52
--- /dev/null
+++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix
@@ -0,0 +1,187 @@
+{ config, lib, pkgs, ... }:
+with lib;
+
+let
+  cfg     = config.services.dnscrypt-wrapper;
+  dataDir = "/var/lib/dnscrypt-wrapper";
+
+  daemonArgs = with cfg; [
+    "--listen-address=${address}:${toString port}"
+    "--resolver-address=${upstream.address}:${toString upstream.port}"
+    "--provider-name=${providerName}"
+    "--provider-publickey-file=public.key"
+    "--provider-secretkey-file=secret.key"
+    "--provider-cert-file=${providerName}.crt"
+    "--crypt-secretkey-file=${providerName}.key"
+  ];
+
+  genKeys = ''
+    # generates time-limited keypairs
+    keyGen() {
+      dnscrypt-wrapper --gen-crypt-keypair \
+        --crypt-secretkey-file=${cfg.providerName}.key
+
+      dnscrypt-wrapper --gen-cert-file \
+        --crypt-secretkey-file=${cfg.providerName}.key \
+        --provider-cert-file=${cfg.providerName}.crt \
+        --provider-publickey-file=public.key \
+        --provider-secretkey-file=secret.key \
+        --cert-file-expire-days=${toString cfg.keys.expiration}
+    }
+
+    cd ${dataDir}
+
+    # generate provider keypair (first run only)
+    if [ ! -f public.key ] || [ ! -f secret.key ]; then
+      dnscrypt-wrapper --gen-provider-keypair
+    fi
+
+    # generate new keys for rotation
+    if [ ! -f ${cfg.providerName}.key ] || [ ! -f ${cfg.providerName}.crt ]; then
+      keyGen
+    fi
+  '';
+
+  rotateKeys = ''
+    # check if keys are not expired
+    keyValid() {
+      fingerprint=$(dnscrypt-wrapper --show-provider-publickey-fingerprint | awk '{print $(NF)}')
+      dnscrypt-proxy --test=${toString (cfg.keys.checkInterval + 1)} \
+        --resolver-address=127.0.0.1:${toString cfg.port} \
+        --provider-name=${cfg.providerName} \
+        --provider-key=$fingerprint
+    }
+
+    cd ${dataDir}
+
+    # archive old keys and restart the service
+    if ! keyValid; then
+      mkdir -p oldkeys
+      mv ${cfg.providerName}.key oldkeys/${cfg.providerName}-$(date +%F-%T).key
+      mv ${cfg.providerName}.crt oldkeys/${cfg.providerName}-$(date +%F-%T).crt
+      systemctl restart dnscrypt-wrapper
+    fi
+  '';
+
+in {
+
+
+  ###### interface
+
+  options.services.dnscrypt-wrapper = {
+    enable = mkEnableOption "DNSCrypt wrapper";
+
+    address = mkOption {
+      type = types.str;
+      default = "127.0.0.1";
+      description = ''
+        The DNSCrypt wrapper will bind to this IP address.
+      '';
+    };
+
+    port = mkOption {
+      type = types.int;
+      default = 5353;
+      description = ''
+        The DNSCrypt wrapper will listen for DNS queries on this port.
+      '';
+    };
+
+    providerName = mkOption {
+      type = types.str;
+      default = "2.dnscrypt-cert.${config.networking.hostName}";
+      example = "2.dnscrypt-cert.myresolver";
+      description = ''
+        The name that will be given to this DNSCrypt resolver.
+        Note: the resolver name must start with <literal>2.dnscrypt-cert.</literal>.
+      '';
+    };
+
+    upstream.address = mkOption {
+      type = types.str;
+      default = "127.0.0.1";
+      description = ''
+        The IP address of the upstream DNS server DNSCrypt will "wrap".
+      '';
+    };
+
+    upstream.port = mkOption {
+      type = types.int;
+      default = 53;
+      description = ''
+        The port of the upstream DNS server DNSCrypt will "wrap".
+      '';
+    };
+
+    keys.expiration = mkOption {
+      type = types.int;
+      default = 30;
+      description = ''
+        The duration (in days) of the time-limited secret key.
+        This will be automatically rotated before expiration.
+      '';
+    };
+
+    keys.checkInterval = mkOption {
+      type = types.int;
+      default = 1440;
+      description = ''
+        The time interval (in minutes) between key expiration checks.
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.users.dnscrypt-wrapper = {
+      description = "dnscrypt-wrapper daemon user";
+      home = "${dataDir}";
+      createHome = true;
+    };
+    users.groups.dnscrypt-wrapper = { };
+
+
+    systemd.services.dnscrypt-wrapper = {
+      description = "dnscrypt-wrapper daemon";
+      after    = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path     = [ pkgs.dnscrypt-wrapper ];
+
+      serviceConfig = {
+        User = "dnscrypt-wrapper";
+        WorkingDirectory = dataDir;
+        Restart   = "on-failure";
+        ExecStart = "${pkgs.dnscrypt-wrapper}/bin/dnscrypt-wrapper ${toString daemonArgs}";
+      };
+
+      preStart = genKeys;
+    };
+
+
+    systemd.services.dnscrypt-wrapper-rotate = {
+      after    = [ "network.target" ];
+      requires = [ "dnscrypt-wrapper.service" ];
+      description = "Rotates DNSCrypt wrapper keys if soon to expire";
+
+      path   = with pkgs; [ dnscrypt-wrapper dnscrypt-proxy gawk ];
+      script = rotateKeys;
+    };
+
+
+    systemd.timers.dnscrypt-wrapper-rotate = {
+      description = "Periodically check DNSCrypt wrapper keys for expiration";
+      wantedBy = [ "multi-user.target" ];
+
+      timerConfig = {
+        Unit = "dnscrypt-wrapper-rotate.service";
+        OnBootSec = "1min";
+        OnUnitActiveSec = cfg.keys.checkInterval * 60;
+      };
+    };
+
+  };
+}

From d79ea39d0424b2e119227aca78aa47a07de25f5e Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 18 Jan 2017 00:27:26 +0100
Subject: [PATCH 511/727] pdns-recursor: init at 4.0.4

---
 pkgs/servers/dns/pdns-recursor/default.nix | 38 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/servers/dns/pdns-recursor/default.nix

diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix
new file mode 100644
index 00000000000..70deadb74e1
--- /dev/null
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, boost
+, openssl, systemd, lua, luajit, protobuf
+, enableLua ? false
+, enableProtoBuf ? false
+}:
+
+assert enableLua      -> lua != null && luajit != null;
+assert enableProtoBuf -> protobuf != null;
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "pdns-recursor-${version}";
+  version = "4.0.4";
+
+  src = fetchurl {
+    url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
+    sha256 = "0k8y9zxj2lz4rq782vgzr28yd43q0hwlnvszwq0k9l6c967pff13";
+  };
+
+  buildInputs = [
+    boost openssl pkgconfig systemd
+  ] ++ optional enableLua [ lua luajit ]
+    ++ optional enableProtoBuf protobuf;
+
+  configureFlags = [
+    "--enable-reproducible"
+    "--with-systemd"
+  ];
+
+  meta = {
+    description = "A recursive DNS server";
+    homepage = http://www.powerdns.com/;
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ rnhmjoj ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbf1abba565..e480145dc1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11666,6 +11666,8 @@ in
 
   powerdns = callPackage ../servers/dns/powerdns { };
 
+  pdns-recursor = callPackage ../servers/dns/pdns-recursor { };
+
   powertop = callPackage ../os-specific/linux/powertop { };
 
   prayer = callPackage ../servers/prayer { };

From cfe41966963e0c7c0911b75cf77c6f3308fb2793 Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Mon, 23 Jan 2017 08:54:11 +0100
Subject: [PATCH 512/727] nagiosPluginsOfficial: configure with ssl

---
 pkgs/servers/monitoring/nagios/plugins/official-2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
index 306dee0ec62..6e4de51963d 100644
--- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssh }:
+{ stdenv, fetchurl, openssh, openssl }:
 
 stdenv.mkDerivation rec {
   name = "nagios-plugins-${version}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   postInstall = "ln -s libexec $out/bin";
 
   # !!! make openssh a runtime dependency only
-  buildInputs = [ openssh ];
+  buildInputs = [ openssh openssl ];
 
   meta = {
     description = "Official plugins for Nagios";

From 016bec0e5ed69b6a03f4b53710adc3de9d9fbda0 Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Mon, 23 Jan 2017 08:55:05 +0100
Subject: [PATCH 513/727] nagiosPluginsOfficial: 2.1.4 -> 2.2.0

---
 pkgs/servers/monitoring/nagios/plugins/official-2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
index 6e4de51963d..897182fe225 100644
--- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nagios-plugins-${version}";
-  version = "2.1.4";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "http://nagios-plugins.org/download/${name}.tar.gz";
-    sha256 = "146hrpcwciz0niqsv4k5yvkhaggs9mr5v02xnnxp5yp0xpdbama3";
+    sha256 = "074yia04py5y07sbgkvri10dv8nf41kqq1x6kmwqcix5vvm9qyy3";
   };
 
   # !!! Awful hack. Grrr... this of course only works on NixOS.

From d79fa8850aee6c542e11892eee9364ba13d1a654 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Mon, 23 Jan 2017 10:32:17 +0100
Subject: [PATCH 514/727] Fixing the wrong Git Commit hash in docker version

`DOCKER_GITCOMMIT` needs to match the tagged commit used to build the
binary. The current commit refers to 1.12.1 and wasn't update each
time we updated the package. Using a variable near the version and
adding a comment so we don't forget to update next time.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/applications/virtualization/docker/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 2391775af42..7c0475697c0 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -12,6 +12,7 @@ with lib;
 stdenv.mkDerivation rec {
   name = "docker-${version}";
   version = "1.13.0";
+  rev = "49bf474"; # should match the version commit
 
   src = fetchFromGitHub {
     owner = "docker";
@@ -79,7 +80,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     patchShebangs .
     export AUTO_GOPATH=1
-    export DOCKER_GITCOMMIT="23cf638"
+    export DOCKER_GITCOMMIT="${rev}"
     ./hack/make.sh dynbinary
   '';
 

From 17af9e98aecf9588305b9a1aa0495ad433576e76 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Mon, 16 Jan 2017 08:36:54 +0800
Subject: [PATCH 515/727] terragrunt: 0.9.1 -> 0.9.3

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

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 4362d7cff90..aad37ca4d56 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.9.1";
+  version = "0.9.3";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "19im4sazw09854lnzalljwx22qswly8ffyys3yrjkd2l9vfxfly3";
+    sha256 = "0i6sqgyxhi6icp7nps9prc40m9wsbr71v967kgl2865sgb214rdx";
   };
 
   goDeps = ./deps.nix;

From 28f3b62efcaadb28290d8332bb8b61d636e69d03 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Mon, 23 Jan 2017 19:05:26 +0800
Subject: [PATCH 516/727] crystal: 0.20.4 -> 0.20.5

---
 pkgs/development/compilers/crystal/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 7162f85e05d..6202a8e968b 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_39, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "0.20.4";
+  version = "0.20.5";
   name = "crystal-${version}-1";
   arch =
     {
@@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
     url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz";
     sha256 =
       {
-        "x86_64-linux" = "cdc11c30235f8bd3b89e1fc13b56838f99d585715fb66563d6599026f5393e37";
-        "i686-linux" = "93e7df2bea3220728987a49a2f93d1c615e2ccae63843e0259a5d891c53a0b80";
-        "x86_64-darwin" = "3fd291a4a5c9eccdea933a9df25446c90d80660a17e89f83503fcb5b6deba03e";
+        "x86_64-linux" = "fd077c0a727419e131b1be6198a5aa5820ecbdaafd2d2bb38be5716ba75b5100";
+        "i686-linux" = "e3a890f11833c57c9004655d108f981c7c630cd7a939f828d9a6c571705bc3e7";
+        "x86_64-darwin" = "79462c8ff994b36cff219c356967844a17e8cb2817bb24a196a960a08b8c9e47";
       }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
   };
 
   src = fetchurl {
     url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
-    sha256 = "fd099f278b71bbb5cad1927c93933d1feba554fbf8f6f4ab9165f535765f5e31";
+    sha256 = "ee1e5948c6e662ccb1e62671cf2c91458775b559b23d74ab226dc2a2d23f7707";
   };
 
   # crystal on Darwin needs libiconv to build

From cce6f3546301e6b3068f82fe54046055177fedee Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Mon, 23 Jan 2017 11:25:41 +0100
Subject: [PATCH 517/727] scotch: specify flex version

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66e6208223f..d17bd889df5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17273,7 +17273,9 @@ in
 
   scilab-bin = callPackage ../applications/science/math/scilab-bin {};
 
-  scotch = callPackage ../applications/science/math/scotch { };
+  scotch = callPackage ../applications/science/math/scotch {
+    flex = flex_2_5_35;
+  };
 
   msieve = callPackage ../applications/science/math/msieve { };
 

From 28c3d7f868b3ebe8b542dbcaf9efa72d355829a9 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 23 Jan 2017 21:12:22 +0900
Subject: [PATCH 518/727] firefox-bin: 50.1.0 -> 51.0

---
 .../browsers/firefox-bin/sources.nix          | 752 +++++++++---------
 1 file changed, 381 insertions(+), 371 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 8e424ea80b0..da057f0e237 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -1,915 +1,925 @@
 {
-  version = "50.1.0";
+  version = "51.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ach/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ach/firefox-51.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "fb941dda8a38f2e8474b4c1b235b4d3b2364a3e4b70f929cb40a6bc96a8859a830b072a0b3bb03bf7d551bec6eb0c46e41a93f7ebf4fb73a21949b824ab09084";
+      sha512 = "28041c7cb96e90ba3c9fbe689b000f56e144543b83f1280da785f70a299b229c72638f206425049ecefdec5f33c66fbc588a2032c392e637428fa03cc5cd9fd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/af/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/af/firefox-51.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "9ca21be569db94f528dd74ae269e9a0929f9a73b399ad619066c45f38fdd04b511fd8126bcbdca7ad0d6aeb7ec82d597287ef168c04fe1c7a47d9dd4fec3674c";
+      sha512 = "73196f42a1932782a7ae682c461a1c0f443b7369c4c9d74e4f45af73db5d0ae6926dc8055cdabc68ee63dc669e8846b5a529bbc16759b0160119ee750eace1c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/an/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/an/firefox-51.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "1899bd8140e847c6458b23bb0652bcfbc3cc1a6a9520ea10546d6b2f6719715f18ef5e79af07b68fe2cb5f50bb7f7c85376f17081478990a7ba907c45a31cc95";
+      sha512 = "eee39ff92c9354b4d6fcbf801e899f123053a6509e9cb857ff25e76e198d8c71d2c8979b7bab8393ab130a3518f564d1ca5e2d528432168f2e679f5cc3b0755e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ar/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ar/firefox-51.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "d3c5e6c263ed1a0cbd535279d03a446ed6e59471c7949d381265056e7dc6bcb7df4abbdc13601b7b681185f66219676a6662e217510a13136d89dbdd6f8460a2";
+      sha512 = "cfcf6ad7e8aa2350207ccb26840757765ab702ab414eb6c657a58cc5ff8422089fcc6544149278d627cc397cc5797c42a44f0bc18fdc2a961379e58cbeabdb9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/as/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/as/firefox-51.0.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "3b0112c8830fd9e90301efaff5d8414cc3edac9382947520ab1c283ebc4dd897ccc3102d12d35eee60fefbdd13329a02f056375fced5bf45a51895a7abeb48b6";
+      sha512 = "7e2b8862528b7a58ee598f56069f6c685cb23aee23f5aa708b4a3fd8c6164dabc5b3cdec418aa2280fbf3948980b5cb9bb6980ef39ed9c96568ad791bcf7873b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ast/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ast/firefox-51.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "b036544990cc08fc0588730780fefe9bda82fa1ffe53b0d7cc0cce60f5fbaba261fbeb6117ecc4b18985751572a5c08f8cc30e9b35291841694a180e0d5e75c5";
+      sha512 = "ef636ef3f1b6a258dd01e1df91b6beba0d8fea6ce3ce09b62e6702fb145bf670a91df0faf23604d066f44e4bfef11c89e34951cc9993bee7be6ddda966f10f22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/az/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/az/firefox-51.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "4beacaf3cf371bf7226095916f3e0c8f4941e32dc2ee6b25368cee6569dd102131cff4fef53f9ce88706172e838dc0a916bc741ae22bbf3eabe293fde3350e67";
+      sha512 = "0527b6c09d9cf6d785a17d3bf7934374f8d9f8470bf7aea884040bcf1faa29c1038640840dff6bfdba8786796d42d41b5acafc724e11af9cc654377d7dab7b3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/be/firefox-50.1.0.tar.bz2";
-      locale = "be";
-      arch = "linux-x86_64";
-      sha512 = "e249554f4ed1f1434b3c0b51736c9739817f39db8afd70cf60a7e3ce5a78dc6a23ae903b991f342bdb93b4324c5c5309bec4e84313beb5af94d887249619fa79";
-    }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bg/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/bg/firefox-51.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "cc4ecea41635b921a652684d7bf10f2e200aacb0c18e50a95f0412c049db26042c0cfbf6d40fabd3db5aedd7ffdca4633827b5f17a27b56766b372420536b593";
+      sha512 = "91d97992a0382b36c051e6b82f41121464df8ab9a24addf22c402a660b0340babb3a03ba5ae2144fdae6fd89b7960c542d382a116d303c1b660e8c58b22dae38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bn-BD/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/bn-BD/firefox-51.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "75483d1f7a5bf3fe54de817222f78aecd4621cd1a53c330cda74348ca6569bfe3bac6b60d628abe4632c0e68b9a9e6f0c24b69bb3ac09e52023ee352190d1cf3";
+      sha512 = "0264a2989ce61684eaaeb68f9a55f0498c58e621e39c89d3b6b54d17e95b8034d00730858a13bba685fcd24bcbdc9751abd10aa0a4bc528fe7a215c578c4f20f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bn-IN/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/bn-IN/firefox-51.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "5b378bc2874cc2fd0f3c739048c894670ed7dfb6e0f37e7de324261c5ed62bc75e62a26a1b2b4392858d86bf2314534841eb8676aeb0bd0e4ce6c23432b4b4a8";
+      sha512 = "f7023475fe832243845d5200fe0ed14fca9be37f6dad21075eee0b40361b5b30e0859a5878063099975ccd06e89ba431c277243f48b8d21357066f9fe73c4c97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/br/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/br/firefox-51.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "eb33bf820530e267a5b5c322951563cf66c886bd71f30d6aa8cc43a2a9b16b6e58d207648b68fb1f2c0d1fd645aba6292c6d8674a3fef7c23f3d2ef706973ab9";
+      sha512 = "824810456fd3d4c0b705d8adcbd6a87aa03373f24a6282011c010e88c1bfb19854695c8989f62f432004c7f84bb517f3849454f06748a7f9c73b99035e64637a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/bs/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/bs/firefox-51.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "aaa4221204b3f736e31fee50c30e73a919066f8cd1f25bf4fc42532edd0a87c557a10f11e275e8b8d2396fe876b8859760d952a311caf0bdfd967e813144b86b";
+      sha512 = "d71a70756807065b64ef25f359913d292b92220e3e6a76018478c592f10f31bdfe393fc8067243274d17a51bb7d37cf2f2c80dff05d00eeff9b5c4360b8204e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ca/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ca/firefox-51.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "e98b08fb0cd937375fd7473617fd234659fdd08d1299f0792efb9757b356447c479335bea765b0fad902d3b055569fe491a30b73d3f1c3d32c76c3cd1e621ab8";
+      sha512 = "0bac177c381cb9a40e5d58280e29ed7a143ee3c9f49c35444066c14191ba14fa45214ffd830a8ca7e7f01f8a029f93cbc5bf2c703f8fed8761abd2a800153697";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cak/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/cak/firefox-51.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "e8a5ec70d52574929edfe93064f03d254e894a790093b2ae86d3f34376db646366a6970d06eaf3f3fe5cfdc89a8f11d0c289061f41d66d7602c0a841cf589428";
+      sha512 = "106ae220caec8528c8251a4dcd785a7ed11621968b35964b1e5a5c5eac6dda8540b63fef2c4a74b6f33a2ce32c7e34ce8d5cde18b4951969b2a7dfc1b11a27bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cs/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/cs/firefox-51.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "3b5e7ea9571eb8ec0f66ca9d062405e3efa874cfa6d39bc455a14f1f25ce1923b276272deda191ddec085d52042ca8cb633e89a8e908ecc428b0d8c3877b08cc";
+      sha512 = "c42915c13ccb30025d29582ff10b52f69681e44c835a049cc4d3ccd2d554da9f02d9286e2f49f1b14879474c18391dea539cd407e4aa8daf2586df42ef242415";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/cy/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/cy/firefox-51.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "78b0e26cdff7f123c6ed3721066ad7f5e9f55d0aee5d1c87c12927ae87fadb8f3e1021193134a83fe5c23c62c68cd9536151999c1ed66a885e12a4dcb4b12fb0";
+      sha512 = "6fc312a3e0303a95e0e00d1e22d9c347decb3764e568dddf871ca87becece14fd5d2ad3d064ef03855b3c498237ce68377c1c8bb6881fd897b7a041637e95023";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/da/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/da/firefox-51.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "de0f78b0d69c292c482edde52f728df7c3d865f31b8b9633d4ca5a66b4fc5f272402a0715baf5efcf14eba683f8ff633c172a5a198906991ff1735db128816b3";
+      sha512 = "0bb5b30f76fb68e27ec653e627874e9d3828ae419d968b0582197d5db2cf0454c466feae4cc884daa2e2cf4e47b77da76ff2f9e554f5a25f0dff743d7b14d2ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/de/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/de/firefox-51.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "f95e36a8393d233409b1c3ae6b56b08fbc44d4603bc932cbdd1897650d1528f57cade92b1b1cf3717191c95db54380ba3c11fbb46b25c14a514e0a00fa5b2a3a";
+      sha512 = "631774f6e95d0e0c9177c0cab012b9b9618b1cdc69489accf4dc535db19b6b64f388e510a5adb5a6bb06fbe0a2f2518747eda2a2361dc4d444db9302bee67256";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/dsb/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/dsb/firefox-51.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "a06f9172490ac731f06701fb7f8414438c1e520bbe5669e8dae54697dc9cc3aa03837ee8f84dd1b69751a4e8d82b34f88ef3c43a37ad9fe6e0c8b1afd18956d1";
+      sha512 = "ba2fb7fb575df8f873ad4a6f7d2ca9c3f5ba150e2754d5f7c8fca637cc8c71198b8ed400d9654b1ee9348c6a39d7e9f501f7e56d9cc6b4cf0c962257c200bb66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/el/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/el/firefox-51.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "78e4a2fc29487347eea47069e022f13482925ce15f37918455a96eb68fed50152ef6a9a93773c4acb680957eded79c0b20883d86f87ac28895d61d777dc07cdd";
+      sha512 = "4256085411d80fe590fb678b186be0a5422502b8260ffccc3f0e01486b4a463d23821c50b2c92e7dbeca26a3a8473f4a4972c6c752c3f4997ec38d69f959d950";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-GB/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/en-GB/firefox-51.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "53deaf16fefcb954b34ce8577d0ff40d2d497c591765a16c7befa6ded348eb997e1523e873775a52a74e47c41ff06cbad3c612722036b6dce538d768d1659886";
+      sha512 = "cc9ded644135ad6362ef711cb96b84fbb57033775009182106d3681492cfc9df366408ac03f2494c217e46b368075f5f81642f3de17d2ca936867ebc7e03afab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-US/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/en-US/firefox-51.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "f81b63d9737c672958674096a69c941351caa335d481dbe39ebbe051153f0680f2d3ab4832267eb27ede36b8ce8242e43374ebb49d5cd3a0c44a813efa8c7a22";
+      sha512 = "b585f100d3b9728dd3d1922f12385cf4ffd025ef5ab72a9b0a84e6cc6d4a77bff48bb184f7de63e1d5ac40296a301c2be9607fc502539b89320463c310ac89fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/en-ZA/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/en-ZA/firefox-51.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "6e1247ccce230fd044f0fbc64deb345b7d82cd347595fee084b8ccedaf31071b992b988346a8bfc5e5af8a2706a47b7e4ce2681e67a11098eefb7895a73bcdd0";
+      sha512 = "5435a360bca5dd865d4f1dc51f6d93eed6bf71abbb6c63d416934283878c7b0d05c212e60c1269c58d54438f9b3219b6599a2d95e80fc915f1f627a3b95d3635";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/eo/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/eo/firefox-51.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "c27c51252c8312f4280dcedb94906296c52c96c26dcfa21fa392c80b0d1277b8d7507daca312c69192cfd6fa70273f66a3319788bc3ae8b8e835af365f3e8fbc";
+      sha512 = "d5ac355f4e9e08dcd0782e7bef428e6606711673353b5159b1fa153f32dc9c4df53bfdcdbd74aa8e9420c7b8a13d8013778c4bf31b59b4913d1447f901cab25e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-AR/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/es-AR/firefox-51.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ece5c060bbc1809a5609dffbc477ad215245eef1e341232d2516859f1f15959d117e2728605ac57bc94fd6ff6a5b85a892275552ac0b006783d4a1d0f02fa26b";
+      sha512 = "1a173345039821ccb0bab091433523a6eb3c485b7f5083bf41d830576d63cc983d354c473971e174af0de724791be31b57f1de371a8386957c5dd3319b25b0ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-CL/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/es-CL/firefox-51.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "2df20afb64fa6d25678bb6dd91f7c042c754aa241af4e3f728d54526edc342b4e6e591d8586e9cfbcde5baeb932e092c00feabe5e3eff1f00e5065a80f0fd097";
+      sha512 = "9c43565a6bf05ed30a8a79b12ca5d88c30c98bb96949e32c688be9b994bcf9f1ac3a2c670ba8afbbb25c19e2921b046278542068e1918b3ff59ac3b0ad5596ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-ES/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/es-ES/firefox-51.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "5b9af2b2664caeaa574ca92d4a63cd0a86a70278f63596e6a7fef0cab3fa4dd22d1c00408e067080979d9b9017f2edd9a3e1e22b3a75710017ef94bb1ba82bb4";
+      sha512 = "6bcf1b218f940a2c0ab6fc9f899d63555e49e45907dce4026312a767708662032c5c6f8b9958d30ae4adc97d037018407d91cf69c4993a8865ef92f3e8cdab2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/es-MX/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/es-MX/firefox-51.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "610462c6841615e2241a3edde60333fe3ada9897dc7ec8bfeb1771025a5f9aa0acf9fded1459938c70c7fb478f659817606a133af4b38019a3dfcc7fd3b3f9dd";
+      sha512 = "1092239baa8016968dd8daeb69f6891f12ddc572bd1010c3800d07598a1a7596ebf8d68d1e6d3de4db33f4dd003a463d9ffe69c3a841c65ceaf44133c5eb74e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/et/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/et/firefox-51.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "2fa4a1683102849ef33c7a149b7628a3c783ee2466d733b328fb8ea4e1ba96917b128a00ad9a8fb75cec181b0208635667bc16d959b28ac1a4af7c96af10e07a";
+      sha512 = "4fb536071e23f2f55674fe790f3dc567c2edabb529c0d3b52b07aa02d9898f3b2d7c7cb694bf22a8e0f921c62d4f33b1ddfc6ee9bdafa42a9405e497677628df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/eu/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/eu/firefox-51.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "0b53f26346f16dc06478bad62a0191fb2c9c9fdf2864e0d5332540eaa81a4c22b0492128df5c8d7eea9d122482986b3f97837538436730b4ddfcd1c02098d1ed";
+      sha512 = "cafe7b1ce89402c961d90c5f28e14ac05884da13236766b04c444f61b3fe259e5bde9460c31bbdad2192b5e1712b13578a165a49a08879fc251d0e6b3c96cc19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fa/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/fa/firefox-51.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "6e6d92624e89214a4110bfdfa181e46847759bb0735e18ca0fcd4b9e333b40b91f8ca48e271b3d1ff4fadc05cfce9824435dbc429f56dfecb6d98e48ea0a31ca";
+      sha512 = "25b2834300a3b48e9cea461dc3b2c5513e81c6b428a96ca7c89e022cfeb4435cad0ec1fbb22806be0adf971c728ff2152e7ba097e0189ace7e15d083670fcee5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ff/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ff/firefox-51.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "59865504f50aa5e5aa2bfafa1159623dd54b91e3cbcc0cd76ae84e8da063e6db11e2594b9448e5ee75fdd15188c5ba9daf335eafa13601ad942e8f6f4d2bca26";
+      sha512 = "c4eb46a438a5174de003c9ec24cbe9de02c3ca66b485e74fb09f1e6cc2c558d4b45df58fb8fb5b97fdce9e3ea4c473d7568f5d197a2e5ba0c27317204a76cf78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fi/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/fi/firefox-51.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "6e07761ce3aa5e42bf887ff13a35619e3e20209b94ed890b505c1f0fd79712a2daeab53ea344378c18f6f05c4673e1f146e8f6a44d325ba387ea6967188357cd";
+      sha512 = "5bc78cebb1414049625da3e3f9f1b33ed8efdc01d4a0b29d2b5c7c69c8b7b4639fcca89f5d75f434c28e3235613094f1e51d35a0bfb9943ebc1993360f8a517b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fr/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/fr/firefox-51.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "0abd50bc0a7d5a79b98900cbeff95827c46dc53163ee6cc9220f234049ec43c09bbb8a283c54a1a41387be8d0ac761fd9e215d37ad234a0bdd088b07e339757b";
+      sha512 = "aeba94f928e6632db44e181e3d6aa8b53943f59effa5cccd2bab5b7141c17c6362adbbfe5a28f0e4318adee9d488c336591cd602a55656b966f57312e20798be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/fy-NL/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/fy-NL/firefox-51.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "2a272b160a2cde4d27f3f3da7a1d6600f4b78af11ecfcfdb3f3596d6a4a1f56b19cec7fee1066afea050b951e1eb7f3245dae28b0a91ac4110010c122609dd58";
+      sha512 = "952b0cb604cc8f3ca39bda118c543aeb1a7dd25d266439c56bed600e136864251ffb866915cf8d92cb8437cac0d9e1d6ec0a8468e89eb0c6df192ad21fb8aaab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ga-IE/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ga-IE/firefox-51.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "730f2c608d9770e2e4c154d6f1ec223290018d2412a1a6103245a71ef17876cf304acbb16e11915cb2e3564c08099a9207839dc8caeb0553cfdcbb869f6cb09c";
+      sha512 = "dcffd355c1d911a00cdd3ebaeae98e6fa5346934a6ef5b1f66c7698bc188878ab75686ae07d0cc885535bc674ab55931a03a60247431da53bed921ad4ef44edc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gd/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/gd/firefox-51.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "cde56f2453d780a9d0debcc012e9a139d61c1d78fcb2a4a7823982321fd65ffe6b538fbaa7a0e5dd69db6f1f3139e5386bd6e02ca5c065510a936fe35583872b";
+      sha512 = "50104f1ba8ebe3505488030de273b04b83568ade8d777fa5dbc75d4b74433f194b16d8e963ea56686563b6aed129cdf64d8db9bad34c68295c5457b3b66812c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gl/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/gl/firefox-51.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "161ee7b027f64698c30bc5147599853c4fa6b8f8629d33e4f11380cf4431835489e834cc3a7b42a676d9da6d6231e1e1bdc5f81f410ccf8f55f33c5ec3e07b32";
+      sha512 = "61436f89c5353e06c29b5aac6ba1ad1ceeab1f580a40643d6afc5f27801b1d67c9f5343bc2e3bc911547389d6b7ce81d75faf9c7882436562fff4fbcf379d057";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gn/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/gn/firefox-51.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "b4637e7727bc726acf3c1aff2c199fef896eb98f95a04b5b899b9800d0fa2cc6b23ae0c7b5a5acb591e49b03dcab22ef73840f129d9e82dc49e5636234fa570e";
+      sha512 = "14c0b3f085f3bceebd6a75e96efd71d6c8f5e50485f2d7b6b18fca42ded88f5f3b8b90afafda388e7b41cbe39ea2410fae37cbdf8ef0a32d8204ddb7ffee8b6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/gu-IN/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/gu-IN/firefox-51.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "b8028122a8132110fb951175d51d07c685c212cc56128788c75bd0c0d21452752e4fd03e6345d80806c8babffeed04f7cdc89b1b338f7d56e539b847c0da7f72";
+      sha512 = "abc5baa41ac6e41813c43838e94b68a63f83058cdf37d25bd315bfdcd27a2a294c91205ec0ce13e7b28508e0ca982bbb6ef3384007d8f857935139e8546b40a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/he/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/he/firefox-51.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "57adfc574ca5160ca5f95f98c76542109dacef231ad8cbcd4c75467bb599e922d6590cb3214f4e4946a947b36e6130b25f12cf4c641b2ca91a36aab5e8489426";
+      sha512 = "ca90c15c7100b40262879fbf12df5ddb440d4808d94679fa6cd32b9579582721b707843d4c65b4593414e139a7f360b437741c627c3b6e1b238994203a2580b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hi-IN/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/hi-IN/firefox-51.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "3a71226d56c373663401d144388d5c74e583ae34b4d05bb444703426991162392e338f11e993707a83943c0fe85b8a5192099b932afa03b9d3ff6a17903b1271";
+      sha512 = "a27ca89b01034d75719f0e736d82e8240e24cb5ac4e9a21829e72cf8ffaebbfcc6a8906ff1db93f392380481f160e748deda23685b12bcc647d7a6f68e764bfc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hr/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/hr/firefox-51.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "f919ce865004a64bcfd834475917ba24c1bfe0bf573e578984199085c073abcfce38b4e838d684f4cdf5bbc2408f84758df9f81345da6e0824f290ad311dc6c3";
+      sha512 = "fb91245060ff025230c3cfa45d15cb96974462642be3f86be44af108da966439575907f8a1b8665311ec599115a3dd66a4fbe09d4ac3f6c09a85bad64d7b2982";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hsb/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/hsb/firefox-51.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "4641225b3dcf328dfbe12af68698a4504d0882c1029a36aa617f57ddf11e0edd9cd10add1d887d2154a59e6fa60bb8b13bc185529df166c72195200ef94a5dd4";
+      sha512 = "d649432eccc384e4c83e292649008ffc87f82b41584d91d37f7c9ef4189039b4ef32f9209428051475671fe79961c2f142a6f44a1ab7d371e17a0bf34a58cce9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hu/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/hu/firefox-51.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "1f34d1d52d28413a46d5f9efa8d8067c41ec5af861f9fca49a5b59f03e6e325455883a2ee4f9c5e3629d7a61a3f1106f24b4bf4f9a75e6659cad4ec511024ce7";
+      sha512 = "a07e3b8c9b6fc306e068ab6311df45d9cad475561993fa8c576942a3c94ba5677b291d7fb1c390a2b48b2a5c199e25053bfef556d6361fa482a13e17204c7f4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/hy-AM/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/hy-AM/firefox-51.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "926a0a1e036303c53fb0a5c65ec2a0285d562c86eb7396f84fa5926a3b9e67ea7872af6d8d436322ca5a939d1626adad80230abfecdeefd51d5cb3b27e16cd5e";
+      sha512 = "246fe80d9e73aec2744534b16e211083277b40cb6fd894e1cbaeee9f94dbafdacf912069917945260208f2446f080c6c90daa91ef07b3485538b5cdfb26ea1d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/id/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/id/firefox-51.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "f3389014409d143a35c66d57974a77d1d811c3ff9d47f6f13b7c40c0f24154d42bb7e4908589de21b3430d44a108f3765792f7573c78e510292d824f96cc77e4";
+      sha512 = "79cb7fbccd0e6cc199c44a8da8a80fc91a195409145cba768edb02e07f11dfbac15774a67d6a088ed8569e46038b629e998185fa52e5d749d33ad1c91468c3e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/is/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/is/firefox-51.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "58f320b32ba9a83a6a8a4f4d108c3bd87a4879da7205dfae59b24a3550e0bb90917b431b15a18e38da0d702ee8f2c8756179ea07082ff6e0aeae9f51a3820246";
+      sha512 = "dc63ebf359f00a0ae47988e3ae868a92c79ee35de2e426aa9a15ae3fd3adc35cedbe957ac08e6a3af84ae0be9ead2d405ecf034c698626ef402e6eb01a519bac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/it/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/it/firefox-51.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "60acfa5b847b5390fb5b733f4a35a0a9c426c4126c53f517eae3e6fea3c6c7c88092063ae0d5d3be05a1dfbab32a1e392aff7f18c6566f827cdc6d21b0e22c7f";
+      sha512 = "34a7a1e39c4d03bd43d5613091b71e1c817fbbb235f801171220f43b71c3be258958e0aaa860ba241c1bd27e2c7d473310cf32e14b02ae4e757029d4f51d7214";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ja/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ja/firefox-51.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "3d668102a2f56547b49add2dacbfa1a8ac285007d47585325002cf4250465dae809b50ff1d1d13dcd3f05ce6afaf76b607a696004e60d33caf52d2d531297550";
+      sha512 = "a5b90e23a17e7c8582223e66565c44e9564575ece1df0a749db021405137c3b1593f6ca70c42bdaa97cc83e69d6799d84d3d3d1520f82ba236dd7c99190c0b0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/kk/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ka/firefox-51.0.tar.bz2";
+      locale = "ka";
+      arch = "linux-x86_64";
+      sha512 = "ae8f709eb4222ab67111ca596bdb466f92826cbddfa42cf5134b75773f40d6d7aeb8d384c8defc5469b569f21f4e6e8f2208b01f1e0e33d2b9cbe79f06527e4c";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/kab/firefox-51.0.tar.bz2";
+      locale = "kab";
+      arch = "linux-x86_64";
+      sha512 = "5090ad81a159dbddd37bba2c36dab62d5cc306c09d3df08562f625a43eb19c8c9456eed19290134ede37e882b2ee7be9b3ada037ce348827273ce05ae49977ed";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/kk/firefox-51.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "c35217a07255fcac9bdbfb52777bae3609c22984733297722c62b8391350fe2d68bea20b542d6d2d7f55fc18aa662da226bf83a62e0017c315b92eb460021cac";
+      sha512 = "01b58e772c65b233cb51dc9ff43d98c64727b02cd5293882271a25625728d9d1b2f61429ce157ac4e7eee17460722201f6d7b6fa6013d25385c76067136d963c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/km/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/km/firefox-51.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "fab7429671c3b866ddb7fd0d25101a4a83c6a1ee3822a57517b9c6288e35f6a4339f5a42d93f865a9c6ddf1a9bb5e2e23d8458b39acc34bc2701d68522feef03";
+      sha512 = "e54cc5c2516a79e4981addb237571593af0bd052ca8fc7ed5c7919524ff8ea73b2ff8857d9e6627ff3de5819722c13c3abf633759e9770cad1e04a2fbf28e1f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/kn/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/kn/firefox-51.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "2ea7a6094ad8f9b8179028820d79d003f5c04e9bd223fd2df19c7b5daa08ba631176775e9586c7507291aa34fc1c39510bd8851b1fd9a7a08c1786f689949839";
+      sha512 = "79c827a477cf369c57fb51708d1d889637ade4b4ced1d60f8cb57c2b69519ef2b3ca8730657691953e7c3d660f4e97a2fd5f0ee212430ed9be4e2d9c90339b0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ko/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ko/firefox-51.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "701a0873b860c62d18ab778d1b0e5c3719cd3e6b49ca37083983f9e3f988d54ebcb2ff27138d7a5e76c940f64f445f96143b0f836af4b9611999b3f49670b8c9";
+      sha512 = "66fe892eab193087be04ceef0a73fb5af5cc153b6218480a20f7ad32da45845a4d5e6a3f9ed130c6c8d2fd0de704c87093a9739233da444848b32b34f0d41445";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lij/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/lij/firefox-51.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "b394da463400ebbcb77cda8ed102f42eca419e896f0b95432e565f126e9e20aee0d9790888c691b9f7291322a3f49d44a58349f611ffc159d514a5a68f7013f4";
+      sha512 = "ae85fbb36573e547bc35ce92fa82d8fd8359a38dc218811ade333d0ba7d02da17ac45490edc4b1ecfb59b6dd0eae31fe9e21c8154ae443f36b52c46e9bf66c29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lt/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/lt/firefox-51.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "55ac32604ec630d2540a7cd2d2a46c4161650f1a3607c2e45ee8006e6bbec0039dd4927ef28c9efd70961f7f5c4d9d6fdc83dd60b670aaaff26c31594c25c813";
+      sha512 = "c9f9bdc80d2e4963c2e4416cc7387a4b5f1b95d5135870ff38d6be6bb01042647ff0df5061a91260dbf48b7a43bcad79d6b974e9e4df67bb0c55541027a9ef8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/lv/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/lv/firefox-51.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "df012ca9e5026661622b1d0a1230399e970809f2d8f9a3d81a9b05d438e7f20c706cbf739a229b82296db15bf8bda89c266051c56c7786a673e38600bfd81164";
+      sha512 = "5cac54d12457684cb5cd2ea03647f5bca8c75221837e4e241a4d86d25a99c3464f8f10f8489dc8afeadb4c47f8a2e0a73e78533362c488aca0987a61f75d040f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mai/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/mai/firefox-51.0.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "df74e2c1465b74602ba834cedbc3e07671a813d5979e6a0d85c32e504e01136a05f4915253f785f0b03fa98a4c284d066ff2101737f40490bfe9e30165b712e0";
+      sha512 = "274de5a51b2fe6696f3eb9372c7adeecf2e43b7c9e9a88c84cbe91c5cccd2a843d141cf89a816af3e1fc53e097da9902ca835608a3098a0b3c72bbc3cb0fe8e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mk/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/mk/firefox-51.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "68d80303625c9bf86bc2b86a38d9a41643416bea77445630b10a4219d725a9800fbd973e683c7dad46941fa089df6bcf1d07ba5fcf2c3739eede865eed038a97";
+      sha512 = "91f1b9336aaaab24aea8837c96214cf79c0be4e7e81ce4342751ab38cadb1f1fe294fee53bc3132fca971bb192eadd5e206069001d80391cfd35b00cd334c69d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ml/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ml/firefox-51.0.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "bd1168a7b3e17edc28dbc051fb2951d134c85637b0e0bfa2ac2542211498a8018f8c8a74584d2ebfc24336dc803ec04bfdb11d5975f261f8ad92cdda6dbc1067";
+      sha512 = "d48e26a22a81ff4655732f099aecc1c003d0930a1a73859ee13db4e866181e7aebc77d7fd816dab7c5574b0810089476682ef128c2fcfcc04750160a1e19b856";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/mr/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/mr/firefox-51.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "d62ab5e147d55ef1b02b4b4fa5b10986f4a8db2c6154d519f4704a6ad4eee99235219b5d825571c8e08128ecac84c1ec0dc19d124c83d608b4afb4606786e474";
+      sha512 = "bf8a614300090c4a24a37dcbf0d6b69cc114f346fd9a4b729f9de54be7a15440a49c46aac3a1b6b1321825d1e617bdd7cb2b1f48eb25bf9c6610d7040a1cef72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ms/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ms/firefox-51.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "e254c8a787f2dda76cc2929665b261437d35351d6725af6d1dbdcca514638800d199827edc8cfeafd927d4f0f758cd246ac47b9cef3011aa68fb0baaaa17c882";
+      sha512 = "8a75fd728889a5164d1e610241f558f083e3dbb107592cb26cd6c230b44f52d8d9b3859fca04c1172f128bd7d809171f170fb81118d0e8eb4c64e6e939e68d30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nb-NO/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/nb-NO/firefox-51.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "b9e53d23338b7d825e0eebce3764862abacaceb5bb40f66c3d0d67a3fffc2c1f60c168385537bb042bdc45d77453977ca3c95660cbe3a27c7c87b68d047ea782";
+      sha512 = "48b5e8bad93c5d6d7307dbbd790bdc9b5dd3e52a7b7f4f52d4598ccfe3fef97d36eed763394a7cb594682c1fbc8acb9e0cdab52f445ecc6f957bbb1cdfffb8ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nl/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/nl/firefox-51.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "0c8de38bdb5ee3636a7a633c57e9e3445374514014221086b9db106247ca08111c987aca889a416997ed6678cae81d1414636d0fc9ff4e490444041b53cb54d9";
+      sha512 = "bd964b338ae332b5db9b9c5a2bc4bda320eb7824bddc4b6df87a05987b7f82fd8ead21e190d1b6bdf4daad17896612554272170d0e00c88ba94d7f03ac45a33c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/nn-NO/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/nn-NO/firefox-51.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "4617abaa89c7caaf9481aca13e61629619b1b4a889a2ed652434c8c01d5b8ad9ad96de167f9d3687d303a8aca49492d7b6d7712f9497ae017200962cb229f855";
+      sha512 = "4e534e4590727582273ee97e3889ecd7354a02210678a33fb80403438718eac6a8c213bb158f36eac438b85821c49f4a2fb32a79601ea12573382fed28ef7a24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/or/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/or/firefox-51.0.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "27df7d794fa1693fb79aae60ec72004cdc3fffa9eeb0662e71aeb639e46b6a4c740e08227e5e334e6c0167aab95de6310f3142bcbd3eef089dedd5eeedd29f8e";
+      sha512 = "92c182fe90312ad1f603cda7989b0e48be790c2f6cedb6e184fe85cba1d8e06b2fae309af86691676c305709fb08553c8ff0b32021b427184419aaf45e396eeb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pa-IN/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/pa-IN/firefox-51.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "33101ba56588e23bb5cbd66bf8fd90e66e2fa382f4fa6b3b5d9fc6a1372957ff4e01a7a01b697ee694c589573c9a5f1e605f205bb17ac63c5b5faf8545879376";
+      sha512 = "8ae2a4d0b8488cde54668b8b49895b67da9f43dbd9524b503fbb552baffb0714518bffc1d3f9bb94c7e00386ff5d2431a4fcb1cb0268ccd65b7d69057ba65bbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pl/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/pl/firefox-51.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "373d3355e980a3dbed1cdf8099ba31e370b270402181e61f6e1a829c2f2d9b7b73a9ebbe074e59f21ac3f934898c9c23adb0a5c09c7637fb6c67c3093bd46fbd";
+      sha512 = "26380ab557d16082ed012dbe781a168484825ac86396ef811ef043296c45569c89e38065708770633d603d5f4fee7e2637db00a2bc1820d8dcbf081cc39dd673";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pt-BR/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/pt-BR/firefox-51.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "ccd935e398095d3b79e2a86b8181e1aa1988fa6a1e12c879d50457756b62ab3dea3087e8de77c7cd98dead6b0078598d22ead36285559af041254bdb454eafad";
+      sha512 = "50761924143f0b619d47f93df04ef38d7cb689230d5b1dbc1385211f3f2a808816a73a70a75c4bb05b2ab8bf1ee0c1905c396338d12b1b9588830e19a1ed1e3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/pt-PT/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/pt-PT/firefox-51.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "a8adaa40a2fa564663173641b3dc3d5642c8c3909a8c14904213c9e1cf9bdb4f03dbd44412bed023b02e6eae63bf56fcadfef0907a168879121811bffb9b9ac4";
+      sha512 = "fc4b858423b8d0d4c5ca93951548487070bc4f398c993ee88e5d51c82ec808468d49f32f80a9754d459844a208183af4774d69214bee3253b53b2aa64e29d08d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/rm/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/rm/firefox-51.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "ce37bb7d969c0fc31c2bfed7ac143e5a6d7d8035a748c5b3eb9a23dc62917ed9ad9b028a9db0b5dca156eb99cb36c763eee39ca893e5a314233e5bf4ec4dbfee";
+      sha512 = "8680c7739422ac11f1f5728a5822376096de49c01005b25906513ed9eff262a5a038f4d69e2fb3d049b7106c9e1dca5c307ebdefd07ae59b11a3cafe13174481";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ro/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ro/firefox-51.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "339120884b8add14d36fdb3fc3ca1355074b0f8a0a87577d1616c392230342c7361859126edfd959e11ebabc6b86c496b440acea679c61e07df59e7e298c47ae";
+      sha512 = "2d5c66437d2edabd40570d2ff22b146ec3583b7c40bfb8846ccee1b2570f876ec62dd6e3d01d3df59ba5828c910cc812c0c4f3c9ab1f872a19bccabd2f69e450";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ru/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ru/firefox-51.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "59ade7f2ef86f412fa376e4fa6a9d7e72cbfabc10e687c7c0bb7e4b4bc2324d7e97e86075c1d7e12480b9f1dd8bffb5e4723f4183882976cd35c4ccf6f2b4726";
+      sha512 = "4ccab70b429afd51f14e398181a08549426c1c73d58b3610ed36a93675ac34f72526f01a1fa3b0d1d6a9d3e9c42503759de73877c5e70bd53a0812da2eca3bdf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/si/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/si/firefox-51.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "4a74944879e40876515e03b1dc2261998bfa2264e074874f886a979de5b48e453c7cbd9a020e8854089b77ca5b5182fe13c685b33991e81c7c533246f87825e4";
+      sha512 = "113d34f2819b4a315764128a4dfdd83c521df2c91bf2bd7b264771b6d475a1a051396d5f6382d60d6f521513c265248f54041e9fe45f0f40a6cae81393cdc77b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sk/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/sk/firefox-51.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "b1440e76e19ef3ed6786f9a40330881bff498c7ab20030189c3eaed293e1ffdf991172251da1ac5d512da4897f2a46f3e0921436d86d9178d96387e33e82708c";
+      sha512 = "d6ff2bdd96f3a3f3f14d45bfb28b08a4db48db3be570c19a79ce226f243366e698aeca1b1682ad216c5e0f9d0edc6c2116ff01c6bd13394325e922d8afd3b98f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sl/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/sl/firefox-51.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "abd4e6da09005698655e2fb2bb749be35f8b9e8302ba1068e20d27e158c4ae57a0f1cb277a87a2229e4e815cd9d4656ab32cdf0614c01deab572e6c8749d4fb2";
+      sha512 = "296fd1291590fa677ac0208f8d555586b5377a575845d6d7e066f46b541e523166b4be4ea10c69cf4fc043abe2c73a34d1dc670582b49dbb15588edd17d15ee3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/son/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/son/firefox-51.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "17d0444a559c7a5331b93bd314003d84f853fba791efc2df6867becabab9fb7d02bba964d208f44f31af1dfb292cfcbd4de7b48454a7e83668bec26139be40b4";
+      sha512 = "fd3462198ac73d24db0e17a8bd427d3798adeb6af82a775655265e91bdec90e53c49a7317ad98609f24a77ca540cd5864bbce2283e0a82c64d0107dc2a6cb7a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sq/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/sq/firefox-51.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "c416060454550ff04086aba74173500a41c4e592246eb524e682f082a75173a6752e982993df3ca096c176c0a75ed5f26a22414df5e794a042dbeb2a0de22413";
+      sha512 = "a8428c4061730e089621551006e28c7caa6381e43c443e40a03a91fd5bce72ed608b5e49a309597547913767e147efc4d7be37e645f6372bace1b445cdda76b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sr/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/sr/firefox-51.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "f615964e4d87b74dadb841993b3c62d6d683a66ff6ed1634311f58e9c7dc522ed9f2a271a043f7ebaff37f3c1a563d862d7abf22af1015d720979f7459e2ceaa";
+      sha512 = "2f946bede46671690652c44dda2df106d0f56c4af7a40f61c827b7a7c2126abe3082843eede2fba251efc62c2466cfc42cc7ecc63cd63062ccc2d052ceed21a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/sv-SE/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/sv-SE/firefox-51.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "4aab1caa825e685923c7c3a32ecf664e2e8cfc2389f48980f51eddaf696cd9056afd944a950dc60987adbfe977d22fab4c994c3aebe1d14c7514369f6898aa7b";
+      sha512 = "a9c9d6246ce4a3af9277fe8ef8d9a8f3b4f7ee459c525e6b5e93a6ecface87db56ba01a3e1407c9a638f78fef0684a27328fd00e2ab4bb43e56f28db0e333cd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/ta/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/ta/firefox-51.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "6e556f182e0652b79c338fb0d7bfc9da9eee5ef5c68115e748013404ba4409dbf743b03f8722b36ace38a8732924bb426e7a7af5059256ae1f0065096e68a661";
+      sha512 = "02f45309ab4f2995ed2404c8cc596d111dffc54d391c028960f4c181e409cecf4117dc1ae8aee900f7ac72c29109d7bfa5bca228d35a1b5907e25fc748aafbeb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/te/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/te/firefox-51.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "ff201a9e66645e148ec740921a7bb1d1b9ffd4b6200d98d06be0f235e829c6a355be0615341f899b433836fc2f2976223a6e46c4f5172590b5254a26f4998959";
+      sha512 = "897448ac3dbf5ae75319feac7c32845cb2c8c60138df429f0171ae71b0346ff71efe005f3a6792087104cfabe6843a9f7e5406c26de2eefe325d4ef6ec172021";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/th/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/th/firefox-51.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "0e9d0c10f21d3d41825194a3afe21cf4281cbf5825839f908d58821d40358ded4226b5dbe7a094b95aa087769de6179331a19a2fe780b4ee56c74ce137a33ac4";
+      sha512 = "262176b096a9025681f8b3f191ad46d8f0b83f9ec9abe9c34b5da4fea57ec2720545957041e3ff1c1044b470411b158d96785315bbe7d2c8bb29cb00c54facbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/tr/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/tr/firefox-51.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "299f07161a3439902110d8929b5ffdc332562b956d25999235b3e212241d95ce94646ba3542d7138c6ac5bbbe274c614d2f49aca8a674d252b240265397fa48b";
+      sha512 = "40e948f12456caa572bd78e5bf8d089428432653cf5bfab0ba23dc120f1cc36f370f745f1965ab0687f41f7617da78f75aa4429f51e5b650c7bf979f600ac5f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/uk/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/uk/firefox-51.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "f108296c0aee994d558cc422403f45c994d2878b69180d3cf526abe4f5b29d8dc59ed9c58f72a0d21d2550a4d32869b96ae43a1ed251e885bc7abc47b22c3894";
+      sha512 = "b82936161c27b5bafdaf340cb26c49c14bf9b3ac39e1831efcfd51b968ff4bfc953f8aed99ea6aa1b23b1a73129d221f0ec5c55de41dc81c405a531a4dce0934";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/uz/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/uz/firefox-51.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "293e4d99572a22dc053cdc8f5ac40338eadcbd622ee1d47c2bab9914ee1d2507e89a8b4340a12d64c0c4b37f4ec312bcf94921184402852c2a7cb114da93983f";
+      sha512 = "b096c35ee124320ec625d3481015715570d56d6b6b4490c818dd40856bae4aea21c066c18bbe2cdd267d92716d8ed05e9cfdd34e12ebf4517d2b835e76a2c8a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/vi/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/vi/firefox-51.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "24355d25ecae3e5f18a0f3c7b87dcec8c18077292329a7ea38e5e9411c38812f394656d79f3fa653a70770ae136b3f5fbd1644a7657f448dfa78f8e795de5afb";
+      sha512 = "9802425d5866ec036c542545e9bce34fb0e0f80b9b6146bb36a5999a02787095c3e786b9b7e1173f992c054caf8716295bd6084f411553df35586bf725c375db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/xh/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/xh/firefox-51.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "0c917bc8cf0a5b66f85cf1511d3fb0b2f4c4bfaa10883d277e6d4bf399b4b359d8ec39c4fcdd6dd23ba3645047318eace530527796b4be58058cb15de69853f4";
+      sha512 = "afba6b174855327a08d404b555a41982f6ef9f42d1067be40b5cae2ba5b62d232faa70936e02e7a313938b5fbd9acd3fb2af5cbc51128c47f2d2630f052a0741";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/zh-CN/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/zh-CN/firefox-51.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "ceb0d7404aa7d8295920e99ccc77e2da7db6101af92d29dfc3c1f2cb4689b582542d154cbc749ad3b7a744f545ccc39e479db4fbe2c7d18c98bf3bf412eccc46";
+      sha512 = "fd952a6e825784b19179e2214755659c31c1be15ad8f42bfe4fe4905b57b5aaad7df9a0c0e9500ce75eff3f12743bc309dff10f9fd72a5849948e91c4d3f58de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-x86_64/zh-TW/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-x86_64/zh-TW/firefox-51.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "e942d5d6b8891d062b452f1a083de2849cc69ac45801aee0b5c413a786ce9d67555d94416d65fb6bb6e4b74cf11ae75a1036dfc661b50fda10b95febd86a80a2";
+      sha512 = "8b9c643ac91fcf01e6708a3ebabc735de5dbdeb8897a9d57560d69c04746e2a9b9902ae356416435010bd4f3e5241140b0a27162afafd5ee5c097f41dd34cfc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ach/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ach/firefox-51.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "7546a3fb1cd0e06c9f6916c668cedcfa4671bc15a7ece8ed3ad8ebd1bce5c6ac84e2e024d7e2149844f1797d66374bb2c8769e67d1c4af941eb626c610c433f2";
+      sha512 = "cfbfa3136edb8786e6a573b4af9aab3250b3eda10c4a9bcade7e489e3bf0cf4761339e811397d938b46ab5cb708531fb036bfe379f54c4857e31b91f003584be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/af/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/af/firefox-51.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "a6981413d7974e2ca13ffce9fc65c0f69242d6c6bfaa6253fb13fd8fc7e62059df718b4722a7a879dc8e352fd94dcf74db41765dbafc277e8debdd7e35a1242c";
+      sha512 = "15e9023b2434c037bc7f0871d97c0371a78ac5ca4981b30f7f9b95202ca299f3b23b07d711c1d33bf3f9d58969816bb2b06c77488ecf9812e79ad2158b9d102c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/an/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/an/firefox-51.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "e123cd3a8c9c8657f09d198b7f113b84192174b021dd816b82ee4497e307794bda1399e5425456c2d990788340a58831cd261a4c5c67e5b0ea3daa3d0ac65f65";
+      sha512 = "6aa27e98598b8aa89c5f4b09bcbd86722e0ce3fd54d428814ccde7630a1a34cf593550cdd201d0d4dab53c3f185ae82ff2edae9b10f63d0773c494f8b89be931";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ar/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ar/firefox-51.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "618b9c24d37f4b82b1e51a5ceb5b2d3981c764f906e7959eb346adc5c974e464d4a691e50acdad7f9e0cfa5855afb6157e8ab600d22266a31fa444db9b7886da";
+      sha512 = "1a4ef1198431566aeda1ead37c7af435834ffe60530e078463c7ec239a1b9cd8cde76216f90920628b7db12459deb25b9b56907de9f29444fe3c70ee02d76624";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/as/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/as/firefox-51.0.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "93e53546ca9fc554decc0c1d6590b5b84a433ab392abf9fff9712d4432bfd47a1cc57439fc65ae9be91da6d38dd462fbb81fdd7304424e42d08eeb600d298eab";
+      sha512 = "028353834513d8b693f1bc053dafb4cf31f038b3c2a58c48454b5990bfc235712ba5c64da0390a9ede4a046167b5ddb5aa24cb86be5ed8272dd7dc5fce7eabe6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ast/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ast/firefox-51.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "e1115994008db11f3c69679372a3f07b6edde23dca20733b7f06a5b0c63dad2a264c02e9f94dc74976efbb3961155216111522c3f1ebca91929ae356f8218c87";
+      sha512 = "be3338ad2a7b86bb3424984860009f9035888e86dabdbf5beb47f3020504c888d5aead0b7f818c00b373a33a73fea48d0d4d9ac549009f37a897f76121bba667";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/az/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/az/firefox-51.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "93be21a2a79d2f4cb2fb5132856837b1ac8d44c699faf623d076b95b5e61126ea540bcabbf57e2752b49cc7b5116f3345a2a78cd07104d873afc2e2127f64224";
+      sha512 = "c775af957145fa138761bdf0d5c8e76b59a0c496a46e9bac708fad7b70741b337e2d639bbab9536504bb20bf8e889fe516d129ccc301df6a405ef73c6d5d39a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/be/firefox-50.1.0.tar.bz2";
-      locale = "be";
-      arch = "linux-i686";
-      sha512 = "ca41cbbe732e8e754cdb0c832ca7820d5320a8106bbb3e5d753f4a7f6eb30045b81cd84191f868076e0edca68e35b344d63ececa45eabff7102fe82c1ca19e61";
-    }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/bg/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/bg/firefox-51.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "4e0a3ff42a8502e07afca92ff98ae675213527e68c3907b177e53a580e0391c075a41ba4e5b87c27558f86b28c1abe2dcae191334c737d37bdbbfb25c33d0024";
+      sha512 = "2e38d0de9d284514803afe24e697ad4491bb27b386c0a0d032db5e175d3b7d2dc1a3f29a874c9b9661951817761588491578025adf675545a7e3c1f1396d5efa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/bn-BD/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/bn-BD/firefox-51.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "602cffffa7ebf0f53f3e466d3aa5d8f203698db16089e83c893092e9a0841a9a8ec6a46aa5df1e2fec020cd8a7345e4fe86fc20797ad65bcca56bb2f391390ef";
+      sha512 = "cba31a0dada3915105ef0a000040040f10cdb1908402fa41065266575db5ee7996a49e373f289524216b7e2d3b65fbaf1ba201bf73d1d5a6b844df9e5b305ed6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/bn-IN/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/bn-IN/firefox-51.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "2f7ab4b093b8be7dfdbdcf2faad88eb99e8b0e19ebc17efba44d46a332754fcf16e9317398e88c8eea73680ac85f08d2f0a99768fad160d79102e8e1fd6fb8f2";
+      sha512 = "127b84f3e3dacd303f9341ae90239a1077039fffbda642c619c1225fd13687f4e5068a111b84b02afb61b36a4fc8fa09c8ff9979eea263c41e8115108148d599";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/br/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/br/firefox-51.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "abc0fb371ae3144fcb3a5130b13c376169d8a3c3051493fb5fece9a4682757c42bf4717b6494d4220daebc3f1560397f1263706e2a3871d7ee5c0135cdfbe1a5";
+      sha512 = "65dfbc7ec3c54000ffff66bc28191fdec7e29df43e6856c81a999adc1d8bf17c645204064932548b47822e779125ed171ab8d22c02ade3a64ce2327d3b4bdd94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/bs/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/bs/firefox-51.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "f62657ff653edae873269a4113a93dadbbb36920e9e30ff04407d28f755bc04e35223031a60018e69cd4c3b891511109b66e7baa83656b0ac37ef5e334f3a89b";
+      sha512 = "ed542247e77146515d5a808d745769cd0f76f950ec6029e2a7673d2fe520e2d7540921f5e8c9c6c7681d2cb08f63e742272c3f4daf55c6ef0d8e46195ae597af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ca/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ca/firefox-51.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "bcc4184d882075eb2ea875c7493ca4f276796672a029ab161b4f2168e879b46a6fef454e04e53531a32ed5bf82178d8d2ef15f9e43679625e4f7632e7cf51f32";
+      sha512 = "0cfb11b0d869b0466d477ac99e4dc65ee60f0d2d08a8af307c2c149e2d10bd8df17b16024947872d5b4513ed5b0188716dd5d23132429a180209d187b62732f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/cak/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/cak/firefox-51.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "88448d8c17235e318628bed05d607f30ab9db4e05f181a36e39c02f2df840a10990a534d5d5f8e16fdaeecfbf3e51bc7cd9f45b8a84b3447132bb57a87c4e2d3";
+      sha512 = "92b08671ddd98e4ee1158dd0fbbd0ce0d45794732f34a3ad43f8698ed2085fd4e1b5124da3ad47fb1ed01ea372655a3d04b82200b8af5cc0ad997c61dc2dd855";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/cs/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/cs/firefox-51.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "acb9fe18d8a5fe97cdeeea24e8a6e56895a3be16c6a5f2099a69c32768e2f76a2c0fd081d3759a2c87d002ea5021dcc5f806195d3bed06e8514c383ee8bf998f";
+      sha512 = "f5bef965360f84821f3b39990c6dcddc12f52851f1d33cc8d72d8772e770ced14784a1e29667b7047f3c9bb9510086eec2f16d2a4401c2b0cafc6b1275c00b28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/cy/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/cy/firefox-51.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "89119e29496981f8ebc85d512e5d58d8bd3678cc8ea4c90e544bde60881cf5f768b4060d710f8ba4d61dfbd7299a4437f5e7aab1140a03cd498af18c480e0b4b";
+      sha512 = "d6bae2da5f69e95ae8e751653d66917571279f44810666553bb7dde4cd41af954c0002276afe7d28dceb83210877bc19db48d7fb7498cefa256e609201e89db0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/da/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/da/firefox-51.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "285363c04cb6506400077f36867a65372fae80ca6b3fbed88be219c3814d3f38a650c78f36014ae205ba9e5167b5291353c799b918c8e2bca6f23374094db209";
+      sha512 = "bb705294c74406eb7dd50dc6a9b70acc7db297e1bf4c4087523a5f6ce653c0e98fac64f0b9bc34442c8cb8d2da3e5077c06b72495a83ffb0a1c5dac04cc3ec36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/de/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/de/firefox-51.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "ea470ab934f49ff79b8cb04809f5605edb70d3ea9bc997c01802f09e3fbc8d045bb322b97b729916b6371b047f3b4ac14b25dca8e8befea401362c2024a2fa13";
+      sha512 = "c77daf84ee3bf5f3d04039f897c603cfb5d067f6da1dc767d2df6a29a7ea479ec69814d9e7e83be94285970b69ff700e972d526b5fe029258a3adf592688c1a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/dsb/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/dsb/firefox-51.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "74bb1ab27970819fd9a368ac5f9a14add5378d9a7c39707e12146ae8082f39593ea53b5dd730708764515b0177d7ddb675b04a8a75f259303d30f281b44527cd";
+      sha512 = "c95d409c97e65e4ae8ff5a57c1e626b638096801c04eb70b3d0f737f7ea66c0572327760db4595ab05025b727df8be233df3bf79e9e79504df2b7b26423af8c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/el/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/el/firefox-51.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "3d3eb83a16c94eaa0bcb8627239b74c0a261189b67b917d4e2fa9ac538ea353a998b691350797470ab8ab4a5effc65a35a36e4b3d372895bd691c63d439a4c9f";
+      sha512 = "0008bf61cbaf9f79318ba48ed34e5d63e26cfe8876e7faef410e5953b8eccef9ef2380a8796d0fbea326a6ed8d4c1ca4c437db46a5b8981d7c05788d054bff58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/en-GB/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/en-GB/firefox-51.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "23a75b31d461ebb0a3960c6235b6c77471f3687e76f154c8d1fc8cce40ba571a9699e19a5310faa55c52b243e6fd88ec76ccbcb93dfa8b3521493805ca852d57";
+      sha512 = "7069ae86235e354b0485c7a2764915138dd030496340fd4717b37c47ac109e452a41c13450e7c1520d698f0e2aa036919516a6473a1ee5c3f6e14fb45441b7e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/en-US/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/en-US/firefox-51.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "b1667f7c235b3fdbd3a2c3ee6ddd7976b4142983393b0b8e0443896cd0929d7a43ca484ba5922340410fa3c4868f555a4ab581c9664281a31b912c1922a1dce5";
+      sha512 = "509ce17388209ea19197ec42bee61b4cb9e31d80a829de3e7f751f7cfad9da5d6ec4827ca47499e40662a1eeaa4c74726ab687440a99f9c0fc81415916aadf33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/en-ZA/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/en-ZA/firefox-51.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "78238141da05b61b797440a04973187bbfb4d3cff7830385e163e8ccaa603368910be89ee7f2f4e65a47a6917835dff8f840a77a507c3ff0242baaf1b7cfb4f4";
+      sha512 = "30598fca931008beb5f7d01f1ba24f61192f2b2cc9e8cc073f7ab3318b4b5c82ba4abd9324a46126ab9fa7adc7d207947d63eee8211aecf7cb5d5d360dc7284c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/eo/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/eo/firefox-51.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "af424d87210909ad480823d56f20327b0e7879bb0ce7ab43994870a69e6e91b3181e480dcc2610064f276ccfccb71badca135f3d8e00ff16947c220dfe67ee82";
+      sha512 = "c887c7819cc2115a637f5454249061ee8a1b9733a11c70f0ef0e0ee0445c4bd072cd553f39dd830fc841f9893906a721b1288b1d7edea1ec437161ec5db1892b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/es-AR/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/es-AR/firefox-51.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "cca38288b4ef6de4c7469cdcbd7cc29715993ca69c39febb877691b2368182a0efbb0111b45bb5a7ddf47b7c70f20638bc6dc7d6fcd46f8d8127d36bc29da3e3";
+      sha512 = "3167d335115b1861debebb96fd9b190c959fe6d89c085e0c792bb33243cfb7fe80d82a1360a72041d5df422342b3abb4c97779bac85da1caad3e6ad1330af3e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/es-CL/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/es-CL/firefox-51.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "104a3fa6bdf86e0e70c54bfdd8c0d388a8e91a9bae0ef973fc043247907295cc5f53c44f414fe8cd6e2f17a02eae14e366fa8c11ccbb45df2055813b17fd7712";
+      sha512 = "1c6cdd5f526b342b234a007d3861c54326edfcea40b06ee691c1bd3d0d9f49c9b426e98286a85736f67d1b328dedbcb27a80610cee63d95ab1eefccce166e723";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/es-ES/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/es-ES/firefox-51.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "be847e51e78991ac739bc32fb29cc0cc166f12f02b5ada4d4656d3447379eb9cd10f80391433607fb63e971d54a48591d60baa5cb963421f1934033e08525d7a";
+      sha512 = "d9ce835f0125063d0be546b9507a9ab00c84ddcc1a83f7a4a4428ec26e3ce5a308845884a6488212b5abe8901300e976068269db03de45a6bb3b684ba9a6186f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/es-MX/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/es-MX/firefox-51.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "7a7464de3223e9cf1cd0f6b7767ea0fb7ee8db0b3b2c3eb9d284cd5ee8db77b9b0ec3c604625c8c6ffffc41bbac4ea47543c1508f7f8aadbaaeb9954b7e62247";
+      sha512 = "fb31254aaf29d8f843576d3dd1f7d9172ff3f021efbe862aba7409fb9b6269107d982219f519778d1bf8e984589b034fd948367f7d6be7c95b778aaf6ed71db7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/et/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/et/firefox-51.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "907612ce5691ec5e4647e943ed58d437db872551da8490af3e5f7af44e7d9ac78a8c5eaf721f719af782c8b202aa24ee6a87640e54323b5eb823dbee39b2903b";
+      sha512 = "24b7e8070c92cec844fd13e5fbab3abf549bb2685fd7a09397c8a6a0c1742fb58eaace43542b3f7399639348a5c34427f0b162114cdef99946e673108e899e13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/eu/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/eu/firefox-51.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "29c76a0f49d87d162749f824e287f2c1b37cab465cdd5e5e991ce429273d492fc905772c25f4c812c6fb899249a9bb7346eefc91af9f642b4acdc70d3af6f338";
+      sha512 = "ec30e182f42fa2c3a6ff09b8354fea55da91748b9ab024466ec5fe9dfee47ba0b8732d43c61858c4e46a48d8bca9b45a03e972afbcbac113640b44951a67b81b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/fa/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/fa/firefox-51.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "0deec5372d5876861af20a60d8db9d4c5aaef8c133c81bc3af6d85d2de528f96ae1da7f5fc78a9bf34bf06d9121fdb6d74e28ad40ae2b7fc23b4a0c161e09722";
+      sha512 = "89e96bdd179fd5e3aeaca6967fb40c1c3310fb390fa62a4dc7ab419cf57ecbf11cf57a01f0ecde64a387a784135f2a6e90c7ff1ee9953508fafe6a8bee236309";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ff/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ff/firefox-51.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "07c87801154ce44d37b1a477850bf9568651beabb4004d7cfe427c0ecf75fc85da91cffbbd60af773c8b3b7cd30e10937c9ff2fcf65409faf2dd194694d9b6c1";
+      sha512 = "ebe06e58b607791f91522314558506ba4179a23cc3ce64418bee68aeacff6680571013a8af99645f53761564b5b8672c3ec39ff879731c37d2ae69cc81144879";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/fi/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/fi/firefox-51.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "310b71c8e46fd7ab3127cfc0743c1d98ede8adbfd01a645089cb6e5752e8ff4e3da9f8f47ab5fd7d06284b3fd76b9780d60c2898d0868e30a76dcebf35c24b05";
+      sha512 = "c6acadf1d77cb9b82918dba4ae6421bfd2054d20c852a08bd28e2f908a6d2acaf9c29fe6b347e9493fe2ff14a5c0e9f4896d1d0a91c4f4c23ad7817b1497eb04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/fr/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/fr/firefox-51.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "1bc1e595f12d04067b9985be57fe4ec17de89069e4d6b780c16231c4ea195fa0cd8e6daece265335fa56ac3dae9d94c3b76f93199cf1e0946f6d6ac75bd01a1a";
+      sha512 = "75f0efa7a2c4954dc86b5cf4b0e2d2a38bafc9f484d9cb455168ad9b80b2e8201175d5d1ae398da3fd2d5fdcabeff881fc12970cbb48b33175d0d180c90cfdce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/fy-NL/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/fy-NL/firefox-51.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "d07b171d615306c6de663f4592450dea92cd7298e6994ea7fb5d55f01f260c2b66d1b4bc4109f44c3d007107c78feccaa6540ddb14dc8666e0192ff3978d8f5f";
+      sha512 = "77e76e4f485a886a9e32c9ba9663a51d0bc25170237b48a5a42bd895592ad04170d415313eae2a7573495d2a15603e5195c014be621bdb6e078bc8d58f668bb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ga-IE/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ga-IE/firefox-51.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "1c234083d098c52a7597dd727c246ea6dfc177edd1e4fc021ad5868ce9082353036d78b9297503a5eb14dc8d500a7a2549d771ea2d3c849817ab791329925d25";
+      sha512 = "0f9745299df4b31137286ee985ea526f33a127fb91a6568f7c2fc922c44e1cf83cc6e728fb1f05c7e68d3365c43045c61020261318a76100a716b7d35948bbc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/gd/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/gd/firefox-51.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "0e88344c58c1b2e63b765949db63ed9e874b23e382f9fe833206cadde1d6c32d804d68a22f17741cc7964773858fa7adb6a6a42e7ed56dad54f2d7d0a71dce08";
+      sha512 = "fd015052565985956dd89cd96b3f3148704010529db96b3f68a7eff3e78c813ef090d79e9b112710439fd07ee3c0745c1ecffb708a62c9b5c12cc40b4ce05645";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/gl/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/gl/firefox-51.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "244cf85b95f4a1eed0369f4f41ba870f4a3fd48fd85979b005ffc19ab4c03e52da87ae8687f5e3048c33599baab46fa8ed8274db5b180936076fd63e02b955b2";
+      sha512 = "4cd8b4aa4f5f450c7a8eff57592cc584300c64e8976544e5de3c16e358330d5db91c5ce504a2576654dee2f80557f8c439e359e8050518784846f0f8b9c36dbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/gn/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/gn/firefox-51.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "20d51aefbc2f98f83fafd23a5800840d1bce7f0688f76d0ef322b2f1dfe44e75fd82c39fef23cc9afb15faa41514f29f8313748a2e969e2051b3824962de6e56";
+      sha512 = "baba3e61db17d04224c08595de42c4c76ef7e0c05e259772f8265c07f311613552024256ddf0e209358be3780d3fea97b20854284b3a15d8be3f52193df86501";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/gu-IN/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/gu-IN/firefox-51.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "b07adecbbf8aaa8dce8e7d8e03b86d5ce3bb97646404433d89d82832e692efeb532df86a5a4276dcf1f63c705507e0d87f3d72440c49e5d70c9a08968f75fbe7";
+      sha512 = "5423af4164dcb39954cf32f6ec6aca508d06b3fde8b9946ce9adef03877625db3567000ed5a1e812c5accefcbfda3c89d332e7e3cb373e89d6d7e3be664d63e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/he/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/he/firefox-51.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "a6d9a10704ad4097af79ee05aae504a9a6ff109192241cd99c3be665f0adaffa6e5b7b39da859d61d9294cf899a5496ce0c82ac4012a318ad4aa96d6418f380f";
+      sha512 = "7ed6b2d4c108a3a6bfb146bd35682f5c7ddf1c2f84998bc70d362352d6e0ddf2887bf6c84d9dbcaaf6289cca0c29036c4295d4d3b45c52c613ad8a9ed51c334a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hi-IN/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/hi-IN/firefox-51.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "6d78b83b289abf37267b08c72c3b3c42005ddc2f2b13c846012f342b16a3bbf9a891fcd6e24af01160d1749c1b7e76a9f62060970d52144405e4162d4c6297e1";
+      sha512 = "f85636573a871214848cc1785adf6b57a993d0ceea7920654a5b6e92fea62ef91a637a2baeee03e2b5a54469447307b2116dc85338493756768469920deec284";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hr/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/hr/firefox-51.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "e70daf40c8a0885c344a01d1cde03b34af23a2d9c76450f0723cc5ec1b577251dfbb8bfacd3eba866953c5b3dcd2974456305a9e171025cfbd43416f679f1cc4";
+      sha512 = "ee4474ceb010040153b9527b4455846b4486be09d8ffbb5604021ace790e4f8937a3ea358cd81513aaa515d5c546f323a309c4afb0acf8092f88d7ab5b4ef96e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hsb/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/hsb/firefox-51.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "8c137a61cb020dbfb1d73a698d76c4921c9a1dff5f836185caba29c22c81c7c0683cb4139b0642d4bf408e01d498de46022c36de78a3c0413eae048f2be69e72";
+      sha512 = "bc67effad488c2baafc516e51faa2b897d167dff34d8153e4cc3af6069a1621284f497c8135336bb4a52294f4b3cb0cf6aee165fe2a0b09106948a0537be7aff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hu/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/hu/firefox-51.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "1630ad84eff835e1f56e424000515e37d52a268ce569ea12fe5abb8afde231f2aee2293046ee8aeb338ccd81ec98c92246f4b62e000ece032349eedb2ca3bb82";
+      sha512 = "0b38ef74627415300a6575f73c9bfa8eaf5672e82e98524e02f9d79a98d817b217e1238ce485249b0d094903d88c545e1e5469a4a0593322273db5c88e456a01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/hy-AM/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/hy-AM/firefox-51.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "dc2359753972d1eac82bc357461331d69e52bde41736ab5c4bd590491add2b592bd3e4f15f32db94922afee84af04500928ece6be14071b10ad1fc4c8b82314b";
+      sha512 = "d492943011b7ea58e211d4a4d5cede973d02928519849be8cdd2287edd92b45d963368dfa556b811cd1353f048e406a1e907899c89cab29c7e28200b5518eb15";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/id/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/id/firefox-51.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "61717f0c508b61b874080e21f7cf22283b1d123e2301490af409c710ee612ee8e0e7709f3bee20891c0a76b3b2de05b4ba94885d1b3813e6612a1dd1f871d34c";
+      sha512 = "b0cf8c192350878ab3502ce077dd0ac85f21329b7bb96e3d3040cb959b20fbd4a21c315d8c2c528eadc9388af63e8f2789b3fa610269e658145afe5c4069d834";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/is/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/is/firefox-51.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "57d649dd96889b533c336078b4d2380a8417a1f77e40379d51a80518ffe2024a303c2b9c42861436425098cbf2e328264972b82039b9fe13054ae3d33a93e737";
+      sha512 = "28e18d3978a7c4510eeea68fec06014e8ac6789c6297048002ec85317e9e1a304dbe530d93d970bc1f4166be91f6ed7fb4961270e91533dc0d9c8314828b06b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/it/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/it/firefox-51.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "b8bb4e379f4e21bdea2190695b0f74c23b72af5c6149e8790a433c09cbe3ee170fc68a375b71ea112d15eb00b948b6c30466fe382f86e8c5da85ea7479b355ed";
+      sha512 = "76b25e5ce6fdc96143cbe20e348c45e13c519e0db506ad8f39084734d33bc29dfcb6ce7e4e13c33890c1a6d8d69ae886324e63ef9d3c697f97713b8f4b95f65d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ja/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ja/firefox-51.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "287d4ba06988e7a6022fead8af2d921fb761222cd0cbaacb7136c44e397b4620a6129f59f97d98d8a992caaf203e7c8fc130aa4e5e9c58b13a2700f63d786497";
+      sha512 = "01887c81b4806356041be5ff3c7e2a5e9fd3903c3ec3ab8c2f578799375f19bfaaefe18bc41f3055312a7654f91b67f43d1eaee609024cb83a482b05238cfebd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/kk/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ka/firefox-51.0.tar.bz2";
+      locale = "ka";
+      arch = "linux-i686";
+      sha512 = "595e766c2be521013f755f85dd33c9aef3deeb6824b170fcd948d6d8afad556d4b6e6772041227bf26de23b8a103c39c6c62326c6d30454acd9f73706c53780f";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/kab/firefox-51.0.tar.bz2";
+      locale = "kab";
+      arch = "linux-i686";
+      sha512 = "49b72ae5e248d55aa20d719b57ebb569ef7470761aa5358a9ff46e495868507431ba2d081de2ee170cdaf7d6c5a20aaf5a3a463e0ac8ce772a7369a5049b0aa4";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/kk/firefox-51.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "f96a9b418849234b41d181ad141dbb030a8b2f26e73944694c5a805a21778d708862df988dda8ab8fe28eca0aa342153db84d6af971461f0eb8072590445ac15";
+      sha512 = "04329c30d403a516ef459beb9290c0dd3db21de2cc3d2258423771146724dc6ecb97174d0d55520943c5558d1160974937de0d6f6192ef85ec9a23f1770a5217";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/km/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/km/firefox-51.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "63af9259f4326d4dc356513203646712f26dd992d2150d58c4f1892d76f0a3944063dbfec0db68f67d20538aea3247313357e5a822e0a8507bfad2a7209067d4";
+      sha512 = "7773700766cd12c320981b97510743d5414a0ad4c0bc3eaedf2dcd2f48a8bdfa367f68d5ebfdfa1f9df19fd3596da17b249bf41fd9ade6ba4d547dad2e2ec8e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/kn/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/kn/firefox-51.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "afa965fd87ca7dcf5217011cf0aa53d89e1656d64cb8ad973a149eed3897eb577bdbe3359a5310bf9e11dc6e927883c08fb7ef069756313dfc75850378ae7820";
+      sha512 = "43a84c6aa11c9672c3c5a248306d1cf386a37a14efe5bb3c6e469d6dea8c52b31d4222ff9b54cba4a934569d322b2dae2942acda26e91f9a1eb63000f64ac9f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ko/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ko/firefox-51.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "724726e85066350ba9fb0254462b198e198c20970664737c925ca41a474ac4070d2e746b671e8583339fb1935e9a05d6191856f5abaa6e23413efdb707d34d19";
+      sha512 = "4d7d43042a54e495be869ede9904f54ed5dfc3685a693564fa1fd9805fecb5d617659eb68b09f21cb8c976369f62a9e76fea56111919ac4f19b5bd4252916716";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/lij/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/lij/firefox-51.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "e17504c60dcf3eea34c9525b3ca537656fabf90a7d888284cd5ac014a939565ba50e8b3d0fd1c936dd5be1ac59ee9f61e2de22b5b1eaeb12fca0f59a094a06eb";
+      sha512 = "b8388bfb293177564c09509e8db3f2e2151fb735fd4ddb55adf0045ac096e5e17753632ccb8866e08a0b5fe5edda967c1c9958c7361907bd08b1b27191bed729";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/lt/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/lt/firefox-51.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "00689c1e19f748e5676ea3b8ed0076f6a63698c57b171eb771d45e9d9ba5bcf359eeb827f5791c96ca6a31eb9ca166208fc63b4a211676b466656e537323719d";
+      sha512 = "fd9ce324c49dc042be215167272eb7f81c653e5a03dbe09bc573dd1a8852406d0f9e002a7db2e04089004e9f30e86e989f8556527e87efe8cfb5b33da5931bad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/lv/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/lv/firefox-51.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "1218ec478e28229f0ef8d5a7a669ed6f69722602f75185c4817a9870b35b6955f87f004317bb32cdada379075115c12ad92f73f74818c182a480393961a85bf4";
+      sha512 = "07f4d39b46c8e96908a0d7a144874d8a054c115941014c8fdadbdfce84cfd468226c8da2e82c2f61854af1abd645986b42e038768f3644208afeb4fa5b376088";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/mai/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/mai/firefox-51.0.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "6fe97505743b8aa14b9bb3be57077c9da14c2049b2d0d455fc2b777b09bc42924f04c781073188fcdb3130bd5d1cba2cbc5c2ebd04fecc7e73ddb8f20f61c716";
+      sha512 = "3b16658b9a09d9334ce3da90d05e8af0bd163fb7292c6b858a9098a45305e1b6a689687ad02a47259610b0269ed64f58ed0a3611676f5f282bbdc5b048e13351";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/mk/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/mk/firefox-51.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "e0bbe68d53a08df8e2ac46b9b51567f69fcd11b03d19b6e84f86ca9f255c0920f89b011df5fd4ff300cb3fda65470fc15ad779757421eea2b3b6db6bc7ae9c1d";
+      sha512 = "e4c13520ac45271fe9d11f7f89fe50ef6299137084a0ea46c0ec4a3a64d1a1b311df4f7c54dd6a0f1d351e78e1d328039aa1d547f1bda7a4a386a60b850a4366";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ml/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ml/firefox-51.0.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "0e6560b60dc8c0fa309c3a73c1aa3331aec82556e3ee5eec9014d8787c9a5f8311049fc7939ec69569abf689e349be08bce040bfab8bd2ee3ac0042753ce2860";
+      sha512 = "342286c05b755482bf19b38aad1f288c0b333b99c39177bf846f46e22ee9b08914e65be2277939a400a514e6603613dfce0bbdecfdb69ceaa77bdec73d1e6082";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/mr/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/mr/firefox-51.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "cc31171f3ee669fb47dfe4e416c84ed58125b1a4787a92588c3650a2062e4e7fed28f2cc5c784fcf1d804c64fb335c2e16340d46f2d879b73e4465f8c662350a";
+      sha512 = "e1c4b4e41aafc5fc015883b91bef7d94a8d2f228cd37692d35b10b509036b0cf434f9eee56f7a490db5e2d58f5602ffd63c6413d8220211253dce5fd4b805393";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ms/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ms/firefox-51.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "12d3bfa0c956b342604a043beefadbe5bff639fbe4b12614832ca36ac11a4046987f3be34dfeb5d3dbb4e9c1d8533645a8d78c3413f9730a72ae952bb07fd703";
+      sha512 = "7ba605a491acba8d1dee3858e0c0ef19b66f95b65565e0fb4bccd7d46d9e01aceba01b2a59bcd6d2a58f0978f446fde838b21edd253afe3de9b856d4c0c1ea62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/nb-NO/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/nb-NO/firefox-51.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "b144e104f01a075bd0d107f77af39664323eed78987ebc78a7a2917b86d83c2d6ff3bb35b6c5230e27c8164246fb32defea91e5b84672e20f5071e0d52456726";
+      sha512 = "26d8bb5183dff82a0515936f33cfae5197c0bc3d90e2294622e37062d33c531a6508d0b129579dbfec13941e155d052a2a292591992bb201256a59c7a192bb9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/nl/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/nl/firefox-51.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "da466f3dc573096be1d55bdb03f926f0b94ee2ad8e326a3fdc29d519d00f5c0c9166b85c0c8c191d1ca7c992b05b68abff5f33882e52e43be3015a35333be3d8";
+      sha512 = "5b410bde9763eccfff227b0f667877997be6df08e73748034d411363cfef1fcd33a8639f5bbe883dc52bdb1dd9b728e217b1d4033b5ee3e7b2b5cd1d616b2b69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/nn-NO/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/nn-NO/firefox-51.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "85f83572953a0b54805b22f3a21cea70343092912c3b988f8408ac1df1931dda52a8686c32cdd7c91e776a17af0a390d6394b22fdf46ae1205a01499f390dc5a";
+      sha512 = "f4da4e20d6fec450669feb9f31a2f8a49f2670f24c88cab08948043331f8cca44908f25a0028d0a1d73707afb156cc763dbdf7726d427acdc8639066e9fa1273";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/or/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/or/firefox-51.0.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "1a0b08aa675bfe8b26675f1eac53389f34d02b0c28287d1a73e663ce5d747efd0bc4db5f0f29e3e864c99447e759fdf35ff573235a7ac9b815fe8b749f0a0e88";
+      sha512 = "75c69e7d49436dd14108ce1395236401157ec8e55e417bb56f54e0c601335cbe3613da69ba90a7a6f25cc658d36349b3273ec134a4011bffd955aa320fb603b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/pa-IN/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/pa-IN/firefox-51.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "ee9c1c9cc27cd8470cee9a1600951274f9a663e4562cacf7452426c562815f393b726402b1356f9a60095e85278030d64f35cb1fdadd5c8cd11d6917f9c70d60";
+      sha512 = "2a219eab022bc38c51c0ab91cdf0058840d306a7b420367e2b887627d0cc9af66367cfdff8ea9d4868e3f6e8686db20dd268a5a603e73349bb66a620af594958";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/pl/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/pl/firefox-51.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "a326d11cb0df567ad13e6d543426c0a28d9158f7d8f0f519b208bddad26145e3eee6350dfb54735cfc05d656ed40b022fa132991a91f1de78eb36ee4f7333fcc";
+      sha512 = "542093af3bee169ca314c592d456f0b8f350ab4ebdc203488ce6881983b7acb8c210c8d195e309a5c6936d43c2c2b2336638efae3ecbe1400bf3ec5c70494070";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/pt-BR/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/pt-BR/firefox-51.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "cb99dec511614bfdccf43b06e4babd28dbe0dfac464147aadccbf69bdedf3a093e625e4fcdfe0cf8db867b5854ce4c3c5d399a6e9ba932a9fd8574928962360c";
+      sha512 = "b6ad50d05e9023a8cad99000ff368fd1bacac1df5fb1400c44209f9af7a13234b262dd875ad84fcda3b9f52c6fcbaeb4d51363277d4eb09d917e25d790e45547";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/pt-PT/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/pt-PT/firefox-51.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "2c4215b8bd5ee9ff78fdfda763c5506fb6a3c7056c9b4494d89f77ff4255c86617f4102f36bf534c0e3ff24ed27ef4a0853d24578bb39ae0a04f741422e6eba3";
+      sha512 = "dbdbece91863c98a2fe5e50961b613cc9c3989a519599b554e59bc7fcde86235deffa76381b317aa033af565c781894e0a7f4533cddf41bb14cb4abc93c6bc9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/rm/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/rm/firefox-51.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "470b3ce93cd25c24c0c9a1581da7a48c101d7a93764423073b1934dbeb5a0fc401150009a622feba1f2f799501fb03e0af79a308c4fef08ac942c5adcaaf0d91";
+      sha512 = "b31b0e52f1b368271877fe56f868e64bfdfc4c5f1533883d90ee1b794cea8f54e7df2704f87a4f1913acf35e105ee5fbf4d4535474e1da1ab6919cf702d58aaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ro/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ro/firefox-51.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "7cfaa6b7b2dbe4dadc464591ffbb508e66b724eba76b6fa8e9547ef1092f1aa51f1846e9392a8531c7ba24aedb4ba49e7a2e0c1f41a0b97e6dbacdf1d6c34c75";
+      sha512 = "6f86862438e13213398e5d4ac1a2bf0ade1d56d7ee0ccb217e8ba9383c237871caad4a6c067758babdd571b0bb936890681553cd481ae5790caf52b1b3246930";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ru/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ru/firefox-51.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "5915a55e881a57797a67d59b4ae9fd95da8bcc4caaa1ad7decb78a6de7a5da7ff35139ff33f7e4ed171615ba9c25ab7df43677a58cecbee530eed25d8a7cc8ca";
+      sha512 = "ed01bb4eef1014d403626e4eb68aa1b86e0a54067c51aad5d0caa255b5cecac45d81ef535d2c50d72cc5568cf45f6cdb7eedd8d527e985e605614e395894a1f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/si/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/si/firefox-51.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "a1702939f705a7c2b3b66efdd6dc27a4320ed019dcd62b59da67ef3f078be0afab91ee5158e67cb62691b1a4a002783f807d6133885bd0ac9bb05401268d5f24";
+      sha512 = "fa3d1fb7c5c223e6195b2f65148db2eed268a3cef74e51a27e3e3df025d98209c1854cd393dfa1d8a7206c0aff966da981463b8b11880d76bc1b21498ad9d56d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sk/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/sk/firefox-51.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "43b72dd5ebcb1524c5b633cbfb73eed21aaf466227f29f4ffdd93f1c49dcc2295a38b57b3ce072c40da72184e1fb954a9097ea6d6d6df6807dfc5d04ff48b327";
+      sha512 = "d6d3a459e390f4b768de3017f611f619e98f93fd6676b77b3f83173c34df23ac8425b43a57fa79aba37e8f3f406e3507ce4d709ed65d0b41b4ff3a241d1892a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sl/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/sl/firefox-51.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "24840e76f00d6a07de581d06050f924018ae2613a6e4cba993073859dd05007b6c97a7d518a6c4b111740945357621c7325c4cd7f45adddceea270e08c1a09c3";
+      sha512 = "578720764a2af9b62eccdad2a95b2233e6f81e1f4c321cc5c6fad0106ef8d8fe944f8e160b7c3386cb561e385e54d2124aac11505ba2e90af88c6f3a57e0754c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/son/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/son/firefox-51.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "004f8732e194d9c1972390d0ce0d04f9e8f91583676fa5d65bcfb1ee58a6b52db5176ce8a281a3ac94391b43aa637ed157128950e589a0f0a354622da6f04132";
+      sha512 = "c01bdddb9382357a85f86c494977df1185d3fc00b290c6076ccdb48823da8ab73b0af0a7d6d61510f24e881a206e3149070be38dfdaacc8a7a7311e8540acba6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sq/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/sq/firefox-51.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "3dead0e008b4255585d22dacb6fa0aec125da6581b7ef4b1ccc6697e03a5afacd14d340bd8eb7bc0b38478bc6ca20f09364e9180313ceedf1853739ee181d125";
+      sha512 = "4027be0b161a175fa9576c31a223120ebd559873b622ae0a658bcd85b7afa73e0353aa7dcb379fa196f32c6a7a615cd4e8321bc081c195d78ca1bf63d443912b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sr/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/sr/firefox-51.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "cdbf5fa9d085829828f5a395114c3efae9b82e77e34aa69b622e611de8aaf54c525ad12ca445190ba5cc9c22d979be902e4f1f6e6a746b5f97570326cd90009b";
+      sha512 = "3e975eae9b281af3e44c72aec6684c668186c67f99b3a3f584e319b5784eb3dbde710bfade02ef0158d7191b831861aa292842aed2c58b63877fca22caa95481";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/sv-SE/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/sv-SE/firefox-51.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "ef8a625973d0286799e2a9ea3a5a10078d912a65521be8f935ec6eb207ba53942ec5d0e0c4c5c013ea2705307dafda12294fdf708dca35f72d5ba3eb48733238";
+      sha512 = "130af7c0ff6bce178119b88a585f4216effb0d08b17965b75c8eee0c0af728849f5c78ec1732db1ef4c18a2b004ad031b34221921ff7fee1a580e954fd90f123";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/ta/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/ta/firefox-51.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "64652e5c68680f1ab15bdb5ec6487387789bd4b1a1537daa215094e57156fd4a1272311d8084435994151aff5e7ddffb16b93c2048989d9c2dc455f98d072b06";
+      sha512 = "afd344db4d2e8f64bb2cbdb9cd29bae258aefe0dece1f784fa683d27107d863ca1000d47f0764edb5c2deb80ba5ba36778396f94aba85ee5ff569a6364bfb64a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/te/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/te/firefox-51.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "e516ee1f536dd98ab95a9a621cf4634f1ac70a3b5952cd8c6498890536b1630b362ebda8e69577eda4c0a6224f1a9cbf19453e5709dbca467e37597016eb5fe3";
+      sha512 = "e6dde9414cb8a75616bdfd7590aab3b4b9c70b43dc8218eddcda7b5d82968f702438cf6f9fcbac8d1c4aa68d10a7b7aa0b144229a1ddee190a670a93b96b8068";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/th/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/th/firefox-51.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "0b9ae06d78e94d6f9ee5861dc911eca02f39671d8f13f2119323ed7dc394dffbe99f2d23dd3eba955d46f7d4b9775cd9fc3311337d4339748c178aa67d7467eb";
+      sha512 = "3a3a78429127cd9b4677618c583135e4b6adacfd26b411442e7654cc1dba6fe97bdb2485b63cffd212e9dca708e260740cd70a8b8213f241cabb2d0ee651ada4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/tr/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/tr/firefox-51.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "31be512e591504d3e8a776933f0926ae54a7797fa037e53a4627b1bb39ed61e4689cafee7d84dfb6b930ee2e4a84df158a97c1c5b201a3a8ea112e2910e65846";
+      sha512 = "f0e75b3edbfc1d254c28e545cd15f0dae01c54361f65b7d3fc9e28cfbe4f620dc995725302e9e77c94b85458c60a25cb2ca3ef11839303fa6a1a55829e01944c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/uk/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/uk/firefox-51.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "19614a4999f5c7509a3c0b1c6bb2bc3d9f408ff6727bcf9bf93bf91a59ec8d3c04206719fe2aa2319a0e62687df871bfa2fe67117219398e19aa5a6e0782c15c";
+      sha512 = "e00212ba3205a6ce8ce3e66e430cc653b607501900f50cecfac67c73cb7e3ba6cecff276903aa8bf9fc99a2e3d6e9d30021c12ae74be027b6c775ba8f5ef58db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/uz/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/uz/firefox-51.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "22bb3b4a3a5a98ad8da002a220dd2779a46fd50a3d0ff41bec8312186ae34543da44fc49518fee160aa4b48176a0d3ba0dd0c4853fea9befc66911684b83ddb1";
+      sha512 = "e3d3bbfc59c5d8db89edff8be8dd40a8b4d63821bb0661d8b7af73ffaffbaf955e441ba2f51a3bcd60e0a9fdb972ee02c5eb9e9b1639982be4dd8685bd18b57a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/vi/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/vi/firefox-51.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "99140a71208a7912dc8b9fd3bd7f5454a0b032dee4d903304dfd14aa9abec0722fdcc6624f3c0a1c6e753bc6ab6ea512d6f8c55b5482069ed6c65d5579f562e0";
+      sha512 = "bbba8a10fa3d3958ee2310bf7c72886a94808ac2dc55bf717b0fb073ab2a38dcf258578e653fea2cbc89daaf996915da441d49639f38a3a25ae00b66380e10b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/xh/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/xh/firefox-51.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "440573a5e364ecd59121b30f664ed23bd2fa80945562d1e5cc04303f12dfff23c96ef53ce07cf689d247a5120b9d7679533ccb6e17c27b29898154f0fc9fc581";
+      sha512 = "1e67a4b168e582d8528192b7f15f4c87edf0a9b5f6113c1a22818e0a31ccf9c9d11f934c043a4f12541ffcf2cc7d7dcbe15ab9df14c37f0bbcfa2a54c6f74017";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/zh-CN/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/zh-CN/firefox-51.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "4a2f5550c130d0992408d328afa3dbd37f80e5b63c2b33c095ab74e397ea394cb33f87214f1b0d3650c60450738fe3eca636ed51ca1c4e5dce9b58e0f09c30f6";
+      sha512 = "1bdd72ad912894961872da41d76498863bb67ba6bf26ab551cac1da450fc79d5196050968ba0786c32254af83fa86dc2c368e8c9703cdf27309475b1ff4ee899";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/50.1.0/linux-i686/zh-TW/firefox-50.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0/linux-i686/zh-TW/firefox-51.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "6417da7af1792f241c8d57dd5bb05dac974db2b73a6274fe3159037bcf8ae8a23b3f1849f5b42a0bfc09f1dcbf949bcaa8b1e9cc633fd3726c12cde7e3cf542f";
+      sha512 = "7920151c1d99fda897b8cfc62eb1e6ec7b984dc56253478fb49e3182695313c3c0fd21a49f37993024e5898377bed23e6d943f6d8d5a851aba30fff8922287a2";
     }
     ];
 }

From a7b7d0fc3ea3eef375c7b398d0127c0611edf637 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Fri, 20 Jan 2017 01:36:05 +0100
Subject: [PATCH 519/727] dnscrypt-proxy: 1.9.1 -> 1.9.4

---
 pkgs/tools/networking/dnscrypt-proxy/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index baa295c0b00..24aa3d4b829 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "dnscrypt-proxy-${version}";
-  version = "1.9.1";
+  version = "1.9.4";
 
   src = fetchurl {
     url = "https://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
-    sha256 = "0aa1qw59b72wl922lfhg24xq2gkv95v1s0daiiqv9b4zpap3ynag";
+    sha256 = "07piwsjczamwvdpv1585kg4awqakip51bwsm8nqi6bljww4agx7x";
   };
 
   configureFlags = optional stdenv.isLinux "--with-systemd";
@@ -21,14 +21,6 @@ stdenv.mkDerivation rec {
     # Previous versions required libtool files to load plugins; they are
     # now strictly optional.
     rm $out/lib/dnscrypt-proxy/*.la
-
-    # The installation ends up copying the same sample configuration
-    # into $out/etc twice, with the expectation that one of them will be
-    # edited by the user.  Since we can't modify the file, it makes more
-    # sense to move only a single copy to the doc directory.
-    mkdir -p $out/share/doc/dnscrypt-proxy
-    mv $out/etc/dnscrypt-proxy.conf.example $out/share/doc/dnscrypt-proxy/
-    rm -rf $out/etc
   '';
 
   meta = {

From 0d7de0e431c80c746de7d423ab9cf3172dc9f509 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <alebedev@mirantis.com>
Date: Mon, 23 Jan 2017 15:31:37 +0300
Subject: [PATCH 520/727] viber: 6.0.1.5 -> 6.5.5.1481

---
 .../networking/instant-messengers/viber/default.nix  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index 2e3832b9ee8..71d1bccc2b1 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -1,20 +1,17 @@
 {fetchurl, stdenv, dpkg, makeWrapper,
  alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap,
- libpulseaudio, mesa, nspr, nss, systemd, wayland, xorg, zlib, ...
+ libpulseaudio, libxml2, libxslt, mesa, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
 }:
 
 assert stdenv.system == "x86_64-linux";
 
-# BUG: Viber requires running tray application, segfaulting if it's missing
-# FIX: Start something like `stalonetray` if you DE doesn't provide tray
-
 stdenv.mkDerivation rec {
   name = "viber-${version}";
-  version = "6.0.1.5";
+  version = "6.5.5.1481";
 
   src = fetchurl {
     url = "http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
-    sha256 = "026vp2pv66b2dlwi5w5wk4yjnnmnsqapdww98p7xdnz8n0hnsbbi";
+    sha256 = "0gvpaprfki04x66ga2ljksspdxd4cz455h92a7i2dnd69w1kik5s";
   };
 
   buildInputs = [ dpkg makeWrapper ];
@@ -35,9 +32,12 @@ stdenv.mkDerivation rec {
       harfbuzz
       libcap
       libpulseaudio
+      libxml2
+      libxslt
       mesa
       nspr
       nss
+      openssl
       stdenv.cc.cc
       systemd
       wayland

From 33f4728a6c46e2b0da690fd39c2cd3701f6b1864 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 23 Jan 2017 14:18:58 +0100
Subject: [PATCH 521/727] youtubeDL: 2017.01.18 -> 2017.01.22

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index f9590b3f044..bcebbc7ab2c 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.01.18";
+  version = "2017.01.22";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "7c16f3ce7cf8a673a4c531e4a1fc10801467a61732cb65430e40b3ab8b2f2d2e";
+    sha256 = "11sqiry50kb1f2v6py1pfb19kd5x04lcd78wx7ss2n6vw6ckm6mw";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From b82d6b3a0af6a0aec436e74e2f061283d1c1dab6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 23 Jan 2017 08:23:43 -0500
Subject: [PATCH 522/727] ios-cross: Expose the SDK directory via ccCross

---
 pkgs/os-specific/darwin/ios-cross/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix
index 01753a5300b..7de7d291289 100644
--- a/pkgs/os-specific/darwin/ios-cross/default.nix
+++ b/pkgs/os-specific/darwin/ios-cross/default.nix
@@ -45,7 +45,7 @@
     '';
   };
 in {
-  cc = runCommand "${prefix}-cc" {} ''
+  cc = runCommand "${prefix}-cc" { passthru = { inherit sdkType sdkVer sdk; }; } ''
     mkdir -p $out/bin
     ln -sv ${wrapper}/bin/clang $out/bin/${prefix}-cc
     mkdir -p $out/nix-support

From d72406985b9d7c2feeada257e64bfb7aa6ae71ce Mon Sep 17 00:00:00 2001
From: Andraz Bajt <andraz@bajt.me>
Date: Mon, 23 Jan 2017 15:50:18 +0100
Subject: [PATCH 523/727] Fix fetchbower to handle SSL origins

---
 pkgs/build-support/fetchbower/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix
index 11d88ae10e9..835fbec6bf0 100644
--- a/pkgs/build-support/fetchbower/default.nix
+++ b/pkgs/build-support/fetchbower/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bower2nix }:
+{ stdenv, lib, bower2nix, cacert }:
 let
   bowerVersion = version:
     let
@@ -9,6 +9,7 @@ let
 
   fetchbower = name: version: target: outputHash: stdenv.mkDerivation {
     name = "${name}-${bowerVersion version}";
+    SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
     buildCommand = ''
       fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}"
       # In some cases, the result of fetchBower is different depending

From 21541082700a27f22dbc094a785bdba098f77e56 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 23 Jan 2017 11:35:59 -0500
Subject: [PATCH 524/727] haskell-modules/generic-builder: Fix copy-paste error

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

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 43676f1e72e..7a421e4f7b6 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -151,7 +151,7 @@ let
   ghcCommand' = if isGhcjs then "ghcjs" else "ghc";
   crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else "";
   ghcCommand = "${crossPrefix}${ghcCommand'}";
-  ghcCommandCaps= lib.toUpper ghcCommand';
+  ghcCommandCaps= toUpper ghcCommand';
 
 in
 

From 6aae00edfc5431be95c4285ca93f471b7b9f69e4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Jan 2017 12:21:16 -0500
Subject: [PATCH 525/727] rkt: 1.22.0 -> 1.23.0

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

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index c0bd9d8ed13..2f610208c72 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -12,7 +12,7 @@ let
   stage1Dir = "lib/rkt/stage1-images";
 
 in stdenv.mkDerivation rec {
-  version = "1.22.0";
+  version = "1.23.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
       owner = "coreos";
       repo = "rkt";
       rev = "v${version}";
-      sha256 = "14rp3652awvx2iw1l6mia5flfib9jfkiaic16afchrlp17sdq2ji";
+      sha256 = "0fgvc3s8rb6da3jgrd8jmqv9xky7mq1y184jbm4lgy0rds4zhkf4";
   };
 
   stage1BaseImage = fetchurl {

From 6bcf89f2174275d11bacb4076e3318c5578708b1 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 18 Jan 2017 00:29:59 +0100
Subject: [PATCH 526/727] pdns-recursor: add service

---
 nixos/modules/misc/ids.nix                    |   1 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/networking/pdns-recursor.nix     | 168 ++++++++++++++++++
 3 files changed, 170 insertions(+)
 create mode 100644 nixos/modules/services/networking/pdns-recursor.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 5058d41bf75..db8b66c9768 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -284,6 +284,7 @@
       glance = 266;
       couchpotato = 267;
       gogs = 268;
+      pdns-recursor = 269;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e99e344b932..f3996564fd9 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -426,6 +426,7 @@
   ./services/networking/pdnsd.nix
   ./services/networking/polipo.nix
   ./services/networking/powerdns.nix
+  ./services/networking/pdns-recursor.nix
   ./services/networking/pptpd.nix
   ./services/networking/prayer.nix
   ./services/networking/privoxy.nix
diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
new file mode 100644
index 00000000000..26be72d2a61
--- /dev/null
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -0,0 +1,168 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  dataDir  = "/var/lib/pdns-recursor";
+  username = "pdns-recursor";
+
+  cfg   = config.services.pdns-recursor;
+  zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones;
+
+  configFile = pkgs.writeText "recursor.conf" ''
+    local-address=${cfg.dns.address}
+    local-port=${toString cfg.dns.port}
+    allow-from=${concatStringsSep "," cfg.dns.allowFrom}
+
+    webserver-address=${cfg.api.address}
+    webserver-port=${toString cfg.api.port}
+    webserver-allow-from=${concatStringsSep "," cfg.api.allowFrom}
+
+    forward-zones=${concatStringsSep "," zones}
+    export-etc-hosts=${if cfg.exportHosts then "yes" else "no"}
+    dnssec=${cfg.dnssecValidation}
+    serve-rfc1918=${if cfg.serveRFC1918 then "yes" else "no"}
+
+    ${cfg.extraConfig}
+  '';
+
+in {
+  options.services.pdns-recursor = {
+    enable = mkEnableOption "PowerDNS Recursor, a recursive DNS server";
+
+    dns.address = mkOption {
+      type = types.str;
+      default = "0.0.0.0";
+      description = ''
+        IP address Recursor DNS server will bind to.
+      '';
+    };
+
+    dns.port = mkOption {
+      type = types.int;
+      default = 53;
+      description = ''
+        Port number Recursor DNS server will bind to.
+      '';
+    };
+
+    dns.allowFrom = mkOption {
+      type = types.listOf types.str;
+      default = [ "10.0.0.0/8" "172.16.0.0/12" "192.168.0.0/16" ];
+      example = [ "0.0.0.0/0" ];
+      description = ''
+        IP address ranges of clients allowed to make DNS queries.
+      '';
+    };
+
+    api.address = mkOption {
+      type = types.str;
+      default = "0.0.0.0";
+      description = ''
+        IP address Recursor REST API server will bind to.
+      '';
+    };
+
+    api.port = mkOption {
+      type = types.int;
+      default = 8082;
+      description = ''
+        Port number Recursor REST API server will bind to.
+      '';
+    };
+
+    api.allowFrom = mkOption {
+      type = types.listOf types.str;
+      default = [ "0.0.0.0/0" ];
+      description = ''
+        IP address ranges of clients allowed to make API requests.
+      '';
+    };
+
+    exportHosts = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+       Whether to export names and IP addresses defined in /etc/hosts.
+      '';
+    };
+
+    forwardZones = mkOption {
+      type = types.attrs;
+      example = { eth = "127.0.0.1:5353"; };
+      default = {};
+      description = ''
+        DNS zones to be forwarded to other servers.
+      '';
+    };
+
+    dnssecValidation = mkOption {
+      type = types.enum ["off" "process-no-validate" "process" "log-fail" "validate"];
+      default = "validate";
+      description = ''
+        Controls the level of DNSSEC processing done by the PowerDNS Recursor.
+        See https://doc.powerdns.com/md/recursor/dnssec/ for a detailed explanation.
+      '';
+    };
+
+    serveRFC1918 = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to directly resolve the RFC1918 reverse-mapping domains:
+        <literal>10.in-addr.arpa</literal>,
+        <literal>168.192.in-addr.arpa</literal>,
+        <literal>16-31.172.in-addr.arpa</literal>
+        This saves load on the AS112 servers.
+      '';
+    };
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Extra options to be appended to the configuration file.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers."${username}" = {
+      home = dataDir;
+      createHome = true;
+      uid = config.ids.uids.pdns-recursor;
+      description = "PowerDNS Recursor daemon user";
+    };
+
+    systemd.services.pdns-recursor = {
+      unitConfig.Documentation = "man:pdns_recursor(1) man:rec_control(1)";
+      description = "PowerDNS recursive server";
+      wantedBy = [ "multi-user.target" ];
+      after    = [ "network.target" ];
+
+      serviceConfig = {
+        User = username;
+        Restart    ="on-failure";
+        RestartSec = "5";
+        PrivateTmp = true;
+        PrivateDevices = true;
+        AmbientCapabilities = "cap_net_bind_service";
+        ExecStart = ''${pkgs.pdns-recursor}/bin/pdns_recursor \
+          --config-dir=${dataDir} \
+          --socket-dir=${dataDir} \
+          --disable-syslog
+        '';
+      };
+
+      preStart = ''
+        # Link configuration file into recursor home directory
+        configPath=${dataDir}/recursor.conf
+        if [ "$(realpath $configPath)" != "${configFile}" ]; then
+          rm -f $configPath
+          ln -s ${configFile} $configPath
+        fi
+      '';
+    };
+  };
+}

From 00444cbf25fcc7d1db64e6fe482815b52f699353 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Tue, 3 Jan 2017 14:12:36 +0100
Subject: [PATCH 527/727] journalbeat service: init at 5.1.2

Journalbeat is a log shipper from systemd/journald to
Logstash/Elasticsearch. I added a package as well as a NixOS service
module for it.
---
 lib/maintainers.nix                           |  1 +
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/logging/journalbeat.nix  | 76 +++++++++++++++++++
 pkgs/tools/system/journalbeat/default.nix     | 34 +++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 114 insertions(+)
 create mode 100644 nixos/modules/services/logging/journalbeat.nix
 create mode 100644 pkgs/tools/system/journalbeat/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 1e9a6fe0f0d..43e79fa2d32 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -290,6 +290,7 @@
   mbbx6spp = "Susan Potter <me@susanpotter.net>";
   mbe = "Brandon Edens <brandonedens@gmail.com>";
   mboes = "Mathieu Boespflug <mboes@tweag.net>";
+  mbrgm = "Marius Bergmann <marius@yeai.de>";
   mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>";
   mdaiter = "Matthew S. Daiter <mdaiter8121@gmail.com>";
   meditans = "Carlo Nucera <meditans@gmail.com>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4ec4c5a6f5b..6ec5ac73b21 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -212,6 +212,7 @@
   ./services/logging/awstats.nix
   ./services/logging/fluentd.nix
   ./services/logging/graylog.nix
+  ./services/logging/journalbeat.nix
   ./services/logging/klogd.nix
   ./services/logging/logcheck.nix
   ./services/logging/logrotate.nix
diff --git a/nixos/modules/services/logging/journalbeat.nix b/nixos/modules/services/logging/journalbeat.nix
new file mode 100644
index 00000000000..8186a3b02c3
--- /dev/null
+++ b/nixos/modules/services/logging/journalbeat.nix
@@ -0,0 +1,76 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.journalbeat;
+
+  journalbeatYml = pkgs.writeText "journalbeat.yml" ''
+    name: ${cfg.name}
+    tags: ${builtins.toJSON cfg.tags}
+
+    journalbeat.cursor_state_file: ${cfg.stateDir}/cursor-state
+
+    ${cfg.extraConfig}
+  '';
+
+in
+{
+  options = {
+
+    services.journalbeat = {
+
+      enable = mkEnableOption "journalbeat";
+
+      name = mkOption {
+        type = types.str;
+        default = "journalbeat";
+        description = "Name of the beat";
+      };
+
+      tags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = "Tags to place on the shipped log messages";
+      };
+
+      stateDir = mkOption {
+        type = types.str;
+        default = "/var/lib/journalbeat";
+        description = "The state directory. Journalbeat's own logs and other data are stored here.";
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = ''
+          journalbeat:
+            seek_position: cursor
+            cursor_seek_fallback: tail
+            write_cursor_state: true
+            cursor_flush_period: 5s
+            clean_field_names: true
+            convert_to_numbers: false
+            move_metadata_to_field: journal
+            default_type: journal
+        '';
+        description = "Any other configuration options you want to add";
+      };
+
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.services.journalbeat = with pkgs; {
+      description = "Journalbeat log shipper";
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        mkdir -p ${cfg.stateDir}/data
+        mkdir -p ${cfg.stateDir}/logs
+      '';
+      serviceConfig = {
+        ExecStart = "${pkgs.journalbeat}/bin/journalbeat -c ${journalbeatYml} -path.data ${cfg.stateDir}/data -path.logs ${cfg.stateDir}/logs";
+      };
+    };
+  };
+}
diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix
new file mode 100644
index 00000000000..5a66fcf5299
--- /dev/null
+++ b/pkgs/tools/system/journalbeat/default.nix
@@ -0,0 +1,34 @@
+{ lib, pkgs, buildGoPackage, fetchFromGitHub, makeWrapper }:
+
+let
+
+  libPath = lib.makeLibraryPath [ pkgs.systemd.lib ];
+
+in buildGoPackage rec {
+
+  name = "journalbeat-${version}";
+  version = "5.1.2";
+
+  goPackagePath = "github.com/mheese/journalbeat";
+
+  buildInputs = [ makeWrapper pkgs.systemd ];
+
+  postInstall = ''
+    wrapProgram $bin/bin/journalbeat \
+      --prefix LD_LIBRARY_PATH : ${libPath}
+  '';
+
+  src = fetchFromGitHub {
+    owner = "mheese";
+    repo = "journalbeat";
+    rev = "v${version}";
+    sha256 = "179jayzvd5k4mwhn73yflbzl5md1fmv7a9hb8vz2ir76lvr33g3l";
+  };
+
+  meta = with lib; {
+    homepage = https://github.com/mheese/journalbeat;
+    description = "Journalbeat is a log shipper from systemd/journald to Logstash/Elasticsearch";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ mbrgm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d17bd889df5..f8f5421ecc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2361,6 +2361,8 @@ in
     gcc = gcc49; # doesn't build with gcc5
   };
 
+  journalbeat = callPackage ../tools/system/journalbeat { };
+
   jp = callPackage ../development/tools/jp { };
 
   jp2a = callPackage ../applications/misc/jp2a { };

From ca38ef79e9d1530cd32890bf9e4760096f25f048 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Tue, 24 Jan 2017 04:44:43 +1100
Subject: [PATCH 528/727] add nix-prefetch-source (#21734)

---
 .../nix-update-source/default.nix             | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/package-management/nix-update-source/default.nix

diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix
new file mode 100644
index 00000000000..06ac8203f82
--- /dev/null
+++ b/pkgs/tools/package-management/nix-update-source/default.nix
@@ -0,0 +1,29 @@
+{ lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }:
+python3Packages.buildPythonApplication rec {
+  version = "0.2.1";
+  name = "nix-update-source-${version}";
+  src = fetchFromGitHub {
+    owner = "timbertson";
+    repo = "nix-update-source";
+    rev = "version-${version}";
+    sha256 = "1w3aj0kjp8zhxkzqxnm5srrsqsvrmxhn4sqkr4kjffh61jg8jq8a";
+  };
+  propagatedBuildInputs = [ nix-prefetch-scripts ];
+  passthru = {
+    fetch = path:
+      let
+        fetchers = {
+          # whitelist of allowed fetchers
+          inherit (pkgs) fetchgit fetchurl fetchFromGitHub;
+        };
+        json = lib.importJSON path;
+        fetchFn = builtins.getAttr json.fetch.fn fetchers;
+        src = fetchFn json.fetch.args;
+      in
+      json // { inherit src; };
+  };
+  meta = {
+    description = "Utility to autimate updating of nix derivation sources";
+    maintainers = with lib.maintainers; [ timbertson ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d17bd889df5..944f9c9d225 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17597,6 +17597,8 @@ in
     nix-prefetch-zip
     nix-prefetch-scripts;
 
+  nix-update-source = callPackage ../tools/package-management/nix-update-source {};
+
   nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; };
 
   nix-repl = callPackage ../tools/package-management/nix-repl { };

From 231ecebfc60515d317f3a2569d7823b337f210a1 Mon Sep 17 00:00:00 2001
From: Alistair Bill <alistair.bill@gmail.com>
Date: Mon, 23 Jan 2017 17:45:29 +0000
Subject: [PATCH 529/727] neofetch: 2.0.2 -> 3.0

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

diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index 0e992f49c7a..92a2f589b30 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "neofetch-${version}";
-  version = "2.0.2";
+  version = "3.0";
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "neofetch";
     rev = version;
-    sha256 = "15fpm6nflf6w0c758xizfifvvxrkmcc2hpzrnfw6fcngfqcvajmd";
+    sha256 = "0z8sqbspf6j7yqy7wbd8ba3pfn836b0y8kmgkcyvswgjkcyh8m68";
   };
 
   patchPhase = ''

From 034d39b2447b251e9613decb6e987efd794a1c15 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 14 Jan 2017 16:22:57 +0100
Subject: [PATCH 530/727] darwin: update shas, some sources where re-released
 with different metadata

---
 pkgs/os-specific/darwin/apple-source-releases/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 4108bc60c27..29a0658d438 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -196,7 +196,7 @@ let
     Csu             = applePackage "Csu"               "osx-10.11.6"     "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {};
     dtrace          = applePackage "dtrace"            "osx-10.11.6"     "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wc0" {};
     dyld            = applePackage "dyld"              "osx-10.11.6"     "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {};
-    eap8021x        = applePackage "eap8021x"          "osx-10.11.6"     "15bbgjhi8l7hbib41gqcldzbf3hf6105jbwc745hp1gmrscw4zch" {};
+    eap8021x        = applePackage "eap8021x"          "osx-10.11.6"     "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {};
     IOKit           = applePackage "IOKit"             "osx-10.11.6"     "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; };
     launchd         = applePackage "launchd"           "osx-10.9.5"      "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {};
     libauto         = applePackage "libauto"           "osx-10.9.5"      "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {};
@@ -212,7 +212,7 @@ let
     libiconv        = applePackage "libiconv"          "osx-10.11.6"     "11h6lfajydri4widis62q8scyz7z8l6msqyx40ly4ahsdlbl0981" {};
     Libinfo         = applePackage "Libinfo"           "osx-10.11.6"     "0qjgkd4y8sjvwjzv5wwyzkb61pg8wwg95bkp721dgzv119dqhr8x" {};
     Libm            = applePackage "Libm"              "osx-10.7.4"      "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {};
-    Libnotify       = applePackage "Libnotify"         "osx-10.11.6"     "14rhhfzb75r9jf3kyj8fzd01n09n7km1fsdj3dzl3lkkp1sir78m" {};
+    Libnotify       = applePackage "Libnotify"         "osx-10.11.6"     "0zbcyxlcfhf91jxczhd5bq9qfgvg494gwwp3l7q5ayb2qdihzr8b" {};
     libpthread      = applePackage "libpthread"        "osx-10.11.6"     "1kbw738cmr9pa7pz1igmajs307clfq7gv2vm1sqdzhcnnjxbl28w" {};
     libresolv       = applePackage "libresolv"         "osx-10.11.6"     "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {};
     Libsystem       = applePackage "Libsystem"         "osx-10.11.6"     "1nfkmbqml587v2s1d1y2s2v8nmr577jvk51y6vqrfvsrhdhc2w94" {};

From 55be1b30fc4a6928376ec4d8f7a83b3d16f7b246 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Mon, 23 Jan 2017 20:32:17 +0100
Subject: [PATCH 531/727] gitlab-runner: 1.9.0 -> 1.10.0

---
 .../continuous-integration/gitlab-runner/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 1338201b996..c2e105d469e 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "1.9.0";
+  version = "1.10.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "12hcpvc0j6g200qhz12gfsslngbqx4sifrikr05vh2av17hba25s";
+    sha256 = "1fv4sv92ng4gx53pbpagb6kv2hdab04lf2chsflf10xgzqw5l521";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "1hqwhg94g514g0ad4h0h7wh7k5clm9i7whzr6c30i8yb00ga628s";
+    sha256 = "153dbgk6fvl73d5qhainqr9hzicsryc6ynlryi9si40ld82flrsr";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-ci-multi-runner";
     rev = "v${version}";
-    sha256 = "1b30daxnpn1psy3vds1m4mnbl2hmvr2bc0zrd3nn9xm3xacm3dqj";
+    sha256 = "0ma6b6624c8218cz4gg5pr077li7nbs0v3mpgr1hxq7v465spa7j";
   };
 
   buildInputs = [ go-bindata ];

From 29ac5d5209e2541888983ca05a2ca5cf293b02c8 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 23 Jan 2017 20:29:01 +0100
Subject: [PATCH 532/727] vagrant: FIX #21365 add libxml2 and libxslt paths

---
 pkgs/development/tools/vagrant/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 39c7ca77f8f..659c831bbe3 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -117,7 +117,8 @@ in stdenv.mkDerivation rec {
     mkdir -p "$out"
     cp -r opt "$out"
     cp -r usr/bin "$out"
-    wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib"
+    wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxml2 libxslt ]}" \
+                                   --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib"
   '';
 
   preFixup = ''

From 0097db08d73731bede7c9d52e5c459d7001b8738 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 23 Jan 2017 21:13:31 +0100
Subject: [PATCH 533/727] kubernetes: add kubeadm command

---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 2b2cca6a609..0040d0ca823 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, fetchFromGitHub, which, go, go-bindata, makeWrapper, rsync
 , iptables, coreutils
 , components ? [
+    "cmd/kubeadm"
     "cmd/kubectl"
     "cmd/kubelet"
     "cmd/kube-apiserver"

From 3c521ed1cf67244326be726b8cde6e5b7fbcb436 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 23 Jan 2017 21:13:35 +0100
Subject: [PATCH 534/727] svtplay-dl: 1.8 -> 1.9

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

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index c5f017564af..8eaad3b5201 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -5,13 +5,13 @@ let
   inherit (pythonPackages) python nose pycrypto requests2 mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "1.8";
+  version = "1.9";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "1cn79kbz9fhhbajxg1fqd8xlab9jz4x1n9w7n42w0j8c627q0rlv";
+    sha256 = "0kqly2jzpn1l26is65nhaq0xdvsjylh7wm12fw9r1wz1558pqswf";
   };
 
   pythonPaths = [ pycrypto requests2 ];

From 653a7d97cb8686d7fd8b72c8a8d86b4d9f46455b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 23 Jan 2017 21:21:34 +0100
Subject: [PATCH 535/727] perl-MooseX-Types-Common: 0.001013 -> 0.001014

Also remove myself from maintainers.
---
 pkgs/top-level/perl-packages.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0b4f53ac861..04db9c7e3ca 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9138,18 +9138,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXTypesCommon = buildPerlPackage rec {
-    name = "MooseX-Types-Common-0.001013";
+    name = "MooseX-Types-Common-0.001014";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "ff0c963f5e8304acb5f64bdf9ba1f19284311148e1a8f0d1f81f123f9950f5f2";
+      sha256 = "ef93718b6d2f240d50b5c3acb1a74b4c2a191869651470001a82be1f35d0ef0f";
     };
     buildInputs = [ ModuleBuildTiny TestDeep TestWarnings perl ];
-    propagatedBuildInputs = [ MooseXTypes ];
+    propagatedBuildInputs = [ MooseXTypes self."if" ];
     meta = {
       homepage = https://github.com/moose/MooseX-Types-Common;
       description = "A library of commonly used type constraints";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ rycee ];
     };
   };
 

From df89b9b9e98d6cd7a1ab7bf3532ff5f79b7ffa57 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 23 Jan 2017 21:22:09 +0100
Subject: [PATCH 536/727] perl-MooX-Types-MooseLike-Numeric: 1.02 -> 1.03

Also remove myself from maintainers.
---
 pkgs/top-level/perl-packages.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 04db9c7e3ca..9d8bf693078 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8599,17 +8599,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooXTypesMooseLikeNumeric = buildPerlPackage rec {
-    name = "MooX-Types-MooseLike-Numeric-1.02";
+    name = "MooX-Types-MooseLike-Numeric-1.03";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MA/MATEU/${name}.tar.gz";
-      sha256 = "6186f75ab2747723fd979249ec6ee0c4550f5b47aa50c0d222cc7d3590182bb6";
+      sha256 = "16adeb617b963d010179922c2e4e8762df77c75232e17320b459868c4970c44b";
     };
-    buildInputs = [ TestFatal ];
+    buildInputs = [ Moo TestFatal ];
     propagatedBuildInputs = [ MooXTypesMooseLike ];
     meta = {
       description = "Moo types for numbers";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 

From 0f91cdc45f943934a8317992326b43c4e68cda56 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 23 Jan 2017 21:45:01 +0100
Subject: [PATCH 537/727] kwm: init at 4.0.4

---
 pkgs/os-specific/darwin/kwm/default.nix       | 34 +++++++++++++++++++
 .../darwin/kwm/org.nixos.kwm.plist            | 26 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 62 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/kwm/default.nix
 create mode 100644 pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist

diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix
new file mode 100644
index 00000000000..ac231f2dfe3
--- /dev/null
+++ b/pkgs/os-specific/darwin/kwm/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "kwm-${version}";
+  version = "4.0.4";
+
+  src = fetchzip {
+    stripRoot = false;
+    url = "https://github.com/koekeishiya/kwm/releases/download/v${version}/Kwm-${version}.zip";
+    sha256 = "07rf4ichq511w8qmvd6s602s7xcyjhjp73d5c615sj82cxvgirwc";
+  };
+
+  # TODO: Build this properly once we have swiftc.
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp kwmc $out/bin/kwmc
+    cp kwm overlaylib.dylib $out
+
+    mkdir -p $out/Library/LaunchDaemons
+    cp ${./org.nixos.kwm.plist} $out/Library/LaunchDaemons/org.nixos.kwm.plist
+    substituteInPlace $out/Library/LaunchDaemons/org.nixos.kwm.plist --subst-var out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tiling window manager with focus follows mouse for OSX";
+    homepage = https://github.com/koekeishiya/kwm;
+    downloadPage = https://github.com/koekeishiya/kwm/releases;
+    platforms = platforms.darwin;
+    maintainers = with maintainers; [ lnl7 ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist b/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist
new file mode 100644
index 00000000000..eafce2ab4a4
--- /dev/null
+++ b/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>org.nixos.kwm</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>@out@/kwm</string>
+  </array>
+  <key>KeepAlive</key>
+  <true/>
+  <key>Sockets</key>
+  <dict>
+    <key>Listeners</key>
+    <dict>
+      <key>SockServiceName</key>
+      <string>3020</string>
+      <key>SockType</key>
+      <string>dgram</string>
+      <key>SockFamily</key>
+      <string>IPv4</string>
+  </dict>
+</dict>
+</dict>
+</plist>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 944f9c9d225..5dd7ed8ad39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -524,6 +524,8 @@ in
 
   oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { };
 
+  kwm = callPackage ../os-specific/darwin/kwm { };
+
   reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};
 
   install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };

From 32a3f7114943e7f753b3b660a3ab307b4b17da5d Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 23 Jan 2017 19:01:33 -0200
Subject: [PATCH 538/727] libfm: 1.2.4 -> 1.2.5

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

diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index 32eb4e04f03..2b30dacb58f 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_23
+{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_34
 , extraOnly ? false }:
 let
     inherit (stdenv.lib) optional;
@@ -7,14 +7,14 @@ stdenv.mkDerivation rec {
   name = if extraOnly
     then "libfm-extra-${version}"
     else "libfm-${version}";
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz";
-    sha256 = "0bsh4p7h2glhxf1cc1lvbxyb4qy0y1zsnl9izf7vrldkikrgc13q";
+    sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7";
   };
 
-  buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_23 ]
+  buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_34 ]
                 ++ optional (!extraOnly) menu-cache;
 
   configureFlags = optional extraOnly "--with-extra-only";

From 4e2d9401253422febe56e52d848c4e33757514b5 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 23 Jan 2017 19:01:40 -0200
Subject: [PATCH 539/727] pcmanfm: 1.2.4 -> 1.2.5

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

diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index e6d96b099fa..aceeae87d08 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "pcmanfm-1.2.4";
+  name = "pcmanfm-1.2.5";
   src = fetchurl {
     url = "mirror://sourceforge/pcmanfm/${name}.tar.xz";
-    sha256 = "04z3vd9si24yi4c8calqncdpb9b6mbj4cs4f3fs86i6j05gvpk9q";
+    sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc";
   };
 
   buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ];

From bdd5b81f565619efd4bccf634fd69b716309969f Mon Sep 17 00:00:00 2001
From: Thane Gill <me@thanegill.com>
Date: Fri, 20 Jan 2017 22:08:42 -0800
Subject: [PATCH 540/727] Fix syncthing-gtk hard coded paths

---
 pkgs/top-level/python-packages.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ffb1aefdd33..d6456c13645 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25264,9 +25264,11 @@ in {
     '';
 
     patchPhase = ''
-      substituteInPlace "scripts/syncthing-gtk" \
-              --replace "/usr/share" "$out/share"
-      substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'"
+        substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'"
+        substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share"
+        substituteInPlace syncthing_gtk/app.py --replace "/usr/share" "$out/share"
+        substituteInPlace syncthing_gtk/wizard.py --replace "/usr/share" "$out/share"
+        substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk"
     '';
 
     meta = {

From 69bbc78eeec6d3384dc3c20ae1d43b8091bba50a Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 23 Jan 2017 19:16:05 -0200
Subject: [PATCH 541/727] aria2: 1.29.0 -> 1.31.0

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

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index ab82851f178..1f003f67df6 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
-  version = "1.29.0";
+  version = "1.31.0";
 
   src = fetchFromGitHub {
     owner = "aria2";
     repo = "aria2";
     rev = "release-${version}";
-    sha256 = "1ivxz2ld4cl9z29kdicban9dir6s0si2jqn4g11gz587x7pagbim";
+    sha256 = "0d7z4bss1plkvlw5kfwzivxryrh13zi58ii3vf8q4csaz4yqhcjy";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From 1853f174d11040b3901e4c83d89f2578320a2e42 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 23 Jan 2017 21:50:23 +0100
Subject: [PATCH 542/727] opencv-3.1: get ippicv from the nix store

If ippicv can't be found in the directory:

  3rdparty/ippicv/downloads/${platform}-${md5}

it will be downloaded instead. Commit 7fedbe7 accidentally swapped the
md5 with the sha256 causing ippicv to be downloaded each time opencv
gets build. This patch fixes that.
---
 pkgs/development/libraries/opencv/3.x.nix | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 978b28aaa48..831cb1ec67c 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -59,22 +59,21 @@ stdenv.mkDerivation rec {
     });
 
   preConfigure =
-    let ippicvVersion = "20151201";
-        ippicvPlatform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux"
-                         else throw "ICV is not available for this platform (or not yet supported by this package)";
-        ippicvHash = if ippicvPlatform == "linux" then "1nph0w0pdcxwhdb5lxkb8whpwd9ylvwl97hn0k425amg80z86cs3"
-                     else throw "ippicvHash: impossible";
-
-        ippicvName = "ippicv_${ippicvPlatform}_${ippicvVersion}.tgz";
-        ippicvArchive = "3rdparty/ippicv/downloads/linux-${ippicvHash}/${ippicvName}";
+    let version  = "20151201";
+        md5      = "808b791a6eac9ed78d32a7666804320e";
+        sha256   = "1nph0w0pdcxwhdb5lxkb8whpwd9ylvwl97hn0k425amg80z86cs3";
+        platform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux"
+                   else throw "ICV is not available for this platform (or not yet supported by this package)";
+        name = "ippicv_${platform}_${version}.tgz";
         ippicv = fetchurl {
-          url = "https://github.com/Itseez/opencv_3rdparty/raw/ippicv/master_${ippicvVersion}/ippicv/${ippicvName}";
-          sha256 = ippicvHash;
+          url = "https://github.com/Itseez/opencv_3rdparty/raw/ippicv/master_${version}/ippicv/${name}";
+          inherit sha256;
         };
+        dir = "3rdparty/ippicv/downloads/${platform}-${md5}";
     in lib.optionalString enableIpp
       ''
-        mkdir -p $(dirname ${ippicvArchive})
-        ln -s ${ippicv}    ${ippicvArchive}
+        mkdir -p "${dir}"
+        ln -s "${ippicv}" "${dir}/${name}"
       '';
 
   buildInputs =

From 58a5a32dc996853b54bc5141133acf70e2f237d2 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 23 Jan 2017 19:37:13 -0200
Subject: [PATCH 543/727] roboto: 2.135 -> 2.136

---
 pkgs/data/fonts/roboto/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix
index e0d2545973b..fbb364b9d72 100644
--- a/pkgs/data/fonts/roboto/default.nix
+++ b/pkgs/data/fonts/roboto/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "roboto-${version}";
-  version = "2.135";
+  version = "2.136";
 
   src = fetchurl {
     url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip";
-    sha256 = "1ndlh36bcx4mhi58sxfx6ywbib586brh6s5sk3jyji78h1i7j8zr";
+    sha256 = "0yx3q5wbbl1qkxfx1fglzy3rvms98jr8fcfj70vvvz3r3lppv201";
   };
 
   nativeBuildInputs = [ unzip ];

From b63f97c6e66d743a8d4123c6ac511f34ecc68e21 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 23 Jan 2017 21:56:00 +0200
Subject: [PATCH 544/727] installer: Include stdenvNoCC

And don't include ArchiveCpio as that one is no longer needed after
5a8147479 ("make-initrd: create reproducible initrds").
---
 nixos/modules/profiles/installation-device.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index b2973d88b15..91c718559ed 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -66,9 +66,8 @@ with lib;
     boot.kernel.sysctl."vm.overcommit_memory" = "1";
 
     # To speed up installation a little bit, include the complete
-    # stdenv in the Nix store on the CD.  Archive::Cpio is needed for
-    # the initrd builder.
-    system.extraDependencies = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ];
+    # stdenv in the Nix store on the CD.
+    system.extraDependencies = with pkgs; [ stdenv stdenvNoCC busybox ];
 
     # Show all debug messages from the kernel but don't log refused packets
     # because we have the firewall enabled. This makes installs from the

From 60e7f6d1b1ed09e8c81e5034e7ff7fb5cb0a150d Mon Sep 17 00:00:00 2001
From: Casey Ransom <cransom@referentiallabs.com>
Date: Mon, 23 Jan 2017 16:48:09 -0500
Subject: [PATCH 545/727] netdata: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 46932076177..df04ef48730 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }:
 
 stdenv.mkDerivation rec{
-  version = "1.4.0";
+  version = "1.5.0";
   name = "netdata-${version}";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "firehol";
     repo = "netdata";
-    sha256 = "1wknxci2baj6f7rl8z8j7haaz122jmbb74aw7i3xbj2y61cs58n8";
+    sha256 = "1nsv0s11ai1kvig9xr4cz2f2lalvilpbfjpd8fdfqk9fak690zhz";
   };
 
   buildInputs = [ autoreconfHook zlib pkgconfig libuuid ];

From f2afe922f4bd1e1640226f53847385b6bb45e2f0 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 23 Jan 2017 22:51:16 +0100
Subject: [PATCH 546/727] opencv-3.1: make ippicv download URL consistent

with the URL defined in:

  https://github.com/opencv/opencv/blob/3.1.0/3rdparty/ippicv/downloader.cmake
---
 pkgs/development/libraries/opencv/3.x.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 831cb1ec67c..3882d6a6ca4 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -59,14 +59,20 @@ stdenv.mkDerivation rec {
     });
 
   preConfigure =
+    # By default ippicv gets downloaded by cmake each time opencv is build. See:
+    # https://github.com/opencv/opencv/blob/3.1.0/3rdparty/ippicv/downloader.cmake
+    # Fortunately cmake doesn't download ippicv if it's already there.
+    # So to prevent repeated downloads we store it in the nix store
+    # and create a symbolic link to it.
     let version  = "20151201";
         md5      = "808b791a6eac9ed78d32a7666804320e";
         sha256   = "1nph0w0pdcxwhdb5lxkb8whpwd9ylvwl97hn0k425amg80z86cs3";
+        rev      = "81a676001ca8075ada498583e4166079e5744668";
         platform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux"
                    else throw "ICV is not available for this platform (or not yet supported by this package)";
         name = "ippicv_${platform}_${version}.tgz";
         ippicv = fetchurl {
-          url = "https://github.com/Itseez/opencv_3rdparty/raw/ippicv/master_${version}/ippicv/${name}";
+          url = "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${rev}/ippicv/${name}";
           inherit sha256;
         };
         dir = "3rdparty/ippicv/downloads/${platform}-${md5}";

From 4f9f00fcc9ba5fce1bf476bf3e3200bdbed00f48 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 23 Jan 2017 18:35:03 -0500
Subject: [PATCH 547/727] Add function to build a ghc standalone archive
 (OSX/iOS only)

---
 pkgs/development/compilers/ghc/head.nix            | 13 ++++++++++++-
 .../darwin/ghc-standalone-archive/default.nix      | 14 ++++++++++++++
 pkgs/top-level/all-packages.nix                    |  2 ++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/darwin/ghc-standalone-archive/default.nix

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 971365eda48..6ff29d600fc 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -85,8 +85,17 @@ in stdenv.mkDerivation (rec {
 } // stdenv.lib.optionalAttrs (cross != null) {
   name = "${cross.config}-ghc-${version}";
 
+  patches = [ ./ios-linker.patch ];
+
   preConfigure = commonPreConfigure + ''
-    sed 's|#BuildFlavour  = quick-cross|BuildFlavour  = perf-cross|' mk/build.mk.sample > mk/build.mk
+    sed 's|#BuildFlavour  = quick-cross|BuildFlavour  = quick-cross|' mk/build.mk.sample > mk/build.mk
+    echo "GhcRtsCcOpts = -glldb -Og" >> mk/build.mk
+  '';
+
+  postUnpack = ''
+    mkdir -p $out/nix-support
+    mv $sourceRoot $out/nix-support/source
+    sourceRoot=$out/nix-support/source
   '';
 
   configureFlags = [
@@ -103,6 +112,8 @@ in stdenv.mkDerivation (rec {
 
   dontSetConfigureCross = true;
 
+  dontStrip = true;
+
   passthru = {
     inherit bootPkgs cross;
 
diff --git a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix
new file mode 100644
index 00000000000..d23328d362e
--- /dev/null
+++ b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix
@@ -0,0 +1,14 @@
+{ runCommand, cctools }:
+{ haskellPackages, src, deps ? p : [], name }: let
+  inherit (haskellPackages) ghc ghcWithPackages;
+  with-env = ghcWithPackages deps;
+  crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else "";
+  ghcName = "${crossPrefix}ghc";
+in runCommand name { buildInputs = [ with-env cctools ]; } ''
+  mkdir -p $out/lib
+  mkdir -p $out/include
+  ${ghcName} ${src} -staticlib -outputdir . -o $out/lib/${name}.a -stubdir $out/include
+  for file in ${ghc}/lib/${ghcName}-${ghc.version}/include/*; do
+    ln -sv $file $out/include
+  done
+''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 944f9c9d225..8d2b4cf5201 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18042,4 +18042,6 @@ in
   simplenote = callPackage ../applications/misc/simplenote { };
 
   hy = callPackage ../development/interpreters/hy {};
+
+  ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; };
 }

From 46bec22f66ddf26106a5ecf05dc8ce97a7219a6b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 23 Jan 2017 18:37:15 -0500
Subject: [PATCH 548/727] Revert "Add function to build a ghc standalone
 archive (OSX/iOS only)"

Partial revert of accidental changes.

This reverts commit 4f9f00fcc9ba5fce1bf476bf3e3200bdbed00f48.
---
 pkgs/development/compilers/ghc/head.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 6ff29d600fc..971365eda48 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -85,17 +85,8 @@ in stdenv.mkDerivation (rec {
 } // stdenv.lib.optionalAttrs (cross != null) {
   name = "${cross.config}-ghc-${version}";
 
-  patches = [ ./ios-linker.patch ];
-
   preConfigure = commonPreConfigure + ''
-    sed 's|#BuildFlavour  = quick-cross|BuildFlavour  = quick-cross|' mk/build.mk.sample > mk/build.mk
-    echo "GhcRtsCcOpts = -glldb -Og" >> mk/build.mk
-  '';
-
-  postUnpack = ''
-    mkdir -p $out/nix-support
-    mv $sourceRoot $out/nix-support/source
-    sourceRoot=$out/nix-support/source
+    sed 's|#BuildFlavour  = quick-cross|BuildFlavour  = perf-cross|' mk/build.mk.sample > mk/build.mk
   '';
 
   configureFlags = [
@@ -112,8 +103,6 @@ in stdenv.mkDerivation (rec {
 
   dontSetConfigureCross = true;
 
-  dontStrip = true;
-
   passthru = {
     inherit bootPkgs cross;
 

From b9604116378c9a5241cfce136c9470d6def49e81 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 24 Jan 2017 08:58:01 +0800
Subject: [PATCH 549/727] dropbox: 17.4.33 -> 18.4.32

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 2ea1de96109..f665e0ea325 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 = "17.4.33";
+  version = "18.4.32";
   sha256 =
     {
-      "x86_64-linux" = "0q3afwzd48mdv4mj4zbm6bvafj4hv18ianzhwjxz5dj6njv7s47y";
-      "i686-linux"   = "0wgq94if8wx08kqzsj6n20aia29h1qfn448ww63yn8dvkp6nlpya";
+      "x86_64-linux" = "0rm91gic6qwlvkclhwpw9mhsb1l9qdxqi7kyvn5ij6a978c70k5r";
+      "i686-linux"   = "0xzk4hxykacvrym8ls8q4zv2277adg6b5m7zmncmfwb6igx4ipap";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From a1906fb54136a046fc7667578a240d3d7eb32ec6 Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Mon, 23 Jan 2017 17:54:43 -0800
Subject: [PATCH 550/727] pythonPackages.foolscap: 0.10.1 -> 0.12.6

---
 pkgs/top-level/python-packages.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 03977936121..4d9ebdca2e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11778,14 +11778,21 @@ in {
   });
 
   foolscap = buildPythonPackage (rec {
-    name = "foolscap-0.10.1";
+    name = "foolscap-${version}";
+    version = "0.12.6";
 
     src = pkgs.fetchurl {
-      url = "http://foolscap.lothar.com/releases/${name}.tar.gz";
-      sha256 = "1wrnbdq3y3lfxnhx30yj9xbr3iy9512jb60k8qi1da1phalnwz5x";
+      url = "mirror://pypi/f/foolscap/${name}.tar.gz";
+      sha256 = "1bpmqq6485mmr5jza9q2c55l9m1bfsvsbd9drsip7p5qcsi22jrz";
     };
 
-    propagatedBuildInputs = [ self.twisted self.pyopenssl self.service-identity ];
+    propagatedBuildInputs = with self; [ mock twisted pyopenssl service-identity ];
+
+    checkPhase = ''
+      # Either uncomment this, or remove this custom check phase entirely, if
+      # you wish to do battle with the foolscap tests. ~ C.
+      # trial foolscap
+    '';
 
     meta = {
       homepage = http://foolscap.lothar.com/;

From c90cab9d8ae1c164656e4bc87b8b4c706160ac1e Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Mon, 23 Jan 2017 17:55:14 -0800
Subject: [PATCH 551/727] tahoelafs: 1.11.0 -> 1.12.1

---
 pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 6b88d2d2b7d..4bdc630efd7 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -6,13 +6,13 @@
 # some loss of functionality because of it.
 
 pythonPackages.buildPythonApplication rec {
-  version = "1.11.0";
+  version = "1.12.1";
   name = "tahoe-lafs-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://tahoe-lafs.org/downloads/tahoe-lafs-${version}.tar.bz2";
-    sha256 = "0hrp87rarbmmpnrxk91s83h6irkykds3pl263dagcddbdl5inqdi";
+    sha256 = "0x9f1kjym1188fp6l5sqy0zz8mdb4xw861bni2ccv26q482ynbks";
   };
 
   patchPhase = ''
@@ -36,7 +36,7 @@ pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [
     twisted foolscap nevow simplejson zfec pycryptopp darcsver
     setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface
-    service-identity
+    service-identity pyyaml
   ];
 
   postInstall = ''

From 46a522698e6aaf144e18876b1d5b14d03dc2523d Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Sat, 21 Jan 2017 19:17:46 -0800
Subject: [PATCH 552/727] pythonPackages.twisted: Fix inotify on Linux.

---
 pkgs/top-level/python-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d9ebdca2e5..8df763844c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26101,6 +26101,13 @@ in {
 
     propagatedBuildInputs = with self; [ zope_interface ];
 
+    # Patch t.p._inotify to point to libc. Without this,
+    # twisted.python.runtime.platform.supportsINotify() == False
+    patchPhase = optionalString stdenv.isLinux ''
+      substituteInPlace twisted/python/_inotify.py --replace \
+        "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'"
+    '';
+
     # Generate Twisted's plug-in cache.  Twisted users must do it as well.  See
     # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3
     # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for

From de4c9e0d1569fe61e973c9889ef36cb285bde406 Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Sun, 22 Jan 2017 01:23:28 -0800
Subject: [PATCH 553/727] nixos/services/tahoe: Work around awkward command.

---
 nixos/modules/services/network-filesystems/tahoe.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix
index ab9eac3829f..f63f641d00b 100644
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@@ -343,7 +343,7 @@ in
             preStart = ''
               if [ \! -d ${nodedir} ]; then
                 mkdir -p /var/db/tahoe-lafs
-                tahoe create-node ${nodedir}
+                tahoe create-node --hostname=localhost ${nodedir}
               fi
 
               # Tahoe has created a predefined tahoe.cfg which we must now

From be1b5c2a68e25d9897f4713b93a680b96ba1f22f Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 23 Jan 2017 21:54:38 -0500
Subject: [PATCH 554/727] exercism: Broaden platforms to include darwin, etc

---
 pkgs/applications/misc/exercism/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index 6ccae9d5360..962d8f8b31f 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -18,6 +18,6 @@ buildGoPackage rec {
    homepage    = http://exercism.io/cli;
    license     = licenses.mit;
    maintainers = [ maintainers.rbasso ];
-   platforms   = platforms.linux;
+   platforms   = platforms.unix;
   };
 }

From 4ef84c31157bccce1d159599980d8962c9ce92c8 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 24 Jan 2017 13:36:42 +0900
Subject: [PATCH 555/727] groonga: 6.1.1 -> 6.1.5

---
 pkgs/servers/search/groonga/default.nix | 36 +++++++++++--------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 8dce24948fe..6e3ab5a4eae 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -1,46 +1,42 @@
 { stdenv, fetchurl, mecab, kytea, libedit, pkgconfig
 , suggestSupport ? false, zeromq, libevent, libmsgpack
-, lz4Support ? false, lz4
+, lz4Support  ? false, lz4
 , zlibSupport ? false, zlib
 }:
 
 stdenv.mkDerivation rec {
 
   name    = "groonga-${version}";
-  version = "6.1.1";
+  version = "6.1.5";
 
   src = fetchurl {
     url    = "http://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "03h65gycy0j2q4n5h62x3sw76ibdywdvmiciys5a7ppxb2mncabz";
+    sha256 = "0phh4qp7ky5rw8xgxv3gjzw2cadkjl604xrdyxxbpd30i354sh5x";
   };
 
-  buildInputs = with stdenv.lib; [ pkgconfig mecab kytea libedit ] ++
-    optional lz4Support lz4 ++
-    optional zlibSupport zlib ++
-    optional suggestSupport [ zeromq libevent libmsgpack ];
+  buildInputs = with stdenv.lib;
+     [ pkgconfig mecab kytea libedit ]
+    ++ optional lz4Support lz4
+    ++ optional zlibSupport zlib
+    ++ optionals suggestSupport [ zeromq libevent libmsgpack ];
 
-  configureFlags = with stdenv.lib; ''
-    ${optionalString zlibSupport "--with-zlib"}
-    ${optionalString lz4Support "--with-lz4"}
-  '';
-
-  doInstallCheck = true;
+  configureFlags = with stdenv.lib;
+       optional zlibSupport "--with-zlib"
+    ++ optional lz4Support  "--with-lz4";
 
+  doInstallCheck    = true;
   installCheckPhase = "$out/bin/groonga --version";
 
   meta = with stdenv.lib; {
-    homepage = http://groonga.org/;
+    homepage    = http://groonga.org/;
     description = "An open-source fulltext search engine and column store";
-
+    license     = licenses.lgpl21;
+    maintainers = [ maintainers.ericsagnes ];
+    platforms   = platforms.linux;
     longDescription = ''
       Groonga is an open-source fulltext search engine and column store. 
       It lets you write high-performance applications that requires fulltext search.
     '';
-
-    license = licenses.lgpl21;
-
-    maintainers = [ maintainers.ericsagnes ];
-    platforms = platforms.linux;
   };
 
 }

From f50b61b27519a4848761ac8190fde761efc396f2 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Tue, 24 Jan 2017 07:18:15 +0100
Subject: [PATCH 556/727] pasystray: 0.5.2 -> 0.6.0

---
 pkgs/tools/audio/pasystray/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index 8b5427ed626..c50805c578f 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -2,13 +2,14 @@
 , gnome3, avahi, gtk3, libnotify, libpulseaudio, xlibsWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "pasystray-0.5.2";
+  name = "pasystray-${version}";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "christophgysin";
     repo = "pasystray";
-    rev = "6709fc1e9f792baf4f7b4507a887d5876b2cfa70";
-    sha256 = "1z21wassdiwfnlcrkpdqh8ylblpd1xxjxcmib5mwix9va2lykdfv";
+    rev = name;
+    sha256 = "0k13s7pmz5ks3kli8pwhzd47hcjwv46gd2fgk7i4fbkfwf3z279h";
   };
 
   buildInputs = [ autoconf automake makeWrapper pkgconfig 
@@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
     description = "PulseAudio system tray";
     homepage = "https://github.com/christophgysin/pasystray";
     license = licenses.lgpl21Plus;
-    maintainers = [ maintainers.exlevan ];
+    maintainers = with maintainers; [ exlevan kamilchm ];
     platforms = platforms.linux;
   };
 }

From adfb7e1f13c3129262551c4cee1912962bafdd2c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 24 Jan 2017 08:31:11 +0100
Subject: [PATCH 557/727] kwm: init at 1.1.4

---
 pkgs/os-specific/darwin/khd/default.nix       | 42 +++++++++++++++++++
 .../darwin/khd/org.nixos.khd.plist            | 33 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 79 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/khd/default.nix
 create mode 100644 pkgs/os-specific/darwin/khd/org.nixos.khd.plist

diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix
new file mode 100644
index 00000000000..f08073a8901
--- /dev/null
+++ b/pkgs/os-specific/darwin/khd/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, Carbon, Cocoa }:
+
+stdenv.mkDerivation rec {
+  name = "khd-${version}";
+  version = "1.1.4";
+
+  src = fetchFromGitHub {
+    owner = "koekeishiya";
+    repo = "khd";
+    rev = "v${version}";
+    sha256 = "1klia3fywl0c88zbp5wdn6kxhdwdry1jwmkj27vpv8vzvdfzwfmy";
+  };
+
+  buildInputs = [ Carbon Cocoa ];
+
+  prePatch = ''
+    substituteInPlace makefile \
+      --replace g++ clang++
+  '';
+
+  buildPhase = ''
+    make install
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/khd $out/bin/khd
+
+    mkdir -p $out/Library/LaunchDaemons
+    cp ${./org.nixos.khd.plist} $out/Library/LaunchDaemons/org.nixos.khd.plist
+    substituteInPlace $out/Library/LaunchDaemons/org.nixos.khd.plist --subst-var out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple modal hototkey daemon for OSX";
+    homepage = https://github.com/koekeishiya/khd;
+    downloadPage = https://github.com/koekeishiya/khd/releases;
+    platforms = platforms.darwin;
+    maintainers = with maintainers; [ lnl7 ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/os-specific/darwin/khd/org.nixos.khd.plist b/pkgs/os-specific/darwin/khd/org.nixos.khd.plist
new file mode 100644
index 00000000000..3c0aaa81eb6
--- /dev/null
+++ b/pkgs/os-specific/darwin/khd/org.nixos.khd.plist
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>org.nixos.khd</string>
+  <key>ProgramArguments</key>
+  <array>
+  <string>@out@/bin/khd</string>
+  </array>
+  <key>KeepAlive</key>
+  <true/>
+  <key>ProcessType</key>
+  <string>Interactive</string>
+  <key>EnvironmentVariables</key>
+  <dict>
+    <key>PATH</key>
+    <string>@out@/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+  </dict>
+  <key>Sockets</key>
+  <dict>
+    <key>Listeners</key>
+    <dict>
+      <key>SockServiceName</key>
+      <string>3021</string>
+      <key>SockType</key>
+      <string>dgram</string>
+      <key>SockFamily</key>
+      <string>IPv4</string>
+    </dict>
+  </dict>
+</dict>
+</plist>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 944f9c9d225..84ea9ddb87a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -524,6 +524,10 @@ in
 
   oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { };
 
+  khd = callPackage ../os-specific/darwin/khd {
+    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+  };
+
   reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};
 
   install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };

From fd26ad6f764510d0234e8dcf5998a13b4b5a424b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 24 Jan 2017 09:59:54 +0100
Subject: [PATCH 558/727] nixos programs.man.enable: improve description

---
 nixos/modules/programs/man.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/programs/man.nix b/nixos/modules/programs/man.nix
index e59ffd6f936..5b20a38d885 100644
--- a/nixos/modules/programs/man.nix
+++ b/nixos/modules/programs/man.nix
@@ -11,6 +11,7 @@ with lib;
       default = true;
       description = ''
         Whether to enable manual pages and the <command>man</command> command.
+        This also includes "man" outputs of all <literal>systemPackages</literal>.
       '';
     };
 

From 4f7fe2706583e389e0431071dc416f76962ea5d5 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 24 Jan 2017 10:55:29 +0100
Subject: [PATCH 559/727] titaniumenv: use Node.js 4.x for the CLI tools

---
 pkgs/development/mobile/titaniumenv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index ae7a16984b8..8f1a5154788 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -19,7 +19,7 @@ rec {
   
   buildApp = import ./build-app.nix {
     inherit (pkgs) stdenv python which jdk nodejs;
-    inherit (pkgs.nodePackages) titanium alloy;
+    inherit (pkgs.nodePackages_4_x) titanium alloy;
     inherit (androidenv) androidsdk;
     inherit (xcodeenv) xcodewrapper;
     inherit titaniumsdk xcodeBaseDir;

From 7c5324f29ad67aca5b4fee3074e70e807249e46f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Jan 2017 11:46:56 +0100
Subject: [PATCH 560/727] nftables: disable broken xtables support

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

diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 78b13b902c8..c06de7ea6f2 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, docbook2x, docbook_xml_dtd_45
-, flex, bison, libmnl, libnftnl, gmp, readline, iptables }:
+, flex, bison, libmnl, libnftnl, gmp, readline }:
 
 stdenv.mkDerivation rec {
   name = "nftables-0.7";
@@ -12,13 +12,12 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "CONFIG_MAN=y"
     "DB2MAN=docbook2man"
-    "--with-xtables"
   ];
 
   XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
 
   nativeBuildInputs = [ pkgconfig docbook2x flex bison ];
-  buildInputs = [ libmnl libnftnl gmp readline iptables ];
+  buildInputs = [ libmnl libnftnl gmp readline ];
 
   meta = with stdenv.lib; {
     description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework";

From de8148d74c61736c88a0b3ae5822e730098a8242 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 24 Jan 2017 11:57:09 +0100
Subject: [PATCH 561/727] haskellPackages.doctest-discover: fix

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 90e80e21406..fdb04681b2c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -693,6 +693,9 @@ self: super: {
   # https://github.com/nushio3/doctest-prop/issues/1
   doctest-prop = dontCheck super.doctest-prop;
 
+  # Depends on itself for testing
+  doctest-discover = addBuildTool super.doctest-discover (dontCheck super.doctest-discover);
+
   # https://github.com/bos/aeson/issues/253
   aeson = dontCheck super.aeson;
 

From b3b300b6ff1353008f42cf1b65d8d8ea0e0c5a36 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 17 Jan 2017 17:07:52 +0100
Subject: [PATCH 562/727] smokeping: setuid for fping6

---
 nixos/modules/services/networking/smokeping.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index 04312c39062..6648ada0c0d 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -273,7 +273,7 @@ in
         message = "services.smokeping: sendmail and Mailhost cannot both be enabled.";
       }
     ];
-    security.setuidPrograms = [ "fping" ];
+    security.setuidPrograms = [ "fping" "fping6" ];
     environment.systemPackages = [ pkgs.fping ];
     users.extraUsers = singleton {
       name = cfg.user;

From a82810c7a7e62848b75739b1cccddca8f1363c75 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 24 Jan 2017 11:37:35 +0100
Subject: [PATCH 563/727] linux: Apply 9p veryloose patch to 4.9

---
 pkgs/os-specific/linux/kernel/patches.nix | 6 +++---
 pkgs/top-level/all-packages.nix           | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 42a6e0d037b..ec114f93e83 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -175,12 +175,12 @@ rec {
       };
     };
 
-  p9_caching_4_4 = rec
+  p9_caching_4_9 = rec
     { name = "9p-caching.patch";
       patch = fetchpatch {
         inherit name;
-        url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch;
-        sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2";
+        url = https://github.com/edolstra/linux/commit/7e20254412c780a2102761fee92cb1d32ceeaefd.patch;
+        sha256 = "001kf1sdy6pirn8sqnfgbfahvwwkc7n7vr5i8fy2n74xph1kks5a";
       };
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d2b4cf5201..ac59998dde4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11243,7 +11243,6 @@ in
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
-        kernelPatches.p9_caching_4_4
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11260,6 +11259,7 @@ in
         # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
         # kernelPatches.cpu-cgroup-v2."4.7"
         kernelPatches.modinst_arg_list_too_long
+        kernelPatches.p9_caching_4_9
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11272,6 +11272,7 @@ in
     kernelPatches = [
       kernelPatches.bridge_stp_helper
       kernelPatches.modinst_arg_list_too_long
+      kernelPatches.p9_caching_4_9
     ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
       kernelPatches.mips_fpureg_emu
       kernelPatches.mips_fpu_sigill

From 86af731cf81e78811251a891e8693b28058bd1b9 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 22 Jan 2017 21:41:51 +0100
Subject: [PATCH 564/727] hubicfuse: 2.1.0 -> 3.0.0

* bump version
* fetchurl -> fetchFromGitHub
---
 pkgs/tools/filesystems/hubicfuse/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix
index 7ce48d28803..2188e957082 100644
--- a/pkgs/tools/filesystems/hubicfuse/default.nix
+++ b/pkgs/tools/filesystems/hubicfuse/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }:
+{ stdenv, fetchFromGitHub, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }:
 
 stdenv.mkDerivation rec {
   name = "hubicfuse-${version}";
-  version = "2.1.0";
+  version = "3.0.0";
 
-  src = fetchurl {
-    url = https://github.com/TurboGit/hubicfuse/archive/v2.1.0.tar.gz;
-    sha256 = "1mnijcwac6k3f6xknvdrsbmkkizpwbayqkb5l6jic15ymxv1fs7d";
+  src = fetchFromGitHub {
+    owner = "TurboGit";
+    repo = "hubicfuse";
+    rev = "v${version}";
+    sha256 = "1y4n63bk9vd6n1l5psjb9xm9h042kw4yh2ni33z7agixkanajv1s";
   };
 
   buildInputs = [ pkgconfig curl openssl fuse libxml2 json_c file ];

From 11f878a0e54818b2feb226b9b5a7cc22ffb9dd36 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 22 Jan 2017 22:51:40 +0100
Subject: [PATCH 565/727] add a maintainer

---
 lib/maintainers.nix                          | 1 +
 pkgs/tools/filesystems/hubicfuse/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 1e9a6fe0f0d..075c9c934b7 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -227,6 +227,7 @@
   joko = "Ioannis Koutras <ioannis.koutras@gmail.com>";
   jonafato = "Jon Banafato <jon@jonafato.com>";
   jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
+  jpierre03 = "Jean-Pierre PRUNARET <nix@prunetwork.fr>";
   jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>";
   juliendehos = "Julien Dehos <dehos@lisic.univ-littoral.fr>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix
index 2188e957082..88922d9ce94 100644
--- a/pkgs/tools/filesystems/hubicfuse/default.nix
+++ b/pkgs/tools/filesystems/hubicfuse/default.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     description = "FUSE-based filesystem to access hubic cloud storage";
     platforms = platforms.linux;
     license = licenses.mit;
+    maintainers = [ maintainers.jpierre03 ];
   };
 }

From de9a4f5fb4ecc1045dd15f65b0ae371ad36b8365 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 24 Jan 2017 13:21:52 +0100
Subject: [PATCH 566/727] titaniumenv: add 6.0 SDK + bump kitchensink testcase

---
 .../mobile/titaniumenv/default.nix            |  3 +-
 .../mobile/titaniumenv/examples/default.nix   |  2 +-
 .../examples/kitchensink/default.nix          |  4 +-
 .../mobile/titaniumenv/titaniumsdk-6.0.nix    | 39 +++++++++++++++++++
 4 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix

diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index 8f1a5154788..b3c48d55ab7 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,4 +1,4 @@
-{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "5.2.3.GA"}:
+{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.0.2.GA"}:
 
 rec {
   androidenv = pkgs.androidenv;
@@ -11,6 +11,7 @@ rec {
   titaniumsdk = let
     titaniumSdkFile = if tiVersion == "5.1.2.GA" then ./titaniumsdk-5.1.nix
       else if tiVersion == "5.2.3.GA" then ./titaniumsdk-5.2.nix
+      else if tiVersion == "6.0.2.GA" then ./titaniumsdk-6.0.nix
       else throw "Titanium version not supported: "+tiVersion;
     in
     import titaniumSdkFile {
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index ffeefdbbbcf..612eb40d192 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -2,7 +2,7 @@
 , systems ? [ "x86_64-linux" "x86_64-darwin" ]
 , xcodeVersion ? "7.2"
 , xcodeBaseDir ? "/Applications/Xcode.app"
-, tiVersion ? "5.1.2.GA"
+, tiVersion ? "6.0.2.GA"
 , rename ? false
 , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2"
 , enableWirelessDistribution ? false, installURL ? null
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index 60b96548da4..4abf650ebee 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -8,8 +8,8 @@ assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioning
 let
   src = fetchgit {
     url = https://github.com/appcelerator/KitchenSink.git;
-    rev = "6e9f509069fafdebfa78e15b2d14f20a27a485cc";
-    sha256 = "049cf0d9y0ivhsi35slx621z0wry4lqf76hw0ksb315i2713v347";
+    rev = "ec9edebf35030f61368000a8a9071dd7a0773884";
+    sha256 = "1j41w4nhcbl40x550pjgabqrach80f9dybv7ya32771wnw2000iy";
   };
   
   # Rename the bundle id to something else
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix
new file mode 100644
index 00000000000..fdaaff39453
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix
@@ -0,0 +1,39 @@
+{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+
+stdenv.mkDerivation {
+  name = "mobilesdk-6.0.2.GA";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+    url = http://builds.appcelerator.com/mobile/6_0_X/mobilesdk-6.0.2.v20170123140026-linux.zip;
+    sha256 = "1yjhr4fgjnxfxzwmgw71yynrfzhsjqj2cirjr5rd14zlp4q9751q";
+  }
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
+    url = http://builds.appcelerator.com/mobile/6_0_X/mobilesdk-6.0.2.v20170123140026-osx.zip;
+    sha256 = "1ijd1wp56ygy238xpcffy112akim208wbv5zm901dvych83ibw1c";
+  }
+  else throw "Platform: ${stdenv.system} not supported!";
+  
+  buildInputs = [ unzip makeWrapper ];
+  
+  buildCommand = ''
+    mkdir -p $out
+    cd $out
+    (yes y | unzip $src) || true
+    
+    # Rename ugly version number
+    cd mobilesdk/*
+    mv * 6.0.2.GA
+    cd *
+    
+    # Patch some executables
+    
+    ${if stdenv.system == "i686-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32
+      ''
+      else if stdenv.system == "x86_64-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64
+      ''
+      else ""}
+  '';
+}

From 7bc801e282fbd8f1a7fc9f92395e738f95ddc731 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 24 Jan 2017 13:51:30 +0100
Subject: [PATCH 567/727] curl: Apply upstream patch to fix https hangs

https://github.com/curl/curl/issues/1174

Fixes https://github.com/NixOS/nix/issues/1181.
---
 pkgs/tools/networking/curl/default.nix      |  4 +++
 pkgs/tools/networking/curl/issue-1174.patch | 34 +++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/networking/curl/issue-1174.patch

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 9ed56ee1ec5..a8006997422 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -25,8 +25,12 @@ stdenv.mkDerivation rec {
     sha256 = "16rqhyzlpnivifin8n7l2fr9ihay9v2nw2drsniinb6bcykqaqfi";
   };
 
+  patches = [ ./issue-1174.patch ];
+
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
 
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ pkgconfig perl ];
 
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
diff --git a/pkgs/tools/networking/curl/issue-1174.patch b/pkgs/tools/networking/curl/issue-1174.patch
new file mode 100644
index 00000000000..eceeef8b001
--- /dev/null
+++ b/pkgs/tools/networking/curl/issue-1174.patch
@@ -0,0 +1,34 @@
+commit a7b38c9dc98481e4a5fc37e51a8690337c674dfb
+Author: Daniel Stenberg <daniel@haxx.se>
+Date:   Mon Dec 26 00:06:33 2016 +0100
+
+    vtls: s/SSLEAY/OPENSSL
+    
+    Fixed an old leftover use of the USE_SSLEAY define which would make a
+    socket get removed from the applications sockets to monitor when the
+    multi_socket API was used, leading to timeouts.
+    
+    Bug: #1174
+
+diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
+index b808e1c..707f24b 100644
+--- a/lib/vtls/vtls.c
++++ b/lib/vtls/vtls.c
+@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data)
+   curlssl_close_all(data);
+ }
+ 
+-#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
++#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
+     defined(USE_DARWINSSL) || defined(USE_NSS)
+ /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */
+ int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
+@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn,
+   (void)numsocks;
+   return GETSOCK_BLANK;
+ }
+-/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
++/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
+ #endif
+ 
+ void Curl_ssl_close(struct connectdata *conn, int sockindex)

From fee579701d0868d8896513197580a4876a49ef5e Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 24 Jan 2017 10:53:58 -0200
Subject: [PATCH 568/727] hexchat: 2.12.3 -> 2.12.4

- Update hexchat to version 2.12.4
- Use sources from github, as the source at
http://dl.hexchat.net/hexchat/hexchat-2.12.4.tar.xz contains invalid symbolic
links in the directory 'build-aux'
- Run 'autogen.sh' to generate 'configure' and friends, as they are not
available in the distributed sources from github.
---
 .../networking/irc/hexchat/default.nix        | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index 4d7ebbfac2e..80eea8219be 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, lua, perl, python
+{ stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python
 , libtool, pciutils, dbus_glib, libcanberra_gtk2, libproxy
 , libsexy, enchant, libnotify, openssl, intltool
 , desktop_file_utils, hicolor_icon_theme
+, autoconf, automake, autoconf-archive
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.12.3";
+  version = "2.12.4";
   name = "hexchat-${version}";
 
-  src = fetchurl {
-    url = "http://dl.hexchat.net/hexchat/${name}.tar.xz";
-    sha256 = "1fpj2kk1p85snffchqxsz3sphhcgiripjw41mgzxi7ks5hvj4avg";
+  src = fetchFromGitHub {
+    owner = "hexchat";
+    repo = "hexchat";
+    rev = "v${version}";
+    sha256 = "1z8v7jg1mc2277k3jihnq4rixw1q27305aw6b6rpb1x7vpiy2zr3";
   };
 
   nativeBuildInputs = [
     pkgconfig libtool intltool
+    autoconf autoconf-archive automake
   ];
 
   buildInputs = [
@@ -24,11 +28,15 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
- #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path
+  #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path
   patchPhase = ''
     sed -i "s,libenchant.so.1,${enchant}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c
   '';
 
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
   configureFlags = [ "--enable-shm" "--enable-textfe" ];
 
   meta = with stdenv.lib; {

From 9c9424d31681d32f701bbd52303d714ea558deb2 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 24 Jan 2017 22:10:58 +0900
Subject: [PATCH 569/727] firefox: 50.1.0 -> 51.0, firefox-esr: 45.6.0esr ->
 45.7.0esr

---
 pkgs/applications/networking/browsers/firefox/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 6a688de02d0..1c4b5fc9d52 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -148,8 +148,8 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "50.1.0";
-    sha512 = "370d2e9b8c4b1b59c3394659c3a7f0f79e6a911ccd9f32095b50b3a22d087132b1f7cb87b734f7497c4381b1df6df80d120b4b87c13eecc425cc66f56acccba5";
+    version = "51.0";
+    sha512 = "4406f840a7a2b4e76a74e846d702b717618fb5b677f1c6df864c3428033dd22aad295d656f1fc57e581fd202d894c5483a16691a60b6ca7710315b157b812467";
     updateScript = import ./update.nix {
         name = "firefox";
         inherit writeScript xidel coreutils gnused gnugrep curl ed;
@@ -158,8 +158,8 @@ in {
 
   firefox-esr-unwrapped = common {
     pname = "firefox-esr";
-    version = "45.6.0esr";
-    sha512 = "b96c71aeed8a1185a085512f33d454a1735237cd9ddf37c8caa9cc91892eafab0615fc0ca6035f282ca8101489fa84c0de1087d1963c05b64df32b0c86446610";
+    version = "45.7.0esr";
+    sha512 = "6424101b6958191ce654d0619950dfbf98d4aa6bdd979306a2df8d6d30d3fecf1ab44638061a2b4fb1af85fe972f5ff49400e8eeda30cdcb9087c4b110b97a7d";
     updateScript = import ./update.nix {
         name = "firefox-esr";
         versionSuffix = "esr";

From 52d44b76c1634ecb2508bb1d0f8000232bc56aba Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 24 Jan 2017 09:25:10 +0100
Subject: [PATCH 570/727] opencv: upgrade from 3.1.0 to 3.2.0

---
 pkgs/development/libraries/opencv/3.x.nix | 156 ++++++++++++----------
 1 file changed, 87 insertions(+), 69 deletions(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 3882d6a6ca4..af0456c0162 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -1,86 +1,103 @@
-{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, cmake, pkgconfig, unzip
-, zlib
-, enableIpp ? false
-, enableContrib ? false
-, enablePython ? false, pythonPackages
-, enableGtk2 ? false, gtk2
-, enableGtk3 ? false, gtk3
-, enableJPEG ? true, libjpeg
-, enablePNG ? true, libpng
-, enableTIFF ? true, libtiff
-, enableWebP ? true, libwebp
-, enableEXR ? true, openexr, ilmbase
-, enableJPEG2K ? true, jasper
-, enableFfmpeg ? false, ffmpeg
+{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, cmake, pkgconfig, unzip, zlib
+
+, enableJPEG      ? true, libjpeg
+, enablePNG       ? true, libpng
+, enableTIFF      ? true, libtiff
+, enableWebP      ? true, libwebp
+, enableEXR       ? true, openexr, ilmbase
+, enableJPEG2K    ? true, jasper
+
+, enableIpp       ? false
+, enableContrib   ? false, protobuf3_1
+, enablePython    ? false, pythonPackages
+, enableGtk2      ? false, gtk2
+, enableGtk3      ? false, gtk3
+, enableFfmpeg    ? false, ffmpeg
 , enableGStreamer ? false, gst_all_1
-, enableEigen ? false, eigen
-, enableCuda ? false, cudatoolkit, gcc5
+, enableEigen     ? false, eigen
+, enableCuda      ? false, cudatoolkit, gcc5
 }:
 
 let
-  version = "3.1.0";
+  version = "3.2.0";
+
+  src = fetchFromGitHub {
+    owner  = "opencv";
+    repo   = "opencv";
+    rev    = version;
+    sha256 = "0f59g0dvhp5xg1xa3r4lp351a7x0k03i77ylgcf69ns3y47qd16p";
+  };
 
   contribSrc = fetchFromGitHub {
-    owner = "Itseez";
-    repo = "opencv_contrib";
-    rev = version;
-    sha256 = "153yx62f34gl3zd6vgxv0fj3wccwmq78lnawlda1f6xhrclg9bax";
+    owner  = "opencv";
+    repo   = "opencv_contrib";
+    rev    = version;
+    sha256 = "1lynpbxz1jay3ya5y45zac5v8c6ifgk4ssn8d1chfdk3spi691jj";
+  };
+
+  vggFiles = fetchFromGitHub {
+    owner  = "opencv";
+    repo   = "opencv_3rdparty";
+    rev    = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d";
+    sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy";
+  };
+
+  bootdescFiles = fetchFromGitHub {
+    owner  = "opencv";
+    repo   = "opencv_3rdparty";
+    rev    = "34e4206aef44d50e6bbcd0ab06354b52e7466d26";
+    sha256 = "13yig1xhvgghvxspxmdidss5lqiikpjr0ddm83jsi0k85j92sn62";
   };
 
   opencvFlag = name: enabled: "-DWITH_${name}=${if enabled then "ON" else "OFF"}";
-
 in
 
 stdenv.mkDerivation rec {
   name = "opencv-${version}";
-  inherit version;
+  inherit version src;
 
-  src = fetchFromGitHub {
-    owner = "Itseez";
-    repo = "opencv";
-    rev = version;
-    sha256 = "1l0w12czavgs0wzw1c594g358ilvfg2fn32cn8z7pv84zxj4g429";
-  };
+  postUnpack =
+    (lib.optionalString enableContrib ''
+      cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
 
-  patches =
-    lib.optionals enableCuda [
-      (fetchpatch { # Patch for CUDA 8 compatibility
-        url = "https://github.com/opencv/opencv/commit/10896129b39655e19e4e7c529153cb5c2191a1db.patch";
-        sha256 = "0jka3kxxywgs3prqqgym5kav6p73rrblwj50k1nf3fvfpk194ah1";
-      })
-      (fetchpatch { # Patch to add CUDA Compute Capability compilation targets up to 6.0
-        url = "https://github.com/opencv/opencv/commit/d76f258aebdf63f979a205cabe6d3e81700a7cd8.patch";
-        sha256 = "00b3msfgrcw7laij6qafn4b18c1dl96xxpzwx05wxzrjldqb6kqg";
-      })
-    ]
-    ++ lib.optional enablePython (fetchpatch { # Patch to fix FlannBasedMatcher under python
-      url = "https://github.com/opencv/opencv/commit/05cfe28612fd8dc8fb0ccb876df945c7b435dd26.patch";
-      sha256 = "0niza5lybr1ljzdkyiapr16laa468168qinpy5qn00yimnaygpm6";
-    });
+      for name in vgg_generated_48.i \
+                  vgg_generated_64.i \
+                  vgg_generated_80.i \
+                  vgg_generated_120.i; do
+        ln -s "${vggFiles}/$name" "$NIX_BUILD_TOP/opencv_contrib/xfeatures2d/src/$name"
+      done
 
+      for name in boostdesc_bgm.i          \
+                  boostdesc_bgm_bi.i       \
+                  boostdesc_bgm_hd.i       \
+                  boostdesc_binboost_064.i \
+                  boostdesc_binboost_128.i \
+                  boostdesc_binboost_256.i \
+                  boostdesc_lbgm.i; do
+        ln -s "${bootdescFiles}/$name" "$NIX_BUILD_TOP/opencv_contrib/xfeatures2d/src/$name"
+      done
+    '');
   preConfigure =
-    # By default ippicv gets downloaded by cmake each time opencv is build. See:
-    # https://github.com/opencv/opencv/blob/3.1.0/3rdparty/ippicv/downloader.cmake
-    # Fortunately cmake doesn't download ippicv if it's already there.
-    # So to prevent repeated downloads we store it in the nix store
-    # and create a symbolic link to it.
-    let version  = "20151201";
-        md5      = "808b791a6eac9ed78d32a7666804320e";
-        sha256   = "1nph0w0pdcxwhdb5lxkb8whpwd9ylvwl97hn0k425amg80z86cs3";
-        rev      = "81a676001ca8075ada498583e4166079e5744668";
-        platform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux"
-                   else throw "ICV is not available for this platform (or not yet supported by this package)";
-        name = "ippicv_${platform}_${version}.tgz";
-        ippicv = fetchurl {
-          url = "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${rev}/ippicv/${name}";
-          inherit sha256;
-        };
-        dir = "3rdparty/ippicv/downloads/${platform}-${md5}";
-    in lib.optionalString enableIpp
-      ''
-        mkdir -p "${dir}"
-        ln -s "${ippicv}" "${dir}/${name}"
-      '';
+    (let version  = "20151201";
+         md5      = "808b791a6eac9ed78d32a7666804320e";
+         sha256   = "1nph0w0pdcxwhdb5lxkb8whpwd9ylvwl97hn0k425amg80z86cs3";
+         rev      = "81a676001ca8075ada498583e4166079e5744668";
+         platform = if stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux" then "linux"
+                    else throw "ICV is not available for this platform (or not yet supported by this package)";
+         name = "ippicv_${platform}_${version}.tgz";
+         ippicv = fetchurl {
+           url = "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${rev}/ippicv/${name}";
+           inherit sha256;
+         };
+         dir = "3rdparty/ippicv/downloads/${platform}-${md5}";
+     in lib.optionalString enableIpp ''
+          mkdir -p "${dir}"
+          ln -s "${ippicv}" "${dir}/${name}"
+        ''
+    ) +
+    (lib.optionalString enableContrib ''
+      cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib")
+    '');
 
   buildInputs =
        [ zlib ]
@@ -96,7 +113,8 @@ stdenv.mkDerivation rec {
     ++ lib.optional enableFfmpeg ffmpeg
     ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
     ++ lib.optional enableEigen eigen
-    ++ lib.optional enableCuda [ cudatoolkit gcc5 ]
+    ++ lib.optionals enableCuda [ cudatoolkit gcc5 ]
+    ++ lib.optional enableContrib protobuf3_1
     ;
 
   propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
@@ -115,8 +133,8 @@ stdenv.mkDerivation rec {
     (opencvFlag "OPENEXR" enableEXR)
     (opencvFlag "CUDA" enableCuda)
     (opencvFlag "CUBLAS" enableCuda)
-  ] ++ lib.optionals enableContrib [ "-DOPENCV_EXTRA_MODULES_PATH=${contribSrc}/modules" ]
-    ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ];
+  ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ]
+    ++ lib.optional enableContrib "-DBUILD_PROTOBUF=off";
 
   enableParallelBuilding = true;
 

From c99db543ab42f44ce2d13ba26104de5e248831b9 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 24 Jan 2017 11:33:00 -0200
Subject: [PATCH 571/727] xfce4-whiskermenu-plugin: 1.6.1 -> 1.6.2

---
 pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
index a9c4da810c1..ffda5b94e07 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
@@ -4,7 +4,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   p_name  = "xfce4-whiskermenu-plugin";
-  version = "1.6.1";
+  version = "1.6.2";
 
   name = "${p_name}-${version}";
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "gottcode";
     repo = "xfce4-whiskermenu-plugin";
     rev = "v${version}";
-    sha256 = "19hldrrgy7qmrncv5rfsclybycjp9rjfnslhm996h62d2p675qpc";
+    sha256 = "0vfyav01hynjm7p73wwbwnn2l8l9a0hkz755wmjzr6qv06f9019d";
   };
 
   nativeBuildInputs = [ cmake pkgconfig intltool ];

From e8e5e640bb8f4ac9ebff9f28967da2c5593be0d8 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 24 Jan 2017 11:43:11 -0200
Subject: [PATCH 572/727] cbatticon: 1.6.4 -> 1.6.5

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

diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix
index d072c5d6a49..efe2b2863ac 100644
--- a/pkgs/applications/misc/cbatticon/default.nix
+++ b/pkgs/applications/misc/cbatticon/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "cbatticon-${version}";
-  version = "1.6.4";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "valr";
     repo = "cbatticon";
     rev = version;
-    sha256 = "0m3bj408mbini97kq0cdf048lnfkdn7bd8ikbfijd7dwfdzv27i5";
+    sha256 = "1j7gbmmygvbrawqn1bbaf47lb600lylslzqbvfwlhifmi7qnm6ca";
   };
 
   makeFlags = "PREFIX=$(out)";

From 25d86bdd102f5e4eb7d7047451f4128df539ccad Mon Sep 17 00:00:00 2001
From: Kai <kai.harries@gmail.com>
Date: Tue, 24 Jan 2017 14:45:01 +0100
Subject: [PATCH 573/727] vnstat service: init (#19809)

---
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/monitoring/vnstat.nix | 43 ++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/vnstat.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4ec4c5a6f5b..523eba2b4a7 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -332,6 +332,7 @@
   ./services/monitoring/telegraf.nix
   ./services/monitoring/ups.nix
   ./services/monitoring/uptime.nix
+  ./services/monitoring/vnstat.nix
   ./services/monitoring/zabbix-agent.nix
   ./services/monitoring/zabbix-server.nix
   ./services/network-filesystems/cachefilesd.nix
diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix
new file mode 100644
index 00000000000..f6be7c7fd34
--- /dev/null
+++ b/nixos/modules/services/monitoring/vnstat.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.vnstat;
+in {
+  options.services.vnstat = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to enable update of network usage statistics via vnstatd.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraUsers.vnstatd = {
+      isSystemUser = true;
+      description = "vnstat daemon user";
+      home = "/var/lib/vnstat";
+      createHome = true;
+    };
+
+    systemd.services.vnstat = {
+      description = "vnStat network traffic monitor";
+      path = [ pkgs.coreutils ];
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      unitConfig.documentation = "man:vnstatd(1) man:vnstat(1) man:vnstat.conf(5)";
+      preStart = "chmod 755 /var/lib/vnstat";
+      serviceConfig = {
+        ExecStart = "${pkgs.vnstat}/bin/vnstatd -n";
+        ExecReload = "kill -HUP $MAINPID";
+        ProtectHome = true;
+        PrivateDevices = true;
+        PrivateTmp = true;
+        User = "vnstatd";
+      };
+    };
+  };
+}

From 2bf0f84f1ff18057c5a2af0d35bc90c264b3e056 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 24 Jan 2017 14:49:14 +0100
Subject: [PATCH 574/727] nss: 3.27.2 -> 3.28.1

---
 .../libraries/nss/85_security_load.patch      |  64 ++---
 pkgs/development/libraries/nss/default.nix    |  16 +-
 .../nss/nss-3.21-gentoo-fixups.patch          | 243 ------------------
 3 files changed, 43 insertions(+), 280 deletions(-)
 delete mode 100644 pkgs/development/libraries/nss/nss-3.21-gentoo-fixups.patch

diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch
index 9e4be3bf282..7687ea9bedb 100644
--- a/pkgs/development/libraries/nss/85_security_load.patch
+++ b/pkgs/development/libraries/nss/85_security_load.patch
@@ -1,45 +1,45 @@
-diff -ru -x '*~' nss-3.27.1-orig/nss/cmd/shlibsign/shlibsign.c nss-3.27.1/nss/cmd/shlibsign/shlibsign.c
---- nss-3.27.1-orig/nss/cmd/shlibsign/shlibsign.c	2016-10-03 16:55:58.000000000 +0200
-+++ nss-3.27.1/nss/cmd/shlibsign/shlibsign.c	2016-11-15 16:28:07.308117900 +0100
-@@ -871,6 +871,8 @@
-     libname = PR_GetLibraryName(NULL, "softokn3");
-     assert(libname != NULL);
+diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/cmd/shlibsign/shlibsign.c nss/cmd/shlibsign/shlibsign.c
+--- nss/cmd/shlibsign/shlibsign.c	2017-01-04 15:24:24.000000000 +0100
++++ nss/cmd/shlibsign/shlibsign.c	2017-01-24 14:43:31.030420852 +0100
+@@ -875,6 +875,8 @@
+         goto cleanup;
+     }
      lib = PR_LoadLibrary(libname);
 +    if (!lib)
 +        lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so");
      assert(lib != NULL);
-     PR_FreeLibraryName(libname);
- 
-diff -ru -x '*~' nss-3.27.1-orig/nss/coreconf/config.mk nss-3.27.1/nss/coreconf/config.mk
---- nss-3.27.1-orig/nss/coreconf/config.mk	2016-10-03 16:55:58.000000000 +0200
-+++ nss-3.27.1/nss/coreconf/config.mk	2016-11-15 16:28:07.308117900 +0100
-@@ -217,3 +217,6 @@
- ifdef NSS_NO_PKCS11_BYPASS
- DEFINES += -DNO_PKCS11_BYPASS
- endif
+     if (!lib) {
+         PR_fprintf(PR_STDERR, "loading softokn3 failed");
+diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/coreconf/config.mk nss/coreconf/config.mk
+--- nss/coreconf/config.mk	2017-01-04 15:24:24.000000000 +0100
++++ nss/coreconf/config.mk	2017-01-24 14:43:47.989432372 +0100
+@@ -208,3 +208,6 @@
+ # exported symbols, which causes problem when NSS is built as part of Mozilla.
+ # So we add a NSS_SSL_ENABLE_ZLIB variable to allow Mozilla to turn this off.
+ NSS_SSL_ENABLE_ZLIB = 1
 +
 +# Nix specific stuff.
 +DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
-diff -ru -x '*~' nss-3.27.1-orig/nss/lib/pk11wrap/pk11load.c nss-3.27.1/nss/lib/pk11wrap/pk11load.c
---- nss-3.27.1-orig/nss/lib/pk11wrap/pk11load.c	2016-10-03 16:55:58.000000000 +0200
-+++ nss-3.27.1/nss/lib/pk11wrap/pk11load.c	2016-11-15 16:28:07.308117900 +0100
-@@ -429,6 +429,13 @@
- 	 * unload the library if anything goes wrong from here on out...
- 	 */
- 	library = PR_LoadLibrary(mod->dllName);
-+	if ((library == NULL) &&
-+	    !rindex(mod->dllName, PR_GetDirectorySeparator())) {
+diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c
+--- nss/lib/pk11wrap/pk11load.c	2017-01-04 15:24:24.000000000 +0100
++++ nss/lib/pk11wrap/pk11load.c	2017-01-24 14:45:06.883485652 +0100
+@@ -440,6 +440,13 @@
+          * unload the library if anything goes wrong from here on out...
+          */
+         library = PR_LoadLibrary(mod->dllName);
++        if ((library == NULL) &&
++            !rindex(mod->dllName, PR_GetDirectorySeparator())) {
 +            library = PORT_LoadLibraryFromOrigin(my_shlib_name,
-+                                      (PRFuncPtr) &softoken_LoadDSO,
-+                                      mod->dllName);
-+	}
++                (PRFuncPtr) &softoken_LoadDSO,
++                mod->dllName);
++        }
 +
- 	mod->library = (void *)library;
+         mod->library = (void *)library;
  
- 	if (library == NULL) {
-diff -ru -x '*~' nss-3.27.1-orig/nss/lib/util/secload.c nss-3.27.1/nss/lib/util/secload.c
---- nss-3.27.1-orig/nss/lib/util/secload.c	2016-10-03 16:55:58.000000000 +0200
-+++ nss-3.27.1/nss/lib/util/secload.c	2016-11-15 16:29:50.482259746 +0100
+         if (library == NULL) {
+diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/util/secload.c nss/lib/util/secload.c
+--- nss/lib/util/secload.c	2017-01-04 15:24:24.000000000 +0100
++++ nss/lib/util/secload.c	2017-01-24 14:43:31.030420852 +0100
 @@ -70,9 +70,14 @@
  
      /* Remove the trailing filename from referencePath and add the new one */
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 72f57dff1ce..e1a8ca93f08 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nspr, perl, zlib, sqlite }:
+{ stdenv, fetchurl, fetchpatch, nspr, perl, zlib, sqlite }:
 
 let
 
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.27.2";
+  version = "3.28.1";
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_3_27_2_RTM/src/${name}.tar.gz";
-    sha256 = "dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524";
+    url = "mirror://mozilla/security/nss/releases/NSS_3_28_1_RTM/src/${name}.tar.gz";
+    sha256 = "58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
@@ -23,11 +23,17 @@ in stdenv.mkDerivation rec {
   '';
 
   patches =
-    [ ./nss-3.21-gentoo-fixups.patch
+    [ # FIXME: what is this patch for? Do we still need it?
+      (fetchpatch {
+        url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.28-gentoo-fixups.patch";
+        sha256 = "0z58axd1n7vq4kdp5mrb3dsg6di39a1g40s3shl6n2dzs14c1y2q";
+      })
       # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
       ./85_security_load.patch
     ];
 
+  patchFlags = "-p0";
+
   postPatch = ''
     # Fix up the patch from Gentoo.
     sed -i \
diff --git a/pkgs/development/libraries/nss/nss-3.21-gentoo-fixups.patch b/pkgs/development/libraries/nss/nss-3.21-gentoo-fixups.patch
deleted file mode 100644
index 33819821c19..00000000000
--- a/pkgs/development/libraries/nss/nss-3.21-gentoo-fixups.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-diff -urN a/nss/config/Makefile b/nss/config/Makefile
---- a/nss/config/Makefile	1969-12-31 18:00:00.000000000 -0600
-+++ b/nss/config/Makefile	2015-11-15 10:42:46.249578304 -0600
-@@ -0,0 +1,40 @@
-+CORE_DEPTH = ..
-+DEPTH      = ..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: export libs
-+
-+export:
-+	# Create the nss.pc file
-+	mkdir -p $(DIST)/lib/pkgconfig
-+	sed -e "s,@prefix@,$(PREFIX)," \
-+	    -e "s,@exec_prefix@,\$${prefix}," \
-+	    -e "s,@libdir@,\$${prefix}/lib64," \
-+	    -e "s,@includedir@,\$${prefix}/include/nss," \
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+	    nss.pc.in > nss.pc
-+	chmod 0644 nss.pc
-+	ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig
-+
-+	# Create the nss-config script
-+	mkdir -p $(DIST)/bin
-+	sed -e "s,@prefix@,$(PREFIX)," \
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+	    nss-config.in > nss-config
-+	chmod 0755 nss-config
-+	ln -sf ../../../config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
-diff -urN a/nss/config/nss-config.in b/nss/config/nss-config.in
---- a/nss/config/nss-config.in	1969-12-31 18:00:00.000000000 -0600
-+++ b/nss/config/nss-config.in	2015-11-15 10:42:46.250578304 -0600
-@@ -0,0 +1,145 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+	cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+	[--prefix[=DIR]]
-+	[--exec-prefix[=DIR]]
-+	[--includedir[=DIR]]
-+	[--libdir[=DIR]]
-+	[--version]
-+	[--libs]
-+	[--cflags]
-+Dynamic Libraries:
-+	nss
-+	ssl
-+	smime
-+	nssutil
-+EOF
-+	exit $1
-+}
-+
-+if test $# -eq 0; then
-+	usage 1 1>&2
-+fi
-+
-+lib_ssl=yes
-+lib_smime=yes
-+lib_nss=yes
-+lib_nssutil=yes
-+
-+while test $# -gt 0; do
-+  case "$1" in
-+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+  *) optarg= ;;
-+  esac
-+
-+  case $1 in
-+    --prefix=*)
-+      prefix=$optarg
-+      ;;
-+    --prefix)
-+      echo_prefix=yes
-+      ;;
-+    --exec-prefix=*)
-+      exec_prefix=$optarg
-+      ;;
-+    --exec-prefix)
-+      echo_exec_prefix=yes
-+      ;;
-+    --includedir=*)
-+      includedir=$optarg
-+      ;;
-+    --includedir)
-+      echo_includedir=yes
-+      ;;
-+    --libdir=*)
-+      libdir=$optarg
-+      ;;
-+    --libdir)
-+      echo_libdir=yes
-+      ;;
-+    --version)
-+      echo ${major_version}.${minor_version}.${patch_version}
-+      ;;
-+    --cflags)
-+      echo_cflags=yes
-+      ;;
-+    --libs)
-+      echo_libs=yes
-+      ;;
-+    ssl)
-+      lib_ssl=yes
-+      ;;
-+    smime)
-+      lib_smime=yes
-+      ;;
-+    nss)
-+      lib_nss=yes
-+      ;;
-+    nssutil)                                                      
-+      lib_nssutil=yes                                             
-+      ;;
-+    *)
-+      usage 1 1>&2
-+      ;;
-+  esac
-+  shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+    exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+    includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+    libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+    echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+    echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+    echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+    echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+    echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+      libdirs=""
-+      if test -n "$lib_ssl"; then
-+	libdirs="$libdirs -lssl${major_version}"
-+      fi
-+      if test -n "$lib_smime"; then
-+	libdirs="$libdirs -lsmime${major_version}"
-+      fi
-+      if test -n "$lib_nss"; then
-+	libdirs="$libdirs -lnss${major_version}"
-+      fi
-+      if test -n "$lib_nssutil"; then
-+       libdirs="$libdirs -lnssutil${major_version}"
-+      fi
-+      echo $libdirs
-+fi      
-+
-diff -urN a/nss/config/nss.pc.in b/nss/config/nss.pc.in
---- a/nss/config/nss.pc.in	1969-12-31 18:00:00.000000000 -0600
-+++ b/nss/config/nss.pc.in	2015-11-15 10:42:46.251578304 -0600
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSS
-+Description: Network Security Services
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.8
-+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
-+Cflags: -I${includedir}
-+
-diff -urN a/nss/Makefile b/nss/Makefile
---- a/nss/Makefile	2015-11-15 09:25:06.410786060 -0600
-+++ b/nss/Makefile	2015-11-15 10:42:46.252578304 -0600
-@@ -46,7 +46,7 @@
- # (7) Execute "local" rules. (OPTIONAL).                              #
- #######################################################################
- 
--nss_build_all: build_nspr all
-+nss_build_all: all
- 
- nss_clean_all: clobber_nspr clobber
- 
-@@ -115,12 +115,6 @@
- 	--with-dist-prefix='$(NSPR_PREFIX)' \
- 	--with-dist-includedir='$(NSPR_PREFIX)/include'
- 
--build_nspr: $(NSPR_CONFIG_STATUS)
--	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
--
--clobber_nspr: $(NSPR_CONFIG_STATUS)
--	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
--
- build_docs:
- 	$(MAKE) -C $(CORE_DEPTH)/doc
- 
-diff -urN a/nss/manifest.mn b/nss/manifest.mn
---- a/nss/manifest.mn	2015-11-15 09:25:06.411786060 -0600
-+++ b/nss/manifest.mn	2015-11-15 10:43:15.633576994 -0600
-@@ -10,4 +10,4 @@
- 
- RELEASE = nss
- 
--DIRS = coreconf lib cmd external_tests
-+DIRS = coreconf lib cmd config

From c2bd9cad111ce0a413ffa145e67934928ac20f05 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 24 Jan 2017 14:54:10 +0100
Subject: [PATCH 575/727] sqlite: 3.15.2 -> 3.16.2

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

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 8161d3bfa1f..6e86780446c 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.15.2";
+  name = "sqlite-3.16.2";
 
   src = fetchurl {
-    url = "http://sqlite.org/2016/sqlite-autoconf-3150200.tar.gz";
-    sha256 = "0j9i1zrwxc7dfd6xr3xagal3incrlalsrk96havnas1qp5im1cq7";
+    url = "http://sqlite.org/2017/sqlite-autoconf-3160200.tar.gz";
+    sha256 = "059n4s9qd35qpbd4g29y9ay99a6f68ad7k65g430rxb6jcz0rk35";
   };
 
   outputs = [ "bin" "dev" "out" ];

From 319879354b63d2dbd37010ac95d7af01fa4ccc91 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Tue, 24 Jan 2017 14:37:56 +0100
Subject: [PATCH 576/727] munin: fetchurl -> fetchFromGithub

---
 pkgs/servers/monitoring/munin/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 25ff8ed25fc..4944c185dca 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, which, coreutils, rrdtool, perl, perlPackages
+{ stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perl, perlPackages
 , python, ruby, jre, nettools
 }:
 
@@ -6,9 +6,11 @@ stdenv.mkDerivation rec {
   version = "2.0.29";
   name = "munin-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz";
-    sha256 = "1zpv0p10iyx49z1hsqvlkk6hh46hp9dhbrdyx103hgx7p3xnxfnv";
+  src = fetchFromGitHub {
+    owner = "munin-monitoring";
+    repo = "munin";
+    rev = version;
+    sha256 = "058x023ciqzqn0n1qfhb2wskg24hjdl2kcrza2a33wfddh9nddwj";
   };
 
   buildInputs = [ 

From fc6622a09899e415cb62e742b584c729bcb464e8 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Tue, 24 Jan 2017 14:52:08 +0100
Subject: [PATCH 577/727] munin: 2.0.29 -> 2.0.30

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

diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 4944c185dca..3e4e778e238 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.29";
+  version = "2.0.30";
   name = "munin-${version}";
 
   src = fetchFromGitHub {
     owner = "munin-monitoring";
     repo = "munin";
     rev = version;
-    sha256 = "058x023ciqzqn0n1qfhb2wskg24hjdl2kcrza2a33wfddh9nddwj";
+    sha256 = "1sxsdfq9a5d8b13jigr06gs7n4m3c95645sfyyl49bkfy0n5cxrg";
   };
 
   buildInputs = [ 

From f8e39ec13cfd5abc14c2ba22bb34a5df671dc559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 24 Jan 2017 15:43:53 +0100
Subject: [PATCH 578/727] nss: fetchpatch -> fetchurl

This isn't a dynamically generated patch, so it's not required,
and the hash was for unmodified patch anyway.
---
 pkgs/development/libraries/nss/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index e1a8ca93f08..6fc9170da87 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
 
   patches =
     [ # FIXME: what is this patch for? Do we still need it?
-      (fetchpatch {
+      (fetchurl {
         url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.28-gentoo-fixups.patch";
         sha256 = "0z58axd1n7vq4kdp5mrb3dsg6di39a1g40s3shl6n2dzs14c1y2q";
       })

From 36ac7058d2859c8544a2140f245c7c980900c6ac Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 14:45:52 +0000
Subject: [PATCH 579/727] tetex: fix source urls

---
 pkgs/tools/typesetting/tex/tetex/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix
index c3d226a2acb..83bead83ea3 100644
--- a/pkgs/tools/typesetting/tex/tetex/default.nix
+++ b/pkgs/tools/typesetting/tex/tetex/default.nix
@@ -4,13 +4,13 @@ stdenv.mkDerivation {
   name = "tetex-3.0";
 
   src = fetchurl {
-    url = ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-3.0.tar.gz;
-    md5 = "944a4641e79e61043fdaf8f38ecbb4b3";
+    url = http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-src-3.0.tar.gz;
+    sha256 = "16v44465ipd9yyqri9rgxp6rbgs194k4sh1kckvccvdsnnp7w3ww";
   };
 
   texmf = fetchurl {
-    url = ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-3.0.tar.gz;
-    md5 = "11aa15c8d3e28ee7815e0d5fcdf43fd4";
+    url = http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-texmf-3.0.tar.gz;
+    sha256 = "1hj06qvm02a2hx1a67igp45kxlbkczjlg20gr8lbp73l36k8yfvc";
   };
 
   buildInputs = [ flex bison zlib libpng ncurses ed ];

From b00a45575237cd5faf77fc61f60780fc18752bdb Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 24 Jan 2017 15:51:14 +0100
Subject: [PATCH 580/727] gnupg21: 2.1.17 -> 2.1.18

See http://lists.gnu.org/archive/html/info-gnu/2017-01/msg00013.html
for release announcement.
---
 pkgs/tools/security/gnupg/21.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index b96226d5c3f..e40d1f7bf01 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
 
-  version = "2.1.17";
+  version = "2.1.18";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1js308b46ifx1gim0c9nivr5yxhans7iq1yvkf7zl2928gdm9p65";
+    sha256 = "157rrv3ly9j2k0acz43nhiba5hfl6h7048jvj55wwqjmgsmnyk6h";
   };
 
   buildInputs = [

From 30a94deac57c3498e4a9ed6e7bdc8056a60ece04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 24 Jan 2017 15:56:00 +0100
Subject: [PATCH 581/727] nss: remove parameter that just got unused

---
 pkgs/development/libraries/nss/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 6fc9170da87..fc933235e96 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, nspr, perl, zlib, sqlite }:
+{ stdenv, fetchurl, nspr, perl, zlib, sqlite }:
 
 let
 

From ca8ab806bb159b4e60f0adaf4a10abbad3b7ae77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 24 Jan 2017 10:46:58 +0100
Subject: [PATCH 582/727] telegraf: 1.1.2 -> 1.2.0

---
 pkgs/servers/monitoring/telegraf/default.nix  |  4 +--
 .../{deps-1.1.2.nix => deps-1.2.0.nix}        | 26 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename pkgs/servers/monitoring/telegraf/{deps-1.1.2.nix => deps-1.2.0.nix} (97%)

diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index 996c839acff..a3c0e3c9226 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "telegraf-${version}";
-  version = "1.1.2";
+  version = "1.2.0";
 
   goPackagePath = "github.com/influxdata/telegraf";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "${version}";
-    sha256 = "0dgrbdyz261j28wcq636125ha4xmfgh4y9shlg8m1y6jqdqd2zf2";
+    sha256 = "0kijg3j2jnz7jfybycv2scvpsfmxg83jh8wl95p2bw322ypqlks1";
   };
 
   goDeps = ./. + builtins.toPath "/deps-${version}.nix";
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.1.2.nix b/pkgs/servers/monitoring/telegraf/deps-1.2.0.nix
similarity index 97%
rename from pkgs/servers/monitoring/telegraf/deps-1.1.2.nix
rename to pkgs/servers/monitoring/telegraf/deps-1.2.0.nix
index b62ae44dbc9..a866881e53d 100644
--- a/pkgs/servers/monitoring/telegraf/deps-1.1.2.nix
+++ b/pkgs/servers/monitoring/telegraf/deps-1.2.0.nix
@@ -198,15 +198,6 @@
       sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
     };
   }
-  {
-    goPackagePath = "github.com/gonuts/go-shellquote";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gonuts/go-shellquote";
-      rev = "e842a11b24c6abfb3dd27af69a17f482e4b483c2";
-      sha256 = "19lbz7wl241bsyzsv2ai40b2vnj8c9nl107b6jf9gid3i6h0xydg";
-    };
-  }
   {
     goPackagePath = "github.com/gorilla/context";
     fetch = {
@@ -306,6 +297,15 @@
       sha256 = "1g10qisgywfqj135yyiq63pnbjgr201gz929ydlgyzqq6yk3bn3h";
     };
   }
+  {
+    goPackagePath = "github.com/kballard/go-shellquote";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kballard/go-shellquote";
+      rev = "d8ec1a69a250a17bb0e419c386eac1f3711dc142";
+      sha256 = "1a57hm0zwyi70am670s0pkglnkk1ilddnmfxz1ba7innpkf5z6s7";
+    };
+  }
   {
     goPackagePath = "github.com/klauspost/crc32";
     fetch = {
@@ -446,8 +446,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shirou/gopsutil";
-      rev = "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08";
-      sha256 = "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni";
+      rev = "1516eb9ddc5e61ba58874047a98f8b44b5e585e8";
+      sha256 = "1pnl1g2l1y5vmnraq97rbm0nirprqvfzxsp6h4xacn1429jdl5bv";
     };
   }
   {
@@ -491,8 +491,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/wvanbergen/kafka";
-      rev = "46f9a1cf3f670edec492029fadded9c2d9e18866";
-      sha256 = "1czmbilprffdbwnrq4wcllaqknbq91l6p0ni6b55fkaggnwck694";
+      rev = "bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee";
+      sha256 = "0x86gnkpsr6gsc6mk2312ay8yqrzscvvdra2knhvwgaws6rzvj2l";
     };
   }
   {

From 4958485bc342b07c612d4626964d158fd9591c69 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:01:04 +0000
Subject: [PATCH 583/727] ocamlPackages.ocaml_optcomp: update hash to sha256

---
 pkgs/development/ocaml-modules/optcomp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix
index 7afbf3a4b40..8953373954a 100644
--- a/pkgs/development/ocaml-modules/optcomp/default.nix
+++ b/pkgs/development/ocaml-modules/optcomp/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "ocaml-optcomp-1.6";
   src = fetchurl {
     url = https://github.com/diml/optcomp/archive/1.6.tar.gz;
-    md5 = "d3587244dba1b8b10f24d0b60a8c700d";
-    };
+    sha256 = "0hhhb2gisah1h22zlg5iszbgqxdd7x85cwd57bd4mfkx9l7dh8jh";
+  };
   
   createFindlibDestdir = true;
 

From a17311a33e57fe4b3bea6621a9a06e5d004158ba Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:09:14 +0000
Subject: [PATCH 584/727] antlr3: point to version 3.4

This was pointing to a broken upstream URL and is a beta release. No
dependent in the nixpkgs tree.
---
 .../tools/parsing/antlr/default.nix           | 24 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 pkgs/development/tools/parsing/antlr/default.nix

diff --git a/pkgs/development/tools/parsing/antlr/default.nix b/pkgs/development/tools/parsing/antlr/default.nix
deleted file mode 100644
index e866f61f25a..00000000000
--- a/pkgs/development/tools/parsing/antlr/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, jre}:
-
-stdenv.mkDerivation {
-  name = "antlr-3.0b3";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://www.antlr.org/download/antlr-3.0b3.tar.gz;
-    md5 = "6a7e70ccece8149b735cc3aaa24241cc";
-  };
-  inherit jre;
-
-  meta = with stdenv.lib; {
-    description = "Powerful parser generator";
-    longDescription = ''
-      ANTLR (ANother Tool for Language Recognition) is a powerful parser
-      generator for reading, processing, executing, or translating structured
-      text or binary files. It's widely used to build languages, tools, and
-      frameworks. From a grammar, ANTLR generates a parser that can build and
-      walk parse trees.
-    '';
-    homepage = http://www.antlr.org/;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac59998dde4..7f3958aaf29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6013,9 +6013,9 @@ in
 
   antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
 
-  antlr3 = callPackage ../development/tools/parsing/antlr { };
   antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { };
   antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { };
+  antlr3 = antlr3_5;
 
   ant = apacheAnt;
 

From 38cc58896c9c368bd1b470a9760b28462401033c Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:16:24 +0000
Subject: [PATCH 585/727] warsow: mark as broken

libjpeg62 is broken as well
---
 pkgs/games/warsow/default.nix   | 1 +
 pkgs/top-level/all-packages.nix | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index 9f2dfbab2ec..ef0e4640c39 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -59,5 +59,6 @@ stdenv.mkDerivation rec {
     license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ astsmtl ];
     platforms = platforms.linux;
+    broken = true; # Depends on a specific old libjpeg version
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f3958aaf29..ad5d0d7f9da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16426,9 +16426,7 @@ in
 
   warmux = callPackage ../games/warmux { };
 
-  warsow = callPackage ../games/warsow {
-    libjpeg = libjpeg62;
-  };
+  warsow = callPackage ../games/warsow { };
 
   warzone2100 = qt5.callPackage ../games/warzone2100 { };
 

From 1005d786ba87a7e3507423e38dba02d04c01819a Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:22:25 +0000
Subject: [PATCH 586/727] libjpeg62: remove

This package has broken upstream url and was only used by warsow
---
 pkgs/development/libraries/libjpeg/62.nix | 33 -----------------------
 pkgs/top-level/all-packages.nix           |  4 ---
 2 files changed, 37 deletions(-)
 delete mode 100644 pkgs/development/libraries/libjpeg/62.nix

diff --git a/pkgs/development/libraries/libjpeg/62.nix b/pkgs/development/libraries/libjpeg/62.nix
deleted file mode 100644
index 3ae8cfac39c..00000000000
--- a/pkgs/development/libraries/libjpeg/62.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{stdenv, fetchurl, libtool, static ? false, ...}: 
-
-stdenv.mkDerivation {
-  name = "libjpeg-6b";
-  
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz;
-    sha256 = "0pg34z6rbkk5kvdz6wirf7g4mdqn5z8x97iaw17m15lr3qjfrhvm";
-  };
-  
-  inherit libtool;
-
-  configureFlags = "--enable-shared ${if static then " --enable-static" else ""}";
-    
-  # Required for building of dynamic libraries on Darwin.
-  patches = [
-    (fetchurl {
-      url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltconfig;
-      md5 = "e6725fa4a09aa1de4ca75343fd0f61d5";
-    })
-    (fetchurl {
-      url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltmain.sh;
-      #md5 = "489986ad8e7a93aef036766b25f321d5";
-      md5 = "092a12aeb0c386dd7dae059109d950ba";
-    })
-  ];
-
-  meta = {
-        platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad5d0d7f9da..2dccf8213b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8309,10 +8309,6 @@ in
   libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { };
   libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin
 
-  libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix {
-    libtool = libtool_1_5;
-  };
-
   libjreen = callPackage ../development/libraries/libjreen { };
 
   libjson_rpc_cpp = callPackage ../development/libraries/libjson-rpc-cpp { };

From 6f21a99bdd3fe8386aebef9f0f30aea255922b3a Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:26:05 +0000
Subject: [PATCH 587/727] doc/old/cross.txt: md5 -> sha256

---
 doc/old/cross.txt | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/doc/old/cross.txt b/doc/old/cross.txt
index 82a69f6f379..73103ea0c6d 100644
--- a/doc/old/cross.txt
+++ b/doc/old/cross.txt
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2;
-    md5 = "6a9d529efb285071dad10e1f3d2b2967";
+    sha256 = "1ian3kwh2vg6hr3ymrv48s04gijs539vzrq62xr76bxbhbwnz2np";
   };
   inherit noSysDirs;
   configureFlags = "--target=arm-linux";
@@ -81,11 +81,11 @@ Step 2: build kernel headers for the target architecture
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
-  name = "linux-headers-2.6.13.4-arm";
+  name = "linux-headers-2.6.13.1-arm";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.4.tar.bz2;
-    md5 = "94768d7eef90a9d8174639b2a7d3f58d";
+    url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.1.tar.bz2;
+    sha256 = "12qxmc827fjhaz53kjy7vyrzsaqcg78amiqsb3qm20z26w705lma";
   };
 }
 ---
@@ -152,9 +152,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-core-4.0.2.tar.bz2;
-    md5 = "f7781398ada62ba255486673e6274b26";
-    #url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-4.0.2.tar.bz2;
-    #md5 = "a659b8388cac9db2b13e056e574ceeb0";
+    sha256 = "02fxh0asflm8825w23l2jq1wvs7hbnam0jayrivg7zdv2ifnc0rc";
   };
   # !!! apply only if noSysDirs is set
   patches = [./no-sys-dirs.patch ./gcc-inhibit.patch];

From 7ef36ffacef3ccb3ea1232860a25e9e3268fd2c5 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:27:20 +0000
Subject: [PATCH 588/727] jclasslib: use sha256 hash

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

diff --git a/pkgs/development/tools/java/jclasslib/default.nix b/pkgs/development/tools/java/jclasslib/default.nix
index cb3f6164b02..1d8ae80572a 100644
--- a/pkgs/development/tools/java/jclasslib/default.nix
+++ b/pkgs/development/tools/java/jclasslib/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   src = fetchurl {
     url = mirror://sourceforge/jclasslib/jclasslib_unix_2_0.tar.gz;
-    md5 = "31d91bb03fee23410689d2f1c4c439b1";
+    sha256 = "1y2fbg5h2p3fwcp7h5n1qib7x9svyrilq3i58vm6vany1xzg7nx5";
   };
 
   inherit jre xpf ant;

From 4b284a2bb6a1d7198bbcc7f65f8486fa08c3361d Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:28:20 +0000
Subject: [PATCH 589/727] mockobjects: use sha256 hash

---
 pkgs/development/libraries/java/mockobjects/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix
index 5681200c4fa..551375d33bd 100644
--- a/pkgs/development/libraries/java/mockobjects/default.nix
+++ b/pkgs/development/libraries/java/mockobjects/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = mirror://sourceforge/mockobjects/mockobjects-bin-0.09.tar;
-    md5 = "a0e11423bd5fcbb6ea65753643ea8852";
+    sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz";
   };
 
   meta = {

From 31d1a52b0cb8ea721486653c12c50273454ca287 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:31:39 +0000
Subject: [PATCH 590/727] lucene: 1.4.1 -> 1.4.3

---
 pkgs/development/libraries/java/lucene/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix
index d6e26a02d67..6f6534cee3e 100644
--- a/pkgs/development/libraries/java/lucene/default.nix
+++ b/pkgs/development/libraries/java/lucene/default.nix
@@ -1,12 +1,14 @@
 {stdenv, fetchurl} :
 
-stdenv.mkDerivation {
-  name = "lucene-1.4.1";
+stdenv.mkDerivation rec {
+  name = "lucene-${version}";
+  version = "1.4.3";
+
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://cvs.apache.org/dist/jakarta/lucene/v1.4.1/lucene-1.4.1.tar.gz;
-    md5 = "656a6f40f5b8f7d2e19453436848bfe8";
+    url = "https://archive.apache.org/dist/jakarta/lucene/${name}.tar.gz";
+    sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh";
   };
 
   meta = {

From c3e4c2f17915a503225faa46ef79fcf8fd17dd7b Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:34:36 +0000
Subject: [PATCH 591/727] jjtraveler: remove package

The package is a java library that no other project is using and which
upstream source doesn't work.

See http://www.program-transformation.org/Tools/JJTraveler
---
 .../libraries/java/jjtraveler/default.nix          | 14 --------------
 pkgs/top-level/all-packages.nix                    |  4 ----
 2 files changed, 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/java/jjtraveler/default.nix

diff --git a/pkgs/development/libraries/java/jjtraveler/default.nix b/pkgs/development/libraries/java/jjtraveler/default.nix
deleted file mode 100644
index b9dc1d68860..00000000000
--- a/pkgs/development/libraries/java/jjtraveler/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, jdk}:
-
-stdenv.mkDerivation {
-  name = "jjtraveler-0.4.3";
-  src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/jjtraveler/JJTraveler-0.4.3.tar.gz;
-    md5 = "35bf801ee61f042513ae88247fe1bf1d";
-  };
-  buildInputs = [stdenv jdk];
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2dccf8213b2..5440cf42ea4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10014,10 +10014,6 @@ in
 
   jflex = callPackage ../development/libraries/java/jflex { };
 
-  jjtraveler = callPackage ../development/libraries/java/jjtraveler {
-    stdenv = overrideInStdenv stdenv [gnumake380];
-  };
-
   junit = callPackage ../development/libraries/java/junit { antBuild = releaseTools.antBuild; };
 
   junixsocket = callPackage ../development/libraries/java/junixsocket { };

From bf17d6dacf2408436ffb5a2f8c87a31c88ec28e2 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 17 Dec 2016 23:51:18 -0800
Subject: [PATCH 592/727] top-level: Introduce `buildPackages` for resolving 
 build-time deps

[N.B., this package also applies to the commits that follow it in the same
PR.]

In most cases, buildPackages = pkgs so things work just as before. For
cross compiling, however, buildPackages is resolved as the previous
bootstrapping stage. This allows us to avoid the mkDerivation hacks cross
compiling currently uses today.

To avoid a massive refactor, callPackage will splice together both package
sets. Again to avoid churn, it uses the old `nativeDrv` vs `crossDrv` to do
so. So now, whether cross compiling or not, packages with get a `nativeDrv`
and `crossDrv`---in the non-cross-compiling case they are simply the same
derivation. This is good because it reduces the divergence between the
cross and non-cross dataflow. See `pkgs/top-level/splice.nix` for a comment
along the lines of the preceding paragraph, and the code that does this
splicing.

Also, `forceNativeDrv` is replaced with `forceNativePackages`. The latter
resolves `pkgs` unless the host platform is different from the build
platform, in which case it resolves to `buildPackages`. Note that the
target platform is not important here---it will not prevent
`forcedNativePackages` from resolving to `pkgs`.

--------

Temporarily, we make preserve some dubious decisions in the name of preserving
hashes:

Most importantly, we don't distinguish between "host" and "target" in the
autoconf sense. This leads to the proliferation of *Cross derivations
currently used. What we ought to is resolve native deps of the cross "build
packages" (build = host != target) package set against the "vanilla
packages" (build = host = target) package set. Instead, "build packages"
uses itself, with (informally) target != build in all cases.

This is wrong because it violates the "sliding window" principle of
bootstrapping stages that shifting the platform triple of one stage to the
left coincides with the next stage's platform triple. Only because we don't
explicitly distinguish between "host" and "target" does it appear that the
"sliding window" principle is preserved--indeed it is over the reductionary
"platform double" of just "build" and "host/target".

Additionally, we build libc, libgcc, etc in the same stage as the compilers
themselves, which is wrong because they are used at runtime, not build
time. Fixing this is somewhat subtle, and the solution and problem will be
better explained in the commit that does fix it.

Commits after this will solve both these issues, at the expense of breaking
cross hashes. Native hashes won't be broken, thankfully.

--------

Did the temporary ugliness pan out? Of the packages that currently build in
`release-cross.nix`, the only ones that have their hash changed are
`*.gcc.crossDrv` and `bootstrapTools.*.coreutilsMinimal`. In both cases I
think it doesn't matter.

 1. GCC when doing a `build = host = target = foreign` build (maximally
    cross), still defines environment variables like `CPATH`[1] with
    packages.  This seems assuredly wrong because whether gcc dynamically
    links those, or the programs built by gcc dynamically link those---I
    have no idea which case is reality---they should be foreign. Therefore,
    in all likelihood, I just made the gcc less broken.

 2. Coreutils (ab)used the old cross-compiling infrastructure to depend on
    a native version of itself. When coreutils was overwritten to be built
    with fewer features, the native version it used would also be
    overwritten because the binding was tight. Now it uses the much looser
    `BuildPackages.coreutils` which is just fine as a richer build dep
    doesn't cause any problems and avoids a rebuild.

So, in conclusion I'd say the conservatism payed off. Onward to actually
raking the muck in the next PR!

[1]: https://gcc.gnu.org/onlinedocs/gcc/Environment-Variables.html
---
 pkgs/os-specific/gnu/default.nix              | 14 ++--
 pkgs/stdenv/adapters.nix                      | 18 ++---
 pkgs/stdenv/booter.nix                        | 18 +++--
 pkgs/stdenv/cross/default.nix                 | 11 ++-
 pkgs/stdenv/generic/default.nix               | 14 +++-
 .../linux/make-bootstrap-tools-cross.nix      | 21 ++---
 pkgs/top-level/all-packages.nix               | 70 +++++++----------
 pkgs/top-level/release-cross.nix              | 14 +++-
 pkgs/top-level/release-lib.nix                |  5 +-
 pkgs/top-level/splice.nix                     | 76 +++++++++++++++++++
 pkgs/top-level/stage.nix                      |  7 ++
 11 files changed, 176 insertions(+), 92 deletions(-)
 create mode 100644 pkgs/top-level/splice.nix

diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index 457b670319e..c002447d64b 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -3,7 +3,7 @@
 args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
 , texinfo, glibcCross, hurdPartedCross, libuuid, samba
 , gccCrossStageStatic, gccCrossStageFinal
-, forceNativeDrv, forceSystem, newScope, platform, config, crossSystem
+, forcedNativePackages, forceSystem, newScope, platform, config, crossSystem
 , overrides ? {} }:
 
 with args;
@@ -12,7 +12,7 @@ let
   callPackage = newScope gnu;
 
   gnu = {
-    hurdCross = forceNativeDrv (callPackage ./hurd {
+    hurdCross = forcedNativePackages.callPackage ./hurd {
       inherit fetchgit stdenv autoconf libtool texinfo
         glibcCross hurdPartedCross;
       inherit (gnu) machHeaders mig;
@@ -21,9 +21,9 @@ let
       headersOnly = false;
       cross = assert crossSystem != null; crossSystem;
       gccCross = gccCrossStageFinal;
-    });
+    };
 
-    hurdCrossIntermediate = forceNativeDrv (callPackage ./hurd {
+    hurdCrossIntermediate = forcedNativePackages.callPackage ./hurd {
       inherit fetchgit stdenv autoconf libtool texinfo glibcCross;
       inherit (gnu) machHeaders mig;
       hurdPartedCross = null;
@@ -42,7 +42,7 @@ let
       # libshouldbeinlibc.
       buildTarget = "libihash libstore libshouldbeinlibc";
       installTarget = "libihash-install libstore-install libshouldbeinlibc-install";
-    });
+    };
 
     hurdHeaders = callPackage ./hurd {
       automake = automake111x;
@@ -58,13 +58,13 @@ let
       hurd = null;
     };
 
-    libpthreadCross = forceNativeDrv (callPackage ./libpthread {
+    libpthreadCross = forcedNativePackages.callPackage ./libpthread {
       inherit fetchgit stdenv autoconf automake libtool glibcCross;
       inherit (gnu) machHeaders hurdHeaders;
       hurd = gnu.hurdCrossIntermediate;
       gccCross = gccCrossStageStatic;
       cross = assert crossSystem != null; crossSystem;
-    });
+    };
 
     # In theory GNU Mach doesn't have to be cross-compiled.  However, since it
     # has to be built for i586 (it doesn't work on x86_64), one needs a cross
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 11f9a43c035..daa180c644f 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -66,12 +66,10 @@ rec {
 
             # In nixpkgs, sometimes 'null' gets in as a buildInputs element,
             # and we handle that through isAttrs.
-            getNativeDrv = drv: drv.nativeDrv or drv;
-            getCrossDrv = drv: drv.crossDrv or drv;
-            nativeBuildInputsDrvs = map getNativeDrv nativeBuildInputs;
-            buildInputsDrvs = map getCrossDrv buildInputs;
-            propagatedBuildInputsDrvs = map getCrossDrv propagatedBuildInputs;
-            propagatedNativeBuildInputsDrvs = map getNativeDrv propagatedNativeBuildInputs;
+            nativeBuildInputsDrvs = nativeBuildInputs;
+            buildInputsDrvs = buildInputs;
+            propagatedBuildInputsDrvs = propagatedBuildInputs;
+            propagatedNativeBuildInputsDrvs = propagatedNativeBuildInputs;
 
             # The base stdenv already knows that nativeBuildInputs and
             # buildInputs should be built with the usual gcc-wrapper
@@ -88,10 +86,7 @@ rec {
                 (drv: builtins.isAttrs drv && drv ? nativeDrv) buildInputs;
             nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull;
 
-            # We should overwrite the input attributes in crossDrv, to overwrite
-            # the defaults for only-native builds in the base stdenv
-            crossDrv = if cross == null then nativeDrv else
-                stdenv.mkDerivation (args // {
+        in      stdenv.mkDerivation (args // {
                     name = name + "-" + cross.config;
                     nativeBuildInputs = nativeBuildInputsDrvs
                       ++ nativeInputsFromBuildInputs
@@ -112,9 +107,6 @@ rec {
 
                     crossConfig = cross.config;
                 } // args.crossAttrs or {});
-        in nativeDrv // {
-          inherit crossDrv nativeDrv;
-        };
     } // {
       inherit cross gccCross binutilsCross;
       ccCross = gccCross;
diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix
index 11ca8e1440e..6e5d073e55a 100644
--- a/pkgs/stdenv/booter.nix
+++ b/pkgs/stdenv/booter.nix
@@ -57,12 +57,18 @@ stageFuns: let
   # debugging purposes.
   folder = stageFun: finalSoFar: let
     args = stageFun finalSoFar;
-    stdenv = args.stdenv // {
-      # For debugging
-      __bootPackages = finalSoFar;
+    args' = args // {
+      stdenv = args.stdenv // {
+        # For debugging
+        __bootPackages = finalSoFar;
+      };
     };
-    args' = args // { inherit stdenv; };
-  in
-    (if args.__raw or false then lib.id else allPackages) args';
+    self =
+      if args.__raw or false
+      then args'
+      else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // {
+        buildPackages = if args.selfBuild or true then self else finalSoFar;
+      });
+  in self;
 
 in lib.lists.fold folder {} withAllowCustomOverrides
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 16f41671b76..e684c14da4a 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -12,13 +12,11 @@ let
 
 in bootStages ++ [
 
-  # Build Packages.
-  #
-  # For now, this is just used to build the native stdenv. Eventually, it
-  # should be used to build compilers and other such tools targeting the cross
-  # platform. Then, `forceNativeDrv` can be removed.
+  # Build Packages
   (vanillaPackages: {
     inherit system platform crossSystem config overlays;
+    # Should be false, but we're trying to preserve hashes for now
+    selfBuild = true;
     # It's OK to change the built-time dependencies
     allowCustomOverrides = true;
     stdenv = vanillaPackages.stdenv // {
@@ -28,9 +26,10 @@ in bootStages ++ [
     };
   })
 
-  # Run packages
+  # Run Packages
   (buildPackages: {
     inherit system platform crossSystem config overlays;
+    selfBuild = false;
     stdenv = if crossSystem.useiOSCross or false
       then let
           inherit (buildPackages.darwin.ios-cross {
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 32e0d894818..269d7ef893a 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -115,7 +115,19 @@ let
     , sandboxProfile ? ""
     , propagatedSandboxProfile ? ""
     , ... } @ attrs:
-    let
+    let # Rename argumemnts to avoid cycles
+      buildInputs__ = buildInputs;
+      nativeBuildInputs__ = nativeBuildInputs;
+      propagatedBuildInputs__ = propagatedBuildInputs;
+      propagatedNativeBuildInputs__ = propagatedNativeBuildInputs;
+    in let
+      getNativeDrv = drv: drv.nativeDrv or drv;
+      getCrossDrv = drv: drv.crossDrv or drv;
+      nativeBuildInputs = map getNativeDrv nativeBuildInputs__;
+      buildInputs = map getCrossDrv buildInputs__;
+      propagatedBuildInputs = map getCrossDrv propagatedBuildInputs__;
+      propagatedNativeBuildInputs = map getNativeDrv propagatedNativeBuildInputs__;
+    in let
       pos' =
         if pos != null then
           pos
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 9f4a4517627..a1b1f02d83d 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -55,11 +55,12 @@ let
     if toolsArch == "armv6l" then raspberrypiCrossSystem else
     if toolsArch == "armv7l" then armv7l-hf-multiplatform-crossSystem else null;
 
-  pkgs = pkgsFun ({inherit system;} // selectedCrossSystem);
+  pkgsUnspliced = pkgsFun ({inherit system;} // selectedCrossSystem);
+  pkgs = pkgsUnspliced.splicedPackages;
 
-  inherit (pkgs) stdenv nukeReferences cpio binutilsCross;
+  inherit (pkgsUnspliced.buildPackages) stdenv nukeReferences cpio binutilsCross;
 
-  glibc = pkgs.libcCross;
+  glibc = pkgs.libcCross.nativeDrv;
   bash = pkgs.bash.crossDrv;
   findutils = pkgs.findutils.crossDrv;
   diffutils = pkgs.diffutils.crossDrv;
@@ -71,7 +72,7 @@ let
   gnumake = pkgs.gnumake.crossDrv;
   patch = pkgs.patch.crossDrv;
   patchelf = pkgs.patchelf.crossDrv;
-  gcc = pkgs.gcc.cc.crossDrv;
+  gcc = pkgs.gcc.crossDrv.cc;
   gmpxx = pkgs.gmpxx.crossDrv;
   mpfr = pkgs.mpfr.crossDrv;
   zlib = pkgs.zlib.crossDrv;
@@ -86,17 +87,17 @@ in
 rec {
 
 
-  coreutilsMinimal = (pkgs.coreutils.override (args: {
+  coreutilsMinimal = pkgs.coreutils.override (args: {
     # We want coreutils without ACL/attr support.
     aclSupport = false;
     attrSupport = false;
     # Our tooling currently can't handle scripts in bin/, only ELFs and symlinks.
     singleBinary = "symlinks";
-  })).crossDrv;
+  });
 
-  tarMinimal = (pkgs.gnutar.override { acl = null; }).crossDrv;
+  tarMinimal = pkgs.gnutar.override { acl = null; };
 
-  busyboxMinimal = (pkgs.busybox.override {
+  busyboxMinimal = pkgs.busybox.override {
     useMusl = true;
     enableStatic = true;
     enableMinimal = true;
@@ -109,13 +110,13 @@ rec {
       CONFIG_TAR y
       CONFIG_UNXZ y
     '';
-  }).crossDrv;
+  };
 
   build =
 
     stdenv.mkDerivation {
       name = "stdenv-bootstrap-tools-cross";
-      crossConfig = stdenv.cross.config;
+      crossConfig = pkgsUnspliced.crossSystem.config;
 
       buildInputs = [nukeReferences cpio binutilsCross];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d2b4cf5201..bafe502da38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10,26 +10,12 @@ self: pkgs:
 
 with pkgs;
 
-let
-  defaultScope = pkgs // pkgs.xorg;
-in
-
 {
 
   # Allow callPackage to fill in the pkgs argument
   inherit pkgs;
 
 
-  # We use `callPackage' to be able to omit function arguments that
-  # can be obtained from `pkgs' or `pkgs.xorg' (i.e. `defaultScope').
-  # Use `newScope' for sets of packages in `pkgs' (see e.g. `gnome'
-  # below).
-  callPackage = newScope {};
-
-  callPackages = lib.callPackagesWith defaultScope;
-
-  newScope = extra: lib.callPackageWith (defaultScope // extra);
-
   # Override system. This is useful to build i686 packages on x86_64-linux.
   forceSystem = system: kernel: nixpkgsFun {
     inherit system;
@@ -39,15 +25,9 @@ in
   # Used by wine, firefox with debugging version of Flash, ...
   pkgsi686Linux = forceSystem "i686-linux" "i386";
 
-  callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg);
+  callPackage_i686 = pkgsi686Linux.callPackage;
 
-  forceNativeDrv = drv:
-    # Even when cross compiling, some packages come from the stdenv's
-    # bootstrapping package set. Those packages are only built for the native
-    # platform.
-    if crossSystem != null && drv ? crossDrv
-    then drv // { crossDrv = drv.nativeDrv; }
-    else drv;
+  forcedNativePackages = if crossSystem == null then pkgs else buildPackages;
 
   # A stdenv capable of building 32-bit binaries.  On x86_64-linux,
   # it uses GCC compiled with multilib support; on i686-linux, it's
@@ -4771,41 +4751,45 @@ in
 
   gccApple = throw "gccApple is no longer supported";
 
-  gccCrossStageStatic = let
+  gccCrossStageStatic = assert crossSystem != null; let
     libcCross1 =
       if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers
       else if stdenv.cross.libc == "libSystem" then darwin.xcode
       else null;
     in wrapGCCCross {
-      gcc = forceNativeDrv (gcc.cc.override {
+      gcc = forcedNativePackages.gcc.cc.override {
         cross = crossSystem;
         crossStageStatic = true;
         langCC = false;
         libcCross = libcCross1;
         enableShared = false;
-      });
+        # Why is this needed?
+        inherit (forcedNativePackages) binutilsCross;
+      };
       libc = libcCross1;
       binutils = binutilsCross;
       cross = crossSystem;
   };
 
   # Only needed for mingw builds
-  gccCrossMingw2 = wrapGCCCross {
+  gccCrossMingw2 = assert crossSystem != null; wrapGCCCross {
     gcc = gccCrossStageStatic.gcc;
     libc = windows.mingw_headers2;
     binutils = binutilsCross;
     cross = assert crossSystem != null; crossSystem;
   };
 
-  gccCrossStageFinal = wrapGCCCross {
-    gcc = forceNativeDrv (gcc.cc.override {
+  gccCrossStageFinal = assert crossSystem != null; wrapGCCCross {
+    gcc = forcedNativePackages.gcc.cc.override {
       cross = crossSystem;
       crossStageStatic = false;
 
       # XXX: We have troubles cross-compiling libstdc++ on MinGW (see
       # <http://hydra.nixos.org/build/4268232>), so don't even try.
       langCC = crossSystem.config != "i686-pc-mingw32";
-    });
+      # Why is this needed?
+      inherit (forcedNativePackages) binutilsCross;
+    };
     libc = libcCross;
     binutils = binutilsCross;
     cross = crossSystem;
@@ -5499,12 +5483,12 @@ in
   wrapGCCCross =
     {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}:
 
-    forceNativeDrv (callPackage ../build-support/gcc-cross-wrapper {
+    forcedNativePackages.callPackage ../build-support/gcc-cross-wrapper {
       nativeTools = false;
       nativeLibc = false;
       noLibc = (libc == null);
       inherit gcc binutils libc shell name cross;
-    });
+    };
 
   # prolog
   yap = callPackage ../development/compilers/yap { };
@@ -6084,12 +6068,12 @@ in
     gold = false;
   });
 
-  binutilsCross = assert crossSystem != null; lowPrio (forceNativeDrv (
+  binutilsCross = assert crossSystem != null; lowPrio (
     if crossSystem.libc == "libSystem" then darwin.cctools_cross
-    else binutils.override {
+    else forcedNativePackages.binutils.override {
       noSysDirs = true;
       cross = crossSystem;
-    }));
+    });
 
   bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
   bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
@@ -6558,9 +6542,9 @@ in
      cross_renaming: we should make all programs use pkgconfig as
      nativeBuildInput after the renaming.
      */
-  pkgconfig = forceNativeDrv (callPackage ../development/tools/misc/pkgconfig {
+  pkgconfig = forcedNativePackages.callPackage ../development/tools/misc/pkgconfig {
     fetchurl = fetchurlBoot;
-  });
+  };
   pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; });
 
   postiats-utilities = callPackage ../development/tools/postiats-utilities {};
@@ -7336,10 +7320,10 @@ in
     withGd = true;
   };
 
-  glibcCross = forceNativeDrv (glibc.override {
+  glibcCross = forcedNativePackages.glibc.override {
     gccCross = gccCrossStageStatic;
     linuxHeaders = linuxHeadersCross;
-  });
+  };
 
   # We can choose:
   libcCrossChooser = name: if name == "glibc" then glibcCross
@@ -10910,7 +10894,7 @@ in
     cmdline = callPackage ../os-specific/darwin/command-line-tools {};
     apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
   in apple-source-releases // rec {
-    cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) {
+    cctools_cross = callPackage (forcedNativePackages.callPackage ../os-specific/darwin/cctools/port.nix {}).cross {
       cross = assert crossSystem != null; crossSystem;
       inherit maloader;
       xctoolchain = xcode.toolchain;
@@ -11148,13 +11132,13 @@ in
 
   linuxHeaders = linuxHeaders_4_4;
 
-  linuxHeaders24Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/2.4.nix {
+  linuxHeaders24Cross = forcedNativePackages.callPackage ../os-specific/linux/kernel-headers/2.4.nix {
     cross = assert crossSystem != null; crossSystem;
-  });
+  };
 
-  linuxHeaders26Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/4.4.nix {
+  linuxHeaders26Cross = forcedNativePackages.callPackage ../os-specific/linux/kernel-headers/4.4.nix {
     cross = assert crossSystem != null; crossSystem;
-  });
+  };
 
   linuxHeaders_3_18 = callPackage ../os-specific/linux/kernel-headers/3.18.nix { };
 
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index f582bcf3b32..48f183162cf 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -32,8 +32,10 @@ let
 in
 
 {
-  # These `nativeDrv`s should be identical to their vanilla ones --- cross
-  # compiling should not affect the native derivation.
+  # These derivations from a cross package set's `buildPackages` should be
+  # identical to their vanilla equivalents --- none of these package should
+  # observe the target platform which is the only difference between those
+  # package sets.
   ensureUnaffected = let
     # Absurd values are fine here, as we are not building anything. In fact,
     # there probably a good idea to try to be "more parametric" --- i.e. avoid
@@ -47,8 +49,12 @@ in
     # good idea lest there be some irrelevant pass-through debug attrs that
     # cause false negatives.
     testEqualOne = path: system: let
-      f = attrs: builtins.toString (lib.getAttrFromPath path (allPackages attrs));
-    in assert f { inherit system; } == f { inherit system crossSystem; }; true;
+      f = path: attrs: builtins.toString (lib.getAttrFromPath path (allPackages attrs));
+    in assert
+        f path { inherit system; }
+        ==
+        f (["buildPackages"] ++ path) { inherit system crossSystem; };
+      true;
 
     testEqual = path: systems: forAllSupportedSystems systems (testEqualOne path);
 
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 5fe87711c01..04a57ef8063 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -76,8 +76,9 @@ rec {
    * parameter for allPackages, defining the target platform for cross builds,
    * and triggering the build of the host derivation (cross built - crossDrv). */
   mapTestOnCross = crossSystem: mapAttrsRecursive
-    (path: systems: testOnCross crossSystem systems
-      (pkgs: addMetaAttrs { maintainers = crossMaintainers; } (getAttrFromPath path pkgs)));
+    (path: systems: testOnCross crossSystem systems (pkgs: addMetaAttrs
+      { maintainers = crossMaintainers; }
+      (getAttrFromPath path pkgs.splicedPackages)));
 
 
   /* Recursively map a (nested) set of derivations to an isomorphic
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
new file mode 100644
index 00000000000..f57f42020c2
--- /dev/null
+++ b/pkgs/top-level/splice.nix
@@ -0,0 +1,76 @@
+# The `splicedPackages' package set, and its use by `callPackage`
+#
+# The `buildPackages` pkg set is a new concept, and the vast majority package
+# expression (the other *.nix files) are not designed with it in mind. This
+# presents us with a problem with how to get the right version (build-time vs
+# run-time) of a package to a consumer that isn't used to thinking so cleverly.
+#
+# The solution is to splice the package sets together as we do below, so every
+# `callPackage`d expression in fact gets both versions. Each# derivation (and
+# each derivation's outputs) consists of the run-time version, augmented with a
+# `nativeDrv` field for the build-time version, and `crossDrv` field for the
+# run-time version.
+#
+# We could have used any names we want for the disambiguated versions, but
+# `crossDrv` and `nativeDrv` were somewhat similarly used for the old
+# cross-compiling infrastructure. The names are mostly invisible as
+# `mkDerivation` knows how to pull out the right ones for `buildDepends` and
+# friends, but a few packages use them directly, so it seemed efficient (to
+# @Ericson2314) to reuse those names, at least initially, to minimize breakage.
+lib: pkgs:
+
+let
+  defaultBuildScope = pkgs.buildPackages // pkgs.buildPackages.xorg;
+  # TODO(@Ericson2314): we shouldn't preclude run-time fetching by removing
+  # these attributes. We should have a more general solution for selecting
+  # whether `nativeDrv` or `crossDrv` is the default in `defaultScope`.
+  pkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs;
+  defaultRunScope = pkgsWithoutFetchers // pkgs.xorg;
+
+  splicer = buildPkgs: runPkgs: let
+    mash = buildPkgs // runPkgs;
+    merge = name: {
+      inherit name;
+      value = let
+        defaultValue = mash.${name};
+        buildValue = buildPkgs.${name} or {};
+        runValue = runPkgs.${name} or {};
+        augmentedValue = defaultValue
+          // (lib.optionalAttrs (buildPkgs ? ${name}) { nativeDrv = buildValue; })
+          // (lib.optionalAttrs (runPkgs ? ${name}) { crossDrv = runValue; });
+        # Get the set of outputs of a derivation
+        getOutputs = value:
+          lib.genAttrs (value.outputs or []) (output: value.${output});
+      in
+        # Certain *Cross derivations will fail assertions, but we need their
+        # nativeDrv. We are assuming anything that fails to evaluate is an
+        # attrset (including derivation) and thus can be unioned.
+        if !(builtins.tryEval defaultValue).success then augmentedValue
+        # The derivation along with its outputs, which we recur
+        # on to splice them together.
+        else if lib.isDerivation defaultValue then augmentedValue
+          // splicer (getOutputs buildValue) (getOutputs runValue)
+        # Just recur on plain attrsets
+        else if lib.isAttrs defaultValue then splicer buildValue runValue
+        # Don't be fancy about non-derivations. But we could have used used
+        # `__functor__` for functions instead.
+        else defaultValue;
+    };
+  in lib.listToAttrs (map merge (lib.attrNames mash));
+
+  splicedPackages = splicer defaultBuildScope defaultRunScope;
+
+in
+
+{
+  splicedPackages = splicedPackages // { recurseForDerivations = false; };
+
+  # We use `callPackage' to be able to omit function arguments that can be
+  # obtained `pkgs` or `buildPackages` and their `xorg` package sets. Use
+  # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).
+  callPackage = pkgs.newScope {};
+
+  callPackages = lib.callPackagesWith splicedPackages;
+
+  newScope = extra: lib.callPackageWith (splicedPackages // extra);
+}
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index cbf65870eb7..c100e21473c 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -12,6 +12,9 @@
 { # The system (e.g., `i686-linux') for which to build the packages.
   system
 
+, # the package set used at build-time
+  buildPackages
+
 , # The standard environment to use for building packages.
   stdenv
 
@@ -51,10 +54,13 @@ let
 
   stdenvBootstappingAndPlatforms = self: super: {
     stdenv = stdenv // { inherit platform; };
+    buildPackages = buildPackages // { recurseForDerivations = false; };
     inherit
       system platform crossSystem;
   };
 
+  splice = self: super: import ./splice.nix lib self;
+
   allPackages = self: super:
     let res = import ./all-packages.nix
       { inherit lib nixpkgsFun noSysDirs config; }
@@ -85,6 +91,7 @@ let
     stdenvBootstappingAndPlatforms
     stdenvAdapters
     trivialBuilders
+    splice
     allPackages
     aliases
     stdenvOverrides

From eee7cafaf7961b762cb74edd1670b42e5a7547a9 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 15 Jan 2017 13:28:35 -0500
Subject: [PATCH 593/727] coreutils: Use `buildPackages` instead of `self` hack
 for native version

---
 pkgs/tools/misc/coreutils/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 9e66c6ba918..b65c20e7808 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perl, xz, gmp ? null
+{ lib, stdenv, buildPackages, fetchurl, perl, xz, gmp ? null
 , aclSupport ? false, acl ? null
 , attrSupport ? false, attr ? null
 , selinuxSupport? false, libselinux ? null, libsepol ? null
@@ -12,8 +12,7 @@ assert selinuxSupport -> libselinux != null && libsepol != null;
 
 with lib;
 
-let
-  self = stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
     name = "coreutils-8.26";
 
     src = fetchurl {
@@ -63,12 +62,12 @@ let
       # Works around a bug with 8.26:
       # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually).  Stop.
       preInstall = ''
-        sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${self}/bin/install -c|'
+        sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|'
       '';
 
       postInstall = ''
         rm $out/share/man/man1/*
-        cp ${self}/share/man/man1/* $out/share/man/man1
+        cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1
       '';
 
       # Needed for fstatfs()
@@ -110,6 +109,4 @@ let
 
       maintainers = [ maintainers.eelco ];
     };
-  };
-in
-  self
+  }

From 94df8e7e4d9024abe9883f310dd6c2c7929f4ce0 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 14 Jan 2017 14:54:53 -0500
Subject: [PATCH 594/727] openssl: Output-santizing hack properly uses native
 perl again

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

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index cd4a696b1d9..7cce57a753f 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl
+{ stdenv, fetchurl, buildPackages, perl
 , withCryptodev ? false, cryptodevHeaders
 , enableSSL2 ? false }:
 
@@ -76,7 +76,7 @@ let
 
     postFixup = ''
       # Check to make sure the main output doesn't depend on perl
-      if grep -r '${perl}' $out; then
+      if grep -r '${buildPackages.perl}' $out; then
         echo "Found an erroneous dependency on perl ^^^" >&2
         exit 1
       fi

From d27403b17b9e7baa902f90be25391d65c22fe19d Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 14 Jan 2017 16:22:50 -0500
Subject: [PATCH 595/727] libiconv: TEMP force building library improperly for
 target plat like libc

---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bafe502da38..47c565bd2ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8241,9 +8241,9 @@ with pkgs;
   # glibc provides libiconv so systems with glibc don't need to build libiconv
   # separately, but we also provide libiconvReal, which will always be a
   # standalone libiconv, just in case you want it
-  libiconv = if crossSystem != null then
-    (if crossSystem.libc == "glibc" then libcCross
-      else if crossSystem.libc == "libSystem" then darwin.libiconv
+  libiconv = if stdenv ? cross then
+    (if stdenv.cross.libc == "glibc" then libcCross
+      else if stdenv.cross.libc == "libSystem" then darwin.libiconv
       else libiconvReal)
     else if stdenv.isGlibc then glibcIconv stdenv.cc.libc
     else if stdenv.isDarwin then darwin.libiconv

From 5b88f09ec4d6b3ac953cd9d252ebfd6663205c57 Mon Sep 17 00:00:00 2001
From: David Grayson <davidegrayson@gmail.com>
Date: Fri, 23 Dec 2016 21:26:54 -0800
Subject: [PATCH 596/727] coreutils: Fix indentation after removing `self` in
 `buildPackages` commit

---
 pkgs/tools/misc/coreutils/default.nix | 162 +++++++++++++-------------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index b65c20e7808..2c435881f8c 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -13,100 +13,100 @@ assert selinuxSupport -> libselinux != null && libsepol != null;
 with lib;
 
 stdenv.mkDerivation rec {
-    name = "coreutils-8.26";
+  name = "coreutils-8.26";
 
-    src = fetchurl {
-      url = "mirror://gnu/coreutils/${name}.tar.xz";
-      sha256 = "13lspazc7xkviy93qz7ks9jv4sldvgmwpq36ghrbrqpq93br8phm";
-    };
+  src = fetchurl {
+    url = "mirror://gnu/coreutils/${name}.tar.xz";
+    sha256 = "13lspazc7xkviy93qz7ks9jv4sldvgmwpq36ghrbrqpq93br8phm";
+  };
 
-    # FIXME needs gcc 4.9 in bootstrap tools
-    hardeningDisable = [ "stackprotector" ];
+  # FIXME needs gcc 4.9 in bootstrap tools
+  hardeningDisable = [ "stackprotector" ];
 
-    patches = optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch;
+  patches = optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch;
 
-    # The test tends to fail on btrfs and maybe other unusual filesystems.
-    postPatch = optionalString (!stdenv.isDarwin) ''
-      sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
-      sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh
-      sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
-      sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh
+  # The test tends to fail on btrfs and maybe other unusual filesystems.
+  postPatch = optionalString (!stdenv.isDarwin) ''
+    sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
+    sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh
+    sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
+    sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh
+  '';
+
+  outputs = [ "out" "info" ];
+
+  nativeBuildInputs = [ perl xz.bin ];
+  configureFlags =
+    optional (singleBinary != false)
+      ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}")
+    ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no"
+    ++ optional withPrefix "--program-prefix=g";
+
+  buildInputs = [ gmp ]
+    ++ optional aclSupport acl
+    ++ optional attrSupport attr
+    ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ]   # due to patch
+    ++ optionals selinuxSupport [ libselinux libsepol ];
+
+  crossAttrs = {
+    buildInputs = [ gmp.crossDrv ]
+      ++ optional aclSupport acl.crossDrv
+      ++ optional attrSupport attr.crossDrv
+      ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ]
+      ++ optional (stdenv.ccCross.libc ? libiconv)
+        stdenv.ccCross.libc.libiconv.crossDrv;
+
+    # Prevents attempts of running 'help2man' on cross-built binaries.
+    PERL = "missing";
+
+    # Works around a bug with 8.26:
+    # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually).  Stop.
+    preInstall = ''
+      sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|'
     '';
 
-    outputs = [ "out" "info" ];
+    postInstall = ''
+      rm $out/share/man/man1/*
+      cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1
+    '';
 
-    nativeBuildInputs = [ perl xz.bin ];
-    configureFlags =
-      optional (singleBinary != false)
-        ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}")
-      ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no"
-      ++ optional withPrefix "--program-prefix=g";
+    # Needed for fstatfs()
+    # I don't know why it is not properly detected cross building with glibc.
+    configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ];
+    doCheck = false;
+  };
 
-    buildInputs = [ gmp ]
-      ++ optional aclSupport acl
-      ++ optional attrSupport attr
-      ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ]   # due to patch
-      ++ optionals selinuxSupport [ libselinux libsepol ];
+  # The tests are known broken on Cygwin
+  # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
+  # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
+  # and {Open,Free}BSD.
+  # With non-standard storeDir: https://github.com/NixOS/nix/issues/512
+  doCheck = stdenv ? glibc && builtins.storeDir == "/nix/store";
 
-    crossAttrs = {
-      buildInputs = [ gmp.crossDrv ]
-        ++ optional aclSupport acl.crossDrv
-        ++ optional attrSupport attr.crossDrv
-        ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ]
-        ++ optional (stdenv.ccCross.libc ? libiconv)
-          stdenv.ccCross.libc.libiconv.crossDrv;
+  # Saw random failures like ‘help2man: can't get '--help' info from
+  # man/sha512sum.td/sha512sum’.
+  enableParallelBuilding = false;
 
-      # Prevents attempts of running 'help2man' on cross-built binaries.
-      PERL = "missing";
+  NIX_LDFLAGS = optionalString selinuxSupport "-lsepol";
+  FORCE_UNSAFE_CONFIGURE = optionalString stdenv.isSunOS "1";
 
-      # Works around a bug with 8.26:
-      # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually).  Stop.
-      preInstall = ''
-        sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|'
-      '';
+  makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0";
 
-      postInstall = ''
-        rm $out/share/man/man1/*
-        cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1
-      '';
+  meta = {
+    homepage = http://www.gnu.org/software/coreutils/;
+    description = "The basic file, shell and text manipulation utilities of the GNU operating system";
 
-      # Needed for fstatfs()
-      # I don't know why it is not properly detected cross building with glibc.
-      configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ];
-      doCheck = false;
-    };
+    longDescription = ''
+      The GNU Core Utilities are the basic file, shell and text
+      manipulation utilities of the GNU operating system.  These are
+      the core utilities which are expected to exist on every
+      operating system.
+    '';
 
-    # The tests are known broken on Cygwin
-    # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
-    # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
-    # and {Open,Free}BSD.
-    # With non-standard storeDir: https://github.com/NixOS/nix/issues/512
-    doCheck = stdenv ? glibc && builtins.storeDir == "/nix/store";
+    license = licenses.gpl3Plus;
 
-    # Saw random failures like ‘help2man: can't get '--help' info from
-    # man/sha512sum.td/sha512sum’.
-    enableParallelBuilding = false;
+    platforms = platforms.all;
 
-    NIX_LDFLAGS = optionalString selinuxSupport "-lsepol";
-    FORCE_UNSAFE_CONFIGURE = optionalString stdenv.isSunOS "1";
-
-    makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0";
-
-    meta = {
-      homepage = http://www.gnu.org/software/coreutils/;
-      description = "The basic file, shell and text manipulation utilities of the GNU operating system";
-
-      longDescription = ''
-        The GNU Core Utilities are the basic file, shell and text
-        manipulation utilities of the GNU operating system.  These are
-        the core utilities which are expected to exist on every
-        operating system.
-      '';
-
-      license = licenses.gpl3Plus;
-
-      platforms = platforms.all;
-
-      maintainers = [ maintainers.eelco ];
-    };
-  }
+    maintainers = [ maintainers.eelco ];
+  };
+}

From 92edcb7ebbf5b4b324288ec62bebbc58a3f96ef6 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 24 Dec 2016 10:55:11 -0800
Subject: [PATCH 597/727] top-level: Lay the groundwork for
 `{build,host,target}Platform`

The long term goal is a big replace:
  { inherit system platform; } => buildPlatform
  crossSystem => hostPlatform
  stdenv.cross => targetPlatform
And additionally making sure each is defined even when not cross compiling.

This commit refactors the bootstrapping code along that vision, but leaves
the old identifiers with their null semantics in place so packages can be
modernized incrementally.
---
 pkgs/stdenv/adapters.nix        |  2 +-
 pkgs/stdenv/cross/default.nix   | 16 ++++---
 pkgs/stdenv/custom/default.nix  |  9 ++--
 pkgs/stdenv/darwin/default.nix  | 17 +++++--
 pkgs/stdenv/default.nix         |  4 +-
 pkgs/stdenv/freebsd/default.nix |  8 +++-
 pkgs/stdenv/linux/default.nix   | 30 ++++++++-----
 pkgs/stdenv/native/default.nix  | 13 ++++--
 pkgs/stdenv/nix/default.nix     |  4 +-
 pkgs/top-level/default.nix      |  3 +-
 pkgs/top-level/stage.nix        | 80 ++++++++++++++++++++++++++-------
 11 files changed, 134 insertions(+), 52 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index daa180c644f..5d66db266c7 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -108,7 +108,7 @@ rec {
                     crossConfig = cross.config;
                 } // args.crossAttrs or {});
     } // {
-      inherit cross gccCross binutilsCross;
+      inherit gccCross binutilsCross;
       ccCross = gccCross;
     };
 
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index e684c14da4a..37f403acee9 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -1,10 +1,10 @@
 { lib
-, system, platform, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays
 }:
 
 let
   bootStages = import ../. {
-    inherit lib system platform overlays;
+    inherit lib localSystem overlays;
     crossSystem = null;
     # Ignore custom stdenvs when cross compiling for compatability
     config = builtins.removeAttrs config [ "replaceStdenv" ];
@@ -14,21 +14,25 @@ in bootStages ++ [
 
   # Build Packages
   (vanillaPackages: {
-    inherit system platform crossSystem config overlays;
+    buildPlatform = localSystem;
+    hostPlatform = localSystem;
+    targetPlatform = crossSystem;
+    inherit config overlays;
     # Should be false, but we're trying to preserve hashes for now
     selfBuild = true;
     # It's OK to change the built-time dependencies
     allowCustomOverrides = true;
     stdenv = vanillaPackages.stdenv // {
-      # Needed elsewhere as a hacky way to pass the target
-      cross = crossSystem;
       overrides = _: _: {};
     };
   })
 
   # Run Packages
   (buildPackages: {
-    inherit system platform crossSystem config overlays;
+    buildPlatform = localSystem;
+    hostPlatform = crossSystem;
+    targetPlatform = crossSystem;
+    inherit config overlays;
     selfBuild = false;
     stdenv = if crossSystem.useiOSCross or false
       then let
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix
index d7e9bf53bed..d5dc977b37a 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/pkgs/stdenv/custom/default.nix
@@ -1,12 +1,12 @@
 { lib
-, system, platform, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays
 }:
 
 assert crossSystem == null;
 
 let
   bootStages = import ../. {
-    inherit lib system platform crossSystem overlays;
+    inherit lib localSystem crossSystem overlays;
     # Remove config.replaceStdenv to ensure termination.
     config = builtins.removeAttrs config [ "replaceStdenv" ];
   };
@@ -15,7 +15,10 @@ in bootStages ++ [
 
   # Additional stage, built using custom stdenv
   (vanillaPackages: {
-    inherit system platform crossSystem config overlays;
+    buildPlatform = localSystem;
+    hostPlatform = localSystem;
+    targetPlatform = localSystem;
+    inherit config overlays;
     stdenv = config.replaceStdenv { pkgs = vanillaPackages; };
   })
 
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index e3a87ea078f..e647c81890e 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -1,11 +1,12 @@
 { lib
-, system, platform, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays
 
 # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
 , bootstrapFiles ? let
   fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> {
     url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/33f59c9d11b8d5014dfd18cc11a425f6393c884a/${file}";
-    inherit sha256 system executable;
+    inherit (localSystem) system;
+    inherit sha256 executable;
   }; in {
     sh      = fetch { file = "sh";    sha256 = "1rx4kg6358xdj05z0m139a0zn4f4zfmq4n4vimlmnwyfiyn4x7wk"; };
     bzip2   = fetch { file = "bzip2"; sha256 = "104qnhzk79vkbp2yi0kci6lszgfppvrwk3rgxhry842ly1xz2r7l"; };
@@ -18,6 +19,8 @@
 assert crossSystem == null;
 
 let
+  inherit (localSystem) system platform;
+
   libSystemProfile = ''
     (import "${./standard-sandbox.sb}")
   '';
@@ -98,7 +101,10 @@ in rec {
       };
 
     in {
-      inherit system platform crossSystem config overlays;
+      buildPlatform = localSystem;
+      hostPlatform = localSystem;
+      targetPlatform = localSystem;
+      inherit config overlays;
       stdenv = thisStdenv;
     };
 
@@ -316,7 +322,10 @@ in rec {
     stage3
     stage4
     (prevStage: {
-      inherit system crossSystem platform config overlays;
+      buildPlatform = localSystem;
+      hostPlatform = localSystem;
+      targetPlatform = localSystem;
+      inherit config overlays;
       stdenv = stdenvDarwin prevStage;
     })
   ];
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index f60ffec4b56..78dbde13b89 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -7,7 +7,7 @@
 { # Args just for stdenvs' usage
   lib
   # Args to pass on to the pkgset builder, too
-, system, platform, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays
 } @ args:
 
 let
@@ -51,4 +51,4 @@ in
     "i686-cygwin" = stagesNative;
     "x86_64-cygwin" = stagesNative;
     "x86_64-freebsd" = stagesFreeBSD;
-  }.${system} or stagesNative
+  }.${localSystem.system} or stagesNative
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 2cb059deb34..b926c6bdd90 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -1,8 +1,9 @@
 { lib
-, system, platform, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays
 }:
 
 assert crossSystem == null;
+let inherit (localSystem) system; in
 
 
 [
@@ -58,7 +59,10 @@ assert crossSystem == null;
   })
 
   (prevStage: {
-    inherit system crossSystem platform config overlays;
+    buildPlatform = localSystem;
+    hostPlatform = localSystem;
+    targetPlatform = localSystem;
+    inherit config overlays;
     stdenv = import ../generic {
       name = "stdenv-freebsd-boot-3";
       inherit system config;
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 12da007f2a7..611628b35ab 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -4,21 +4,23 @@
 # compiler and linker that do not search in default locations,
 # ensuring purity of components produced by it.
 { lib
-, system, platform, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays
 
-, bootstrapFiles ?
-    if system == "i686-linux" then import ./bootstrap-files/i686.nix
-    else if system == "x86_64-linux" then import ./bootstrap-files/x86_64.nix
-    else if system == "armv5tel-linux" then import ./bootstrap-files/armv5tel.nix
-    else if system == "armv6l-linux" then import ./bootstrap-files/armv6l.nix
-    else if system == "armv7l-linux" then import ./bootstrap-files/armv7l.nix
-    else if system == "mips64el-linux" then import ./bootstrap-files/loongson2f.nix
-    else abort "unsupported platform for the pure Linux stdenv"
+, bootstrapFiles ? { # switch
+    "i686-linux" = import ./bootstrap-files/i686.nix;
+    "x86_64-linux" = import ./bootstrap-files/x86_64.nix;
+    "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix;
+    "armv6l-linux" = import ./bootstrap-files/armv6l.nix;
+    "armv7l-linux" = import ./bootstrap-files/armv7l.nix;
+    "mips64el-linux" = import ./bootstrap-files/loongson2f.nix;
+  }.${localSystem.system}
+    or (abort "unsupported platform for the pure Linux stdenv")
 }:
 
 assert crossSystem == null;
 
 let
+  inherit (localSystem) system platform;
 
   commonPreHook =
     ''
@@ -91,7 +93,10 @@ let
       };
 
     in {
-      inherit system platform crossSystem config overlays;
+      buildPlatform = localSystem;
+      hostPlatform = localSystem;
+      targetPlatform = localSystem;
+      inherit config overlays;
       stdenv = thisStdenv;
     };
 
@@ -246,7 +251,10 @@ in
   # dependency (`nix-store -qR') on bootstrapTools or the first
   # binutils built.
   (prevStage: {
-    inherit system crossSystem platform config overlays;
+    buildPlatform = localSystem;
+    hostPlatform = localSystem;
+    targetPlatform = localSystem;
+    inherit config overlays;
     stdenv = import ../generic rec {
       inherit system config;
 
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 4028638009e..f5c0976bf93 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -1,10 +1,11 @@
 { lib
-, system, platform, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays
 }:
 
 assert crossSystem == null;
 
 let
+  inherit (localSystem) system platform;
 
   shell =
     if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash"
@@ -134,7 +135,10 @@ in
 
   # First build a stdenv based only on tools outside the store.
   (prevStage: {
-    inherit system crossSystem platform config overlays;
+    buildPlatform = localSystem;
+    hostPlatform = localSystem;
+    targetPlatform = localSystem;
+    inherit config overlays;
     stdenv = makeStdenv {
       inherit (prevStage) cc fetchurl;
     } // { inherit (prevStage) fetchurl; };
@@ -143,7 +147,10 @@ in
   # Using that, build a stdenv that adds the ‘xz’ command (which most systems
   # don't have, so we mustn't rely on the native environment providing it).
   (prevStage: {
-    inherit system crossSystem platform config overlays;
+    buildPlatform = localSystem;
+    hostPlatform = localSystem;
+    targetPlatform = localSystem;
+    inherit config overlays;
     stdenv = makeStdenv {
       inherit (prevStage.stdenv) cc fetchurl;
       extraPath = [ prevStage.xz ];
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index a5f0a18464c..9aece3ce829 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -9,9 +9,9 @@ assert crossSystem == null;
 bootStages ++ [
   (prevStage: let
     inherit (prevStage) stdenv;
-    inherit (stdenv) system platform;
   in {
-    inherit system platform crossSystem config;
+    inherit (prevStage) buildPlatform hostPlatform targetPlatform;
+    inherit config overlays;
 
     stdenv = import ../generic rec {
       inherit config;
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index a146dad63bc..b7a4273acff 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -83,7 +83,8 @@ in let
   boot = import ../stdenv/booter.nix { inherit lib allPackages; };
 
   stages = stdenvStages {
-    inherit lib system platform crossSystem config overlays;
+    localSystem = { inherit system platform; };
+    inherit lib crossSystem config overlays;
   };
 
   pkgs = boot stages;
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index c100e21473c..780be566436 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -9,10 +9,43 @@
    import `pkgs/default.nix` or `default.nix`. */
 
 
-{ # The system (e.g., `i686-linux') for which to build the packages.
-  system
+{ ## Misc parameters kept the same for all stages
+  ##
 
-, # the package set used at build-time
+  # Utility functions, could just import but passing in for efficiency
+  lib
+
+, # Use to reevaluate Nixpkgs; a dirty hack that should be removed
+  nixpkgsFun
+
+  ## Platform parameters
+  ##
+  ## The "build" "host" "target" terminology below comes from GNU Autotools. See
+  ## its documentation for more information on what those words mean. Note that
+  ## each should always be defined, even when not cross compiling.
+  ##
+  ## For purposes of bootstrapping, think of each stage as a "sliding window"
+  ## over a list of platforms. Specifically, the host platform of the previous
+  ## stage becomes the build platform of the current one, and likewise the
+  ## target platform of the previous stage becomes the host platform of the
+  ## current one.
+  ##
+
+, # The platform on which packages are built. Consists of `system`, a
+  # string (e.g.,`i686-linux') identifying the most import attributes of the
+  # build platform, and `platform` a set of other details.
+  buildPlatform
+
+, # The platform on which packages run.
+  hostPlatform
+
+, # The platform which build tools (especially compilers) build for in this stage,
+  targetPlatform
+
+  ## Other parameters
+  ##
+
+, # The package set used at build-time
   buildPackages
 
 , # The standard environment to use for building packages.
@@ -24,21 +57,19 @@
   allowCustomOverrides
 
 , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc
-  # outside of the store.  Thus, GCC, GFortran, & co. must always look for
-  # files in standard system directories (/usr/include, etc.)
-  noSysDirs ? (system != "x86_64-freebsd" && system != "i686-freebsd"
-               && system != "x86_64-solaris"
-               && system != "x86_64-kfreebsd-gnu")
+  # outside of the store.  Thus, GCC, GFortran, & co. must always look for files
+  # in standard system directories (/usr/include, etc.)
+  noSysDirs ? buildPlatform.system != "x86_64-freebsd"
+           && buildPlatform.system != "i686-freebsd"
+           && buildPlatform.system != "x86_64-solaris"
+           && buildPlatform.system != "x86_64-kfreebsd-gnu"
 
 , # The configuration attribute set
   config
 
-, overlays # List of overlays to use in the fix-point.
-
-, crossSystem
-, platform
-, lib
-, nixpkgsFun
+, # A list of overlays (Additional `self: super: { .. }` customization
+  # functions) to be fixed together in the produced package set
+  overlays
 }:
 
 let
@@ -53,10 +84,24 @@ let
     };
 
   stdenvBootstappingAndPlatforms = self: super: {
-    stdenv = stdenv // { inherit platform; };
     buildPackages = buildPackages // { recurseForDerivations = false; };
-    inherit
-      system platform crossSystem;
+    inherit stdenv
+      buildPlatform hostPlatform targetPlatform;
+  };
+
+  # The old identifiers for cross-compiling. These should eventually be removed,
+  # and the packages that rely on them refactored accordingly.
+  platformCompat = self: super: let
+    # TODO(@Ericson2314) this causes infinite recursion
+    #inherit (self) buildPlatform hostPlatform targetPlatform;
+  in {
+    stdenv = super.stdenv // {
+      inherit (buildPlatform) platform;
+    } // lib.optionalAttrs (targetPlatform != buildPlatform) {
+      cross = targetPlatform;
+    };
+    inherit (buildPlatform) system platform;
+    crossSystem = if targetPlatform != buildPlatform then targetPlatform else null;
   };
 
   splice = self: super: import ./splice.nix lib self;
@@ -89,6 +134,7 @@ let
   # The complete chain of package set builders, applied from top to bottom
   toFix = lib.foldl' (lib.flip lib.extends) (self: {}) ([
     stdenvBootstappingAndPlatforms
+    platformCompat
     stdenvAdapters
     trivialBuilders
     splice

From 09401d44eb402a368b1eb6908a68e5b5a3e64e05 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 15 Jan 2017 13:40:32 -0500
Subject: [PATCH 598/727] cc-wrapper: Remove unneeded crossAttrs

---
 pkgs/build-support/cc-wrapper/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index c8e3d8b4cc8..95e0b360937 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -281,9 +281,6 @@ stdenv.mkDerivation {
   crossAttrs = {
     shell = shell.crossDrv + shell.crossDrv.shellPath;
     libc = stdenv.ccCross.libc;
-    coreutils = coreutils.crossDrv;
-    binutils = binutils.crossDrv;
-    cc = cc.crossDrv;
     #
     # This is not the best way to do this. I think the reference should be
     # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I

From 1c0365bd88b7d98377ff639b5ede5f725e05663b Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 15 Jan 2017 16:47:53 -0500
Subject: [PATCH 599/727] cross-stdenv: Inline useless bindings and reindent

Semantics should be unchanged
---
 pkgs/stdenv/adapters.nix | 94 ++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 48 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 5d66db266c7..7e0eaeddd2c 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -56,61 +56,59 @@ rec {
 
   # Return a modified stdenv that adds a cross compiler to the
   # builds.
-  makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv //
-    { mkDerivation = {name ? "", buildInputs ? [], nativeBuildInputs ? [],
-            propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [],
-            selfNativeBuildInput ? false, ...}@args: let
+  makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // {
 
-            # *BuildInputs exists temporarily as another name for
-            # *HostInputs.
+    mkDerivation =
+      { name ? "", buildInputs ? [], nativeBuildInputs ? []
+      , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? []
+      , selfNativeBuildInput ? false, ...
+      } @ args:
 
-            # In nixpkgs, sometimes 'null' gets in as a buildInputs element,
-            # and we handle that through isAttrs.
-            nativeBuildInputsDrvs = nativeBuildInputs;
-            buildInputsDrvs = buildInputs;
-            propagatedBuildInputsDrvs = propagatedBuildInputs;
-            propagatedNativeBuildInputsDrvs = propagatedNativeBuildInputs;
+      let
+        # *BuildInputs exists temporarily as another name for
+        # *HostInputs.
 
-            # The base stdenv already knows that nativeBuildInputs and
-            # buildInputs should be built with the usual gcc-wrapper
-            # And the same for propagatedBuildInputs.
-            nativeDrv = stdenv.mkDerivation args;
+        # The base stdenv already knows that nativeBuildInputs and
+        # buildInputs should be built with the usual gcc-wrapper
+        # And the same for propagatedBuildInputs.
+        nativeDrv = stdenv.mkDerivation args;
 
-            # Temporary expression until the cross_renaming, to handle the
-            # case of pkgconfig given as buildInput, but to be used as
-            # nativeBuildInput.
-            hostAsNativeDrv = drv:
-                builtins.unsafeDiscardStringContext drv.nativeDrv.drvPath
-                == builtins.unsafeDiscardStringContext drv.crossDrv.drvPath;
-            buildInputsNotNull = stdenv.lib.filter
-                (drv: builtins.isAttrs drv && drv ? nativeDrv) buildInputs;
-            nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull;
+        # Temporary expression until the cross_renaming, to handle the
+        # case of pkgconfig given as buildInput, but to be used as
+        # nativeBuildInput.
+        hostAsNativeDrv = drv:
+            builtins.unsafeDiscardStringContext drv.nativeDrv.drvPath
+            == builtins.unsafeDiscardStringContext drv.crossDrv.drvPath;
+        buildInputsNotNull = stdenv.lib.filter
+            (drv: builtins.isAttrs drv && drv ? nativeDrv) buildInputs;
+        nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull;
+      in
+        stdenv.mkDerivation (args // {
+          name = name + "-" + cross.config;
+          nativeBuildInputs = nativeBuildInputs
+            ++ nativeInputsFromBuildInputs
+            ++ [ gccCross binutilsCross ]
+            ++ stdenv.lib.optional selfNativeBuildInput nativeDrv
+              # without proper `file` command, libtool sometimes fails
+              # to recognize 64-bit DLLs
+            ++ stdenv.lib.optional (cross.config  == "x86_64-w64-mingw32") pkgs.file
+            ;
 
-        in      stdenv.mkDerivation (args // {
-                    name = name + "-" + cross.config;
-                    nativeBuildInputs = nativeBuildInputsDrvs
-                      ++ nativeInputsFromBuildInputs
-                      ++ [ gccCross binutilsCross ]
-                      ++ stdenv.lib.optional selfNativeBuildInput nativeDrv
-                        # without proper `file` command, libtool sometimes fails
-                        # to recognize 64-bit DLLs
-                      ++ stdenv.lib.optional (cross.config  == "x86_64-w64-mingw32") pkgs.file
-                      ;
+          # Cross-linking dynamic libraries, every buildInput should
+          # be propagated because ld needs the -rpath-link to find
+          # any library needed to link the program dynamically at
+          # loader time. ld(1) explains it.
+          buildInputs = [];
+          propagatedBuildInputs = propagatedBuildInputs ++ buildInputs;
+          propagatedNativeBuildInputs = propagatedNativeBuildInputs;
 
-                    # Cross-linking dynamic libraries, every buildInput should
-                    # be propagated because ld needs the -rpath-link to find
-                    # any library needed to link the program dynamically at
-                    # loader time. ld(1) explains it.
-                    buildInputs = [];
-                    propagatedBuildInputs = propagatedBuildInputsDrvs ++ buildInputsDrvs;
-                    propagatedNativeBuildInputs = propagatedNativeBuildInputsDrvs;
+          crossConfig = cross.config;
+        } // args.crossAttrs or {});
 
-                    crossConfig = cross.config;
-                } // args.crossAttrs or {});
-    } // {
-      inherit gccCross binutilsCross;
-      ccCross = gccCross;
-    };
+    inherit gccCross binutilsCross;
+    ccCross = gccCross;
+
+  };
 
 
   /* Modify a stdenv so that the specified attributes are added to

From a1a798f01788bc3efe4ca477f2c9e8545eeafddc Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 15 Jan 2017 17:31:52 -0500
Subject: [PATCH 600/727] top-level: `crossSystem` is no longer exposed to
 packages. Use `*Platform`.

---
 pkgs/development/compilers/ghc/head.nix       |  7 ++-
 pkgs/os-specific/gnu/default.nix              |  9 +--
 .../linux/make-bootstrap-tools-cross.nix      |  2 +-
 pkgs/top-level/all-packages.nix               | 60 +++++++++----------
 pkgs/top-level/haskell-packages.nix           |  4 +-
 pkgs/top-level/stage.nix                      |  1 -
 6 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 971365eda48..e7f4335d6f6 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
-, autoconf, automake, happy, alex, python3, crossSystem, selfPkgs, cross ? null
+, autoconf, automake, happy, alex, python3, buildPlatform, targetPlatform
+, selfPkgs, cross ? null
 }:
 
 let
@@ -68,9 +69,9 @@ in stdenv.mkDerivation (rec {
 
   passthru = {
     inherit bootPkgs;
-  } // stdenv.lib.optionalAttrs (crossSystem != null) {
+  } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) {
     crossCompiler = selfPkgs.ghc.override {
-      cross = crossSystem;
+      cross = targetPlatform;
       bootPkgs = selfPkgs;
     };
   };
diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index c002447d64b..247c73e468d 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -3,7 +3,8 @@
 args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
 , texinfo, glibcCross, hurdPartedCross, libuuid, samba
 , gccCrossStageStatic, gccCrossStageFinal
-, forcedNativePackages, forceSystem, newScope, platform, config, crossSystem
+, forcedNativePackages, forceSystem, newScope, platform, config
+, targetPlatform, buildPlatform
 , overrides ? {} }:
 
 with args;
@@ -19,7 +20,7 @@ let
       libuuid = libuuid.crossDrv;
       automake = automake111x;
       headersOnly = false;
-      cross = assert crossSystem != null; crossSystem;
+      cross = assert targetPlatform != buildPlatform; targetPlatform;
       gccCross = gccCrossStageFinal;
     };
 
@@ -30,7 +31,7 @@ let
       libuuid = null;
       automake = automake111x;
       headersOnly = false;
-      cross = assert crossSystem != null; crossSystem;
+      cross = assert targetPlatform != buildPlatform; targetPlatform;
 
       # The "final" GCC needs glibc and the Hurd libraries (libpthread in
       # particular) so we first need an intermediate Hurd built with the
@@ -63,7 +64,7 @@ let
       inherit (gnu) machHeaders hurdHeaders;
       hurd = gnu.hurdCrossIntermediate;
       gccCross = gccCrossStageStatic;
-      cross = assert crossSystem != null; crossSystem;
+      cross = assert targetPlatform != buildPlatform; targetPlatform;
     };
 
     # In theory GNU Mach doesn't have to be cross-compiled.  However, since it
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index a1b1f02d83d..38b3e611bc2 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -116,7 +116,7 @@ rec {
 
     stdenv.mkDerivation {
       name = "stdenv-bootstrap-tools-cross";
-      crossConfig = pkgsUnspliced.crossSystem.config;
+      crossConfig = pkgsUnspliced.hostPlatform.config;
 
       buildInputs = [nukeReferences cpio binutilsCross];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47c565bd2ee..1fe326e7762 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27,7 +27,7 @@ with pkgs;
 
   callPackage_i686 = pkgsi686Linux.callPackage;
 
-  forcedNativePackages = if crossSystem == null then pkgs else buildPackages;
+  forcedNativePackages = if hostPlatform == buildPlatform then pkgs else buildPackages;
 
   # A stdenv capable of building 32-bit binaries.  On x86_64-linux,
   # it uses GCC compiled with multilib support; on i686-linux, it's
@@ -3246,7 +3246,7 @@ with pkgs;
   pngout = callPackage ../tools/graphics/pngout { };
 
   hurdPartedCross =
-    if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+    if targetPlatform != buildPlatform && targetPlatform.config == "i586-pc-gnu"
     then (makeOverridable
             ({ hurd }:
               (parted.override {
@@ -4751,14 +4751,14 @@ with pkgs;
 
   gccApple = throw "gccApple is no longer supported";
 
-  gccCrossStageStatic = assert crossSystem != null; let
+  gccCrossStageStatic = assert targetPlatform != buildPlatform; let
     libcCross1 =
       if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers
       else if stdenv.cross.libc == "libSystem" then darwin.xcode
       else null;
     in wrapGCCCross {
       gcc = forcedNativePackages.gcc.cc.override {
-        cross = crossSystem;
+        cross = targetPlatform;
         crossStageStatic = true;
         langCC = false;
         libcCross = libcCross1;
@@ -4768,31 +4768,31 @@ with pkgs;
       };
       libc = libcCross1;
       binutils = binutilsCross;
-      cross = crossSystem;
+      cross = targetPlatform;
   };
 
   # Only needed for mingw builds
-  gccCrossMingw2 = assert crossSystem != null; wrapGCCCross {
+  gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapGCCCross {
     gcc = gccCrossStageStatic.gcc;
     libc = windows.mingw_headers2;
     binutils = binutilsCross;
-    cross = assert crossSystem != null; crossSystem;
+    cross = targetPlatform;
   };
 
-  gccCrossStageFinal = assert crossSystem != null; wrapGCCCross {
+  gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapGCCCross {
     gcc = forcedNativePackages.gcc.cc.override {
-      cross = crossSystem;
+      cross = targetPlatform;
       crossStageStatic = false;
 
       # XXX: We have troubles cross-compiling libstdc++ on MinGW (see
       # <http://hydra.nixos.org/build/4268232>), so don't even try.
-      langCC = crossSystem.config != "i686-pc-mingw32";
+      langCC = targetPlatform.config != "i686-pc-mingw32";
       # Why is this needed?
       inherit (forcedNativePackages) binutilsCross;
     };
     libc = libcCross;
     binutils = binutilsCross;
-    cross = crossSystem;
+    cross = targetPlatform;
   };
 
   gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 {
@@ -4810,7 +4810,7 @@ with pkgs;
     # and host != build), `cross' must be null but the cross-libc must still
     # be passed.
     cross = null;
-    libcCross = if crossSystem != null then libcCross else null;
+    libcCross = if targetPlatform != buildPlatform then libcCross else null;
   }));
 
   gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 {
@@ -4823,7 +4823,7 @@ with pkgs;
     # and host != build), `cross' must be null but the cross-libc must still
     # be passed.
     cross = null;
-    libcCross = if crossSystem != null then libcCross else null;
+    libcCross = if targetPlatform != buildPlatform then libcCross else null;
 
     isl = if !stdenv.isDarwin then isl_0_14 else null;
     cloog = if !stdenv.isDarwin then cloog else null;
@@ -4840,7 +4840,7 @@ with pkgs;
     # and host != build), `cross' must be null but the cross-libc must still
     # be passed.
     cross = null;
-    libcCross = if crossSystem != null then libcCross else null;
+    libcCross = if targetPlatform != buildPlatform then libcCross else null;
 
     isl = if !stdenv.isDarwin then isl_0_11 else null;
 
@@ -4857,7 +4857,7 @@ with pkgs;
     # and host != build), `cross' must be null but the cross-libc must still
     # be passed.
     cross = null;
-    libcCross = if crossSystem != null then libcCross else null;
+    libcCross = if targetPlatform != buildPlatform then libcCross else null;
 
     isl = if !stdenv.isDarwin then isl_0_14 else null;
   }));
@@ -4872,7 +4872,7 @@ with pkgs;
     # and host != build), `cross' must be null but the cross-libc must still
     # be passed.
     cross = null;
-    libcCross = if crossSystem != null then libcCross else null;
+    libcCross = if targetPlatform != buildPlatform then libcCross else null;
 
     isl = if !stdenv.isDarwin then isl_0_14 else null;
   }));
@@ -5005,7 +5005,7 @@ with pkgs;
 
   # Haskell and GHC
 
-  haskell = callPackage ./haskell-packages.nix { inherit crossSystem; };
+  haskell = callPackage ./haskell-packages.nix { };
 
   haskellPackages = haskell.packages.ghc801.override {
     overrides = config.haskellPackageOverrides or (self: super: {});
@@ -6068,11 +6068,11 @@ with pkgs;
     gold = false;
   });
 
-  binutilsCross = assert crossSystem != null; lowPrio (
-    if crossSystem.libc == "libSystem" then darwin.cctools_cross
+  binutilsCross = assert targetPlatform != buildPlatform; lowPrio (
+    if targetPlatform.libc == "libSystem" then darwin.cctools_cross
     else forcedNativePackages.binutils.override {
       noSysDirs = true;
-      cross = crossSystem;
+      cross = targetPlatform;
     });
 
   bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
@@ -6718,7 +6718,7 @@ with pkgs;
   gdbGuile = lowPrio (gdb.override { inherit guile; });
 
   gdbCross = lowPrio (callPackage ../development/tools/misc/gdb {
-    target = crossSystem;
+    target = if targetPlatform != buildPlatform then targetPlatform else null;
   });
 
   gdb-multitarget = lowPrio (gdb.override { multitarget = true; });
@@ -7332,7 +7332,7 @@ with pkgs;
     else if name == "libSystem" then darwin.xcode
     else throw "Unknown libc";
 
-  libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;
+  libcCross = assert targetPlatform != buildPlatform; libcCrossChooser targetPlatform.libc;
 
   # Only supported on Linux
   glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null;
@@ -10895,7 +10895,7 @@ with pkgs;
     apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
   in apple-source-releases // rec {
     cctools_cross = callPackage (forcedNativePackages.callPackage ../os-specific/darwin/cctools/port.nix {}).cross {
-      cross = assert crossSystem != null; crossSystem;
+      cross = assert targetPlatform != buildPlatform; targetPlatform;
       inherit maloader;
       xctoolchain = xcode.toolchain;
     };
@@ -10968,7 +10968,7 @@ with pkgs;
   libossp_uuid = callPackage ../development/libraries/libossp-uuid { };
 
   libuuid =
-    if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+    if targetPlatform != buildPlatform && targetPlatform.config == "i586-pc-gnu"
     then (utillinuxMinimal // {
       crossDrv = lib.overrideDerivation utillinuxMinimal.crossDrv (args: {
         # `libblkid' fails to build on GNU/Hurd.
@@ -11053,7 +11053,7 @@ with pkgs;
 
   # GNU/Hurd core packages.
   gnu = recurseIntoAttrs (callPackage ../os-specific/gnu {
-    inherit platform crossSystem;
+    inherit platform;
   });
 
   hwdata = callPackage ../os-specific/linux/hwdata { };
@@ -11133,11 +11133,11 @@ with pkgs;
   linuxHeaders = linuxHeaders_4_4;
 
   linuxHeaders24Cross = forcedNativePackages.callPackage ../os-specific/linux/kernel-headers/2.4.nix {
-    cross = assert crossSystem != null; crossSystem;
+    cross = assert targetPlatform != buildPlatform; targetPlatform;
   };
 
   linuxHeaders26Cross = forcedNativePackages.callPackage ../os-specific/linux/kernel-headers/4.4.nix {
-    cross = assert crossSystem != null; crossSystem;
+    cross = assert targetPlatform != buildPlatform; targetPlatform;
   };
 
   linuxHeaders_3_18 = callPackage ../os-specific/linux/kernel-headers/3.18.nix { };
@@ -11149,8 +11149,8 @@ with pkgs;
     else if ver == "2.6" then linuxHeaders26Cross
     else throw "Unknown linux kernel version";
 
-  linuxHeadersCross = assert crossSystem != null;
-    linuxHeadersCrossChooser crossSystem.platform.kernelMajor;
+  linuxHeadersCross = assert targetPlatform != buildPlatform;
+    linuxHeadersCrossChooser targetPlatform.platform.kernelMajor;
 
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
 
@@ -11812,7 +11812,7 @@ with pkgs;
   uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
     linuxHeaders = linuxHeadersCross;
     gccCross = gccCrossStageStatic;
-    cross = assert crossSystem != null; crossSystem;
+    cross = assert targetPlatform != buildPlatform; targetPlatform;
   });
 
   udev = systemd;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5b14af145e9..7309121486e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, callPackage, stdenv, crossSystem }:
+{ pkgs, callPackage, stdenv, buildPlatform, targetPlatform }:
 
 rec {
 
@@ -55,7 +55,7 @@ rec {
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
       bootPkgs = packages.ghc7103;
       inherit (bootPkgs) alex happy;
-      inherit crossSystem;
+      inherit buildPlatform targetPlatform;
       selfPkgs = packages.ghcHEAD;
     };
     ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 780be566436..0f3d967a091 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -101,7 +101,6 @@ let
       cross = targetPlatform;
     };
     inherit (buildPlatform) system platform;
-    crossSystem = if targetPlatform != buildPlatform then targetPlatform else null;
   };
 
   splice = self: super: import ./splice.nix lib self;

From 4c17cd555f6443207144da9af6e1c2b1304afd8b Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 15 Jan 2017 17:45:04 -0500
Subject: [PATCH 601/727] top-level: Document the `{local,cross}System,
 contrasting with `*Platform`

This is an implementation detail of how the bootstrapping chain is chosen,
and thus need not be in the manual.
---
 pkgs/top-level/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index b7a4273acff..3c67d316f7c 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -83,6 +83,22 @@ in let
   boot = import ../stdenv/booter.nix { inherit lib allPackages; };
 
   stages = stdenvStages {
+    # One would think that `localSystem` and `crossSystem` overlap horribly with
+    # the three `*Platforms` (`buildPlatform`, `hostPlatform,` and
+    # `targetPlatform`; see `stage.nix` or the manual). Actually, those
+    # identifiers I, @Ericson2314, purposefully not used here to draw a subtle
+    # but important distinction:
+    #
+    # While the granularity of having 3 platforms is necessary to properly
+    # *build* packages, it is overkill for specifying the user's *intent* when
+    # making a build plan or package set. A simple "build vs deploy" dichotomy
+    # is adequate: the "sliding window" principle described in the manual shows
+    # how to interpolate between the these two "end points" to get the 3
+    # platform triple for each bootstrapping stage.
+    #
+    # Also, less philosophically but quite practically, `crossSystem` should be
+    # null when one doesn't want to cross-compile, while the `*Platform`s are
+    # always non-null. `localSystem` is always non-null.
     localSystem = { inherit system platform; };
     inherit lib crossSystem config overlays;
   };

From bfb147b6a8c4a3ddc581aab0b8a29b418db3b7a6 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 15 Jan 2017 18:03:59 -0500
Subject: [PATCH 602/727] top-level: Only splice as needed for performance

---
 pkgs/stdenv/booter.nix    | 13 ++++++-------
 pkgs/top-level/splice.nix | 11 +++++++++--
 pkgs/top-level/stage.nix  |  8 +++++---
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix
index 6e5d073e55a..2c82d12da95 100644
--- a/pkgs/stdenv/booter.nix
+++ b/pkgs/stdenv/booter.nix
@@ -63,12 +63,11 @@ stageFuns: let
         __bootPackages = finalSoFar;
       };
     };
-    self =
-      if args.__raw or false
-      then args'
-      else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // {
-        buildPackages = if args.selfBuild or true then self else finalSoFar;
-      });
-  in self;
+  in
+    if args.__raw or false
+    then args'
+    else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // {
+      buildPackages = if args.selfBuild or true then null else finalSoFar;
+    });
 
 in lib.lists.fold folder {} withAllowCustomOverrides
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index f57f42020c2..7afbd956d5b 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -17,7 +17,11 @@
 # `mkDerivation` knows how to pull out the right ones for `buildDepends` and
 # friends, but a few packages use them directly, so it seemed efficient (to
 # @Ericson2314) to reuse those names, at least initially, to minimize breakage.
-lib: pkgs:
+#
+# For performance reasons, rather than uniformally splice in all cases, we only
+# do so when `pkgs` and `buildPackages` are distinct. The `actuallySplice`
+# parameter there the boolean value of that equality check.
+lib: pkgs: actuallySplice:
 
 let
   defaultBuildScope = pkgs.buildPackages // pkgs.buildPackages.xorg;
@@ -58,7 +62,10 @@ let
     };
   in lib.listToAttrs (map merge (lib.attrNames mash));
 
-  splicedPackages = splicer defaultBuildScope defaultRunScope;
+  splicedPackages =
+    if actuallySplice
+    then splicer defaultBuildScope defaultRunScope
+    else pkgs // pkgs.xorg;
 
 in
 
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 0f3d967a091..6febedb79f3 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -45,7 +45,8 @@
   ## Other parameters
   ##
 
-, # The package set used at build-time
+, # The package set used at build-time. If null, `buildPackages` will
+  # be defined internally as the produced package set as itself.
   buildPackages
 
 , # The standard environment to use for building packages.
@@ -84,7 +85,8 @@ let
     };
 
   stdenvBootstappingAndPlatforms = self: super: {
-    buildPackages = buildPackages // { recurseForDerivations = false; };
+    buildPackages = (if buildPackages == null then self else buildPackages)
+      // { recurseForDerivations = false; };
     inherit stdenv
       buildPlatform hostPlatform targetPlatform;
   };
@@ -103,7 +105,7 @@ let
     inherit (buildPlatform) system platform;
   };
 
-  splice = self: super: import ./splice.nix lib self;
+  splice = self: super: import ./splice.nix lib self (buildPackages != null);
 
   allPackages = self: super:
     let res = import ./all-packages.nix

From 7dc4e43837a83d1b938b7eba0541b32f4e9bce72 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 22 Jan 2017 14:36:16 -0500
Subject: [PATCH 603/727] nixos doc: Mention cross overhaul in 17.03 release
 notes

---
 nixos/doc/manual/release-notes/rl-1703.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 6be2cd3af7f..aa864b7a757 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -30,6 +30,15 @@ has the following highlights: </para>
 following incompatible changes:</para>
 
 <itemizedlist>
+  <listitem>
+    <para>
+      Cross compilation has been rewritten. See the nixpkgs manual for
+      details. The most obvious breaking change is that derivations absent a
+      <literal>.nativeDrv</literal> or <literal>.crossDrv</literal> are now
+      cross by default, not native.
+    </para>
+  </listitem>
+
   <listitem>
     <para>
       <literal>stdenv.overrides</literal> is now expected to take <literal>self</literal>

From 76ea89aa78c9099a2e5c5121942cdaa8b2d52c89 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 22 Jan 2017 14:36:46 -0500
Subject: [PATCH 604/727] nixpkgs doc: Talk about nativeBuildInputs and
 propgatedNativeBuildInputs

Do so in the stdenv section where the other two are discussed. This can be
done without brining up cross-compilation by talking about build-time vs
run-time.
---
 doc/stdenv.xml | 90 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 36 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 44a0e4601fc..6ec5c9f2814 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -194,33 +194,52 @@ genericBuild
     tools.</para></listitem>
   </varlistentry>
 
+</variablelist>
+
+<variablelist>
+  <title>Variables specifying dependencies</title>
+
+  <varlistentry>
+    <term><varname>nativeBuildInputs</varname></term>
+    <listitem><para>
+      A list of dependencies used by the new derivation at <emphasis>build</emphasis>-time.
+      I.e. these dependencies should not make it into the package's runtime-closure, though this is currently not checked.
+      For each dependency <replaceable>dir</replaceable>, the directory <filename><replaceable>dir</replaceable>/bin</filename>, if it exists, is added to the <envar>PATH</envar> environment variable.
+      Other environment variables are also set up via a pluggable mechanism.
+      For instance, if <varname>buildInputs</varname> contains Perl, then the <filename>lib/site_perl</filename> subdirectory of each input is added to the <envar>PERL5LIB</envar> environment variable.
+      See <xref linkend="ssec-setup-hooks"/> for details.
+    </para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>buildInputs</varname></term>
-    <listitem><para>A list of dependencies used by
-    <literal>stdenv</literal> to set up the environment for the build.
-    For each dependency <replaceable>dir</replaceable>, the directory
-    <filename><replaceable>dir</replaceable>/bin</filename>, if it
-    exists, is added to the <envar>PATH</envar> environment variable.
-    Other environment variables are also set up via a pluggable
-    mechanism.  For instance, if <varname>buildInputs</varname>
-    contains Perl, then the <filename>lib/site_perl</filename>
-    subdirectory of each input is added to the <envar>PERL5LIB</envar>
-    environment variable.  See <xref linkend="ssec-setup-hooks"/> for
-    details.</para></listitem>
+    <listitem><para>
+      A list of dependencies used by the new derivation at <emphasis>run</emphasis>-time.
+      Currently, the build-time environment is modified in the exact same way as with <varname>nativeBuildInputs</varname>.
+      This is problematic in that when cross-compiling, foreign executables can clobber native ones on the <envar>PATH</envar>.
+      Even more confusing is static-linking.
+      A statically-linked library should be listed here because ultimately that generated machine code will be used at run-time, even though a derivation containing the object files or static archives will only be used at build-time.
+      A less confusing solution to this would be nice.
+    </para></listitem>
   </varlistentry>
-  
+
+
+  <varlistentry>
+    <term><varname>propagatedNativeBuildInputs</varname></term>
+    <listitem><para>
+      Like <varname>nativeBuildInputs</varname>, but these dependencies are <emphasis>propagated</emphasis>:
+      that is, the dependencies listed here are added to the <varname>nativeBuildInputs</varname> of any package that uses <emphasis>this</emphasis> package as a dependency.
+      So if package Y has <literal>propagatedBuildInputs = [X]</literal>, and package Z has <literal>buildInputs = [Y]</literal>, then package X will appear in Z’s build environment automatically.
+    </para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>propagatedBuildInputs</varname></term>
-    <listitem><para>Like <varname>buildInputs</varname>, but these
-    dependencies are <emphasis>propagated</emphasis>: that is, the
-    dependencies listed here are added to the
-    <varname>buildInputs</varname> of any package that uses
-    <emphasis>this</emphasis> package as a dependency.  So if package
-    Y has <literal>propagatedBuildInputs = [X]</literal>, and package
-    Z has <literal>buildInputs = [Y]</literal>, then package X will
-    appear in Z’s build environment automatically.</para></listitem>
+    <listitem><para>
+      Like <varname>buildInputs</varname>, but propagated just like <varname>propagatedNativeBuildInputs</varname>.
+      This inherits <varname>buildInputs</varname>'s flaws of clobbering native executables when cross-compiling and being confusing for static linking.
+    </para></listitem>
   </varlistentry>
-  
 
 </variablelist>
 
@@ -322,7 +341,7 @@ executed and in what order:
       $preInstallPhases installPhase fixupPhase $preDistPhases
       distPhase $postPhases</literal>.
       </para>
-      
+
       <para>Usually, if you just want to add a few phases, it’s more
       convenient to set one of the variables below (such as
       <varname>preInstallPhases</varname>), as you then don’t specify
@@ -706,7 +725,7 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
 </variablelist>
 
 
-<para> 
+<para>
 You can set flags for <command>make</command> through the
 <varname>makeFlags</varname> variable.</para>
 
@@ -773,7 +792,7 @@ doCheck = true;</programlisting>
 
 </variablelist>
 
-  
+
 </section>
 
 
@@ -840,12 +859,12 @@ install phase.  The default <function>fixupPhase</function> does the
 following:
 
 <itemizedlist>
-      
+
   <listitem><para>It moves the <filename>man/</filename>,
   <filename>doc/</filename> and <filename>info/</filename>
   subdirectories of <envar>$out</envar> to
   <filename>share/</filename>.</para></listitem>
-      
+
   <listitem><para>It strips libraries and executables of debug
   information.</para></listitem>
 
@@ -1091,13 +1110,13 @@ functions.</para>
 
 <variablelist>
 
-  
+
   <varlistentry xml:id='fun-substitute'>
     <term><function>substitute</function>
     <replaceable>infile</replaceable>
     <replaceable>outfile</replaceable>
     <replaceable>subs</replaceable></term>
-    
+
     <listitem>
       <para>Performs string substitution on the contents of
       <replaceable>infile</replaceable>, writing the result to
@@ -1125,7 +1144,7 @@ functions.</para>
             <literal>@<replaceable>...</replaceable>@</literal> in the
             template as placeholders.</para></listitem>
           </varlistentry>
-          
+
           <varlistentry>
             <term><option>--subst-var-by</option>
             <replaceable>varName</replaceable>
@@ -1134,7 +1153,7 @@ functions.</para>
             <literal>@<replaceable>varName</replaceable>@</literal> by
             the string <replaceable>s</replaceable>.</para></listitem>
           </varlistentry>
-          
+
         </variablelist>
 
       </para>
@@ -1162,7 +1181,7 @@ substitute ./foo.in ./foo.out \
 
     </listitem>
   </varlistentry>
-  
+
 
   <varlistentry xml:id='fun-substituteInPlace'>
     <term><function>substituteInPlace</function>
@@ -1173,7 +1192,7 @@ substitute ./foo.in ./foo.out \
     <replaceable>file</replaceable>.</para></listitem>
   </varlistentry>
 
-  
+
   <varlistentry xml:id='fun-substituteAll'>
     <term><function>substituteAll</function>
     <replaceable>infile</replaceable>
@@ -1233,7 +1252,7 @@ echo @foo@
     <listitem><para>Strips the directory and hash part of a store
     path, outputting the name part to <literal>stdout</literal>.
     For example:
-    
+
 <programlisting>
 # prints coreutils-8.24
 stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
@@ -1241,7 +1260,7 @@ stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
 
     If you wish to store the result in another variable, then the
     following idiom may be useful:
-    
+
 <programlisting>
 name="/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
 someVar=$(stripHash $name)
@@ -1250,7 +1269,7 @@ someVar=$(stripHash $name)
     </para></listitem>
   </varlistentry>
 
-  
+
 </variablelist>
 
 </section>
@@ -1607,4 +1626,3 @@ Arch Wiki</link>.
 </section>
 
 </chapter>
-

From 39fb46f5384bd4d28f1b10580ac9227c4ed36da2 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 22 Jan 2017 15:52:35 -0500
Subject: [PATCH 605/727] nixpkgs docs: Cross compilation docs

---
 doc/cross-compilation.xml | 153 ++++++++++++++++++++++++++++++++++++++
 doc/manual.xml            |   1 +
 2 files changed, 154 insertions(+)
 create mode 100644 doc/cross-compilation.xml

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
new file mode 100644
index 00000000000..e93d1a98f7f
--- /dev/null
+++ b/doc/cross-compilation.xml
@@ -0,0 +1,153 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-cross">
+
+<title>Cross-compilation</title>
+
+<section xml:id="sec-cross-intro">
+  <title>Introduction</title>
+  <para>
+    "Cross-compilation" means compiling a program on one machine for another type of machine.
+    For example, a typical use of cross compilation is to compile programs for embedded devices.
+    These devices often don't have the computing power and memory to compile their own programs.
+    One might think that cross-compilation is a fairly niche concern, but there are advantages to being rigorous about distinguishing build-time vs run-time environments even when one is developing and deploying on the same machine.
+    Nixpkgs is increasingly adopting this opinion in that packages should be written with cross-compilation in mind, and nixpkgs should evaluate in a similar way (by minimizing cross-compilation-specific special cases) whether or not one is cross-compiling.
+  </para>
+
+  <para>
+    This chapter will be organized in three parts.
+    First, it will describe the basics of how to package software in a way that supports cross-compilation.
+    Second, it will describe how to use Nixpkgs when cross-compiling.
+    Third, it will describe the internal infrastructure supporting cross-compilation.
+  </para>
+</section>
+
+<!--============================================================-->
+
+<section xml:id="sec-cross-packaging">
+  <title>Packing in a cross-friendly manner</title>
+
+  <section>
+    <title>Platform parameters</title>
+    <para>
+      The three GNU Autoconf platforms, <wordasword>build</wordasword>, <wordasword>host</wordasword>, and <wordasword>cross</wordasword>, are historically the result of much confusion.
+      <link xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html" /> clears this up somewhat but there is more to be said.
+      An important advice to get out the way is, unless you are packaging a compiler or other build tool, just worry about the build and host platforms.
+      Dealing with just two platforms usually better matches people's preconceptions, and in this case is completely correct.
+    </para>
+    <para>
+      In Nixpkgs, these three platforms are defined as attribute sets under the names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal>.
+      All are guaranteed to contain at least a <varname>platform</varname> field, which contains detailed information on the platform.
+      All three are always defined at the top level, so one can get at them just like a dependency in a function that is imported with <literal>callPackage</literal>:
+      <programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...</programlisting>
+    </para>
+    <warning><para>
+      These platforms should all have the same structure in all scenarios, but that is currently not the case.
+      When not cross-compiling, they will each contain a <literal>system</literal> field with a short 2-part, hyphen-separated summering string name for the platform.
+      But, when when cross compiling, <literal>hostPlatform</literal> and <literal>targetPlatform</literal> may instead contain <literal>config</literal> with a fuller 3- or 4-part string in the manner of LLVM.
+      We should have all 3 platforms always contain both, and maybe give <literal>config</literal> a better name while we are at it.
+    </para></warning>
+    <variablelist>
+      <varlistentry>
+        <term><varname>buildPlatform</varname></term>
+        <listitem><para>
+          The "build platform" is the platform on which a package is built.
+          Once someone has a built package, or pre-built binary package, the build platform should not matter and be safe to ignore.
+        </para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><varname>hostPlatform</varname></term>
+        <listitem><para>
+          The "host platform" is the platform on which a package is run.
+          This is the simplest platform to understand, but also the one with the worst name.
+        </para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><varname>targetPlatform</varname></term>
+        <listitem>
+          <para>
+            The "target platform" is black sheep.
+            The other two intrinsically apply to all compiled software—or any build process with a notion of "build-time" followed by "run-time".
+            The target platform only applies to programming tools, and even then only is a good for for some of them.
+            Briefly, GCC, Binutils, GHC, and certain other tools are written in such a way such that a single build can only compiler code for a single platform.
+            Thus, when building them, one must think ahead about what platforms they wish to use the tool to produce machine code for, and build binaries for each.
+          </para>
+          <para>
+            There is no fundamental need to think about the target ahead of time like this.
+            LLVM, for example, was designed from the beginning with cross-compilation in mind, and so a normal LLVM binary will support every architecture that LLVM supports.
+            If the tool supports modular or pluggable backends, one might imagine specifying a <emphasis>set</emphasis> of target platforms / backends one wishes to support, rather than a single one.
+          </para>
+          <para>
+            The biggest reason for mess, if there is one, is that many compilers have the bad habit a build process that builds the compiler and standard library/runtime together.
+            Then the specifying target platform is essential, because it determines the host platform of the standard library/runtime.
+            Nixpkgs tries to avoid this where possible too, but still, because the concept of a target platform is so ingrained now in Autoconf and other tools, it is best to support it as is.
+            Tools like LLVM that don't need up-front target platforms can safely ignore it like normal packages, and it will do no harm.
+          </para>
+          </listitem>
+      </varlistentry>
+    </variablelist>
+    <note><para>
+      If you dig around nixpkgs, you may notice there is also <varname>stdenv.cross</varname>.
+      This field defined as <varname>hostPlatform</varname> when the host and build platforms differ, but otherwise not defined at all.
+      This field is obsolete and will soon disappear—please do not use it.
+    </para></note>
+  </section>
+
+  <section>
+    <title>Specifying Dependencies</title>
+    <para>
+      As mentioned in the introduction to this chapter, one can think about a build time vs run time distinction whether cross-compiling or not.
+      In the case of cross-compilation, this corresponds with whether a derivation running on the native or foreign platform is produced.
+      An interesting thing to think about is how this corresponds with the three Autoconf platforms.
+      In the run-time case, the depending and depended-on package simply have matching build, host, and target platforms.
+      But in the build-time case, one can imagine "sliding" the platforms one over.
+      The depended-on package's host and target platforms (respectively) become the depending package's build and host platforms.
+      This is the most important guiding principle behind cross-compilation with Nixpkgs, and will be called the <wordasword>sliding window principle</wordasword>.
+      In this manner, given the 3 platforms for one package, we can determine the three platforms for all its transitive dependencies.
+    </para>
+    <note><para>
+      The depending package's target platform is unconstrained by the sliding window principle, which makes sense in that one can in principle build cross compilers targeting arbitrary platforms.
+    </para></note>
+    <warning><para>
+      From the above, one would surmise that if a package is being built with a <literal>(build, host, target)</literal> platform triple of <literal>(foo, bar, bar)</literal>, then its build-time dependencies would have a triple of <literal>(foo, foo, bar)</literal>, and <emphasis>those packages'</emphasis> build-time dependencies would have triple of <literal>(foo, foo, foo)</literal>.
+      In other words, it should take two "rounds" of following build-time dependency edges before one reaches a fixed point where, by the sliding window principle, the platform triple no longer changes.
+      Unfortunately, at the moment, we do <emphasis>not</emphasis> implement this correctly, and after only one round of following build-time dependencies is the fixed point reached, with target incorrectly kept different than the others.
+    </para></warning>
+    <para>
+      How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from from <varname>buildPackages</varname>, whereas run-time dependencies are taken from the top level attribute set.
+      For example, <varname>buildPackages.gcc</varname> should be used at build time, while <varname>gcc</varname> should be used at run time.
+      Now, for most of Nixpkgs's history, there was no <varname>buildPackages</varname>, and most packages have not been refactored to use it explicitly.
+      Instead, one can use the four attributes used for specifying dependencies as documented in <link linkend="ssec-stdenv-attributes" />.
+      We "splice" together the run-time and build-time package sets with <varname>callPackage</varname>, and then <varname>mkDerivation</varname> for each of four attributes pulls the right derivation out.
+      This splicing can be skipped when not cross compiling as the package sets are the same, but is a bit slow for cross compiling.
+      Because of this, a best-of-both-worlds solution is in the works with no splicing or explicit access of <varname>buildPackages</varname> needed.
+      For now, feel free to use either method.
+    </para>
+  </section>
+
+</section>
+
+<!--============================================================-->
+
+<section xml:id="sec-cross-usage">
+  <title>Cross-building packages</title>
+  <para>
+    To be written.
+    This is basically unchanged so see the old wiki for now.
+  </para>
+</section>
+
+<!--============================================================-->
+
+<section xml:id="sec-cross-infra">
+  <title>Cross-compilation infrastructure</title>
+  <para>To be written.</para>
+  <note><para>
+    If one explores nixpkgs, they will see derivations with names like <literal>gccCross</literal>.
+    Such <literal>*Cross</literal> derivations is a holdover from before we properly distinguished between the host and target platforms
+    —the derivation with "Cross" in the name covered the <literal>build = host != target</literal> case, while the other covered the <literal>host = target</literal>, with build platform the same or not based on whether one was using its <literal>.nativeDrv</literal> or <literal>.crossDrv</literal>.
+    This ugliness will disappear soon.
+  </para></note>
+</section>
+
+</chapter>
diff --git a/doc/manual.xml b/doc/manual.xml
index 1c0dac6e4df..75bd21557fd 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -13,6 +13,7 @@
   <xi:include href="quick-start.xml" />
   <xi:include href="stdenv.xml" />
   <xi:include href="multiple-output.xml" />
+  <xi:include href="cross-compilation.xml" />
   <xi:include href="configuration.xml" />
   <xi:include href="functions.xml" />
   <xi:include href="meta.xml" />

From 0f350299597d9e8bb7c79655bdeef4bd19a7de4a Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:41:21 +0000
Subject: [PATCH 606/727] aspectj: use sha256 hash

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

diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix
index 264e76d038c..f9e79226033 100644
--- a/pkgs/development/compilers/aspectj/default.nix
+++ b/pkgs/development/compilers/aspectj/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, jre}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "aspectj-1.5.2";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/aspectj/aspectj-1.5.2.jar;
-    md5 = "64245d451549325147e3ca1ec4c9e57c";
+    url = "http://archive.eclipse.org/tools/aspectj/${name}.jar";
+    sha256 = "1b3mx248dc1xka1vgsl0jj4sm0nfjsqdcj9r9036mvixj1zj3nmh";
   };
 
   inherit jre;

From 29be6e1685d135c32d6ae9f5ceb0a2f3fe6b484e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:42:44 +0000
Subject: [PATCH 607/727] jikes: use sha256 hash

---
 pkgs/development/compilers/jikes/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/jikes/default.nix b/pkgs/development/compilers/jikes/default.nix
index 1423bc8d51e..1e202160b3c 100644
--- a/pkgs/development/compilers/jikes/default.nix
+++ b/pkgs/development/compilers/jikes/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "jikes-1.22";
   src = fetchurl {
     url = mirror://sourceforge/jikes/jikes-1.22.tar.bz2;
-    md5 = "cda958c7fef6b43b803e1d1ef9afcb85";
+    sha256 = "1qqldrp74pzpy5ly421srqn30qppmm9cvjiqdngk8hf47dv2rc0c";
   };
 
   meta = {

From 9120a99807862f1bd557cf21fdbcd57bafa76795 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:44:08 +0000
Subject: [PATCH 608/727] cilaterm: remove package

The package is broken since September, doesn't have a maintainer and
uses md5 for hashing
---
 .../libraries/cil-aterm/cil-aterm-1.3.6.patch | 600 ------------------
 .../libraries/cil-aterm/default.nix           |  13 -
 pkgs/top-level/all-packages.nix               |   4 -
 3 files changed, 617 deletions(-)
 delete mode 100644 pkgs/development/libraries/cil-aterm/cil-aterm-1.3.6.patch
 delete mode 100644 pkgs/development/libraries/cil-aterm/default.nix

diff --git a/pkgs/development/libraries/cil-aterm/cil-aterm-1.3.6.patch b/pkgs/development/libraries/cil-aterm/cil-aterm-1.3.6.patch
deleted file mode 100644
index 97891652853..00000000000
--- a/pkgs/development/libraries/cil-aterm/cil-aterm-1.3.6.patch
+++ /dev/null
@@ -1,600 +0,0 @@
-diff -urN cil-1.3.6-orig/bin/CilConfig.pm.in cil-1.3.6/bin/CilConfig.pm.in
---- cil-1.3.6-orig/bin/CilConfig.pm.in	2007-02-05 22:10:29.000000000 +0100
-+++ cil-1.3.6/bin/CilConfig.pm.in	2007-03-08 15:02:06.000000000 +0100
-@@ -1,6 +1,6 @@
- 
- $::archos    = "@ARCHOS@";
- $::cc        = "@CC@";
--$::cilhome   = "@CILHOME@";
-+$::cilhome   = "@prefix@";
- $::default_mode = "@DEFAULT_CIL_MODE@";
- 
-diff -urN cil-1.3.6-orig/Makefile.in cil-1.3.6/Makefile.in
---- cil-1.3.6-orig/Makefile.in	2007-02-05 22:10:29.000000000 +0100
-+++ cil-1.3.6/Makefile.in	2007-03-05 15:10:31.000000000 +0100
-@@ -85,6 +85,7 @@
-               cfg liveness reachingdefs deadcodeelim availexps \
-               availexpslv predabst\
-               testcil \
-+	      atermprinter \
- 	      $(CILLY_FEATURES) \
- 	      ciloptions feature_config
- # ww: we don't want "main" in an external cil library (cil.cma),
-@@ -626,6 +627,8 @@
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-+bindir = @prefix@/bin
-+objdir = @prefix@/$(OBJDIR)
- datarootdir = @datarootdir@
- libdir = @libdir@
- pkglibdir = $(libdir)/cil
-@@ -645,6 +648,11 @@
- 	$(INSTALL_DATA) $(install_lib) $(DESTDIR)$(pkglibdir)
- 	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)
- 	$(INSTALL_DATA) $(addprefix lib/, $(filter %.pm, $(DISTRIB_LIB))) $(DESTDIR)$(pkgdatadir)
-+	$(INSTALL) -d $(bindir)
-+	$(INSTALL) -d $(objdir)
-+	$(INSTALL) bin/* $(bindir)
-+	$(INSTALL_DATA) lib/* $(bindir)
-+	$(INSTALL) $(OBJDIR)/*.exe $(objdir)
- 
- cil.spec: cil.spec.in
- 	./config.status $@
-diff -urN cil-1.3.6-orig/ocamlutil/Makefile.ocaml cil-1.3.6/ocamlutil/Makefile.ocaml
---- cil-1.3.6-orig/ocamlutil/Makefile.ocaml	2007-02-05 22:10:29.000000000 +0100
-+++ cil-1.3.6/ocamlutil/Makefile.ocaml	2007-03-05 15:14:01.000000000 +0100
-@@ -192,20 +192,10 @@
- #   $(AT)          - put this before shell commands which are to be executed,
- #                    and also printed in style 2
- #   $(ECHO)        - use in place of '@' for things not printed in either style
--ifdef ECHOSTYLE_SCOTT
--  # 'true' silently consumes its arguments, whereas 'echo' prints them
--  NARRATIVE   := true           
--  COMMAND     := echo
--  AT          := 
--  ECHO        := @
--else
--  NARRATIVE   := echo
--  COMMAND     := true
--  # change these next two definitions to <empty> to echo everything,
--  # or leave as @ to suppress echoing
--  AT          := @
--  ECHO        := @
--endif
-+NARRATIVE   := true           
-+COMMAND     := echo
-+AT          := 
-+ECHO        := @
- 
- ifdef PREPROC
-   COMPILEFLAGS += -pp "$(PREPROC)$"
-diff -urN cil-1.3.6-orig/src/ext/atermprinter.ml cil-1.3.6/src/ext/atermprinter.ml
---- cil-1.3.6-orig/src/ext/atermprinter.ml	1970-01-01 01:00:00.000000000 +0100
-+++ cil-1.3.6/src/ext/atermprinter.ml	2007-03-05 16:48:08.000000000 +0100
-@@ -0,0 +1,514 @@
-+open Cil
-+open Pretty
-+open List
-+open String
-+open Printf
-+module S = String 
-+module E = Errormsg
-+module H = Hashtbl
-+module IH = Inthash
-+
-+let outputfilename = ref "cil.aterm"
-+let trace p = eprintf "%s" (p ^ "\n") ; flush stderr
-+let invalidStmt = mkStmt (Instr [])
-+let id = fun x -> x 
-+let compose f g x = (f (g x))
-+let (@) = compose
-+let pSpace            = text " "
-+let foldl1 op ls      = match ls with
-+			| (x::xs) -> fold_left op x xs
-+                        | _       -> raise (Invalid_argument "foldl1 should not take an empty list")
-+let pPacked d l r     = l ++ d ++ r
-+let pParens d         = pPacked d (text "(") (text ")")
-+let pBraced d         = pPacked d (text "{") (text "}")
-+let pSquared d        = pPacked d (text "[") (text "]")
-+let pSpaced d         = pPacked d pSpace pSpace
-+let pBool b           = (pSpaced @ text @ S.capitalize @ string_of_bool) b
-+let pInt64 i          = text (Int64.to_string i)
-+let pSeqSep sep xs    = match xs with
-+			| [] -> nil
-+                        | _  -> foldl1 (pPacked sep) xs
-+let pCommaSep xs      = pSeqSep (text ",") xs
-+let pPair (a,b)       = (pSpaced @ pParens @ pCommaSep) [a;b]
-+let pTriplet (a,b,c)  = (pSpaced @ pParens @ pCommaSep) [a;b;c]
-+let pSemiColSep xs    = pSeqSep (text ";") xs
-+let pTriple f g h (a,b,c) = (f a, g b, h c)
-+let pDouble f g (a,b) = (f a, g b)
-+let pOption p m  = match m with
-+	         | None   -> text "None()"
-+                 | Some v -> text "Some" ++ pParens( p v )
-+let pSpParens = pSpaced @ pParens
-+let pQuoted str = pPacked (text(escaped str)) (text "\"") (text "\"")
-+let pList   = pSpaced @ pSquared @ pCommaSep
-+let pRecord = pSpaced @ pBraced  @ pCommaSep
-+
-+class atermPrinter : cilPrinter  = 
-+object (self)
-+  inherit defaultCilPrinterClass
-+
-+  (* printing variable declarations; just store the varinfo *)
-+  method pVDecl () (vinfo:varinfo) : doc = if !E.verboseFlag then trace "pVDecl"
-+                                         ; self#pp_varinfo vinfo
-+  (* printing variable uses; same as declarations; store the varinfo *)
-+  method pVar (vinfo:varinfo) : doc = if !E.verboseFlag then trace "pVar" ;
-+    self#pp_varinfo vinfo
-+
-+  method pLval () ((lh, off):lval) : doc = if !E.verboseFlag then trace "pLvalue" ;
-+    text "Lvalue" ++ (pParens @ pCommaSep) [ self#pp_lhost lh ; self#pOffset nil off ] 
-+
-+  (** we are not using the first argument which represents the base from which we are
-+      offsetting, because we just want to generate a tree view of the CIL tree. For a tree view
-+      this base case is not necessary **)
-+  method pOffset (d:doc) (o:offset) : doc = if !E.verboseFlag then trace "pOffset" ;
-+    match o with
-+    | NoOffset           -> text "Offset_NoOffset() "
-+    | Field (finfo, off) -> text "Offset_Field" ++ (pParens @ pCommaSep) [ (self#pFieldDecl ()) finfo ; self#pOffset nil off ]
-+    | Index (e, off)     -> text "Offset_Index" ++ (pParens @ pCommaSep) [ self#pExp () e ; self#pOffset nil off ]
-+  
-+  (*** INSTRUCTIONS ***)
-+  method pInstr () (i:instr) : doc = if !E.verboseFlag then trace "pInstr" ;
-+    match i with
-+    | Set (lv,e,l) -> text "Set" ++ (pParens @ pCommaSep) [ 
-+	self#pLval () lv ;
-+	self#pExp () e ;
-+	self#pp_location l ]
-+    | Call (olv,e, elst, l) -> text "Call" ++ (pParens @ pCommaSep) [
-+	pOption (self#pLval ()) olv ;
-+	self#pExp () e ;
-+	pList (map (self#pExp ()) elst) ;
-+	self#pp_location l]
-+    | Asm (attr, slst1, outs, ins, slst2, l) -> text "Asm" ++ (pParens @ pCommaSep) [
-+	self#pAttrs () attr ;
-+	(pList  @ map pQuoted) slst1 ;
-+	(pList   @ ( map ( pTriplet 
-+	              @ (pTriple (pOption (pQuoted)) (pQuoted) (self#pLval ()))
-+		        ) 
-+		  ) ) outs ;
-+	(pList   @ ( map ( pTriplet 
-+	              @ (pTriple (pOption (pQuoted)) (pQuoted) (self#pExp ()))
-+		        ) 
-+		  ) ) ins ;
-+	(pList  @ map pQuoted) slst2 ;
-+	self#pp_location l]
-+
-+	
-+
-+  (* a statement itself is just a record of info about the statement
-+     the different kinds of statements can be found at pStmtKind *) 
-+  method pStmt () (s:stmt) : doc = if !E.verboseFlag then trace "pStmt" ;
-+    self#pp_stmtinfo s
-+  method dStmt (out:out_channel) (i:int) (s:stmt) : unit = fprint out i (self#pStmt () s)
-+
-+  (* a block is just a record of info about the block of interest.
-+     the real block is a stmtkind (see pStmtKind) *)
-+  method dBlock (out:out_channel) (i:int) (b:block) : unit = fprint out i (self#pBlock () b)
-+  method pBlock () (b:block) : doc = if !E.verboseFlag then trace "pBlock" ;
-+    self#pp_blockinfo b
-+
-+  (*** GLOBALS ***)
-+  method pGlobal () (g:global) : doc = if !E.verboseFlag then trace "pGlobal" ;      (* global (vars, types, etc.) *)
-+    match g with 
-+    | GType        (typ , l) -> text "GlobalType" ++ (pParens @ pCommaSep) [ self#pp_typeinfo typ ; self#pp_location l ]
-+    | GCompTag     (comp, l) -> text "GlobalCompTag" ++ (pParens @ pCommaSep) [ self#pp_compinfo comp ; self#pp_location l ]
-+    | GCompTagDecl (comp, l) -> text "GlobalCompTagDecl" ++ (pParens @ pCommaSep) [ self#pp_compinfo comp ; self#pp_location l ]
-+    | GEnumTag     (enum, l) -> text "GlobalEnumTag" ++ (pParens @ pCommaSep) [ self#pp_enuminfo enum ; self#pp_location l ]
-+    | GEnumTagDecl (enum, l) -> text "GlobalEnumTagDecl" ++ (pParens @ pCommaSep) [ self#pp_enuminfo enum ; self#pp_location l ]
-+    | GVarDecl     (vinf, l) -> text "GlobalVarDecl" ++ (pParens @ pCommaSep) [ self#pp_varinfo vinf ; self#pp_location l ]
-+    | GVar   (vinf, iinf, l) -> text "GlobalVar" ++ (pParens @ pCommaSep) [ self#pp_varinfo vinf ; self#pp_initinfo iinf ; self#pp_location l ]
-+    | GFun         (fdec, l) -> text "GlobalFun" ++ (pParens @ pCommaSep) [ self#pp_fundec fdec ; self#pp_location l ]
-+    | GAsm         (str , l) -> text "GlobalAsm"  ++ (pParens @ pCommaSep) [ pQuoted str ; self#pp_location l ]
-+    | GPragma      (attr, l) -> text "GlobalPragma" ++ (pParens @ pCommaSep) [ (fun (doc1, bool1) -> doc1) (self#pAttr attr)
-+                                                        ; self#pp_location l
-+                                        ]
-+    | GText str -> text "GlobalText" ++ pParens( pQuoted str)
-+  method dGlobal (out:out_channel) (g:global) : unit = fprint out 80 (self#pGlobal () g)
-+
-+  (* a fielddecl is just a record containing info about the decl *)
-+  method pFieldDecl () : fieldinfo -> doc = if !E.verboseFlag then trace "pFieldDecl" ;
-+    self#pp_fieldinfo
-+
-+  (*** TYPES ***)
-+  method pType (nameOpt: doc option) (* Whether we are declaring a name or 
-+                                      * we are just printing a type *)
-+               () (t:typ) =  if !E.verboseFlag then trace "pType" ;     (* use of some type *)
-+    match t with
-+    | TVoid  attr         -> text "TVoid" ++ pParens( self#pAttrs () attr)
-+    | TInt   (ikin, attr) -> text "TInt" ++ (pParens @ pCommaSep) [ self#pp_ikind ikin ; self#pAttrs () attr ]
-+    | TFloat (fkin, attr) -> text "TFloat" ++ (pParens @ pCommaSep) [ self#pp_fkind fkin ; self#pAttrs () attr ]
-+    | TPtr   (t   , attr) -> text "TPtr" ++ (pParens @ pCommaSep) [ self#pType None () t ; self#pAttrs () attr ]
-+    | TArray (t, e, attr) -> text "TArray" ++ (pParens @ pCommaSep) [ self#pType None () t ;
-+	pOption (self#pExp ()) e ; self#pAttrs () attr ]
-+    | TFun (t, olst, b, attr) -> text "TFun" ++ (pParens @ pCommaSep) [ 
-+        self#pType None () t ;
-+	pOption (pList @ (map ( pTriplet
-+                              @ (pTriple (pQuoted) (self#pType None ()) (self#pAttrs ()))
-+                              )     
-+                         )
-+                )
-+                olst ;
-+	pBool b ;
-+	self#pAttrs () attr]
-+    | TNamed (tinfo, attr) -> text "TNamed" ++ (pParens @ pCommaSep) [ self#pp_typeinfo tinfo ; self#pAttrs () attr ]
-+    | TComp  (cinfo, attr) -> text "TComp" ++ (pParens @ pCommaSep) [ (text @ string_of_int) cinfo.ckey ;
-+                                                           self#pAttrs () attr]
-+    | TEnum  (einfo, attr) -> text "TEnum" ++ (pParens @ pCommaSep) [ self#pp_enuminfo einfo ; self#pAttrs () attr ]
-+    | TBuiltin_va_list (attr) -> text "TBuiltin_va_list" ++ pParens( self#pAttrs () attr)
-+  
-+  (*** ATTRIBUTES ***)
-+  method pAttr (Attr(an, args) : attribute) : (doc * bool) = if !E.verboseFlag then trace "pAttr" ;
-+    ( text "Attr" ++ (pParens @ pCommaSep) [ pQuoted an ; pList (map (self#pAttrParam ()) args) ]
-+    , false
-+    )
-+
-+  method pAttrParam () (p:attrparam) : doc = if !E.verboseFlag then trace "pAttrParam" ;
-+    match p with
-+    | AInt      (i)               -> text "AInt" ++ pParens( pQuoted (string_of_int i))
-+    | AStr      (s)               -> text "AStr" ++ pParens( pQuoted s)
-+    | ACons     (s, args)         -> text "ACons" ++ (pParens @ pCommaSep) [ pQuoted s ; pList (map (self#pAttrParam ()) args) ]
-+    | ASizeOf   (t)               -> text "ASizeOf" ++ pParens( self#pType None () t)
-+    | ASizeOfE  (arg)             -> text "ASizeOfE" ++ pParens( self#pAttrParam () arg)
-+    | ASizeOfS  (tsig)            -> text "ASizeOfS" ++ pParens( self#pp_typsig tsig)
-+    | AAlignOf  (t)               -> text "AAlignOf" ++ pParens( self#pType None () t)
-+    | AAlignOfE (arg)             -> text "AAlignOfE" ++ pParens( self#pAttrParam () arg)
-+    | AAlignOfS (tsig)            -> text "AAlignOfS" ++ pParens( self#pp_typsig tsig)
-+    | AUnOp     (uop, arg)        -> text "AUnOp" ++ (pParens @ pCommaSep) [ self#pp_unop uop ; self#pAttrParam () arg ]
-+    | ABinOp    (bop, arg1, arg2) -> text "ABinOp" ++ (pParens @ pCommaSep) [ self#pp_binop bop 
-+                                                                ; self#pAttrParam () arg1
-+                                                                ; self#pAttrParam () arg2 ]
-+    | ADot      (arg, s)          -> text "ADot" ++ (pParens @ pCommaSep) [ self#pAttrParam () arg ; pQuoted s]
-+    | AStar     (a1)              -> text "AStar" ++ pParens( self#pAttrParam () a1 )
-+    | AAddrOf   (a1)              -> text "AAddrOf" ++ pParens( self#pAttrParam () a1 )
-+    | AIndex    (a1, a2)          -> text "AIndex" ++ (pParens @ pCommaSep) [ self#pAttrParam () a1 
-+                                                                            ; self#pAttrParam () a2 ]
-+    | AQuestion (a1, a2, a3)      -> text "AQuestion" ++ (pParens @ pCommaSep) [ self#pAttrParam () a1 
-+                                                                               ; self#pAttrParam () a2 
-+                                                                               ; self#pAttrParam () a3 ]
-+
-+  (*  | AStar a1 -> 
-+        text "(*" ++ (self#pAttrPrec derefStarLevel () a1) ++ text ")"
-+    | AAddrOf a1 -> text "& " ++ (self#pAttrPrec addrOfLevel () a1)
-+    | AIndex (a1, a2) -> self#pAttrParam () a1 ++ text "[" ++ 
-+                         self#pAttrParam () a2 ++ text "]"
-+    | AQuestion (a1, a2, a3) -> 
-+          self#pAttrParam () a1 ++ text " ? " ++
-+          self#pAttrParam () a2 ++ text " : " ++
-+          self#pAttrParam () a3 
-+*)
-+  method pAttrs () (attr:attributes) : doc = if !E.verboseFlag then trace "pAttrs" ;
-+    text "Attributes" ++ pParens( 
-+               pList (map (fst @ self#pAttr) attr)
-+              )
-+  
-+  (*** LABELS ***)
-+  method pLabel () (l:label) : doc = if !E.verboseFlag then trace "pLabel" ;
-+    match l with
-+    | Label   (s,l,b) -> text "Label" ++ (pParens @ pCommaSep) [
-+	pQuoted s ;
-+	self#pp_location l ;
-+	pBool b ]
-+    | Case    (e,l)   -> text "Case" ++ (pParens @ pCommaSep) [ 
-+	self#pExp () e ;
-+	self#pp_location l ]
-+    | Default (l)     -> text "Default" ++ pParens( self#pp_location l)
-+
-+  (*** printing out locations as line directives is not necessary
-+       because we are printing the tree structure and locations are
-+       present everywhere ***)
-+  method pLineDirective : ?forcefile:bool -> location -> doc = fun ?forcefile _ -> nil
-+
-+  (*** STATEMENT KINDS ***)
-+  method pStmtKind s () (sk:stmtkind) : doc = if !E.verboseFlag then trace "pStmtKind" ;
-+    match sk with
-+    | Instr      (ilst)          -> text "Instr" ++ pParens( pList (map (self#pInstr ()) ilst))
-+    | Return     (oe, l)         -> text "Return" ++ (pParens @ pCommaSep) [ pOption (self#pExp ()) oe ; self#pp_location l ]
-+    | Goto       (stmtref, l)    -> text "Goto" ++ (pParens @ pCommaSep) [ self#pStmt () !stmtref ; self#pp_location l ]
-+    | Break      (l)             -> text "Break" ++ pParens( self#pp_location l)
-+    | Continue   (l)             -> text "Continue" ++ pParens( self#pp_location l)
-+    | If         (e, b1, b2, l)  -> text "If" ++ (pParens @ pCommaSep) [ 
-+	self#pExp () e ;
-+	self#pBlock () b1 ;
-+	self#pBlock () b2 ;
-+	self#pp_location l ]
-+    | Switch     (e,b,stlst,l)   -> text "Switch" ++ (pParens @ pCommaSep) [ 
-+	self#pExp () e ;
-+	self#pBlock () b ;
-+	pList (map (self#pStmt ()) stlst) ;
-+	self#pp_location l ]
-+    | Loop       (b,l,os1, os2)  -> text "Loop" ++ (pParens @ pCommaSep) [
-+	self#pBlock () b ;
-+	self#pp_location l ;
-+	pOption (self#pStmt ()) os1 ;
-+	pOption (self#pStmt ()) os2 ]
-+    | Block      (b)             -> text "Block" ++ pParens( self#pBlock () b)
-+    | TryFinally (b1,b2,l)       -> text "TryFinally" ++ (pParens @ pCommaSep) [ 
-+	self#pBlock () b1 ;
-+	self#pBlock () b2 ;
-+	self#pp_location l ]
-+    | TryExcept  (b1, pr, b2, l) -> text "TryExcept" ++ (pParens @ pCommaSep) [ 
-+	self#pBlock () b1 ;
-+	(  pPair
-+         @ pDouble (pList @ map (self#pInstr ())) 
-+                   (self#pExp ())
-+        ) pr ;
-+	self#pBlock () b2 ;
-+	self#pp_location l ]
-+
-+  (*** EXPRESSIONS ***)
-+
-+  method pExp () (e:exp) : doc = if !E.verboseFlag then trace "pExp" ;
-+    match e with
-+    | Const     (c)              -> text "Constant" ++ pParens( self#pp_constant c)
-+    | Lval      (lh,off)         -> text "Lvalue" ++ (pParens @ pCommaSep)  [self#pp_lhost lh ; self#pOffset nil off ]
-+    | SizeOf    (t)              -> text "SizeOfType" ++ pParens( self#pType None () t)
-+    | SizeOfE   (e)              -> text "SizeOfExp" ++ pParens( self#pExp () e)
-+    | SizeOfStr (s)              -> text "SizeOfString" ++ pParens( pQuoted s)
-+    | AlignOf   (t)              -> text "AlignOfType" ++ pParens( self#pType None () t)
-+    | AlignOfE  (e)              -> text "AlignOfExp" ++ pParens( self#pExp () e)
-+    | UnOp      (uop, e, t)      -> text "UnOp" ++ (pParens @ pCommaSep) [ 
-+					self#pp_unop uop ; 
-+                                        self#pExp () e ; 
-+	                                self#pType None () t ]
-+    | BinOp     (bop, e1, e2, t) -> text "BinOp" ++ (pParens @ pCommaSep) [ 
-+                                        self#pp_binop bop ;
-+                                        self#pExp () e1 ;
-+                                        self#pExp () e2 ;
-+                                        self#pType None () t ]
-+    | CastE     (t,e)            -> text "Cast" ++ (pParens @ pCommaSep) [ self#pType None () t ; self#pExp () e]
-+    | AddrOf    (lv)             -> text "AddressOf" ++ pParens( self#pLval () lv)
-+    | StartOf   (lv)             -> text "StartOf" ++ pParens( self#pLval () lv)
-+
-+  (*** INITIALIZERS ***)
-+  method pInit () (i:init) : doc = if !E.verboseFlag then trace "pInit" ;
-+    match i with
-+    | SingleInit   (e)        -> text "SingleInit" ++ pParens( self#pExp () e)
-+    | CompoundInit (t, oilst) -> text "CompoundInit" ++ (pParens @ pCommaSep) [ self#pType None () t ;
-+				    pList (map (  pPair
-+			                        @ pDouble (self#pOffset nil) (self#pInit ())
-+			                       ) 
-+			                       oilst
-+			                  ) ]
-+  method dInit (out:out_channel) (i:int) (init1:init) : unit = fprint out i (self#pInit () init1)
-+
-+  (*** auxiliary methods ***)
-+  method private pp_storage (s:storage) : doc =
-+    let tok = match s with
-+	      | NoStorage -> "NoStorage"
-+	      | Static    -> "Static"
-+	      | Register  -> "Register"
-+	      | Extern	  -> "Extern"
-+    in text ("Storage_" ^ tok)
-+
-+  method private pp_typeinfo (tinfo:typeinfo) : doc = if !E.verboseFlag then trace "pp_typeinfo" ;
-+    text "Typeinfo" ++ (pParens @ pCommaSep) [   
-+    pQuoted tinfo.tname ;
-+    self#pType None () tinfo.ttype ;
-+    pBool tinfo.treferenced ]
-+
-+  method private pp_fieldinfo (finfo:fieldinfo) : doc = if !E.verboseFlag then trace "pp_fieldinfo" ;
-+    text "Fieldinfo" ++ (pParens @ pCommaSep) [ 
-+    pQuoted finfo.fname ;
-+    self#pType None () finfo.ftype ;
-+    pOption (pQuoted @ string_of_int) finfo.fbitfield ;
-+    self#pAttrs () finfo.fattr ;
-+    self#pp_location finfo.floc ]
-+
-+  method private pp_compinfo (cinfo:compinfo) : doc = if !E.verboseFlag then trace "pp_compinfo" ;
-+    text "Compinfo" ++ (pParens @ pCommaSep) [ 
-+    pBool cinfo.cstruct ;
-+    pQuoted cinfo.cname ;
-+    text (string_of_int cinfo.ckey) ;
-+    pList (map (self#pFieldDecl ()) cinfo.cfields) ;
-+    self#pAttrs () cinfo.cattr ;
-+    pBool cinfo.cdefined ;
-+    pBool cinfo.creferenced ]
-+
-+  method private pp_enuminfo (einfo:enuminfo) : doc = if !E.verboseFlag then trace "pp_enuminfo" ;
-+    text "Enuminfo" ++ (pParens @ pCommaSep) [
-+    pQuoted einfo.ename ;
-+    pList (map (  pTriplet
-+                @ (pTriple pQuoted (self#pExp ()) self#pp_location)
-+               )
-+               einfo.eitems) ;
-+    self#pAttrs () einfo.eattr ;
-+    pBool einfo.ereferenced ]
-+
-+  method private pp_location (loc:location) : doc = if !E.verboseFlag then trace "pp_location" ;
-+    text "Location" ++ (pParens @ pCommaSep) [
-+    text (string_of_int loc.line) ;
-+    pQuoted loc.file ;
-+    text (string_of_int loc.byte) ]
-+
-+  method private pp_varinfo (vinfo:varinfo) : doc = if !E.verboseFlag then trace "pp_varinfo" ;
-+    text "Varinfo" ++ (pParens @ pCommaSep) [
-+    pQuoted vinfo.vname ;
-+    self#pType None () vinfo.vtype ;
-+    self#pAttrs () vinfo.vattr ;
-+    self#pp_storage vinfo.vstorage ;
-+    pBool vinfo.vglob ;
-+    pBool vinfo.vinline ;
-+    self#pp_location vinfo.vdecl ;
-+    text (string_of_int vinfo.vid) ;
-+    pBool vinfo.vaddrof ;
-+    pBool vinfo.vreferenced ]
-+
-+  method private pp_initinfo (iinfo:initinfo) : doc = if !E.verboseFlag then trace "pp_initinfo" ;
-+    text "Initinfo" ++ pParens( 
-+    pOption (self#pInit ()) iinfo.init)
-+
-+  method private pp_fundec (fdec:fundec) : doc = if !E.verboseFlag then trace "pp_fundec" ;
-+    text "Fundec" ++ (pParens @ pCommaSep) [
-+    self#pp_varinfo fdec.svar ;
-+    pList (map self#pp_varinfo fdec.sformals) ;
-+    pList (map self#pp_varinfo fdec.slocals) ;
-+    text (string_of_int fdec.smaxid) ;
-+    self#pBlock () fdec.sbody ;
-+    pOption (pSpParens @ text @ string_of_int) fdec.smaxstmtid ;
-+    pList (map (self#pStmt ()) fdec.sallstmts) ]
-+
-+  method private pp_ikind (ikin:ikind) : doc =
-+    let tok = match ikin with
-+              | IChar  -> "IChar"
-+	      | ISChar -> "ISChar"
-+	      | IUChar -> "IUChar"
-+	      | IInt   -> "IInt"
-+	      | IUInt  -> "IUInt"
-+	      | IShort -> "IShort"
-+	      | IUShort -> "IUShort"
-+	      | ILong  -> "ILong"
-+	      | IULong -> "IULong"
-+	      | ILongLong -> "ILongLong"
-+	      | IULongLong -> "IULongLong"
-+    in text ("Ikind_" ^ tok)
-+
-+  method private pp_fkind (fkin:fkind) : doc =
-+    let tok = match fkin with
-+	      | FFloat -> "FFloat"
-+	      | FDouble -> "FDouble"
-+	      | FLongDouble -> "FLongDouble"
-+    in text ("Fkind_" ^ tok)
-+
-+  method private pp_typsig (tsig:typsig) : doc = if !E.verboseFlag then trace "pp_typsig" ;
-+    match tsig with
-+    | TSArray (tsig2, oe, attr)         -> text "TSArray" ++ (pParens @ pCommaSep) [
-+					      self#pp_typsig tsig2 ;
-+					      pOption pInt64 oe ;
-+					      self#pAttrs () attr ]
-+    | TSPtr   (tsig2, attr)             -> text "TSPtr" ++ (pParens @ pCommaSep) [
-+					      self#pp_typsig tsig2 ;
-+					      self#pAttrs () attr ]	
-+    | TSComp  (b, s, attr)              -> text "TSComp" ++ (pParens @ pCommaSep) [
-+					      pBool b ;
-+					      pQuoted s ;
-+					      self#pAttrs () attr ]
-+    | TSFun   (tsig2, tsiglst, b, attr) -> text "TSFun" ++ (pParens @ pCommaSep) [
-+					      self#pp_typsig tsig2 ;
-+					      pList (map self#pp_typsig tsiglst) ;
-+					      pBool b ;
-+					      self#pAttrs () attr ]
-+    | TSEnum  (s, attr)                 -> text "TSEnum" ++ (pParens @ pCommaSep) [
-+					      pQuoted s ;
-+					      self#pAttrs () attr ]
-+    | TSBase  (t)                       -> text "TSBase" ++ pParens( self#pType None () t)
-+     
-+
-+  method private pp_unop (uop:unop) : doc =
-+    let tok = match uop with
-+	      | Neg -> "Neg"
-+	      | BNot -> "BNot"
-+	      | LNot -> "LNot"
-+    in text ("UnOp_" ^ tok)
-+
-+  method private pp_binop (bop:binop) : doc = 
-+    let tok = match bop with
-+              | PlusA -> "PlusA"
-+	      | PlusPI -> "PlusPI"
-+	      | IndexPI -> "IndexPI"
-+	      | MinusA -> "MinusA"
-+	      | MinusPI -> "MinusPI"
-+	      | MinusPP -> "MinusPP"
-+	      | Mult -> "Mult"
-+	      | Div -> "Div"
-+	      | Mod -> "Mod"
-+	      | Shiftlt -> "Shiftlt"
-+	      | Shiftrt -> "Shiftrt"
-+	      | Lt -> "Lt"
-+	      | Gt -> "Gt"
-+	      | Le -> "Le"
-+	      | Ge -> "Ge"
-+	      | Eq -> "Eq"
-+	      | Ne -> "Ne"
-+	      | BAnd -> "BAnd"
-+	      | BXor -> "BXor"
-+	      | BOr -> "BOr"
-+	      | LAnd -> "LAnd"
-+	      | LOr -> "LOr"
-+    in text ("BinOp_" ^ tok )
-+
-+  method private pp_constant (c:constant) : doc = if !E.verboseFlag then trace "pp_constant" ;
-+    match c with
-+    | CInt64 (i, ikin, os) -> text "CInt64" ++ (pParens @ pCommaSep) [  
-+                                  pQuoted (Int64.to_string i)  ;
-+				  self#pp_ikind ikin ;
-+				  pOption pQuoted os ]
-+    | CStr   (s)           -> text "CStr" ++ pParens( pQuoted s)
-+    | CWStr  (ilist)       -> text "CWStr" ++ pParens( pList (map ( text @ Int64.to_string) ilist))
-+    | CChr   (c)           -> text "CChr" ++ pParens( text "\"" ++ text (Char.escaped c) ++ text "\"")
-+    | CReal  (f, fkin, os) -> text "CReal" ++ (pParens @ pCommaSep) [  pQuoted (sprintf "%f0" f) ;
-+				  self#pp_fkind fkin ;
-+				  pOption pQuoted os ]
-+    | CEnum(_, s, ei)      -> text "CEnum" ++ pParens( pQuoted s)
-+
-+  method private pp_lhost (lh:lhost) : doc = if !E.verboseFlag then trace "pp_lhost" ;
-+    match lh with
-+    | Var (vinfo) -> text "Var" ++ pParens( self#pp_varinfo vinfo)
-+    | Mem (e)     -> text "Mem" ++ pParens( self#pExp () e)
-+
-+  method private pp_blockinfo (b:block) : doc = if !E.verboseFlag then trace "pp_blockinfo" ;
-+    text "Block" ++ (pParens @ pCommaSep) [
-+    self#pAttrs () b.battrs ;
-+    pList (map (self#pStmt ()) b.bstmts) ]
-+
-+  method private pp_stmtinfo (sinfo:stmt) : doc = if !E.verboseFlag then trace "pp_stmtinfo" ;
-+    text "Stmt" ++ (pParens @ pCommaSep) [
-+    pList (map (self#pLabel ()) sinfo.labels) ;
-+    self#pStmtKind invalidStmt () sinfo.skind ;
-+    text (string_of_int sinfo.sid) ;
-+    pList (map self#pp_stmtinfo sinfo.succs) ;
-+    pList (map self#pp_stmtinfo sinfo.preds) ]
-+end
-+
-+let ppFile (f:file) (pp:cilPrinter) : doc = if !E.verboseFlag then trace "ppFile" ;
-+  text "File" ++ (pParens @ pCommaSep) [ 
-+  pQuoted f.fileName ;
-+  pList (map (pp#pGlobal ()) f.globals) ]
-+
-+(* we need a different more flexible mapGlobals
-+   we only visit globals and not global init;
-+   use mapGlobinits *)
-+let mapGlobals2 (fl: file) 
-+                (doone: global -> 'a) : 'a list = 
-+  List.map doone fl.globals
-+
-+(* We redefine dumpFile because we don't want a header in our
-+   file telling us it was generated with CIL blabla *)
-+let dumpFile (pp: cilPrinter) (out : out_channel) file =
-+  printDepth := 99999;  
-+  Pretty.fastMode := true;
-+  if !E.verboseFlag then ignore (E.log "printing file %s\n" file.fileName);
-+  let file_doc = ppFile file pp in
-+  fprint out 80 file_doc;
-+  flush out
-+
-+let feature : featureDescr =
-+  { fd_name = "printaterm";
-+    fd_enabled = ref false;
-+    fd_description = "printing the current CIL AST to an ATerm";
-+    fd_extraopt = [("--atermfile", Arg.String (fun s -> outputfilename := s), "=<filename>: writes the ATerm to <filename>");];
-+    fd_doit = (function (f: file) ->        
-+        let channel = open_out !outputfilename in 
-+        let printer = new atermPrinter
-+	in dumpFile printer channel f
-+         ; close_out channel
-+    );
-+    fd_post_check = false;
-+  }
-diff -urN cil-1.3.6-orig/src/main.ml cil-1.3.6/src/main.ml
---- cil-1.3.6-orig/src/main.ml	2007-02-05 22:10:29.000000000 +0100
-+++ cil-1.3.6/src/main.ml	2007-03-05 15:14:54.000000000 +0100
-@@ -105,6 +105,7 @@
-     Logcalls.feature;
-     Ptranal.feature;
-     Liveness.feature;
-+    Atermprinter.feature;
-   ] 
-   @ Feature_config.features 
- 
diff --git a/pkgs/development/libraries/cil-aterm/default.nix b/pkgs/development/libraries/cil-aterm/default.nix
deleted file mode 100644
index 62d69f943af..00000000000
--- a/pkgs/development/libraries/cil-aterm/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ stdenv, fetchurl, ocaml, perl }:
-
-stdenv.mkDerivation {
-  name    = "cil-aterm-1.3.6";
-  src     = fetchurl {
-		url = mirror://sourceforge/cil/cil-1.3.6.tar.gz;
-                md5 = "112dfbabdd0e1280800d62ba4449ab45";
-            };
-  patches = [./cil-aterm-1.3.6.patch];
-  buildInputs = [ ocaml perl ];
-  inherit ocaml perl;
-  meta.broken = true;
-}  
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5440cf42ea4..3a3ded5b20e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6938,10 +6938,6 @@ in
 
   chromaprint = callPackage ../development/libraries/chromaprint { };
 
-  cilaterm = callPackage ../development/libraries/cil-aterm {
-    stdenv = overrideInStdenv stdenv [gnumake380];
-  };
-
   cl = callPackage ../development/libraries/cl { };
 
   classads = callPackage ../development/libraries/classads { };

From 883eb32e64a15f438b464d5a5433058783542085 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:47:13 +0000
Subject: [PATCH 609/727] gtkmozembedsharp: remove package

The package has:

* broken source URL
* uses md5 hash
* no maintainer
* is a library with nobody depending on it
---
 .../libraries/gtkmozembed-sharp/builder.sh    | 11 ----------
 .../libraries/gtkmozembed-sharp/default.nix   | 21 -------------------
 pkgs/top-level/all-packages.nix               |  4 ----
 3 files changed, 36 deletions(-)
 delete mode 100644 pkgs/development/libraries/gtkmozembed-sharp/builder.sh
 delete mode 100644 pkgs/development/libraries/gtkmozembed-sharp/default.nix

diff --git a/pkgs/development/libraries/gtkmozembed-sharp/builder.sh b/pkgs/development/libraries/gtkmozembed-sharp/builder.sh
deleted file mode 100644
index 4b8f757540b..00000000000
--- a/pkgs/development/libraries/gtkmozembed-sharp/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-genericBuild
-
-# !!! hack
-export ALL_INPUTS="$out $pkgs"
-
-find $out -name "*.dll.config" | while read configFile; do
-    echo "modifying config file $configFile"
-    $monoDLLFixer "$configFile"
-done
diff --git a/pkgs/development/libraries/gtkmozembed-sharp/default.nix b/pkgs/development/libraries/gtkmozembed-sharp/default.nix
deleted file mode 100644
index 52fc4b26e6d..00000000000
--- a/pkgs/development/libraries/gtkmozembed-sharp/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{stdenv, fetchurl, pkgconfig, mono, gtksharp, gtk2, monoDLLFixer}:
-
-stdenv.mkDerivation {
-  name = "gtkmozembed-sharp-0.7-pre41601";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://tarballs.nixos.org/gtkmozembed-sharp-0.7-pre41601.tar.bz2;
-    md5 = "34aac139377296791acf3af9b5dc27ed";
-  };
-
-  buildInputs = [
-    pkgconfig mono gtksharp gtk2
-  ];
-
-  inherit monoDLLFixer;
-
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a3ded5b20e..3b2fef30499 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7563,10 +7563,6 @@ in
   gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { };
   gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
 
-  gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
-    gtksharp = gtk-sharp-2_0;
-  };
-
   gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix {
     inherit (gnome2) libglade libgtkhtml gtkhtml
               libgnomecanvas libgnomeui libgnomeprint

From 414b1d212816bddeea2709d4bbbb7da599a8b9cd Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:48:43 +0000
Subject: [PATCH 610/727] metaBuildEnv: use sha256 hash

---
 .../compilers/meta-environment/meta-build-env/default.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
index 105844887f1..3869bdad84f 100644
--- a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
+++ b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix
@@ -2,7 +2,7 @@
   name = "meta-build-env-0.1";
   src = fetchurl {
     url = http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz ;
-    md5 = "827b54ace4e2d3c8e7605ea149b34293";
+    sha256 = "1imn1gaan4fv73v8w3k3lgyjzkcn7bdp69k6hlz0vqdg17ysd1x3";
   };
 
   meta = {

From cf4f91f1a238da953edd1d6b83d225cefe7d5b52 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:53:59 +0000
Subject: [PATCH 611/727] hunspellDicts: remove spanish dictionaries

Unfortunately the upstream has gone and I didn't find any replacement
sources.
---
 .../libraries/hunspell/dictionaries.nix       | 228 ------------------
 1 file changed, 228 deletions(-)

diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 0189ecda77f..7caaece03a2 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -40,22 +40,6 @@ let
     '';
   };
 
-  mkDictFromRedIRIS =
-    { shortName, shortDescription, dictFileName, src }:
-    mkDict rec {
-      inherit src dictFileName;
-      version = "0.7";
-      name = "hunspell-dict-${shortName}-rediris-${version}";
-      readmeFile = "README.txt";
-      meta = with stdenv.lib; {
-        description = "Hunspell dictionary for ${shortDescription} from RedIRIS";
-        homepage = https://forja.rediris.es/projects/rla-es/;
-        license = with licenses; [ gpl3 lgpl3 mpl11 ];
-        maintainers = with maintainers; [ renzo ];
-        platforms = platforms.all;
-      };
-    };
-
   mkDictFromDicollecte =
     { shortName, shortDescription, longDescription, dictFileName }:
     mkDict rec {
@@ -152,218 +136,6 @@ in {
     };
   };
 
-  /* SPANISH */
-
-  es-any = mkDictFromRedIRIS {
-    shortName = "es-any";
-    shortDescription = "Spanish (any variant)";
-    dictFileName = "es_ANY";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2933/es_ANY.oxt;
-      md5 = "e3d4b38f280e7376178529db2ece982b";
-    };
-  };
-
-  es-ar = mkDictFromRedIRIS {
-    shortName = "es-ar";
-    shortDescription = "Spanish (Argentina)";
-    dictFileName = "es_AR";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2953/es_AR.oxt;
-      md5 = "68ee8f4ebc89a1fa461045d4dbb9b7be";
-    };
-  };
-
-  es-bo = mkDictFromRedIRIS {
-    shortName = "es-bo";
-    shortDescription = "Spanish (Bolivia)";
-    dictFileName = "es_BO";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2952/es_BO.oxt;
-      md5 = "1ebf11b6094e0bfece8e95cc34e7a409";
-    };
-  };
-
-  es-cl = mkDictFromRedIRIS {
-    shortName = "es-cl";
-    shortDescription = "Spanish (Chile)";
-    dictFileName = "es_CL";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2951/es_CL.oxt;
-      md5 = "092a388101350b77af4fd789668582bd";
-    };
-  };
-
-  es-co = mkDictFromRedIRIS {
-    shortName = "es-co";
-    shortDescription = "Spanish (Colombia)";
-    dictFileName = "es_CO";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2950/es_CO.oxt;
-      md5 = "fc440fd9fc55ca2dfb9bfa34a1e63864";
-    };
-  };
-
-  es-cr = mkDictFromRedIRIS {
-    shortName = "es-cr";
-    shortDescription = "Spanish (Costra Rica)";
-    dictFileName = "es_CR";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2949/es_CR.oxt;
-      md5 = "7510fd0f4eb3c6e65523a8d0960f77dd";
-    };
-  };
-
-  es-cu = mkDictFromRedIRIS {
-    shortName = "es-cu";
-    shortDescription = "Spanish (Cuba)";
-    dictFileName = "es_CU";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2948/es_CU.oxt;
-      md5 = "0ab4b9638f58ddd3d95d1265918ff39e";
-    };
-  };
-
-  es-do = mkDictFromRedIRIS {
-    shortName = "es-do";
-    shortDescription = "Spanish (Dominican Republic)";
-    dictFileName = "es_DO";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2947/es_DO.oxt;
-      md5 = "24a20fd4d887693afef539e6f1a3b58e";
-    };
-  };
-
-  es-ec = mkDictFromRedIRIS {
-    shortName = "es-ec";
-    shortDescription = "Spanish (Ecuador)";
-    dictFileName = "es_EC";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2946/es_EC.oxt;
-      md5 = "5d7343a246323ceda58cfbbf1428e279";
-    };
-  };
-
-  es-es = mkDictFromRedIRIS {
-    shortName = "es-es";
-    shortDescription = "Spanish (Spain)";
-    dictFileName = "es_ES";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2945/es_ES.oxt;
-      md5 = "59dd45e6785ed644adbbd73f4f126182";
-    };
-  };
-
-  es-gt = mkDictFromRedIRIS {
-    shortName = "es-gt";
-    shortDescription = "Spanish (Guatemala)";
-    dictFileName = "es_GT";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2944/es_GT.oxt;
-      md5 = "b1a9be80687e3117c67ac46aad6b8d66";
-    };
-  };
-
-  es-hn = mkDictFromRedIRIS {
-    shortName = "es-hn";
-    shortDescription = "Spanish (Honduras)";
-    dictFileName = "es_HN";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2943/es_HN.oxt;
-      md5 = "d0db5bebd6925738b524de9709950f22";
-    };
-  };
-
-  es-mx = mkDictFromRedIRIS {
-    shortName = "es-mx";
-    shortDescription = "Spanish (Mexico)";
-    dictFileName = "es_MX";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2942/es_MX.oxt;
-      md5 = "0de780714f84955112f38f35fb63a894";
-    };
-  };
-
-  es-ni = mkDictFromRedIRIS {
-    shortName = "es-ni";
-    shortDescription = "Spanish (Nicaragua)";
-    dictFileName = "es_NI";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2941/es_NI.oxt;
-      md5 = "d259d7be17c34df76c7de40c80720a39";
-    };
-  };
-
-  es-pa = mkDictFromRedIRIS {
-    shortName = "es-pa";
-    shortDescription = "Spanish (Panama)";
-    dictFileName = "es_PA";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2940/es_PA.oxt;
-      md5 = "085fbdbed6a2e248630c801881563b7a";
-    };
-  };
-
-  es-pe = mkDictFromRedIRIS {
-    shortName = "es-pe";
-    shortDescription = "Spanish (Peru)";
-    dictFileName = "es_PE";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2939/es_PE.oxt;
-      md5 = "f4673063246888995d4eaa2d4a24ee3d";
-    };
-  };
-
-  es-pr = mkDictFromRedIRIS {
-    shortName = "es-pr";
-    shortDescription = "Spanish (Puerto Rico)";
-    dictFileName = "es_PR";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2938/es_PR.oxt;
-      md5 = "e67bcf891ba9eeaeb57a60ec8e57f1ac";
-    };
-  };
-
-  es-py = mkDictFromRedIRIS {
-    shortName = "es-py";
-    shortDescription = "Spanish (Paraguay)";
-    dictFileName = "es_PY";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2937/es_PY.oxt;
-      md5 = "ba98e3197c81db4c572def2c5cca942d";
-    };
-  };
-
-  es-sv = mkDictFromRedIRIS {
-    shortName = "es-sv";
-    shortDescription = "Spanish (El Salvador)";
-    dictFileName = "es_SV";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2936/es_SV.oxt;
-      md5 = "c68ca9d188cb23c88cdd34a069c5a013";
-    };
-  };
-
-  es-uy = mkDictFromRedIRIS {
-    shortName = "es-uy";
-    shortDescription = "Spanish (Uruguay)";
-    dictFileName = "es_UY";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2935/es_UY.oxt;
-      md5 = "aeb9d39e4d17e9c904c1f3567178aad6";
-    };
-  };
-
-  es-ve = mkDictFromRedIRIS {
-    shortName = "es-ve";
-    shortDescription = "Spanish (Venezuela)";
-    dictFileName = "es_VE";
-    src = fetchurl {
-      url = http://forja.rediris.es/frs/download.php/2934/es_VE.oxt;
-      md5 = "8afa9619aede2d9708e799e0f5d0fcab";
-    };
-  };
-
   /* FRENCH */
 
   fr-any = mkDictFromDicollecte {

From c0d60b9dbee0192452c04b3a74cc069e97f23b82 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 24 Jan 2017 16:56:11 +0000
Subject: [PATCH 612/727] hunspellDict.it-it: use sha256 hash

---
 pkgs/development/libraries/hunspell/dictionaries.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 7caaece03a2..e5cb99aa44a 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -188,7 +188,7 @@ in {
     shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico";
     src = fetchurl {
       url = mirror://sourceforge/linguistico/italiano_2_4_2007_09_01.zip;
-      md5 = "e7fbd9e2dfb25ea3288cdb918e1e1260";
+      sha256 = "0m9frz75fx456bczknay5i446gdcp1smm48lc0qfwzhz0j3zcdrd";
     };
   };
 }

From eebee951763424d932fe9895df8206824d37967f Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 24 Jan 2017 12:32:22 -0500
Subject: [PATCH 613/727] apache-kafka service: change default brokerId to -1

A default of 0 means that if you deploy two NixOS boxes with the default
configuration, the second will fail because the brokerId was already in
use. Using -1 instead tells it to pick one automatically at first start.
---
 nixos/modules/services/misc/apache-kafka.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index c856d3294c0..cff05339688 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -38,7 +38,7 @@ in {
 
     brokerId = mkOption {
       description = "Broker ID.";
-      default = 0;
+      default = -1;
       type = types.int;
     };
 

From 1a534e0aabf64c704c044504790c789493d63220 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Tue, 24 Jan 2017 18:29:22 +0100
Subject: [PATCH 614/727] diagrams: Fix the 1.4.* versions of the ecosystem

The affected packages now depend on:

   diagrams-core ==1.4.*
   diagrams-lib ==1.4.*
   optparse-applicative ==0.13.*
---
 .../haskell-modules/configuration-common.nix  | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index fdb04681b2c..06bfab9e0fe 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -675,8 +675,38 @@ self: super: {
     '';
   }));
 
-  # Requires optparse-applicative 0.13.0.0
+  # Packages of the diagrams ecosystem that require:
+  #   diagrams-core ==1.4.*
+  #   diagrams-lib ==1.4.*
+  #   optparse-applicative ==0.13.*
+  diagrams_1_4 = super.diagrams_1_4.overrideScope (self: super: {
+    diagrams-contrib = self.diagrams-contrib_1_4_0_1;
+    diagrams-core = self.diagrams-core_1_4;
+    diagrams-lib = self.diagrams-lib_1_4_0_1;
+    diagrams-svg = self.diagrams-svg_1_4_1;
+    optparse-applicative = self.optparse-applicative_0_13_0_0;
+  });
+  diagrams-contrib_1_4_0_1 = super.diagrams-contrib_1_4_0_1.overrideScope (self: super: {
+    diagrams-core = self.diagrams-core_1_4;
+    diagrams-lib = self.diagrams-lib_1_4_0_1;
+  });
+  diagrams-lib_1_4_0_1 = super.diagrams-lib_1_4_0_1.overrideScope (self: super: {
+    diagrams-core = self.diagrams-core_1_4;
+    optparse-applicative = self.optparse-applicative_0_13_0_0;
+  });
   diagrams-pgf = super.diagrams-pgf.overrideScope (self: super: {
+    diagrams-core = self.diagrams-core_1_4;
+    diagrams-lib = self.diagrams-lib_1_4_0_1;
+    optparse-applicative = self.optparse-applicative_0_13_0_0;
+  });
+  diagrams-rasterific_1_4 = super.diagrams-rasterific_1_4.overrideScope (self: super: {
+    diagrams-core = self.diagrams-core_1_4;
+    diagrams-lib = self.diagrams-lib_1_4_0_1;
+    optparse-applicative = self.optparse-applicative_0_13_0_0;
+  });
+  diagrams-svg_1_4_1 = super.diagrams-svg_1_4_1.overrideScope (self: super: {
+    diagrams-core = self.diagrams-core_1_4;
+    diagrams-lib = self.diagrams-lib_1_4_0_1;
     optparse-applicative = self.optparse-applicative_0_13_0_0;
   });
 

From a0d29cf33e137f9af2a21a282e751ba301d4a73c Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 24 Jan 2017 16:36:22 -0200
Subject: [PATCH 615/727] drake: init at 0.9.2.0.3.1

---
 .../tools/build-managers/drake/Gemfile         |  2 ++
 .../tools/build-managers/drake/Gemfile.lock    | 15 +++++++++++++++
 .../tools/build-managers/drake/default.nix     | 18 ++++++++++++++++++
 .../tools/build-managers/drake/gemset.nix      | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 5 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/drake/Gemfile
 create mode 100644 pkgs/development/tools/build-managers/drake/Gemfile.lock
 create mode 100644 pkgs/development/tools/build-managers/drake/default.nix
 create mode 100644 pkgs/development/tools/build-managers/drake/gemset.nix

diff --git a/pkgs/development/tools/build-managers/drake/Gemfile b/pkgs/development/tools/build-managers/drake/Gemfile
new file mode 100644
index 00000000000..ddb13a65c16
--- /dev/null
+++ b/pkgs/development/tools/build-managers/drake/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'drake'
diff --git a/pkgs/development/tools/build-managers/drake/Gemfile.lock b/pkgs/development/tools/build-managers/drake/Gemfile.lock
new file mode 100644
index 00000000000..cf8900a30ee
--- /dev/null
+++ b/pkgs/development/tools/build-managers/drake/Gemfile.lock
@@ -0,0 +1,15 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    comp_tree (1.1.3)
+    drake (0.9.2.0.3.1)
+      comp_tree (>= 1.1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  drake
+
+BUNDLED WITH
+   1.13.7
diff --git a/pkgs/development/tools/build-managers/drake/default.nix b/pkgs/development/tools/build-managers/drake/default.nix
new file mode 100644
index 00000000000..15a88b1fc31
--- /dev/null
+++ b/pkgs/development/tools/build-managers/drake/default.nix
@@ -0,0 +1,18 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv {
+  name = "drake-0.9.2.0.3.1";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+  
+  meta = with lib; {
+    description = "A branch of Rake supporting automatic parallelizing of tasks";
+    homepage = http://quix.github.io/rake/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/development/tools/build-managers/drake/gemset.nix b/pkgs/development/tools/build-managers/drake/gemset.nix
new file mode 100644
index 00000000000..fd5a6f06a2a
--- /dev/null
+++ b/pkgs/development/tools/build-managers/drake/gemset.nix
@@ -0,0 +1,18 @@
+{
+  comp_tree = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dj9lkfxcczn67l1j12dcxswrfxxd1zgxa344zk6vqs2gwwhy9m9";
+      type = "gem";
+    };
+    version = "1.1.3";
+  };
+  drake = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09gkmdshwdmdnkdxi03dv4rk1dip0wdv6dx14wscrmi0jyk86yag";
+      type = "gem";
+    };
+    version = "0.9.2.0.3.1";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 944f9c9d225..d704ee339a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6293,6 +6293,8 @@ in
 
   doxygen_gui = lowPrio (doxygen.override { inherit qt4; });
 
+  drake = callPackage ../development/tools/build-managers/drake { };
+
   drush = callPackage ../development/tools/misc/drush { };
 
   editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { };

From e38970c60b638573068e9d42a4aa03d6bda1c7a0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 24 Jan 2017 12:52:39 -0600
Subject: [PATCH 616/727] nixos/ibus: fix custom panel example

The example was missing a `''`, so it did not appear correctly in the
manual. This also caused the manual to retain references inappropriately.
---
 nixos/modules/i18n/input-method/ibus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix
index 3eaf9e2ab37..a5bbe6bcb55 100644
--- a/nixos/modules/i18n/input-method/ibus.nix
+++ b/nixos/modules/i18n/input-method/ibus.nix
@@ -44,7 +44,7 @@ in
       panel = mkOption {
         type = with types; nullOr path;
         default = null;
-        example = literalExample "${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
+        example = literalExample "''${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
         description = "Replace the IBus panel with another panel.";
       };
     };

From 54df1426721358e21abcb7dc3a787e7df88ce122 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 24 Jan 2017 12:55:06 -0600
Subject: [PATCH 617/727] nixos/kde5: use kimpanel with IBus by default

---
 nixos/modules/services/x11/desktop-managers/kde5.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index ee4ec0fc819..8f081a1e9d2 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -249,6 +249,11 @@ in
 
       security.pam.services.kde = { allowNullPassword = true; };
 
+      # use kimpanel as the default IBus panel
+      i18n.inputMethod.ibus.panel =
+        lib.mkDefault
+        "${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
+
     })
   ];
 

From c91aa18070cbc6b483256abac41ef4eae253fb3c Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Tue, 24 Jan 2017 20:35:29 +0100
Subject: [PATCH 618/727] i3status: 2.10 -> 2.11

---
 pkgs/applications/window-managers/i3/status.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index 1693e7ed0fd..bd79f6b8ff0 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -2,11 +2,11 @@
   }:
 
 stdenv.mkDerivation rec {
-  name = "i3status-2.10";
+  name = "i3status-2.11";
 
   src = fetchurl {
     url = "http://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "1497dsvb32z9xljmxz95dnyvsbayn188ilm3l4ys8m5h25vd1xfs";
+    sha256 = "0pwcy599fw8by1a1sf91crkqba7679qhvhbacpmhis8c1xrpxnwq";
   };
 
   buildInputs = [ confuse yajl alsaLib libpulseaudio libnl pkgconfig ];

From 348a91cfe1c74ada2741533c113b4804a3a92b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20G=C3=B6tz?= <stefan.goetz@uni-ulm.de>
Date: Tue, 24 Jan 2017 21:12:58 +0100
Subject: [PATCH 619/727] youtube-dl: 2017.01.22 -> 2017.01.24

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index bcebbc7ab2c..68a422b97e2 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.01.22";
+  version = "2017.01.24";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "11sqiry50kb1f2v6py1pfb19kd5x04lcd78wx7ss2n6vw6ckm6mw";
+    sha256 = "6691206f68b8ecf8e9f81a85c63b4c00676f66f549d37e9ea36113eda6d1e4d8";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From c9d5e5b34b734361c057a9415b80e0548eaedb3e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Jan 2017 21:28:13 +0100
Subject: [PATCH 620/727] gitlab: 8.15.4 -> 8.16.1

---
 .../gitlab-workhorse/default.nix              |  4 +-
 .../version-management/gitlab/Gemfile         | 48 +++++------
 .../version-management/gitlab/Gemfile.lock    | 61 ++++++-------
 .../version-management/gitlab/default.nix     |  4 +-
 .../version-management/gitlab/gemset.nix      | 86 ++++++-------------
 5 files changed, 79 insertions(+), 124 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index 4cbec62b2f9..b15576b364e 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitLab, git, go }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.1";
+  version = "1.3.0";
   name = "gitlab-workhorse-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "1z4iyymld3pssf1dwar0hy6c5hii79gk4k59mqj0mgy2k73405y0";
+    sha256 = "06pxnb675c5fwk7rv6fjh0cwbdylrdbjcyf8b0pins8jl0ix0szy";
   };
 
   buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 8edb08638dd..0e80d9f233e 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -16,10 +16,12 @@ gem 'default_value_for', '~> 3.0.0'
 gem 'mysql2', '~> 0.3.16', group: :mysql
 gem 'pg', '~> 0.18.2', group: :postgres
 
+gem 'rugged', '~> 0.24.0'
+
 # Authentication libraries
 gem 'devise',                 '~> 4.2'
 gem 'doorkeeper',             '~> 4.2.0'
-gem 'omniauth',               '~> 1.3.1'
+gem 'omniauth',               '~> 1.3.2'
 gem 'omniauth-auth0',         '~> 1.4.1'
 gem 'omniauth-azure-oauth2',  '~> 0.0.6'
 gem 'omniauth-cas3',          '~> 1.1.2'
@@ -49,10 +51,6 @@ gem 'u2f', '~> 0.2.1'
 # Browser detection
 gem 'browser', '~> 2.2'
 
-# Extracting information from a git repository
-# Provide access to Gitlab::Git library
-gem 'gitlab_git', '~> 10.7.0'
-
 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
 # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
@@ -101,18 +99,19 @@ gem 'unf', '~> 0.1.4'
 gem 'seed-fu', '~> 2.3.5'
 
 # Markdown and HTML processing
-gem 'html-pipeline',      '~> 1.11.0'
-gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie'
-gem 'gitlab-markup',      '~> 1.5.1'
-gem 'redcarpet',          '~> 3.3.3'
-gem 'RedCloth',           '~> 4.3.2'
-gem 'rdoc',               '~> 4.2'
-gem 'org-ruby',           '~> 0.9.12'
-gem 'creole',             '~> 0.5.0'
-gem 'wikicloth',          '0.8.1'
-gem 'asciidoctor',        '~> 1.5.2'
-gem 'rouge',              '~> 2.0'
-gem 'truncato',           '~> 0.7.8'
+gem 'html-pipeline',        '~> 1.11.0'
+gem 'deckar01-task_list',   '1.0.6', require: 'task_list/railtie'
+gem 'gitlab-markup',        '~> 1.5.1'
+gem 'redcarpet',            '~> 3.3.3'
+gem 'RedCloth',             '~> 4.3.2'
+gem 'rdoc',                 '~> 4.2'
+gem 'org-ruby',             '~> 0.9.12'
+gem 'creole',               '~> 0.5.0'
+gem 'wikicloth',            '0.8.1'
+gem 'asciidoctor',          '~> 1.5.2'
+gem 'asciidoctor-plantuml', '0.0.6'
+gem 'rouge',                '~> 2.0'
+gem 'truncato',             '~> 0.7.8'
 
 # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
 # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
@@ -253,10 +252,9 @@ end
 
 group :development do
   gem 'foreman', '~> 0.78.0'
-  gem 'brakeman', '~> 3.3.0', require: false
+  gem 'brakeman', '~> 3.4.0', require: false
 
   gem 'letter_opener_web', '~> 1.3.0'
-  gem 'rerun', '~> 0.11.0'
   gem 'bullet', '~> 5.2.0', require: false
   gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
   gem 'web-console', '~> 2.0'
@@ -287,7 +285,7 @@ group :development, :test do
   gem 'minitest', '~> 5.7.0'
 
   # Generate Fake data
-  gem 'ffaker', '~> 2.0.0'
+  gem 'ffaker', '~> 2.4'
 
   gem 'capybara',            '~> 2.6.2'
   gem 'capybara-screenshot', '~> 1.0.0'
@@ -301,8 +299,8 @@ group :development, :test do
   gem 'spring-commands-spinach',  '~> 1.1.0'
   gem 'spring-commands-teaspoon', '~> 0.0.2'
 
-  gem 'rubocop', '~> 0.43.0', require: false
-  gem 'rubocop-rspec', '~> 1.5.0', require: false
+  gem 'rubocop', '~> 0.46.0', require: false
+  gem 'rubocop-rspec', '~> 1.9.1', require: false
   gem 'scss_lint', '~> 0.47.0', require: false
   gem 'haml_lint', '~> 0.18.2', require: false
   gem 'simplecov', '0.12.0', require: false
@@ -331,11 +329,11 @@ end
 
 gem 'newrelic_rpm', '~> 3.16'
 
-gem 'octokit', '~> 4.3.0'
+gem 'octokit', '~> 4.6.2'
 
 gem 'mail_room', '~> 0.9.0'
 
-gem 'email_reply_parser', '~> 0.5.8'
+gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'
 
 gem 'ruby-prof', '~> 0.16.2'
@@ -350,7 +348,7 @@ gem 'paranoia', '~> 2.2'
 gem 'health_check', '~> 2.2.0'
 
 # System information
-gem 'vmstat', '~> 2.2'
+gem 'vmstat', '~> 2.3.0'
 gem 'sys-filesystem', '~> 1.1.6'
 
 gem "activerecord-nulldb-adapter"
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 211bdd20fd1..ca1e2ed25c3 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -56,6 +56,8 @@ GEM
       faraday_middleware-multi_json (~> 0.0)
       oauth2 (~> 1.0)
     asciidoctor (1.5.3)
+    asciidoctor-plantuml (0.0.6)
+      asciidoctor (~> 1.5)
     ast (2.3.0)
     attr_encrypted (3.0.3)
       encryptor (~> 3.0.0)
@@ -88,7 +90,7 @@ GEM
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    brakeman (3.3.2)
+    brakeman (3.4.1)
     browser (2.2.0)
     builder (3.2.2)
     bullet (5.2.0)
@@ -173,7 +175,7 @@ GEM
       railties (>= 4.2)
     dropzonejs-rails (0.7.2)
       rails (> 3.1)
-    email_reply_parser (0.5.8)
+    email_reply_trimmer (0.1.6)
     email_spec (1.6.0)
       launchy (~> 2.1)
       mail (~> 2.2)
@@ -198,7 +200,7 @@ GEM
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
       multi_json
-    ffaker (2.0.0)
+    ffaker (2.4.0)
     ffi (1.9.10)
     flay (2.6.1)
       ruby_parser (~> 3.0)
@@ -268,11 +270,6 @@ GEM
     gitlab-markup (1.5.1)
     gitlab-turbolinks-classic (2.5.6)
       coffee-rails
-    gitlab_git (10.7.0)
-      activesupport (~> 4.0)
-      charlock_holmes (~> 0.7.3)
-      github-linguist (~> 4.7.0)
-      rugged (~> 0.24.0)
     gitlab_omniauth-ldap (1.2.1)
       net-ldap (~> 0.9)
       omniauth (~> 1.0)
@@ -412,9 +409,6 @@ GEM
       xml-simple
     licensee (8.0.0)
       rugged (>= 0.24b)
-    listen (3.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
     little-plugger (1.1.4)
     logging (2.1.0)
       little-plugger (~> 1.1)
@@ -454,10 +448,10 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.3.0)
-      sawyer (~> 0.7.0, >= 0.5.3)
+    octokit (4.6.2)
+      sawyer (~> 0.8.0, >= 0.5.3)
     oj (2.17.4)
-    omniauth (1.3.1)
+    omniauth (1.3.2)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
     omniauth-auth0 (1.4.1)
@@ -585,9 +579,6 @@ GEM
     rainbow (2.1.0)
     raindrops (0.17.0)
     rake (10.5.0)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
     rblineprof (0.3.6)
       debugger-ruby_core_source (~> 1.3)
     rdoc (4.2.2)
@@ -616,8 +607,6 @@ GEM
     redis-store (1.2.0)
       redis (>= 2.2)
     request_store (1.3.1)
-    rerun (0.11.0)
-      listen (~> 3.0)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
     rest-client (2.0.0)
@@ -655,14 +644,14 @@ GEM
     rspec-retry (0.4.5)
       rspec-core
     rspec-support (3.5.0)
-    rubocop (0.43.0)
+    rubocop (0.46.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.5.0)
-      rubocop (>= 0.40.0)
+    rubocop-rspec (1.9.1)
+      rubocop (>= 0.42.0)
     ruby-fogbugz (0.2.1)
       crack (~> 0.4)
     ruby-prof (0.16.2)
@@ -686,9 +675,9 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sawyer (0.7.0)
-      addressable (>= 2.3.5, < 2.5)
-      faraday (~> 0.8, < 0.10)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
     scss_lint (0.47.1)
       rake (>= 0.9, < 11)
       sass (~> 3.4.15)
@@ -812,7 +801,7 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    vmstat (2.2.0)
+    vmstat (2.3.0)
     warden (1.2.6)
       rack (>= 1.0)
     web-console (2.3.0)
@@ -849,6 +838,7 @@ DEPENDENCIES
   allocations (~> 1.0)
   asana (~> 0.4.0)
   asciidoctor (~> 1.5.2)
+  asciidoctor-plantuml (= 0.0.6)
   attr_encrypted (~> 3.0.0)
   awesome_print (~> 1.2.0)
   babosa (~> 1.0.2)
@@ -857,7 +847,7 @@ DEPENDENCIES
   better_errors (~> 1.0.1)
   binding_of_caller (~> 0.7.2)
   bootstrap-sass (~> 3.3.0)
-  brakeman (~> 3.3.0)
+  brakeman (~> 3.4.0)
   browser (~> 2.2)
   bullet (~> 5.2.0)
   bundler-audit (~> 0.5.0)
@@ -879,10 +869,10 @@ DEPENDENCIES
   diffy (~> 3.1.0)
   doorkeeper (~> 4.2.0)
   dropzonejs-rails (~> 0.7.1)
-  email_reply_parser (~> 0.5.8)
+  email_reply_trimmer (~> 0.1)
   email_spec (~> 1.6.0)
   factory_girl_rails (~> 4.7.0)
-  ffaker (~> 2.0.0)
+  ffaker (~> 2.4)
   flay (~> 2.6.1)
   fog-aws (~> 0.9)
   fog-core (~> 1.40)
@@ -899,7 +889,6 @@ DEPENDENCIES
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-markup (~> 1.5.1)
   gitlab-turbolinks-classic (~> 2.5, >= 2.5.6)
-  gitlab_git (~> 10.7.0)
   gitlab_omniauth-ldap (~> 1.2.1)
   gollum-lib (~> 4.2)
   gollum-rugged_adapter (~> 0.4.2)
@@ -937,9 +926,9 @@ DEPENDENCIES
   newrelic_rpm (~> 3.16)
   nokogiri (~> 1.6.7, >= 1.6.7.2)
   oauth2 (~> 1.2.0)
-  octokit (~> 4.3.0)
+  octokit (~> 4.6.2)
   oj (~> 2.17.4)
-  omniauth (~> 1.3.1)
+  omniauth (~> 1.3.2)
   omniauth-auth0 (~> 1.4.1)
   omniauth-authentiq (~> 0.2.0)
   omniauth-azure-oauth2 (~> 0.0.6)
@@ -974,16 +963,16 @@ DEPENDENCIES
   redis-namespace (~> 1.5.2)
   redis-rails (~> 5.0.1)
   request_store (~> 1.3)
-  rerun (~> 0.11.0)
   responders (~> 2.0)
   rouge (~> 2.0)
   rqrcode-rails3 (~> 0.1.7)
   rspec-rails (~> 3.5.0)
   rspec-retry (~> 0.4.5)
-  rubocop (~> 0.43.0)
-  rubocop-rspec (~> 1.5.0)
+  rubocop (~> 0.46.0)
+  rubocop-rspec (~> 1.9.1)
   ruby-fogbugz (~> 0.2.1)
   ruby-prof (~> 0.16.2)
+  rugged (~> 0.24.0)
   sanitize (~> 2.0)
   sass-rails (~> 5.0.6)
   scss_lint (~> 0.47.0)
@@ -1023,7 +1012,7 @@ DEPENDENCIES
   unicorn-worker-killer (~> 0.4.4)
   version_sorter (~> 2.1.0)
   virtus (~> 1.0.1)
-  vmstat (~> 2.2)
+  vmstat (~> 2.3.0)
   web-console (~> 2.0)
   webmock (~> 1.21.0)
   wikicloth (= 0.8.1)
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 659e002dfb6..2840b06ecf5 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -22,7 +22,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "gitlab-${version}";
-  version = "8.15.4";
+  version = "8.16.1";
 
   buildInputs = [ env ruby bundler tzdata git nodejs procps ];
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "1cd6dl8niy1xxifxdrm1kwm8qhy4x4zyvwdsb722kr136rwnxm84";
+    sha256 = "0c6cf8p1xx21xxmlpldhxs0i01myd4ddpjl7vfv932qmw9bw4in7";
   };
 
   patches = [
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index 64ebf34e477..21ab6d324dd 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -143,6 +143,14 @@
     };
     version = "1.5.3";
   };
+  asciidoctor-plantuml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rd8yh0by5sxhg1c3cb1mzkp4jp3j8v6vzbyv1mx492s9ml451fx";
+      type = "gem";
+    };
+    version = "0.0.6";
+  };
   ast = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -274,10 +282,10 @@
   brakeman = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0v2yllqcn2zyi60ahgi8ds8pix6a82703ln25p9pkm1bvrwj3fsq";
+      sha256 = "0kmg55glfnx7jidrl1ivkfqc0zqya78wxk8wf5j37rj8ya3lzxgd";
       type = "gem";
     };
-    version = "3.3.2";
+    version = "3.4.1";
   };
   browser = {
     source = {
@@ -607,13 +615,13 @@
     };
     version = "0.7.2";
   };
-  email_reply_parser = {
+  email_reply_trimmer = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0k2p229mv7xn7q627zwmvhrcvba4b9m70pw2jfjm6iimg2vmf22r";
+      sha256 = "0vijywhy1acsq4187ss6w8a7ksswaf1d5np3wbj962b6rqif5vcz";
       type = "gem";
     };
-    version = "0.5.8";
+    version = "0.1.6";
   };
   email_spec = {
     source = {
@@ -738,10 +746,10 @@
   ffaker = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19fnbbsw87asyb1hvkr870l2yldah2jcjb8074pgyrma5lynwmn0";
+      sha256 = "1rlfvf2iakphs3krxy1hiywr2jzmrhvhig8n8fw6rcivpz9v52ry";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "2.4.0";
   };
   ffi = {
     source = {
@@ -944,14 +952,6 @@
     };
     version = "2.5.6";
   };
-  gitlab_git = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nnr6dlqq30syab2g7yvffgzinj5c8n9q7fvr3d88ix8hsawjrjm";
-      type = "gem";
-    };
-    version = "10.7.0";
-  };
   gitlab_omniauth-ldap = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1312,14 +1312,6 @@
     };
     version = "8.0.0";
   };
-  listen = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g";
-      type = "gem";
-    };
-    version = "3.0.5";
-  };
   little-plugger = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1531,10 +1523,10 @@
   octokit = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hq47ck0z03vr3rzblyszihn7x2m81gv35chwwx0vrhf17nd27np";
+      sha256 = "1bppfc0q8mflbcdsb66dly3skx42vad30q0fkzwx4za908qwvjpd";
       type = "gem";
     };
-    version = "4.3.0";
+    version = "4.6.2";
   };
   oj = {
     source = {
@@ -1547,10 +1539,10 @@
   omniauth = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vsqxgzkcfi10b7k6vpv3shmlphbs8grc29hznwl9s0i16n8962p";
+      sha256 = "1dp5g3a6jnppy2kriz365p3jf9alrir4fhrj2nff2gm9skci2bk6";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.3.2";
   };
   omniauth-auth0 = {
     source = {
@@ -1928,22 +1920,6 @@
     };
     version = "10.5.0";
   };
-  rb-fsevent = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hq57by28iv0ijz8pk9ynih0xdg7vnl1010xjcijfklrcv89a1j2";
-      type = "gem";
-    };
-    version = "0.9.6";
-  };
-  rb-inotify = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9";
-      type = "gem";
-    };
-    version = "0.9.5";
-  };
   rblineprof = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2056,14 +2032,6 @@
     };
     version = "1.3.1";
   };
-  rerun = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0av239bpmy55fdx4qaw9n71aapjy2myr51h5plzjxsyr0fdwn1xq";
-      type = "gem";
-    };
-    version = "0.11.0";
-  };
   responders = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2187,18 +2155,18 @@
   rubocop = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r2p4v6w5w1zx4skj9i3g3pshg3rykhgswimydrswp6nb8nkaphj";
+      sha256 = "0604qa0s0xcq0avnh9aa6iw58azpz6a7bavcs0ch61xnaz0qfl0c";
       type = "gem";
     };
-    version = "0.43.0";
+    version = "0.46.0";
   };
   rubocop-rspec = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11701iw858vkxmb6khc9apmagz3lmnbdxm8irsxsgg57d0p8bs8p";
+      sha256 = "0h3781f4mz72qz8i30ah4fjfm4i20aqncak6rc9kwsvm5hw48i18";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.9.1";
   };
   ruby-fogbugz = {
     source = {
@@ -2315,10 +2283,10 @@
   sawyer = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cn48ql00mf1ag9icmfpj7g7swh7mdn7992ggynjqbw1gh15bs3j";
+      sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd";
       type = "gem";
     };
-    version = "0.7.0";
+    version = "0.8.1";
   };
   scss_lint = {
     source = {
@@ -2779,10 +2747,10 @@
   vmstat = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10hlfam5gvxjvr5p1f4f81wlv5k81mrlg556rc9525290bcz31f0";
+      sha256 = "0vb5mwc71p8rlm30hnll3lb4z70ipl5rmilskpdrq2mxwfilcm5b";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   warden = {
     source = {

From fa8f6f652c5a57e203f449c9b06fdfcf815467ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mariusz=20=60shd=60=20Gliwi=C5=84ski?= <shd@nawia.net>
Date: Tue, 24 Jan 2017 21:30:20 +0100
Subject: [PATCH 621/727] pydub: 0.16.7

---
 pkgs/top-level/python-packages.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 061dcd68f9b..a891d674c5e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4968,6 +4968,23 @@ in {
     };
   };
 
+  pydub = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "pydub";
+    version = "0.16.7";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/05/e0/8d2496c8ef1d7f2c8ff625be3849f550da42809b862879a8fb137c6baa11/${name}.tar.gz";
+      sha256 = "10rmbvsld5fni9wsvb7la8lblrglsnzd2l1159rcxqf6b8k441dx";
+    };
+
+    meta = {
+      description = "Manipulate audio with a simple and easy high level interface.";
+      homepage    = "http://pydub.com/";
+      license     = licenses.mit;
+      platforms   = platforms.all;
+    };
+  };
+
   pyjade = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "pyjade";

From e98aa7832caa9e68c5505d238027fcb04d1bdc76 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 24 Jan 2017 18:50:56 -0200
Subject: [PATCH 622/727] mkvtoolnix: 9.6.0 -> 9.8.0

- Update mkvtoolnix to v9.8.0
- Add a build dependency on drake, because it is not bundled with
  mkvtoolnix anymore since v9.8.0
---
 pkgs/applications/video/mkvtoolnix/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 9c987534065..e8dc1227ef8 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoconf, automake
-, ruby, file, xdg_utils, gettext, expat, qt5, boost
+, drake, ruby, file, xdg_utils, gettext, expat, qt5, boost
 , libebml, zlib, libmatroska, libogg, libvorbis, flac
 , withGUI ? true
 }:
@@ -10,16 +10,16 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "9.6.0";
+  version = "9.8.0";
 
   src = fetchFromGitHub {
     owner = "mbunkus";
     repo = "mkvtoolnix";
     rev = "release-${version}";
-    sha256 = "14v6iclzkqxibzcdxr65bb5frmnsjyyly0d3lwv1gg7g1mkcw3jd";
+    sha256 = "1hnk92ksgg290q4kwdl8jqrz7vzlwki4f85bb6kgdgzpjkblw76n";
   };
 
-  nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ];
+  nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby ];
 
   buildInputs = [
     expat file xdg_utils boost libebml zlib libmatroska libogg
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
   ] ++ optional withGUI qt5.qtbase;
 
   preConfigure = "./autogen.sh; patchShebangs .";
-  buildPhase   = "./drake -j $NIX_BUILD_CORES";
-  installPhase = "./drake install -j $NIX_BUILD_CORES";
+  buildPhase   = "drake -j $NIX_BUILD_CORES";
+  installPhase = "drake install -j $NIX_BUILD_CORES";
 
   configureFlags = [
     "--enable-magic"
@@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
     "--disable-profiling"
     "--disable-precompiled-headers"
     "--disable-static-qt"
-    "--without-curl"
     "--with-gettext"
     (enableFeature withGUI "qt")
   ];

From ae047510bfb534f89225d26820872467e66f5328 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 9 Nov 2016 13:58:34 +0100
Subject: [PATCH 623/727] ocaml: init at 4.04

---
 pkgs/development/compilers/ocaml/4.04.nix    | 6 ++++++
 pkgs/development/compilers/ocaml/generic.nix | 2 +-
 pkgs/top-level/ocaml-packages.nix            | 4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/ocaml/4.04.nix

diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/pkgs/development/compilers/ocaml/4.04.nix
new file mode 100644
index 00000000000..7e35c9e1aa8
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/4.04.nix
@@ -0,0 +1,6 @@
+import ./generic.nix {
+  major_version = "4";
+  minor_version = "04";
+  patch_version = "0";
+  sha256 = "1d2nk3kq4dyzz8dls45r13jprq5by3q8kshc8kvxzm8n4fnnvvb4";
+}
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index abded4b6690..0c1b7831412 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (args // rec {
   buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
   buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ];
   installTargets = "install" + optionalString useNativeCompilers " installopt";
-  preConfigure = ''
+  preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") ''
     CAT=$(type -tp cat)
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
   '';
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index eb3553f5561..16232ddc56d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -727,7 +727,9 @@ in rec
 
   ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { }) (self: super: { });
 
-  ocamlPackages_latest = ocamlPackages_4_03;
+  ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { }) (self: super: { });
+
+  ocamlPackages_latest = ocamlPackages_4_04;
 
   ocamlPackages = ocamlPackages_4_01_0;
 }

From f697e5ae3b573616dec1f3b0bf9e0502cb96c88c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 9 Nov 2016 14:00:43 +0100
Subject: [PATCH 624/727] camlp4: init at 4.04+1

---
 pkgs/development/tools/ocaml/camlp4/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index 1e1d2eb68ea..a257a88287c 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -7,6 +7,9 @@ let param = {
   "4.03.0" = {
      version = "4.03+1";
      sha256 = "1f2ndch6f1m4fgnxsjb94qbpwjnjgdlya6pard44y6n0dqxi1wsq"; };
+  "4.04.0" = {
+     version = "4.04+1";
+     sha256 = "1ad7rygqjxrc1im95gw9lp8q83nhdaf383f2808f1p63yl42xm7k"; };
   }."${ocaml.version}";
 in
 

From 0caeaf4cdddaf53301b90d82f4840d732918c76d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 26 Nov 2016 10:13:02 +0100
Subject: [PATCH 625/727] ocamlPackages.ppx_tools: minor refactoring

---
 .../ocaml-modules/ppx_tools/default.nix       | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index 33bf180cd7f..b6a6039a4fa 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -1,19 +1,21 @@
 { stdenv, fetchFromGitHub, ocaml, findlib }:
 
-let
-  version =
-  if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.03" then "5.0+4.03.0" else "5.0+4.02.0";
+let param = {
+  "4.02.3" = {
+    version = "5.0+4.02.0";
+    sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8"; };
+  "4.03.0" = {
+    version = "5.0+4.03.0";
+    sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg"; };
+}."${ocaml.version}";
 in
   stdenv.mkDerivation {
-    name = "ocaml-ppx_tools-${version}";
+    name = "ocaml${ocaml.version}-ppx_tools-${param.version}";
     src = fetchFromGitHub {
       owner = "alainfrisch";
       repo = "ppx_tools";
-      rev = version;
-      sha256 = if version == "5.0+4.03.0"
-      then "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg"
-      else "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8"
-      ;
+      rev = param.version;
+      inherit (param) sha256;
     };
 
     buildInputs = [ ocaml findlib ];

From 82ab1f84081f1f15a9075f3c6b445f5e21e0b40d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 26 Nov 2016 10:35:23 +0100
Subject: [PATCH 626/727] ocaml: fix the meta.branch attribute

---
 pkgs/development/compilers/ocaml/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 0c1b7831412..17b3033c31d 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (args // rec {
 
   meta = with stdenv.lib; {
     homepage = http://caml.inria.fr/ocaml;
-    branch = "4.03";
+    branch = versionNoPatch;
     license = with licenses; [
       qpl /* compiler */
       lgpl2 /* library */

From 92f9c0600dc6ebe2d44fae487ddcc88450a05dce Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 1 Dec 2016 22:05:25 +0000
Subject: [PATCH 627/727] ocamlPackages.ocsigen-deriving: 0.7 -> 0.7.1

---
 .../ocaml-modules/ocsigen-deriving/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
index d2d66994604..65344561795 100644
--- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchzip, ocaml, findlib, oasis, ocaml_optcomp, camlp4 }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4 }:
 
-let version = "0.7"; in
+let version = "0.7.1"; in
 
 stdenv.mkDerivation {
   name = "ocsigen-deriving-${version}";
   src = fetchzip {
     url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz";
-    sha256 = "05z606gly1iyan292x3mflg3zasgg68n8i2mivz0zbshx2hz2jbw";
+    sha256 = "0gg3nr3iic4rwqrcc0qvfm9x0x57zclvdsnpy0z8rv2fl5isbzms";
     };
 
-  buildInputs = [ ocaml findlib oasis ocaml_optcomp camlp4 ];
+  buildInputs = [ ocaml findlib ocamlbuild oasis ocaml_optcomp camlp4 ];
 
   createFindlibDestdir = true;
 

From 93d0e4ab5b790207842d7bba03d5bc3383c55edf Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Sat, 21 Jan 2017 21:50:13 +0100
Subject: [PATCH 628/727] pythonPackages.pytestdjango: 2.9.1 -> 3.1.2

---
 .../python-modules/pytestdjango.nix           | 21 +++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 ++-----------------
 2 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/pytestdjango.nix

diff --git a/pkgs/development/python-modules/pytestdjango.nix b/pkgs/development/python-modules/pytestdjango.nix
new file mode 100644
index 00000000000..5a8dd85f4bd
--- /dev/null
+++ b/pkgs/development/python-modules/pytestdjango.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchurl
+, pytest, django, setuptools_scm
+}:
+buildPythonPackage rec {
+  name = "pytest-django-${version}";
+  version = "3.1.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pytest-django/${name}.tar.gz";
+    sha256 = "02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303";
+  };
+
+  buildInputs = [ pytest setuptools_scm ];
+  propagatedBuildInputs = [ django ];
+
+  meta = with stdenv.lib; {
+    description = "py.test plugin for testing of Django applications";
+    homepage = http://pytest-django.readthedocs.org/en/latest/;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ffb1aefdd33..893cce234c1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5077,27 +5077,8 @@ in {
     };
   };
 
-  pytestdjango = buildPythonPackage rec {
-    name = "pytest-django-${version}";
-    version = "2.9.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest-django/${name}.tar.gz";
-      sha256 = "1mmc7zsz3dlhs6sx4sppkj1vgshabi362r1a8b8wpj1qfximpqcb";
-    };
-
-    # doing this to allow depending packages to find
-    # pytest's binaries
-    pytest = self.pytest;
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ django setuptools_scm_18 ];
-
-    meta = {
-      description = "py.test plugin for testing of Django applications";
-      homepage = http://pytest-django.readthedocs.org/en/latest/;
-      license = licenses.bsd3;
-    };
+  pytestdjango = callPackage ../development/python-modules/pytestdjango.nix {
+    pytest = self.pytest_30;
   };
 
   pytest-fixture-config = buildPythonPackage rec {

From b6e5976d4b55e15b5f204a659c92fbb87b7d9031 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Sat, 21 Jan 2017 21:56:37 +0100
Subject: [PATCH 629/727] pythonPackages.django_guardian: 1.4.4 -> 1.4.6

---
 .../python-modules/django_guardian.nix        | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 ++--------------
 2 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/django_guardian.nix

diff --git a/pkgs/development/python-modules/django_guardian.nix b/pkgs/development/python-modules/django_guardian.nix
new file mode 100644
index 00000000000..c9217955213
--- /dev/null
+++ b/pkgs/development/python-modules/django_guardian.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, python, fetchurl
+, django_environ, mock, django, six
+, pytest, pytestrunner, pytestdjango, setuptools_scm
+}:
+buildPythonPackage rec {
+  name = "django-guardian-${version}";
+  version = "1.4.6";
+
+  src = fetchurl {
+    url = "mirror://pypi/d/django-guardian/${name}.tar.gz";
+    sha256 = "1r3xj0ik0hh6dfak4kjndxk5v73x95nfbppgr394nhnmiayv4zc5";
+  };
+
+  buildInputs = [ pytest pytestrunner pytestdjango django_environ mock setuptools_scm ];
+  propagatedBuildInputs = [ django six ];
+
+  checkPhase = ''
+    ${python.interpreter} nix_run_setup.py test --addopts="--ignore build"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Per object permissions for Django";
+    homepage = https://github.com/django-guardian/django-guardian;
+    licenses = [ licenses.mit licenses.bsd2 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 893cce234c1..0118abd57cf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10405,27 +10405,8 @@ in {
     };
   };
 
-  django_guardian = buildPythonPackage rec {
-    name = "django-guardian-${version}";
-    version = "1.4.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-guardian/${name}.tar.gz";
-      sha256 = "1m7y3brk3697hr2cvkzl8dry4pp7wkmhvxmf8db1ardz1r9d8895";
-    };
-
-    buildInputs = with self ; [ pytest pytestrunner pytestdjango django_environ mock ];
-    propagatedBuildInputs = with self ; [ django six ];
-
-    checkPhase = ''
-      ${python.interpreter} nix_run_setup.py test --addopts="--ignore build"
-    '';
-
-    meta = {
-      description = "Per object permissions for Django";
-      homepage = https://github.com/django-guardian/django-guardian;
-      licenses = [ licenses.mit licenses.bsd2 ];
-    };
+  django_guardian = callPackage ../development/python-modules/django_guardian.nix {
+    pytest = self.pytest_30;
   };
 
   django_tagging = buildPythonPackage rec {

From 18b2c31eaad696f87566164bedb01e64bc33c9e3 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 24 Jan 2017 20:06:52 +0100
Subject: [PATCH 630/727] pythonPackages.pytest_*: move to
 pkgs/development/python-modules

---
 .../development/python-modules/pytest/2_7.nix | 28 ++++++++++
 .../development/python-modules/pytest/2_8.nix | 28 ++++++++++
 .../development/python-modules/pytest/2_9.nix | 28 ++++++++++
 .../python-modules/pytest/default.nix         | 22 ++++++++
 pkgs/top-level/python-packages.nix            | 56 ++-----------------
 5 files changed, 110 insertions(+), 52 deletions(-)
 create mode 100644 pkgs/development/python-modules/pytest/2_7.nix
 create mode 100644 pkgs/development/python-modules/pytest/2_8.nix
 create mode 100644 pkgs/development/python-modules/pytest/2_9.nix
 create mode 100644 pkgs/development/python-modules/pytest/default.nix

diff --git a/pkgs/development/python-modules/pytest/2_7.nix b/pkgs/development/python-modules/pytest/2_7.nix
new file mode 100644
index 00000000000..adaa640fdbe
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/2_7.nix
@@ -0,0 +1,28 @@
+{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }:
+buildPythonPackage rec {
+  name = "pytest-2.7.3";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pytest/${name}.tar.gz";
+    sha256 = "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm";
+  };
+
+  # Disabled temporarily because of Hydra issue with namespaces
+  doCheck = false;
+
+  preCheck = ''
+    # don't test bash builtins
+    rm testing/test_argcomplete.py
+  '';
+
+  propagatedBuildInputs = [ py ]
+    ++ (stdenv.lib.optional isPy26 argparse)
+    ++ stdenv.lib.optional
+      pkgs.config.pythonPackages.pytest.selenium or false
+      selenium;
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ domenkozar lovek323 madjar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/python-modules/pytest/2_8.nix b/pkgs/development/python-modules/pytest/2_8.nix
new file mode 100644
index 00000000000..6232ccaf700
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/2_8.nix
@@ -0,0 +1,28 @@
+{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }:
+buildPythonPackage rec {
+  name = "pytest-2.8.7";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pytest/${name}.tar.gz";
+    sha256 = "1bwb06g64x2gky8x5hcrfpg6r351xwvafimnhm5qxq7wajz8ck7w";
+  };
+
+  # Disabled temporarily because of Hydra issue with namespaces
+  doCheck = false;
+
+  preCheck = ''
+    # don't test bash builtins
+    rm testing/test_argcomplete.py
+  '';
+
+  propagatedBuildInputs = [ py ]
+    ++ (stdenv.lib.optional isPy26 argparse)
+    ++ stdenv.lib.optional
+      pkgs.config.pythonPackages.pytest.selenium or false
+      selenium;
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ domenkozar lovek323 madjar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/python-modules/pytest/2_9.nix b/pkgs/development/python-modules/pytest/2_9.nix
new file mode 100644
index 00000000000..3ca7120dd92
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/2_9.nix
@@ -0,0 +1,28 @@
+{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }:
+buildPythonPackage rec {
+  name = "pytest-2.9.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pytest/${name}.tar.gz";
+    sha256 = "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j";
+  };
+
+  # Disabled temporarily because of Hydra issue with namespaces
+  doCheck = false;
+
+  preCheck = ''
+    # don't test bash builtins
+    rm testing/test_argcomplete.py
+  '';
+
+  propagatedBuildInputs = [ py ]
+    ++ (stdenv.lib.optional isPy26 argparse)
+    ++ stdenv.lib.optional
+      pkgs.config.pythonPackages.pytest.selenium or false
+      selenium;
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ domenkozar lovek323 madjar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
new file mode 100644
index 00000000000..76e2b67e65a
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchurl, hypothesis, py }:
+buildPythonPackage rec {
+  name = "pytest-${version}";
+  version = "3.0.5";
+
+  preCheck = ''
+    # don't test bash builtins
+    rm testing/test_argcomplete.py
+  '';
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pytest/${name}.tar.gz";
+    sha256 = "1z9pj39w0r2gw5hsqndlmsqa80kgbrann5kfma8ww8zhaslkl02a";
+  };
+
+  propagatedBuildInputs = [ hypothesis py ];
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ domenkozar lovek323 madjar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0118abd57cf..31d5c0f3d11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4997,61 +4997,13 @@ in {
 
   pytest = self.pytest_29;
 
-  pytest_27 = buildPythonPackage rec {
-    name = "pytest-2.7.3";
+  pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {};
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest/${name}.tar.gz";
-      sha256 = "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm";
-    };
+  pytest_28 = callPackage ../development/python-modules/pytest/2_8.nix {};
 
-    # Disabled temporarily because of Hydra issue with namespaces
-    doCheck = false;
+  pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};
 
-    preCheck = ''
-      # don't test bash builtins
-      rm testing/test_argcomplete.py
-    '';
-
-    propagatedBuildInputs = with self; [ py ]
-      ++ (optional isPy26 argparse)
-      ++ stdenv.lib.optional
-        pkgs.config.pythonPackages.pytest.selenium or false
-        self.selenium;
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar lovek323 madjar ];
-      platforms = platforms.unix;
-    };
-  };
-
-  pytest_28 = self.pytest_27.override rec {
-    name = "pytest-2.8.7";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest/${name}.tar.gz";
-      sha256 = "1bwb06g64x2gky8x5hcrfpg6r351xwvafimnhm5qxq7wajz8ck7w";
-    };
-  };
-
-  pytest_29 = self.pytest_27.override rec {
-    name = "pytest-2.9.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest/${name}.tar.gz";
-      sha256 = "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j";
-    };
-  };
-
-  pytest_30 = self.pytest_27.override rec {
-    name = "pytest-3.0.5";
-
-    propagatedBuildInputs = with self; [ hypothesis py ];
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest/${name}.tar.gz";
-      sha256 = "1z9pj39w0r2gw5hsqndlmsqa80kgbrann5kfma8ww8zhaslkl02a";
-    };
-  };
+  pytest_30 = callPackage ../development/python-modules/pytest {};
 
   pytestcache = buildPythonPackage rec {
     name = "pytest-cache-1.0";

From 86a26322e8d38d096ecf77756e4f60ebad1c0fd1 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 24 Jan 2017 20:08:17 +0100
Subject: [PATCH 631/727] pythonPackages.pytest_30: 3.0.5 -> 3.0.6

---
 pkgs/development/python-modules/pytest/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 76e2b67e65a..d3fea5a3b43 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, buildPythonPackage, fetchurl, hypothesis, py }:
+{ stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py }:
 buildPythonPackage rec {
   name = "pytest-${version}";
-  version = "3.0.5";
+  version = "3.0.6";
 
   preCheck = ''
     # don't test bash builtins
@@ -10,13 +10,15 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://pypi/p/pytest/${name}.tar.gz";
-    sha256 = "1z9pj39w0r2gw5hsqndlmsqa80kgbrann5kfma8ww8zhaslkl02a";
+    sha256 = "0h6rfp7y7c5mqwfm9fy5fq4l9idnp160c82ylcfjg251y6lk8d34";
   };
 
-  propagatedBuildInputs = [ hypothesis py ];
+  buildInputs = [ hypothesis ];
+  propagatedBuildInputs = [ py ]
+    ++ (stdenv.lib.optional isPy26 argparse);
 
   meta = with stdenv.lib; {
-    maintainers = with maintainers; [ domenkozar lovek323 madjar ];
+    maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
     platforms = platforms.unix;
   };
 }

From 88e620f58751d7eb2a7aac9b96f752b0ece432dc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 24 Jan 2017 21:14:46 +0000
Subject: [PATCH 632/727] ocamlPackages.js_of_ocaml: add ocamlbuild as a
 dependency

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

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index d88dd9eb896..81cd2caf7ee 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4
+{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild
 , cmdliner, tyxml, reactivedata, cppo, which, base64, uchar
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     }."${version}";
   };
 
-  buildInputs = [ ocaml findlib menhir ocsigen_deriving
+  buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild
                  cmdliner reactivedata cppo which base64 ]
   ++ stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.02") tyxml;
   propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ]

From b56d87c962ab7f4c544137bbf5b96ec333c1c90e Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 24 Jan 2017 19:19:34 -0200
Subject: [PATCH 633/727] jwm: 1563 -> 1575

---
 pkgs/applications/window-managers/jwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 47130ac71ec..97e4b391a79 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "jwm-${version}";
-  version = "1563";
+  version = "1575";
   
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
     rev = "s${version}";
-    sha256 = "0xfrsk0cffc0fmlmq1340ylzdcmancn2bwgzv6why3gklxplsp9z";
+    sha256 = "0dw0f29s04jglncavgqr7h9h791f7vw3lb3dcwrgmzk5v50v4nx9";
   };
 
   nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];

From 5bcf3c5e25aeb6b2d0d587ec6d5f3cb6ca5170c9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 24 Jan 2017 21:18:33 +0000
Subject: [PATCH 634/727] ocamlPackages.spacetime_lib: init at 0.1.0

---
 .../ocaml-modules/spacetime_lib/default.nix   | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/spacetime_lib/default.nix

diff --git a/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/pkgs/development/ocaml-modules/spacetime_lib/default.nix
new file mode 100644
index 00000000000..c12e47968ef
--- /dev/null
+++ b/pkgs/development/ocaml-modules/spacetime_lib/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, owee }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-spacetime_lib-${version}";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "lpw25";
+    repo = "spacetime_lib";
+    rev = version;
+    sha256 = "1g91y6wl3z18jhaz2q03wn54zj6xk1qcjidr1nc6nq9a8906lcq5";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  propagatedBuildInputs = [ owee ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "An OCaml library providing some simple operations for handling OCaml “spacetime” profiles";
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 16232ddc56d..52c74b37b6e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -374,6 +374,8 @@ let
 
     sequence = callPackage ../development/ocaml-modules/sequence { };
 
+    spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
+
     sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { };
 
     tuntap = callPackage ../development/ocaml-modules/tuntap { };

From b299e508eab87b26f3624421a35d76efa026ae3b Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 24 Jan 2017 21:21:38 +0000
Subject: [PATCH 635/727] fluentd: 0.14.0 -> 0.14.11, with more plugins

I added the most popular plugins (S3, kafka, kinesis, mongo, etc.)
and tried to bring it closer to the set of plugins they bundle with
td-agent, without getting rid of the ones we already have today. We
should probably make this overridable more generically going forward
but this should scratch most itches today.
---
 pkgs/tools/misc/fluentd/Gemfile      |   9 +
 pkgs/tools/misc/fluentd/Gemfile.lock | 130 ++++++++---
 pkgs/tools/misc/fluentd/gemset.nix   | 319 ++++++++++++++++++++++++---
 3 files changed, 401 insertions(+), 57 deletions(-)

diff --git a/pkgs/tools/misc/fluentd/Gemfile b/pkgs/tools/misc/fluentd/Gemfile
index 8c9dd3aa0a0..2c4fbc84963 100644
--- a/pkgs/tools/misc/fluentd/Gemfile
+++ b/pkgs/tools/misc/fluentd/Gemfile
@@ -3,3 +3,12 @@ source "https://rubygems.org"
 gem 'fluentd'
 gem 'fluent-plugin-elasticsearch'
 gem 'fluent-plugin-record-reformer'
+gem 'fluent-plugin-s3'
+gem 'fluent-plugin-kinesis'
+gem 'fluent-plugin-kafka'
+gem 'fluent-plugin-elasticsearch'
+gem 'fluent-plugin-scribe'
+gem 'fluent-plugin-mongo'
+gem 'fluent-plugin-webhdfs'
+gem 'fluent-plugin-rewrite-tag-filter'
+
diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock
index 581fa6e169a..2f9485d9577 100644
--- a/pkgs/tools/misc/fluentd/Gemfile.lock
+++ b/pkgs/tools/misc/fluentd/Gemfile.lock
@@ -1,58 +1,136 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    cool.io (1.4.4)
-    elasticsearch (1.0.17)
-      elasticsearch-api (= 1.0.17)
-      elasticsearch-transport (= 1.0.17)
-    elasticsearch-api (1.0.17)
+    activesupport (5.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    aws-sdk (2.7.0)
+      aws-sdk-resources (= 2.7.0)
+    aws-sdk-core (2.7.0)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.7.0)
+      aws-sdk-core (= 2.7.0)
+    aws-sigv4 (1.0.0)
+    bson (1.12.5)
+    bzip2-ffi (1.0.0)
+      ffi (~> 1.0)
+    concurrent-ruby (1.0.4)
+    cool.io (1.4.5)
+    elasticsearch (1.0.18)
+      elasticsearch-api (= 1.0.18)
+      elasticsearch-transport (= 1.0.18)
+    elasticsearch-api (1.0.18)
       multi_json
-    elasticsearch-transport (1.0.17)
+    elasticsearch-transport (1.0.18)
       faraday
       multi_json
-    excon (0.49.0)
-    faraday (0.9.2)
+    excon (0.54.0)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
-    fluent-plugin-elasticsearch (1.5.0)
-      elasticsearch
+    ffi (1.9.17)
+    fluent-mixin-config-placeholders (0.4.0)
+      fluentd
+      uuidtools (>= 2.1.5)
+    fluent-mixin-plaintextformatter (0.2.6)
+      fluentd
+      ltsv
+    fluent-plugin-elasticsearch (1.9.2)
+      elasticsearch (< 1.1)
       excon
       fluentd (>= 0.10.43)
-    fluent-plugin-record-reformer (0.8.1)
+    fluent-plugin-kafka (0.5.0)
+      fluentd (>= 0.10.58, < 2)
+      ltsv
+      ruby-kafka (= 0.3.16.beta2)
+    fluent-plugin-kinesis (1.1.2)
+      aws-sdk (~> 2)
+      concurrent-ruby (~> 1)
+      fluentd (>= 0.10.58, < 2)
+      os (>= 0.9.6)
+      protobuf (>= 3.5.5)
+    fluent-plugin-mongo (0.7.16)
+      fluentd (>= 0.10.58, < 2)
+      mongo (~> 1.9)
+    fluent-plugin-record-reformer (0.8.2)
       fluentd
-    fluentd (0.14.0)
-      cool.io (>= 1.4.3, < 2.0.0)
+    fluent-plugin-rewrite-tag-filter (1.5.5)
+      fluentd
+    fluent-plugin-s3 (0.8.0)
+      aws-sdk (>= 2.3.22, < 3)
+      fluentd (>= 0.10.58, < 2)
+    fluent-plugin-scribe (0.10.14)
+      fluentd
+      thrift (~> 0.8.0)
+    fluent-plugin-webhdfs (0.5.2)
+      bzip2-ffi
+      fluent-mixin-config-placeholders (>= 0.3.0)
+      fluent-mixin-plaintextformatter (>= 0.2.1)
+      fluentd (>= 0.10.59)
+      webhdfs (>= 0.6.0)
+    fluentd (0.14.11)
+      cool.io (~> 1.4.5)
       http_parser.rb (>= 0.5.1, < 0.7.0)
-      json (>= 1.4.3)
-      msgpack (>= 0.7.0)
-      serverengine (>= 1.6.4)
+      msgpack (>= 0.7.0, < 2.0.0)
+      serverengine (>= 2.0.4, < 3.0.0)
       sigdump (~> 0.2.2)
-      strptime (>= 0.1.7)
-      tzinfo (>= 1.0.0)
-      tzinfo-data (>= 1.0.0)
+      strptime (~> 0.1.7)
+      tzinfo (~> 1.0)
+      tzinfo-data (~> 1.0)
       yajl-ruby (~> 1.0)
     http_parser.rb (0.6.0)
-    json (1.8.3)
-    msgpack (0.7.6)
+    i18n (0.7.0)
+    jmespath (1.3.1)
+    ltsv (0.1.0)
+    middleware (0.1.0)
+    minitest (5.10.1)
+    mongo (1.12.5)
+      bson (= 1.12.5)
+    msgpack (1.0.2)
     multi_json (1.12.1)
     multipart-post (2.0.0)
-    serverengine (1.6.4)
+    os (0.9.6)
+    protobuf (3.6.12)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
+    public_suffix (2.0.5)
+    ruby-kafka (0.3.16.beta2)
+    serverengine (2.0.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
-    strptime (0.1.8)
+    strptime (0.1.9)
+    thor (0.19.4)
     thread_safe (0.3.5)
+    thrift (0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2016.4)
+    tzinfo-data (1.2016.10)
       tzinfo (>= 1.0.0)
-    yajl-ruby (1.2.1)
+    uuidtools (2.1.5)
+    webhdfs (0.8.0)
+      addressable
+    yajl-ruby (1.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   fluent-plugin-elasticsearch
+  fluent-plugin-kafka
+  fluent-plugin-kinesis
+  fluent-plugin-mongo
   fluent-plugin-record-reformer
+  fluent-plugin-rewrite-tag-filter
+  fluent-plugin-s3
+  fluent-plugin-scribe
+  fluent-plugin-webhdfs
   fluentd
 
 BUNDLED WITH
-   1.11.2
+   1.12.5
diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix
index e6b03fadfd3..1c508e7b58e 100644
--- a/pkgs/tools/misc/fluentd/gemset.nix
+++ b/pkgs/tools/misc/fluentd/gemset.nix
@@ -1,75 +1,227 @@
 {
+  activesupport = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08bnl0nr9csjgkgz6xf8dyg7rccinmfrmn235z3bfaz8ihz15d1d";
+      type = "gem";
+    };
+    version = "5.0.1";
+  };
+  addressable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw";
+      type = "gem";
+    };
+    version = "2.5.0";
+  };
+  aws-sdk = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19s7ialas1yrc54g50yfa37z7m8dq4gqbf8dvlfg8qmpdijjxy3l";
+      type = "gem";
+    };
+    version = "2.7.0";
+  };
+  aws-sdk-core = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a9sgff43s3zhpcmisk1bp6vvlpawa617svfhz84xwa6lmik9sp4";
+      type = "gem";
+    };
+    version = "2.7.0";
+  };
+  aws-sdk-resources = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b5z25n4bgzwkzmzx2q6ik2y74jinyphmrh38lnrn9im6pmmvy3w";
+      type = "gem";
+    };
+    version = "2.7.0";
+  };
+  aws-sigv4 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  bson = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12zcsfr72hr0w1qyxv1iz587nzganpclvimyx5y02gg1hij8hz6b";
+      type = "gem";
+    };
+    version = "1.12.5";
+  };
+  bzip2-ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y5jlcz1vb0v3rbmsbbrarfglcmzdhr5jhlfc5wjnhz2zpybsz3y";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  concurrent-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0p7ji1h1l407kci9w4b4yspzd58ssmlx7p91npx55kw08836dlpb";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
   "cool.io" = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ycc8qdvpba8bf6da8nsna34md86mk527j4qizxh059vqm3521sb";
+      sha256 = "1x5fkyjdjwk68sg7fwxhx2k3hzxkkm6frnd2yix7brxdh06fp0k1";
       type = "gem";
     };
-    version = "1.4.4";
+    version = "1.4.5";
   };
   elasticsearch = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1g7vax396l68w5mrrfbsaly39zkc4rrvljz9717mxyn82m5f66w5";
+      sha256 = "1wdy17i56b4m7akp7yavnr8vhfhyz720waphmixq05dj21b11hl0";
       type = "gem";
     };
-    version = "1.0.17";
+    version = "1.0.18";
   };
   elasticsearch-api = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08bb63raz381fmspijwjc4ksvrrgavmwrymjms1b9mg4qkic87jx";
+      sha256 = "1v6nb3ajz5rack3p4b4nz37hs0zb9x738h2ms8cc4plp6wqh1w5s";
       type = "gem";
     };
-    version = "1.0.17";
+    version = "1.0.18";
   };
   elasticsearch-transport = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07r798g3lnzr3zabk2ks2j5jnxdga23bc8wrr7mcqzn8q0yv82bz";
+      sha256 = "0smfrz8nq49hgf67y5ayxa9i4rmmi0q4m51l0h499ykq4cvcwv6i";
       type = "gem";
     };
-    version = "1.0.17";
+    version = "1.0.18";
   };
   excon = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jmdgc4lhlbxccpg79a32vn3qngqipcaaq8bxa0ivfw5mvz0zc0z";
+      sha256 = "0j4b6s90v84r4wrhbg4rzjfjg9sfisq50fjd3hh9p6yrkm86wbd3";
       type = "gem";
     };
-    version = "0.49.0";
+    version = "0.54.0";
   };
   faraday = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6";
+      sha256 = "18p1csdivgwmshfw3mb698a3bn0yrykg30khk5qxjf6n168g91jr";
       type = "gem";
     };
-    version = "0.9.2";
+    version = "0.11.0";
+  };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7";
+      type = "gem";
+    };
+    version = "1.9.17";
+  };
+  fluent-mixin-config-placeholders = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14b4lqy91jgpky6g7h0vyfy2rr1qavmjzzgnmhwajfzxgw9y2jvi";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  fluent-mixin-plaintextformatter = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gliangfr07060ya9sawkyfx2vz7vdygys65f83czawhckvvm75n";
+      type = "gem";
+    };
+    version = "0.2.6";
   };
   fluent-plugin-elasticsearch = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kgv62s51y9x98qk0b6wrg4a73jfbhw50vg5z36hr0bh9rh2rq4y";
+      sha256 = "0q0v8jxpwrkh1z5qh0chwrssz93nldka4jwfn32hlqhnmb99q8i1";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.9.2";
+  };
+  fluent-plugin-kafka = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sd025xsl1cnjs11wasg0di2k02rx9ifaj49n28ak363df6vsqgf";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  fluent-plugin-kinesis = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "119ngswi9q0p5hh5ldan9pzrgd1lfsbkr5f56hy1k4gfss4kmq27";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
+  fluent-plugin-mongo = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x7n8cknqh956yx3c9hv2g535x4kcixmnxw3fvcspjbqprrd1s91";
+      type = "gem";
+    };
+    version = "0.7.16";
   };
   fluent-plugin-record-reformer = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ca09msvcdgrjv0xdjxh0nhxx8crp3h9nz5qw90c75s5hss2ws9b";
+      sha256 = "1q2pws1mqp6pkb00ix6wjkxklckqb4wcbp79lpyk0b644bk9hqzb";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "0.8.2";
+  };
+  fluent-plugin-rewrite-tag-filter = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1avxvvmfm7bl7fpa2p73295kydh1nbsgdvsr7bsyrb77z1s1m86z";
+      type = "gem";
+    };
+    version = "1.5.5";
+  };
+  fluent-plugin-s3 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nxvk5n76pw4r37lv8vfl1cd0yjxnlj5wlwyk8f1lvp9ma5zlzmg";
+      type = "gem";
+    };
+    version = "0.8.0";
+  };
+  fluent-plugin-scribe = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00m19w7p22adq0yx1h7h2h4ckw9kh5j458a8lawgmbazw2dz0zxi";
+      type = "gem";
+    };
+    version = "0.10.14";
+  };
+  fluent-plugin-webhdfs = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kb9cgrgvh61pqqzv2csnibmp2jwh4hyjyvrh2npkk59k3jp54ad";
+      type = "gem";
+    };
+    version = "0.5.2";
   };
   fluentd = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1v6c8g6fv9s710lrl0jy9ihbb8af37gvw3klk7csr5whp1mhwb8f";
+      sha256 = "0w1bg3nrn6gwhyp8xlpbs9rcajkddnvw6jhn7kvzydp70g2aydhz";
       type = "gem";
     };
-    version = "0.14.0";
+    version = "0.14.11";
   };
   "http_parser.rb" = {
     source = {
@@ -78,21 +230,61 @@
     };
     version = "0.6.0";
   };
-  json = {
+  i18n = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+      sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
       type = "gem";
     };
-    version = "1.8.3";
+    version = "0.7.0";
+  };
+  jmespath = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  ltsv = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1alfq3g0mih4w86736ybnzqmknphm2z95c9q0wl765i4lrmxng11";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  middleware = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0703nkf2v371wqr41c04x5qid7ww45cxqv3hnlg07if3b3xrm9xl";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  minitest = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yk2m8sp0p5m1niawa3ncg157a4i0594cg7z91rzjxv963rzrwab";
+      type = "gem";
+    };
+    version = "5.10.1";
+  };
+  mongo = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0658pn2hbyfvbnpp3wdh3irin0wpikm6y2qbhnx07w54jbkmgh5p";
+      type = "gem";
+    };
+    version = "1.12.5";
   };
   msgpack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fn2riiaygiyvmr0glgm1vx995np3jb2hjf5i0j78vncd2wbwdw5";
+      sha256 = "1fb2my91j08plsbbry5kilsrh7slmzgbbf6f55zy6xk28p9036lg";
       type = "gem";
     };
-    version = "0.7.6";
+    version = "1.0.2";
   };
   multi_json = {
     source = {
@@ -109,13 +301,45 @@
     };
     version = "2.0.0";
   };
+  os = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz";
+      type = "gem";
+    };
+    version = "0.9.6";
+  };
+  protobuf = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cvkfp7574dr6wqpgafl3pg9niqfri3dh2fxb2f8qaapcgfgcaq6";
+      type = "gem";
+    };
+    version = "3.6.12";
+  };
+  public_suffix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
+      type = "gem";
+    };
+    version = "2.0.5";
+  };
+  ruby-kafka = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "112avql9nf0hq07zvh47fyx7na721bj4zfpf43ip471l6k2ksrf5";
+      type = "gem";
+    };
+    version = "0.3.16.beta2";
+  };
   serverengine = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16sy6yissv8h2vla5ba4msqzsjy0cm0x8q2llssx3kl3bwysrbrp";
+      sha256 = "0f08kbiqg9yp5fxdw5blsrnq383a9g4n830g1ypppb7ddv61sbmi";
       type = "gem";
     };
-    version = "1.6.4";
+    version = "2.0.4";
   };
   sigdump = {
     source = {
@@ -128,10 +352,18 @@
   strptime = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lkadizgdls9ya4sbf3bg5i1z6g2kxfw1r5ja0wkc9711zxjilx2";
+      sha256 = "1avbl1fj4y5qx9ywkxpcjjxxpjj6h7r1dqlnddhk5wqg6ypq8lsb";
       type = "gem";
     };
-    version = "0.1.8";
+    version = "0.1.9";
+  };
+  thor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns";
+      type = "gem";
+    };
+    version = "0.19.4";
   };
   thread_safe = {
     source = {
@@ -140,6 +372,14 @@
     };
     version = "0.3.5";
   };
+  thrift = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0aj23ndh5n5yqcvp4c12y7vl5wvxpl66zncf6n6ax2zvb6ig44cv";
+      type = "gem";
+    };
+    version = "0.8.0";
+  };
   tzinfo = {
     dependencies = ["thread_safe"];
     source = {
@@ -151,16 +391,33 @@
   tzinfo-data = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bxfljd5i7g89s7jc5l4a3ddykfsvvp0gm02805r1q77ahn1gp33";
+      sha256 = "01nr50alfm1fyzlcbzvfbpnsq37yb3h676f9n3z0iyp4s4766psf";
       type = "gem";
     };
-    version = "1.2016.4";
+    version = "1.2016.10";
+  };
+  uuidtools = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g";
+      type = "gem";
+    };
+    version = "2.1.5";
+  };
+  webhdfs = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gs6xb9dz9bp5xc38yplfy48jcgj7jrj0zg0vgi7ydkxnkzkhbf2";
+      type = "gem";
+    };
+    version = "0.8.0";
   };
   yajl-ruby = {
     source = {
-      sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sah2lpvpsh555dcnhgcqylinjj5544md9dh1a0a13da0qv1p57i";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.3.0";
   };
 }
\ No newline at end of file

From d3506505775425c31e4699451545e44751bc63e3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Jan 2017 20:34:42 +0100
Subject: [PATCH 636/727] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/e2cd120f1536e2100e34f51ea105dbae8407ecf0.
---
 .../haskell-modules/hackage-packages.nix      | 1044 ++++++++++++-----
 1 file changed, 781 insertions(+), 263 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 056a98727c1..5969f782ca9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1676,8 +1676,8 @@ self: {
      }:
      mkDerivation {
        pname = "BitStringRandomMonad";
-       version = "0.1.1.1";
-       sha256 = "496715852ecfd5651fee81eba635b88865ef6dbc87792e56ea47eeac36fd9c36";
+       version = "0.1.1.2";
+       sha256 = "96a5bb1cb04427a64be71f83d1a09abb950d3023ae80e3811a304748ace16dbf";
        libraryHaskellDepends = [
          base bitstring bytestring mtl parallel primitive transformers
          vector
@@ -4992,6 +4992,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "FastPush" = callPackage
+    ({ mkDerivation, base, STMonadTrans, vector }:
+     mkDerivation {
+       pname = "FastPush";
+       version = "0.1.0.2";
+       sha256 = "301cf0552dc14adc8865038b7d7f5aac7dc791f4039c790c28262603b129c674";
+       libraryHaskellDepends = [ base STMonadTrans vector ];
+       homepage = "https://github.com/wyager/FastPush/";
+       description = "A monad and monad transformer for pushing things onto a stack very fast";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "FastxPipe" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring, pipes
      , pipes-attoparsec, pipes-bytestring
@@ -6273,6 +6285,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "GoogleCodeJam" = callPackage
+    ({ mkDerivation, array, base, containers, mtl, parallel, safe
+     , split, transformers
+     }:
+     mkDerivation {
+       pname = "GoogleCodeJam";
+       version = "0.0.3";
+       sha256 = "e08209b95b264757ce8c4fc1422059c09910b38a4bdd22f6d4e51b24ab1cabdc";
+       libraryHaskellDepends = [
+         array base containers mtl parallel safe split transformers
+       ];
+       homepage = "http://johannesgerer.com/GoogleCodeJam";
+       description = "A monad for flexible parsing of Google Code Jam input files with automatic parallelization";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "GoogleDirections" = callPackage
     ({ mkDerivation, AttoJson, base, bytestring, containers, dataenc
      , download-curl
@@ -9422,6 +9450,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
+  "HsOpenSSL_0_11_4" = callPackage
+    ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
+     , time
+     }:
+     mkDerivation {
+       pname = "HsOpenSSL";
+       version = "0.11.4";
+       sha256 = "6326b9b1fb07e05a72f8435cc3ae777d696251e43e93b25ec2ff513f7f2bed07";
+       libraryHaskellDepends = [
+         base bytestring integer-gmp network time
+       ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/vshabanov/HsOpenSSL";
+       description = "Partial OpenSSL binding for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "HsOpenSSL-x509-system" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
      mkDerivation {
@@ -14047,8 +14094,8 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "QuickCheckVariant";
-       version = "0.1.1.0";
-       sha256 = "3d29e3b03f3908b04db06d3912e65e4370f752d57296e509bbf7e17db949c2f8";
+       version = "0.2.0.0";
+       sha256 = "5ad8557a69793d00facc27a8f3eb9edd7bfde8cd923ea51465a9bfa0a7e7d682";
        libraryHaskellDepends = [ base QuickCheck ];
        homepage = "https://github.com/sanjorgek/QuickCheckVariant";
        description = "Generator of \"valid\" and \"invalid\" data in a type class";
@@ -14558,21 +14605,20 @@ self: {
   "Redmine" = callPackage
     ({ mkDerivation, aeson, base, bytestring, connection, containers
      , HTTP, http-client-tls, http-conduit, http-types, HUnit, MissingH
-     , network, old-locale, old-time, resourcet, text, time
-     , transformers
+     , network, resourcet, text, time, transformers
      }:
      mkDerivation {
        pname = "Redmine";
-       version = "0.0.6";
-       sha256 = "e81f23501fc58456db77b9797a196200f20a81013da3b8f89fdffbf1214d9882";
+       version = "0.0.8";
+       sha256 = "0f0460459b9293b95f55ea966891daf04552de4c8d950da79963fe8b9552acd2";
        libraryHaskellDepends = [
          aeson base bytestring connection containers HTTP http-client-tls
-         http-conduit http-types MissingH network old-locale old-time
-         resourcet text time transformers
+         http-conduit http-types MissingH network resourcet text time
+         transformers
        ];
        testHaskellDepends = [
-         aeson base bytestring connection containers http-client-tls
-         http-conduit HUnit MissingH network old-locale resourcet text time
+         aeson base bytestring connection containers HTTP http-client-tls
+         http-conduit http-types HUnit MissingH network resourcet text time
          transformers
        ];
        homepage = "https://github.com/lookunder/RedmineHs";
@@ -16408,8 +16454,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "THEff";
-       version = "0.1.1.0";
-       sha256 = "545725746fa7ea7d77cdb1447a1f2564ddfe36624c8a3118a7e8d0b009ef2462";
+       version = "0.1.4";
+       sha256 = "4857093c5be0c15557a5c1b06d6dd16e65ff6da0a9362b1d6ee3614d476af266";
        libraryHaskellDepends = [ base template-haskell ];
        description = "TH implementation of effects";
        license = stdenv.lib.licenses.bsd3;
@@ -27830,8 +27876,8 @@ self: {
      }:
      mkDerivation {
        pname = "async-pool";
-       version = "0.9.0";
-       sha256 = "3083cc4a45ebda8d44d25ed143f670cbdc877603ba1d37353a7dee088c172581";
+       version = "0.9.0.1";
+       sha256 = "54c7cc38f00e85978c59569744ca11802a28a93d9a7bbfc83d87c72158bee28b";
        libraryHaskellDepends = [
          async base containers fgl monad-control stm transformers
          transformers-base
@@ -28901,8 +28947,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5";
-       revision = "5";
-       editedCabalFile = "319f1526093b829e5cbb6fe1591f77f3f5be25da83df7790e37741272e711b24";
+       revision = "6";
+       editedCabalFile = "4fdb981cfedcc58b8b64a823d826fafd32c7b0fce7e01bd816db1474994d6018";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -33338,30 +33384,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bitcoin-payment-channel_0_6_0_1" = callPackage
+  "bitcoin-payment-channel_1_0_0_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
-     , bytestring, cereal, errors, haskoin-core, hexstring, QuickCheck
-     , scientific, string-conversions, tagged, test-framework
-     , test-framework-quickcheck2, text, time
+     , bytestring, cereal, errors, haskell-rbpcp-api, haskoin-core
+     , hexstring, hspec, monad-time, mtl, QuickCheck, random, scientific
+     , semigroups, string-conversions, tagged, test-framework
+     , test-framework-quickcheck2, text, tf-random, time
      }:
      mkDerivation {
        pname = "bitcoin-payment-channel";
-       version = "0.6.0.1";
-       sha256 = "10085ef9254d88a4494986f372b07d4109d1767196cc6d230c02ffe18f5f1abd";
+       version = "1.0.0.0";
+       sha256 = "3858a212258099aed8361bbaeef5a251c5d12d7b222c027290d963571e1f7698";
        libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring cereal errors haskoin-core
-         hexstring QuickCheck scientific string-conversions tagged text time
+         aeson base base16-bytestring bytestring cereal errors
+         haskell-rbpcp-api haskoin-core hexstring hspec monad-time
+         QuickCheck scientific semigroups string-conversions tagged text
+         time
        ];
        testHaskellDepends = [
          aeson base base16-bytestring base64-bytestring bytestring cereal
-         haskoin-core hexstring QuickCheck string-conversions test-framework
-         test-framework-quickcheck2 text time
+         errors haskell-rbpcp-api haskoin-core hexstring hspec monad-time
+         mtl QuickCheck random scientific semigroups string-conversions
+         tagged test-framework test-framework-quickcheck2 text tf-random
+         time
        ];
        homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel";
-       description = "Library for working with Bitcoin payment channels";
+       description = "Instant, two-party Bitcoin payments";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       broken = true;
+     }) {haskell-rbpcp-api = null;};
 
   "bitcoin-rpc" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
@@ -35136,8 +35188,8 @@ self: {
     ({ mkDerivation, base, gtk, transformers, X11 }:
      mkDerivation {
        pname = "boring-window-switcher";
-       version = "0.1.0.2";
-       sha256 = "e7e568de0b410fd878c6cd6ce9eae66f51e3e98c83090ad5dec23b5738c9721f";
+       version = "0.1.0.3";
+       sha256 = "ac8273d978973b9424ce195ab48b6f599d06bb1af1af6abf94305b35ffed2748";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base gtk transformers X11 ];
@@ -35480,26 +35532,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "brick_0_15_2" = callPackage
-    ({ mkDerivation, base, containers, contravariant, data-default
-     , deepseq, microlens, microlens-mtl, microlens-th, template-haskell
-     , text, text-zipper, transformers, vector, vty
-     }:
-     mkDerivation {
-       pname = "brick";
-       version = "0.15.2";
-       sha256 = "7407473d133588df46c43480a2b41a50a04a7f0e63a996c6422a07592b8ca85e";
-       libraryHaskellDepends = [
-         base containers contravariant data-default deepseq microlens
-         microlens-mtl microlens-th template-haskell text text-zipper
-         transformers vector vty
-       ];
-       homepage = "https://github.com/jtdaugherty/brick/";
-       description = "A declarative terminal user interface library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "brick" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-default
      , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
@@ -35517,6 +35549,7 @@ self: {
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brillig" = callPackage
@@ -36957,6 +36990,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-dependency-licenses_0_2_0_0" = callPackage
+    ({ mkDerivation, base, Cabal, containers, directory, filepath }:
+     mkDerivation {
+       pname = "cabal-dependency-licenses";
+       version = "0.2.0.0";
+       sha256 = "1731299d3764dd56fe93da2df0b32ce6d4e794e9a68a3dff96cf84a63fb5341e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal containers directory filepath
+       ];
+       homepage = "http://github.com/jaspervdj/cabal-dependency-licenses";
+       description = "Compose a list of a project's transitive dependencies with their licenses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-dev" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers
      , directory, filepath, HTTP, mtl, network, pretty, process, setenv
@@ -37838,15 +37888,15 @@ self: {
      }) {};
 
   "cached-io" = callPackage
-    ({ mkDerivation, base, stm, time }:
+    ({ mkDerivation, base, stm, time, transformers }:
      mkDerivation {
        pname = "cached-io";
-       version = "0.1.1.0";
-       sha256 = "b43e7b329aff4a1f96daff221b6e68b7124d35cef3331034b452d794c8b03546";
+       version = "1.1.0.0";
+       sha256 = "353267bfc4de538ed0811cc4ce9d77683dc7c92654519a29e483d582ba781f30";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base stm time ];
-       executableHaskellDepends = [ base stm time ];
+       libraryHaskellDepends = [ base stm time transformers ];
+       executableHaskellDepends = [ base ];
        description = "A simple library to cache a single IO action with timeout";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38393,8 +38443,8 @@ self: {
     ({ mkDerivation, aeson, base }:
      mkDerivation {
        pname = "canteven-listen-http";
-       version = "0.1.0.0";
-       sha256 = "b7a750e3cf9c1aa7bac89c631714546aea477f3b5a5672dd3df7bb1e2513e168";
+       version = "1.0.0.1";
+       sha256 = "80035ba4bd16e308dd27008aa989efcbd9bedb96c6a84ca651ebef6fbeb781c5";
        libraryHaskellDepends = [ aeson base ];
        description = "data types to describe HTTP services";
        license = stdenv.lib.licenses.asl20;
@@ -41736,6 +41786,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "classy-prelude_1_2_0" = callPackage
+    ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
+     , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
+     , hashable, hspec, lifted-async, lifted-base, monad-unlift
+     , mono-traversable, mono-traversable-instances, mtl
+     , mutable-containers, primitive, QuickCheck, safe-exceptions, say
+     , semigroups, stm, stm-chans, text, time, time-locale-compat
+     , transformers, transformers-base, unordered-containers, vector
+     , vector-instances
+     }:
+     mkDerivation {
+       pname = "classy-prelude";
+       version = "1.2.0";
+       sha256 = "74ca864563ae2b6e048f86ec3be256192e81d12fbef0723d2aa2ee3d1d71fd70";
+       libraryHaskellDepends = [
+         async base basic-prelude bifunctors bytestring chunked-data
+         containers deepseq dlist exceptions ghc-prim hashable lifted-async
+         lifted-base monad-unlift mono-traversable
+         mono-traversable-instances mtl mutable-containers primitive
+         safe-exceptions say semigroups stm stm-chans text time
+         time-locale-compat transformers transformers-base
+         unordered-containers vector vector-instances
+       ];
+       testHaskellDepends = [
+         base containers hspec QuickCheck transformers unordered-containers
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "A typeclass-based Prelude";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classy-prelude-conduit" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit
      , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
@@ -41758,6 +41840,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "classy-prelude-conduit_1_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, classy-prelude, conduit
+     , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
+     , transformers, void
+     }:
+     mkDerivation {
+       pname = "classy-prelude-conduit";
+       version = "1.2.0";
+       sha256 = "24090dd042cd74d2663a5870482a60746b9096754f598b5171b800511230ec7f";
+       libraryHaskellDepends = [
+         base bytestring classy-prelude conduit conduit-combinators
+         monad-control resourcet transformers void
+       ];
+       testHaskellDepends = [
+         base bytestring conduit hspec QuickCheck transformers
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "classy-prelude together with conduit functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classy-prelude-yesod" = callPackage
     ({ mkDerivation, aeson, base, classy-prelude
      , classy-prelude-conduit, data-default, http-conduit, http-types
@@ -41778,15 +41882,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "classy-prelude-yesod_1_1_0" = callPackage
+  "classy-prelude-yesod_1_2_0" = callPackage
     ({ mkDerivation, aeson, base, classy-prelude
      , classy-prelude-conduit, data-default, http-conduit, http-types
      , persistent, yesod, yesod-newsfeed, yesod-static
      }:
      mkDerivation {
        pname = "classy-prelude-yesod";
-       version = "1.1.0";
-       sha256 = "2b7672093e16850dba4c118c56d8626d8049e3c29b163c8389619bfc265f5b58";
+       version = "1.2.0";
+       sha256 = "01cfe84ab5de0b803dc68a2bee5f5bfa4b9daf948974113ef9af9dd99c003fd5";
        libraryHaskellDepends = [
          aeson base classy-prelude classy-prelude-conduit data-default
          http-conduit http-types persistent yesod yesod-newsfeed
@@ -42281,6 +42385,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "clif" = callPackage
+    ({ mkDerivation, base, containers, QuickCheck, tasty
+     , tasty-quickcheck, tasty-th
+     }:
+     mkDerivation {
+       pname = "clif";
+       version = "0.1.0.0";
+       sha256 = "5c39d33787674c4452fab56f8166920525254e0dd095bdd64e3e51a97285d9c6";
+       libraryHaskellDepends = [ base containers QuickCheck ];
+       testHaskellDepends = [
+         base containers QuickCheck tasty tasty-quickcheck tasty-th
+       ];
+       description = "A Clifford algebra number type for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "clifford" = callPackage
     ({ mkDerivation, base, cereal, Chart, Chart-cairo, colour, converge
      , criterion, data-default-class, data-ordlist, deepseq, derive
@@ -43807,17 +43927,18 @@ self: {
 
   "commodities" = callPackage
     ({ mkDerivation, base, comonad, containers, directory, distributive
-     , doctest, filepath, hspec, hspec-expectations, keys, lens, linear
-     , mtl, numbers, PSQueue, QuickCheck, semigroupoids, semigroups
-     , text, thyme, transformers
+     , doctest, failure, filepath, hspec, hspec-expectations, keys, lens
+     , linear, mtl, numbers, parsers, PSQueue, QuickCheck, semigroupoids
+     , semigroups, split, text, thyme, transformers, trifecta
      }:
      mkDerivation {
        pname = "commodities";
-       version = "0.2.0";
-       sha256 = "093df899954134b657ac338384342f64a4f71dbe9841cef2ec138fc5cfddc275";
+       version = "0.2.0.1";
+       sha256 = "fa58f2c3c5acf6f14d0079d8cd2d944c6e35c4bd12c128904021094e8c059130";
        libraryHaskellDepends = [
-         base comonad containers distributive keys lens linear mtl numbers
-         PSQueue semigroupoids semigroups text thyme transformers
+         base comonad containers distributive failure keys lens linear mtl
+         numbers parsers PSQueue semigroupoids semigroups split text thyme
+         transformers trifecta
        ];
        testHaskellDepends = [
          base containers directory doctest filepath hspec hspec-expectations
@@ -44996,6 +45117,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-combinators_1_1_0" = callPackage
+    ({ mkDerivation, base, base16-bytestring, base64-bytestring
+     , bytestring, chunked-data, conduit, conduit-extra, containers
+     , directory, filepath, hspec, monad-control, mono-traversable, mtl
+     , mwc-random, primitive, QuickCheck, resourcet, safe, silently
+     , text, transformers, transformers-base, unix, unix-compat, vector
+     , void
+     }:
+     mkDerivation {
+       pname = "conduit-combinators";
+       version = "1.1.0";
+       sha256 = "ff1f16f24e2c186ce5d61f079b318e2f58c4bc3a4a2c8d9011d001512786335a";
+       libraryHaskellDepends = [
+         base base16-bytestring base64-bytestring bytestring chunked-data
+         conduit conduit-extra filepath monad-control mono-traversable
+         mwc-random primitive resourcet text transformers transformers-base
+         unix unix-compat vector void
+       ];
+       testHaskellDepends = [
+         base base16-bytestring base64-bytestring bytestring chunked-data
+         conduit containers directory filepath hspec mono-traversable mtl
+         mwc-random QuickCheck safe silently text transformers vector
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "Commonly used conduit functions, for both chunked and unchunked data";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-connection" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection, HUnit
      , network, resourcet, test-framework, test-framework-hunit
@@ -45578,8 +45728,8 @@ self: {
      }:
      mkDerivation {
        pname = "consistent";
-       version = "0.0.1";
-       sha256 = "a57d5872c68de93d5f2cf9aaa45c091559ed3877d26eab2b025fae6a60b57b00";
+       version = "0.1.0";
+       sha256 = "f8d983c3c3bc4f0928681c98dac459c18d4dbe64c575d260ac4576e8866a0833";
        libraryHaskellDepends = [
          base lifted-async lifted-base monad-control stm transformers
          transformers-base unordered-containers
@@ -47462,12 +47612,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "crackNum_1_8" = callPackage
+  "crackNum_1_9" = callPackage
     ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
      mkDerivation {
        pname = "crackNum";
-       version = "1.8";
-       sha256 = "26a592d71d6290c1acda8a8acc72f1e5e2be0461236ac9369ab4bc25647b3dc4";
+       version = "1.9";
+       sha256 = "a5a78b774e17837513b7c6048856c375457095898a59b7f3bbb7f49abb1639c5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47930,6 +48080,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "criu-rpc-types" = callPackage
+    ({ mkDerivation, base, proto-lens, proto-lens-protoc }:
+     mkDerivation {
+       pname = "criu-rpc-types";
+       version = "0.0.0.1";
+       sha256 = "eb5cbe012507a81ede156858b262f69270308592ba1faf097e00b90eff496aad";
+       setupHaskellDepends = [ base proto-lens-protoc ];
+       libraryHaskellDepends = [ base proto-lens proto-lens-protoc ];
+       homepage = "https://github.com/wayofthepie/haskell-criu-rpc-types";
+       description = "Criu RPC protocol buffer types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "crockford" = callPackage
     ({ mkDerivation, base, digits, QuickCheck, safe }:
      mkDerivation {
@@ -53840,10 +54003,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.0.1";
-       sha256 = "4bc7a6e0de32900ac64b58024ea989c3afaeab0f9a3e1256a04090eb6233b428";
-       revision = "1";
-       editedCabalFile = "a149e10771a65c573ffb2c9ed1c6694f11392590a36d60a9b1c48f02d0e9e77c";
+       version = "1.0.2";
+       sha256 = "75816f0ca8c8c4bd764cc5d55654656839e72179bd047491ad7f9b7826fda845";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53857,6 +54018,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dhall-nix" = callPackage
+    ({ mkDerivation, base, containers, data-fix, dhall, hnix
+     , neat-interpolation, optparse-generic, text, trifecta, vector
+     }:
+     mkDerivation {
+       pname = "dhall-nix";
+       version = "1.0.0";
+       sha256 = "a3331f9fd1fb35cbd9aa4690fe755e85d89a3f66f28430108dd4f29f3a994e4e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers data-fix dhall hnix neat-interpolation text vector
+       ];
+       executableHaskellDepends = [
+         base dhall hnix optparse-generic text trifecta
+       ];
+       description = "Dhall to Nix compiler";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dia-base" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
@@ -56963,6 +57144,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "doi" = callPackage
+    ({ mkDerivation, async, base, bibtex, directory, filepath
+     , haskeline, MissingH, optparse-applicative, parsec, process
+     , regex-base, regex-compat, regex-tdfa, safe, strict, tagsoup
+     , temporary, time, transformers, urlencoded, utility-ht
+     }:
+     mkDerivation {
+       pname = "doi";
+       version = "0.0.2";
+       sha256 = "202c7a5bf7b49077a287f6d73d55620684c3cbe8c6b0e30f66d333151bb259a5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bibtex directory filepath haskeline MissingH
+         optparse-applicative parsec process regex-base regex-compat
+         regex-tdfa safe strict tagsoup temporary time transformers
+         urlencoded utility-ht
+       ];
+       executableHaskellDepends = [
+         async base bibtex directory filepath haskeline MissingH
+         optparse-applicative parsec process regex-base regex-compat
+         regex-tdfa safe strict tagsoup temporary time transformers
+         urlencoded utility-ht
+       ];
+       homepage = "http://johannesgerer.com/doi";
+       description = "Automatic Bibtex and fulltext of scientific articles";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dom-lt" = callPackage
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
@@ -61357,8 +61567,8 @@ self: {
      }:
      mkDerivation {
        pname = "escape-artist";
-       version = "1.0.0";
-       sha256 = "50bd3a9b1e8773abff8d2a863c014978a74f3d4cd17a0c14cd8f4fdfb5740c7e";
+       version = "1.1.0";
+       sha256 = "e2ccea8bfb7e5d6d094b70a47b1449affcffc3e94044351b6a1addcaaad451fe";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [
          base bytestring hspec QuickCheck silently text
@@ -61429,8 +61639,8 @@ self: {
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "2.5.0";
-       sha256 = "2cba54c813bb506024889b29ceb75079e31e4172dc79cfa1e48c84337e064fa2";
+       version = "2.5.1";
+       sha256 = "76a75c84c4b4e0d41b28d8f8e73cc746282f5e7e50cfb11fcc252286950c87d9";
        libraryHaskellDepends = [
          base blaze-html bytestring conduit monad-logger persistent
          resourcet tagged text transformers unordered-containers
@@ -61957,7 +62167,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "eventstore_0_14_0_0" = callPackage
+  "eventstore_0_14_0_1" = callPackage
     ({ mkDerivation, aeson, array, base, cereal, classy-prelude
      , connection, containers, dns, dotnet-timespan, http-client, mtl
      , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time
@@ -61965,8 +62175,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "0.14.0.0";
-       sha256 = "0855c29baa25f14da74804bd324a4e4fb4f51f7609df3d0c6fbb0ef09d81552d";
+       version = "0.14.0.1";
+       sha256 = "0daf1e7c51405053cbcb35ab53f8b1eaaa4e937b985c49762e9e6814f9b380d0";
        libraryHaskellDepends = [
          aeson array base cereal classy-prelude connection containers dns
          dotnet-timespan http-client mtl protobuf random semigroups stm time
@@ -64727,8 +64937,8 @@ self: {
      }:
      mkDerivation {
        pname = "filestore";
-       version = "0.6.2";
-       sha256 = "a545e54c70bd12b5a2dfd9a303784d7eccd1db6a074860263f40fd0dd092d3d7";
+       version = "0.6.3";
+       sha256 = "b1f3ea70bdecb17281c65b14c8f5c6c52e189a30ad102d87a8f9c2fe08d92d57";
        libraryHaskellDepends = [
          base bytestring containers Diff directory filepath old-locale
          parsec process split time utf8-string xml
@@ -66027,8 +66237,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.0.2";
-       sha256 = "a8f848eb6d47d1ce3e6d102ec61137737371fb68a112155696629d53f81e2cab";
+       version = "0.5.0.3";
+       sha256 = "6c90ce6d51ebba82fc3148b6a60d0665f941be04f12328ace8ac69ad825bdeec";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
@@ -66270,6 +66480,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fold-debounce_0_2_0_5" = callPackage
+    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
+     , time
+     }:
+     mkDerivation {
+       pname = "fold-debounce";
+       version = "0.2.0.5";
+       sha256 = "78c0ff60d8a69193fbd298ece7a20351566c0a5a9adadfae96ff15e902fa594d";
+       libraryHaskellDepends = [
+         base data-default-class stm stm-delay time
+       ];
+       testHaskellDepends = [ base hspec stm time ];
+       homepage = "https://github.com/debug-ito/fold-debounce";
+       description = "Fold multiple events that happen in a given period of time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fold-debounce-conduit" = callPackage
     ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
      , stm, transformers, transformers-base
@@ -66290,6 +66518,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fold-debounce-conduit_0_1_0_5" = callPackage
+    ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
+     , stm, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "fold-debounce-conduit";
+       version = "0.1.0.5";
+       sha256 = "253e73bcf6e1cb281acce2c9e39b00b2419032e4f1e0234bd19a473d210f84cc";
+       libraryHaskellDepends = [
+         base conduit fold-debounce resourcet stm transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base conduit hspec resourcet stm transformers
+       ];
+       homepage = "https://github.com/debug-ito/fold-debounce-conduit";
+       description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foldl" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, mwc-random, primitive, profunctors, text
@@ -67502,8 +67751,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-vector-spaces";
-       version = "0.1.1.0";
-       sha256 = "fa4066b3cb1e6e58ca471e953154acaca9f978cfc81d3987552da79c4805f1b4";
+       version = "0.1.2.0";
+       sha256 = "68aed93d6e73e9d4e68fceb63e5b276b79558474d66cf44df34be667db1ba4ce";
        libraryHaskellDepends = [
          base lens linear MemoTrie vector vector-space
        ];
@@ -69122,8 +69371,8 @@ self: {
      }:
      mkDerivation {
        pname = "gegl";
-       version = "0.0.0.2";
-       sha256 = "475adb9ff07a1e8cc314e441c76e76e46919e842c77ec092b9ed8d7847549e95";
+       version = "0.0.0.4";
+       sha256 = "cd938dcc3042980669f01186cc4d0a52d03a5b8cf14553598ef6c04e0748f822";
        libraryHaskellDepends = [
          babl base containers glib inline-c monad-loops random split
          template-haskell
@@ -69859,8 +70108,8 @@ self: {
        pname = "genvalidity-hspec";
        version = "0.3.0.0";
        sha256 = "0d25376307b9bbbf8a7d438f0e9252e86f1f3227c356a2979f002ebb711d612d";
-       revision = "1";
-       editedCabalFile = "cd36781a3c2aa0a77ed801ae246560f8e04901bfae7cf88139fa68eb3c5e0e25";
+       revision = "2";
+       editedCabalFile = "dc8f7ce63cb185436f09ee5ff581a6b6430576a9e1053849321cd4d4ad653719";
        libraryHaskellDepends = [
          base genvalidity hspec QuickCheck validity
        ];
@@ -77725,17 +77974,19 @@ self: {
      }) {};
 
   "graflog" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hspec, mtl, test-fixture
-     , text, text-conversions
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec, mtl
+     , test-fixture, text, text-conversions
      }:
      mkDerivation {
        pname = "graflog";
-       version = "1.0.0";
-       sha256 = "fcc205034be28055c3f6550e09a94bec4561530926151d7710001b53293c17c0";
+       version = "3.0.0";
+       sha256 = "4f1022278257fb078ba136050f4f919047bdc0f9a9a3e4d97b9cdcd2740feaf6";
        libraryHaskellDepends = [
-         aeson base bytestring text text-conversions
+         aeson base bytestring containers text text-conversions
+       ];
+       testHaskellDepends = [
+         aeson base containers hspec mtl test-fixture text
        ];
-       testHaskellDepends = [ base hspec mtl test-fixture ];
        homepage = "https://github.com/m-arnold/graflog#readme";
        description = "Monadic correlated log events";
        license = stdenv.lib.licenses.bsd3;
@@ -81590,8 +81841,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.9.3.0";
-       sha256 = "f15c6cd2118501fa6be44e3cb3d9f37a22fced0fd1ebd64236277e2daf622e7a";
+       version = "4.9.5.0";
+       sha256 = "47cb6b1859911f638a69ff7cc4fb3ca837be56c51a98b5ff98e43f638ac406d7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83749,8 +84000,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, split }:
      mkDerivation {
        pname = "hashids";
-       version = "1.0.2.2";
-       sha256 = "989d7d1f50738c664230629b3e43340c929d5995ab978837748a5cc22aaaf308";
+       version = "1.0.2.3";
+       sha256 = "ecd74235e8f729514214715b828bf479701aa4b777e4f104ea07534a30822534";
        libraryHaskellDepends = [ base bytestring containers split ];
        testHaskellDepends = [ base bytestring containers split ];
        homepage = "http://hashids.org/";
@@ -88585,8 +88836,8 @@ self: {
        pname = "heist";
        version = "1.0.1.0";
        sha256 = "fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb";
-       revision = "3";
-       editedCabalFile = "35bff91163943a30b86f87edf1873568e88b12ebe70a66d3f5fc146c6af4d84f";
+       revision = "4";
+       editedCabalFile = "d6925d28dee1606c73a16d86ce362e5e6faace458e1dff1fded52c0deac590eb";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist filepath hashable
@@ -89339,8 +89590,8 @@ self: {
      }:
      mkDerivation {
        pname = "heterocephalus";
-       version = "1.0.2.3";
-       sha256 = "653de3568644936d8e011bb329efd763d3b9d9f03101b9cf6486c45532453046";
+       version = "1.0.3.0";
+       sha256 = "df5bece7cd4a03df21e82a195b030b59608b991b16b1d7771569d542bbb7ee0b";
        libraryHaskellDepends = [
          base blaze-html blaze-markup containers dlist parsec shakespeare
          template-haskell text
@@ -90345,10 +90596,8 @@ self: {
      }:
      mkDerivation {
        pname = "hierarchy";
-       version = "0.3.1";
-       sha256 = "4ff6dcb89691dbf20de993964ad32904508f5b6569af1e83eaaaf73a271c9c5f";
-       revision = "1";
-       editedCabalFile = "d5f57b7a5087193876ddccfb410a297bcc4d0babb0b7b8233a4bb591d6d0e5eb";
+       version = "0.3.1.2";
+       sha256 = "d0ac3d7099930278da265c1f4fd384e061636834243eb1cf935530bdf66d541d";
        libraryHaskellDepends = [
          base exceptions free mmorph monad-control mtl pipes semigroups
          transformers transformers-base transformers-compat
@@ -90380,6 +90629,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hifi" = callPackage
+    ({ mkDerivation, base, directory, filepath, mustache, parsec
+     , process, text, unix
+     }:
+     mkDerivation {
+       pname = "hifi";
+       version = "0.1.0.0";
+       sha256 = "6afe6184c86e888a56452a1593830d8fb9514a74d943d9abec7fbc4164fe20de";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory filepath mustache parsec process text unix
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://gitlab.com/gonz/hifi";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "highWaterMark" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
@@ -90903,20 +91172,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hip_1_4_0_1" = callPackage
+  "hip_1_5_0_0" = callPackage
     ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
      , deepseq, directory, filepath, hspec, JuicyPixels, netpbm
      , primitive, process, QuickCheck, repa, temporary, vector
      }:
      mkDerivation {
        pname = "hip";
-       version = "1.4.0.1";
-       sha256 = "960a4f964e5a7e82e5948b05da5a0b17122b50afabea86f451475b0c58a9a4c0";
+       version = "1.5.0.0";
+       sha256 = "b8d04faecd4b6adaaa3b0625eef17f0658794ee6fcfa64c522104a0df30206b9";
        libraryHaskellDepends = [
          base bytestring Chart Chart-diagrams colour deepseq directory
          filepath JuicyPixels netpbm primitive process repa temporary vector
        ];
-       testHaskellDepends = [ base hspec QuickCheck ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "https://github.com/lehins/hip";
        description = "Haskell Image Processing (HIP) Library";
        license = stdenv.lib.licenses.bsd3;
@@ -91939,15 +92208,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hlint_1_9_39" = callPackage
+  "hlint_1_9_40" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
      , directory, extra, filepath, haskell-src-exts, hscolour, process
      , refact, transformers, uniplate
      }:
      mkDerivation {
        pname = "hlint";
-       version = "1.9.39";
-       sha256 = "66cffc12e38c0dfbbab61219381c0af6b41a48462a71e3810612ff2bbdc0b38f";
+       version = "1.9.40";
+       sha256 = "68ff63ac4686ac5b09ff71be811af57a2e640af49e3e606f389901b6388594a1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -94939,6 +95208,27 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {inherit (pkgs) ruby;};
 
+  "hruby_0_3_4_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck
+     , ruby, scientific, stm, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hruby";
+       version = "0.3.4.3";
+       sha256 = "a1fe68e20ffeae12b12a0f156e58c020c4d2da85dcd773ae4350f7b79aacf9cc";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring scientific stm text
+         unordered-containers vector
+       ];
+       librarySystemDepends = [ ruby ];
+       testHaskellDepends = [
+         aeson attoparsec base QuickCheck text vector
+       ];
+       description = "Embed a Ruby intepreter in your Haskell program !";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) ruby;};
+
   "hs-GeoIP" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, GeoIP }:
      mkDerivation {
@@ -96869,8 +97159,8 @@ self: {
     ({ mkDerivation, base, hslogger, mtl, template-haskell }:
      mkDerivation {
        pname = "hslogger-template";
-       version = "2.0.3";
-       sha256 = "b324e500ee3e05e653ff1ca427895195a53c56ee0c0bc1f2da5f7ad29f14afe0";
+       version = "2.0.4";
+       sha256 = "e8a251f7d50d1bd9a095062e9a8783f140b6f3a995e05257bccb0e36ccb7e7b9";
        libraryHaskellDepends = [ base hslogger mtl template-haskell ];
        description = "Automatic generation of hslogger functions";
        license = stdenv.lib.licenses.publicDomain;
@@ -97283,15 +97573,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_3_2" = callPackage
+  "hspec_2_4_0" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.3.2";
-       sha256 = "e852f69cd585cc945c2a9aa191ae6f8894f2e7e10685d60bfed29b521f032fb4";
+       version = "2.4.0";
+       sha256 = "8c8119027bb7c6529bb513b53dca1b55d1df3b7c8f083de0c513d993594a873b";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -97377,25 +97667,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_3_2" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, call-stack, deepseq
-     , hspec-expectations, hspec-meta, HUnit, process, QuickCheck
-     , quickcheck-io, random, setenv, silently, tf-random, time
-     , transformers
+  "hspec-core_2_4_0" = callPackage
+    ({ mkDerivation, ansi-terminal, array, async, base, call-stack
+     , deepseq, directory, filepath, hspec-expectations, hspec-meta
+     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+     , silently, temporary, tf-random, time, transformers
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.3.2";
-       sha256 = "1c6d5d07475a4de72837b1739e0e94cfa2896e762af403d1978ee4df683541b9";
+       version = "2.4.0";
+       sha256 = "0703c133b0f85df86c9b0b9bf00fa9ef1c51ca914ac6aef8b15ec6b9db78c353";
        libraryHaskellDepends = [
-         ansi-terminal async base call-stack deepseq hspec-expectations
-         HUnit QuickCheck quickcheck-io random setenv tf-random time
-         transformers
+         ansi-terminal array async base call-stack deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv tf-random time transformers
        ];
        testHaskellDepends = [
-         ansi-terminal async base call-stack deepseq hspec-expectations
-         hspec-meta HUnit process QuickCheck quickcheck-io random setenv
-         silently tf-random time transformers
+         ansi-terminal array async base call-stack deepseq directory
+         filepath hspec-expectations hspec-meta HUnit process QuickCheck
+         quickcheck-io random setenv silently temporary tf-random time
+         transformers
        ];
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
@@ -97419,12 +97710,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-discover_2_3_2" = callPackage
+  "hspec-discover_2_4_0" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.3.2";
-       sha256 = "fd36c9b91d417d0bb9041e0c2f148fa593dd752d4d62a8ca156fb3d8f88fe35f";
+       version = "2.4.0";
+       sha256 = "563d0b596cac68f5c0dcb8f361cd017bed32f817835e8c6b5858d1902e743bb3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -98029,8 +98320,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheckVariant }:
      mkDerivation {
        pname = "hspecVariant";
-       version = "0.1.0.0";
-       sha256 = "2ca22b48d9535b9099a38df0d26dc7bd694632e5ba0b50791450fdf540912d0c";
+       version = "0.1.0.1";
+       sha256 = "d54fcc1e543c718732088e6579401cba5b62e01f1b9021429e958e3e2ba2866e";
        libraryHaskellDepends = [ base hspec QuickCheckVariant ];
        homepage = "https://github.com/sanjorgek/hspecVariant";
        description = "Spec for testing properties for variant types";
@@ -98043,8 +98334,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspkcs11";
-       version = "0.2";
-       sha256 = "c66b9527f152d5ed29d5de18883905863a3b87fa177514ad0728cb56ae172f98";
+       version = "0.3";
+       sha256 = "c95ba5b7a560b0e1d2b1e11fec7dca72a253232ba9def3081b2313c8b103f7b1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98055,6 +98346,7 @@ self: {
          base bytestring cipher-aes cprng-aes crypto-api RSA testpack unix
          utf8-string
        ];
+       executableToolDepends = [ c2hs ];
        homepage = "https://github.com/denisenkom/hspkcs11";
        description = "Wrapper for PKCS #11 interface";
        license = stdenv.lib.licenses.mit;
@@ -98834,8 +99126,8 @@ self: {
     ({ mkDerivation, base, bytestring, com_err, mtl, time, zephyr }:
      mkDerivation {
        pname = "hszephyr";
-       version = "0.1";
-       sha256 = "593b213b298bdda179bd97b013e4e7ad52ddab1ae9f18c7595710bdc58ccff51";
+       version = "0.2";
+       sha256 = "9175c7cdae7e37f86cd28b38c213b00c458b789758bb675e2012c2b68e91f418";
        libraryHaskellDepends = [ base bytestring mtl time ];
        librarySystemDepends = [ com_err zephyr ];
        description = "Simple libzephyr bindings";
@@ -105061,12 +105353,14 @@ self: {
        pname = "integer-logarithms";
        version = "1";
        sha256 = "9a34b7a9ea6cf0e760159913f41305f786fd027efce3c4e4fe700c2a46cf103c";
+       revision = "2";
+       editedCabalFile = "ee7f145ff4250ef4babd7e0b679b1a26c79da0897da2453cc12281a78f992a04";
        libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
        testHaskellDepends = [
          base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck
        ];
-       homepage = "https://github.com/phadej/integer-logarithms";
+       homepage = "https://github.com/Bodigrim/integer-logarithms";
        description = "Integer logarithms";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105454,8 +105748,8 @@ self: {
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.1.0.4";
-       sha256 = "a8475b8a72bbd9ef8b712defc8206c3eac6dbb3917d52a57e4175b363acf1f84";
+       version = "0.1.0.5";
+       sha256 = "0803d38f425d8f338d7ce5ae5e0755b59f39ae54a7ccc44a381a2840f3d48cb0";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
          hashable mtl safe string-conversions tagged text transformers
@@ -110229,7 +110523,7 @@ self: {
      }) {};
 
   "keysafe" = callPackage
-    ({ mkDerivation, aeson, argon2, async, base, binary, bloomfilter
+    ({ mkDerivation, aeson, argon2, async, base, bloomfilter
      , bytestring, containers, deepseq, directory, disk-free-space
      , exceptions, fast-logger, filepath, http-client, lifted-base
      , MonadRandom, network, optparse-applicative, process, raaz, random
@@ -110240,20 +110534,20 @@ self: {
      }:
      mkDerivation {
        pname = "keysafe";
-       version = "0.20161107";
-       sha256 = "ded1fd52ede4c574a4dd85ff60296f0e1bfe9b248857ee83025247790a03dfe7";
+       version = "0.20170122";
+       sha256 = "39349c641898e77e340d171263a9b2d860089a4ae7a6068a563e8e6647a1fd7e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson argon2 async base binary bloomfilter bytestring containers
-         deepseq directory disk-free-space exceptions fast-logger filepath
+         aeson argon2 async base bloomfilter bytestring containers deepseq
+         directory disk-free-space exceptions fast-logger filepath
          http-client lifted-base MonadRandom network optparse-applicative
          process raaz random random-shuffle readline SafeSemaphore
          secret-sharing servant servant-client servant-server socks split
          stm text time token-bucket transformers unbounded-delays unix
          unix-compat utf8-string wai warp zxcvbn-c
        ];
-       homepage = "https://joeyh.name/code/keysafe/";
+       homepage = "https://keysafe.branchable.com/";
        description = "back up a secret key securely to the cloud";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111625,8 +111919,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdacube-gl";
-       version = "0.5.2.0";
-       sha256 = "6552d8dc5aa3d1639155d42890934aeaa19afe6c5feafee041199ad98cfbd165";
+       version = "0.5.2.2";
+       sha256 = "9dda0c70df5caddee65ca89cabb4e7b169f413f7bf54cab15ec66b3df9154c5e";
        libraryHaskellDepends = [
          base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
          vector vector-algorithms
@@ -113976,8 +114270,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.0.7.0";
-       sha256 = "582a1191b8ac60a4a50fa9361a48f0fe58686ab94db7dbc13bee07e57a20e615";
+       version = "1.0.8.0";
+       sha256 = "108af2057f56b74a8a42e8f1bbb47e7af64cff612bb90f886e93f6118651154e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -118111,6 +118405,8 @@ self: {
        pname = "lrucaching";
        version = "0.3.1";
        sha256 = "2f287ea60d721f58474dc105dec953f98ce9a41dd1897647ef68a48605b132d6";
+       revision = "1";
+       editedCabalFile = "d6cfaad57c507189c9c63c24c96b551ce36f8bd035baceda4b9d187a98fef060";
        libraryHaskellDepends = [
          base base-compat deepseq hashable psqueues vector
        ];
@@ -119077,8 +119373,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "0.1.0.2";
-       sha256 = "8ce44a28bff7b1c22554719aa94adb529482745a2ddc0efd5e06bff4f77ad53c";
+       version = "0.1.0.3";
+       sha256 = "da323b35826c891860b6d93a79cc4d83c53ab7d4f558fab23bc706ac8fb58d43";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120750,6 +121046,8 @@ self: {
        pname = "mcm";
        version = "0.6.5.0";
        sha256 = "35dd7823314ff88d64fc533429a188f455c9dc3dc55abe12f37d791fbf22c5ed";
+       revision = "1";
+       editedCabalFile = "f80a81b16f1133ff0d7ba1468633a76ffb28dde2b1b2edf6f14718856886d0aa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -124543,6 +124841,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "monadoid" = callPackage
+    ({ mkDerivation, base, monad-control, mtl, transformers-base }:
+     mkDerivation {
+       pname = "monadoid";
+       version = "0.0.2";
+       sha256 = "26c2e9fb0456dbec761c6d9723ad33cbb9fcd3a1318ff4197859d766e14ec877";
+       libraryHaskellDepends = [
+         base monad-control mtl transformers-base
+       ];
+       description = "A monoid for monads";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "monadplus" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -125130,6 +125441,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "more-extensible-effects" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "more-extensible-effects";
+       version = "0.1.0.0";
+       sha256 = "e7d3dfd5e6982f7a071acca3180d2968c621fb91b50fa44aaa64f22734b46357";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/qzchenwl/more-extensible-effects#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "morfette" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, filepath, mtl, pretty, QuickCheck, text, utf8-string
@@ -130205,6 +130528,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "non-empty-zipper" = callPackage
+    ({ mkDerivation, base, checkers, QuickCheck }:
+     mkDerivation {
+       pname = "non-empty-zipper";
+       version = "0.1.0.5";
+       sha256 = "196e30fd12ce74458a62b8b61ea7c1f6cec4d5999f465d2ccb11b394c3ed77b4";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base checkers QuickCheck ];
+       description = "The Zipper for NonEmpty";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "non-negative" = callPackage
     ({ mkDerivation, base, QuickCheck, utility-ht }:
      mkDerivation {
@@ -131829,15 +132164,16 @@ self: {
      }) {};
 
   "one-liner" = callPackage
-    ({ mkDerivation, base, contravariant, ghc-prim, profunctors
-     , transformers
+    ({ mkDerivation, base, bifunctors, contravariant, ghc-prim
+     , profunctors, tagged, transformers
      }:
      mkDerivation {
        pname = "one-liner";
-       version = "0.6";
-       sha256 = "40b4ed5de04d7f32a1297c33eedc971abd0652c156cfb89172fbeccdeda1e17f";
+       version = "0.7";
+       sha256 = "2ea06f985f3755c870b2cdcd9b7ab0d541b51e1687507acccd833eb2de258ab4";
        libraryHaskellDepends = [
-         base contravariant ghc-prim profunctors transformers
+         base bifunctors contravariant ghc-prim profunctors tagged
+         transformers
        ];
        homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
@@ -134349,15 +134685,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-types_1_17_0_5" = callPackage
+  "pandoc-types_1_19" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , ghc-prim, HUnit, QuickCheck, string-qq, syb, test-framework
      , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.17.0.5";
-       sha256 = "c8825588b587ff5ed0c105156a11a43f3b752279997231cfc13102809bbc51b3";
+       version = "1.19";
+       sha256 = "2bdd244a1a8fda8d3da07b7e0ffbfe54d7808709bb35825963177b112d4dcccf";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
        ];
@@ -135757,8 +136093,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.4.7.0";
-       sha256 = "f0e1dafb87d6a09c9cc3dae0dfab740c7b387327c913e2512a4aae9feb5d4f3c";
+       version = "0.4.7.1";
+       sha256 = "9e05e5510afd0b2c031e6115ee68749d0075c7357d536c67e34e60f1ea71da13";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -138251,7 +138587,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "pinboard_0_9_12_3" = callPackage
+  "pinboard_0_9_12_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , http-client, http-client-tls, http-types, monad-logger, mtl
      , network, profunctors, QuickCheck, random, safe-exceptions
@@ -138260,8 +138596,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinboard";
-       version = "0.9.12.3";
-       sha256 = "b38931a4cd32bc6a43862c38116779af76c0b5b5eb6f117ba6b60ef3f717324b";
+       version = "0.9.12.4";
+       sha256 = "a64c3dab19bedbe341406a0897a323d9f7830f384856f01a8d0a2cf5ae591e99";
        libraryHaskellDepends = [
          aeson base bytestring containers http-client http-client-tls
          http-types monad-logger mtl network profunctors random
@@ -138814,10 +139150,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-files";
-       version = "0.1.1";
-       sha256 = "a895f464790996ca19195fe605040520660087a36e8c6316fe6647bc23d516aa";
-       revision = "1";
-       editedCabalFile = "5ac3b0b50d526ba7e9018a8870d0df0e981c0365d1a0650bc84959dd1a80da83";
+       version = "0.1.2";
+       sha256 = "7c76760998925020f912d0da9f67938bfdb96858b63771bd5c2696b0de1a4531";
        libraryHaskellDepends = [
          attoparsec base bytestring directory exceptions filepath free
          hierarchy mmorph monad-control mtl pipes pipes-safe posix-paths
@@ -138886,10 +139220,8 @@ self: {
     ({ mkDerivation, base, containers, heaps, pipes }:
      mkDerivation {
        pname = "pipes-interleave";
-       version = "1.1.0";
-       sha256 = "bd083ec1cc9f35ee393763b18581835d8124b358480ae91c6473308af642d8c4";
-       revision = "1";
-       editedCabalFile = "d198f42613a501edcdd6f66ad1991b0ba0a2de01453b001e95b0627f87a5853c";
+       version = "1.1.1";
+       sha256 = "2758429d9da110fcd8037d2db301813c5635c28e89c01e91c709663d090aef50";
        libraryHaskellDepends = [ base containers heaps pipes ];
        homepage = "http://github.com/bgamari/pipes-interleave";
        description = "Interleave and merge streams of elements";
@@ -141445,6 +141777,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "postgresql-simple-url_0_2_0_0" = callPackage
+    ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-url";
+       version = "0.2.0.0";
+       sha256 = "f7d85afe7dd047c63aa56cc67e8d28e1d18f33baff8ee447adc5bec427b6ea4c";
+       libraryHaskellDepends = [
+         base network-uri postgresql-simple split
+       ];
+       testHaskellDepends = [
+         base postgresql-simple tasty tasty-quickcheck
+       ];
+       homepage = "https://github.com/futurice/postgresql-simple-url";
+       description = "Parse postgres:// url into ConnectInfo";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-transactional" = callPackage
     ({ mkDerivation, base, monad-control, mtl, postgresql-simple }:
      mkDerivation {
@@ -142385,8 +142737,8 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-simple";
-       version = "1.1.0.0";
-       sha256 = "ebb343d0a26d88c4700a2b60d5185b8444e879cc7ed60b79eec157b004325aa8";
+       version = "1.1.0.2";
+       sha256 = "0286520edbca9018b254b2a0a8839b03904c1da4919dfd19433bb9c7c7ada1a2";
        libraryHaskellDepends = [
          ansi-terminal base containers lens mono-traversable mtl parsec
          semigroups text transformers
@@ -147706,6 +148058,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rbpcp-api" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring, cereal
+     , haskoin-core, servant, string-conversions, text
+     }:
+     mkDerivation {
+       pname = "rbpcp-api";
+       version = "0.1.0.0";
+       sha256 = "16290f21dc85b53a4738753a7c827584bfd2455d1e0f0d11f78c2520448afd06";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cereal haskoin-core servant
+         string-conversions text
+       ];
+       homepage = "http://paychandoc.runeks.me/";
+       description = "RESTful Bitcoin Payment Channel Protocol Servant API description";
+       license = "unknown";
+     }) {};
+
   "rbr" = callPackage
     ({ mkDerivation, base, bio, bytestring, containers }:
      mkDerivation {
@@ -150366,23 +150735,23 @@ self: {
      }) {};
 
   "remarks" = callPackage
-    ({ mkDerivation, base, directory, filepath, GenericPretty, pretty
-     , tasty, tasty-golden, tasty-hunit
+    ({ mkDerivation, base, containers, directory, filepath
+     , GenericPretty, pretty, tasty, tasty-golden, tasty-hunit
      }:
      mkDerivation {
        pname = "remarks";
-       version = "0.1.9";
-       sha256 = "fe76db6ef442c2b7cf234a909e359651ac7dddc9c603c78d49f2094805a1542b";
+       version = "0.1.11";
+       sha256 = "769f3e9bd64926a8bf00e76d60265baf02d69d3622a161f5e43e3b21a4f0e245";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base GenericPretty pretty ];
+       libraryHaskellDepends = [ base containers GenericPretty pretty ];
        executableHaskellDepends = [
          base directory filepath GenericPretty
        ];
        testHaskellDepends = [
          base GenericPretty tasty tasty-golden tasty-hunit
        ];
-       homepage = "https://github.com/oleks/remarks#readme";
+       homepage = "https://github.com/DIKU-EDU/remarks#readme";
        description = "A DSL for marking student work";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153795,6 +154164,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "safe_0_3_11" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "safe";
+       version = "0.3.11";
+       sha256 = "6a58c8199a8c5ee7ca14077b69c2e876b29be51c797ec4b93de9c7ab3c7bd879";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base deepseq QuickCheck ];
+       homepage = "https://github.com/ndmitchell/safe#readme";
+       description = "Library of safe (exception free) functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safe-access" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -155781,8 +156164,8 @@ self: {
      }:
      mkDerivation {
        pname = "scroll";
-       version = "1.20151219";
-       sha256 = "4f91c20e645ee715c9d3549fffffcc58943bee4fb3ba2e622e0189ccb70dd050";
+       version = "1.20170122";
+       sha256 = "89b5636f8ff2e540892a1b6fb96d3c1bb7b287c13f24c94c143e99afdca38b38";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -160437,8 +160820,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-conduit";
-       version = "0.5.1";
-       sha256 = "f997a94736b90abfd6abc08a56e59c02cd42ab549f35148c68ce40c11b03c7cb";
+       version = "0.6.0";
+       sha256 = "184446555a051992f1a7111af95e84c6cf4a89bdd97c68d354cf9100cb2414fe";
        libraryHaskellDepends = [
          base bifunctors bytestring chunked-data containers either
          exceptions filepath free lifted-async lifted-base mmorph
@@ -161621,8 +162004,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.1.1";
-       sha256 = "010c00a96fe61acb2650695633705a19ebda535822862887b94aadc31177945b";
+       version = "0.1.1.1";
+       sha256 = "27722ea3ac638ace239b241a27a6c66ea9ca1580d5eb97985ec766b88acc4775";
        libraryHaskellDepends = [
          aeson base blaze-html bytestring case-insensitive containers
          directory filepath hxt mtl regex-pcre-builtin safe text utf8-string
@@ -161702,8 +162085,8 @@ self: {
      }:
      mkDerivation {
        pname = "slack-api";
-       version = "0.10";
-       sha256 = "0b9b6688858b85d9c40a6cfd670658330671173ac309326936ff07c931afb452";
+       version = "0.11";
+       sha256 = "aa4c71bd6e877bca8d5e4cdb516c4049eb9068e287205985fd4305d78425d0c3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164096,10 +164479,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket-unix";
-       version = "0.1.0.0";
-       sha256 = "34c71e014e728a4c5f31fbb55ac0d46f049969a8860e2b8629369f4d83429f2d";
-       revision = "1";
-       editedCabalFile = "082468d0b01112a99fffa76d7ff1bbe1b0ebbf878b3364fecec64a73fed094a3";
+       version = "0.1.1.0";
+       sha256 = "7541dd005761c6d08f8a87fe8157e1cfde128437c3bb3b9a72f3052f799ebd0f";
        libraryHaskellDepends = [ base bytestring socket ];
        testHaskellDepends = [
          async base bytestring socket tasty tasty-hunit unix
@@ -167732,6 +168113,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stopwatch_0_1_0_4" = callPackage
+    ({ mkDerivation, base, clock, hspec, transformers }:
+     mkDerivation {
+       pname = "stopwatch";
+       version = "0.1.0.4";
+       sha256 = "b9f4c22f93359491c9fd20a0bd1ff9abd7e077aadfce1a213293e7e124b1b5c2";
+       libraryHaskellDepends = [ base clock transformers ];
+       testHaskellDepends = [ base clock hspec ];
+       homepage = "https://github.com/debug-ito/stopwatch";
+       description = "A simple stopwatch utility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "storable" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -168310,6 +168705,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "streaming-commons_0_1_17" = callPackage
+    ({ mkDerivation, array, async, base, blaze-builder, bytestring
+     , deepseq, directory, hspec, network, process, QuickCheck, random
+     , stm, text, transformers, unix, zlib
+     }:
+     mkDerivation {
+       pname = "streaming-commons";
+       version = "0.1.17";
+       sha256 = "e50a38cb8b626ef2f031c195e22171ffce00e20cbe63e8c768887564a7f47da9";
+       libraryHaskellDepends = [
+         array async base blaze-builder bytestring directory network process
+         random stm text transformers unix zlib
+       ];
+       testHaskellDepends = [
+         array async base blaze-builder bytestring deepseq hspec network
+         QuickCheck text unix zlib
+       ];
+       homepage = "https://github.com/fpco/streaming-commons";
+       description = "Common lower-level functions needed by various streaming data libraries";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streaming-eversion" = callPackage
     ({ mkDerivation, base, doctest, foldl, microlens, pipes
      , pipes-bytestring, pipes-text, streaming, tasty, tasty-hunit
@@ -168373,8 +168791,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-utils";
-       version = "0.1.4.6";
-       sha256 = "fe061b466b47b227b871c40bbb55a90a9425341de32690328ce04adeb2067e51";
+       version = "0.1.4.7";
+       sha256 = "d75d3baaf5afa5a020a8a48830779835112047c4da1b708cfb3901ac6c068d48";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring http-client http-client-tls
          json-stream mtl network network-simple pipes resourcet streaming
@@ -169195,15 +169613,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "stylish-haskell_0_6_5_0" = callPackage
+  "stylish-haskell_0_7_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
      , strict, syb, test-framework, test-framework-hunit, yaml
      }:
      mkDerivation {
        pname = "stylish-haskell";
-       version = "0.6.5.0";
-       sha256 = "aeee182f8b6a9492eedd12a45cd9a4abb677e95e1789ddd8681e699f27a5ea78";
+       version = "0.7.1.0";
+       sha256 = "570a643ae6798995a43b0b357005e71c1529ed43ebafa2748fc97a236e0c01bc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -170099,6 +170517,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sxml" = callPackage
+    ({ mkDerivation, base, containers, polyparse, text, xml-types }:
+     mkDerivation {
+       pname = "sxml";
+       version = "0.1.0.0";
+       sha256 = "ab37bccc87b50d14060ae65d63d0f0ee9eca73962d414f7ae1002a286dd7bd8b";
+       libraryHaskellDepends = [
+         base containers polyparse text xml-types
+       ];
+       homepage = "http://blog.luigiscorner.com/";
+       description = "A SXML-parser";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "syb" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl }:
      mkDerivation {
@@ -172201,6 +172633,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-auto" = callPackage
+    ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-auto";
+       version = "0.1.0.1";
+       sha256 = "ec858ac5f1890af16c7a98ae866231e15ee3f46c374245bd89a9168b52a7d109";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath tasty tasty-hspec tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/minad/tasty-auto#readme";
+       description = "Simple auto discovery for Tasty";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tasty-dejafu" = callPackage
     ({ mkDerivation, base, dejafu, tagged, tasty }:
      mkDerivation {
@@ -172313,8 +172766,8 @@ self: {
        pname = "tasty-hspec";
        version = "1.1.3";
        sha256 = "3c597d948cad9c61355a56811533abbad130eb6e4068fd930ab5514c759bfe31";
-       revision = "1";
-       editedCabalFile = "01a77505da91de5d767129a556b345bf6b26265fa047a9f2b7cd8677adab1412";
+       revision = "2";
+       editedCabalFile = "16e03febf0d4bc7921878291345c6658518656d8c8420618e5d72d10143d93f4";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck random tagged tasty
          tasty-quickcheck tasty-smallcheck
@@ -175667,12 +176120,11 @@ self: {
     ({ mkDerivation, atomic-primops, base, containers }:
      mkDerivation {
        pname = "thread-local-storage";
-       version = "0.1.0.4";
-       sha256 = "3e87f35f3cabfedbd39810f33b7b167832aac008f4f458a2b2411349506b8239";
-       revision = "1";
-       editedCabalFile = "3bba7e8933033aa92c2767ccee383d84cc36a791773aff56d51ea95ecf12d90f";
+       version = "0.1.1";
+       sha256 = "11a0dfa77abf3d39e33529975aade945b0a6720143b3b134fd9460b0889845ca";
        libraryHaskellDepends = [ base containers ];
-       testHaskellDepends = [ atomic-primops base containers ];
+       testHaskellDepends = [ atomic-primops base ];
+       homepage = "https://github.com/rrnewton/thread-local-storage";
        description = "Several options for thread-local-storage (TLS) in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176001,8 +176453,8 @@ self: {
      }:
      mkDerivation {
        pname = "tibetan-utils";
-       version = "0.1.0.2";
-       sha256 = "6afa74aaef0d2fa8ae42f840ab19100f747abc8ddef5e1ffd1186f0a0035182c";
+       version = "0.1.0.4";
+       sha256 = "64fe33564b370cb906fa877d5f130c25618800351c12bc6fb6fed77edd3af1ae";
        libraryHaskellDepends = [
          base composition either megaparsec text text-show
        ];
@@ -181340,18 +181792,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "unfoldable_0_9_1" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, QuickCheck, random
-     , transformers
+  "unfoldable_0_9_2" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
+     , random, transformers
      }:
      mkDerivation {
        pname = "unfoldable";
-       version = "0.9.1";
-       sha256 = "08e2565142d11f21242d631dfd78ad02da93fd6fa3e75af0df4c1024123db236";
-       revision = "1";
-       editedCabalFile = "6b047ce80f7c2eab1edef56df078b25bd86bcb496f1c8f9962758a229324ef7c";
+       version = "0.9.2";
+       sha256 = "9592ec5b6d021fe5c93bc2a047e4f9dddb4bc688bae546fb357e8cd4071b0e04";
        libraryHaskellDepends = [
-         base containers ghc-prim QuickCheck random transformers
+         base containers ghc-prim one-liner QuickCheck random transformers
        ];
        homepage = "https://github.com/sjoerdvisscher/unfoldable";
        description = "Class of data structures that can be unfolded";
@@ -181602,16 +182052,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "unicode-transforms_0_2_0" = callPackage
+  "unicode-transforms_0_2_1" = callPackage
     ({ mkDerivation, base, bitarray, bytestring, deepseq
      , getopt-generics, QuickCheck, split, text
      }:
      mkDerivation {
        pname = "unicode-transforms";
-       version = "0.2.0";
-       sha256 = "3b27ca1ae8f0a906fbbefe1de819a80a01933610a4657ef6383db2590fdecb0e";
-       revision = "1";
-       editedCabalFile = "33480d6bb76758c9016397d10769d6ebf2db4004391961ad6dff05610a67d380";
+       version = "0.2.1";
+       sha256 = "1d8baa0de3c58685aa1e476961f7f3765395ba257d79258c66e86b06a87f3abc";
        libraryHaskellDepends = [ base bitarray bytestring text ];
        testHaskellDepends = [
          base deepseq getopt-generics QuickCheck split text
@@ -182070,8 +182518,8 @@ self: {
      }:
      mkDerivation {
        pname = "universum";
-       version = "0.2";
-       sha256 = "e913282eb9952229d109544c1f4541d8fce503d6ab77e38dc50330423d91e665";
+       version = "0.2.1";
+       sha256 = "e5f8c58824cbf559fb3632ff5a00190870e254262a0f4db9dfde7bc2bc423d21";
        libraryHaskellDepends = [
          async base bytestring containers deepseq exceptions ghc-prim
          hashable microlens microlens-mtl mtl safe stm text text-format
@@ -184184,8 +184632,8 @@ self: {
      }:
      mkDerivation {
        pname = "vcsgui";
-       version = "0.2.1.1";
-       sha256 = "76fa0af1c68195097059ea05e3bf7337dd94590d5f6d10109b33a2def474176b";
+       version = "0.2.1.2";
+       sha256 = "e58fc0156b8badcb5ee74c81e2c75a1f3e4a047d3154f356ba833e1cb58dc5e1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -185474,38 +185922,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vty_5_14" = callPackage
+  "vty_5_15" = 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
+     , 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.14";
-       sha256 = "6f96be6c79c55850f09589b940bfebcc774adddf8a8258af2235320893c53912";
+       version = "5.15";
+       sha256 = "03bf0fa5132c271248e0f721ad9fb3f5003dc93cff99776fcc7cb7920a85d7f7";
        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
+         base blaze-builder bytestring containers 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
+         base containers 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
+         base blaze-builder bytestring Cabal containers 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";
+       homepage = "https://github.com/jtdaugherty/vty";
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185769,6 +186216,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-cli" = callPackage
+    ({ mkDerivation, ansi-terminal, base, http-types, monads-tf
+     , network, options, socket-activation, stm, streaming-commons, unix
+     , wai, wai-extra, warp, warp-tls
+     }:
+     mkDerivation {
+       pname = "wai-cli";
+       version = "0.1.0";
+       sha256 = "220d8b3eb52e7b045844be37682f09823a9730115f33ea718717896f74673007";
+       libraryHaskellDepends = [
+         ansi-terminal base http-types monads-tf network options
+         socket-activation stm streaming-commons unix wai wai-extra warp
+         warp-tls
+       ];
+       homepage = "https://github.com/myfreeweb/wai-cli";
+       description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "wai-conduit" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, conduit
      , http-types, transformers, wai
@@ -186013,8 +186479,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-handler-launch";
-       version = "3.0.2.1";
-       sha256 = "84a466837e6df61be9ae03f8c0241bee374a0493f24f4bdc2a1e5f38ab705864";
+       version = "3.0.2.2";
+       sha256 = "9c94c4da533ebcbbd28cf3dfbeb44a5e953dbf73b53cab0179f16931fa102908";
        libraryHaskellDepends = [
          async base blaze-builder bytestring http-types process
          streaming-commons transformers wai warp
@@ -188569,6 +189035,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wide-word" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "wide-word";
+       version = "0.1.0.0";
+       sha256 = "1a2a5926cbc65afa7bd7dee2ea776779c48d581e980dbc47dfb024391e0836c7";
+       revision = "1";
+       editedCabalFile = "9dad4dd0b247fd7649e70c4cd0a112b9ce1e231981f624653c7ab15fc5f26e5a";
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ];
+       homepage = "https://github.com/erikd/wide-word";
+       description = "Data types for large but fixed width signed and unsigned integers";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "wigner-symbols" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite }:
      mkDerivation {
@@ -188599,6 +189080,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wikicfp-scraper_0_1_0_7" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
+     , scalpel, text, time
+     }:
+     mkDerivation {
+       pname = "wikicfp-scraper";
+       version = "0.1.0.7";
+       sha256 = "1e76ab2361c54b4f68dbe9c099f1e36144b405927abd69e6ee09c2292f65c582";
+       libraryHaskellDepends = [
+         attoparsec base bytestring scalpel text time
+       ];
+       testHaskellDepends = [ base bytestring filepath hspec time ];
+       homepage = "https://github.com/debug-ito/wikicfp-scraper";
+       description = "Scrape WikiCFP web site";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wikipedia4epub" = callPackage
     ({ mkDerivation, base, bytestring, directory, epub, filepath
      , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url
@@ -188626,8 +189125,8 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind";
-       version = "0.1.0.2";
-       sha256 = "472a0bec3129e8b0ea60170e0535e602030e1d68c39bfd405c71b246c5211522";
+       version = "0.1.0.3";
+       sha256 = "f2f5764b9b33aee30d87646a849e6db063fde2b92c8bce0e08ebb94b6b9f737f";
        libraryHaskellDepends = [ base containers text transformers ];
        testHaskellDepends = [
          base hspec microlens QuickCheck stm transformers
@@ -188676,8 +189175,8 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind-x11";
-       version = "0.1.0.4";
-       sha256 = "62b6ca3f4b6fdc19dae22126ff831b2633bf2d5e24c0c5bedc2757ea9a59e45a";
+       version = "0.1.0.5";
+       sha256 = "655f263a134e26a45b1001f7ea861743dbdbd30e69ea4808050c5d3178d557e1";
        libraryHaskellDepends = [
          base containers fold-debounce stm text transformers wild-bind X11
        ];
@@ -188804,21 +189303,20 @@ self: {
      }) {};
 
   "wiringPi" = callPackage
-    ({ mkDerivation, base, wiringPi }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "wiringPi";
-       version = "0.1.0.0";
-       sha256 = "b38a690d3c0e05c892a04f212dcf729f784fb6f05e4ecff2933cd969da04b23f";
+       version = "1.0";
+       sha256 = "78449f9f48bab82bf8e268e0b858171e7539d7b9a61dd92c75a9ea7c1a7523d0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ wiringPi ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/ppelleti/hs-wiringPi";
        description = "Access GPIO pins on Raspberry Pi via wiringPi library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {wiringPi = null;};
+     }) {};
 
   "with-location" = callPackage
     ({ mkDerivation, base, hspec }:
@@ -191426,8 +191924,8 @@ self: {
        pname = "xmlhtml";
        version = "0.2.3.5";
        sha256 = "e333a1c7afd5068b60b143457fea7325a34408cc65b3ac55f5b342eb0274b06d";
-       revision = "2";
-       editedCabalFile = "7ef4b85552808a9169da9c650ece3b9994a6c6106185a92e73aad50c5e98e6f1";
+       revision = "3";
+       editedCabalFile = "4b5e2c334e6fdcab94095ca5fa805a2353690d3a616733cec0febf2ba2991880";
        libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring containers
          parsec text unordered-containers
@@ -191710,6 +192208,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xmonad-vanessa" = callPackage
+    ({ mkDerivation, base, containers, process, tibetan-utils, X11
+     , xmonad, xmonad-contrib, xmonad-extras
+     }:
+     mkDerivation {
+       pname = "xmonad-vanessa";
+       version = "0.1.0.1";
+       sha256 = "795192ea6b9510512dd0e7cb1959b6d070089e0fd5c6896218f17af893447290";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers process tibetan-utils X11 xmonad xmonad-contrib
+         xmonad-extras
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/vmchale/xmonad-vanessa#readme";
+       description = "Custom xmonad, which uses stack and sets various defaults";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "xmonad-wallpaper" = callPackage
     ({ mkDerivation, base, magic, mtl, random, unix, xmonad }:
      mkDerivation {

From 8ea8493889dc52e2478d95f8540e63bcb22631b7 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sun, 22 Jan 2017 13:46:42 -0800
Subject: [PATCH 637/727] haskellPackages.ReadArgs: remove jailbreak

fixed here:

https://github.com/rampion/ReadArgs/pull/9/commits/90d6122d743a85037f5d7ef4cc6fdb9447c5803e
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 06bfab9e0fe..e5dd5655943 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1202,10 +1202,6 @@ self: super: {
 
   socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; });
 
-  # Encountered missing dependencies: hspec >=1.3 && <2.1
-  # https://github.com/rampion/ReadArgs/issues/8
-  ReadArgs = doJailbreak super.ReadArgs;
-
   # https://github.com/philopon/barrier/issues/3
   barrier = doJailbreak super.barrier;
 

From a8aee189e814f11e2b058d94f8c29e00a4028f0a Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sun, 22 Jan 2017 13:48:26 -0800
Subject: [PATCH 638/727] haskellPackages.barrier: remove jailbreak

fixed here:

https://github.com/philopon/barrier/pull/4/commits/1d61f4db12e748e922c13c08c73889f78aced187
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e5dd5655943..0a2d761902a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1202,9 +1202,6 @@ self: super: {
 
   socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; });
 
-  # https://github.com/philopon/barrier/issues/3
-  barrier = doJailbreak super.barrier;
-
   # requires vty 5.13
   brick = super.brick.overrideScope (self: super: { vty = self.vty_5_14; });
 

From 4e536a9f61d002119d88f97e93872a49dcdd9533 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sun, 22 Jan 2017 13:49:25 -0800
Subject: [PATCH 639/727] haskellPackages.elm-export: remove jailbreak

fixed here:

https://github.com/krisajenkins/elm-export/commit/257962f51230e868a91d653dd1f382f392d7ba4a
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0a2d761902a..d8f03a412c6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1205,9 +1205,6 @@ self: super: {
   # requires vty 5.13
   brick = super.brick.overrideScope (self: super: { vty = self.vty_5_14; });
 
-  # https://github.com/krisajenkins/elm-export/pull/22
-  elm-export = doJailbreak super.elm-export;
-
   turtle_1_3_1 = super.turtle_1_3_1.overrideScope (self: super: {
     optparse-applicative = self.optparse-applicative_0_13_0_0;
   });

From 0cb43b920eb0cf8b8b30f9023e1be3cfd947ac8d Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sun, 22 Jan 2017 13:52:29 -0800
Subject: [PATCH 640/727] haskellPackages.git-annex: remove overrides

they don't seem to be needed anymore
---
 .../development/haskell-modules/configuration-common.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d8f03a412c6..c31f33bab7a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -57,14 +57,7 @@ self: super: {
       sha256 = "1vy6bj7f8zyj4n1r0gpi0r7mxapsrjvhwmsi5sbnradfng5j3jya";
       rev = drv.version;
     };
-  })).overrideScope (self: super: {
-    # https://github.com/bitemyapp/esqueleto/issues/8
-    esqueleto = self.esqueleto_2_4_3;
-    # https://github.com/prowdsponsor/esqueleto/issues/137
-    persistent = self.persistent_2_2_4_1;
-    persistent-template = self.persistent-template_2_1_8_1;
-    persistent-sqlite = self.persistent-sqlite_2_2_1;
-  })).override {
+  }))).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
     fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;

From dc3182a15cc94fe6808aa8b7f37a8f4e1069dfde Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sun, 22 Jan 2017 14:06:32 -0800
Subject: [PATCH 641/727] haskellPackages.store: enable check

looks like it works again
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c31f33bab7a..728ba9b53fc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1149,8 +1149,7 @@ self: super: {
   # 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;
+  # Use proper store-core version.
   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

From 663afff78097bedf803af7d2a16e0533e825fda0 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sun, 22 Jan 2017 14:06:50 -0800
Subject: [PATCH 642/727] haskellPackages.HsOpenSSL: remove jailbreak

issue has been closed and it seems to work
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 728ba9b53fc..abcdc3cddd4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1158,9 +1158,6 @@ self: super: {
   # https://github.com/roelvandijk/terminal-progress-bar/issues/13
   terminal-progress-bar = doJailbreak super.terminal-progress-bar;
 
-  # https://github.com/vshabanov/HsOpenSSL/issues/11
-  HsOpenSSL = doJailbreak super.HsOpenSSL;
-
   # https://github.com/NixOS/nixpkgs/issues/19612
   wai-app-file-cgi = (dontCheck super.wai-app-file-cgi).overrideScope (self: super: {
     http-client = self.http-client_0_5_5;

From 2bbf68eafb5bf247366131f3ec67f3209a3dbf6f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Jan 2017 21:32:48 +0100
Subject: [PATCH 643/727] structured-haskell-mode: drop obsolete version
 override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index abcdc3cddd4..798f346b0b6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -834,14 +834,6 @@ self: super: {
 
   # Fine-tune the build.
   structured-haskell-mode = (overrideCabal super.structured-haskell-mode (drv: {
-    # Bump version to latest git-version to get support for Emacs 25.x.
-    version = "1.0.20-28-g1ffb4db";
-    src = pkgs.fetchFromGitHub {
-      owner = "chrisdone";
-      repo = "structured-haskell-mode";
-      rev = "dde5104ee28e1c63ca9fbc37c969f8e319b4b903";
-      sha256 = "0g5qpnxzr9qmgzvsld5mg94rb28xb8kd1a02q045r6zlmv1zx7lp";
-    };
     # Statically linked Haskell libraries make the tool start-up much faster,
     # which is important for use in Emacs.
     enableSharedExecutables = false;

From e832d380deb61872af1012f9b37889c198547467 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Jan 2017 23:09:53 +0100
Subject: [PATCH 644/727] haskell-brick: fix reference to vty

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 798f346b0b6..a3082989855 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -509,7 +509,7 @@ self: super: {
 
   # https://ghc.haskell.org/trac/ghc/ticket/9625
   vty = dontCheck super.vty;
-  vty_5_14 = dontCheck super.vty_5_14;
+  vty_5_15 = dontCheck super.vty_5_15;
 
   # https://github.com/vincenthz/hs-crypto-pubkey/issues/20
   crypto-pubkey = dontCheck super.crypto-pubkey;
@@ -1183,8 +1183,8 @@ self: super: {
 
   socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; });
 
-  # requires vty 5.13
-  brick = super.brick.overrideScope (self: super: { vty = self.vty_5_14; });
+  # requires most recent vty
+  brick = super.brick.overrideScope (self: super: { vty = self.vty_5_15; });
 
   turtle_1_3_1 = super.turtle_1_3_1.overrideScope (self: super: {
     optparse-applicative = self.optparse-applicative_0_13_0_0;

From 4a914f2f9f9b2784d2bf78ee3cd56a7fd4e44e93 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 24 Jan 2017 23:12:49 +0100
Subject: [PATCH 645/727] overpass: 2.1 -> 3.0.2

---
 pkgs/data/fonts/overpass/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix
index d441ac514d3..e24d61d5ba1 100644
--- a/pkgs/data/fonts/overpass/default.nix
+++ b/pkgs/data/fonts/overpass/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchFromGitHub, unzip }:
 
 stdenv.mkDerivation rec {
   name = "overpass-${version}";
-  version = "2.1";
+  version = "3.0.2";
 
-  src = fetchurl {
-    url = "https://github.com/RedHatBrand/overpass/releases/download/2.1/overpass-fonts-ttf-2.1.zip";
-    sha256 = "1kd7vbqffp5988j3p4zxkxajdmfviyv4y6rzk7jazg81xcsxicwf";
+  src = fetchFromGitHub {
+    owner = "RedHatBrand";
+    repo = "Overpass";
+    rev = version;
+    sha256 = "1bgmnhdfmp4rycyadcnzw62vkvn63nn29pq9vbjf4c9picvl8ah6";
   };
 
   nativeBuildInputs = [ unzip ];
@@ -15,8 +17,8 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/share/doc/${name}
-    mkdir -p $out/share/fonts/truetype
-    cp -v *.ttf $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/opentype
+    cp -v "desktop-fonts/"*"/"*.otf $out/share/fonts/opentype
     cp -v LICENSE.md README.md $out/share/doc/${name}
   '';
 

From a96b6e64fb6028c29dea49b5c74e8c45e668f529 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 24 Jan 2017 23:34:40 +0100
Subject: [PATCH 646/727] ghc-8.0.2: remove unused fetchFilteredPatch function

---
 pkgs/development/compilers/ghc/8.0.2.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 5979eba3e10..ba8401b9b09 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -4,13 +4,6 @@
 
 let
   inherit (bootPkgs) ghc;
-
-  fetchFilteredPatch = args: fetchurl (args // {
-    downloadToTemp = true;
-    postFetch = ''
-      ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out"
-    ''; # fix syntax highlighting: */
-  });
 in
 stdenv.mkDerivation rec {
   version = "8.0.2";

From 82c661313de9f76467759a6bfaccc7df7bac3887 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 25 Jan 2017 00:07:09 +0100
Subject: [PATCH 647/727] caddy: 0.9.2 -> 0.9.5

---
 pkgs/servers/caddy/default.nix |  4 +--
 pkgs/servers/caddy/deps.nix    | 61 +++++++++++++++-------------------
 2 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index bf0b40e1d7b..add92f68876 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "caddy-${version}";
-  version = "0.9.2";
+  version = "0.9.5";
 
   goPackagePath = "github.com/mholt/caddy";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "mholt";
     repo = "caddy";
     rev = "v${version}";
-    sha256 = "1nmimyykbjfnwbrka50z15d11z0fc6abpkr0cjbj678d5r9wpz33";
+    sha256 = "0z1qjmlxrsiccrl5cb0j4c48ksng4xgp5bgy11gswrijvymsbq2r";
   };
 
   buildFlagsArray = ''
diff --git a/pkgs/servers/caddy/deps.nix b/pkgs/servers/caddy/deps.nix
index d7c974ecb16..49ae8fa09e8 100644
--- a/pkgs/servers/caddy/deps.nix
+++ b/pkgs/servers/caddy/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/dustin/go-humanize";
-      rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8";
-      sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k";
+      rev = "7a41df006ff9af79a29f0ffa9c5f21fbe6314a2d";
+      sha256 = "0055ir369kz63x9ay0fxqpx2xby8digja6ffbc35vsqjnzfwws18";
     };
   }
   {
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/websocket";
-      rev = "2d1e4548da234d9cb742cc3628556fef86aafbac";
-      sha256 = "0n7af8pjjmg5rhb3104lyvn966l1p4dfblmy3g9b0plsmnzrz6g5";
+      rev = "0674c7c7968d9fac5f0f678325161ec31df406af";
+      sha256 = "0ql8bsxcc0rjli5cxb0jf22jaq18bd6s4pja7razir3a9zcyn3km";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-syslog";
-      rev = "315de0c1920b18b942603ffdc2229e2af4803c17";
-      sha256 = "1z0kinqp8hbl7hw856jhx41ys97rc6hflcgwrkfyxj5fdx60xis6";
+      rev = "b609c7d9de4658cded34a7336b90886c56f9dbdb";
+      sha256 = "1k0dqkizj4vwgdsb7x7fzmcgz9079sczhpn9whd0r3xcnqs7pkkb";
     };
   }
   {
@@ -59,8 +59,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/lucas-clemente/aes12";
-      rev = "8ee5b5610baca43b60ecfad586b3c40d92a96e0c";
-      sha256 = "1lnzrr7f6cyb10gqji6433fvwi8zid0k019m694xyppv4pzgrc93";
+      rev = "25700e67be5c860bcc999137275b9ef8b65932bd";
+      sha256 = "08zbfy5n6ki6fjaihk7y686dwksdglds9c8f1klkldvjbg8mw4vp";
     };
   }
   {
@@ -77,8 +77,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/lucas-clemente/quic-go";
-      rev = "8f7a96dfafd8b03eae5679702a837ed5bdf91327";
-      sha256 = "12qc7y8v3g16q3klh852f3v4yvbcp6h8am1q98ds2c1zay9jl50n";
+      rev = "86e02c4d2c459b70073cd5c39468e8a5a22db45a";
+      sha256 = "16qrkcwllx88f6623ps5p5h62168xs6mcwybbw8862pvb0zkndz0";
     };
   }
   {
@@ -90,22 +90,13 @@
       sha256 = "033099nv0y9pbv0v292x6g0mvwr2w02jf4vvpwx6sjpwbla4xjxd";
     };
   }
-  {
-    goPackagePath = "github.com/mholt/caddy";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mholt/caddy";
-      rev = "73916ccc3069de4720a77b6b817b0bb77bda6b44";
-      sha256 = "1nmimyykbjfnwbrka50z15d11z0fc6abpkr0cjbj678d5r9wpz33";
-    };
-  }
   {
     goPackagePath = "github.com/miekg/dns";
     fetch = {
       type = "git";
       url = "https://github.com/miekg/dns";
-      rev = "db96a2b759cdef4f11a34506a42eb8d1290c598e";
-      sha256 = "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6";
+      rev = "ca336a1f95a6b89be9c250df26c7a41742eb4a6f";
+      sha256 = "03yh1zszhspmmq0v22ckw96q8ds2a5s3nd0c6r3p3n165w28z434";
     };
   }
   {
@@ -131,8 +122,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/russross/blackfriday";
-      rev = "35eb537633d9950afc8ae7bdf0edb6134584e9fc";
-      sha256 = "1hwi1nq5kkpcci7lf4fwhs8jj0mf6xcbdz1vgijpfyyd0zr6mphc";
+      rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70";
+      sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k";
     };
   }
   {
@@ -149,8 +140,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/xenolf/lego";
-      rev = "82ac43327b01319544c050d5d78a4edeff9565d2";
-      sha256 = "0zs1l4dm0srkx78a7rqq1g8g4yn84c07177zbaa286jqpzgijahi";
+      rev = "f5d538caab6dc0c167d4e32990c79bbf9eff578c";
+      sha256 = "026sjqinb0j4ddfh3rwhhh7a1yjkfdmdr4yflba5syp1hrjf1f37";
     };
   }
   {
@@ -158,8 +149,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "6ab629be5e31660579425a738ba8870beb5b7404";
-      sha256 = "1pk98j3wcxkns9whgazhid3if0dnaf57hmq0h6byq75aj9xbncxj";
+      rev = "41d678d1df78cd0410143162dff954e6dc09300f";
+      sha256 = "1gcw2850nghsfi3m98ibsxs8bwqzhdjsgiznrr9ymarzn58v3357";
     };
   }
   {
@@ -167,8 +158,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "f4fe4abe3c785295ddf81c7f1823bcd3bad391b6";
-      sha256 = "0l50x533pj0sj3gnr30zxgm51y4x5a5fwc515zj93iy1z0pyf9cn";
+      rev = "f2499483f923065a842d38eb4c7f1927e6fc6e6d";
+      sha256 = "0q1ps8igfczfafk39hkp8gs57s6qxjvf2c48hiq00p873agz0x7s";
     };
   }
   {
@@ -176,8 +167,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/natefinch/lumberjack.v2";
-      rev = "514cbda263a734ae8caac038dadf05f8f3f9f738";
-      sha256 = "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82";
+      rev = "dd45e6a67c53f673bb49ca8a001fd3a63ceb640e";
+      sha256 = "1fla2mzbwl1lxa9na3xhjmcszn8kiw051xq7i9xzbazzpgf0csg0";
     };
   }
   {
@@ -185,8 +176,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/square/go-jose.v1";
-      rev = "139276ceb5afbf13e636c44e9382f0ca75c12ba3";
-      sha256 = "1f46qka0xzzkbsg01r9c9fi9zlzai7h83mp9hlwg9m5s73h8gzwj";
+      rev = "aa2e30fdd1fe9dd3394119af66451ae790d50e0d";
+      sha256 = "0drajyadd6c4m5qv0jxcv748qczg8sgxz28nva1jn39f234m02is";
     };
   }
   {
@@ -194,8 +185,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "31c299268d302dd0aa9a0dcf765a3d58971ac83f";
-      sha256 = "14jkpa8g0s448n2x5qdi05m59ncsdscby1wy2p089zxl9nqavm8h";
+      rev = "14227de293ca979cf205cd88769fe71ed96a97e2";
+      sha256 = "038hnrjcnjygyi3qidfrkpkakis82qg381sr495d2s40g2dwlzah";
     };
   }
 ]

From 403fdd737eb353734591ee59711f8c5d26ca4f90 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 17:09:24 +0100
Subject: [PATCH 648/727] linux: remove canDisableNetfilterConntrackHelpers
 feature

This feature is available in all kernels in nixpkgs.
---
 nixos/modules/services/networking/firewall.nix          | 3 ---
 pkgs/os-specific/linux/kernel/linux-3.10.nix            | 1 -
 pkgs/os-specific/linux/kernel/linux-3.12.nix            | 1 -
 pkgs/os-specific/linux/kernel/linux-3.18.nix            | 1 -
 pkgs/os-specific/linux/kernel/linux-4.1.nix             | 1 -
 pkgs/os-specific/linux/kernel/linux-4.4.nix             | 1 -
 pkgs/os-specific/linux/kernel/linux-4.9.nix             | 1 -
 pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix | 1 -
 pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix | 3 +--
 pkgs/os-specific/linux/kernel/linux-grsecurity.nix      | 1 -
 pkgs/os-specific/linux/kernel/linux-mptcp.nix           | 1 -
 pkgs/os-specific/linux/kernel/linux-rpi.nix             | 1 -
 pkgs/os-specific/linux/kernel/linux-testing.nix         | 1 -
 13 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index c251b52e03f..0b0ee57cf7a 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -41,7 +41,6 @@ let
   kernelPackages = config.boot.kernelPackages;
 
   kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false;
-  kernelCanDisableHelpers = kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers or false;
 
   helpers =
     ''
@@ -512,8 +511,6 @@ in
 
     assertions = [ { assertion = (cfg.checkReversePath != false) || kernelHasRPFilter;
                      message = "This kernel does not support rpfilter"; }
-                   { assertion = cfg.autoLoadConntrackHelpers || kernelCanDisableHelpers;
-                     message = "This kernel does not support disabling conntrack helpers"; }
                  ];
 
     systemd.services.firewall = {
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 3e6bd51cc47..42546b0262e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
 })
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 95ca51a972e..9a0f314c246 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
 })
diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 5ecfdefa97d..acfd08f2af3 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index fd171eae001..9c7354024ad 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 0eb87a8dd9e..bec31549ae3 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 54c67901f50..dba02330380 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
index 72d7cd1fba0..c8e189dcbfc 100644
--- a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
@@ -16,7 +16,6 @@ import ./generic.nix (args // rec {
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
   features.chromiumos = true;
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
index 4be81409ee1..b80c9acd659 100644
--- a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
@@ -16,9 +16,8 @@ import ./generic.nix (args // rec {
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
   features.chromiumos = true;
-  
+
   extraMeta.hydraPlatforms = [];
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index 8a71a771c4f..7b725f4e439 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -14,6 +14,5 @@ import ./generic.nix (args // rec {
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index a037343751c..e533670014b 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -46,6 +46,5 @@ import ./generic.nix (args // rec {
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index f41c53da5a6..e50a6c80232 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -17,7 +17,6 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
 
   features.iwlwifi = true;
   features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
 
   extraMeta.hydraPlatforms = [];
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 8f18febdf0d..1778f343903 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -13,7 +13,6 @@ import ./generic.nix (args // rec {
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
 
   # Should the testing kernels ever be built on Hydra?

From bdfe638f31042872344325d4b1fe29b70ebb525e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 25 Jan 2017 00:27:53 +0100
Subject: [PATCH 649/727] tor: 0.2.8.12 -> 0.2.9.9

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

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index da52bde56bd..41cb399cb9f 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.2.8.12";
+  name = "tor-0.2.9.9";
 
   src = fetchurl {
-    url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
-    sha256 = "1bsagy4gcf6hgq04q949hv45ljb36j3ylxxn22cwxy4whgr4hmxk";
+    url = "https://dist.torproject.org/${name}.tar.gz";
+    sha256 = "0hqdk5p6dw4bpn7c8gmhyi8jjkhc37112pfw5nx4gl0g4lmmscik";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 0501e496956c5e341b165c507d1481e451554d98 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 25 Jan 2017 00:38:42 +0100
Subject: [PATCH 650/727] electrum: 2.7.12 -> 2.7.18

See https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES
---
 pkgs/applications/misc/electrum/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index e0d426e99b6..28b5f02e813 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "2.7.12";
+  version = "2.7.18";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "0vxdfl208if7mdsnva1jg37bnay2dsz3ww157aqwcv1j6512fi1n";
+    sha256 = "1l9krc7hqhqrm5bwp999bpykkcq4958qwvx8v0l5mxcxw8k7fkab";
   };
 
   propagatedBuildInputs = with python2Packages; [

From 482c67af70ffe43a0c8ca17c3a3b8e83593d9f1b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 25 Jan 2017 00:47:08 +0100
Subject: [PATCH 651/727] grsecurity: adapt new to mirror url structure

---
 pkgs/os-specific/linux/kernel/patches.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index ec114f93e83..b7a4d8749c6 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -30,7 +30,7 @@ let
         # When updating versions/hashes, ALWAYS use the official
         # version; we use this mirror only because upstream removes
         # source files immediately upon releasing a new version ...
-        "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${name}.patch"
+        "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${kver}/${name}.patch"
       ];
       inherit sha256;
     };

From c50c55114264dc369a60efb1735694324d904714 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 25 Jan 2017 00:51:24 +0100
Subject: [PATCH 652/727] grsecurity: 4.8.16-201701062021 ->
 4.8.17-201701151620

---
 pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index 8a71a771c4f..a5ce23ee3e4 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.8.16";
+  version = "4.8.17";
   extraMeta.branch = "4.8";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1aml6vhsfpvm8rsadraff7qj0ivgd9aw75k2q65drz4iby1pqb9h";
+    sha256 = "1zk0q6bvqgz2pk1axd5z0cx71vqk96314f1zn8apwa4raylf9fpa";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index b7a4d8749c6..4848057547e 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -95,9 +95,9 @@ rec {
   };
 
   grsecurity_testing = grsecPatch
-    { kver   = "4.8.16";
-      grrev  = "201701062021";
-      sha256 = "0ivl9dpbyf0f7ywgh8kbzdf0za10yrh6s8plqk9vnns3dhgcnvnq";
+    { kver   = "4.8.17";
+      grrev  = "201701151620";
+      sha256 = "10gavcdby8aiylbx8afc1x4j0vzbb16bhlw39a7ibnav45scsr0p";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 8322a12ef2ce6ea5a239b2221aa6f9a2fe84d904 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 17:29:38 +0100
Subject: [PATCH 653/727] firewall: disable conntrack helper autoloading by
 default

This was disabled in the Linux kernel since 4.7 and poses a security risk
if not configured properly.

https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=486dcf43da7815baa615822f3e46883ccca5400f
---
 nixos/modules/services/networking/firewall.nix | 17 ++++++++++-------
 nixos/tests/nat.nix                            |  3 ---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 0b0ee57cf7a..34b731ad35c 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -425,7 +425,7 @@ in
 
     networking.firewall.connectionTrackingModules = mkOption {
       type = types.listOf types.str;
-      default = [ "ftp" ];
+      default = [ ];
       example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ];
       description =
         ''
@@ -434,9 +434,11 @@ in
 
           As helpers can pose as a security risk, it is advised to
           set this to an empty list and disable the setting
-          networking.firewall.autoLoadConntrackHelpers
+          networking.firewall.autoLoadConntrackHelpers unless you
+          know what you are doing. Connection tracking is disabled
+          by default.
 
-          Loading of helpers is recommended to be done through the new
+          Loading of helpers is recommended to be done through the
           CT target.  More info:
           https://home.regit.org/netfilter-en/secure-use-of-helpers/
         '';
@@ -444,7 +446,7 @@ in
 
     networking.firewall.autoLoadConntrackHelpers = mkOption {
       type = types.bool;
-      default = true;
+      default = false;
       description =
         ''
           Whether to auto-load connection-tracking helpers.
@@ -504,9 +506,10 @@ in
 
     environment.systemPackages = [ pkgs.iptables ] ++ cfg.extraPackages;
 
-    boot.kernelModules = map (x: "nf_conntrack_${x}") cfg.connectionTrackingModules;
-    boot.extraModprobeConfig = optionalString (!cfg.autoLoadConntrackHelpers) ''
-      options nf_conntrack nf_conntrack_helper=0
+    boot.kernelModules = (optional cfg.autoLoadConntrackHelpers "nf_conntrack")
+      ++ map (x: "nf_conntrack_${x}") cfg.connectionTrackingModules;
+    boot.extraModprobeConfig = optionalString cfg.autoLoadConntrackHelpers ''
+      options nf_conntrack nf_conntrack_helper=1
     '';
 
     assertions = [ { assertion = (cfg.checkReversePath != false) || kernelHasRPFilter;
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 4fbf6446268..b16260be38c 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -65,9 +65,6 @@ import ./make-test.nix ({ pkgs, withFirewall, ... }:
         $server->succeed("echo Hello World > /home/ftp/foo.txt");
         $client->succeed("curl -v ftp://server/foo.txt >&2");
 
-        # Test whether active FTP works.
-        $client->succeed("curl -v -P - ftp://server/foo.txt >&2");
-
         # Test ICMP.
         $client->succeed("ping -c 1 router >&2");
         $router->succeed("ping -c 1 client >&2");

From 2d9152d509da7fb6b4d156b094ca7525358634bd Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 19:42:59 +0100
Subject: [PATCH 654/727] nixos/tests/nat: add test for conntrack helper
 autoloading

---
 nixos/release.nix   |  1 +
 nixos/tests/nat.nix | 47 ++++++++++++++++++++++++++++++---------------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index dfa9b67654f..2d78a4db973 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -273,6 +273,7 @@ in rec {
   tests.mysql = callTest tests/mysql.nix {};
   tests.mysqlReplication = callTest tests/mysql-replication.nix {};
   tests.nat.firewall = callTest tests/nat.nix { withFirewall = true; };
+  tests.nat.firewall-conntrack = callTest tests/nat.nix { withFirewall = true; withConntrackHelpers = true; };
   tests.nat.standalone = callTest tests/nat.nix { withFirewall = false; };
   tests.networking.networkd = callSubTests tests/networking.nix { networkd = true; };
   tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; };
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index b16260be38c..74e20bff8d8 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -3,34 +3,47 @@
 # client on the inside network, a server on the outside network, and a
 # router connected to both that performs Network Address Translation
 # for the client.
-import ./make-test.nix ({ pkgs, withFirewall, ... }:
+import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ... }:
   let
     unit = if withFirewall then "firewall" else "nat";
   in
   {
-    name = "nat${if withFirewall then "WithFirewall" else "Standalone"}";
-  meta = with pkgs.stdenv.lib.maintainers; {
+    name = "nat" + (if withFirewall then "WithFirewall" else "Standalone")
+                 + (lib.optionalString withConntrackHelpers "withConntrackHelpers");
+    meta = with pkgs.stdenv.lib.maintainers; {
       maintainers = [ eelco chaoflow rob wkennington ];
     };
 
     nodes =
       { client =
           { config, pkgs, nodes, ... }:
-          { virtualisation.vlans = [ 1 ];
-            networking.firewall.allowPing = true;
-            networking.defaultGateway =
-              (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address;
-          };
+          lib.mkMerge [
+            { virtualisation.vlans = [ 1 ];
+              networking.firewall.allowPing = true;
+              networking.defaultGateway =
+                (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address;
+            }
+            (lib.optionalAttrs withConntrackHelpers {
+              networking.firewall.connectionTrackingModules = [ "ftp" ];
+              networking.firewall.autoLoadConntrackHelpers = true;
+            })
+          ];
 
         router =
           { config, pkgs, ... }:
-          { virtualisation.vlans = [ 2 1 ];
-            networking.firewall.enable = withFirewall;
-            networking.firewall.allowPing = true;
-            networking.nat.enable = true;
-            networking.nat.internalIPs = [ "192.168.1.0/24" ];
-            networking.nat.externalInterface = "eth1";
-          };
+          lib.mkMerge [
+            { virtualisation.vlans = [ 2 1 ];
+              networking.firewall.enable = withFirewall;
+              networking.firewall.allowPing = true;
+              networking.nat.enable = true;
+              networking.nat.internalIPs = [ "192.168.1.0/24" ];
+              networking.nat.externalInterface = "eth1";
+            }
+            (lib.optionalAttrs withConntrackHelpers {
+              networking.firewall.connectionTrackingModules = [ "ftp" ];
+              networking.firewall.autoLoadConntrackHelpers = true;
+            })
+          ];
 
         server =
           { config, pkgs, ... }:
@@ -65,6 +78,10 @@ import ./make-test.nix ({ pkgs, withFirewall, ... }:
         $server->succeed("echo Hello World > /home/ftp/foo.txt");
         $client->succeed("curl -v ftp://server/foo.txt >&2");
 
+        # Test whether active FTP works.
+        $client->${if withConntrackHelpers then "succeed" else "fail"}(
+          "curl -v -P - ftp://server/foo.txt >&2");
+
         # Test ICMP.
         $client->succeed("ping -c 1 router >&2");
         $router->succeed("ping -c 1 client >&2");

From 8d5a4c53b8734b1fc10ab4acdcba28451b836fd9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Jan 2017 19:53:19 +0100
Subject: [PATCH 655/727] nixos/release-notes: document conntrack helper
 changes

---
 nixos/doc/manual/release-notes/rl-1703.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index aa864b7a757..177010e2a32 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -133,6 +133,19 @@ following incompatible changes:</para>
 
     </para>
   </listitem>
+
+  <listitem>
+    <para>
+      Autoloading connection tracking helpers is now disabled by default.
+      This default was also changed in the Linux kernel and is considered
+      insecure if not configured properly in your firewall. If you need
+      connection tracking helpers (i.e. for active FTP) please enable
+      <literal>networking.firewall.autoLoadConntrackHelpers</literal> and
+      tune <literal>networking.firewall.connectionTrackingModules</literal>
+      to suit your needs.
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 

From 942a60697d1802e7ac7f3a62f8e759ac7b1e4274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 25 Jan 2017 00:02:12 -0200
Subject: [PATCH 656/727] terminology: 0.9.1 -> 1.0.0 (#22115)

---
 pkgs/desktops/enlightenment/terminology.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index 34506c05fab..fc36a7e7a65 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
-  version = "0.9.1";
+  version = "1.0.0";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
-    sha256 = "1kwv9vkhngdm5v38q93xpcykghnyawhjjcb5bgy0p89gpbk7mvpc";
+    sha256 = "1x4j2q4qqj10ckbka0zaq2r2zm66ff1x791kp8slv1ff7fw45vdz";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The best terminal emulator written with the EFL";
     homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.bsd2;
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
   };
 }

From c57715570a27ce89df57234e3ce7f1eb7c64cfe4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 22 Jan 2017 06:28:12 +0000
Subject: [PATCH 657/727] freealut: fix build on Darwin

---
 pkgs/development/libraries/freealut/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix
index 39d63a8bd69..2c9a893284b 100644
--- a/pkgs/development/libraries/freealut/default.nix
+++ b/pkgs/development/libraries/freealut/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openal }:
+{ stdenv, darwin, fetchurl, openal }:
 
 stdenv.mkDerivation rec {
   name = "freealut-1.1.0";
@@ -8,12 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0";
   };
 
-  buildInputs = [ openal ];
+  buildInputs = [ openal
+  ] ++ stdenv.lib.optional stdenv.isDarwin
+    darwin.apple_sdk.frameworks.OpenAL
+  ;
 
   meta = {
     homepage = "http://openal.org/";
     description = "Free implementation of OpenAL's ALUT standard";
     license = stdenv.lib.licenses.lgpl2;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 453a3838f9eb96cee9c6234658d3d4ba34d1478a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 24 Jan 2017 21:09:20 +0000
Subject: [PATCH 658/727] ocamlPackages.mtime: init at 0.8.3

Mtime is an OCaml module to access monotonic wall-clock time.

Homepage: http://erratique.ch/software/mtime
---
 .../ocaml-modules/mtime/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/mtime/default.nix

diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix
new file mode 100644
index 00000000000..a26109bd4f9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mtime/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml
+, jsooSupport ? !(stdenv.lib.versionAtLeast ocaml.version "4.04")
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-mtime-0.8.3";
+
+  src = fetchurl {
+    url = http://erratique.ch/software/mtime/releases/mtime-0.8.3.tbz;
+    sha256 = "1hfx4ny2dkw6jf3jppz0640dafl5xgn8r2si9kpwzhmibal8qrah";
+  };
+
+  unpackCmd = "tar xjf $src";
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ]
+  ++ stdenv.lib.optional jsooSupport js_of_ocaml;
+
+  buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${if jsooSupport then "true" else "false"}";
+
+  installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
+
+  meta = {
+    description = "Monotonic wall-clock time for OCaml";
+    homepage = http://erratique.ch/software/mtime;
+    inherit (ocaml.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 52c74b37b6e..40f4ba85745 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -269,6 +269,8 @@ let
 
     mlgmpidl =  callPackage ../development/ocaml-modules/mlgmpidl { };
 
+    mtime =  callPackage ../development/ocaml-modules/mtime { };
+
     nocrypto =  callPackage ../development/ocaml-modules/nocrypto {
       lwt = ocaml_lwt;
     };

From 4963b5014ed36b27cd57fad73e838da262d15931 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 25 Jan 2017 07:11:09 -0200
Subject: [PATCH 659/727] lumina: 1.1.0-p1 -> 1.2.0-p1

---
 pkgs/desktops/lumina/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix
index dcacabc39c1..f593bd14437 100644
--- a/pkgs/desktops/lumina/default.nix
+++ b/pkgs/desktops/lumina/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "lumina-${version}";
-  version = "1.1.0-p1";
+  version = "1.2.0-p1";
 
   src = fetchFromGitHub {
     owner = "trueos";
     repo = "lumina";
     rev = "v${version}";
-    sha256 = "1kkb6v6p6w5mx1qdmcrq3r674k9ahpc6wlsb9pi2lq8qk9yaid0m";
+    sha256 = "0k16lcpxp9avwkadbbyqficd1wxsmwian5ji38wyax76v22yq7p6";
   };
 
   nativeBuildInputs = [

From a30e8db9f04315730f83f324c4079f69bbac44a5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 9 Jan 2017 19:32:49 +0000
Subject: [PATCH 660/727] coq: merge files 8.5.nix and 8.6.nix into default.nix

---
 pkgs/applications/science/logic/coq/8.6.nix   | 88 -------------------
 .../logic/coq/{8.5.nix => default.nix}        | 16 ++--
 pkgs/top-level/all-packages.nix               |  5 +-
 3 files changed, 11 insertions(+), 98 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/coq/8.6.nix
 rename pkgs/applications/science/logic/coq/{8.5.nix => default.nix} (85%)

diff --git a/pkgs/applications/science/logic/coq/8.6.nix b/pkgs/applications/science/logic/coq/8.6.nix
deleted file mode 100644
index 9d3aa756aa5..00000000000
--- a/pkgs/applications/science/logic/coq/8.6.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-# - coqide compilation can be disabled by setting lablgtk to null;
-# - 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
-, pl ? "1"
-}:
-
-let
-  # version = "8.6pl${pl}";
-  version = "8.6";
-  sha256 = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f";
-  coq-version = "8.6";
-  buildIde = lablgtk != null;
-  ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
-  csdpPatch = if csdp != null then ''
-    substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
-    substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
-  '' else "";
-in
-
-stdenv.mkDerivation {
-  name = "coq-${version}";
-
-  inherit coq-version;
-  inherit ocaml camlp5;
-
-  src = fetchurl {
-    url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
-    inherit sha256;
-  };
-
-  buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
-
-  postPatch = ''
-    UNAME=$(type -tp uname)
-    RM=$(type -tp rm)
-    substituteInPlace configure --replace "/bin/uname" "$UNAME"
-    substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
-    substituteInPlace configure.ml --replace '"md5 -q"' '"md5sum"'
-    ${csdpPatch}
-  '';
-
-  setupHook = writeText "setupHook.sh" ''
-    addCoqPath () {
-      if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then
-        export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
-      fi
-    }
-
-    envHooks=(''${envHooks[@]} addCoqPath)
-  '';
-
-  preConfigure = ''
-    configureFlagsArray=(
-      -opt
-      ${ideFlags}
-    )
-  '';
-
-  prefixKey = "-prefix ";
-
-  buildFlags = "revision coq coqide bin/votour";
-
-  postInstall = ''
-    cp bin/votour $out/bin/
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Coq proof assistant";
-    longDescription = ''
-      Coq is a formal proof management system.  It provides a formal language
-      to write mathematical definitions, executable algorithms and theorems
-      together with an environment for semi-interactive development of
-      machine-checked proofs.
-    '';
-    homepage = "http://coq.inria.fr";
-    license = licenses.lgpl21;
-    branch = coq-version;
-    maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/default.nix
similarity index 85%
rename from pkgs/applications/science/logic/coq/8.5.nix
rename to pkgs/applications/science/logic/coq/default.nix
index aae2101f50e..2fb76ac33bc 100644
--- a/pkgs/applications/science/logic/coq/8.5.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -2,23 +2,23 @@
 # - 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 patch-level version can be specified through the `version` argument to
 #   the derivation; it defaults to the greatest.
 
 { stdenv, fetchurl, writeText, pkgconfig
 , ocaml, findlib, camlp5, ncurses
 , lablgtk ? null, csdp ? null
-, pl ? "3"
+, version ? "8.6"
 }:
 
 let
-  version = "8.5pl${pl}";
   sha256 = {
-   "1" = "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb";
-   "2" = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3";
-   "3" = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh";
-  }."${pl}";
-  coq-version = "8.5";
+   "8.5pl1"	= "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb";
+   "8.5pl2"	= "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3";
+   "8.5pl3"	= "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh";
+   "8.6"	= "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f";
+  }."${version}";
+  coq-version = builtins.substring 0 3 version;
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
   csdpPatch = if csdp != null then ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0fed3d4f5dd..3ddf3271b13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16977,11 +16977,12 @@ with pkgs;
     inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk;
     camlp5 = ocamlPackages_4_01_0.camlp5_transitional;
   };
-  coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix {
+  coq_8_5 = callPackage ../applications/science/logic/coq {
+    version = "8.5pl3";
     inherit (ocamlPackages) ocaml findlib lablgtk;
     camlp5 = ocamlPackages.camlp5_transitional;
   };
-  coq_8_6 = callPackage ../applications/science/logic/coq/8.6.nix {
+  coq_8_6 = callPackage ../applications/science/logic/coq {
     inherit (ocamlPackages) ocaml findlib lablgtk;
     camlp5 = ocamlPackages.camlp5_transitional;
   };

From 9b949be617ecd3c2f8ed9e0a7b159e96b58b025d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jan 2017 10:49:36 +0000
Subject: [PATCH 661/727] coq: minor refactoring

---
 pkgs/applications/science/logic/coq/default.nix | 16 +++++++++-------
 pkgs/top-level/all-packages.nix                 |  7 +------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 2fb76ac33bc..36f6b76a477 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -1,4 +1,4 @@
-# - coqide compilation can be disabled by setting lablgtk to null;
+# - coqide compilation can be disabled by setting buildIde to false
 # - 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.
@@ -6,8 +6,9 @@
 #   the derivation; it defaults to the greatest.
 
 { stdenv, fetchurl, writeText, pkgconfig
-, ocaml, findlib, camlp5, ncurses
-, lablgtk ? null, csdp ? null
+, ocamlPackages, ncurses
+, buildIde ? true
+, csdp ? null
 , version ? "8.6"
 }:
 
@@ -19,8 +20,8 @@ let
    "8.6"	= "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f";
   }."${version}";
   coq-version = builtins.substring 0 3 version;
-  buildIde = lablgtk != null;
-  ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+  camlp5 = ocamlPackages.camlp5_transitional;
+  ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
   csdpPatch = if csdp != null then ''
     substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
     substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
@@ -31,14 +32,15 @@ stdenv.mkDerivation {
   name = "coq-${version}";
 
   inherit coq-version;
-  inherit ocaml camlp5;
+  inherit camlp5;
+  inherit (ocamlPackages) ocaml;
 
   src = fetchurl {
     url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
     inherit sha256;
   };
 
-  buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
+  buildInputs = [ pkgconfig ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ];
 
   postPatch = ''
     UNAME=$(type -tp uname)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ddf3271b13..ac0a8248289 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16979,13 +16979,8 @@ with pkgs;
   };
   coq_8_5 = callPackage ../applications/science/logic/coq {
     version = "8.5pl3";
-    inherit (ocamlPackages) ocaml findlib lablgtk;
-    camlp5 = ocamlPackages.camlp5_transitional;
-  };
-  coq_8_6 = callPackage ../applications/science/logic/coq {
-    inherit (ocamlPackages) ocaml findlib lablgtk;
-    camlp5 = ocamlPackages.camlp5_transitional;
   };
+  coq_8_6 = callPackage ../applications/science/logic/coq {};
   coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
     inherit (ocamlPackages) ocaml findlib lablgtk;
     camlp5 = ocamlPackages.camlp5_transitional;

From 798a87159b00d79b0931ff65d7ce3ae7366f7574 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 25 Jan 2017 07:03:24 +0000
Subject: [PATCH 662/727] Coq: propagates the findlib package

So that Coq libraries that need it can easyly use it
---
 pkgs/applications/science/logic/coq/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 36f6b76a477..bc9ba049cd2 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -34,6 +34,9 @@ stdenv.mkDerivation {
   inherit coq-version;
   inherit camlp5;
   inherit (ocamlPackages) ocaml;
+  passthru = {
+    inherit (ocamlPackages) findlib;
+  };
 
   src = fetchurl {
     url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";

From b984d5d25f3c5f4d8c700f3c5e0b41bd48cfcb79 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Wed, 25 Jan 2017 22:23:52 +1100
Subject: [PATCH 663/727] nix-update-source: 0.2.1 -> 0.2.2

---
 pkgs/tools/package-management/nix-update-source/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix
index 06ac8203f82..08b5dcb319c 100644
--- a/pkgs/tools/package-management/nix-update-source/default.nix
+++ b/pkgs/tools/package-management/nix-update-source/default.nix
@@ -1,12 +1,12 @@
 { lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }:
 python3Packages.buildPythonApplication rec {
-  version = "0.2.1";
+  version = "0.2.2";
   name = "nix-update-source-${version}";
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "nix-update-source";
     rev = "version-${version}";
-    sha256 = "1w3aj0kjp8zhxkzqxnm5srrsqsvrmxhn4sqkr4kjffh61jg8jq8a";
+    sha256 = "0liigkr37ib2xy269bcp53ivpir4mpg6lzwnfrsqc4kbkz3l16gg";
   };
   propagatedBuildInputs = [ nix-prefetch-scripts ];
   passthru = {
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
         fetchFn = builtins.getAttr json.fetch.fn fetchers;
         src = fetchFn json.fetch.args;
       in
-      json // { inherit src; };
+      json // json.fetch // { inherit src; };
   };
   meta = {
     description = "Utility to autimate updating of nix derivation sources";

From a59c3038cd26863ab0eb90aad813440dfec1a59e Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Wed, 25 Jan 2017 22:25:14 +1100
Subject: [PATCH 664/727] gup: 0.5.5 -> 0.6.0 and derivation update

---
 .../tools/build-managers/gup/build.nix        | 30 ++++++++++++++-----
 .../tools/build-managers/gup/build.nix.gup    |  6 ++++
 .../tools/build-managers/gup/default.nix      | 26 ++++++++--------
 .../tools/build-managers/gup/src.json         | 17 +++++++++++
 4 files changed, 59 insertions(+), 20 deletions(-)
 create mode 100755 pkgs/development/tools/build-managers/gup/build.nix.gup
 create mode 100644 pkgs/development/tools/build-managers/gup/src.json

diff --git a/pkgs/development/tools/build-managers/gup/build.nix b/pkgs/development/tools/build-managers/gup/build.nix
index a9af037bb81..b2a60c309b3 100644
--- a/pkgs/development/tools/build-managers/gup/build.nix
+++ b/pkgs/development/tools/build-managers/gup/build.nix
@@ -1,14 +1,30 @@
-# NOTE: this file is copied from the upstream repository for this package.
-# Please submit any changes you make here to https://github.com/timbertson/gup/
+# NOTE: the `nixpkgs` version of this file is copied from the upstream repository
+# for this package. Please make any changes to https://github.com/timbertson/gup/
 
-{ stdenv, lib, python, which, pychecker ? null }:
-{ src, version, meta ? {} }:
+{ stdenv, lib, pythonPackages }:
+{ src, version, meta ? {}, passthru ? {}, forceTests ? false }:
+let
+  testInputs = [
+    pythonPackages.mocktest or null
+    pythonPackages.whichcraft
+    pythonPackages.nose
+    pythonPackages.nose_progressive
+  ];
+  pychecker = pythonPackages.pychecker or null;
+  usePychecker = forceTests || pychecker != null;
+  enableTests = forceTests || (lib.all (dep: dep != null) testInputs);
+in
 stdenv.mkDerivation {
-  inherit src meta;
+  inherit src meta passthru;
   name = "gup-${version}";
-  buildInputs = lib.remove null [ python which pychecker ];
-  SKIP_PYCHECKER = pychecker == null;
+  buildInputs = [ pythonPackages.python ]
+    ++ (lib.optionals enableTests testInputs)
+    ++ (lib.optional usePychecker pychecker)
+  ;
+  SKIP_PYCHECKER = !usePychecker;
   buildPhase = "make python";
+  inherit pychecker;
+  testPhase = if enableTests then "make test" else "true";
   installPhase = ''
     mkdir $out
     cp -r python/bin $out/bin
diff --git a/pkgs/development/tools/build-managers/gup/build.nix.gup b/pkgs/development/tools/build-managers/gup/build.nix.gup
new file mode 100755
index 00000000000..915d4287566
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gup/build.nix.gup
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -eu
+if [ -n "${GUP_TARGET:-}" ]; then
+	gup --always
+fi
+curl -LSs -o "$1" https://raw.githubusercontent.com/timbertson/gup/master/nix/gup-python.nix
diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index 8e85c63cb6e..e73beb03164 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchFromGitHub, lib, python, which }:
-let
-  version = "0.5.5";
-  src = fetchFromGitHub {
-    sha256 = "12yv0j333z6jkaaal8my3jx3k4ml9hq8ldis5zfvr8179d4xah7q";
-    rev = "version-${version}";
-    repo = "gup";
-    owner = "timbertson";
-  };
-in
+{ stdenv, fetchFromGitHub, lib, pythonPackages, nix-update-source, curl }:
 import ./build.nix
-  { inherit stdenv lib python which; }
-  { inherit src version;
+  { inherit stdenv lib pythonPackages; }
+  { inherit (nix-update-source.fetch ./src.json) src version;
     meta = {
-      inherit (src.meta) homepage;
+      homepage = https://github.com/timbertson/gup/;
       description = "A better make, inspired by djb's redo";
       license = stdenv.lib.licenses.lgpl2Plus;
       maintainers = [ stdenv.lib.maintainers.timbertson ];
       platforms = stdenv.lib.platforms.all;
     };
+    passthru = {
+      updateScript = ''
+        set -e
+        echo
+        cd ${toString ./.}
+        ${nix-update-source}/bin/nix-update-source --prompt version src.json
+        ./build.nix.gup build.nix
+      '';
+    };
   }
diff --git a/pkgs/development/tools/build-managers/gup/src.json b/pkgs/development/tools/build-managers/gup/src.json
new file mode 100644
index 00000000000..6b9719a3076
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gup/src.json
@@ -0,0 +1,17 @@
+{
+  "fetch": {
+    "args": {
+      "owner": "timbertson",
+      "repo": "gup",
+      "rev": "version-0.6.0",
+      "sha256": "053xnx39jh9kn9l572z4k0q7bbxjpisf1fm9aq27ybj2ha1rh6wr"
+    },
+    "fn": "fetchFromGitHub",
+    "rev": "version-0.6.0",
+    "version": "0.6.0"
+  },
+  "owner": "timbertson",
+  "repo": "gup",
+  "rev": "version-{version}",
+  "type": "fetchFromGitHub"
+}
\ No newline at end of file

From 04ae7febc80a165765a9035234e962289a4f6d14 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 25 Jan 2017 07:23:49 -0500
Subject: [PATCH 665/727] cvs: patch against CVE-2012-0804 (heap overflow)

---
 .../version-management/cvs/CVE-2012-0804.patch   | 16 ++++++++++++++++
 .../version-management/cvs/default.nix           |  5 ++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/version-management/cvs/CVE-2012-0804.patch

diff --git a/pkgs/applications/version-management/cvs/CVE-2012-0804.patch b/pkgs/applications/version-management/cvs/CVE-2012-0804.patch
new file mode 100644
index 00000000000..cd2b324729f
--- /dev/null
+++ b/pkgs/applications/version-management/cvs/CVE-2012-0804.patch
@@ -0,0 +1,16 @@
+diff --git a/src/client.c b/src/client.c
+index 751406b..b45d89c 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -3558,9 +3558,9 @@ connect_to_pserver (cvsroot_t *root, struct buffer **to_server_p,
+          * code.
+          */
+ 	read_line_via (from_server, to_server, &read_buf);
+-	sscanf (read_buf, "%s %d", write_buf, &codenum);
++	count = sscanf (read_buf, "%*s %d", &codenum);
+
+-	if ((codenum / 100) != 2)
++	if (count != 1 || (codenum / 100) != 2)
+ 	    error (1, 0, "proxy server %s:%d does not support http tunnelling",
+ 		   root->proxy_hostname, proxy_port_number);
+ 	free (read_buf);
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 74a2267043c..7ad3aac61d9 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -8,7 +8,10 @@ stdenv.mkDerivation {
     sha256 = "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq";
   };
 
-  patches = [ ./getcwd-chroot.patch ];
+  patches = [
+    ./getcwd-chroot.patch
+    ./CVE-2012-0804.patch
+  ];
 
   hardeningDisable = [ "fortify" "format" ];
 

From e5229c63ad77673d6b7abe398c7a73af7082a13c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 25 Jan 2017 13:53:31 +0100
Subject: [PATCH 666/727] t1lib: add a note about CVE fixes

---
 pkgs/development/libraries/t1lib/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix
index c6f3d68ebd6..8a76e886b4f 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/pkgs/development/libraries/t1lib/default.nix
@@ -13,6 +13,7 @@ let
     { name = "CVE-2011-0764.diff"; sha256 = "1j0y3f38im7srpqjg9jvx8as6sxkz8gw7hglcxnxl9qylx8mr2jh"; }
     { name = "CVE-2011-1552_1553_1554.patch"; sha256 = "16cyq6jhyhh8912j8hapx9pq4rzxk36ljlkxlnyi7i3wr8iz1dir"; }
     { name = "CVE-2010-2642.patch"; sha256 = "175zvyr9v1xs22k2svgxqjcpz5nihfa7j46hn9nzvkqcrhm5m9y8"; }
+      # this ^ also fixes CVE-2011-5244
   ];
 in
 stdenv.mkDerivation {

From 42bf99ef443f4f59e1972b42116407279c312e58 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 25 Jan 2017 07:41:25 +0000
Subject: [PATCH 667/727] coqPackages.{ssreflect,mathcomp}: fix build with
 Coq-8.6

by adding `findlib` as a build input.

Also clean `default.nix` a little bit.
---
 .../coq-modules/mathcomp/default.nix          | 45 ++++++-------------
 .../coq-modules/mathcomp/generic.nix          |  4 +-
 .../coq-modules/ssreflect/default.nix         | 45 ++++++-------------
 .../coq-modules/ssreflect/generic.nix         |  2 +-
 4 files changed, 31 insertions(+), 65 deletions(-)

diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 81cfdecdfff..dba6a3abbea 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -1,39 +1,22 @@
 { callPackage, fetchurl, coq }:
 
-if coq.coq-version == "8.4" then
-
-callPackage ./generic.nix {
-
-  name = "coq-mathcomp-1.6-${coq.coq-version}";
-  src = fetchurl {
+let param =
+  let v16 = {
+    version = "1.6";
     url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
     sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
-  };
-
-}
-
-else if coq.coq-version == "8.5" then
-
-callPackage ./generic.nix {
-
-  name = "coq-mathcomp-1.6-${coq.coq-version}";
-  src = fetchurl {
-    url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
-    sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
-  };
-
-}
-
-else if coq.coq-version == "8.6" then
-
-callPackage ./generic.nix {
-
-  name = "coq-mathcomp-1.6.1-${coq.coq-version}";
-  src = fetchurl {
+  }; v161 = {
+    version = "1.6.1";
     url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
     sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
-  };
+  }; in
+{
+  "8.4" = v16;
+  "8.5" = v16;
+  "8.6" = v161;
+}."${coq.coq-version}"; in
 
+callPackage ./generic.nix {
+  name = "coq${coq.coq-version}-mathcomp-${param.version}";
+  src = fetchurl { inherit (param) url sha256; };
 }
-
-else throw "No ssreflect package for Coq version ${coq.coq-version}"
diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
index 9a6a98609d2..1c150c9e69f 100644
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ b/pkgs/development/coq-modules/mathcomp/generic.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, coq, ssreflect, ncurses, which
-, graphviz, ocamlPackages, withDoc ? false
+, graphviz, withDoc ? false
 , src, name
 }:
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   inherit src;
 
   nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
-  buildInputs = [ coq.ocaml coq.camlp5 ncurses which ];
+  buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ];
   propagatedBuildInputs = [ coq ssreflect ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 16147c4dc2a..18eafe5e9c2 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -1,39 +1,22 @@
 { callPackage, fetchurl, coq }:
 
-if coq.coq-version == "8.4" then
-
-callPackage ./generic.nix {
-
-  name = "coq-ssreflect-1.6-${coq.coq-version}";
-  src = fetchurl {
+let param =
+  let v16 = {
+    version = "1.6";
     url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
     sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
-  };
-
-}
-
-else if coq.coq-version == "8.5" then
-
-callPackage ./generic.nix {
-
-  name = "coq-ssreflect-1.6-${coq.coq-version}";
-  src = fetchurl {
-    url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
-    sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
-  };
-
-}
-
-else if coq.coq-version == "8.6" then
-
-callPackage ./generic.nix {
-
-  name = "coq-ssreflect-1.6.1-${coq.coq-version}";
-  src = fetchurl {
+  }; v161 = {
+    version = "1.6.1";
     url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
     sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
-  };
+  }; in
+{
+  "8.4" = v16;
+  "8.5" = v16;
+  "8.6" = v161;
+}."${coq.coq-version}"; in
 
+callPackage ./generic.nix {
+  name = "coq${coq.coq-version}-ssreflect-${param.version}";
+  src = fetchurl { inherit (param) url sha256; };
 }
-
-else throw "No ssreflect package for Coq version ${coq.coq-version}"
diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix
index 3362e8839a7..c598345403d 100644
--- a/pkgs/development/coq-modules/ssreflect/generic.nix
+++ b/pkgs/development/coq-modules/ssreflect/generic.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   inherit src;
 
   nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
-  buildInputs = [ coq.ocaml coq.camlp5 ncurses which ];
+  buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ];
   propagatedBuildInputs = [ coq ];
 
   enableParallelBuilding = true;

From d40b6801012613ee1fddcee95e012b01e7dc8360 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 25 Jan 2017 13:14:31 +0000
Subject: [PATCH 668/727] coq-8.4: fix build of ssreflect and mathcomp

---
 pkgs/applications/science/logic/coq/8.4.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix
index f162fe4a86e..32007ba45ce 100644
--- a/pkgs/applications/science/logic/coq/8.4.nix
+++ b/pkgs/applications/science/logic/coq/8.4.nix
@@ -63,6 +63,7 @@ stdenv.mkDerivation {
   '';
 
   passthru = {
+    inherit findlib;
     emacsBufferSetup = pkgs: ''
       ; Propagate coq paths to children
       (inherit-local-permanent coq-prog-name "${self}/bin/coqtop")

From d9987f360a72b97b346f13f7d5ec1bf58f284e52 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 16 Jan 2017 16:46:43 +0100
Subject: [PATCH 669/727] nginx: added serverName option for virtualHosts

This allows overriding the `server_name` attribute of virtual
hosts. By doing so it is possible to have multiple virtualHost
definitions that share the same `server_name`. This is useful in
particular when you need a HTTP as well as a HTTPS virtualhost: same
server_name, different port.
---
 .../services/web-servers/nginx/default.nix    | 40 +++++++++++--------
 .../web-servers/nginx/vhost-options.nix       |  9 +++++
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 68a672c42c9..c9eacdd85dc 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -5,7 +5,11 @@ with lib;
 let
   cfg = config.services.nginx;
   virtualHosts = mapAttrs (vhostName: vhostConfig:
-    vhostConfig // (optionalAttrs vhostConfig.enableACME {
+    vhostConfig // {
+      serverName = if vhostConfig.serverName != null
+        then vhostConfig.serverName
+        else vhostName;
+    } // (optionalAttrs vhostConfig.enableACME {
       sslCertificate = "/var/lib/acme/${vhostName}/fullchain.pem";
       sslCertificateKey = "/var/lib/acme/${vhostName}/key.pem";
     })
@@ -112,8 +116,9 @@ let
     ${cfg.appendConfig}
   '';
 
-  vhosts = concatStringsSep "\n" (mapAttrsToList (serverName: vhost:
+  vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost:
       let
+        serverName = vhost.serverName;
         ssl = vhost.enableSSL || vhost.forceSSL;
         port = if vhost.port != null then vhost.port else (if ssl then 443 else 80);
         listenString = toString port + optionalString ssl " ssl http2"
@@ -161,7 +166,7 @@ let
             ssl_certificate_key ${vhost.sslCertificateKey};
           ''}
 
-          ${optionalString (vhost.basicAuth != {}) (mkBasicAuth serverName vhost.basicAuth)}
+          ${optionalString (vhost.basicAuth != {}) (mkBasicAuth vhostName vhost.basicAuth)}
 
           ${mkLocations vhost.locations}
 
@@ -178,8 +183,8 @@ let
       ${config.extraConfig}
     }
   '') locations);
-  mkBasicAuth = serverName: authDef: let
-    htpasswdFile = pkgs.writeText "${serverName}.htpasswd" (
+  mkBasicAuth = vhostName: authDef: let
+    htpasswdFile = pkgs.writeText "${vhostName}.htpasswd" (
       concatStringsSep "\n" (mapAttrsToList (user: password: ''
         ${user}:{PLAIN}${password}
       '') authDef)
@@ -393,17 +398,20 @@ in
     };
 
     security.acme.certs = filterAttrs (n: v: v != {}) (
-      mapAttrs (vhostName: vhostConfig:
-        optionalAttrs vhostConfig.enableACME {
-          user = cfg.user;
-          group = cfg.group;
-          webroot = vhostConfig.acmeRoot;
-          extraDomains = genAttrs vhostConfig.serverAliases (alias: null);
-          postRun = ''
-            systemctl reload nginx
-          '';
-        }
-      ) virtualHosts
+      let
+        vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts;
+        acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME) vhostsConfigs;
+        acmePairs = map (vhostConfig: { name = vhostConfig.serverName; value = {
+            user = cfg.user;
+            group = cfg.group;
+            webroot = vhostConfig.acmeRoot;
+            extraDomains = genAttrs vhostConfig.serverAliases (alias: null);
+            postRun = ''
+              systemctl reload nginx
+            '';
+          }; }) acmeEnabledVhosts;
+      in
+        listToAttrs acmePairs
     );
 
     users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index dcebbc9229f..c0ea645b3df 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -8,6 +8,15 @@
 with lib;
 {
   options = {
+    serverName = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        Name of this virtual host. Defaults to attribute name in virtualHosts.
+      '';
+      example = "example.org";
+    };
+
     serverAliases = mkOption {
       type = types.listOf types.str;
       default = [];

From 30c3fdedfefb2ad991f9dc827f282718e4180e3b Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 25 Jan 2017 14:49:54 +0100
Subject: [PATCH 670/727] mkpasswd: make the package high priority

Otherwise, if you have the `expect` package installed, its `mkpasswd`
program can override the one from the `mkpasswd` package. If that
happens, the NixOS documentation instructions for generating a hashed
password to put into `configuration.nix` will not work.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6c300a5b2b..3e1a5dec32c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2838,7 +2838,7 @@ with pkgs;
 
   mkcue = callPackage ../tools/cd-dvd/mkcue { };
 
-  mkpasswd = callPackage ../tools/security/mkpasswd { };
+  mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { });
 
   mkrand = callPackage ../tools/security/mkrand { };
 

From 5d5fb4a2fb1fc782f603837a53a0a831e81ad637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 25 Jan 2017 15:20:18 +0100
Subject: [PATCH 671/727] knot-resolver: init at 1.2.0

Celebrating today's release!
---
 pkgs/servers/dns/knot-resolver/default.nix | 69 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/servers/dns/knot-resolver/default.nix

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
new file mode 100644
index 00000000000..e9668ed3e53
--- /dev/null
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchurl, pkgconfig, utillinux, which, knot-dns, luajit, libuv, lmdb
+, cmocka, systemd, hiredis, libmemcached
+, gnutls, nettle
+, luajitPackages, makeWrapper # TODO: on master there's luajitPackages
+, fetchzip
+}:
+
+let
+  inherit (stdenv.lib) optional;
+in
+stdenv.mkDerivation rec {
+  name = "knot-resolver-${version}";
+  version = "1.2.0";
+
+  src = fetchurl {
+    url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
+    sha256 = "b8828197dbd563e4b502571538c6d44ef2bb07dede1df884b785921f8aec77fd";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  configurePhase = ":";
+
+  nativeBuildInputs = [ pkgconfig utillinux.bin/*hexdump*/ which ];
+  buildInputs = [ knot-dns luajit libuv gnutls ]
+    # TODO: lmdb needs lmdb.pc; embedded for now
+    ## optional dependencies
+    ++ optional doInstallCheck cmocka
+    ++ [
+      nettle # DNS cookies
+      systemd # socket activation
+      makeWrapper
+      hiredis libmemcached # additional cache backends
+      # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
+    ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+  CFLAGS = [ "-O2" "-DNDEBUG" ];
+
+  enableParallelBuilding = true;
+
+  doInstallCheck = true;
+  installCheckTarget = "check";
+  preInstallCheck = ''
+    export LD_LIBRARY_PATH="$out/lib"
+  '';
+
+  # optional: to allow auto-bootstrapping root trust anchor via https
+  postInstall = with luajitPackages; ''
+    wrapProgram "$out/sbin/kresd" \
+      --set LUA_PATH '${
+        stdenv.lib.concatStringsSep ";"
+          (map getLuaPath [ luasec luasocket ])
+        }' \
+      --set LUA_CPATH '${
+        stdenv.lib.concatStringsSep ";"
+          (map getLuaCPath [ luasec luasocket ])
+        }'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Caching DNS resolver, from .cz domain registry";
+    homepage = https://knot-resolver.cz;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.vcunat /* upstream developer */ ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e1a5dec32c..0fc8fbb9c62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10328,6 +10328,7 @@ with pkgs;
   jetty = callPackage ../servers/http/jetty { };
 
   knot-dns = callPackage ../servers/dns/knot-dns { };
+  knot-resolver = callPackage ../servers/dns/knot-resolver { };
 
   rdkafka = callPackage ../development/libraries/rdkafka { };
 

From c869fe022e9db78f779f687e4ac4d7ce5578f447 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 26 Dec 2016 14:42:48 -0800
Subject: [PATCH 672/727] top-level: no more need to expose `splicedPackages`

This was just done temporarily on the last cross-overhauling PR for
testing purposes.
---
 .../linux/make-bootstrap-tools-cross.nix      | 49 +++++++------
 pkgs/top-level/release-cross.nix              | 72 +++++++++----------
 pkgs/top-level/release-lib.nix                |  5 +-
 pkgs/top-level/splice.nix                     |  2 -
 4 files changed, 62 insertions(+), 66 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 38b3e611bc2..b5dfcb73a12 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -55,33 +55,32 @@ let
     if toolsArch == "armv6l" then raspberrypiCrossSystem else
     if toolsArch == "armv7l" then armv7l-hf-multiplatform-crossSystem else null;
 
-  pkgsUnspliced = pkgsFun ({inherit system;} // selectedCrossSystem);
-  pkgs = pkgsUnspliced.splicedPackages;
+  pkgs = pkgsFun ({inherit system;} // selectedCrossSystem);
 
-  inherit (pkgsUnspliced.buildPackages) stdenv nukeReferences cpio binutilsCross;
+  inherit (pkgs.buildPackages) stdenv nukeReferences cpio binutilsCross;
 
-  glibc = pkgs.libcCross.nativeDrv;
-  bash = pkgs.bash.crossDrv;
-  findutils = pkgs.findutils.crossDrv;
-  diffutils = pkgs.diffutils.crossDrv;
-  gnused = pkgs.gnused.crossDrv;
-  gnugrep = pkgs.gnugrep.crossDrv;
-  gawk = pkgs.gawk.crossDrv;
-  gzip = pkgs.gzip.crossDrv;
-  bzip2 = pkgs.bzip2.crossDrv;
-  gnumake = pkgs.gnumake.crossDrv;
-  patch = pkgs.patch.crossDrv;
-  patchelf = pkgs.patchelf.crossDrv;
-  gcc = pkgs.gcc.crossDrv.cc;
-  gmpxx = pkgs.gmpxx.crossDrv;
-  mpfr = pkgs.mpfr.crossDrv;
-  zlib = pkgs.zlib.crossDrv;
-  libmpc = pkgs.libmpc.crossDrv;
-  binutils = pkgs.binutils.crossDrv;
-  libelf = pkgs.libelf.crossDrv;
+  glibc = pkgs.buildPackages.libcCross;
+  bash = pkgs.bash;
+  findutils = pkgs.findutils;
+  diffutils = pkgs.diffutils;
+  gnused = pkgs.gnused;
+  gnugrep = pkgs.gnugrep;
+  gawk = pkgs.gawk;
+  gzip = pkgs.gzip;
+  bzip2 = pkgs.bzip2;
+  gnumake = pkgs.gnumake;
+  patch = pkgs.patch;
+  patchelf = pkgs.patchelf;
+  gcc = pkgs.gcc.cc;
+  gmpxx = pkgs.gmpxx;
+  mpfr = pkgs.mpfr;
+  zlib = pkgs.zlib;
+  libmpc = pkgs.libmpc;
+  binutils = pkgs.binutils;
+  libelf = pkgs.libelf;
 
   # Keep these versions in sync with the versions used in the current GCC!
-  isl = pkgs.isl_0_14.crossDrv;
+  isl = pkgs.isl_0_14;
 in
 
 rec {
@@ -116,7 +115,7 @@ rec {
 
     stdenv.mkDerivation {
       name = "stdenv-bootstrap-tools-cross";
-      crossConfig = pkgsUnspliced.hostPlatform.config;
+      crossConfig = pkgs.hostPlatform.config;
 
       buildInputs = [nukeReferences cpio binutilsCross];
 
@@ -174,7 +173,7 @@ rec {
         cp -d ${patch}/bin/* $out/bin
         cp ${patchelf}/bin/* $out/bin
 
-        cp -d ${gnugrep.pcre.crossDrv.out}/lib/libpcre*.so* $out/lib # needed by grep
+        cp -d ${gnugrep.pcre.out}/lib/libpcre*.so* $out/lib # needed by grep
 
         # Copy what we need of GCC.
         cp -d ${gcc.out}/bin/gcc $out/bin
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 48f183162cf..f9382985fcd 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -14,17 +14,17 @@ let
 
   /* Basic list of packages to cross-build */
   basicCrossDrv = {
-    gccCrossStageFinal = nativePlatforms;
-    bison.crossDrv = nativePlatforms;
-    busybox.crossDrv = nativePlatforms;
-    coreutils.crossDrv = nativePlatforms;
-    dropbear.crossDrv = nativePlatforms;
+    bison = nativePlatforms;
+    busybox = nativePlatforms;
+    coreutils = nativePlatforms;
+    dropbear = nativePlatforms;
   };
 
   /* Basic list of packages to be natively built,
      but need a crossSystem defined to get meaning */
   basicNativeDrv = {
-    gdbCross.nativeDrv = nativePlatforms;
+    buildPackages.gccCrossStageFinal = nativePlatforms;
+    buildPackages.gdbCross = nativePlatforms;
   };
 
   basic = basicCrossDrv // basicNativeDrv;
@@ -85,7 +85,7 @@ in
       openssl.system = "linux-generic32";
     };
   in mapTestOnCross crossSystem (basic // {
-    ubootSheevaplug.crossDrv = nativePlatforms;
+    ubootSheevaplug = nativePlatforms;
   });
 
 
@@ -98,14 +98,14 @@ in
       platform = {};
     };
   in mapTestOnCross crossSystem {
-    coreutils.crossDrv = nativePlatforms;
-    boehmgc.crossDrv = nativePlatforms;
-    gmp.crossDrv = nativePlatforms;
-    guile_1_8.crossDrv = nativePlatforms;
-    libffi.crossDrv = nativePlatforms;
-    libtool.crossDrv = nativePlatforms;
-    libunistring.crossDrv = nativePlatforms;
-    windows.wxMSW.crossDrv = nativePlatforms;
+    coreutils = nativePlatforms;
+    boehmgc = nativePlatforms;
+    gmp = nativePlatforms;
+    guile_1_8 = nativePlatforms;
+    libffi = nativePlatforms;
+    libtool = nativePlatforms;
+    libunistring = nativePlatforms;
+    windows.wxMSW = nativePlatforms;
   };
 
 
@@ -119,14 +119,14 @@ in
       platform = {};
     };
   in mapTestOnCross crossSystem {
-    coreutils.crossDrv = nativePlatforms;
-    boehmgc.crossDrv = nativePlatforms;
-    gmp.crossDrv = nativePlatforms;
-    guile_1_8.crossDrv = nativePlatforms;
-    libffi.crossDrv = nativePlatforms;
-    libtool.crossDrv = nativePlatforms;
-    libunistring.crossDrv = nativePlatforms;
-    windows.wxMSW.crossDrv = nativePlatforms;
+    coreutils = nativePlatforms;
+    boehmgc = nativePlatforms;
+    gmp = nativePlatforms;
+    guile_1_8 = nativePlatforms;
+    libffi = nativePlatforms;
+    libtool = nativePlatforms;
+    libunistring = nativePlatforms;
+    windows.wxMSW = nativePlatforms;
   };
 
 
@@ -156,9 +156,9 @@ in
       };
     };
   in mapTestOnCross crossSystem {
-    coreutils.crossDrv = nativePlatforms;
-    ed.crossDrv = nativePlatforms;
-    patch.crossDrv = nativePlatforms;
+    coreutils = nativePlatforms;
+    ed = nativePlatforms;
+    patch = nativePlatforms;
   };
 
 
@@ -182,16 +182,16 @@ in
       };
     };
   in mapTestOnCross crossSystem {
-    coreutils.crossDrv = nativePlatforms;
-    ed.crossDrv = nativePlatforms;
-    patch.crossDrv = nativePlatforms;
-    vim.crossDrv = nativePlatforms;
-    unzip.crossDrv = nativePlatforms;
-    ddrescue.crossDrv = nativePlatforms;
-    lynx.crossDrv = nativePlatforms;
-    patchelf.crossDrv = nativePlatforms;
-    binutils.crossDrv = nativePlatforms;
-    mpg123.crossDrv = nativePlatforms;
+    coreutils = nativePlatforms;
+    ed = nativePlatforms;
+    patch = nativePlatforms;
+    vim = nativePlatforms;
+    unzip = nativePlatforms;
+    ddrescue = nativePlatforms;
+    lynx = nativePlatforms;
+    patchelf = nativePlatforms;
+    buildPackages.binutils = nativePlatforms;
+    mpg123 = nativePlatforms;
   };
 
 
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 04a57ef8063..5fe87711c01 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -76,9 +76,8 @@ rec {
    * parameter for allPackages, defining the target platform for cross builds,
    * and triggering the build of the host derivation (cross built - crossDrv). */
   mapTestOnCross = crossSystem: mapAttrsRecursive
-    (path: systems: testOnCross crossSystem systems (pkgs: addMetaAttrs
-      { maintainers = crossMaintainers; }
-      (getAttrFromPath path pkgs.splicedPackages)));
+    (path: systems: testOnCross crossSystem systems
+      (pkgs: addMetaAttrs { maintainers = crossMaintainers; } (getAttrFromPath path pkgs)));
 
 
   /* Recursively map a (nested) set of derivations to an isomorphic
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index 7afbd956d5b..a22587d5b57 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -70,8 +70,6 @@ let
 in
 
 {
-  splicedPackages = splicedPackages // { recurseForDerivations = false; };
-
   # We use `callPackage' to be able to omit function arguments that can be
   # obtained `pkgs` or `buildPackages` and their `xorg` package sets. Use
   # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).

From ca7923f1117571cb13bd74b349156b963b4b7526 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 25 Jan 2017 16:13:04 +0100
Subject: [PATCH 673/727] nss: Provide a more stable URL for pkgconfig patch

Since 2bf0f84f1ff18057c5a2af0d35bc90c264b3e056, the patch isn't in our
repository anymore but being fetched from its origin.

However, the origin URL is always pointing to the latest master version
of Gentoo. This has the downside that whenever Gentoo changes the patch,
our build of NSS will be broken.

Also, I'm providing a comment here indicating what the patch does.

As to the reason *why* the patch is there, I vaguely remeber seeing a
few libraries/applications that depend on NSS relying that there's a
pkgconfig file.

After checking a few distros, they all seem to have it:

https://anonscm.debian.org/cgit/pkg-mozilla/nss.git/tree/debian?id=5306c4192d6bc0a2685842e9fd533196e7302297
https://apps.fedoraproject.org/packages/nss-devel/
https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/nss&id=3f7f54b357e23b7ac1cec849693334ad29be07d2

The issue is already reported upstream but hasn't been fixed yet:

https://bugzilla.mozilla.org/show_bug.cgi?id=530672

Tested by building nss on x86_64-linux (the hash didn't change anyway,
but just to be sure).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/nss/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index fc933235e96..8621d60ca96 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -23,9 +23,13 @@ in stdenv.mkDerivation rec {
   '';
 
   patches =
-    [ # FIXME: what is this patch for? Do we still need it?
+    [ # Install a nss.pc (pkgconfig) file and nss-config script
+      # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672
       (fetchurl {
-        url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.28-gentoo-fixups.patch";
+        name = "nss-3.28-gentoo-fixups.patch";
+        url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/"
+            + "dev-libs/nss/files/nss-3.28-gentoo-fixups.patch"
+            + "?id=05c31f8cca591b3ce8219e4def7c26c7b1b130d6";
         sha256 = "0z58axd1n7vq4kdp5mrb3dsg6di39a1g40s3shl6n2dzs14c1y2q";
       })
       # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch

From 0f6eab52e133f2e54723aed7d946efb6f25ca3ea Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@mgail.com>
Date: Wed, 25 Jan 2017 16:56:55 +0100
Subject: [PATCH 674/727] xcodeenv: make it work with Xcode 8.2.1

---
 pkgs/development/mobile/titaniumenv/build-app.nix      |  2 +-
 pkgs/development/mobile/titaniumenv/default.nix        |  2 +-
 .../mobile/titaniumenv/examples/default.nix            |  4 ++--
 .../examples/simulate-kitchensink/default.nix          |  2 +-
 pkgs/development/mobile/xcodeenv/build-app.nix         | 10 ++--------
 pkgs/development/mobile/xcodeenv/default.nix           |  2 +-
 pkgs/development/mobile/xcodeenv/simulate-app.nix      |  5 ++---
 pkgs/development/mobile/xcodeenv/xcodewrapper.nix      |  2 +-
 8 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index cafe329c076..3c56b3ecb8a 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -1,7 +1,7 @@
 {stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, xcodeBaseDir}:
 { name, src, target, androidPlatformVersions ? [ "23" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
 , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
-, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "9.2"
+, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "10.2"
 , enableWirelessDistribution ? false, installURL ? null
 }:
 
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index b3c48d55ab7..6ca4c441e64 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,4 +1,4 @@
-{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.0.2.GA"}:
+{pkgs, pkgs_i686, xcodeVersion ? "8.2.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.0.2.GA"}:
 
 rec {
   androidenv = pkgs.androidenv;
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index 612eb40d192..3c5d3a018ec 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -1,10 +1,10 @@
 { nixpkgs ? <nixpkgs>
 , systems ? [ "x86_64-linux" "x86_64-darwin" ]
-, xcodeVersion ? "7.2"
+, xcodeVersion ? "8.2.1"
 , xcodeBaseDir ? "/Applications/Xcode.app"
 , tiVersion ? "6.0.2.GA"
 , rename ? false
-, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2"
+, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "10.2"
 , enableWirelessDistribution ? false, installURL ? null
 }:
 
diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
index 15a86e338de..5bdd0fd63c5 100644
--- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
@@ -3,5 +3,5 @@
 xcodeenv.simulateApp {
   name = "simulate-${kitchensink.name}";
   inherit bundleId;
-  app = "${kitchensink}/build/iphone/build/Debug-iphonesimulator";
+  app = "${kitchensink}/build/iphone/build/Products/Debug-iphonesimulator";
 }
diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index b2e6f84bb00..7e46aefb299 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -1,12 +1,11 @@
 {stdenv, xcodewrapper}:
 { name
 , src
-, sdkVersion ? "6.1"
+, sdkVersion ? "10.2"
 , target ? null
 , configuration ? null
 , scheme ? null
 , sdk ? null
-, arch ? null
 , xcodeFlags ? ""
 , release ? false
 , codeSignIdentity ? null
@@ -35,11 +34,6 @@ let
       if release then "Release" else "Debug"
     else configuration;
     
-  _arch = if arch == null
-    then
-      if release then "armv7" else "x86_64"
-    else arch;
-
   _sdk = if sdk == null
     then
       if release then "iphoneos" + sdkVersion else "iphonesimulator" + sdkVersion
@@ -83,7 +77,7 @@ stdenv.mkDerivation {
       ''}
 
     # Do the building
-    xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO VALID_ARCHS="${_arch}" CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""}
+    xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""}
     
     ${stdenv.lib.optionalString release ''
       ${stdenv.lib.optionalString generateIPA ''
diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix
index d7e35142be4..afe430df383 100644
--- a/pkgs/development/mobile/xcodeenv/default.nix
+++ b/pkgs/development/mobile/xcodeenv/default.nix
@@ -1,4 +1,4 @@
-{stdenv, version ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app"}:
+{stdenv, version ? "8.2.1", xcodeBaseDir ? "/Applications/Xcode.app"}:
 
 rec {
   xcodewrapper = import ./xcodewrapper.nix {
diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix
index ecfdbe2a6e3..5f71b599408 100644
--- a/pkgs/development/mobile/xcodeenv/simulate-app.nix
+++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     
     # Copy the app and restore the write permissions
     appTmpDir=$(mktemp -d -t appTmpDir)
-    cp -r "$(echo ${app}/*.app)" $appTmpDir
+    cp -r "$(echo ${app}/*.app)" "$appTmpDir"
     chmod -R 755 "$(echo $appTmpDir/*.app)"
     
     # Wait for the simulator to start
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     read
     
     # Install the app
-    xcrun simctl install $udid "$(echo $appTmpDir/*.app)"
+    xcrun simctl install "$udid" "$(echo $appTmpDir/*.app)"
     
     # Remove the app tempdir
     rm -Rf $appTmpDir
@@ -45,4 +45,3 @@ stdenv.mkDerivation {
     chmod +x $out/bin/run-test-simulator
   '';
 }
-
diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
index 26b0197b2e1..38afe86c5aa 100644
--- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
+++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
@@ -8,8 +8,8 @@ stdenv.mkDerivation {
     ln -s /usr/bin/xcode-select
     ln -s /usr/bin/security
     ln -s /usr/bin/codesign
+    ln -s /usr/bin/xcrun
     ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"
-    ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcrun"
     ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator"
 
     cd ..

From b79fa22b7ab65089bf9a28e15b582b0480d3ee99 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Jan 2017 16:55:11 +0100
Subject: [PATCH 675/727] tests.installer: rely on swap.target in tests

fixes #5258
---
 nixos/tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 1df2c651f9b..35dd00fe630 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -115,8 +115,8 @@ let
 
       # Did the swap device get activated?
       # uncomment once https://bugs.freedesktop.org/show_bug.cgi?id=86930 is resolved
-      #$machine->waitForUnit("swap.target");
-      $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev");
+      $machine->waitForUnit("swap.target");
+      $machine->succeed("cat /proc/swaps | grep -q /dev");
 
       # Check whether the channel works.
       $machine->succeed("nix-env -iA nixos.procps >&2");

From b7ef0ed48714a3e19ffc6330227bf3feb83f068a Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Wed, 25 Jan 2017 15:54:47 +0530
Subject: [PATCH 676/727] riemann: 0.2.9 -> 0.2.12

---
 pkgs/servers/monitoring/riemann/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index 5d653474961..1549690a269 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "riemann-${version}";
-  version = "0.2.9";
+  version = "0.2.12";
 
   src = fetchurl {
-    url = "http://aphyr.com/riemann/${name}.tar.bz2";
-    sha256 = "10zz92sg9ak8g7xsfc05p4kic6hzwj7nqpkjgsd8f7f3slvfjqw3";
+    url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2";
+    sha256 = "1x57gi301rg6faxm4q5scq9dpp0v9nqiwjpsgigdb8whmjr1zwkr";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From 34eae3f73ae076bf17ae6091763891939b303596 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 25 Jan 2017 16:41:59 +0100
Subject: [PATCH 677/727] riemann: fix executable with wrapper script

---
 pkgs/servers/monitoring/riemann/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index 1549690a269..64585de51ff 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
   name = "riemann-${version}";
@@ -9,15 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "1x57gi301rg6faxm4q5scq9dpp0v9nqiwjpsgigdb8whmjr1zwkr";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   phases = [ "unpackPhase" "installPhase" ];
 
   installPhase = ''
-    sed -i 's#lib/riemann.jar#$out/share/java/riemann.jar#' bin/riemann
+    substituteInPlace bin/riemann --replace '$top/lib/riemann.jar' "$out/share/java/riemann.jar"
 
     mkdir -p $out/share/java $out/bin $out/etc
     mv lib/riemann.jar $out/share/java/
     mv bin/riemann $out/bin/
     mv etc/riemann.config $out/etc/
+
+    wrapProgram "$out/bin/riemann" --prefix PATH : "${jre}/bin"
   '';
 
   meta = with stdenv.lib; {

From cb30150bd5dd728e2cd9b9b2870cf6f3424d4261 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Jan 2017 18:00:48 +0100
Subject: [PATCH 678/727] php: fix build in case mysql is not mariadb

fixes #20986
---
 pkgs/development/interpreters/php/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index c261668edd2..b7777d55667 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -9,9 +9,10 @@ let
   generic =
     { version, sha256 }:
 
-    let php7 = lib.versionAtLeast version "7.0"; in
+    let php7 = lib.versionAtLeast version "7.0";
+        mysqlHeaders = mysql.lib.dev or mysql;
 
-    composableDerivation.composableDerivation {} (fixed: {
+    in composableDerivation.composableDerivation {} (fixed: {
 
       inherit version;
 
@@ -114,12 +115,12 @@ let
 
         mysql = {
           configureFlags = ["--with-mysql"];
-          buildInputs = [ mysql.lib.dev ];
+          buildInputs = [ mysqlHeaders ];
         };
 
         mysqli = {
-          configureFlags = ["--with-mysqli=${mysql.lib.dev}/bin/mysql_config"];
-          buildInputs = [ mysql.lib.dev ];
+          configureFlags = ["--with-mysqli=${mysqlHeaders}/bin/mysql_config"];
+          buildInputs = [ mysqlHeaders ];
         };
 
         mysqli_embedded = {
@@ -129,8 +130,8 @@ let
         };
 
         pdo_mysql = {
-          configureFlags = ["--with-pdo-mysql=${mysql.lib.dev}"];
-          buildInputs = [ mysql.lib.dev ];
+          configureFlags = ["--with-pdo-mysql=${mysqlHeaders}"];
+          buildInputs = [ mysqlHeaders ];
         };
 
         bcmath = {

From 278bbe3b33a91435036295a61fef49576a49c27f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 25 Jan 2017 18:41:52 +0100
Subject: [PATCH 679/727] add kresd service with basic options

Still celebrating today's 1.2.0 release!
---
 nixos/modules/misc/ids.nix                  |   2 +
 nixos/modules/module-list.nix               |   1 +
 nixos/modules/services/networking/kresd.nix | 119 ++++++++++++++++++++
 pkgs/servers/dns/knot-resolver/default.nix  |   5 +-
 4 files changed, 124 insertions(+), 3 deletions(-)
 create mode 100644 nixos/modules/services/networking/kresd.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index db8b66c9768..2005f2518ba 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -285,6 +285,7 @@
       couchpotato = 267;
       gogs = 268;
       pdns-recursor = 269;
+      kresd = 270;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -539,6 +540,7 @@
       glance = 266;
       couchpotato = 267;
       gogs = 268;
+      kresd = 270;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 888f6ff955f..9100f5b27a0 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -399,6 +399,7 @@
   ./services/networking/iodine.nix
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/kippo.nix
+  ./services/networking/kresd.nix
   ./services/networking/lambdabot.nix
   ./services/networking/libreswan.nix
   ./services/networking/logmein-hamachi.nix
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
new file mode 100644
index 00000000000..18e2ab9aebf
--- /dev/null
+++ b/nixos/modules/services/networking/kresd.nix
@@ -0,0 +1,119 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.kresd;
+  package = pkgs.knot-resolver;
+
+  configFile = pkgs.writeText "kresd.conf" cfg.extraConfig;
+in
+
+{
+  meta.maintainers = [ maintainers.vcunat /* upstream developer */ ];
+
+  ###### interface
+  options.services.kresd = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to enable knot-resolver domain name server.
+        DNSSEC validation is turned on by default.
+        You can run <literal>sudo nc -U /run/kresd/control</literal>
+        and give commands interactively to kresd.
+      '';
+    };
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Extra lines to be added verbatim to the generated configuration file.
+      '';
+    };
+    cacheDir = mkOption {
+      type = types.path;
+      default = "/var/cache/kresd";
+      description = ''
+        Directory for caches.  They are intended to survive reboots.
+      '';
+    };
+    interfaces = mkOption {
+      type = with types; listOf str;
+      default = [ "::1" "127.0.0.1" ];
+      description = ''
+        What addresses the server should listen on.
+      '';
+    };
+    # TODO: perhaps options for more common stuff like cache size or forwarding
+  };
+
+  ###### implementation
+  config = mkIf cfg.enable {
+    environment.etc."kresd.conf".source = configFile; # not required
+
+    users.extraUsers = singleton
+      { name = "kresd";
+        uid = config.ids.uids.kresd;
+        group = "kresd";
+        description = "Knot-resolver daemon user";
+      };
+    users.extraGroups = singleton
+      { name = "kresd";
+        gid = config.ids.gids.kresd;
+      };
+
+    systemd.sockets.kresd = rec {
+      wantedBy = [ "sockets.target" ];
+      before = wantedBy;
+      listenStreams = map
+        # Syntax depends on being IPv6 or IPv4.
+        (iface: if elem ":" (stringToCharacters iface) then "[${iface}]:53" else "${iface}:53")
+        cfg.interfaces;
+      socketConfig.ListenDatagram = listenStreams;
+    };
+
+    systemd.sockets.kresd-control = rec {
+      wantedBy = [ "sockets.target" ];
+      before = wantedBy;
+      partOf = [ "kresd.socket" ];
+      listenStreams = [ "/run/kresd/control" ];
+      socketConfig = {
+        FileDescriptorName = "control";
+        Service = "kresd.service";
+        SocketMode = "0660"; # only root user/group may connect
+      };
+    };
+
+    # Create the cacheDir; tmpfiles don't work on nixos-rebuild switch.
+    systemd.services.kresd-cachedir = {
+      serviceConfig.Type = "oneshot";
+      script = ''
+        if [ ! -d '${cfg.cacheDir}' ]; then
+          mkdir -p '${cfg.cacheDir}'
+          chown kresd:kresd '${cfg.cacheDir}'
+        fi
+      '';
+    };
+
+    systemd.services.kresd = {
+      description = "Knot-resolver daemon";
+
+      serviceConfig = {
+        User = "kresd";
+        Type = "notify";
+        WorkingDirectory = cfg.cacheDir;
+      };
+
+      script = ''
+        exec '${package}/bin/kresd' --config '${configFile}' \
+          -k '${cfg.cacheDir}/root.key'
+      '';
+
+      after = [ "kresd-cachedir.service" ];
+      requires = [ "kresd.socket" "kresd-cachedir.service" ];
+      wantedBy = [ "sockets.target" ];
+    };
+  };
+}
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index e9668ed3e53..493a4a17e4d 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchurl, pkgconfig, utillinux, which, knot-dns, luajit, libuv, lmdb
 , cmocka, systemd, hiredis, libmemcached
 , gnutls, nettle
-, luajitPackages, makeWrapper # TODO: on master there's luajitPackages
-, fetchzip
+, luajitPackages, makeWrapper
 }:
 
 let
@@ -59,7 +58,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Caching DNS resolver, from .cz domain registry";
+    description = "Caching validating DNS resolver, from .cz domain registry";
     homepage = https://knot-resolver.cz;
     license = licenses.gpl3Plus;
     platforms = platforms.unix;

From 2a939c4b21bd408f6fc07e23b2b98d6b73b0dec1 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Wed, 25 Jan 2017 13:38:52 +0100
Subject: [PATCH 680/727] streamlink: 0.0.2 -> 0.3.0

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

diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index f516c871f51..462d74c9672 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -1,14 +1,14 @@
 { stdenv, pythonPackages, fetchFromGitHub, rtmpdump }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.0.2";
+  version = "0.3.0";
   name = "streamlink-${version}";
 
   src = fetchFromGitHub {
     owner = "streamlink";
     repo = "streamlink";
     rev = "${version}";
-    sha256 = "156b3smivs8lja7a98g3qa74bawqhc4mi8w8f3dscampbxx4dr9y";
+    sha256 = "1bjih6y21vmjmsk3xvhgc1innymryklgylyvjrskqw610niai59j";
   };
 
   propagatedBuildInputs = (with pythonPackages; [ pycrypto requests2 ]) ++ [ rtmpdump ];

From 516760a6fb82ec856ca0eecc8fa637ebfd4852e9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 25 Jan 2017 19:11:42 +0100
Subject: [PATCH 681/727] nixos/acme: add random delay to timer

This way we behave like good citizens and won't overload Let's Encrypt
with lots of cert renewal requests at the same time.
---
 nixos/modules/security/acme.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 726e5471141..4e7c966a463 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -284,6 +284,8 @@ in
             OnCalendar = cfg.renewInterval;
             Unit = "acme-${cert}.service";
             Persistent = "yes";
+            AccuracySec = "5m";
+            RandomizedDelaySec = "1h";
           };
         })
       );

From 8fa49a6351028e3f2bb1fc508dd6abb37b38c679 Mon Sep 17 00:00:00 2001
From: Thomas Pham <thomas.pham@ithings.ch>
Date: Sat, 21 Jan 2017 11:53:31 +0100
Subject: [PATCH 682/727] postgis: 2.2.1 -> 2.3.1

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

diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index 1886038dff3..44a66409d45 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -5,7 +5,7 @@ args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, p
   ### NixOS - usage:
   ==================
 
-    services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }).v_2_2_1 ];
+    services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }).v_2_3_1 ];
 
 
   ### important Postgis implementation details:
@@ -84,9 +84,9 @@ let
 
 in rec {
 
-  v_2_2_1 = pgDerivationBaseNewer.merge ( fix : {
-    version = "2.2.1";
-    sha256 = "02gsi1cm63kf0r7881444lrkzdjqhhpz9a5zav3al0q24nq01r8g";
+  v_2_3_1 = pgDerivationBaseNewer.merge ( fix : {
+    version = "2.3.1";
+    sha256 = "0xd21h2k6x3i1b3z6pgm3pmkfpxm6irxd5wbx68acjndjgd6p3ac";
     sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"];
     builtInputs = [gdal json_c pkgconfig];
 

From 9371acd80f1dfc99b58eee83895e7121457d305c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= <anothersms@gmail.com>
Date: Mon, 12 Dec 2016 13:05:28 +0100
Subject: [PATCH 683/727] fcrackzip: init at 1.0

---
 pkgs/tools/security/fcrackzip/default.nix     |  26 +++++
 .../fcrackzip/fcrackzip_forkexec.patch        | 105 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 133 insertions(+)
 create mode 100644 pkgs/tools/security/fcrackzip/default.nix
 create mode 100644 pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch

diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/tools/security/fcrackzip/default.nix
new file mode 100644
index 00000000000..5d2e515c327
--- /dev/null
+++ b/pkgs/tools/security/fcrackzip/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "fcrackzip-${version}";
+  version = "1.0";
+  src = fetchurl {
+    url = "http://oldhome.schmorp.de/marc/data/${name}.tar.gz";
+    sha256 = "0l1qsk949vnz18k4vjf3ppq8p497966x4c7f2yx18x8pk35whn2a";
+  };
+
+  # 'fcrackzip --use-unzip' cannot deal with file names containing a single quote
+  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430387
+  patches = [ ./fcrackzip_forkexec.patch ];
+
+  # Do not clash with unizp/zipinfo
+  postInstall = "mv $out/bin/zipinfo $out/bin/fcrackzip-zipinfo";
+
+  meta = with stdenv.lib; {
+    description = "zip password cracker, similar to fzc, zipcrack and others";
+    homepage = http://oldhome.schmorp.de/marc/fcrackzip.html;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ nico202 ];
+    platforms = with platforms; unix;
+  };
+}
+
diff --git a/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch b/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch
new file mode 100644
index 00000000000..8e508ec1f59
--- /dev/null
+++ b/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch
@@ -0,0 +1,105 @@
+--- origin/main.c	2016-12-12 12:53:38.344285376 +0100
++++ main.c	2016-12-12 13:01:41.134548824 +0100
+@@ -26,11 +26,13 @@
+ #include <string.h>
+ 
+ #ifdef USE_UNIX_REDIRECTION
+-#define DEVNULL ">/dev/null 2>&1"
++#define DEVNULL "/dev/null"
+ #else
+-#define DEVNULL ">NUL 2>&1"
++#define DEVNULL "NUL"
+ #endif
+ 
++#include <errno.h>
++
+ #include "crack.h"
+ 
+ int use_unzip;
+@@ -47,21 +49,77 @@
+ int REGPARAM
+ check_unzip (const char *pw)
+ {
+-  char buff[1024];
+-  int status;
++pid_t cpid;
++cpid = fork ();
++if (cpid == -1)
++  {
++    perror ("fork");
++    exit (EXIT_FAILURE);
++  }
++
++if (cpid == 0)
++  {
++    // Redirect STDERR/STDOUT to /dev/null
++    int oldfd_stderr, oldfd_stdout;
++    oldfd_stdout = dup (fileno (stdout));
++    if (oldfd_stdout == -1)
++      {
++        perror ("dup for stdout");
++        _exit (127);
++      }
++    oldfd_stderr = dup (fileno (stderr));
++    if (oldfd_stderr == -1)
++      {
++        perror ("dup for stderr");
++        _exit (127);
++      }
++    if (freopen (DEVNULL, "w", stdout) == NULL)
++      {
++        perror ("freopen " DEVNULL " for stdout");
++        _exit (127);
++      }
++    if (freopen (DEVNULL, "w", stderr) == NULL)
++      {
++        perror ("freopen " DEVNULL " for stderr");
++        _exit (127);
++      }
++    execlp ("unzip", "unzip", "-qqtP", pw, file_path[0], NULL);
++
++    // When execlp failed.
++    // Restores the stderr/stdout redirection to print an error.
++    int errno_saved = errno;
++    dup2 (oldfd_stderr, fileno (stderr));
++    dup2 (oldfd_stdout, fileno (stdout));
++    close (oldfd_stderr);
++    close (oldfd_stdout);
++    errno = errno_saved;
++    perror ("execlp for unzip");
++    _exit (127); // Returns 127 on error as system(3) does
++  }
+ 
+-  sprintf (buff, "unzip -qqtP \"%s\" %s " DEVNULL, pw, file_path[0]);
+-  status = system (buff);
+-
+-#undef REDIR
++  int status;
+ 
+-  if (status == EXIT_SUCCESS)
++  if (waitpid (cpid, &status, 0) == -1)
+     {
+-      printf("\n\nPASSWORD FOUND!!!!: pw == %s\n", pw);
++    perror ("waitpid");
++    exit (EXIT_FAILURE);
++  }
++
++  // The child process does not terminated normally, OR returns the exit status 127.
++  if (!WIFEXITED (status)
++    || (WIFEXITED (status) && (WEXITSTATUS (status) == 127)))
++  {
++    fprintf (stderr, "Executing unzip failed.\n");
++    exit (EXIT_FAILURE);
++  }
++// unzip exited normally with the exit status 0 then...
++ if (WIFEXITED (status) && (WEXITSTATUS (status) == EXIT_SUCCESS))
++  {
++    printf ("\n\nPASSWORD FOUND!!!!: pw == %s\n", pw);
+       exit (EXIT_SUCCESS);
+     }
+ 
+-  return !status;
++  return 0;
+ }
+ 
+ /* misc. callbacks.  */
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0fc8fbb9c62..d3a55ceab2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1663,6 +1663,8 @@ with pkgs;
 
   fcppt = callPackage ../development/libraries/fcppt/default.nix { };
 
+  fcrackzip = callPackage ../tools/security/fcrackzip { };
+
   fcron = callPackage ../tools/system/fcron { };
 
   fdm = callPackage ../tools/networking/fdm {};

From 15c23d91a8c1eef8ead7b9ecb44d3b5552e8b786 Mon Sep 17 00:00:00 2001
From: Benrob0329 <ben@innovationplex.com>
Date: Wed, 25 Jan 2017 13:25:58 -0500
Subject: [PATCH 684/727] minetest 0.4.14 -> 0.4.15

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

diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 53227f2cc81..e28a83cc6a2 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -4,19 +4,19 @@
 }:
 
 let
-  version = "0.4.14";
+  version = "0.4.15";
   sources = {
     src = fetchFromGitHub {
       owner = "minetest";
       repo = "minetest";
       rev = "${version}";
-      sha256 = "1f74wsiqj8x1m8wqmxijb00df5ljlvy4ac0ahbh325vfzi0bjla3";
+      sha256 = "0bn4102d0hq774bn6hqhrs6qzl4sancrs4j15w4318bqdndk4676";
     };
     data = fetchFromGitHub {
       owner = "minetest";
       repo = "minetest_game";
       rev = "${version}";
-      sha256 = "1dc9zfbp603h2nlk39bw37kjbswrfmpd9yg3v72z1jb89pcxzsqs";
+      sha256 = "1mjj40slfiw0khg9nrq8yfmnay237z5jm1cg9hrsiq2fkjrr8w2m";
     };
   };
 in stdenv.mkDerivation {

From 0a4943a38144808a8989a40dc6e1bad5a62e1940 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 25 Jan 2017 21:57:51 +0800
Subject: [PATCH 685/727] syncthing: 0.14.19 -> 0.14.21

---
 pkgs/applications/networking/syncthing/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 16e3c61bcc1..59c0f6d92b0 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,20 +1,19 @@
 { stdenv, lib, fetchFromGitHub, go, pkgs }:
+
 let
   removeExpr = ref: ''
     sed -i "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \
   '';
 
-in
-
-stdenv.mkDerivation rec {
-  version = "0.14.19";
+in stdenv.mkDerivation rec {
+  version = "0.14.21";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "16wpw9ndx3x37mfnymp2fx9n2az9ibyr61zgq3mh2mszzzl7bkcg";
+    sha256 = "0gxv4r7zg2rxjj0q8iiq3p5s75kwshcy6drjv65k8p2778bbvcjl";
   };
 
   buildInputs = [ go ];

From 03ef04f0a40c1be907fd6f0a70891f8317c04d77 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Mon, 23 Jan 2017 22:15:59 +0100
Subject: [PATCH 686/727] install-device: permit root login with password

Allow password login to the installation this allows doing remote installation
via SSH. All that need to be done on the local machine is:
1. Boot from the installation media
2. Set a password with passwd
3. Enable SSH with systemctl start sshd

It is safe as root doesn't have a password by default
and SSH is disabled by default.

Fixes #20718
---
 nixos/modules/profiles/installation-device.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 91c718559ed..af3ef77e99c 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -46,7 +46,12 @@ with lib;
       '';
 
     # Allow sshd to be started manually through "start sshd".
-    services.openssh.enable = true;
+    services.openssh = {
+      enable = true;
+      # Allow password login to the installation, if the user sets a password via "passwd"
+      # It is safe as root doesn't have a password by default and SSH is disabled by default
+      permitRootLogin = "yes";
+    };
     systemd.services.sshd.wantedBy = mkOverride 50 [];
 
     # Enable wpa_supplicant, but don't start it by default.

From 01fd86723c95b4e86fc701b358d9a1f9269427d2 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Mon, 23 Jan 2017 22:25:28 +0100
Subject: [PATCH 687/727] install-device: correct command to start sshd

---
 nixos/modules/profiles/installation-device.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index af3ef77e99c..a24fa75e01d 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -45,7 +45,7 @@ with lib;
             "Type `systemctl start display-manager' to\nstart the graphical user interface."}
       '';
 
-    # Allow sshd to be started manually through "start sshd".
+    # Allow sshd to be started manually through "systemctl start sshd".
     services.openssh = {
       enable = true;
       # Allow password login to the installation, if the user sets a password via "passwd"

From a6968ad43c1b6ab7fc341ddba4ed0a082a24229b Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Mon, 23 Jan 2017 22:34:43 +0100
Subject: [PATCH 688/727] installing: document how to activate SSH during
 installation

---
 nixos/doc/manual/installation/installing.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 04a186a1bca..79d07ae7257 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -37,6 +37,11 @@
   first disable network-manager with
   <command>systemctl stop network-manager</command>.</para></listitem>
 
+  <listitem><para>If you would like to continue the installation from a different
+  machine you need to activate the SSH daemon via <literal>systemctl start sshd</literal>.
+  In order to be able to login you also need to set a password for
+  <literal>root</literal> using <literal>passwd<literal>.</para></listitem>
+
   <listitem><para>The NixOS installer doesn’t do any partitioning or
   formatting yet, so you need to do that yourself.  Use the following
   commands:

From 5f3db56048aa6ce459f76555e18ba1321d8cc992 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Wed, 25 Jan 2017 21:28:45 +0100
Subject: [PATCH 689/727] valadoc: 2016-10-09 -> 2016-11-11

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

diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix
index 7d4e61c8799..3fd92dfeba4 100644
--- a/pkgs/development/tools/valadoc/default.nix
+++ b/pkgs/development/tools/valadoc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchgit, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobjectIntrospection, expat}:
 stdenv.mkDerivation rec {
-  version = "2016-10-09";
+  version = "2016-11-11";
   name = "valadoc-unstable-${version}";
 
   src = fetchgit {
     url = "git://git.gnome.org/valadoc";
-    rev = "37756970379d1363453562e9f2af2c354d172fb4";
-    sha256 = "1s9sf6f0srh5sqqikswnb3bgwv5s1r9bd4n10hs2lzfmh7z227qb";
+    rev = "8080b626db9c16ac9a0a9802677b4f6ab0d36d4e";
+    sha256 = "1y00yls4wgxggzfagm3hcmzkpskfbs3m52pjgl71lg4p85kv6msv";
   };
 
   nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobjectIntrospection ];

From 4f8b4069e5dbfdb319fa394f0f3b3fa9aa10d673 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <skosyrev@ptsecurity.com>
Date: Tue, 24 Jan 2017 15:26:03 +0300
Subject: [PATCH 690/727] quodlibet:  rename to quodlibet,
 quodlibet-without-gst-plugins

The gst-plugin-less version is barely useful out of the box, so it is
the one that should be relegated to a less prominent spot in the namespace.
---
 pkgs/applications/audio/quodlibet/default.nix | 2 +-
 pkgs/top-level/all-packages.nix               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index dd3a0b4a1c6..0546f9a0ad2 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -12,7 +12,7 @@ let
   inherit (python2Packages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python;
 in buildPythonApplication {
   # call the package quodlibet and just quodlibet
-  name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}";
+  name = "quodlibet${stdenv.lib.optionalString (!withGstPlugins) "-without-gst-plugins"}-${version}";
 
   # XXX, tests fail
   doCheck = false;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3a55ceab2f..b0189355fdc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14728,9 +14728,9 @@ with pkgs;
 
   quiterss = qt5.callPackage ../applications/networking/newsreaders/quiterss {};
 
-  quodlibet = callPackage ../applications/audio/quodlibet { };
+  quodlibet-without-gst-plugins = callPackage ../applications/audio/quodlibet { };
 
-  quodlibet-with-gst-plugins = callPackage ../applications/audio/quodlibet {
+  quodlibet = callPackage ../applications/audio/quodlibet {
     withGstPlugins = true;
     gst_plugins_bad = null;
   };

From cde8e89a2e5e0ce5706bbd86df359938be083fa3 Mon Sep 17 00:00:00 2001
From: Shaun Sharples <shaun.sharples@gmail.com>
Date: Sun, 22 Jan 2017 12:07:02 +0200
Subject: [PATCH 691/727] factorio: 0.13.20 -> 0.14.21

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

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index fe01667f531..e071edfeb81 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless";
 
 with stdenv.lib;
 let
-  version = "0.13.20";
+  version = "0.14.21";
   isHeadless = releaseType == "headless";
 
   arch = if stdenv.system == "x86_64-linux" then {
@@ -27,12 +27,12 @@ let
     url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
     name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz";
     x64 = {
-      headless = fetchurl        { inherit name url; sha256 = "0nf1sxcgnbx52iwx7jgkjxass10lzz1iyskvgk0gq3ky9cg4ixfb"; };
-      alpha = authenticatedFetch { inherit      url; sha256 = "0rgjdxdcqf9m3ghzr076q3xi1g01ix14jldjwn6jgnvggzqkph9l"; };
+      headless = fetchurl        { inherit name url; sha256 = "0bx4fq46781vv9vr0ciyckaskksjrqikvcdv1yz0wj8mrb2j08cw"; };
+      alpha = authenticatedFetch { inherit      url; sha256 = "067p1i5wcxk88kmblyklc4lh8fqjc5pqjdarvhjz420vqmdls7k6"; };
     };
     i386 = {
       headless = abort "Factorio 32-bit headless binaries are not available for download.";
-      alpha = authenticatedFetch { inherit      url; sha256 = "0hda2z1q22xanl328kic5q09ck59mr3aa5cy4dbjv86s4dx9kxfq"; };
+      alpha = authenticatedFetch { inherit      url; sha256 = "0iwhachp0z02w19x5y70qy3b0yp79dspawkcygdfna5cfqrybvx6"; };
     };
   };
 

From 7f358917ee988afd45248563f6f74a6ef7b2a5fe Mon Sep 17 00:00:00 2001
From: Shaun Sharples <shaun.sharples@gmail.com>
Date: Sun, 22 Jan 2017 17:51:11 +0200
Subject: [PATCH 692/727] factorio: settings moved from command-line options to
 server-settings.json

---
 nixos/modules/services/games/factorio.nix | 86 ++++++++++++++++++++++-
 1 file changed, 84 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index 0369752997a..68ebcf35f6b 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -14,6 +14,31 @@ let
     read-data=${factorio}/share/factorio/data
     write-data=${stateDir}
   '';
+  serverSettings = {
+    name = cfg.game-name;
+    description = cfg.description;
+    visibility = {
+      public = cfg.public;
+      lan = cfg.lan;
+    };
+    username = cfg.username;
+    password = cfg.password;
+    token = cfg.token;
+    game_password = cfg.game-password;
+    require_user_verification = true;
+    max_upload_in_kilobytes_per_second = 0;
+    minimum_latency_in_ticks = 0;
+    ignore_player_limit_for_returning_players = false;
+    allow_commands = "admins-only";
+    autosave_interval = cfg.autosave-interval;
+    autosave_slots = 5;
+    afk_autokick_interval = 0;
+    auto_pause = true;
+    only_admins_can_pause_the_game = true;
+    autosave_only_on_server = true;
+    admins = [];
+  };
+  serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings));
   modDir = pkgs.factorio-mkModDirDrv cfg.mods;
 in
 {
@@ -67,12 +92,68 @@ in
           derivations via nixos-channel. Until then, this is for experts only.
         '';
       };
+      game-name = mkOption {
+        type = types.nullOr types.string;
+        default = "Factorio Game";
+        description = ''
+          Name of the game as it will appear in the game listing.
+        '';
+      };
+      description = mkOption {
+        type = types.nullOr types.string;
+        default = "";
+        description = ''
+          Description of the game that will appear in the listing.
+        '';
+      };
+      public = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Game will be published on the official Factorio matching server.
+        '';
+      };
+      lan = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Game will be broadcast on LAN.
+        '';
+      };
+      username = mkOption {
+        type = types.nullOr types.string;
+        default = null;
+        description = ''
+          Your factorio.com login credentials. Required for games with visibility public.
+        '';
+      };
+      password = mkOption {
+        type = types.nullOr types.string;
+        default = null;
+        description = ''
+          Your factorio.com login credentials. Required for games with visibility public.
+        '';
+      };
+      token = mkOption {
+        type = types.nullOr types.string;
+        default = null;
+        description = ''
+          Authentication token. May be used instead of 'password' above.
+        '';
+      };
+      game-password = mkOption {
+        type = types.nullOr types.string;
+        default = null;
+        description = ''
+          Game password.
+        '';
+      };
       autosave-interval = mkOption {
         type = types.nullOr types.int;
         default = null;
-        example = 2;
+        example = 10;
         description = ''
-          The time, in minutes, between autosaves.
+          Autosave interval in minutes.
         '';
       };
     };
@@ -120,6 +201,7 @@ in
           "--config=${cfg.configFile}"
           "--port=${toString cfg.port}"
           "--start-server=${mkSavePath cfg.saveName}"
+          "--server-settings=${serverSettingsFile}"
           (optionalString (cfg.mods != []) "--mod-directory=${modDir}")
           (optionalString (cfg.autosave-interval != null) "--autosave-interval ${toString cfg.autosave-interval}")
         ];

From 462ef7444292831a3a8715928878a03ea2079615 Mon Sep 17 00:00:00 2001
From: Shaun Sharples <shaun.sharples@gmail.com>
Date: Mon, 23 Jan 2017 19:47:54 +0200
Subject: [PATCH 693/727] factorio: remove autosave-interval from command-line
 options

---
 nixos/modules/services/games/factorio.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index 68ebcf35f6b..e7f070d0877 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -203,7 +203,6 @@ in
           "--start-server=${mkSavePath cfg.saveName}"
           "--server-settings=${serverSettingsFile}"
           (optionalString (cfg.mods != []) "--mod-directory=${modDir}")
-          (optionalString (cfg.autosave-interval != null) "--autosave-interval ${toString cfg.autosave-interval}")
         ];
       };
     };

From d01b9493c982c308d929211dcbcb4efea0207cf4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 25 Jan 2017 21:38:13 +0100
Subject: [PATCH 694/727] nixos/doc/installing: Fix typo in <literal/>

The tag wasn't properly closed which caused the manual build to fail.

Tested with: nix-build nixos/release.nix -A manual.x86_64-linux

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/doc/manual/installation/installing.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 79d07ae7257..8c37643c08f 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -40,7 +40,7 @@
   <listitem><para>If you would like to continue the installation from a different
   machine you need to activate the SSH daemon via <literal>systemctl start sshd</literal>.
   In order to be able to login you also need to set a password for
-  <literal>root</literal> using <literal>passwd<literal>.</para></listitem>
+  <literal>root</literal> using <literal>passwd</literal>.</para></listitem>
 
   <listitem><para>The NixOS installer doesn’t do any partitioning or
   formatting yet, so you need to do that yourself.  Use the following

From cedca371c826eb78afca9866eac1c03a0458fa1b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 25 Jan 2017 22:15:37 +0100
Subject: [PATCH 695/727] homebank: 5.1.2 -> 5.1.3

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

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 5f1c721e4c4..b4df8fdd460 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
 , hicolor_icon_theme, libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "homebank-5.1.2";
+  name = "homebank-5.1.3";
   src = fetchurl {
     url = "http://homebank.free.fr/public/${name}.tar.gz";
-    sha256 = "09zsq5l3s8cg4slhsyybsq8v1arnhh07i0rzka3j6ahysky15pfh";
+    sha256 = "0wzv2hkm30a1kqjldw02bzbh49bdmac041d6qybjzvkgwvrbmci2";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From ed83ec1b65f2923914e2fe97cc4f8214fc0e1d07 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 25 Jan 2017 21:30:46 +0000
Subject: [PATCH 696/727] lkl: fix impure reference to /usr/bin/env

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

diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index b1b3c3aebee..a307099783e 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
     sha256 = "0x1hdjsrj6hfk1sgfw11ihm00fmp6g158sr2q3cgjy2b6jnsr4hp";
   };
 
+  # Fix a /usr/bin/env reference in here that breaks sandboxed builds
+  prePatch = "patchShebangs arch/lkl/scripts";
+
   installPhase = ''
     mkdir -p $out/{bin,lib}
 

From f27fb8ab758aef15115f5651ee92fd9ebef7e8e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 25 Jan 2017 22:41:07 +0100
Subject: [PATCH 697/727] knot-{dns,resolver}: try to fix on darwin

Evaluation works now, at least.
---
 pkgs/servers/dns/knot-dns/default.nix      |  7 ++++---
 pkgs/servers/dns/knot-resolver/default.nix | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 9ecd6fe0b9d..07ba9cef82f 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -15,10 +15,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gnutls jansson liburcu lmdb libcap_ng libidn
-    systemd nettle libedit
+    gnutls jansson liburcu lmdb libidn
+    nettle libedit
     # without sphinx &al. for developer documentation
-  ];
+  ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 493a4a17e4d..3c84d0942e7 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, utillinux, which, knot-dns, luajit, libuv, lmdb
+{ stdenv, fetchurl, pkgconfig, utillinux, vimNox, which
+, knot-dns, luajit, libuv, lmdb
 , cmocka, systemd, hiredis, libmemcached
 , gnutls, nettle
 , luajitPackages, makeWrapper
@@ -20,15 +21,16 @@ stdenv.mkDerivation rec {
 
   configurePhase = ":";
 
-  nativeBuildInputs = [ pkgconfig utillinux.bin/*hexdump*/ which ];
+  nativeBuildInputs = [ pkgconfig which makeWrapper ]
+    ++ [(if stdenv.isLinux then utillinux.bin/*hexdump*/ else vimNox/*xxd*/)];
+
   buildInputs = [ knot-dns luajit libuv gnutls ]
     # TODO: lmdb needs lmdb.pc; embedded for now
     ## optional dependencies
     ++ optional doInstallCheck cmocka
+    ++ optional stdenv.isLinux systemd # socket activation
     ++ [
       nettle # DNS cookies
-      systemd # socket activation
-      makeWrapper
       hiredis libmemcached # additional cache backends
       # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
     ];

From 98e830efe2c7294850e89f0e2aef669c2f06a588 Mon Sep 17 00:00:00 2001
From: oleks <oleks@oleks.info>
Date: Wed, 25 Jan 2017 23:05:02 +0100
Subject: [PATCH 698/727] licenses: add EUPL v1.1 license

---
 lib/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index e5784ce2202..e45c0969649 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -191,6 +191,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     free = false;
   };
 
+  eupl11 = {
+    fullName = "EUPL v1.1";
+    url = https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11;
+  };
+
   fdl12 = spdx {
     spdxId = "GFDL-1.2";
     fullName = "GNU Free Documentation License v1.2";

From 15219fe15e6607b543b3ad80f3c3b0bb0f1c38b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 25 Jan 2017 23:31:25 +0100
Subject: [PATCH 699/727] licenses.eupl11: unify with the other licenses

... as it *is* present in the SPDX list.
---
 lib/licenses.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index e45c0969649..90c1cc177cb 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -191,9 +191,9 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     free = false;
   };
 
-  eupl11 = {
-    fullName = "EUPL v1.1";
-    url = https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11;
+  eupl11 = spdx {
+    spdxId = "EUPL-1.1";
+    fullname = "European Union Public License 1.1";
   };
 
   fdl12 = spdx {

From f1ba2c8d3bbe4f2421a6872d56d34b3bb2a4bf00 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 01:04:49 +0100
Subject: [PATCH 700/727] nginxMainline: 1.11.8 -> 1.11.9

---
 pkgs/servers/http/nginx/mainline.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 0e688b0c0c4..5d976a33488 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix (args // {
-  version = "1.11.8";
-  sha256 = "0d3bcrgj2ykky2yk06y0ihv6832s30mqzcfwq8a560brbmqz7bjk";
+  version = "1.11.9";
+  sha256 = "0j2pcara9ir2xj3m2mjzf7wz46mdy51c0kal61cp0ldm2qgvf8nw";
 })

From 1294909c2ae2389135228e5cab6522daefc734ab Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 25 Jan 2017 16:55:47 -0800
Subject: [PATCH 701/727] lens-family-th_0_4_1_0: Add to hackage-packages.nix
 for GHC 7.10

---
 .../development/haskell-modules/hackage-packages.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 5969f782ca9..276965d28d2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -114077,6 +114077,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-family-th_0_4_1_0" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "lens-family-th";
+       version = "0.4.1.0";
+       sha256 = "084yng26xyhw6c6hij3p70zvjpvm1dlw6klphw51car9gi6dqkvm";
+       libraryHaskellDepends = [ base template-haskell ];
+       homepage = "http://github.com/DanBurton/lens-family-th#readme";
+       description = "Generate lens-family style lenses";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lens-family-th" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {

From 5de731c8536d39ebc3638a6c210e4a040f568d07 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 26 Jan 2017 02:44:05 +0100
Subject: [PATCH 702/727] tests.bittorrent: use a file instead of a directory

nixUnstable.src is a directory, which made cp fail without -r
---
 nixos/tests/bittorrent.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 5aded554f4e..3a718a79831 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -11,7 +11,7 @@ import ./make-test.nix ({ pkgs, ... }:
 let
 
   # Some random file to serve.
-  file = pkgs.nixUnstable.src;
+  file = pkgs.hello.src;
 
   miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf"
     ''

From 8d342d20b5ea7df31b0a29fc5e3664868c81d832 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 25 Jan 2017 07:43:30 -0500
Subject: [PATCH 703/727] libnl: 3.2.28 -> 3.2.29 for CVE-2017-0386

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

diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index 481d134b461..22bae8a921b 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }:
 
-let version = "3.2.28"; in
+let version = "3.2.29"; in
 stdenv.mkDerivation {
   name = "libnl-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "02cm57z4h7rhjlxza07zhk02924acfz6m5gbmm5lbkkp6qh81328";
-    rev = "libnl3_2_28";
+    sha256 = "1078sbfgcb6ijal9af6lv26sy233wq14afyrc4bkdbnfl0zgsbwi";
+    rev = "libnl3_2_23";
     repo = "libnl";
     owner = "thom311";
   };

From 111b4e4c877cbbda08c16c548de3e644b0981df4 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 25 Jan 2017 08:26:17 -0500
Subject: [PATCH 704/727] mariadb: 10.1.19 -> 10.1.21 for multiple CVEs

---
 pkgs/servers/sql/mariadb/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index f50a97afd20..4f64afe3d92 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -15,11 +15,11 @@ mariadb = everything // {
 };
 
 common = rec { # attributes common to both builds
-  version = "10.1.19";
+  version = "10.1.21";
 
   src = fetchurl {
     url    = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz";
-    sha256 = "108s4mimdbmgmmn5pcr9a405j70cyny9adzv49s75lg22krp74sv";
+    sha256 = "144lcm5awcf0k6a7saqfr4p2kg8r5wbdhdm4cmn2m8hyg1an70as";
   };
 
   prePatch = ''
@@ -161,4 +161,3 @@ everything = stdenv.mkDerivation (common // {
 });
 
 in mariadb
-

From 5f3c62698bdde7c0b0b0200fe2abc17ca72bdd75 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 00:27:10 +0100
Subject: [PATCH 705/727] libav_0_8: 0.8.19 -> 0.8.20 for multiple CVEs

Fixes:

  * CVE-2016-9819
  * CVE-2016-9820
  * CVE-2016-9821
  * CVE-2016-9822
---
 pkgs/development/libraries/libav/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 7bf969b78da..6d81a284040 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -26,8 +26,8 @@ with { inherit (stdenv.lib) optional optionals hasPrefix; };
 
 let
   result = {
-    libav_0_8 = libavFun "0.8.19" "c79350d6fa071fcd66448ffc713fe3b9754876a8";
-    libav_11  = libavFun  "11.8"  "y18hmrzy7jqq7h9ys54nrr4s49mkzsfh";
+    libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f";
+    libav_11  = libavFun  "11.8"  "d0e93f6b229ae46c49d13ec183b13cfee70a51f0";
     libav_12  = libavFun "12"     "4ecde7274621c82a6882b7614d907b28de25cc4e";
   };
 

From 6a02d48c728ccd922a8ffef6fa7699da68eb0521 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 00:33:28 +0100
Subject: [PATCH 706/727] gd: 2.2.3 -> 2.2.4 for multiple CVEs

Fixes:

  * CVE-2016-9317
  * CVE-2016-6912
---
 pkgs/development/libraries/gd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix
index 724888b3b82..c87e344ae55 100644
--- a/pkgs/development/libraries/gd/default.nix
+++ b/pkgs/development/libraries/gd/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   name = "gd-${version}";
-  version = "2.2.3";
+  version = "2.2.4";
 
   src = fetchurl {
     url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz";
-    sha256 = "0g3xz8jpz1pl2zzmssglrpa9nxiaa7rmcmvgpbrjz8k9cyynqsvl";
+    sha256 = "1rp4v7n1dq38b92kl7gkvpvqqkw7nvdfnz6d5kip5klkxfki6zqk";
   };
 
   hardeningDisable = [ "format" ];

From 9ac6297b79b5004283a939ebdc451e8a8749af24 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 00:40:17 +0100
Subject: [PATCH 707/727] ppp: add patch to fix CVE-2015-3310

---
 pkgs/tools/networking/ppp/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index bc6b2b0e5de..90a4b988c3f 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
       # Without nonpriv.patch, pppd --version doesn't work when not run as
       # root.
       ./nonpriv.patch
+      (fetchurl {
+        name = "CVE-2015-3310.patch";
+        url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/rc_mksid-no-buffer-overflow?h=debian/2.4.7-1%2b4";
+        sha256 = "1dk00j7bg9nfgskw39fagnwv1xgsmyv0xnkd6n1v5gy0psw0lvqh";
+      })
     ];
 
   buildInputs = [ libpcap ];

From 1d251e268c045af58e9004ce492c712aee56895a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 01:25:28 +0100
Subject: [PATCH 708/727] chrony: 2.4.1 -> 3.0, enable seccomp

---
 pkgs/tools/networking/chrony/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index 1e2b48207f5..32a8ca5f99e 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -1,25 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr }:
+{ stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr
+, libseccomp }:
 
 assert stdenv.isLinux -> libcap != null;
 
 stdenv.mkDerivation rec {
   name = "chrony-${version}";
 
-  version = "2.4.1";
+  version = "3.0";
 
   src = fetchurl {
     url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
-    sha256 = "1q5nxl19fdppwpxancff5dc9crgma8f24zww7ag4bd15yq79xm8g";
+    sha256 = "0vfdsajz2w6b7c94rxrj7fsr234jryhl2rbdlmb7h10gla8pnf50";
   };
 
-  buildInputs = [ readline texinfo nss nspr ] ++ stdenv.lib.optional stdenv.isLinux libcap;
+  buildInputs = [ readline texinfo nss nspr ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp ];
   nativeBuildInputs = [ pkgconfig ];
 
   hardeningEnable = [ "pie" ];
 
-  configureFlags = [
-    "--chronyvardir=$(out)/var/lib/chrony"
-  ];
+  configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" ]
+    ++ stdenv.lib.optional stdenv.isLinux [ "--enable-scfilter" ];
 
   meta = with stdenv.lib; {
     description = "Sets your computer's clock from time servers on the Net";

From 8f39095abb152db538440e5113b2beab6058d2fc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 02:30:02 +0100
Subject: [PATCH 709/727] biosdevname: 0.6.1 -> 0.7.2

---
 pkgs/tools/networking/biosdevname/default.nix | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix
index 2b7d3a5dc7a..906e3eda3a6 100644
--- a/pkgs/tools/networking/biosdevname/default.nix
+++ b/pkgs/tools/networking/biosdevname/default.nix
@@ -1,20 +1,18 @@
-{ stdenv, fetchgit, autoreconfHook, zlib, pciutils }:
+{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pciutils }:
 
 stdenv.mkDerivation rec {
   name = "biosdevname-${version}";
-  version = "0.6.1";
+  version = "0.7.2";
 
-  src = fetchgit {
-    url = git://linux.dell.com/biosdevname.git;
-    rev = "refs/tags/v${version}";
-    sha256 = "059s3qyky9i497c9wnrjml15sknpsqbv01ww7q95bf9ybhdqqq8w";
+  src = fetchFromGitHub {
+    owner = "dell";
+    repo = "biosdevname";
+    rev = "v${version}";
+    sha256 = "183k6f9nayhai27y6nizf0sp9bj1kabykj66hcwdzllhrrh505sd";
   };
 
-  buildInputs = [
-    autoreconfHook
-    zlib
-    pciutils
-  ];
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ zlib pciutils ];
 
   # Don't install /lib/udev/rules.d/*-biosdevname.rules
   patches = [ ./makefile.patch ];

From f3e4307f3e55072d325662cd0be9b4e45dad936b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 02:37:01 +0100
Subject: [PATCH 710/727] bandwidth: fix unavailable source url

---
 pkgs/tools/misc/bandwidth/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index eb0a0d2b60b..05fbe9b5632 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
   version = "1.3.1";
 
   src = fetchurl {
-    url = "https://mutineer.org/file.php?id=284ebee21bde256fd0daeae91242c2b73d9cf1df&p=bandwidth";
-    name = "${name}.tar.gz";
+    url = "http://zsmith.co/archives/${name}.tar.gz";
     sha256 = "13a0mxrkybpwiynv4cj8wsy8zl5xir5xi1a03fzam5gw815dj4am";
   };
 

From d71fb25b08dc3fb3a961619b8d6f7e2897b24724 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 02:45:36 +0100
Subject: [PATCH 711/727] apktool: 1.5.2 -> 2.2.2

---
 pkgs/development/tools/apktool/default.nix | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index 9d97b0f9f31..4f87bcd1589 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -2,30 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "apktool-${version}";
-  version = "1.5.2";
+  version = "2.2.2";
 
   src = fetchurl {
-    url = "https://android-apktool.googlecode.com/files/apktool${version}.tar.bz2";
-    sha1 = "2dd828cf79467730c7406aa918f1da1bd21aaec8";
+    url = "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar";
+    sha256 = "1a94jw0ml08xdwls1q9v5p1zak5qrbw2zyychnm5vch8znyws411";
   };
 
-  unpackCmd = ''
-    tar -xvf $src || true
-    cd apktool*
-  '';
+  phases = [ "installPhase" ];
 
-  phases = [ "unpackPhase" "installPhase" ];
-
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   sourceRoot = ".";
 
   installPhase = ''
-    install -D apktool.jar "$out/libexec/apktool/apktool.jar"
+    install -D ${src} "$out/libexec/apktool/apktool.jar"
     mkdir -p "$out/bin"
     makeWrapper "${jre}/bin/java" "$out/bin/apktool" \
         --add-flags "-jar $out/libexec/apktool/apktool.jar" \
-        --prefix PATH : "${buildTools}/build-tools/android-4.3/"
+        --prefix PATH : "${buildTools}/build-tools/25.0.1/"
   '';
 
   meta = with stdenv.lib; {
@@ -33,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage    = https://code.google.com/p/android-apktool/;
     license     = licenses.asl20;
     maintainers = with maintainers; [ offline ];
-    platforms = with platforms; unix;
+    platforms   = with platforms; unix;
   };
 
 }

From ceea7adfbb6372d4f79efa4fc77e33faa601f165 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 02:45:50 +0100
Subject: [PATCH 712/727] aiccu: fix unavailable source url, use debian mirror

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

diff --git a/pkgs/tools/networking/aiccu/default.nix b/pkgs/tools/networking/aiccu/default.nix
index e1b3a420079..a821c6476f7 100644
--- a/pkgs/tools/networking/aiccu/default.nix
+++ b/pkgs/tools/networking/aiccu/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
   version = "20070115";
 
   src = fetchurl {
-    url = "https://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_20070115.tar.gz";
-    sha256 = "2260f426c13471169ccff8cb4a3908dc5f79fda18ddb6a55363e7824e6c4c760";
+    url = "http://http.debian.net/debian/pool/main/a/aiccu/aiccu_20070115.orig.tar.gz";
+    sha256 = "1k73vw7i25qzmnbvmsp3ci4pm6h8q70w70vnr512517s2q5gag6j";
   };
 
   buildInputs = [ gnutls iproute makeWrapper ];

From 6821a038b762947ecc407129c5d9627a2d223693 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:00:26 +0100
Subject: [PATCH 713/727] freeradius: 3.0.11 -> 3.0.12

---
 pkgs/servers/freeradius/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index cbafe16623e..117fa8782c9 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -2,9 +2,9 @@
 , openssl
 , linkOpenssl? true
 , openldap
-, withLdap ? false
+, withLdap ? true
 , sqlite
-, withSqlite ? false
+, withSqlite ? true
 , libpcap
 , withPcap ? true
 , libcap
@@ -40,9 +40,16 @@ assert withCollectd -> collectd != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "freeradius-${version}";
-  version = "3.0.11";
+  version = "3.0.12";
 
-  buildInputs = [ autoreconfHook openssl talloc finger_bsd perl ]
+  src = fetchurl {
+    url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz";
+    sha256 = "182xnb9pdsivlyfm471l90m37q9i04h7jadhkgm0ivvzrzpzcnja";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ openssl talloc finger_bsd perl ]
     ++ optional withLdap openldap
     ++ optional withSqlite sqlite
     ++ optional withPcap libpcap
@@ -54,8 +61,6 @@ stdenv.mkDerivation rec {
     ++ optional withYubikey libyubikey
     ++ optional withCollectd collectd;
 
-  # NOTE: are the --with-{lib}-lib-dir and --with-{lib}-include-dir necessary with buildInputs ?
-
   configureFlags = [
      "--sysconfdir=/etc"
      "--localstatedir=/var"
@@ -70,11 +75,6 @@ stdenv.mkDerivation rec {
     "localstatedir=\${TMPDIR}"
   ];
 
-  src = fetchurl {
-    url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz";
-    sha256 = "0naxw9b060rbp4409904j6nr2zwl6wbjrbq1839xrwhmaf8p4yxr";
-  };
-
   meta = with stdenv.lib; {
     homepage = http://freeradius.org/;
     description = "A modular, high performance free RADIUS suite";

From 243272cd2e934744f288ec5f20e71b77534ef697 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:03:21 +0100
Subject: [PATCH 714/727] forkstat: 0.01.14 -> 0.01.16

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

diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix
index a0478af912c..f8d0eab835b 100644
--- a/pkgs/os-specific/linux/forkstat/default.nix
+++ b/pkgs/os-specific/linux/forkstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "forkstat-${version}";
-  version = "0.01.14";
+  version = "0.01.16";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz";
-    sha256 = "0yj3mhf9b2nm8fnz4vf2fqdd8417g30p2sgv3ilq3zwy4hbg9bav";
+    sha256 = "0g65basrs569y42zhgjq9sdyz62km8xy55yfilmyxa43ckb3xmlw";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''

From 96c35ad06a856ac7343252140ec82a2e11b3b9f6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:05:29 +0100
Subject: [PATCH 715/727] fnotifystat: 0.01.14 -> 0.01.16

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

diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix
index 5708ed7c4df..35638e7dabd 100644
--- a/pkgs/os-specific/linux/fnotifystat/default.nix
+++ b/pkgs/os-specific/linux/fnotifystat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "fnotifystat-${version}";
-  version = "0.01.14";
+  version = "0.01.16";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz";
-    sha256 = "1cc3w94v8b4nfpkgr33gfzxpwaf43brqyc0fla9p70gk3hxjqzi5";
+    sha256 = "1k9nc7a4r7c2l7vrlcrfxj9rsdb04amiqcsnxm5kpshncry38nl5";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''

From 2a7707cf5c12b1cea2735f9dc844d7b49e17f6b1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:14:28 +0100
Subject: [PATCH 716/727] dpkg: 1.18.15 -> 1.18.18

---
 pkgs/tools/package-management/dpkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 103ef8d7776..0d7a5449d6e 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dpkg-${version}";
-  version = "1.18.15";
+  version = "1.18.18";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "0wd3rl1wi2d22jyavxg1ljzkymilg7p338y0c0ql0fcw7djkdsdf";
+    sha256 = "1xbgjdazcxb9iqrz6jcmy8qwgwggvf6rws2265sh01b6skin32y8";
   };
 
   configureFlags = [

From d14c7bf046bf233971fc5ebf4582077679974514 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:16:33 +0100
Subject: [PATCH 717/727] eventstat: 0.03.02 -> 0.03.03

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

diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix
index 49eab1fe254..de27d7b0d83 100644
--- a/pkgs/os-specific/linux/eventstat/default.nix
+++ b/pkgs/os-specific/linux/eventstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "eventstat-${version}";
-  version = "0.03.02";
+  version = "0.03.03";
   src = fetchzip {
     url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
-    sha256 = "1bwv0m9pk9l0jfibvsfjggc5pp9lyyrsfr10h6jm6kf1v6r6hf5s";
+    sha256 = "02pg46f3x7v1c1vvqzfjqq0wjb2bzmfkd6a8xp06cg9zvidn6jpb";
   };
   buildInputs = [ ncurses ];
   installFlags = [ "DESTDIR=$(out)" ];

From a8a5d3dcf8f3be7ba48810bf65b83714a1201e0b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:17:26 +0100
Subject: [PATCH 718/727] clipgrab: 3.6.1 -> 3.6.2

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

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 26128f44fa2..69f58fe94bd 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
-  version = "3.6.1";
+  version = "3.6.2";
 
   src = fetchurl {
-    sha256 = "1pmsnb9yfyadp8kzxldw09wmv2r0wmg9yza9ariqc27jz1j3kpsc";
+    sha256 = "0n7bhwkzknjpp54h54hxv1s8nsmmb7cwwf1aqpbcsnd7y6cv28nm";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "https://download.clipgrab.org/${name}.tar.gz";
   };

From 78fe722656d3fcc5b0015085b4d4c8b1eea490bc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:23:16 +0100
Subject: [PATCH 719/727] gmtk: remove, source not available anymore

---
 .../browsers/mozilla-plugins/gmtk/default.nix    | 16 ----------------
 pkgs/top-level/all-packages.nix                  |  4 ----
 2 files changed, 20 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
deleted file mode 100644
index 82a1c271225..00000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk2, GConf, alsaLib }:
-
-stdenv.mkDerivation rec {
-  name = "gmtk-1.0.9b";
-
-  src = fetchurl {
-    url = "http://gmtk.googlecode.com/files/${name}.tar.gz";
-    sha256 = "07y5hd94qhvlk9a9vhrpznqaml013j3rq52r3qxmrj74gg4yf4zc";
-  };
-
-  buildInputs = [ intltool pkgconfig gtk2 GConf alsaLib ];
-
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0189355fdc..0b6e38f15f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13542,10 +13542,6 @@ with pkgs;
 
   gmpc = callPackage ../applications/audio/gmpc {};
 
-  gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk {
-    inherit (gnome2) GConf;
-  };
-
   gnome-mpv = callPackage ../applications/video/gnome-mpv { };
 
   gollum = callPackage ../applications/misc/gollum { };

From b72b6a3160386c7ffa1d82e332adb2cba7450213 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:26:00 +0100
Subject: [PATCH 720/727] gentium: fix source url

---
 pkgs/data/fonts/gentium/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix
index 6addc779f35..9e4a88ab770 100644
--- a/pkgs/data/fonts/gentium/default.nix
+++ b/pkgs/data/fonts/gentium/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "5.000";
 
   src = fetchzip {
-    url = "http://software.sil.org/downloads/gentium/GentiumPlus-${version}.zip";
+    url = "http://software.sil.org/downloads/d/gentium/GentiumPlus-${version}.zip";
     sha256 = "0g9sx38wh7f0m16gr64g2xggjwak2q6jw9y4zhrvhmp4aq4xfqm6";
   };
 

From e2b14abbe09d37b7b4fd7b22ace280d14e71ac1c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:38:20 +0100
Subject: [PATCH 721/727] tcsh: 6.19.00 -> 6.20.00

---
 .../tcsh/avoid-gcc5-wrong-optimisation.patch  | 28 -------------------
 pkgs/shells/tcsh/default.nix                  | 18 ++++++------
 pkgs/shells/tcsh/tcsh.glibc-2.24.patch        | 21 --------------
 3 files changed, 8 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch
 delete mode 100644 pkgs/shells/tcsh/tcsh.glibc-2.24.patch

diff --git a/pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch b/pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch
deleted file mode 100644
index b35d29680af..00000000000
--- a/pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: christos <christos>
-Date: Thu, 28 May 2015 11:47:03 +0000
-Subject: [PATCH] avoid gcc-5 optimization malloc + memset = calloc (Fridolin
-Pokorny)
-
----
-tc.alloc.c | 5 ++++-
-1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tc.alloc.c b/tc.alloc.c
-index b9aec63..c1cb330 100644
---- a/tc.alloc.c
-+++ b/tc.alloc.c
-@@ -348,10 +348,13 @@ calloc(size_t i, size_t j)
- {
- #ifndef lint
-     char *cp;
-+    volatile size_t k;
- 
-     i *= j;
-     cp = xmalloc(i);
--    memset(cp, 0, i);
-+    /* Stop gcc 5.x from optimizing malloc+memset = calloc */
-+    k = i;
-+    memset(cp, 0, k);
- 
-     return ((memalign_t) cp);
- #else
diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix
index 02702510014..da76e2c3027 100644
--- a/pkgs/shells/tcsh/default.nix
+++ b/pkgs/shells/tcsh/default.nix
@@ -3,19 +3,17 @@
 
 stdenv.mkDerivation rec {
   name = "tcsh-${version}";
-  version = "6.19.00";
-  
+  version = "6.20.00";
+
   src = fetchurl {
-    urls = [ 
-             "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${name}.tar.gz" 
-             "ftp://ftp.astron.com/pub/tcsh/${name}.tar.gz" 
-             "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz"
-             ];
-    sha256 = "0jaw51382pqyb6d1kgfg8ir0wd3p5qr2bmg8svcmjhlyp3h73qhj";
+    urls = [
+      "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${name}.tar.gz"
+      "ftp://ftp.astron.com/pub/tcsh/${name}.tar.gz"
+      "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz"
+    ];
+    sha256 = "17ggxkkn5skl0v1x0j6hbv5l0sgnidfzwv16992sqkdm983fg7dq";
   };
 
-  patches = [ ./avoid-gcc5-wrong-optimisation.patch ./tcsh.glibc-2.24.patch ];
-  
   buildInputs = [ ncurses ];
 
   meta = with stdenv.lib;{
diff --git a/pkgs/shells/tcsh/tcsh.glibc-2.24.patch b/pkgs/shells/tcsh/tcsh.glibc-2.24.patch
deleted file mode 100644
index 267d89c8f1b..00000000000
--- a/pkgs/shells/tcsh/tcsh.glibc-2.24.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Proposed patch from Debian bug tracker by Aurelien Jarno <aurel32@debian.org>
-
-diff --git a/sh.proc.c b/sh.proc.c
-index ad07250..5c68409 100644
---- a/sh.proc.c
-+++ b/sh.proc.c
-@@ -47,11 +47,11 @@ RCSID("$tcsh$")
- # define HZ 16
- #endif /* aiws */
- 
--#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
--# if !defined(__ANDROID__)
-+#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GLIBC__)
-+# if !defined(__ANDROID__) && !defined(__GLIBC__)
- #  define BSDWAIT
- # endif
--#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */
-+#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || gnu-linux */
- #ifndef WTERMSIG
- # define WTERMSIG(w)	(((union wait *) &(w))->w_termsig)
- # ifndef BSDWAIT

From e02b96590d4d439379a9467d93719b8f0db45e0c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:44:50 +0100
Subject: [PATCH 722/727] xchainkeys: fix source and homepage url

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

diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix
index 3d228fedfb7..238b8c7b2b2 100644
--- a/pkgs/tools/X11/xchainkeys/default.nix
+++ b/pkgs/tools/X11/xchainkeys/default.nix
@@ -4,14 +4,14 @@ stdenv.mkDerivation rec {
   name = "xchainkeys-0.11";
 
   src = fetchurl {
-    url = "https://xchainkeys.googlecode.com/files/${name}.tar.gz";
+    url = "http://henning-bekel.de/download/xchainkeys/${name}.tar.gz";
     sha256 = "1rpqs7h5krral08vqxwb0imy33z17v5llvrg5hy8hkl2ap7ya0mn";
   };
 
   buildInputs = [ libX11 ];
 
   meta = {
-    homepage = "https://code.google.com/p/xchainkeys/";
+    homepage = "http://henning-bekel.de/xchainkeys/";
     description = "A standalone X11 program to create chained key bindings";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;

From 6a24c6dc32346e4438e282067b39f0717c683a6d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:48:08 +0100
Subject: [PATCH 723/727] stunnel: 5.38 -> 5.39

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

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index e9c82a798ed..cf930769b86 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.38";
+  version = "5.39";
 
   src = fetchurl {
     url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "1mag0gd52f5q1jj3ds1pcn3s09si63cbxmri3zyv2fk8l6ds5b89";
+    sha256 = "1vjdn32iw11zqsygwxbjmqgs4644dk3ql1h8ap890ls6a1x0i318";
   };
 
   buildInputs = [ openssl ];

From f4833ed4849e6f1f3e5ef132410fd6f690ba6da4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:48:56 +0100
Subject: [PATCH 724/727] smemstat: 0.01.14 -> 0.01.16

---
 pkgs/os-specific/linux/smemstat/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix
index a38c819bc6f..9a244c6ed8f 100644
--- a/pkgs/os-specific/linux/smemstat/default.nix
+++ b/pkgs/os-specific/linux/smemstat/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, lib, fetchurl }:
+{ stdenv, lib, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "smemstat-${version}";
-  version = "0.01.14";
+  version = "0.01.16";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz";
-    sha256 = "0qkpbg0n40d8m9jzf3ylpdp65zzs344zbjn8khha4plbwg00ijrw";
+    sha256 = "14n3s6ibm9bq58drvpiasqn11ci6mrwswfpcbpbsimx6fh2j4bi3";
   };
+  buildInputs = [ ncurses ];
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''
     mv $out/usr/* $out

From 4276844cb0c6f1516f958bfe7096bd0d908d649e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 26 Jan 2017 03:52:03 +0100
Subject: [PATCH 725/727] powerstat: 0.2.10 -> 0.2.11

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

diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix
index 9604a67ddd9..69abdbec5d2 100644
--- a/pkgs/os-specific/linux/powerstat/default.nix
+++ b/pkgs/os-specific/linux/powerstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "powerstat-${version}";
-  version = "0.02.10";
+  version = "0.02.11";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz";
-    sha256 = "11n2k20h27j7m8j0l524w23xlkjhapsb3ml1qpx1si7gf0pkglcl";
+    sha256 = "0iid3b3284sf89pfp68i1k5mwmr31bqjzasb8clm2sa45ivafx52";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''

From 076e2651641d9ae706c581e7c8755b1c5c8d7962 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 26 Jan 2017 09:29:54 +0100
Subject: [PATCH 726/727] squid4: init at 4.0.17

---
 pkgs/servers/squid/4.nix        | 36 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/squid/4.nix

diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix
new file mode 100644
index 00000000000..52fcad7ff95
--- /dev/null
+++ b/pkgs/servers/squid/4.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
+, expat, libxml2, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "squid-4.0.17";
+
+  src = fetchurl {
+    url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
+    sha256 = "1713fqw59r3d892p5hpbkhmfcaw6jzfnngfn5f4h46sx963k87wb";
+  };
+
+  buildInputs = [
+    perl openldap pam db cyrus_sasl libcap expat libxml2 openssl
+  ];
+
+  configureFlags = [
+    "--enable-ipv6"
+    "--disable-strict-error-checking"
+    "--disable-arch-native"
+    "--with-openssl"
+    "--enable-ssl-crtd"
+    "--enable-linux-netfilter"
+    "--enable-storeio=ufs,aufs,diskd,rock"
+    "--enable-removal-policies=lru,heap"
+    "--enable-delay-pools"
+    "--enable-x-accelerator-vary"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
+    homepage = "http://www.squid-cache.org";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fpletz raskin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b6e38f15f3..01bfb68b5ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10704,6 +10704,7 @@ with pkgs;
   spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };
 
   squid = callPackage ../servers/squid { };
+  squid4 = callPackage ../servers/squid/4.nix { };
 
   sslh = callPackage ../servers/sslh { };
 

From 142696de884213e01cc518af813a20d2e2ece3cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 26 Jan 2017 09:25:23 +0100
Subject: [PATCH 727/727] liburcu: platforms: linux -> unix

There's probably no reason to restrict it to Linux.
I can't test directly, but Hombrew does have the package.
My intention is to build knot-resolver for Darwin as well.
---
 pkgs/development/libraries/liburcu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
index 29765f07066..b31ced11c6c 100644
--- a/pkgs/development/libraries/liburcu/default.nix
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     description = "Userspace RCU (read-copy-update) library";
     homepage = http://lttng.org/urcu;
     license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };