From 67337972484fbf4cc9870a8376837b4c46e23f89 Mon Sep 17 00:00:00 2001
From: Florian <fmu@users.noreply.github.com>
Date: Fri, 29 Jul 2016 12:55:35 +0200
Subject: [PATCH 0001/1310] ndjbdns: build from latest sources which adds
 Darwin compatibility

---
 pkgs/tools/networking/ndjbdns/default.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix
index 256f50e5c54..3269f92d7f4 100644
--- a/pkgs/tools/networking/ndjbdns/default.nix
+++ b/pkgs/tools/networking/ndjbdns/default.nix
@@ -1,17 +1,22 @@
-{ stdenv, fetchurl, systemd, pkgconfig }:
+{ stdenv, fetchFromGitHub, autoreconfHook, systemd, pkgconfig }:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "1.06";
   name = "ndjbdns-${version}";
 
-  src = fetchurl {
-    url = "http://pjp.dgplug.org/ndjbdns/${name}.tar.gz";
-    sha256 = "09qi5a9abqm08iqmxj74fzzq9x1w5lzr1jlbzj2hl8hz0g2sgraw";
+  src = fetchFromGitHub {
+    owner = "pjps";
+    repo = "ndjbdns";
+    rev = "64d371b6f887621de7bf8bd495be10442b2accd0";
+    sha256 = "0gjyvn8r66kp49gasd6sqfvg2pj0c6v67hnq7cqwl04kj69rfy86";
   };
 
-  buildInputs = [ pkgconfig systemd ];
+  buildInputs = [ autoreconfHook pkgconfig ]
+    ++ optional stdenv.isLinux systemd;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "A brand new release of the Djbdns";
     longDescription = ''
       Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein.
@@ -19,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = http://pjp.dgplug.org/ndjbdns/;
     license = licenses.gpl2;
     maintainers = [ maintainers.msackman ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 
 }

From e2bb0c5da85bf66648103395fe926a9c8f274840 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Thu, 20 Oct 2016 10:19:57 +0200
Subject: [PATCH 0002/1310] js_of_ocaml: propagate dependency on ppx_deriving

ppx_deriving is needed by js_of_ocaml even when it is not used in the code to be compiled
by js_of_ocaml
---
 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 b19f078d9a2..33a7fe52c39 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -8,9 +8,9 @@ stdenv.mkDerivation {
     sha256 = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj";
     };
 
-  buildInputs = [ ocaml findlib menhir ocsigen_deriving ppx_deriving
+  buildInputs = [ ocaml findlib menhir ocsigen_deriving
                  cmdliner tyxml reactivedata cppo which base64];
-  propagatedBuildInputs = [ ocaml_lwt camlp4 ];
+  propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ];
 
   patches = [ ./Makefile.conf.diff ];
 

From 51e0173c284aecc857fd81533df36e541ae66f08 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 22 Oct 2016 11:03:56 +0200
Subject: [PATCH 0003/1310] ocamlPackages.ocaml_pcre: change name from
 ocaml-ocaml-pcre to ocaml-pcre

The old name was confusing some dependencies when searching for dllpcrestubs.so
---
 pkgs/development/ocaml-modules/pcre/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index dd152262ca7..d2e0e0aa727 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -1,7 +1,7 @@
 {stdenv, buildOcaml, fetchurl, pcre, ocaml, findlib}:
 
 buildOcaml {
-  name = "ocaml-pcre";
+  name = "pcre";
   version = "7.1.1";
 
   src = fetchurl {

From a52c1b484017d57ec1a7a9bb3a7add8bcabc11a1 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 22 Oct 2016 11:05:39 +0200
Subject: [PATCH 0004/1310] pgocaml: 2.2 -> 2.3

Changes the build system from mkDerivation to buildOcaml
---
 .../ocaml-modules/pgocaml/default.nix          | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix
index 6b9ae97ad54..a8b3ed15862 100644
--- a/pkgs/development/ocaml-modules/pgocaml/default.nix
+++ b/pkgs/development/ocaml-modules/pgocaml/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, calendar, csv, ocaml_pcre }:
+{ stdenv, fetchurl, buildOcaml, calendar, csv, re }:
 
-stdenv.mkDerivation {
-  name = "ocaml-pgocaml-2.2";
+buildOcaml {
+  name = "pgocaml";
+  version = "2.3";
   src = fetchurl {
-    url = http://forge.ocamlcore.org/frs/download.php/1506/pgocaml-2.2.tgz;
-    sha256 = "0x0dhlz2rqxpwfdqi384f9fn0ng2irifadmxfm2b4gcz7y1cl9rh";
+    url = https://github.com/darioteixeira/pgocaml/archive/v2.3.tar.gz;
+    sha256 = "18lymxlvcf4nwxawkidq3pilsp5rhl0l8ifq6pjk3ssjlx9w53pg";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild camlp4 ];
-  propagatedBuildInputs = [ calendar csv ocaml_pcre ];
+  buildInputs = [ ];
+  propagatedBuildInputs = [ calendar csv re ];
+
+  configureFlags = [ "--enable-p4" ];
 
   createFindlibDestdir = true;
 
@@ -16,7 +19,6 @@ stdenv.mkDerivation {
     description = "An interface to PostgreSQL databases for OCaml applications";
     homepage = http://pgocaml.forge.ocamlcore.org/;
     license = licenses.lgpl2;
-    platforms = ocaml.meta.platforms or [];
     maintainers = with maintainers; [ vbgl ];
   };
 }

From ac69382453c61a17ec0669e449dac33d7e13c3a6 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 22 Oct 2016 11:08:27 +0200
Subject: [PATCH 0005/1310] eliom: modernize derivation

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

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 219f104271d..293faad2301 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,15 +1,10 @@
-{ stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving,
+{ buildOcaml, 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, camlp4}:
+  reactivedata, opam, ppx_tools, ppx_deriving, camlp4}:
 
-let ocamlVersion = (stdenv.lib.getVersion ocaml);
-  in
-
-(
-assert stdenv.lib.versionAtLeast ocamlVersion "4";
-
-stdenv.mkDerivation rec
+let ocamlVersion = (stdenv.lib.getVersion ocaml); in
+buildOcaml rec
 {
   pname = "eliom";
   version = "5.0.0";
@@ -22,12 +17,11 @@ stdenv.mkDerivation rec
 
   patches = [ ./camlp4.patch ];
 
-  buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving
-                 js_of_ocaml ocaml_optcomp opam ppx_tools camlp4 ];
+  buildInputs = [ which ocaml_optcomp opam ppx_tools camlp4 ];
 
-  propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr
-                            calendar cryptokit ocamlnet ocaml_react ocaml_ssl
-                            ocaml_pcre ];
+  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
@@ -57,8 +51,6 @@ stdenv.mkDerivation rec
 
     license = stdenv.lib.licenses.lgpl21;
 
-    platforms = ocaml.meta.platforms or [];
-
     maintainers = [ stdenv.lib.maintainers.gal_bolle ];
   };
-})
+}

From 1c8cb703a6934ac37bbc8d08cc9e8a6ff792076c Mon Sep 17 00:00:00 2001
From: Andrew Scott <andj.scott@gmail.com>
Date: Tue, 25 Oct 2016 12:58:49 +0100
Subject: [PATCH 0006/1310] mlocate: init at version 0.26

---
 nixos/modules/misc/locate.nix       | 11 ++++++++++-
 pkgs/tools/misc/mlocate/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/misc/mlocate/default.nix

diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 27a0fa6cf3d..3cb5bb1a351 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -15,6 +15,15 @@ in {
       '';
     };
 
+    locate = mkOption {
+      type = types.package;
+      default = pkgs.findutils;
+      example = "pkgs.mlocate";
+      description = ''
+        The locate implementation to use
+      '';
+    };
+
     interval = mkOption {
       type = types.str;
       default = "02:15";
@@ -77,7 +86,7 @@ in {
         script =
           ''
             mkdir -m 0755 -p $(dirname ${toString cfg.output})
-            exec updatedb \
+            exec ${cfg.locate}/bin/updatedb \
               --localuser=${cfg.localuser} \
               ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \
               --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix
new file mode 100644
index 00000000000..6dbd0bcc439
--- /dev/null
+++ b/pkgs/tools/misc/mlocate/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "mlocate-${version}";
+  version = "0.26";
+
+  src = fetchurl {
+    url = "http://fedorahosted.org/releases/m/l/mlocate/${name}.tar.xz";
+    sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh";
+  };
+
+  buildInputs = [ ];
+
+  meta = with stdenv.lib; {
+    description = "Merging locate is an utility to index and quickly search for files";
+    homepage = https://fedorahosted.org/mlocate/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 146e13c21e3..dbf9ef071b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13881,6 +13881,8 @@ in
 
   diffpdf = callPackage ../applications/misc/diffpdf { };
 
+  mlocate = callPackage ../tools/misc/mlocate { };
+
   mypaint = callPackage ../applications/graphics/mypaint { };
 
   mythtv = callPackage ../applications/video/mythtv { };

From 10728c25b0fe4b91ac25d4b40c2de84ab6a944c2 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 28 Oct 2016 00:59:56 +0200
Subject: [PATCH 0007/1310] replaceDependency: fix syntax error

---
 pkgs/build-support/replace-dependency.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix
index b0174ca24ab..15ab50bf397 100644
--- a/pkgs/build-support/replace-dependency.nix
+++ b/pkgs/build-support/replace-dependency.nix
@@ -22,7 +22,7 @@
 with lib;
 
 let
-  warn = if verbose then builtins.trace else (x:y:y);
+  warn = if verbose then builtins.trace else (x: y: y);
   references = import (runCommand "references.nix" { exportReferencesGraph = [ "graph" drv ]; } ''
     (echo {
     while read path

From 33d778a1ca60f956f25b83ba85a01ac4048fdab5 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@users.noreply.github.com>
Date: Mon, 31 Oct 2016 12:06:32 -0800
Subject: [PATCH 0008/1310] qsyncthingtray: init at 0.5.5rc2

---
 .../misc/qsyncthingtray/default.nix           | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/applications/misc/qsyncthingtray/default.nix

diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
new file mode 100644
index 00000000000..96d2aa0c85b
--- /dev/null
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub
+, qtbase, qtwebengine
+, qmakeHook }:
+
+stdenv.mkDerivation rec {
+  version = "0.5.5rc2";
+  name = "qsyncthingtray-${version}";
+
+  src = fetchFromGitHub {
+    owner = "sieren";
+    repo = "QSyncthingTray";
+    rev = "${version}";
+    sha256 = "1x7j7ylgm4ih06m7gb5ls3c9bdjwbra675489caq2f04kgw4yxq2";
+  };
+
+  buildInputs = [ qtbase qtwebengine ];
+  nativeBuildInputs = [ qmakeHook ];
+  enableParallelBuilding = true;
+  
+  postInstall = ''
+    mkdir -p $out/bin
+    cp binary/QSyncthingTray $out/bin
+    cat > $out/bin/qt.conf <<EOF
+    [Paths]
+    Prefix = ${qtwebengine.out}
+    EOF
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/sieren/QSyncthingTray/;
+    description = "A Traybar Application for Syncthing written in C++";
+    longDescription = ''
+        A cross-platform status bar for Syncthing.
+        Currently supports OS X, Windows and Linux.
+        Written in C++ with Qt.
+    '';
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ zraexy ];
+    platforms = platforms.all;
+  };
+}

From 9b0cec5eb29e7232d05f8556387a3de33d7861c0 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@users.noreply.github.com>
Date: Mon, 31 Oct 2016 12:14:16 -0800
Subject: [PATCH 0009/1310] qsyncthingtray: init at 0.5.5rc2

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05195015670..e8feef5a51d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14201,6 +14201,8 @@ in
   qscreenshot = callPackage ../applications/graphics/qscreenshot {
     qt = qt4;
   };
+  
+  qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };
 

From b7996efeae6c3fe108ba761e79c8eeb5ebb77e51 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@users.noreply.github.com>
Date: Mon, 31 Oct 2016 12:17:32 -0800
Subject: [PATCH 0010/1310] maintainers: add zraexy

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6ff64599540..b1b1118aa32 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -483,4 +483,5 @@
   zimbatm = "zimbatm <zimbatm@zimbatm.com>";
   zohl = "Al Zohali <zohl@fmap.me>";
   zoomulator = "Kim Simmons <zoomulator@gmail.com>";
+  zraexy = "David Mell <zraexy@gmail.com>";
 }

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 0011/1310] 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 41fcb036eb19b6aef8f4f11d7eb6135247afc8bd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 28 Nov 2016 14:52:41 +0300
Subject: [PATCH 0012/1310] releaseTools.debBuild: split checkinstall into
 separate phase and allow to override them

---
 pkgs/build-support/release/debian-build.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index f4bc3e73056..74e061966bc 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -16,17 +16,14 @@ with stdenv.lib;
 vmTools.runInLinuxImage (stdenv.mkDerivation (
 
   {
+    name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
+
     doCheck = true;
 
     prefix = "/usr";
 
-    prePhases = "installExtraDebsPhase sysInfoPhase";
-  }
-
-  // removeAttrs args ["vmTools"] //
-
-  {
-    name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
+    prePhases = [ "installExtraDebsPhase" "sysInfoPhase" ];
+    postPhases = [ "debInstallPhase" ];
 
     # !!! cut&paste from rpm-build.nix
     postHook = ''
@@ -72,6 +69,12 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
       mkdir -p $out/debs
       find . -name "*.deb" -exec cp {} $out/debs \;
 
+      eval "$postInstall"
+    '';
+
+    debInstallPhase = ''
+      eval "$preDebInstall"
+
       [ "$(echo $out/debs/*.deb)" != "" ]
 
       for i in $out/debs/*.deb; do
@@ -87,12 +90,12 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
         echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products
       done
 
-      eval "$postInstall"
+      eval "$postDebInstall"
     ''; # */
 
     meta = (if args ? meta then args.meta else {}) // {
       description = "Deb package for ${diskImage.fullName}";
     };
-  }
+  } // removeAttrs args ["name" "meta" "vmTools"]
 
 ))

From 1712366bac9fabd51543545615b1ba3bccdc8776 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Fri, 11 Nov 2016 17:29:50 -0500
Subject: [PATCH 0013/1310] apple-sdk: Include system cups libraries

The SDK includes cups header files, but not the libraries. The
`nixpkgs.cups` definition doesn't build on darwin due to the SDK being
too old. This change symlinks the system cups libraries into the old
SDK.
---
 pkgs/os-specific/darwin/apple-sdk/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index c1e09c20111..1148fe5c4a1 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -31,6 +31,10 @@ let
       mv System/* .
       rmdir System
 
+      pushd lib
+      ln -s -L /usr/lib/libcups*.dylib .
+      popd
+
       cd Library/Frameworks/QuartzCore.framework/Versions/A/Headers
       for file in CI*.h; do
         rm $file

From 4ea9f4e325fcea0d6f7c5045d1e58443b688f07b Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 8 Dec 2016 17:28:52 +0100
Subject: [PATCH 0014/1310] gnugrep: 2.25 -> 2.27

See http://lists.gnu.org/archive/html/info-gnu/2016-12/msg00004.html
for release announcement.
---
 pkgs/tools/text/gnugrep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 3e714871827..b9dca2e8709 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pcre, libiconv, perl }:
 
-let version = "2.25"; in
+let version = "2.27"; in
 
 stdenv.mkDerivation {
   name = "gnugrep-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/grep/grep-${version}.tar.xz";
-    sha256 = "0c38b67cnwchwzv4wq2gpz6smkhdxrac2hhssv8f0l04qnx867p2";
+    sha256 = "1syadppgpxpfhpwhhqcsibrn131azypzps5aicx1qjh74d6w8k5d";
   };
 
   # Perl is needed for testing

From ff62e8a72e20b641bd7006c9cb1966d63b656735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 9 Dec 2016 18:53:39 +0100
Subject: [PATCH 0015/1310] glib: avoid runtime reference from gtk3

Fixes #21022.  Related: #15931.
---
 pkgs/development/libraries/glib/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 87c511f00dd..c7c704c641f 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -99,7 +99,12 @@ stdenv.mkDerivation rec {
     moveToOutput "share/glib-2.0" "$dev"
     substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
     sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
-  '';
+  ''
+    # This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
+    + ''
+      sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
+        -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
+    '';
 
   inherit doCheck;
   preCheck = optionalString doCheck

From 10d9845a1a4a49f56aec3d473349511f9d95937a Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Sat, 10 Dec 2016 00:36:28 +0100
Subject: [PATCH 0016/1310] nghttp2: 1.16.1 -> 1.17.0

See release notes :
https://github.com/nghttp2/nghttp2/releases/tag/v1.17.0
---
 pkgs/development/libraries/nghttp2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index 080a3e35138..a035cccda7f 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   name = "nghttp2-${version}";
-  version = "1.16.1";
+  version = "1.17.0";
 
   # Don't use fetchFromGitHub since this needs a bootstrap curl
   src = fetchurl {
     url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
-    sha256 = "069pw84f8gg21npapn7y1sizwn6w35692zaq5g45gy8hdbmcl8yc";
+    sha256 = "7685b6717d205d3a251b7dd5e73a7ca5e643bc5c01f928b82bfeed30c243f28a";
   };
 
   # Configure script searches for a symbol which does not exist in jemalloc on Darwin

From 879a98bf27f6de6cfdc4270ac35f93e0ebdec4a7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 10 Dec 2016 14:37:20 +0100
Subject: [PATCH 0017/1310] pythonPackages.pycairo: fix name

---
 pkgs/development/python-modules/pycairo/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 23e06ff4cb4..e7cf3b4c448 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -2,7 +2,7 @@
 
 if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else mkPythonDerivation rec {
   version = "1.10.0";
-  name = "${python.libPrefix}-pycairo-${version}";
+  name = "pycairo-${version}";
   src = if isPy3k
     then fetchurl {
       url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2";

From af220f2a7a14e804885150e1a62cd29efc87498e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 10 Dec 2016 15:22:52 +0100
Subject: [PATCH 0018/1310] cairo: maintenance 1.14.6 -> 1.14.8

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

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 71aa1874951..5d201c52312 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -12,11 +12,11 @@ assert glSupport -> mesa_noglu != null;
 with { inherit (stdenv.lib) optional optionals; };
 
 stdenv.mkDerivation rec {
-  name = "cairo-1.14.6";
+  name = "cairo-1.14.8";
 
   src = fetchurl {
     url = "http://cairographics.org/releases/${name}.tar.xz";
-    sha256 = "0lmjlzmghmr27y615px9hkm552x7ap6pmq9mfbzr6smp8y2b6g31";
+    sha1 = "c6f7b99986f93c9df78653c3e6a3b5043f65145e";
   };
 
   infinality = fetchFromGitHub {

From c3d20b2e43467fa669b51ca596d538fb0a613936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 10 Dec 2016 15:28:51 +0100
Subject: [PATCH 0019/1310] gtk3: maintenance 3.22.4 -> 3.22.5

---
 pkgs/development/libraries/gtk+/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index b50264f3a02..1b938215d17 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
 
 let
   ver_maj = "3.22";
-  ver_min = "4";
+  ver_min = "5";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "0zrq3wq4x0vcrzapps0608d5ywcrwk9xb2rmg32h2g8kzvyad53h";
+    sha256 = "693fa0ac643c59ccd51db99cabe476b4e0a41fd4f0c3c8b3e3ef38f94b2e7334";
   };
 
   outputs = [ "out" "dev" ];

From a3dbada1077fc124928e13dcddd4f4f2fcac66d4 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 10 Dec 2016 18:57:09 +0100
Subject: [PATCH 0020/1310] wxmac: fix build with clang-3.8

---
 pkgs/development/libraries/wxmac/default.nix | 47 ++++++++++++++--
 pkgs/development/libraries/wxmac/wx.patch    | 59 --------------------
 pkgs/top-level/all-packages.nix              |  2 +-
 3 files changed, 42 insertions(+), 66 deletions(-)
 delete mode 100644 pkgs/development/libraries/wxmac/wx.patch

diff --git a/pkgs/development/libraries/wxmac/default.nix b/pkgs/development/libraries/wxmac/default.nix
index e5d680501f0..f4e71424833 100644
--- a/pkgs/development/libraries/wxmac/default.nix
+++ b/pkgs/development/libraries/wxmac/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl
-, expat, libiconv, libjpeg, libpng, libtiff, zlib
-, setfile, rez, derez
-, AGL, Cocoa, Kernel, QuickTime
+{ stdenv, fetchurl, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib
+# darwin only attributes
+, derez, rez, setfile
+, AGL, Cocoa, Kernel
 }:
 
 with stdenv.lib;
@@ -15,11 +15,46 @@ stdenv.mkDerivation rec {
     sha256 = "346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d";
   };
 
-  patches = [ ./wx.patch ];
+  patches =
+    [ # Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems
+      # with abiguous overloads for clang-3.8 and gcc6.
+      (fetchpatch {
+        name = "patch-stc-abs.diff";
+        url = https://github.com/wxWidgets/wxWidgets/commit/73e9e18ea09ffffcaac50237def0d9728a213c02.patch;
+        sha256 = "0w5whmfzm8waw62jmippming0zffa9064m5b3aw5nixph21rlcvq";
+      })
+
+      # Various fixes related to Yosemite. Revisit in next stable release.
+      # Please keep an eye on http://trac.wxwidgets.org/ticket/16329 as well
+      # Theoretically the above linked patch should still be needed, but it isn't.
+      # Try to find out why.
+      (fetchpatch {
+        name = "patch-yosemite.diff";
+        url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-yosemite.diff;
+        sha256 = "0ss66z2a79v976mvlrskyj1zmkyaz8hbwm98p29bscfvcx5845jb";
+      })
+
+      # Remove uncenessary <QuickTime/QuickTime.h> includes
+      # http://trac.wxwidgets.org/changeset/f6a2d1caef5c6d412c84aa900cb0d3990b350938/git-wxWidgets
+      (fetchpatch {
+        name = "patch-quicktime-removal.diff";
+        url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-quicktime-removal.diff;
+        sha256 = "0mzvdk8r70p9s1wj7qzdsqmdrlxlf2dalh9gqs8xjkqq2666yp0y";
+      })
+
+      # Patch for wxOSXPrintData, custom paper not applied
+      # http://trac.wxwidgets.org/ticket/16959
+      (fetchpatch {
+        name = "wxPaperCustomPatch.patch";
+        url = http://trac.wxwidgets.org/raw-attachment/ticket/16959/wxPaperCustomPatch.patch;
+        sha256 = "0xgscv86f8dhggn9n8bhlq9wlj3ydsicgy9v35sraxyma18cbjvl";
+      })
+    ];
 
   buildInputs = [
     expat libiconv libjpeg libpng libtiff zlib
-    Cocoa Kernel QuickTime setfile rez derez
+    derez rez setfile
+    Cocoa Kernel
   ];
 
   propagatedBuildInputs = [ AGL ];
diff --git a/pkgs/development/libraries/wxmac/wx.patch b/pkgs/development/libraries/wxmac/wx.patch
deleted file mode 100644
index 622e22d1fdb..00000000000
--- a/pkgs/development/libraries/wxmac/wx.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/include/wx/defs.h b/include/wx/defs.h
-index 397ddd7..d128083 100644
---- a/include/wx/defs.h
-+++ b/include/wx/defs.h
-@@ -3169,12 +3169,20 @@ DECLARE_WXCOCOA_OBJC_CLASS(UIImage);
- DECLARE_WXCOCOA_OBJC_CLASS(UIEvent);
- DECLARE_WXCOCOA_OBJC_CLASS(NSSet);
- DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext);
-+DECLARE_WXCOCOA_OBJC_CLASS(UIWebView);
- 
- typedef WX_UIWindow WXWindow;
- typedef WX_UIView WXWidget;
- typedef WX_EAGLContext WXGLContext;
- typedef WX_NSString* WXGLPixelFormat;
- 
-+typedef WX_UIWebView OSXWebViewPtr;
-+
-+#endif
-+
-+#if wxOSX_USE_COCOA_OR_CARBON
-+DECLARE_WXCOCOA_OBJC_CLASS(WebView);
-+typedef WX_WebView OSXWebViewPtr;
- #endif
- 
- #endif /* __WXMAC__ */
-diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
-index 8700367..f805099 100644
---- a/include/wx/html/webkit.h
-+++ b/include/wx/html/webkit.h
-@@ -18,7 +18,6 @@
- #endif
- 
- #include "wx/control.h"
--DECLARE_WXCOCOA_OBJC_CLASS(WebView); 
- 
- // ----------------------------------------------------------------------------
- // Web Kit Control
-@@ -107,7 +106,7 @@ private:
-     wxString m_currentURL;
-     wxString m_pageTitle;
- 
--    WX_WebView m_webView;
-+    OSXWebViewPtr m_webView;
- 
-     // we may use this later to setup our own mouse events,
-     // so leave it in for now.
-diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
-index 803f8b0..438e532 100644
---- a/include/wx/osx/webview_webkit.h
-+++ b/include/wx/osx/webview_webkit.h
-@@ -158,7 +158,7 @@ private:
-     wxWindowID m_windowID;
-     wxString m_pageTitle;
- 
--    wxObjCID m_webView;
-+    OSXWebViewPtr m_webView;
- 
-     // we may use this later to setup our own mouse events,
-     // so leave it in for now.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8b7341cd39..c18b2f4539d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9612,7 +9612,7 @@ in
   };
 
   wxmac = callPackage ../development/libraries/wxmac {
-    inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel QuickTime;
+    inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel;
     inherit (darwin.stubs) setfile rez derez;
   };
 

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 0021/1310] 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 105fead2aab8e4bfcd84dbf456667751f83f07d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Dec 2016 17:50:28 +0100
Subject: [PATCH 0022/1310] nghttp2 cleanup: unneeded patching, unused inputs

Suggested on
https://github.com/NixOS/nixpkgs/pull/21029#issuecomment-266290756
---
 pkgs/development/libraries/nghttp2/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index a035cccda7f..f7a026c52d4 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, pkgconfig
 
 # Optional Dependencies
-, openssl ? null, libev ? null, zlib ? null, jansson ? null, boost ? null
-, libxml2 ? null, jemalloc ? null
+, openssl ? null, libev ? null, zlib ? null
+#, jansson ? null, boost ? null, libxml2 ? null, jemalloc ? null
 }:
 
 stdenv.mkDerivation rec {
@@ -15,12 +15,6 @@ stdenv.mkDerivation rec {
     sha256 = "7685b6717d205d3a251b7dd5e73a7ca5e643bc5c01f928b82bfeed30c243f28a";
   };
 
-  # Configure script searches for a symbol which does not exist in jemalloc on Darwin
-  # Reported upstream in https://github.com/tatsuhiro-t/nghttp2/issues/233
-  postPatch = if stdenv.isDarwin && jemalloc != null then ''
-    substituteInPlace configure --replace "malloc_stats_print" "je_malloc_stats_print"
-  '' else null;
-
   outputs = [ "out" "dev" "lib" ];
 
   nativeBuildInputs = [ pkgconfig ];

From 1626b1b652982363c9102343ee4100b513bb3cbf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 9 Dec 2016 15:47:12 +0100
Subject: [PATCH 0023/1310] json_glib: use multiple outputs

---
 pkgs/development/libraries/json-glib/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 9505192ef8a..9d434c088ba 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
+  outputs = [ "out" "dev" ];
+
   meta = with stdenv.lib; {
     homepage = http://live.gnome.org/JsonGlib;
     description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format";

From 3e6cf98ada5c32dfd925570965f302d7c7275f5d Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sun, 11 Dec 2016 13:56:00 +0100
Subject: [PATCH 0024/1310] owncloud: update minor versions

---
 pkgs/servers/owncloud/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix
index ada198a171a..c452ac869fc 100644
--- a/pkgs/servers/owncloud/default.nix
+++ b/pkgs/servers/owncloud/default.nix
@@ -43,28 +43,28 @@ in {
   };
 
   owncloud80 = common {
-    versiona = "8.0.15";
-    sha256 = "18042jkp4p3b6xh394zm80126975g94r4ka8gzwhyvgfwpgxrx84";
+    versiona = "8.0.16";
+    sha256 = "1pgfawrmx6n02h7h6g5wk0sa1kgablqa8ljfiywyw8znxxa5lnrm";
   };
 
   owncloud81 = common {
-    versiona = "8.1.10";
-    sha256 = "1vspsd3l86mrhhddmyafwdr961f4dy6ln2j4dds2h45wf6296c63";
+    versiona = "8.1.11";
+    sha256 = "04izfzj3ckcs0x882kkggp6y7zcrhdihm71wkd9vk6j5fn8k9am0";
   };
 
   owncloud82 = common {
-    versiona = "8.2.8";
-    sha256 = "0k10b3gfpfk3imxhkra0vn6a004xmcma09lw6pgxnalpmpbm8jiy";
+    versiona = "8.2.9";
+    sha256 = "09gzpxd9gjg8h57m8j0r6xnr85fdb951ykwmjby811c6730769pw";
   };
 
   owncloud90 = common {
-    versiona = "9.0.5";
-    sha256 = "1igpjc4rfaxqrkf2dln85wvdii54nrmwlh17fq3g0232l3vw9hn8";
+    versiona = "9.0.7";
+    sha256 = "1j6xrd4dhc0v0maa3z8n392nfc9hrnvbxxyqr8g8kz88w9vbqa6h";
   };
 
   owncloud91 = common {
-    versiona = "9.1.1";
-    sha256 = "1fd73ggzj2v43j284is2c6936gwkmz1inr5fm88rmq5pxcqkbgx6";
+    versiona = "9.1.3";
+    sha256 = "1sgnsj2ng14lh05n5kc3jv03xk6xnkyx7xj1rasxlqgvzwsyp8g0";
   };
 
 }

From 8a43550e9008644b503a1cb985e0e991cd9044b2 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 15 Dec 2016 15:35:17 +0100
Subject: [PATCH 0025/1310] aws-sdk-cpp: Enable on Darwin systems

This (re)reverts commit ef65353c73bccbedb60603725ca230fd1d4fc2ae.
---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index d5d7371aebf..755b98ad32d 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "A C++ interface for Amazon Web Services";
     homepage = https://github.com/awslabs/aws-sdk-cpp;
     license = lib.licenses.asl20;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c18b2f4539d..f2560d778ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10748,7 +10748,7 @@ in
     })
     else if stdenv.isLinux
     then utillinuxMinimal
-    else null;
+    else libossp_uuid;
 
   light = callPackage ../os-specific/linux/light { };
 

From 0e64be20b7734d49a2aa4db0617febcf81da25a4 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 15 Dec 2016 21:10:08 +0100
Subject: [PATCH 0026/1310] Revert "aws-sdk-cpp: Enable on Darwin systems"

This reverts commit 8a43550e9008644b503a1cb985e0e991cd9044b2.
---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 755b98ad32d..d5d7371aebf 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "A C++ interface for Amazon Web Services";
     homepage = https://github.com/awslabs/aws-sdk-cpp;
     license = lib.licenses.asl20;
-    platforms = lib.platforms.unix;
+    platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2560d778ce..c18b2f4539d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10748,7 +10748,7 @@ in
     })
     else if stdenv.isLinux
     then utillinuxMinimal
-    else libossp_uuid;
+    else null;
 
   light = callPackage ../os-specific/linux/light { };
 

From a01a5ed925552fcd7df113ce043d936f11f418b3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 15 Dec 2016 10:54:44 +0100
Subject: [PATCH 0027/1310] darwin.libunwind: fix source

Fixes #20977

since this was the same sha as the linux package nix just used that instead.
---
 pkgs/os-specific/darwin/apple-source-releases/default.nix    | 2 +-
 .../darwin/apple-source-releases/libunwind/default.nix       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 69dc2283645..c245a790695 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -220,7 +220,7 @@ let
     libresolv       = applePackage "libresolv"         "osx-10.11.6"     "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {};
     Libsystem       = applePackage "Libsystem"         "osx-10.11.6"     "1nfkmbqml587v2s1d1y2s2v8nmr577jvk51y6vqrfvsrhdhc2w94" {};
     libutil         = applePackage "libutil"           "osx-10.11.6"     "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {};
-    libunwind       = applePackage "libunwind"         "osx-10.11.6"     "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx" {};
+    libunwind       = applePackage "libunwind"         "osx-10.11.6"     "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {};
     mDNSResponder   = applePackage "mDNSResponder"     "osx-10.11.6"     "069incq28a78yh1bnr17h9cd5if5mwqpq8ahnkyxxx25fkaxgzcf" {};
     objc4           = applePackage "objc4"             "osx-10.11.6"     "00b7vbgxni8frrqyi69b4njjihlwydzjd9zj9x4z5dbx8jabkvrj" {};
     ppp             = applePackage "ppp"               "osx-10.11.6"     "1dql6r1v0vbcs04958nn2i6p31yfsxyy51jca63bm5mf0gxalk3f" {};
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
index 81a45d99a86..b4b2b685895 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
@@ -1,15 +1,16 @@
 { stdenv, appleDerivation, dyld, osx_private_sdk }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
+  buildPhase = ":";
 
+  # install headers only
   installPhase = ''
     mkdir -p $out/lib
     cp -R include $out/include
   '';
 
   meta = with stdenv.lib; {
-    maintainers = with maintainers; [ copumpkin ];
+    maintainers = with maintainers; [ copumpkin lnl7 ];
     platforms   = platforms.darwin;
     license     = licenses.apsl20;
   };

From 0d1d1bd7e2bf2c825ea7685ec1427d7dfc79113c Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Thu, 8 Dec 2016 16:25:39 +0000
Subject: [PATCH 0028/1310] unigine-valley: 1.0-1 -> 1.0 (remove unnecessary
 release version)

The upstream version is "1.0", so that's what the version of the Nix package should be too.
When I packaged this I wasn't aware that a Nix package could update without its version number
increasing, so I added an extra "release version" (like Arch Linux packages). Of course, this
isn't necessary.
---
 pkgs/applications/graphics/unigine-valley/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix
index 8fef29fa107..d2b3756cecb 100644
--- a/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/pkgs/applications/graphics/unigine-valley/default.nix
@@ -16,7 +16,6 @@
 
 let
   version = "1.0";
-  pkgversion = "1";
 
   arch = if stdenv.system == "x86_64-linux" then
     "x64"
@@ -27,7 +26,7 @@ let
 
 in
   stdenv.mkDerivation {
-    name = "unigine-valley-${version}-${pkgversion}";
+    name = "unigine-valley-${version}";
 
     src = fetchurl {
       url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run";

From c3f49dcaf07f00a7f29d65f2429490089b24b3df Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Thu, 8 Dec 2016 16:50:54 +0000
Subject: [PATCH 0029/1310] unigine-valley: install files to a more idiomatic
 location

Previously, the entire installation was copied to $out/opt/unigine/valley.
Using $out/lib instead of $out/opt would be more consistent with other Nix packages.
---
 pkgs/applications/graphics/unigine-valley/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix
index d2b3756cecb..9ff603f405e 100644
--- a/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/pkgs/applications/graphics/unigine-valley/default.nix
@@ -70,7 +70,7 @@ in
     buildPhase = "";
 
     installPhase = ''
-      instdir=$out/opt/unigine/valley
+      instdir=$out/lib/unigine/valley
 
       # Install executables and libraries
       mkdir -p $instdir/bin
@@ -96,7 +96,7 @@ in
     meta = {
       description = "The Unigine Valley GPU benchmarking tool";
       homepage = "http://unigine.com/products/benchmarks/valley/";
-      license = stdenv.lib.licenses.unfree; # see also: /nix/store/*-unigine-valley-1.0/opt/unigine/valley/documentation/License.pdf
+      license = stdenv.lib.licenses.unfree; # see also: /nix/store/*-unigine-valley-1.0/lib/unigine/valley/documentation/License.pdf
       maintainers = [ stdenv.lib.maintainers.kierdavis ];
       platforms = ["x86_64-linux" "i686-linux"];
     };

From aa53e1d17e2274d45a419c58ff13b83058f882ac Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Thu, 8 Dec 2016 17:00:25 +0000
Subject: [PATCH 0030/1310] unigine-valley: exclude non-ELF files from
 stripping during fix-up

---
 pkgs/applications/graphics/unigine-valley/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix
index 9ff603f405e..01eda33217c 100644
--- a/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/pkgs/applications/graphics/unigine-valley/default.nix
@@ -93,6 +93,8 @@ in
         --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$instdir/bin:$libPath
     '';
 
+    stripDebugList = ["lib/unigine/valley/bin"];
+
     meta = {
       description = "The Unigine Valley GPU benchmarking tool";
       homepage = "http://unigine.com/products/benchmarks/valley/";

From d1226333e22a5cccd5247a323b7e70e809ee5efb Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Fri, 16 Dec 2016 10:22:24 +0000
Subject: [PATCH 0031/1310] unigine-valley: clean up

---
 .../graphics/unigine-valley/default.nix           | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix
index 01eda33217c..1bb57538cd5 100644
--- a/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/pkgs/applications/graphics/unigine-valley/default.nix
@@ -25,7 +25,7 @@ let
     abort "Unsupported platform";
 
 in
-  stdenv.mkDerivation {
+  stdenv.mkDerivation rec {
     name = "unigine-valley-${version}";
 
     src = fetchurl {
@@ -34,6 +34,7 @@ in
     };
 
     sourceRoot = "Unigine_Valley-${version}";
+    instPath = "lib/unigine/valley";
 
     buildInputs = [file makeWrapper];
 
@@ -55,22 +56,16 @@ in
       ./extractor.run --target $sourceRoot
     '';
 
-    # The executable loads libGPUMonitor_${arch}.so "manually" (i.e. not through the ELF interpreter).
-    # However, it still uses the RPATH to look for it.
     patchPhase = ''
       # Patch ELF files.
       elfs=$(find bin -type f | xargs file | grep ELF | cut -d ':' -f 1)
       for elf in $elfs; do
-        echo "Patching $elf"
         patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $elf || true
       done
     '';
 
-    configurePhase = "";
-    buildPhase = "";
-
     installPhase = ''
-      instdir=$out/lib/unigine/valley
+      instdir=$out/${instPath}
 
       # Install executables and libraries
       mkdir -p $instdir/bin
@@ -93,12 +88,12 @@ in
         --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$instdir/bin:$libPath
     '';
 
-    stripDebugList = ["lib/unigine/valley/bin"];
+    stripDebugList = ["${instPath}/bin"];
 
     meta = {
       description = "The Unigine Valley GPU benchmarking tool";
       homepage = "http://unigine.com/products/benchmarks/valley/";
-      license = stdenv.lib.licenses.unfree; # see also: /nix/store/*-unigine-valley-1.0/lib/unigine/valley/documentation/License.pdf
+      license = stdenv.lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf
       maintainers = [ stdenv.lib.maintainers.kierdavis ];
       platforms = ["x86_64-linux" "i686-linux"];
     };

From 0a1278a6793bee02c1e48e7b424b2a038bcc1dd9 Mon Sep 17 00:00:00 2001
From: Alexei Boronine <alexei@boronine.com>
Date: Fri, 16 Dec 2016 21:53:35 +0800
Subject: [PATCH 0032/1310] haxe: 3.1.3 -> 3.2.1

---
 pkgs/development/compilers/haxe/default.nix   |  8 ++---
 .../compilers/haxe/haxelib-nix.patch          | 34 ++++++++++---------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index a2afcc77380..a4077408ef0 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchgit, ocaml, zlib, neko, camlp4 }:
 
 stdenv.mkDerivation {
-  name = "haxe-3.1.3";
+  name = "haxe-3.2.1";
 
   buildInputs = [ocaml zlib neko camlp4];
 
   src = fetchgit {
     url = "https://github.com/HaxeFoundation/haxe.git";
-    sha256 = "0d8s9yqsqcbr2lfw4xnmg7vzgb6k1jq6hlwwaf1kmn9wxpvcc6x9";
+    sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3";
     fetchSubmodules = true;
 
-    # Tag 3.1.3
-    rev = "7be30670b2f1f9b6082499c8fb9e23c0a6df6c28";
+    # Tag 3.2.1
+    rev = "deab4424399b520750671e51e5f5c2684e942c17";
   };
 
   prePatch = ''
diff --git a/pkgs/development/compilers/haxe/haxelib-nix.patch b/pkgs/development/compilers/haxe/haxelib-nix.patch
index da7e4c8dacb..ed370e8efd1 100644
--- a/pkgs/development/compilers/haxe/haxelib-nix.patch
+++ b/pkgs/development/compilers/haxe/haxelib-nix.patch
@@ -1,10 +1,10 @@
-diff --git a/extra/haxelib_src/src/tools/haxelib/Main.hx b/extra/haxelib_src/src/tools/haxelib/Main.hx
-index a44a785..0eb811a 100644
+diff --git a/src/tools/haxelib/Main.hx b/src/tools/haxelib/Main.hx
+index dc18815..def5231 100644
 --- a/extra/haxelib_src/src/tools/haxelib/Main.hx
 +++ b/extra/haxelib_src/src/tools/haxelib/Main.hx
-@@ -996,21 +996,26 @@ class Main {
+@@ -1301,21 +1301,26 @@ class Main {
  	}
- 
+
  	function checkRec( prj : String, version : String, l : List<{ project : String, version : String, info : Infos }> ) {
 -		var pdir = getRepository() + Data.safe(prj);
 -		if( !FileSystem.exists(pdir) )
@@ -44,7 +44,7 @@ index a44a785..0eb811a 100644
  		var json = try File.getContent(vdir+"/"+Data.JSON) catch( e : Dynamic ) null;
  		var inf = Data.readData(json,false);
  		l.add({ project : prj, version : version, info: inf });
-@@ -1025,15 +1030,21 @@ class Main {
+@@ -1330,15 +1335,21 @@ class Main {
  			var a = args[argcur++].split(":");
  			checkRec(a[0],a[1],list);
  		}
@@ -73,10 +73,10 @@ index a44a785..0eb811a 100644
  			var ndir = dir + "ndll";
  			if( FileSystem.exists(ndir) ) {
  				var sysdir = ndir+"/"+Sys.systemName();
-@@ -1153,21 +1164,39 @@ class Main {
- 		print('  Path: $devPath');
+@@ -1491,23 +1502,43 @@ class Main {
+ 			);
  	}
- 
+
 +	function getNixLib(project:String):Null<String>
 +	{
 +		var hlibPath = Sys.getEnv("HAXELIB_PATH");
@@ -91,7 +91,7 @@ index a44a785..0eb811a 100644
 +		}
 +		return null;
 +	}
-+
+
  	function run() {
 -		var rep = getRepository();
  		var project = param("Library");
@@ -103,10 +103,10 @@ index a44a785..0eb811a 100644
 -		pdir += "/";
 -		var version = temp[1] != null ? temp[1] : getCurrent(pdir);
 -		var dev = try getDev(pdir) catch ( e : Dynamic ) null;
--		var vdir = dev!=null ? dev : pdir + Data.safe(version);
--		var rdir = vdir + "/run.n";
--		if( !FileSystem.exists(rdir) )
--			throw "Library "+project+" version "+version+" does not have a run script";
+-		var vdir = dev != null ? dev : pdir + Data.safe(version);
+
+ 		args.push(cli.cwd);
++
 +		var vdir = this.getNixLib(project);
 +		if (vdir == null) {
 +			var rep = getRepository();
@@ -121,6 +121,8 @@ index a44a785..0eb811a 100644
 +			if( !FileSystem.exists(rdir) )
 +				throw "Library "+project+" version "+version+" does not have a run script";
 +		}
- 		args.push(Sys.getCwd());
- 		Sys.setCwd(vdir);
- 		var cmd = "neko run.n";
+ 		cli.cwd = vdir;
+-
+ 		var callArgs =
+ 			switch try [Data.readData(File.getContent(vdir + '/haxelib.json'), false), null] catch (e:Dynamic) [null, e] {
+ 				case [null, e]:

From b0bfa88848cddb3011db8fb3465a25ec80e54da9 Mon Sep 17 00:00:00 2001
From: Tom Hinton <github@larkery.com>
Date: Fri, 16 Dec 2016 15:10:23 +0000
Subject: [PATCH 0033/1310] Fiddle LD_LIBRARY_PATH to include GDAL

Some GRASS functions dlopen GDAL, and don't get patched in the install.
To make them work I have to export LD_LIBRARY_PATH from within grass again with pkgs.gdal/lib.
Alternatively this does the trick - there might be a better way to do this, if the configure script can take the true path to gdal and reflect it in the dlopen calls or something?
---
 pkgs/applications/gis/grass/default.nix | 1 +
 1 file changed, 1 insertion(+)

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

From d12e540739a773319bbedf7714f3c482dedf39a1 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 16 Dec 2016 07:26:00 -0200
Subject: [PATCH 0034/1310] pythonPackages.docutils: 0.12 -> 0.13.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 31745e5380a..e0bc4f1c2bf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10631,11 +10631,12 @@ in {
 
 
   docutils = buildPythonPackage rec {
-    name = "docutils-0.12";
+    name = "docutils-${version}";
+    version = "0.13.1";
 
     src = pkgs.fetchurl {
       url = "mirror://sourceforge/docutils/${name}.tar.gz";
-      sha256 = "c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa";
+      sha256 = "1gkma47i609jfs7dssxn4y9vsz06qi0l5q41nws0zgkpnrghz33i";
     };
 
     # error: invalid command 'test'
@@ -10644,7 +10645,7 @@ in {
     meta = {
       description = "An open-source text processing system for processing plaintext documentation into useful formats, such as HTML or LaTeX";
       homepage = http://docutils.sourceforge.net/;
-      maintainers = with maintainers; [ garbas ];
+      maintainers = with maintainers; [ garbas AndersonTorres ];
     };
   };
 

From 1c3c59ebd693a55d2a736b2b42f6f976b892cf8b Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 16 Dec 2016 22:15:21 -0200
Subject: [PATCH 0035/1310] qwt6_qt4: init at 6.1.2

---
 pkgs/development/libraries/qwt/6_qt4.nix | 29 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/qwt/6_qt4.nix

diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix
new file mode 100644
index 00000000000..7774ab7df9e
--- /dev/null
+++ b/pkgs/development/libraries/qwt/6_qt4.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, qt4, qmake4Hook }:
+
+stdenv.mkDerivation rec {
+  name = "qwt-6.1.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/qwt/${name}.tar.bz2";
+    sha256 = "031x4hz1jpbirv9k35rqb52bb9mf2w7qav89qv1yfw1r3n6z221b";
+  };
+
+  buildInputs = [ qt4 ];
+  nativeBuildInputs = [ qmake4Hook ];
+
+  postPatch = ''
+    sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri
+  '';
+
+  qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ];
+
+  meta = with stdenv.lib; {
+    description = "Qt widgets for technical applications";
+    homepage = http://qwt.sourceforge.net/;
+    # LGPL 2.1 plus a few exceptions (more liberal)
+    license = stdenv.lib.licenses.qwt;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+    branch = "6";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43f8f4bb2bb..0afba55879f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9061,6 +9061,8 @@ in
 
   qwt = callPackage ../development/libraries/qwt {};
 
+  qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { };
+
   qxt = callPackage ../development/libraries/qxt {};
 
   rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};

From 662aa495dfa0e07610f4a9248501a8f6fca0740d Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 16 Dec 2016 22:17:29 -0200
Subject: [PATCH 0036/1310] gplates: init at 2.0.0

---
 .../science/misc/gplates/boostfix.patch       | 612 ++++++++++++++++++
 .../science/misc/gplates/default.nix          |  24 +
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 638 insertions(+)
 create mode 100644 pkgs/applications/science/misc/gplates/boostfix.patch
 create mode 100644 pkgs/applications/science/misc/gplates/default.nix

diff --git a/pkgs/applications/science/misc/gplates/boostfix.patch b/pkgs/applications/science/misc/gplates/boostfix.patch
new file mode 100644
index 00000000000..e429600b709
--- /dev/null
+++ b/pkgs/applications/science/misc/gplates/boostfix.patch
@@ -0,0 +1,612 @@
+--- a/src/app-logic/ApplicationState.h
++++ b/src/app-logic/ApplicationState.h
+@@ -33,6 +33,7 @@
+ #include <boost/shared_ptr.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "FeatureCollectionFileState.h"
+ #include "Layer.h"
+ #include "LayerTaskRegistry.h"
+@@ -48,6 +49,7 @@
+ #include "model/ModelInterface.h"
+ #include "model/types.h"
+ #include "model/WeakReferenceCallback.h"
++#endif
+ 
+ ////////////////////////////////////////////////////////////////////////////////////////////////
+ // NOTE: Please use forward declarations (and boost::scoped_ptr) instead of including headers
+--- a/src/app-logic/CoRegistrationLayerTask.h
++++ b/src/app-logic/CoRegistrationLayerTask.h
+@@ -32,11 +32,13 @@
+ #include <QObject>
+ #include <QString>
+ 
++#ifndef Q_MOC_RUN
+ #include "CoRegistrationLayerParams.h"
+ #include "CoRegistrationLayerProxy.h"
+ #include "LayerTask.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
++#endif
+ 
+ namespace GPlatesAppLogic
+ {
+--- a/src/app-logic/RasterLayerTask.h
++++ b/src/app-logic/RasterLayerTask.h
+@@ -32,11 +32,13 @@
+ #include <QObject>
+ #include <QString>
+ 
++#ifndef Q_MOC_RUN
+ #include "LayerTask.h"
+ #include "RasterLayerParams.h"
+ #include "RasterLayerProxy.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/ReconstructGraph.h
++++ b/src/app-logic/ReconstructGraph.h
+@@ -46,6 +46,7 @@
+ #include <boost/lambda/construct.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "FeatureCollectionFileState.h"
+ #include "Layer.h"
+ #include "Reconstruction.h"
+@@ -53,6 +54,7 @@
+ 
+ #include "model/FeatureCollectionHandle.h"
+ #include "model/WeakReferenceCallback.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/ReconstructLayerTask.h
++++ b/src/app-logic/ReconstructLayerTask.h
+@@ -33,6 +33,7 @@
+ #include <QObject>
+ #include <QString>
+ 
++#ifndef Q_MOC_RUN
+ #include "LayerTask.h"
+ #include "ReconstructLayerProxy.h"
+ #include "ReconstructLayerParams.h"
+@@ -42,6 +43,7 @@
+ #include "maths/types.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/ReconstructScalarCoverageLayerParams.h
++++ b/src/app-logic/ReconstructScalarCoverageLayerParams.h
+@@ -30,6 +30,7 @@
+ #include <boost/optional.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "LayerParams.h"
+ #include "ReconstructScalarCoverageLayerProxy.h"
+ #include "ReconstructScalarCoverageParams.h"
+@@ -38,6 +39,7 @@
+ #include "property-values/ValueObjectType.h"
+ 
+ #include "utils/SubjectObserverToken.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/ReconstructScalarCoverageLayerTask.h
++++ b/src/app-logic/ReconstructScalarCoverageLayerTask.h
+@@ -30,12 +30,14 @@
+ #include <boost/shared_ptr.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "LayerTask.h"
+ #include "ReconstructScalarCoverageLayerParams.h"
+ #include "ReconstructScalarCoverageLayerProxy.h"
+ #include "ScalarCoverageFeatureProperties.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/TopologyNetworkResolverLayerTask.h
++++ b/src/app-logic/TopologyNetworkResolverLayerTask.h
+@@ -33,6 +33,7 @@
+ #include <QObject>
+ #include <QString>
+ 
++#ifndef Q_MOC_RUN
+ #include "LayerParams.h"
+ #include "LayerTask.h"
+ #include "ReconstructLayerProxy.h"
+@@ -41,6 +42,7 @@
+ #include "TopologyNetworkResolverLayerProxy.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/VelocityFieldCalculatorLayerTask.h
++++ b/src/app-logic/VelocityFieldCalculatorLayerTask.h
+@@ -32,9 +32,11 @@
+ #include <QObject>
+ #include <QString>
+ 
++#ifndef Q_MOC_RUN
+ #include "LayerTask.h"
+ #include "VelocityFieldCalculatorLayerParams.h"
+ #include "VelocityFieldCalculatorLayerProxy.h"
++#endif
+ 
+ #include "model/FeatureCollectionHandle.h"
+ 
+--- a/src/data-mining/CoRegConfigurationTable.h
++++ b/src/data-mining/CoRegConfigurationTable.h
+@@ -28,6 +28,7 @@
+ 
+ #include <vector>
+ #include <map>
++#ifndef Q_MOC_RUN
+ #include <boost/operators.hpp>
+ 
+ #include "CoRegFilter.h"
+@@ -44,6 +45,7 @@
+ #include "scribe/Transcribe.h"
+ #include "scribe/TranscribeContext.h"
+ 
++#endif
+ 
+ namespace GPlatesDataMining
+ {
+--- a/src/gui/CommandServer.h
++++ b/src/gui/CommandServer.h
+@@ -38,9 +38,11 @@
+ #include <QRegExp>
+ #include <QtXml/QXmlStreamReader>
+ 
++#ifndef Q_MOC_RUN
+ #include "app-logic/ApplicationState.h"
+ 
+ #include "presentation/ViewState.h"
++#endif
+ 
+ namespace GPlatesGui
+ {
+--- a/src/gui/FeatureTableModel.h
++++ b/src/gui/FeatureTableModel.h
+@@ -32,8 +32,10 @@
+ #include <QItemSelection>
+ #include <QHeaderView>
+ 
++#ifndef Q_MOC_RUN
+ #include "app-logic/Layer.h"
+ #include "app-logic/ReconstructionGeometry.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/gui/TopologyTools.h
++++ b/src/gui/TopologyTools.h
+@@ -35,6 +35,7 @@
+ #include <QDebug>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "TopologySectionsContainer.h"
+ 
+ #include "app-logic/Layer.h"
+@@ -64,6 +65,7 @@
+ #include "utils/UnicodeStringUtils.h"
+ 
+ #include "view-operations/RenderedGeometryCollection.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/opengl/GLVisualLayers.h
++++ b/src/opengl/GLVisualLayers.h
+@@ -35,6 +35,7 @@
+ #include <boost/shared_ptr.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "GLAgeGridMaskSource.h"
+ #include "GLContext.h"
+ #include "GLLight.h"
+@@ -79,6 +80,7 @@
+ 
+ #include "view-operations/RenderedGeometry.h"
+ #include "view-operations/ScalarField3DRenderParameters.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/presentation/VisualLayer.h
++++ b/src/presentation/VisualLayer.h
+@@ -32,6 +32,7 @@
+ #include <QString>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "VisualLayerParams.h"
+ #include "VisualLayerType.h"
+ 
+@@ -42,6 +43,7 @@
+ #include "model/FeatureCollectionHandle.h"
+ 
+ #include "view-operations/RenderedGeometryCollection.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/presentation/VisualLayers.h
++++ b/src/presentation/VisualLayers.h
+@@ -34,6 +34,7 @@
+ #include <boost/weak_ptr.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "VisualLayer.h"
+ 
+ #include "app-logic/FeatureCollectionFileState.h"
+@@ -42,6 +43,7 @@
+ #include "gui/Symbol.h"
+ 
+ #include "view-operations/RenderedGeometryCollection.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/AssignReconstructionPlateIdsDialog.h
++++ b/src/qt-widgets/AssignReconstructionPlateIdsDialog.h
+@@ -39,6 +39,7 @@
+ #include "GPlatesDialog.h"
+ #include "InformationDialog.h"
+ 
++#ifndef Q_MOC_RUN
+ #include "app-logic/AssignPlateIds.h"
+ 
+ #include "file-io/File.h"
+@@ -47,6 +48,7 @@
+ #include "model/ModelInterface.h"
+ 
+ #include "presentation/VisualLayer.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h
++++ b/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h
+@@ -38,6 +38,7 @@
+ 
+ #include "OpenDirectoryDialog.h"
+ 
++#ifndef Q_MOC_RUN
+ #include "app-logic/ApplicationState.h"
+ #include "app-logic/Layer.h"
+ #include "app-logic/LayerInputChannelName.h"
+@@ -45,6 +46,7 @@
+ 
+ #include "data-mining/CheckAttrTypeVisitor.h"
+ #include "data-mining/CoRegConfigurationTable.h"
++#endif
+ 
+ #include "global/PointerTraits.h"
+ 
+--- a/src/qt-widgets/CoRegistrationOptionsWidget.h
++++ b/src/qt-widgets/CoRegistrationOptionsWidget.h
+@@ -31,6 +31,7 @@
+ #include "CoRegistrationLayerConfigurationDialog.h"
+ #include "CoRegistrationOptionsWidgetUi.h"
+ #include "LayerOptionsWidget.h"
++#ifndef Q_MOC_RUN
+ #include "CoRegistrationResultTableDialog.h"
+ 
+ #include "app-logic/CoRegistrationLayerTask.h"
+@@ -41,7 +42,7 @@
+ #include "file-io/File.h"
+ 
+ #include "presentation/VisualLayer.h"
+-
++#endif
+ 
+ namespace GPlatesAppLogic
+ {
+--- a/src/qt-widgets/CoRegistrationResultTableDialog.h
++++ b/src/qt-widgets/CoRegistrationResultTableDialog.h
+@@ -36,6 +36,7 @@
+ #include <QEvent>
+ #include <qevent.h>
+ 
++#ifndef Q_MOC_RUN
+ #include "CoRegistrationResultTableDialogUi.h"
+ #include "SaveFileDialog.h"
+ 
+@@ -43,6 +44,7 @@
+ #include "data-mining/OpaqueDataToQString.h"
+ 
+ #include "presentation/VisualLayer.h"
++#endif
+ 
+ namespace GPlatesPresentation
+ {
+--- a/src/qt-widgets/DrawStyleDialog.h
++++ b/src/qt-widgets/DrawStyleDialog.h
+@@ -33,6 +33,7 @@
+ #include <QMutex>
+ #include <QMutexLocker>
+ 
++#ifndef Q_MOC_RUN
+ #include "DrawStyleDialogUi.h"
+ #include "GPlatesDialog.h"
+ #include "PythonArgumentWidget.h"
+@@ -41,6 +42,7 @@
+ #include "gui/PythonConfiguration.h"
+ 
+ #include "presentation/Application.h"
++#endif
+ 
+ namespace GPlatesAppLogic
+ {
+--- a/src/qt-widgets/EditTableActionWidget.h
++++ b/src/qt-widgets/EditTableActionWidget.h
+@@ -27,8 +27,11 @@
+ #define GPLATES_QTWIDGETS_EDITTABLEACTIONWIDGET_H
+ 
+ #include <QWidget>
++
++#ifndef Q_MOC_RUN
+ #include "app-logic/ApplicationState.h"
+ #include "EditTableActionWidgetUi.h"
++#endif
+ 
+ namespace GPlatesQtWidgets
+ {
+--- a/src/qt-widgets/GlobeCanvas.h
++++ b/src/qt-widgets/GlobeCanvas.h
+@@ -41,6 +41,7 @@
+ #include <QPainter>
+ #include <QtOpenGL/qgl.h>
+ 
++#ifndef Q_MOC_RUN
+ #include "gui/ColourScheme.h"
+ #include "gui/Globe.h"
+ #include "gui/ViewportZoom.h"
+@@ -58,6 +59,7 @@
+ #include "qt-widgets/SceneView.h"
+ 
+ #include "view-operations/RenderedGeometryFactory.h"
++#endif
+ 
+ 
+ namespace GPlatesGui
+--- a/src/qt-widgets/LogDialog.h
++++ b/src/qt-widgets/LogDialog.h
+@@ -34,7 +34,9 @@
+ #include "GPlatesDialog.h"
+ #include "LogDialogUi.h"
+ 
++#ifndef Q_MOC_RUN
+ #include "app-logic/ApplicationState.h"
++#endif
+ 
+ 
+ namespace GPlatesGui
+--- a/src/qt-widgets/MapCanvas.h
++++ b/src/qt-widgets/MapCanvas.h
+@@ -39,6 +39,7 @@
+ #include <QSize>
+ #include <QTransform>
+ 
++#ifndef Q_MOC_RUN
+ #include "gui/ColourScheme.h"
+ #include "gui/Map.h"
+ #include "gui/TextOverlay.h"
+@@ -47,6 +48,7 @@
+ #include "opengl/GLMatrix.h"
+ #include "opengl/GLOffScreenContext.h"
+ #include "opengl/GLVisualLayers.h"
++#endif
+ 
+ 
+ namespace GPlatesGui
+--- a/src/qt-widgets/MapView.h
++++ b/src/qt-widgets/MapView.h
+@@ -36,6 +36,7 @@
+ #include <QGLWidget>
+ #include <QMouseEvent>
+ 
++#ifndef Q_MOC_RUN
+ #include "gui/ColourScheme.h"
+ 
+ #include "maths/LatLonPoint.h"
+@@ -44,6 +45,7 @@
+ #include "opengl/GLVisualLayers.h"
+ 
+ #include "qt-widgets/SceneView.h"
++#endif
+ 
+ 
+ namespace GPlatesGui
+--- a/src/qt-widgets/MergeReconstructionLayersDialog.h
++++ b/src/qt-widgets/MergeReconstructionLayersDialog.h
+@@ -33,7 +33,9 @@
+ 
+ #include "MergeReconstructionLayersDialogUi.h"
+ 
++#ifndef Q_MOC_RUN
+ #include "app-logic/Layer.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/RasterLayerOptionsWidget.h
++++ b/src/qt-widgets/RasterLayerOptionsWidget.h
+@@ -31,6 +31,7 @@
+ #include <QString>
+ #include <QToolButton>
+ 
++#ifndef Q_MOC_RUN
+ #include "RasterLayerOptionsWidgetUi.h"
+ 
+ #include "LayerOptionsWidget.h"
+@@ -40,6 +41,7 @@
+ 
+ #include "gui/BuiltinColourPaletteType.h"
+ #include "gui/RasterColourPalette.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h
++++ b/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h
+@@ -28,6 +28,7 @@
+ 
+ #include <utility>
+ 
++#ifndef Q_MOC_RUN
+ #include "ReconstructScalarCoverageLayerOptionsWidgetUi.h"
+ 
+ #include "LayerOptionsWidget.h"
+@@ -37,6 +38,7 @@
+ 
+ #include "gui/BuiltinColourPaletteType.h"
+ #include "gui/RasterColourPalette.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/ScalarField3DLayerOptionsWidget.h
++++ b/src/qt-widgets/ScalarField3DLayerOptionsWidget.h
+@@ -30,6 +30,7 @@
+ #include <vector>
+ #include <QSlider>
+ 
++#ifndef Q_MOC_RUN
+ #include "ScalarField3DLayerOptionsWidgetUi.h"
+ 
+ #include "LayerOptionsWidget.h"
+@@ -41,6 +42,7 @@
+ #include "gui/RasterColourPalette.h"
+ 
+ #include "view-operations/ScalarField3DRenderParameters.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/TotalReconstructionPolesDialog.h
++++ b/src/qt-widgets/TotalReconstructionPolesDialog.h
+@@ -32,12 +32,14 @@
+ #include <boost/weak_ptr.hpp>
+ #include <QDialog>
+ 
++#ifndef Q_MOC_RUN
+ #include "TotalReconstructionPolesDialogUi.h"
+ 
+ #include "GPlatesDialog.h"
+ #include "SaveFileDialog.h"
+ 
+ #include "presentation/VisualLayer.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/VisualLayersComboBox.h
++++ b/src/qt-widgets/VisualLayersComboBox.h
+@@ -32,8 +32,10 @@
+ #include <QComboBox>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "presentation/VisualLayer.h"
+ #include "presentation/VisualLayerType.h"
++#endif
+ 
+ 
+ namespace GPlatesPresentation
+--- a/src/qt-widgets/VisualLayerWidget.h
++++ b/src/qt-widgets/VisualLayerWidget.h
+@@ -36,11 +36,13 @@
+ #include <QMenu>
+ #include <QStackedWidget>
+ 
++#ifndef Q_MOC_RUN
+ #include "VisualLayerWidgetUi.h"
+ 
+ #include "app-logic/Layer.h"
+ 
+ #include "gui/Colour.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/view-operations/InternalGeometryBuilder.h
++++ b/src/view-operations/InternalGeometryBuilder.h
+@@ -30,9 +30,11 @@
+ #include <vector>
+ #include <boost/optional.hpp>
+ 
++#ifndef Q_MOC_RUN
+ #include "maths/GeometryOnSphere.h"
+ #include "maths/GeometryType.h"
+ #include "maths/PointOnSphere.h"
++#endif
+ 
+ namespace GPlatesViewOperations
+ {
+--- a/src/view-operations/RenderedGeometryCollection.h
++++ b/src/view-operations/RenderedGeometryCollection.h
+@@ -39,7 +39,9 @@
+ #include <boost/foreach.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "RenderedGeometryLayer.h"
++#endif
+ 
+ namespace GPlatesViewOperations
+ {
+--- a/src/view-operations/RenderedGeometryFactory.h
++++ b/src/view-operations/RenderedGeometryFactory.h
+@@ -33,6 +33,7 @@
+ #include <QString>
+ #include <QFont>
+ 
++#ifndef Q_MOC_RUN
+ #include "RenderedGeometry.h"
+ #include "RenderedColouredEdgeSurfaceMesh.h"
+ #include "RenderedColouredTriangleSurfaceMesh.h"
+@@ -62,6 +63,7 @@
+ #include "property-values/TextContent.h"
+ 
+ #include "view-operations/ScalarField3DRenderParameters.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/view-operations/RenderedGeometryLayer.h
++++ b/src/view-operations/RenderedGeometryLayer.h
+@@ -35,10 +35,12 @@
+ #include <boost/optional.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "RenderedGeometry.h"
+ 
+ #include "maths/CubeQuadTreeLocation.h"
+ 
++#endif
+ 
+ namespace GPlatesMaths
+ {
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
new file mode 100644
index 00000000000..9dd7b6b72db
--- /dev/null
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal, proj, boost, cmake, python2, doxygen, graphviz, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "gplates-${version}";
+  version = "2.0.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gplates/${name}-unixsrc.tar.bz2";
+    sha256 = "02scnjj5nlc2d2c8lbx0xvj8gg1bgkjliv3wxsx564c55a9x69qw";
+  };
+
+  patches = [
+    ./boostfix.patch
+  ];
+
+  buildInputs = [ qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ];
+
+  meta = with stdenv.lib; {
+    description = "Desktop software for the interactive visualisation of plate-tectonics";
+    homepage = https://www.gplates.org;
+    license = licenses.gpl2;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0afba55879f..c1143ab7a75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16894,6 +16894,8 @@ in
 
   fityk = callPackage ../applications/science/misc/fityk { };
 
+  gplates = callPackage ../applications/science/misc/gplates { };
+
   gravit = callPackage ../applications/science/astronomy/gravit { };
 
   golly = callPackage ../applications/science/misc/golly { };

From c39e36f766deda952f268791b9eb681f688296aa Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sat, 17 Dec 2016 12:57:27 +0000
Subject: [PATCH 0037/1310] {lib}mediainfo{-gui},libzen: 0.7.87 -> 0.7.91,
 0.4.33 -> 0.4.34

Unfortunately I've not been able to keep this updated on a regular basis
at the moment, therefore some versions have been skipped. I'm therefore
going to just add the link for the changelog:

https://mediaarea.net/MediaInfo/ChangeLog
---
 pkgs/applications/misc/mediainfo-gui/default.nix    | 4 ++--
 pkgs/applications/misc/mediainfo/default.nix        | 4 ++--
 pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
 pkgs/development/libraries/libzen/default.nix       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 2fe806649c2..e60d1619685 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
 , desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.87";
+  version = "0.7.91";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "1ws4hyfcw289hax0bq8y3bbw5y321xmh0va1x4zv5rjwfzcd51pv";
+    sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 77c1badbf40..0ddee228e9d 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.87";
+  version = "0.7.91";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "1ws4hyfcw289hax0bq8y3bbw5y321xmh0va1x4zv5rjwfzcd51pv";
+    sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 90869a4c8a5..f57a49ab812 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.87";
+  version = "0.7.91";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "1gvjvc809mrhpcqr62cihhc6jnwml197xjbgydnzvsghih8dq8s9";
+    sha256 = "1h39cwd85rgidr0hbwab9dwbjv25xhvjv8y2nv35p3fwrs48p098";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix
index 23597c2e03b..5bb3f79f790 100644
--- a/pkgs/development/libraries/libzen/default.nix
+++ b/pkgs/development/libraries/libzen/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.33";
+  version = "0.4.34";
   name = "libzen-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2";
-    sha256 = "0py5iagajz6m5zh26svkjyy85k1dmyhi6cdbmc3cb56a4ix1k2d2";
+    sha256 = "02krmhl6dplidz6h251ajpzzdhzzm0hp0lwwv9rgn55xjgh4yxw3";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 3a0f1975b09c4e0c7c68e4231b5c988a34af1ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 17 Dec 2016 20:29:40 +0100
Subject: [PATCH 0038/1310] Revert "Revert "Merge pull request #21234 from
 l2dy/coreutils-up""

This reverts commit ffb90e8c4fc0c8ed2d0fb817e5dafbded1c5a6c8.
This moves the coreutils update from master.
---
 pkgs/tools/misc/coreutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 8f09a677b8e..ec6be06ede3 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -13,11 +13,11 @@ with lib;
 
 let
   self = stdenv.mkDerivation rec {
-    name = "coreutils-8.25";
+    name = "coreutils-8.26";
 
     src = fetchurl {
       url = "mirror://gnu/coreutils/${name}.tar.xz";
-      sha256 = "11yfrnb94xzmvi4lhclkcmkqsbhww64wf234ya1aacjvg82prrii";
+      sha256 = "13lspazc7xkviy93qz7ks9jv4sldvgmwpq36ghrbrqpq93br8phm";
     };
 
     # FIXME needs gcc 4.9 in bootstrap tools

From 515573ef7f993787abacf31e3235ccfa59bc967e Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Sat, 17 Dec 2016 21:50:23 +0000
Subject: [PATCH 0039/1310] pg_similarity: init at 1.0

---
 .../sql/postgresql/pg_similarity/default.nix  | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/servers/sql/postgresql/pg_similarity/default.nix

diff --git a/pkgs/servers/sql/postgresql/pg_similarity/default.nix b/pkgs/servers/sql/postgresql/pg_similarity/default.nix
new file mode 100644
index 00000000000..32945c9fa62
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/pg_similarity/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, gcc, postgresql }:
+
+stdenv.mkDerivation {
+
+  name = "pg_similarity-1.0";
+  src = fetchFromGitHub {
+    owner = "eulerto";
+    repo = "pg_similarity";
+    rev = "be1a8b08c8716e59b89982557da9ea68cdf868c5";
+    sha256 = "1z4v4r2yccdr8kz3935fnk1bc5vj0qj0apscldyap4wxlyi89xim";
+  };
+
+  buildInputs = [ postgresql gcc ];
+  buildPhase = "USE_PGXS=1 make";
+  installPhase = ''
+    mkdir -p $out/bin   # for buildEnv to setup proper symlinks
+    install -D pg_similarity.so -t $out/lib/
+    install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/extension
+  '';
+
+  meta = {
+    description = ''
+       pg_similarity is an extension to support similarity queries on PostgreSQL. The implementation
+       is tightly integrated in the RDBMS in the sense that it defines operators so instead of the traditional
+       operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function).
+    '';
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ danbst ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f81a39bf9d..1771ce7eb2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8892,6 +8892,8 @@ in
 
   pg_repack = callPackage ../servers/sql/postgresql/pg_repack {};
 
+  pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {};
+
   phonon = callPackage ../development/libraries/phonon {};
 
   phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {};

From 3ef134a19b197832521674d88e55a95785653c76 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sun, 18 Dec 2016 16:19:15 +0100
Subject: [PATCH 0040/1310] ocaml-pcre: fix name

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

diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index dd152262ca7..d2e0e0aa727 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -1,7 +1,7 @@
 {stdenv, buildOcaml, fetchurl, pcre, ocaml, findlib}:
 
 buildOcaml {
-  name = "ocaml-pcre";
+  name = "pcre";
   version = "7.1.1";
 
   src = fetchurl {

From 7e54f35d65737f55525f8328dd9309bdb93b5ff9 Mon Sep 17 00:00:00 2001
From: Adam Beckmeyer <adam_git@thebeckmeyers.xyz>
Date: Sun, 18 Dec 2016 17:08:33 -0500
Subject: [PATCH 0041/1310] mm: init at 2016.11.04

---
 .../instant-messengers/mm/default.nix         | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/mm/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix
new file mode 100644
index 00000000000..a75835b3c7e
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/mm/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildGoPackage, fetchFromGitLab }:
+
+buildGoPackage rec {
+  name = "mm-${version}";
+  version = "2016.11.04";
+
+  goPackagePath = "gitlab.com/meutraa/mm";
+
+  src = fetchFromGitLab {
+    owner = "meutraa";
+    repo = "mm";
+    rev = "473fdd97285168054b672dbad2ffc4047324c518";
+    sha256 = "1s8v5gxpw1sms1g3i8nq2x2mmmyz97qkmxs1fzlspfcd6i8vknkp";
+  };
+
+  meta = {
+    description = "A file system based matrix client";
+    homepage = https://gitlab.com/meutraa/mm;
+    license = stdenv.lib.licenses.isc;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 210fdcde7f6..21227775ef9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13971,6 +13971,8 @@ in
 
   normalize = callPackage ../applications/audio/normalize { };
 
+  mm = callPackage ../applications/networking/instant-messengers/mm { };
+
   mplayer = callPackage ../applications/video/mplayer ({
     pulseSupport = config.pulseaudio or false;
     libdvdnav = libdvdnav_4_2_1;

From 4c1d8b4347cf4a3e566165bb16551108ea4b4af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Tue, 20 Dec 2016 00:28:23 +0100
Subject: [PATCH 0042/1310] idrisPackages.httpclient: init

---
 pkgs/development/idris-modules/httpclient.nix | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/development/idris-modules/httpclient.nix

diff --git a/pkgs/development/idris-modules/httpclient.nix b/pkgs/development/idris-modules/httpclient.nix
new file mode 100644
index 00000000000..ec41956b963
--- /dev/null
+++ b/pkgs/development/idris-modules/httpclient.nix
@@ -0,0 +1,30 @@
+{ pkgs
+, build-idris-package
+, fetchFromGitHub
+, lightyear
+, contrib
+, lib
+, idris
+}:
+
+let
+  date = "2016-12-20";
+in
+build-idris-package {
+  name = "httpclient-${date}";
+
+  src = fetchFromGitHub {
+    owner = "justjoheinz";
+    repo = "idris-httpclient";
+    rev = "4a7296d572d7f7fde87d27da07d5c9566dc4ff14";
+    sha256 = "0sy0q7gri9lwbqdmx9720pby3w1470w7wzn62bf2rir532219hhl";
+  };
+
+  propagatedBuildInputs = [ pkgs.curl lightyear contrib ];
+
+  meta = {
+    description = "HTTP Client for Idris";
+    homepage = https://github.com/justjoheinz/idris-httpclient;
+    inherit (idris.meta) platforms;
+  };
+}

From a737eff5c194c87cb7858b76a8deabc80487680a Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <phanimahesh@gmail.com>
Date: Tue, 20 Dec 2016 12:26:24 +0530
Subject: [PATCH 0043/1310] python:html5lib: 0.999 -> 0.999999999

fixes LWN vuln:709146
ref #21289: Vulnerability roundup 14
---
 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 82d5649120d..271e354e02f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12485,12 +12485,12 @@ in {
 
 
   html5lib = buildPythonPackage (rec {
-    version = "0.999";
+    version = "0.999999999";
     name = "html5lib-${version}";
 
     src = pkgs.fetchurl {
       url = "http://github.com/html5lib/html5lib-python/archive/${version}.tar.gz";
-      sha256 = "1kxl36p0csssaf37zbbc9p4h8l1s7yb1qnfv3d4nixplvrxqkybp";
+      sha256 = "09j6194f5mlnd5xwbavwvnndwl1x91jw74shxl6hcxjp4fxg3h05";
     };
 
     buildInputs = with self; [ nose flake8 ];

From ec4d73573ae944611346bef8d769994b3bc1ec41 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Tue, 20 Dec 2016 14:16:27 +0100
Subject: [PATCH 0044/1310] boost: default version 1.62.0

---
 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 d6e770ac404..34431f8de6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6732,7 +6732,7 @@ in
   boost159 = callPackage ../development/libraries/boost/1.59.nix { };
   boost160 = callPackage ../development/libraries/boost/1.60.nix { };
   boost162 = callPackage ../development/libraries/boost/1.62.nix { };
-  boost = boost160;
+  boost = boost162;
 
   boost_process = callPackage ../development/libraries/boost-process { };
 

From 76c4b5fcca06441e00e1d27d44f3a601915f8d66 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Tue, 20 Dec 2016 16:20:08 +0100
Subject: [PATCH 0045/1310] cmake: 3.6.2 -> 3.7.1

---
 .../tools/build-managers/cmake/default.nix            | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 1e4bacb0725..fbc6f5be5ca 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig
-, bzip2, curl, expat, libarchive, xz, zlib
+, bzip2, curl, expat, libarchive, xz, zlib, libuv
 , useNcurses ? false, ncurses, useQt4 ? false, qt4
 , wantPS ? false, ps ? null
 }:
@@ -12,8 +12,8 @@ assert stdenv.cc ? libc;
 
 let
   os = stdenv.lib.optionalString;
-  majorVersion = "3.6";
-  minorVersion = "2";
+  majorVersion = "3.7";
+  minorVersion = "1";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "0imkz04ncz6cv5659qfd4scm99k3siq7zrrsa8pvp663d8mf76hq";
+    # from https://cmake.org/files/v3.7/cmake-3.7.1-SHA-256.txt
+    sha256 = "449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1";
   };
 
   # Don't search in non-Nix locations such as /usr, but do search in our libc.
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   buildInputs =
-    [ setupHook pkgconfig bzip2 curl expat libarchive xz zlib ]
+    [ setupHook pkgconfig bzip2 curl expat libarchive xz zlib libuv ]
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 

From 8a5fb68b0cdd235f7cd930a25075c96fd356976c Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Tue, 20 Dec 2016 16:53:32 +0100
Subject: [PATCH 0046/1310] mariadb: use latest boost

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34431f8de6e..72355e8a7e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10289,7 +10289,6 @@ in
   mariadb = callPackage ../servers/sql/mariadb {
     inherit (darwin) cctools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
-    boost = boost159;
   };
 
   mongodb = callPackage ../servers/nosql/mongodb {

From a60500ce7028a1888aa2e367cf69c53dd93e01b6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 20 Dec 2016 17:59:33 +0300
Subject: [PATCH 0047/1310] cyrus_sasl: 2.1.26 -> 2.5.10

---
 pkgs/development/libraries/cyrus-sasl/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 5bbfd6e375e..05eb575547d 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -2,7 +2,8 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "cyrus-sasl-2.1.26${optionalString (kerberos == null) "-without-kerberos"}";
+  name = "cyrus-sasl-${version}${optionalString (kerberos == null) "-without-kerberos"}";
+  version = "2.5.10";
 
   src = fetchurl {
     url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz";

From f84344ed41ec43319d08a396b42c7a35d9154544 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 20 Dec 2016 17:59:51 +0300
Subject: [PATCH 0048/1310] libkrb5: 1.14.3 -> 1.15

---
 pkgs/development/libraries/kerberos/krb5.nix  |  9 ++---
 .../libraries/kerberos/path_char_fix.patch    | 38 -------------------
 2 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/development/libraries/kerberos/path_char_fix.patch

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 8fda2b7e584..1b8c274c457 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -11,11 +11,12 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "${type}krb5-${version}";
-  version = "1.14.3";
+  majorVersion = "1.15";
+  version = "${majorVersion}";
 
   src = fetchurl {
-    url = "${meta.homepage}dist/krb5/1.14/krb5-${version}.tar.gz";
-    sha256 = "1jgjiyh1sp72lkxvk437lz5hzcibvw99jc4ihzfz03fg43aj0ind";
+    url = "${meta.homepage}dist/krb5/${majorVersion}/krb5-${version}.tar.gz";
+    sha256 = "0z0jxm6ppbxi9anv2h12nrb5lpwl95f96kw6dx7sn268fhkpad7x";
   };
 
   configureFlags = optional stdenv.isFreeBSD ''WARN_CFLAGS=""'';
@@ -26,8 +27,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl ]
     ++ optionals (!libOnly) [ openldap libedit ];
 
-  patches = [ ./path_char_fix.patch ];
-
   preConfigure = "cd ./src";
 
   buildPhase = optionalString libOnly ''
diff --git a/pkgs/development/libraries/kerberos/path_char_fix.patch b/pkgs/development/libraries/kerberos/path_char_fix.patch
deleted file mode 100644
index 2a6dc4c11c3..00000000000
--- a/pkgs/development/libraries/kerberos/path_char_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-See https://github.com/krb5/krb5/pull/467
-diff --git a/src/include/Makefile.in b/src/include/Makefile.in
-index 4bb11e4..cb4b44b 100644
---- a/src/include/Makefile.in
-+++ b/src/include/Makefile.in
-@@ -57,19 +57,19 @@ SBINDIR = @sbindir@
- LIBDIR  = @libdir@
- SYSCONFCONF = @SYSCONFCONF@
- 
--PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
--		  -e "s+@PREFIX+$(INSTALL_PREFIX)+" \
--		  -e "s+@EXEC_PREFIX+$(INSTALL_EXEC_PREFIX)+" \
--		  -e "s+@BINDIR+$(BINDIR)+" \
--		  -e "s+@LIBDIR+$(LIBDIR)+" \
--		  -e "s+@SBINDIR+$(SBINDIR)+" \
--		  -e "s+@MODULEDIR+$(MODULE_DIR)+" \
--		  -e "s+@GSSMODULEDIR+$(GSS_MODULE_DIR)+" \
--		  -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
--		  -e 's+@RUNSTATEDIR+$(RUNSTATEDIR)+' \
--		  -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' \
--		  -e 's+@DYNOBJEXT+$(DYNOBJEXT)+' \
--		  -e 's+@SYSCONFCONF+$(SYSCONFCONF)+'
-+PROCESS_REPLACE = -e "s\"@KRB5RCTMPDIR\"$(KRB5RCTMPDIR)\"" \
-+		  -e "s\"@PREFIX\"$(INSTALL_PREFIX)\"" \
-+		  -e "s\"@EXEC_PREFIX\"$(INSTALL_EXEC_PREFIX)\"" \
-+		  -e "s\"@BINDIR\"$(BINDIR)\"" \
-+		  -e "s\"@LIBDIR\"$(LIBDIR)\"" \
-+		  -e "s\"@SBINDIR\"$(SBINDIR)\"" \
-+		  -e "s\"@MODULEDIR\"$(MODULE_DIR)\"" \
-+		  -e "s\"@GSSMODULEDIR\"$(GSS_MODULE_DIR)\"" \
-+		  -e "s\"@LOCALSTATEDIR\"$(LOCALSTATEDIR)\"" \
-+		  -e "s\"@RUNSTATEDIR\"$(RUNSTATEDIR)\"" \
-+		  -e "s\"@SYSCONFDIR\"$(SYSCONFDIR)\"" \
-+		  -e "s\"@DYNOBJEXT\"$(DYNOBJEXT)\"" \
-+		  -e "s\"@SYSCONFCONF\"$(SYSCONFCONF)\""
- 
- OSCONFSRC = $(srcdir)/osconf.hin
- 

From b0a1028a1a18932aced53f36f0a80a3a213f91e4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 20 Dec 2016 18:00:04 +0300
Subject: [PATCH 0049/1310] samba4: 4.4.6 -> 4.5.3

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

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 2dfdf3709ee..51bee4f0b4c 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -19,11 +19,11 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "samba-${version}";
-  version = "4.4.6";
+  version = "4.5.3";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "1361ijz7vpgf66w3j9z7qb37rnlrydxw01ibjnfhjqqcb7fj7i1p";
+    sha256 = "1jif95684swssqwp9v3i2r08cn3r2iddf6ly68db4wmvl5ac8vgh";
   };
 
   outputs = [ "out" "dev" "man" ];

From 489ba1744cc2d007802934aa333d2f308da200b9 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Tue, 20 Dec 2016 16:27:04 -0800
Subject: [PATCH 0050/1310] top-level: missing parentheses

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

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 658f149908c..db3abb531f1 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -49,8 +49,8 @@ in let
   # reasonable default.
   platform =
     args.platform
-    or (config.platform
-    or (import ./platforms.nix).selectPlatformBySystem system);
+    or ( config.platform
+      or ((import ./platforms.nix).selectPlatformBySystem system) );
 
   # A few packages make a new package set to draw their dependencies from.
   # (Currently to get a cross tool chain, or forced-i686 package.) Rather than

From 7609b9aaa3c74aa37740b9880536063b9bf4749e Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Wed, 21 Dec 2016 15:04:45 +0100
Subject: [PATCH 0051/1310] sauce-connect: 4.4.0 -> 4.4.2

---
 pkgs/development/tools/sauce-connect/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index d573a6c5b60..f8569249c06 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -4,18 +4,18 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "sauce-connect-${version}";
-  version = "4.4.0";
+  version = "4.4.2";
 
   src = fetchurl (
     if stdenv.system == "x86_64-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz";
-      sha256 = "19zgnw0qn5f775p581mq5ry086rhcnnhqc6x82hzmwfysbsyl7xs";
+      sha256 = "0n3c9ihrxqy4y4mzgchggqa2v7c0y9jw2yqnjdd7cf4nd24fixbq";
     } else if stdenv.system == "i686-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz";
-      sha256 = "1m4nf1yidwkmlwald0ycwzvnsp5p93nc4bs1xh67phw0b2db99x9";
+      sha256 = "1pdvx4apd4x1bsyl8lhzlpv3jp3xzyv7yrsl3wjrql17p2asaba6";
     } else {
       url = "https://saucelabs.com/downloads/sc-${version}-osx.zip";
-      sha256 = "1bpdpwqa9sw2n7vw2g8q4c1mzgh8wgwn4p7sbryc2ki90yz8ibga";
+      sha256 = "03kn7i0a6mpxfc6mz9h560wadhmw5qxn15is7cl9kgkz5j874xlz";
     }
   );
 

From dd968d0365bafb3f85d0f2136a089128a4dbe54e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 21 Dec 2016 11:17:54 -0600
Subject: [PATCH 0052/1310] okular: propagate build inputs

Fixes #14390. The runtime dependencies were not being detected in the
wrapper because they were not propagated.
---
 pkgs/desktops/kde-5/applications/okular.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-5/applications/okular.nix b/pkgs/desktops/kde-5/applications/okular.nix
index b8780a7ccc1..faebf3e679b 100644
--- a/pkgs/desktops/kde-5/applications/okular.nix
+++ b/pkgs/desktops/kde-5/applications/okular.nix
@@ -11,7 +11,7 @@ let
   unwrapped = kdeApp {
     name = "okular";
     nativeBuildInputs = [ ecm kdoctools ];
-    buildInputs = [
+    propagatedBuildInputs = [
       djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
       kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
       kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler

From 2c24ce5cfa831677556a9fecec3488ea701285c1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 19 Dec 2016 17:15:57 -0500
Subject: [PATCH 0053/1310] game-music-emu: 0.6.0 -> 0.6.1 for multiple CVEs

CVE-2016-9957 CVE-2016-9958 CVE-2016-9959 CVE-2016-9960 CVE-2016-9961
---
 pkgs/applications/audio/game-music-emu/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix
index 60d9c0e7b12..4f22ca62c1a 100644
--- a/pkgs/applications/audio/game-music-emu/default.nix
+++ b/pkgs/applications/audio/game-music-emu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.0";
+  version = "0.6.1";
   name = "game-music-emu-${version}";
 
   src = fetchurl {
-    url = "https://game-music-emu.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "11s9l938nxbrk7qb2k1ppfgizcz00cakbxgv0gajc6hyqv882vjh";
+    url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${name}.tar.bz2";
+    sha256 = "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw";
   };
 
   buildInputs = [ cmake ];

From a528c04612b87e52fd6a07c3a31fc80a34bf00c2 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 19 Dec 2016 17:20:34 -0500
Subject: [PATCH 0054/1310] tomcat85: 8.5.8 -> 8.5.9 for CVE-2016-9774,
 CVE-2016-9775

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

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index edf1e59931e..77c644450d6 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -51,8 +51,8 @@ in {
 
   tomcat85 = common {
     versionMajor = "8";
-    versionMinor = "5.8";
-    sha256 = "1rfws897m09pbnb1jc4684didpklfhqp86szv2jcqzdx0hlfxxs0";
+    versionMinor = "5.9";
+    sha256 = "1dy8bf18jwyi6p7ayb96gbhd4iyfq4d37s3qxnlll8vklfx388np";
   };
 
   tomcatUnstable = common {

From 72faac9d358a1e2645b49c1e15ac940226f07e9b Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 19 Dec 2016 17:20:58 -0500
Subject: [PATCH 0055/1310] tomcatUnstable: 9.0.0.M13 -> 9.0.0.M15 for
 CVE-2016-9774, CVE-2016-9775

---
 pkgs/servers/http/tomcat/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 77c644450d6..909b26f162b 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -57,8 +57,7 @@ in {
 
   tomcatUnstable = common {
     versionMajor = "9";
-    versionMinor = "0.0.M13";
-    sha256 = "0im3w4iqpar7x50vg7c9zkxyqf9x53xs5jvcq79xqgrmcqb9lk91";
+    versionMinor = "0.0.M15";
+    sha256 = "1spbq5vh2dplp83ki3fbbwl0klxq36s4rwkpcjdnwjxjymg9k432";
   };
-
 }

From 2f17c3628e0cee6c5af051f21514da12f43aef6e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 20 Dec 2016 08:36:57 -0500
Subject: [PATCH 0056/1310] nagios: 4.2.3 -> 4.2.4 for CVE-2016-9566

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

diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index c4d60cabaa3..5d7becb1652 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nagios-${version}";
-  version = "4.2.3";
+  version = "4.2.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz";
-    sha256 = "0p16sm5pkbzf4py30hwzm38194cl23wfzsvkhk4jkf3p1fq7xvl3";
+    sha256 = "0w0blbwiw0ps04b7gkyyk89qkgwsxh6gydhmggbm1kl3ar3mq1dh";
   };
 
   patches = [ ./nagios.patch ];

From 0d3f0f05e20672e2f021df855fb2b8b5482637fe Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 20 Dec 2016 21:49:20 +0100
Subject: [PATCH 0057/1310] libupnp: 1.6.20 -> 1.6.21 for CVE-2016-8863

Switching to git tags means we don't get pre-generated configure
scripts. Thusly, run bootstrap ourselves.

For https://github.com/NixOS/nixpkgs/issues/21289
For CVE-2016-8863 (remote code execution)
---
 pkgs/development/libraries/pupnp/default.nix | 23 +++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index b1d2b1fd92e..389e575dbb1 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -1,15 +1,28 @@
-{ fetchurl, stdenv }:
+{ fetchFromGitHub, stdenv, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
-  name = "libupnp-1.6.20";
+  name = "libupnp-${version}";
+  version = "1.6.20";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/pupnp/${name}.tar.bz2";
-    sha256 = "0qrsdsb1qm85hc4jy04qph895613d148f0x1mmk6z99y3q43fdgf";
+  src = fetchFromGitHub {
+    owner = "mrjimenez";
+    repo = "pupnp";
+    rev = "release-${version}";
+    sha256 = "10583dkz1l5sjp2833smql8w428x2nbh1fni8j6h9rji6ma2yhs0";
   };
 
+  buildInputs = [
+    autoconf
+    automake
+    libtool
+  ];
+
   hardeningDisable = [ "fortify" ];
 
+  preConfigure = ''
+    ./bootstrap
+  '';
+
   meta = {
     description = "libupnp, an open source UPnP development kit for Linux";
 

From c7a2073323b7837214aa081840d7088c798be8d5 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 21 Dec 2016 08:16:43 -0500
Subject: [PATCH 0058/1310] openjpeg2: patch for CVE-2016-9580, and
 CVE-2016-9581

---
 pkgs/development/libraries/openjpeg/2.1.nix   |   8 +
 .../CVE-2016-9580-and-CVE-2016-9581.patch     | 242 ++++++++++++++++++
 .../libraries/openjpeg/generic.nix            |   4 +-
 3 files changed, 253 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/openjpeg/CVE-2016-9580-and-CVE-2016-9581.patch

diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix
index 00cd4103c8f..9e3c4473b31 100644
--- a/pkgs/development/libraries/openjpeg/2.1.nix
+++ b/pkgs/development/libraries/openjpeg/2.1.nix
@@ -5,4 +5,12 @@ callPackage ./generic.nix (args // rec {
   branch = "2.1";
   revision = "v2.1.2";
   sha256 = "0kdcl9sqjz0vagli4ad6bxq1r8ma086m0prpkm5x3dxp37hpjp8h";
+
+  patches = [
+    # Fetched from https://github.com/szukw000/openjpeg/commit/cadff5fb6e73398de26a92e96d3d7cac893af255
+    # Referenced from https://bugzilla.redhat.com/show_bug.cgi?id=1405135
+    # Put in our source code to make sure we don't lose it, since that
+    # referenced commit is someone else's fork, and not actually up-stream.
+    ./CVE-2016-9580-and-CVE-2016-9581.patch
+  ];
 })
diff --git a/pkgs/development/libraries/openjpeg/CVE-2016-9580-and-CVE-2016-9581.patch b/pkgs/development/libraries/openjpeg/CVE-2016-9580-and-CVE-2016-9581.patch
new file mode 100644
index 00000000000..064e7419c34
--- /dev/null
+++ b/pkgs/development/libraries/openjpeg/CVE-2016-9580-and-CVE-2016-9581.patch
@@ -0,0 +1,242 @@
+From cadff5fb6e73398de26a92e96d3d7cac893af255 Mon Sep 17 00:00:00 2001
+From: szukw000 <szukw000@arcor.de>
+Date: Fri, 9 Dec 2016 08:29:55 +0100
+Subject: [PATCH] These changes repair bugs of #871 and #872
+
+---
+ src/bin/jp2/converttif.c | 107 +++++++++++++++++++++++++++++++----------------
+ 1 file changed, 70 insertions(+), 37 deletions(-)
+
+diff --git a/src/bin/jp2/converttif.c b/src/bin/jp2/converttif.c
+index 143d3be..c690f8b 100644
+--- a/src/bin/jp2/converttif.c
++++ b/src/bin/jp2/converttif.c
+@@ -553,20 +553,18 @@ static void tif_32sto16u(const OPJ_INT32* pSrc, OPJ_UINT16* pDst, OPJ_SIZE_T len
+ 
+ int imagetotif(opj_image_t * image, const char *outfile)
+ {
+-	int width, height;
+-	int bps,adjust, sgnd;
+-	int tiPhoto;
++	uint32 width, height, bps, tiPhoto;
++	int adjust, sgnd;
+ 	TIFF *tif;
+ 	tdata_t buf;
+-	tsize_t strip_size;
++	tmsize_t strip_size, rowStride;
+ 	OPJ_UINT32 i, numcomps;
+-	OPJ_SIZE_T rowStride;
+ 	OPJ_INT32* buffer32s = NULL;
+ 	OPJ_INT32 const* planes[4];
+ 	convert_32s_PXCX cvtPxToCx = NULL;
+ 	convert_32sXXx_C1R cvt32sToTif = NULL;
+ 
+-	bps = (int)image->comps[0].prec;
++	bps = (uint32)image->comps[0].prec;
+ 	planes[0] = image->comps[0].data;
+ 	
+ 	numcomps = image->numcomps;
+@@ -674,13 +672,13 @@ int imagetotif(opj_image_t * image, const char *outfile)
+ 			break;
+ 	}
+ 	sgnd = (int)image->comps[0].sgnd;
+-	adjust = sgnd ? 1 << (image->comps[0].prec - 1) : 0;
+-	width   = (int)image->comps[0].w;
+-	height  = (int)image->comps[0].h;
++	adjust = sgnd ? (int)(1 << (image->comps[0].prec - 1)) : 0;
++	width   = (uint32)image->comps[0].w;
++	height  = (uint32)image->comps[0].h;
+ 	
+ 	TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width);
+ 	TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height);
+-	TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, numcomps);
++	TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, (uint32)numcomps);
+ 	TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
+ 	TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+ 	TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+@@ -688,8 +686,8 @@ int imagetotif(opj_image_t * image, const char *outfile)
+ 	TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1);
+ 	
+ 	strip_size = TIFFStripSize(tif);
+-	rowStride = ((OPJ_SIZE_T)width * numcomps * (OPJ_SIZE_T)bps + 7U) / 8U;
+-	if (rowStride != (OPJ_SIZE_T)strip_size) {
++	rowStride = (width * numcomps * bps + 7U) / 8U;
++	if (rowStride != strip_size) {
+ 		fprintf(stderr, "Invalid TIFF strip size\n");
+ 		TIFFClose(tif);
+ 		return 1;
+@@ -699,7 +697,7 @@ int imagetotif(opj_image_t * image, const char *outfile)
+ 		TIFFClose(tif);
+ 		return 1;
+ 	}
+-	buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)width * numcomps * sizeof(OPJ_INT32));
++	buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)(width * numcomps * sizeof(OPJ_INT32)));
+ 	if (buffer32s == NULL) {
+ 		_TIFFfree(buf);
+ 		TIFFClose(tif);
+@@ -1211,20 +1209,19 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
+ 	TIFF *tif;
+ 	tdata_t buf;
+ 	tstrip_t strip;
+-	tsize_t strip_size;
++	tmsize_t strip_size;
+ 	int j, currentPlane, numcomps = 0, w, h;
+ 	OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_UNKNOWN;
+ 	opj_image_cmptparm_t cmptparm[4]; /* RGBA */
+ 	opj_image_t *image = NULL;
+ 	int has_alpha = 0;
+-	unsigned short tiBps, tiPhoto, tiSf, tiSpp, tiPC;
+-	unsigned int tiWidth, tiHeight;
++	uint32 tiBps, tiPhoto, tiSf, tiSpp, tiPC, tiWidth, tiHeight;
+ 	OPJ_BOOL is_cinema = OPJ_IS_CINEMA(parameters->rsiz);
+ 	convert_XXx32s_C1R cvtTifTo32s = NULL;
+ 	convert_32s_CXPX cvtCxToPx = NULL;
+ 	OPJ_INT32* buffer32s = NULL;
+ 	OPJ_INT32* planes[4];
+-	OPJ_SIZE_T rowStride;
++	tmsize_t rowStride;
+ 	
+ 	tif = TIFFOpen(filename, "r");
+ 	
+@@ -1243,22 +1240,35 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
+ 	TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &tiSpp);
+ 	TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &tiPhoto);
+ 	TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &tiPC);
+-	w= (int)tiWidth;
+-	h= (int)tiHeight;
+-	
+-	if(tiBps > 16U) {
+-		fprintf(stderr,"tiftoimage: Bits=%d, Only 1 to 16 bits implemented\n",tiBps);
+-		fprintf(stderr,"\tAborting\n");
++
++	if(tiSpp == 0 || tiSpp > 4) { /* should be 1 ... 4 */
++		fprintf(stderr,"tiftoimage: Bad value for samples per pixel == %hu.\n"
++		 "\tAborting.\n", tiSpp);
++		TIFFClose(tif);
++		return NULL;
++	}
++	if(tiBps > 16U || tiBps == 0) {
++		fprintf(stderr,"tiftoimage: Bad values for Bits == %d.\n"
++		 "\tMax. 16 Bits are allowed here.\n\tAborting.\n",tiBps);
+ 		TIFFClose(tif);
+ 		return NULL;
+ 	}
+ 	if(tiPhoto != PHOTOMETRIC_MINISBLACK && tiPhoto != PHOTOMETRIC_RGB) {
+-		fprintf(stderr,"tiftoimage: Bad color format %d.\n\tOnly RGB(A) and GRAY(A) has been implemented\n",(int) tiPhoto);
++		fprintf(stderr,"tiftoimage: Bad color format %d.\n"
++		 "\tOnly RGB(A) and GRAY(A) has been implemented\n",(int) tiPhoto);
+ 		fprintf(stderr,"\tAborting\n");
+ 		TIFFClose(tif);
+ 		return NULL;
+ 	}
+-	
++	if(tiWidth == 0 || tiHeight == 0) {
++		fprintf(stderr,"tiftoimage: Bad values for width(%u) "
++		 "and/or height(%u)\n\tAborting.\n",tiWidth,tiHeight);
++		TIFFClose(tif);
++		return NULL;
++	}
++	w= (int)tiWidth;
++	h= (int)tiHeight;
++
+ 	switch (tiBps) {
+ 		case 1:
+ 		case 2:
+@@ -1312,7 +1322,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
+ 		
+ 		TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES,
+ 													&extrasamples, &sampleinfo);
+-		
++
+ 		if(extrasamples >= 1)
+ 		{
+ 			switch(sampleinfo[0])
+@@ -1333,7 +1343,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
+ 		else /* extrasamples == 0 */
+ 			if(tiSpp == 4 || tiSpp == 2) has_alpha = 1;
+ 	}
+-	
++
+ 	/* initialize image components */
+ 	memset(&cmptparm[0], 0, 4 * sizeof(opj_image_cmptparm_t));
+ 	
+@@ -1346,7 +1356,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
+ 	} else {
+ 		is_cinema = 0U;
+ 	}
+-	
++
+ 	if(tiPhoto == PHOTOMETRIC_RGB) /* RGB(A) */
+ 	{
+ 		numcomps = 3 + has_alpha;
+@@ -1384,10 +1394,24 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
+ 	image->x0 = (OPJ_UINT32)parameters->image_offset_x0;
+ 	image->y0 = (OPJ_UINT32)parameters->image_offset_y0;
+ 	image->x1 =	!image->x0 ? (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1 :
+-	image->x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1;
++	 image->x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1;
++	if(image->x1 <= image->x0) {
++		fprintf(stderr,"tiftoimage: Bad value for image->x1(%d) vs. "
++		 "image->x0(%d)\n\tAborting.\n",image->x1,image->x0);
++		TIFFClose(tif);
++		opj_image_destroy(image);
++		return NULL;
++	}
+ 	image->y1 =	!image->y0 ? (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1 :
+-	image->y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1;
+-
++	 image->y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1;
++	if(image->y1 <= image->y0) {
++		fprintf(stderr,"tiftoimage: Bad value for image->y1(%d) vs. "
++		 "image->y0(%d)\n\tAborting.\n",image->y1,image->y0);
++		TIFFClose(tif);
++		opj_image_destroy(image);
++		return NULL;
++	}
++	
+ 	for(j = 0; j < numcomps; j++)
+ 	{
+ 		planes[j] = image->comps[j].data;
+@@ -1395,15 +1419,15 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
+ 	image->comps[numcomps - 1].alpha = (OPJ_UINT16)(1 - (numcomps & 1));
+ 		
+ 	strip_size = TIFFStripSize(tif);
+-	
++
+ 	buf = _TIFFmalloc(strip_size);
+ 	if (buf == NULL) {
+ 		TIFFClose(tif);
+ 		opj_image_destroy(image);
+ 		return NULL;
+ 	}
+-	rowStride = ((OPJ_SIZE_T)w * tiSpp * tiBps + 7U) / 8U;
+-	buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)w * tiSpp * sizeof(OPJ_INT32));
++	rowStride = (w * tiSpp * tiBps + 7U) / 8U;
++	buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)(w * tiSpp * sizeof(OPJ_INT32)));
+ 	if (buffer32s == NULL) {
+ 		_TIFFfree(buf);
+ 		TIFFClose(tif);
+@@ -1421,11 +1445,20 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
+ 		for(; (h > 0) && (strip < TIFFNumberOfStrips(tif)); strip++)
+ 		{
+ 				const OPJ_UINT8 *dat8;
+-				OPJ_SIZE_T ssize;
++				tmsize_t ssize;
+ 				
+-				ssize = (OPJ_SIZE_T)TIFFReadEncodedStrip(tif, strip, buf, strip_size);
++				ssize = TIFFReadEncodedStrip(tif, strip, buf, strip_size);
++				if(ssize < 1 || ssize > strip_size) {
++					fprintf(stderr,"tiftoimage: Bad value for ssize(%ld) "
++                     "vs. strip_size(%ld).\n\tAborting.\n",ssize,strip_size);
++					_TIFFfree(buf);
++					_TIFFfree(buffer32s);
++					TIFFClose(tif);
++					opj_image_destroy(image);
++					return NULL;
++				}
+ 				dat8 = (const OPJ_UINT8*)buf;
+-				
++
+ 				while (ssize >= rowStride) {
+ 					cvtTifTo32s(dat8, buffer32s, (OPJ_SIZE_T)w * tiSpp);
+ 					cvtCxToPx(buffer32s, planes, (OPJ_SIZE_T)w);
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index c70bab523cb..96cf0451ebf 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -11,7 +11,7 @@
 , testsSupport ? false
 , jdk ? null
 # Inherit generics
-, branch, version, revision, sha256, ...
+, branch, version, revision, sha256, patches ? [], ...
 }:
 
 assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null;
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
+  inherit patches;
+
   outputs = [ "out" "dev" ];
 
   cmakeFlags = [

From 4e6c7faf3680ecc4eff79ee0f5b1f1d05ace6a52 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 21 Dec 2016 08:56:03 -0500
Subject: [PATCH 0059/1310] xen: patch for many XSAs

 - XSA-190
 - XSA-191
 - XSA-192
 - XSA-193
 - XSA-195
 - XSA-196
 - XSA-198
 - XSA-200
 - XSA_202
 - XSA-204
---
 pkgs/applications/virtualization/xen/4.5.nix | 84 +++++++++++++++-----
 1 file changed, 65 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index 7b89fabaa1c..dc9d92534f0 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -2,8 +2,19 @@
 
 let
   # Xen 4.5.5
+  #
+  # Patching XEN? Check the XSAs and try applying all the ones we
+  # don't have yet.
+  #
+  # XSAs at: https://xenbits.xen.org/xsa/
   xenConfig = rec {
     version = "4.5.5";
+
+    xsaPatch = { name , sha256 }: (fetchpatch {
+      url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
+      inherit sha256;
+    });
+
     name = "xen-${version}";
 
     src = fetchurl {
@@ -52,25 +63,60 @@ let
         }
       ];
 
-    xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
-                   ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
-                   ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
-                   (fetchpatch {
-                     url = "https://bugzilla.redhat.com/attachment.cgi?id=1218547";
-                     name = "CVE-2016-9385.patch";
-                     sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
-                   })
-                   (fetchpatch {
-                     url = "https://bugzilla.redhat.com/attachment.cgi?id=1218536";
-                     name = "CVE-2016-9377-CVE-2016-9378-part1.patch";
-                     sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
-                   })
-                   (fetchpatch {
-                     url = "https://bugzilla.redhat.com/attachment.cgi?id=1218537";
-                     name = "CVE-2016-9377-CVE-2016-9378-part2.patch";
-                     sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
-                   })
-                 ];
+      # Note this lacks patches for:
+      # XSA-201
+      # XSA-199
+      # XSA-197
+      # they didn't apply, and there are plenty of other patches here
+      # to get this deployed as-is.
+      xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
+                     ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
+                     ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
+                     (xsaPatch {
+                       name = "190-4.5";
+                       sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm";
+                     })
+                     (xsaPatch {
+                       name = "191-4.6";
+                       sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg";
+                     })
+                     (xsaPatch {
+                       name = "192-4.5";
+                       sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm";
+                     })
+                     (xsaPatch {
+                       name = "193-4.5";
+                       sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
+                     })
+                     (xsaPatch {
+                       name = "195";
+                       sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7";
+                     })
+                     (xsaPatch {
+                       name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject";
+                       sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
+                     })
+                     (xsaPatch {
+                       name = "196-0002-x86-svm-Fix-injection-of-software-interrupts";
+                       sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
+                     })
+                     (xsaPatch {
+                       name = "198";
+                       sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9";
+                     })
+                     (xsaPatch {
+                       name = "200-4.6";
+                       sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7";
+                     })
+                     (xsaPatch {
+                       name = "202-4.6";
+                       sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f";
+                     })
+                     (xsaPatch {
+                       name = "204-4.5";
+                       sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
+                     })
+                   ];
   };
 
 in callPackage ./generic.nix (args // { xenConfig=xenConfig; })

From ecc7b3364c5b43f2ea7bfeac9dbdb23eccb73947 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Dec 2016 18:59:35 +0100
Subject: [PATCH 0060/1310] pythonPackages.bottle: 0.12.9 -> 0.12.11 for
 CVE-2016-9964

---
 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 3d44ad0707f..8adec68bdcd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3059,12 +3059,12 @@ in {
   };
 
   bottle = buildPythonPackage rec {
-    version = "0.12.9";
+    version = "0.12.11";
     name = "bottle-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/bottle/${name}.tar.gz";
-      sha256 = "0l80a1qkg7zbi8s077brfgm5w4ypwxgq9rvsvw16snc5jfsj82py";
+      sha256 = "0cd787lzggs933qfav6xicx5c78dz6npwgg3xc4rhah44nbqz5d1";
     };
 
     propagatedBuildInputs = with self; [ setuptools ];

From ea46420fc0f099e7fb73c6594a8340544c3ae4a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 21 Dec 2016 20:49:08 +0100
Subject: [PATCH 0061/1310] Use overlayfs instead of unionfs-fuse in the VM
 tests

Overlayfs is quite a bit faster, e.g. with it the KDE 5 test takes ~7m
instead of ~30m on my laptop (which is still not great, since plain
9pfs is ~4m30s).
---
 nixos/modules/virtualisation/qemu-vm.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 6423432c78b..041c7dbec70 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -278,7 +278,7 @@ in
         description =
           ''
             If enabled, the Nix store in the VM is made writable by
-            layering a unionfs-fuse/tmpfs filesystem on top of the host's Nix
+            layering an overlay filesystem on top of the host's Nix
             store.
           '';
       };
@@ -395,6 +395,13 @@ in
         chmod 1777 $targetRoot/tmp
 
         mkdir -p $targetRoot/boot
+
+        ${optionalString cfg.writableStore ''
+          echo "mounting overlay filesystem on /nix/store..."
+          mkdir -p 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store
+          mount -t overlay overlay $targetRoot/nix/store \
+            -o lowerdir=$targetRoot/nix/.ro-store,upperdir=$targetRoot/nix/.rw-store/store,workdir=$targetRoot/nix/.rw-store/work || fail
+        ''}
       '';
 
     # After booting, register the closure of the paths in
@@ -412,7 +419,8 @@ in
       '';
 
     boot.initrd.availableKernelModules =
-      optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx";
+      optional cfg.writableStore "overlay"
+      ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx";
 
     virtualisation.bootDevice =
       mkDefault (if cfg.qemu.diskInterface == "scsi" then "/dev/sda" else "/dev/vda");
@@ -447,12 +455,6 @@ in
             options = [ "trans=virtio" "version=9p2000.L" ];
             neededForBoot = true;
           };
-      } // optionalAttrs cfg.writableStore
-      { "/nix/store" =
-          { fsType = "unionfs-fuse";
-            device = "unionfs";
-            options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ];
-          };
       } // optionalAttrs (cfg.writableStore && cfg.writableStoreUseTmpfs)
       { "/nix/.rw-store" =
           { fsType = "tmpfs";

From 2cfe735d1aa9179561c200486fba285f967ff10b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 21 Dec 2016 21:21:59 +0100
Subject: [PATCH 0062/1310] zsh: 5.3 -> 5.3.1

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

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 537df67d447..c4814046200 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "5.3";
+  version = "5.3.1";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz";
-    sha256 = "0cvkdw7x6i4m2brc9aakw8d3bmp6baziv72amlq9jd65r421bq88";
+    sha256 = "0hbqn1zg3x5i9klqfzhizk88jzy8pkg65r9k41b3cn42lg3ncsy1";
   };
 
 in
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz";
-    sha256 = "0vcsgc1ymqhq0acklhlq5skgj27z597x2a7nx5g3j6q4jvx778hx";
+    sha256 = "03h42gjqx7yb7qggi7ha0ndsggnnav1qm9vx737jwmiwzy8ab51x";
   };
 
   buildInputs = [ ncurses pcre ];

From 84ec6f836bf17966f0cf313e8f0fafe7dc337c31 Mon Sep 17 00:00:00 2001
From: Sigrid <sigrid.haflinadottir@gmail.com>
Date: Wed, 21 Dec 2016 21:44:11 +0100
Subject: [PATCH 0063/1310] spotify: 1.0.45.182 -> 1.0.45.186

---
 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 a1a4d26e2a0..1f8924cd03e 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.182.gbbd5909f-72";
+  version = "1.0.45.186.g3b5036d6-95";
 
   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 = "0vpwwla5vrx5ryx434a486l8vcgr1vxh28ri6ab4f28xrz16ipys";
+      sha256 = "0fpvz1mzyva1sypg4gjmrv0clckb0c3xwjfcxnb8gvkxx9vm56p1";
     };
 
   buildInputs = [ dpkg makeWrapper ];

From 41f55691a96ca4f37a87c8659884edf19b2c8446 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 21 Dec 2016 17:12:05 -0500
Subject: [PATCH 0064/1310] zlib: patch for CVE-2016-9840, CVE-2016-9841,
 CVE-9842, CVE-9843

---
 .../libraries/zlib/CVE-2016-9840.patch        |  71 ++++++
 .../libraries/zlib/CVE-2016-9841.patch        | 224 ++++++++++++++++++
 .../libraries/zlib/CVE-2016-9842.patch        |  29 +++
 .../libraries/zlib/CVE-2016-9843.patch        |  49 ++++
 pkgs/development/libraries/zlib/default.nix   |   8 +-
 5 files changed, 380 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/zlib/CVE-2016-9840.patch
 create mode 100644 pkgs/development/libraries/zlib/CVE-2016-9841.patch
 create mode 100644 pkgs/development/libraries/zlib/CVE-2016-9842.patch
 create mode 100644 pkgs/development/libraries/zlib/CVE-2016-9843.patch

diff --git a/pkgs/development/libraries/zlib/CVE-2016-9840.patch b/pkgs/development/libraries/zlib/CVE-2016-9840.patch
new file mode 100644
index 00000000000..a8b84ff8413
--- /dev/null
+++ b/pkgs/development/libraries/zlib/CVE-2016-9840.patch
@@ -0,0 +1,71 @@
+From 6a043145ca6e9c55184013841a67b2fef87e44c0 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Wed, 21 Sep 2016 23:35:50 -0700
+Subject: [PATCH] Remove offset pointer optimization in inftrees.c.
+
+inftrees.c was subtracting an offset from a pointer to an array,
+in order to provide a pointer that allowed indexing starting at
+the offset. This is not compliant with the C standard, for which
+the behavior of a pointer decremented before its allocated memory
+is undefined. Per the recommendation of a security audit of the
+zlib code by Trail of Bits and TrustInSoft, in support of the
+Mozilla Foundation, this tiny optimization was removed, in order
+to avoid the possibility of undefined behavior.
+---
+ inftrees.c | 18 ++++++++----------
+ 1 file changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/inftrees.c b/inftrees.c
+index 22fcd66..0d2670d 100644
+--- a/inftrees.c
++++ b/inftrees.c
+@@ -54,7 +54,7 @@ unsigned short FAR *work;
+     code FAR *next;             /* next available space in table */
+     const unsigned short FAR *base;     /* base value table to use */
+     const unsigned short FAR *extra;    /* extra bits table to use */
+-    int end;                    /* use base and extra for symbol > end */
++    unsigned match;             /* use base and extra for symbol >= match */
+     unsigned short count[MAXBITS+1];    /* number of codes of each length */
+     unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
+     static const unsigned short lbase[31] = { /* Length codes 257..285 base */
+@@ -181,19 +181,17 @@ unsigned short FAR *work;
+     switch (type) {
+     case CODES:
+         base = extra = work;    /* dummy value--not used */
+-        end = 19;
++        match = 20;
+         break;
+     case LENS:
+         base = lbase;
+-        base -= 257;
+         extra = lext;
+-        extra -= 257;
+-        end = 256;
++        match = 257;
+         break;
+     default:            /* DISTS */
+         base = dbase;
+         extra = dext;
+-        end = -1;
++        match = 0;
+     }
+ 
+     /* initialize state for loop */
+@@ -216,13 +214,13 @@ unsigned short FAR *work;
+     for (;;) {
+         /* create table entry */
+         here.bits = (unsigned char)(len - drop);
+-        if ((int)(work[sym]) < end) {
++        if (work[sym] + 1 < match) {
+             here.op = (unsigned char)0;
+             here.val = work[sym];
+         }
+-        else if ((int)(work[sym]) > end) {
+-            here.op = (unsigned char)(extra[work[sym]]);
+-            here.val = base[work[sym]];
++        else if (work[sym] >= match) {
++            here.op = (unsigned char)(extra[work[sym] - match]);
++            here.val = base[work[sym] - match];
+         }
+         else {
+             here.op = (unsigned char)(32 + 64);         /* end of block */
diff --git a/pkgs/development/libraries/zlib/CVE-2016-9841.patch b/pkgs/development/libraries/zlib/CVE-2016-9841.patch
new file mode 100644
index 00000000000..e350b3d9642
--- /dev/null
+++ b/pkgs/development/libraries/zlib/CVE-2016-9841.patch
@@ -0,0 +1,224 @@
+From 9aaec95e82117c1cb0f9624264c3618fc380cecb Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Wed, 21 Sep 2016 22:25:21 -0700
+Subject: [PATCH] Use post-increment only in inffast.c.
+
+An old inffast.c optimization turns out to not be optimal anymore
+with modern compilers, and furthermore was not compliant with the
+C standard, for which decrementing a pointer before its allocated
+memory is undefined. Per the recommendation of a security audit of
+the zlib code by Trail of Bits and TrustInSoft, in support of the
+Mozilla Foundation, this "optimization" was removed, in order to
+avoid the possibility of undefined behavior.
+---
+ inffast.c | 81 ++++++++++++++++++++++++---------------------------------------
+ 1 file changed, 31 insertions(+), 50 deletions(-)
+
+diff --git a/inffast.c b/inffast.c
+index bda59ce..f0d163d 100644
+--- a/inffast.c
++++ b/inffast.c
+@@ -10,25 +10,6 @@
+ 
+ #ifndef ASMINF
+ 
+-/* Allow machine dependent optimization for post-increment or pre-increment.
+-   Based on testing to date,
+-   Pre-increment preferred for:
+-   - PowerPC G3 (Adler)
+-   - MIPS R5000 (Randers-Pehrson)
+-   Post-increment preferred for:
+-   - none
+-   No measurable difference:
+-   - Pentium III (Anderson)
+-   - M68060 (Nikl)
+- */
+-#ifdef POSTINC
+-#  define OFF 0
+-#  define PUP(a) *(a)++
+-#else
+-#  define OFF 1
+-#  define PUP(a) *++(a)
+-#endif
+-
+ /*
+    Decode literal, length, and distance codes and write out the resulting
+    literal and match bytes until either not enough input or output is
+@@ -96,9 +77,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
+ 
+     /* copy state to local variables */
+     state = (struct inflate_state FAR *)strm->state;
+-    in = strm->next_in - OFF;
++    in = strm->next_in;
+     last = in + (strm->avail_in - 5);
+-    out = strm->next_out - OFF;
++    out = strm->next_out;
+     beg = out - (start - strm->avail_out);
+     end = out + (strm->avail_out - 257);
+ #ifdef INFLATE_STRICT
+@@ -119,9 +100,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
+        input data or output space */
+     do {
+         if (bits < 15) {
+-            hold += (unsigned long)(PUP(in)) << bits;
++            hold += (unsigned long)(*in++) << bits;
+             bits += 8;
+-            hold += (unsigned long)(PUP(in)) << bits;
++            hold += (unsigned long)(*in++) << bits;
+             bits += 8;
+         }
+         here = lcode[hold & lmask];
+@@ -134,14 +115,14 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
+             Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                     "inflate:         literal '%c'\n" :
+                     "inflate:         literal 0x%02x\n", here.val));
+-            PUP(out) = (unsigned char)(here.val);
++            *out++ = (unsigned char)(here.val);
+         }
+         else if (op & 16) {                     /* length base */
+             len = (unsigned)(here.val);
+             op &= 15;                           /* number of extra bits */
+             if (op) {
+                 if (bits < op) {
+-                    hold += (unsigned long)(PUP(in)) << bits;
++                    hold += (unsigned long)(*in++) << bits;
+                     bits += 8;
+                 }
+                 len += (unsigned)hold & ((1U << op) - 1);
+@@ -150,9 +131,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
+             }
+             Tracevv((stderr, "inflate:         length %u\n", len));
+             if (bits < 15) {
+-                hold += (unsigned long)(PUP(in)) << bits;
++                hold += (unsigned long)(*in++) << bits;
+                 bits += 8;
+-                hold += (unsigned long)(PUP(in)) << bits;
++                hold += (unsigned long)(*in++) << bits;
+                 bits += 8;
+             }
+             here = dcode[hold & dmask];
+@@ -165,10 +146,10 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
+                 dist = (unsigned)(here.val);
+                 op &= 15;                       /* number of extra bits */
+                 if (bits < op) {
+-                    hold += (unsigned long)(PUP(in)) << bits;
++                    hold += (unsigned long)(*in++) << bits;
+                     bits += 8;
+                     if (bits < op) {
+-                        hold += (unsigned long)(PUP(in)) << bits;
++                        hold += (unsigned long)(*in++) << bits;
+                         bits += 8;
+                     }
+                 }
+@@ -196,30 +177,30 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
+ #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                         if (len <= op - whave) {
+                             do {
+-                                PUP(out) = 0;
++                                *out++ = 0;
+                             } while (--len);
+                             continue;
+                         }
+                         len -= op - whave;
+                         do {
+-                            PUP(out) = 0;
++                            *out++ = 0;
+                         } while (--op > whave);
+                         if (op == 0) {
+                             from = out - dist;
+                             do {
+-                                PUP(out) = PUP(from);
++                                *out++ = *from++;
+                             } while (--len);
+                             continue;
+                         }
+ #endif
+                     }
+-                    from = window - OFF;
++                    from = window;
+                     if (wnext == 0) {           /* very common case */
+                         from += wsize - op;
+                         if (op < len) {         /* some from window */
+                             len -= op;
+                             do {
+-                                PUP(out) = PUP(from);
++                                *out++ = *from++;
+                             } while (--op);
+                             from = out - dist;  /* rest from output */
+                         }
+@@ -230,14 +211,14 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
+                         if (op < len) {         /* some from end of window */
+                             len -= op;
+                             do {
+-                                PUP(out) = PUP(from);
++                                *out++ = *from++;
+                             } while (--op);
+-                            from = window - OFF;
++                            from = window;
+                             if (wnext < len) {  /* some from start of window */
+                                 op = wnext;
+                                 len -= op;
+                                 do {
+-                                    PUP(out) = PUP(from);
++                                    *out++ = *from++;
+                                 } while (--op);
+                                 from = out - dist;      /* rest from output */
+                             }
+@@ -248,35 +229,35 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
+                         if (op < len) {         /* some from window */
+                             len -= op;
+                             do {
+-                                PUP(out) = PUP(from);
++                                *out++ = *from++;
+                             } while (--op);
+                             from = out - dist;  /* rest from output */
+                         }
+                     }
+                     while (len > 2) {
+-                        PUP(out) = PUP(from);
+-                        PUP(out) = PUP(from);
+-                        PUP(out) = PUP(from);
++                        *out++ = *from++;
++                        *out++ = *from++;
++                        *out++ = *from++;
+                         len -= 3;
+                     }
+                     if (len) {
+-                        PUP(out) = PUP(from);
++                        *out++ = *from++;
+                         if (len > 1)
+-                            PUP(out) = PUP(from);
++                            *out++ = *from++;
+                     }
+                 }
+                 else {
+                     from = out - dist;          /* copy direct from output */
+                     do {                        /* minimum length is three */
+-                        PUP(out) = PUP(from);
+-                        PUP(out) = PUP(from);
+-                        PUP(out) = PUP(from);
++                        *out++ = *from++;
++                        *out++ = *from++;
++                        *out++ = *from++;
+                         len -= 3;
+                     } while (len > 2);
+                     if (len) {
+-                        PUP(out) = PUP(from);
++                        *out++ = *from++;
+                         if (len > 1)
+-                            PUP(out) = PUP(from);
++                            *out++ = *from++;
+                     }
+                 }
+             }
+@@ -313,8 +294,8 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
+     hold &= (1U << bits) - 1;
+ 
+     /* update state and return */
+-    strm->next_in = in + OFF;
+-    strm->next_out = out + OFF;
++    strm->next_in = in;
++    strm->next_out = out;
+     strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
+     strm->avail_out = (unsigned)(out < end ?
+                                  257 + (end - out) : 257 - (out - end));
diff --git a/pkgs/development/libraries/zlib/CVE-2016-9842.patch b/pkgs/development/libraries/zlib/CVE-2016-9842.patch
new file mode 100644
index 00000000000..e729f7e162c
--- /dev/null
+++ b/pkgs/development/libraries/zlib/CVE-2016-9842.patch
@@ -0,0 +1,29 @@
+From e54e1299404101a5a9d0cf5e45512b543967f958 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Sat, 5 Sep 2015 17:45:55 -0700
+Subject: [PATCH] Avoid shifts of negative values inflateMark().
+
+The C standard says that bit shifts of negative integers is
+undefined.  This casts to unsigned values to assure a known
+result.
+---
+ inflate.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/inflate.c b/inflate.c
+index 2889e3a..a718416 100644
+--- a/inflate.c
++++ b/inflate.c
+@@ -1506,9 +1506,10 @@ z_streamp strm;
+ {
+     struct inflate_state FAR *state;
+ 
+-    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
++    if (strm == Z_NULL || strm->state == Z_NULL)
++        return (long)(((unsigned long)0 - 1) << 16);
+     state = (struct inflate_state FAR *)strm->state;
+-    return ((long)(state->back) << 16) +
++    return (long)(((unsigned long)((long)state->back)) << 16) +
+         (state->mode == COPY ? state->length :
+             (state->mode == MATCH ? state->was - state->length : 0));
+ }
diff --git a/pkgs/development/libraries/zlib/CVE-2016-9843.patch b/pkgs/development/libraries/zlib/CVE-2016-9843.patch
new file mode 100644
index 00000000000..1fe4c4daa03
--- /dev/null
+++ b/pkgs/development/libraries/zlib/CVE-2016-9843.patch
@@ -0,0 +1,49 @@
+From d1d577490c15a0c6862473d7576352a9f18ef811 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Wed, 28 Sep 2016 20:20:25 -0700
+Subject: [PATCH] Avoid pre-decrement of pointer in big-endian CRC calculation.
+
+There was a small optimization for PowerPCs to pre-increment a
+pointer when accessing a word, instead of post-incrementing. This
+required prefacing the loop with a decrement of the pointer,
+possibly pointing before the object passed. This is not compliant
+with the C standard, for which decrementing a pointer before its
+allocated memory is undefined. When tested on a modern PowerPC
+with a modern compiler, the optimization no longer has any effect.
+Due to all that, and per the recommendation of a security audit of
+the zlib code by Trail of Bits and TrustInSoft, in support of the
+Mozilla Foundation, this "optimization" was removed, in order to
+avoid the possibility of undefined behavior.
+---
+ crc32.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/crc32.c b/crc32.c
+index 979a719..05733f4 100644
+--- a/crc32.c
++++ b/crc32.c
+@@ -278,7 +278,7 @@ local unsigned long crc32_little(crc, buf, len)
+ }
+ 
+ /* ========================================================================= */
+-#define DOBIG4 c ^= *++buf4; \
++#define DOBIG4 c ^= *buf4++; \
+         c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
+             crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
+ #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
+@@ -300,7 +300,6 @@ local unsigned long crc32_big(crc, buf, len)
+     }
+ 
+     buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+-    buf4--;
+     while (len >= 32) {
+         DOBIG32;
+         len -= 32;
+@@ -309,7 +308,6 @@ local unsigned long crc32_big(crc, buf, len)
+         DOBIG4;
+         len -= 4;
+     }
+-    buf4++;
+     buf = (const unsigned char FAR *)buf4;
+ 
+     if (len) do {
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index e61001e7d6d..21a7e81ce3e 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "039agw5rqvqny92cpkrfn243x2gd4xn13hs3xi6isk55d2vqqr9n";
   };
 
+  patches = [
+    ./CVE-2016-9840.patch
+    ./CVE-2016-9841.patch
+    ./CVE-2016-9842.patch
+    ./CVE-2016-9843.patch
+  ];
+
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure \
       --replace '/usr/bin/libtool' 'ar' \
@@ -81,4 +88,3 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
   };
 }
-

From ecf4e223f41ff68802166f35568598624c1791d2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 21 Dec 2016 00:35:36 +0300
Subject: [PATCH 0065/1310] pythonPackages.virtkey: init at 0.63

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8adec68bdcd..eaa2d3a37cb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26179,6 +26179,32 @@ in {
     };
   };
 
+  virtkey = buildPythonPackage rec {
+    name = "virtkey-${version}";
+    majorVersion = "0.63";
+    version = "${majorVersion}.0";
+
+    src = pkgs.fetchurl {
+      url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz";
+      sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr";
+    };
+
+    nativeBuildInputs = [ pkgs.pkgconfig ];
+
+    buildInputs =
+         [ pkgs.gtk2 ]
+      ++ (with pkgs.xorg; [ libX11 libXtst libXi libxkbfile xextproto xproto ]);
+
+    meta = {
+      description = "Extension to emulate keypresses and to get the layout information from the X server";
+      homepage = "https://launchpad.net/virtkey";
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
+
+
   virtual-display = buildPythonPackage rec {
     name = "PyVirtualDisplay-0.1.5";
 

From 800020446e2842b48faa41b43b9ae874c85848fb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 21 Dec 2016 00:35:48 +0300
Subject: [PATCH 0066/1310] pythonPackages.python-uinput: init at 0.11.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eaa2d3a37cb..b44d07eefe6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -729,6 +729,27 @@ in {
     };
   };
 
+  python-uinput = buildPythonPackage rec {
+    name = "python-uinput-${version}";
+    version = "0.11.2";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/python-uinput/${name}.tar.gz";
+      sha256 = "033zqiypjz0nigav6vz0s57pbzikvds55mxphrdpkdbpdikjnfcr";
+    };
+
+    buildInputs = [ pkgs.udev ];
+
+    NIX_CFLAGS_LINK = [ "-ludev" ];
+
+    meta = with stdenv.lib; {
+      description = "Pythonic API to Linux uinput kernel module";
+      homepage = "http://tjjr.fi/sw/python-uinput/";
+      license = licenses.gpl3Plus;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   almir = buildPythonPackage rec {
     name = "almir-0.1.8";
 

From c22b243b3b8be98f3ec8aed817e7f490d8250d27 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 21 Dec 2016 00:36:41 +0300
Subject: [PATCH 0067/1310] gnome2.gnome_python: use standard build system

---
 .../gnome-2/bindings/gnome-python/default.nix | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
index 94ce68f9cb2..d7861285cb1 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pythonPackages, pkgconfig, libgnome, GConf, glib, gtk, gnome_vfs}:
+{ stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk, gnome_vfs }:
 
 with stdenv.lib;
 
 let
-  inherit (pythonPackages) python pygobject2 pygtk dbus-python;
+  inherit (python2.pkgs) python pygobject2 pygtk dbus-python;
 in stdenv.mkDerivation rec {
   version = "2.28";
   name = "gnome-python-${version}.1";
@@ -13,30 +13,21 @@ in stdenv.mkDerivation rec {
     sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8";
   };
 
-  phases = "unpackPhase configurePhase buildPhase installPhase";
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ python glib gtk GConf libgnome gnome_vfs ];
+  propagatedBuildInputs = [ pygobject2 pygtk dbus-python ];
 
-  # WAF is probably the biggest crap on this planet, btw i removed the /gtk-2.0 path thingy
-  configurePhase = ''
-    sed -e "s@{PYTHONDIR}/gtk-2.0@{PYTHONDIR}/@" -i gconf/wscript
-    python waf configure --prefix=$out
+  # gnome-python expects that .pth file is already installed by PyGTK in the
+  # same directory. This is not the case for Nix.
+  postInstall = ''
+    echo "gtk-2.0" > $out/${python2.sitePackages}/${name}.pth
   '';
 
-  buildPhase = ''
-    python waf build
-  '';
-
-  installPhase = ''
-    python waf install
-    cp bonobo/*.{py,defs} $out/share/pygtk/2.0/defs/
-  '';
-
-  buildInputs = [ python pkgconfig pygobject2 pygtk glib gtk GConf libgnome dbus-python gnome_vfs ];
-
-  doCheck = false;
-
-  meta = {
-    homepage = "http://projects.gnome.org/gconf/";
-    description = "Python wrapper for gconf";
-    maintainers = [ stdenv.lib.maintainers.qknight ];
+  meta = with stdenv.lib; {
+    homepage = "http://pygtk.org/";
+    description = "Python wrapper for GNOME libraries";
+    platforms = platforms.linux;
+    licenses = licenses.lgpl2;
+    maintainers = with maintainers; [ qknight ];
   };
 }

From c0417435984988a11a821a85692da374d9cc51e1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 21 Dec 2016 00:37:14 +0300
Subject: [PATCH 0068/1310] gnome2.gnome_python_desktop: init from
 gnome2.python_rsvg

---
 .../bindings/gnome-python-desktop/default.nix | 32 ++++++++++++++++++
 .../gnome-2/bindings/python-rsvg/default.nix  | 33 -------------------
 pkgs/desktops/gnome-2/default.nix             |  5 +--
 3 files changed, 35 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
 delete mode 100644 pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix

diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
new file mode 100644
index 00000000000..b33afb50e99
--- /dev/null
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkgconfig, python2, gtk }:
+
+let
+  inherit (python2.pkgs) python pygtk;
+in stdenv.mkDerivation rec {
+  ver_maj = "2.32";
+  ver_min = "0";
+  version = "${ver_maj}.${ver_min}";
+  name = "gnome-python-desktop-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2";
+    sha256 = "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk librsvg libwnck libgtop python ];
+  propagatedBuildInputs = [ gnome_python pygtk ];
+
+  # gnome-python-desktop expects that .pth file is already installed by PyGTK
+  # in the same directory. This is not the case for Nix.
+  postInstall = ''
+    echo "gtk-2.0" > $out/${python2.sitePackages}/${name}.pth
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.pygtk.org";
+    description = "Python bindings for GNOME desktop packages";
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix b/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix
deleted file mode 100644
index c862bee0c90..00000000000
--- a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, gnome2, librsvg, pkgconfig, python27Packages, gtk }:
-
-let
-  inherit (python27Packages) python pygtk;
-in stdenv.mkDerivation rec {
-  ver_maj = "2.32";
-  ver_min = "0";
-  version = "${ver_maj}.${ver_min}";
-  name = "python-rsvg-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2";
-    sha256 = "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9";
-  };
-
-  configurePhase = ''
-    sed -e "s@{PYTHONDIR}/gtk-2.0@{PYTHONDIR}/@" -i rsvg/wscript
-    python waf configure --enable-modules=rsvg --prefix=$out
-  '';
-
-  buildPhase = "python waf build";
-
-  installPhase = "python waf install";
-
-  buildInputs = [ gtk gnome2.gnome_python librsvg pkgconfig pygtk python ];
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.pygtk.org";
-    description = "The rsvg python module";
-    license = licenses.lgpl21;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 54e397fd474..c6df2a9ebc2 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -47,6 +47,9 @@ let overridden = set // overrides; set = with overridden; {
 
   gnome_python = callPackage ./bindings/gnome-python { };
 
+  gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { };
+  python_rsvg = overridden.gnome_python_desktop;
+
   gnome_vfs = callPackage ./platform/gnome-vfs { };
 
   gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { };
@@ -59,8 +62,6 @@ let overridden = set // overrides; set = with overridden; {
 
   libbonoboui = callPackage ./platform/libbonoboui { };
 
-  python_rsvg = callPackage ./bindings/python-rsvg { };
-
   at_spi = callPackage ./platform/at-spi { };
 
   gtkhtml = callPackage ./platform/gtkhtml { };

From e1707eec5ccb0e39fb38a37c1a21e24b22982a4a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 22 Dec 2016 01:32:15 +0300
Subject: [PATCH 0069/1310] pythonPackages.pyinputevent: init at 2016-10-18

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b44d07eefe6..8cc49d53c70 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20489,12 +20489,30 @@ in {
     };
   };
 
+  pyinputevent = buildPythonPackage rec {
+    name = "pyinputevent-2016-10-18";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "ntzrmtthihu777";
+      repo = "pyinputevent";
+      rev = "d2075fa5db5d8a402735fe788bb33cf9fe272a5b";
+      sha256 = "0rkis0xp8f9jc00x7jb9kbvhdla24z1vl30djqa6wy6fx0cr6sib";
+    };
+
+    meta = {
+      homepage = "https://github.com/ntzrmtthihu777/pyinputevent";
+      description = "Python interface to the Input Subsystem's input_event and uinput";
+      license = licenses.bsd3;
+      platforms = platforms.linux;
+    };
+  };
+
   pyinotify = buildPythonPackage rec {
-    name = "pyinotify";
+    name = "pyinotify-${version}";
     version = "0.9.6";
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/p/${name}/${name}-${version}.tar.gz";
+      url = "mirror://pypi/p/${name}/${name}.tar.gz";
       sha256 = "1x3i9wmzw33fpkis203alygfnrkcmq9w1aydcm887jh6frfqm6cw";
     };
 

From 7de8494be6768fedbcc921eb4da7256f2f81f3e2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 21 Dec 2016 00:37:42 +0300
Subject: [PATCH 0070/1310] gnome15: init at 2016-06-10

---
 pkgs/applications/misc/gnome15/default.nix | 36 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 +++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/misc/gnome15/default.nix

diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix
new file mode 100644
index 00000000000..c4f8be88bb5
--- /dev/null
+++ b/pkgs/applications/misc/gnome15/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, gnome_python, gnome_python_desktop }:
+
+stdenv.mkDerivation rec {
+  name = "gnome15-2016-06-10";
+
+  src = fetchFromGitHub {
+    owner = "achilleas-k";
+    repo = "gnome15";
+    rev = "1077c890d9ba8ef7a5e448e70a792de5c7443c84";
+    sha256 = "0z5k2rgvv5zyi3lbbk6svncypidj44qzfchivb4vlr7clmh16m95";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig python2.pkgs.wrapPython ];
+  buildInputs = [ python2 ];
+  propagatedBuildInputs = with python2.pkgs; [
+    pygtk keyring virtkey pillow dbus-python pyinotify lxml pyxdg pyusb gnome_python gnome_python_desktop
+    python-uinput xlib pyudev pyinputevent
+  ];
+
+  postPatch = ''
+    touch README
+    export UDEV_RULES_PATH="$out/lib/udev/rules.d"
+  '';
+
+  postFixup = ''
+    wrapPythonPrograms
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A set of tools for configuring the Logitech G15 keyboard";
+    license = licenses.gpl3;
+    homepage = "https://gnome15.org/";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7df99796df8..a980ab66387 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1882,6 +1882,10 @@ in
     stdenv = overrideCC stdenv gcc49;
   };
 
+  gnome15 = callPackage ../applications/misc/gnome15 {
+    inherit (gnome2) gnome_python gnome_python_desktop;
+  };
+
   gnokii = callPackage ../tools/misc/gnokii { };
 
   gnuapl = callPackage ../development/interpreters/gnu-apl { };

From fc3b8665cfc7d9a3501bdf1324c5b6ecdc7e6d40 Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@traumapony.org>
Date: Wed, 21 Dec 2016 13:58:45 +1000
Subject: [PATCH 0071/1310] libssh2: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 89e402d2416..0e53d27c889 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurlBoot, openssl, zlib, windows}:
 
 stdenv.mkDerivation rec {
-  name = "libssh2-1.7.0";
+  name = "libssh2-1.8.0";
 
   src = fetchurlBoot {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "116mh112w48vv9k3f15ggp5kxw5sj4b88dzb5j69llsh7ba1ymp4";
+    sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From 9251f57133ceaf334257e8eec67ad993dfae34b7 Mon Sep 17 00:00:00 2001
From: Stefan Goetz <goetzst@hotmail.de>
Date: Thu, 22 Dec 2016 00:18:17 +0100
Subject: [PATCH 0072/1310] youtube-dl: 2016-12-15 -> 2016-12-20 (#21342)

---
 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 808ba21ab66..a1ed2d9657f 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 = "2016.12.15";
+  version = "2016.12.20";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "85d937a6edb8c14f8eac1b17d2e5d45574c7ec3f2cb792781ac1d8fb6a6ca39e";
+    sha256 = "f80d47d5e2a236ea6c9d8b4636199aea01a041607ce7b544babedb0fe1ce59a5";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From 45043abd2da0b6fc13b7c616c2af5e9b91aab8ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 21 Dec 2016 14:09:55 +0100
Subject: [PATCH 0073/1310] Fix go test

In a user namespace, sending credentials for an unmapped user return
EINVAL instead of EPERM. So handle that case.

http://hydra.nixos.org/build/44839000
(cherry picked from commit 1dd0fb6b5a7c44d1b632466f936ca74268d13298)
---
 pkgs/development/compilers/go/1.7.nix          |  6 +++++-
 pkgs/development/compilers/go/creds-test.patch | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/go/creds-test.patch

diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index 16de9b0edbf..c33e45c2983 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -101,7 +101,11 @@ stdenv.mkDerivation rec {
     sed -i '1 a\exit 0' misc/cgo/errors/test.bash
   '';
 
-  patches = [ ./remove-tools-1.7.patch ./cacert-1.7.patch ];
+  patches =
+    [ ./remove-tools-1.7.patch
+      ./cacert-1.7.patch
+      ./creds-test.patch
+    ];
 
   SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
diff --git a/pkgs/development/compilers/go/creds-test.patch b/pkgs/development/compilers/go/creds-test.patch
new file mode 100644
index 00000000000..09f78959ff9
--- /dev/null
+++ b/pkgs/development/compilers/go/creds-test.patch
@@ -0,0 +1,14 @@
+diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go
+--- ./result/src/syscall/creds_test.go	1970-01-01 01:00:01.000000000 +0100
++++ go-go1.7.4-src/src/syscall/creds_test.go	2016-12-21 14:06:39.559932164 +0100
+@@ -62,8 +62,8 @@
+ 		if sys, ok := err.(*os.SyscallError); ok {
+ 			err = sys.Err
+ 		}
+-		if err != syscall.EPERM {
+-			t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err)
++		if err != syscall.EPERM && err != syscall.EINVAL {
++			t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err)
+ 		}
+ 	}
+ 

From 2c0303745065368df4cfc6a231684d4a43ee0fc8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 21 Dec 2016 13:32:31 +0100
Subject: [PATCH 0074/1310] Work around slowness in the KDE 5 test

The use of unionfs-fuse (57a0f140643cde409022e297ed05e05f8d34d778)
slows down the KDE 5 test enough that it hits Hydra timeouts. (E.g. on
my laptop it went from ~5 min to ~30 min.) So disable it for the KDE
test.

http://hydra.nixos.org/build/45127422
(cherry picked from commit 3fcbcf25568cd629644a680562f47762d1ae15b2)
---
 nixos/tests/kde5.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/kde5.nix b/nixos/tests/kde5.nix
index 30db316dba5..2b61d6f3f0a 100644
--- a/nixos/tests/kde5.nix
+++ b/nixos/tests/kde5.nix
@@ -18,6 +18,7 @@ import ./make-test.nix ({ pkgs, ...} :
       };
     };
     services.xserver.desktopManager.kde5.enable = true;
+    virtualisation.writableStore = false; # FIXME
   };
 
   testScript = { nodes, ... }:

From adc2a8f648d4111987be7b83b23b99717cce1a30 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 21 Dec 2016 19:30:06 -0500
Subject: [PATCH 0075/1310] Fix go_1_6 test

In a user namespace, sending credentials for an unmapped user return
EINVAL instead of EPERM. So handle that case.
---
 pkgs/development/compilers/go/1.6.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index db6573417bf..ce68b007eaa 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -110,6 +110,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./remove-tools-1.5.patch
+    ./creds-test.patch
   ];
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";

From dd6025dbce35bb47ca78c3d0f044bde80f5c0b2f Mon Sep 17 00:00:00 2001
From: "Desmond O. Chang" <dochang@gmail.com>
Date: Sun, 11 Dec 2016 04:13:05 +0800
Subject: [PATCH 0076/1310] yank: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix
index 5186ec2121b..6cae1947340 100644
--- a/pkgs/tools/misc/yank/default.nix
+++ b/pkgs/tools/misc/yank/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     owner = "mptre";
     repo = "yank";
     rev = "v${meta.version}";
-    sha256 = "0iv3ilyjcq6cd429qkg8mfpwagkb30617z0kdjlhk2s74chyaghm";
+    sha256 = "1m8pnarm8n5x6ylbzxv8j9amylrllw166arrj4cx9f2jp2zbzcic";
     inherit name;
   };
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     '';
     downloadPage = "https://github.com/mptre/yank/releases";
     license = licenses.mit;
-    version = "0.7.0";
+    version = "0.7.1";
     maintainers = [ maintainers.dochang ];
     platforms = platforms.unix;
   };

From fdd9832e2c224f17b5e9af38e2a73d013e562dcd Mon Sep 17 00:00:00 2001
From: "Desmond O. Chang" <dochang@gmail.com>
Date: Sun, 11 Dec 2016 04:19:55 +0800
Subject: [PATCH 0077/1310] lnav: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix
index a3b40edb46c..23e823eb963 100644
--- a/pkgs/tools/misc/lnav/default.nix
+++ b/pkgs/tools/misc/lnav/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     owner = "tstack";
     repo = "lnav";
     rev = "v${meta.version}";
-    sha256 = "06h0hy8k0w692df2490dshxf2x8qcnw5myyp0k5jkc63ai2ra6aq";
+    sha256 = "0pag2rl7b6s2xfl80c629vhwsdvvlhcdy6732yvpgfv94w0zyjp9";
     inherit name;
   };
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     '';
     downloadPage = "https://github.com/tstack/lnav/releases";
     license = licenses.bsd2;
-    version = "0.8.0";
+    version = "0.8.1";
     maintainers = [ maintainers.dochang ];
   };
 

From 95c42970e7ad4481cf97c8952c2a3e70ed16bf2d Mon Sep 17 00:00:00 2001
From: "Desmond O. Chang" <dochang@gmail.com>
Date: Sun, 11 Dec 2016 04:38:17 +0800
Subject: [PATCH 0078/1310] rolespec: 20160105 -> 20161104

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

diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix
index f9254abe102..6eb13bb242d 100644
--- a/pkgs/development/tools/misc/rolespec/default.nix
+++ b/pkgs/development/tools/misc/rolespec/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nickjj";
     repo = "rolespec";
-    rev = "64a2092773b77f7a888522ceddd815e97b129321";
-    sha256 = "1867acxy18a3cgi84iwsp37sxglaljn1dq50amahp5zkmd8x8vnz";
+    rev = "d9ee530cd709168882059776c482fc37f46cb743";
+    sha256 = "1jkidw6aqr0zfqwmcvlpi9qa140z2pxcfsd43xm5ikx6jcwjdrzl";
     inherit name;
   };
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     '';
     downloadPage = "https://github.com/nickjj/rolespec";
     license = licenses.gpl3;
-    version = "20160105";
+    version = "20161104";
     maintainers = [ maintainers.dochang ];
     platforms = platforms.unix;
   };

From 1b8aec421b4d4423ed82f3734068531f3e7bcddd Mon Sep 17 00:00:00 2001
From: "ft@zeus" <ft@zeus>
Date: Sun, 18 Dec 2016 13:48:54 -0800
Subject: [PATCH 0079/1310] stellarium: 0.14.3 -> 0.15.0

close #21271
---
 .../applications/science/astronomy/stellarium/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 6f7d1b7b764..49c774f7039 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,20 +1,22 @@
 { stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
 , qtscript, qtserialport, qttools, makeQtWrapper
+, qtmultimedia
 }:
 
 stdenv.mkDerivation rec {
-  name = "stellarium-0.14.3";
+  name = "stellarium-${version}";
+  version = "0.15.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "1919wzlvhfxdxficbwhp31xlhm0571grgcmsfdp5y36z9yqwahfy";
+    sha256 = "0il751lgnfkx35h1m8fzwwnrygpxjx2a80gng1i1rbybkykf7l3l";
   };
 
   nativeBuildInputs = [ makeQtWrapper ];
 
   buildInputs = [
     cmake freetype libpng mesa gettext openssl perl libiconv qtscript
-    qtserialport qttools
+    qtserialport qttools qtmultimedia
   ];
 
   enableParallelBuilding = true;

From 77588ca4428875e5d04bd470a6b68556950c3981 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 22 Dec 2016 03:04:55 +0100
Subject: [PATCH 0080/1310] wireguard: 20161209 -> 20161218 (#21288)

---
 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 e1b17f8f9fc..b164530938e 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 "4.1";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20161209";
+  version = "0.0.20161218";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "11n8dq8a8w0qj8xg5np9w02kmk14hn5hphv2h4bjw9hs8yxvkaya";
+    sha256 = "d805035d3e99768e69d8cdeb8fb5250a59b994ce127fceb71a078582c30f5597";
   };
 
   meta = with stdenv.lib; {

From 53e21529d4faaf9d3302d96c6bedfbd544a095de Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 21 Dec 2016 21:08:16 -0500
Subject: [PATCH 0081/1310] linux:3.12.68 -> 3.12.69

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 72fbe15b02d..95ca51a972e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.68";
+  version = "3.12.69";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0k4kwxmm6vj840k4v6iyswsajaxsb5g9vrc7mzr4grflfbjrgh14";
+    sha256 = "1pzghmj0j2shms4n3knryigy73qssskd6awbgk6mmyg42wypbcmm";
   };
 
   kernelPatches = args.kernelPatches;

From 3ffb5ba60c4c7ed63c043d79fb8e4b3c6e896892 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 21 Dec 2016 21:08:36 -0500
Subject: [PATCH 0082/1310] linux:3.18.44 -> 3.18.45

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 4a18f2e498b..727126de388 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.44";
+  version = "3.18.45";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1cjdh9w2q164r53k06vv6nhxwjzm69nha5wndp8r1hjywjwcqqan";
+    sha256 = "1qwvqrlzpf57zvh57dsdk4c4swgbasf2ab75vcn2py8l7jl6rxf0";
   };
 
   kernelPatches = args.kernelPatches;

From 3e1ad389092ac25069cb72efeb59aa40cd1ccca0 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 21 Dec 2016 21:40:13 -0500
Subject: [PATCH 0083/1310] go_bootstrap: Fix credential test for new user
 namespacing

---
 pkgs/development/compilers/go/1.4.nix           |  1 +
 .../compilers/go/creds-test-1.4.patch           | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/compilers/go/creds-test-1.4.patch

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 273d768ce21..3f0726e2aef 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -90,6 +90,7 @@ stdenv.mkDerivation rec {
   patches = [
     ./remove-tools-1.4.patch
     ./new-binutils.patch
+    ./creds-test-1.4.patch
   ];
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";
diff --git a/pkgs/development/compilers/go/creds-test-1.4.patch b/pkgs/development/compilers/go/creds-test-1.4.patch
new file mode 100644
index 00000000000..98cec532dcc
--- /dev/null
+++ b/pkgs/development/compilers/go/creds-test-1.4.patch
@@ -0,0 +1,17 @@
+diff --git a/go-go1.4.3/src/syscall/creds_test.go b/go-go1.4.3/src/syscall/creds_test.go
+index b1894c6..b2d6b4e 100644
+--- a/src/syscall/creds_test.go
++++ b/src/syscall/creds_test.go
+@@ -56,9 +56,10 @@ func TestSCMCredentials(t *testing.T) {
+ 		ucred.Gid = 0
+ 		oob := syscall.UnixCredentials(&ucred)
+ 		_, _, err := cli.(*net.UnixConn).WriteMsgUnix(nil, oob, nil)
+-		if err.(*net.OpError).Err != syscall.EPERM {
+-			t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err)
++		if err.(*net.OpError).Err != syscall.EPERM && err.(*net.OpError).Err != syscall.EINVAL {
++			t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err)
+ 		}
++
+ 	}
+
+ 	ucred.Pid = int32(os.Getpid())

From 70424e1209ca6e420d21821429d8b9220c295958 Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@traumapony.org>
Date: Thu, 22 Dec 2016 13:16:15 +1000
Subject: [PATCH 0084/1310] ncurses: Create libtinfo symlink

Some applications expect libtinfo to be a separate library to libncurses; this fixes that.
---
 pkgs/development/libraries/ncurses/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 3eff1f3d5bb..bbf7d7108dd 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -102,6 +102,9 @@ stdenv.mkDerivation rec {
       done
     done
 
+    # create libtinfo symlink
+    ln -svf $out/lib/libncurses.$dylibtype $out/libtinfo.$dylibtype
+        
     # move some utilities to $bin
     # these programs are used at runtime and don't really belong in $dev
     moveToOutput "bin/clear" "$out"

From ebe19f5db0d9df4d86cd2012b44dd4249062d891 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 20 Dec 2016 22:02:43 +0000
Subject: [PATCH 0085/1310] lablgtk: 2.18.3 -> 2.18.5

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

diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index 93ebf4b9c92..7408ee4b478 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -8,11 +8,11 @@ assert stdenv.lib.versionAtLeast ocaml.version "3.12";
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "2.18.3";
+  version = "2.18.5";
 
   src = fetchurl {
-    url = https://forge.ocamlcore.org/frs/download.php/1479/lablgtk-2.18.3.tar.gz;
-    sha256 = "1bybn3jafxf4cx25zvn8h2xj9agn1xjbn7j3ywxxqx6az7rfnnwp";
+    url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz;
+    sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib";
   };
 
   buildInputs = [ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4];

From 0c1382085b2969ce38359bcb28fc5dfe67cca7eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 22 Dec 2016 11:28:09 +0100
Subject: [PATCH 0086/1310] Revert "Merge pull request #21350 from
 spacekitteh/patch-23"

This reverts commit 81f2e4f378081bdd96c305e12e6ccd086d22d33c, reversing
changes made to ebe19f5db0d9df4d86cd2012b44dd4249062d891.
Moving to staging.
---
 pkgs/development/libraries/ncurses/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index bbf7d7108dd..3eff1f3d5bb 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -102,9 +102,6 @@ stdenv.mkDerivation rec {
       done
     done
 
-    # create libtinfo symlink
-    ln -svf $out/lib/libncurses.$dylibtype $out/libtinfo.$dylibtype
-        
     # move some utilities to $bin
     # these programs are used at runtime and don't really belong in $dev
     moveToOutput "bin/clear" "$out"

From 2b883c6f564202a32169d3bf762aa8c40156c8fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 22 Dec 2016 11:29:13 +0100
Subject: [PATCH 0087/1310] Revert "Revert "Merge pull request #21350 from
 spacekitteh/patch-23""

This reverts commit 0c1382085b2969ce38359bcb28fc5dfe67cca7eb.
Moved to staging.
---
 pkgs/development/libraries/ncurses/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 3eff1f3d5bb..bbf7d7108dd 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -102,6 +102,9 @@ stdenv.mkDerivation rec {
       done
     done
 
+    # create libtinfo symlink
+    ln -svf $out/lib/libncurses.$dylibtype $out/libtinfo.$dylibtype
+        
     # move some utilities to $bin
     # these programs are used at runtime and don't really belong in $dev
     moveToOutput "bin/clear" "$out"

From 39e4d93649ce8cbe5f3ad6467c545df0125fb816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 22 Dec 2016 11:30:03 +0100
Subject: [PATCH 0088/1310] libuv: disable tests broken on Hydra

They were broken by nix starting to use user namespaces.
---
 pkgs/development/libraries/libuv/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index db77a6fefc3..f9e7cf389bb 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -1,5 +1,4 @@
 { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig
-
 , ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
@@ -13,10 +12,15 @@ stdenv.mkDerivation rec {
     sha256 = "0gna53fgsjjs38kv1g20xfaalv0fk3xncb6abga3saswrv283hx0";
   };
 
-  # these checks are probably network-dependent
-  postPatch = lib.optionalString doCheck ''
-    sed '/getnameinfo_basic/d' -i test/test-list.h
-  '';
+  postPatch = let
+    toDisable = [
+      "getnameinfo_basic" # probably network-dependent
+      "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces
+    ];
+    tdRegexp = lib.concatStringsSep "\\|" toDisable;
+    in lib.optionalString doCheck ''
+      sed '/${tdRegexp}/d' -i test/test-list.h
+    '';
 
   buildInputs = [ automake autoconf libtool pkgconfig ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];

From 96c8e1982836bf0b5e4c8614f5ca995d252f9fdd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Dec 2016 12:27:18 +0100
Subject: [PATCH 0089/1310] libtecla: update to version 1.6.3

Also dropped the slightly overzealous -O3 flag for the compiler. I doubt this
library benefits from crazy optimizations.
---
 pkgs/development/libraries/tecla/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix
index ea03795afc8..93cf0670dc7 100644
--- a/pkgs/development/libraries/tecla/default.nix
+++ b/pkgs/development/libraries/tecla/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "tecla-1.6.2";
+  name = "tecla-1.6.3";
 
   src = fetchurl {
     url = "http://www.astro.caltech.edu/~mcs/tecla/lib${name}.tar.gz";
-    sha256 = "1f5p1v9ac5r1f6pjzwacb4yf8m6z19rv77p76j7fix34hd9dnqcc";
+    sha256 = "06pfq5wa8d25i9bdjkp4xhms5101dsrbg82riz7rz1a0a32pqxgj";
   };
 
-  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3";
-
   meta = {
     homepage = "http://www.astro.caltech.edu/~mcs/tecla/";
     description = "Command-line editing library";

From 9f1880039fef079927ffb746f8b95a4ce4983fa3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Dec 2016 12:42:02 +0100
Subject: [PATCH 0090/1310] maude: update to version 2.7

---
 .../interpreters/maude/default.nix            | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index 13403d50759..e833e7b0c6d 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -1,26 +1,34 @@
-{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper }:
+{ stdenv, fetchurl, unzip, makeWrapper
+, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx,
+}:
 
-stdenv.mkDerivation rec {
-  name = "maude-2.6";
+let
 
-  src = fetchurl {
-    url = "http://maude.cs.uiuc.edu/download/current/Maude-2.6.tar.gz";
-    sha256 = "182abzhvjvlaa21aqv7802v3bs57a4dm7cw09s3mqmih7nzpkfm5";
-  };
+  version = "2.7";
 
   fullMaude = fetchurl {
-    url = "https://full-maude.googlecode.com/git/full-maude261h.maude";
-    sha256 = "0xx8bfn6arsa75m5vhp5lmpazgfw230ssq33h9vifswlvzzc81ha";
+    url = "https://raw.githubusercontent.com/maude-team/full-maude/master/full-maude27c.maude";
+    sha256 = "08bg3gn1vyjy5k69hnynpzc9s1hnrbkyv6z08y1h2j37rlc4c18y";
   };
 
-  buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper];
+in
+
+stdenv.mkDerivation rec {
+  name = "maude-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/maude-team/maude/archive/v${version}-ext-hooks.tar.gz";
+    sha256 = "02p0snxm69rs8pvm93r91p881dw6p3bxmazr3cfw5pnxpgz0vjl0";
+  };
+
+  buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip];
 
   hardeningDisable = [ "stackprotector" ] ++
     stdenv.lib.optionals stdenv.isi686 [ "pic" "fortify" ];
 
   preConfigure = ''
     configureFlagsArray=(
-      --datadir=$out/share/maude
+      --datadir="$out/share/maude"
       TECLA_LIBS="-ltecla -lncursesw"
       CFLAGS="-O3" CXXFLAGS="-O3"
     )
@@ -30,8 +38,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
-    mkdir -p $out/share/maude
-    cp ${fullMaude} -d $out/share/maude/full-maude.maude
+    install -D -m 444 ${fullMaude} $out/share/maude/full-maude.maude
   '';
 
   meta = {

From e6fa6b21e14df0d204a1f428254651e191270e7a Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 15 Dec 2016 12:36:07 +0100
Subject: [PATCH 0091/1310] apacheHttpdPackages.mod_perl: init at 2.0.10

---
 .../web-servers/apache-httpd/default.nix      | 12 +++++++++
 .../http/apache-modules/mod_perl/default.nix  | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 39 insertions(+)
 create mode 100644 pkgs/servers/http/apache-modules/mod_perl/default.nix

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 2d71bcc0c79..84c608ca2ab 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -16,6 +16,8 @@ let
 
   phpMajorVersion = head (splitString "." php.version);
 
+  mod_perl = pkgs.mod_perl.override { apacheHttpd = httpd; };
+
   defaultListen = cfg: if cfg.enableSSL
     then [{ip = "*"; port = 443;}]
     else [{ip = "*"; port = 80;}];
@@ -76,6 +78,7 @@ let
           robotsEntries = "";
           startupScript = "";
           enablePHP = false;
+          enablePerl = false;
           phpOptions = "";
           options = {};
           documentRoot = null;
@@ -355,6 +358,7 @@ let
           ++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules
           ++ optional mainCfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; }
           ++ optional enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; }
+          ++ optional enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; }
           ++ concatMap (svc: svc.extraModules) allSubservices
           ++ extraForeignModules;
       in concatMapStrings load allModules
@@ -415,6 +419,8 @@ let
 
   enablePHP = mainCfg.enablePHP || any (svc: svc.enablePHP) allSubservices;
 
+  enablePerl = mainCfg.enablePerl || any (svc: svc.enablePerl) allSubservices;
+
 
   # Generate the PHP configuration file.  Should probably be factored
   # out into a separate module.
@@ -579,6 +585,12 @@ in
         '';
       };
 
+      enablePerl = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the Perl module (mod_perl).";
+      };
+
       phpOptions = mkOption {
         type = types.lines;
         default = "";
diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix
new file mode 100644
index 00000000000..04746d678c5
--- /dev/null
+++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, apacheHttpd, perl }:
+
+stdenv.mkDerivation rec {
+  name = "mod_perl-2.0.10";
+
+  src = fetchurl {
+    url = "mirror://apache/perl/${name}.tar.gz";
+    sha256 = "0r1bhzwl5gr0202r6448943hjxsickzn55kdmb7dzad39vnq7kyi";
+  };
+
+  buildInputs = [ apacheHttpd perl ];
+  buildPhase = ''
+    perl Makefile.PL \
+      MP_APXS=${apacheHttpd.dev}/bin/apxs
+    make
+  '';
+  installPhase = ''
+    mkdir -p $out
+    make install DESTDIR=$out
+    mv $out${apacheHttpd}/* $out
+    mv $out${apacheHttpd.dev}/* $out
+    mv $out${perl}/* $out
+    rm $out/nix -rf
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a980ab66387..4261200ad6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10005,6 +10005,8 @@ in
 
     mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { };
 
+    mod_perl = callPackage ../servers/http/apache-modules/mod_perl { };
+
     mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { };
 
     mod_python = callPackage ../servers/http/apache-modules/mod_python { };

From af2ecc27fccc7f1e3ed3081f79f2894dde6b8f30 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 21 Dec 2016 17:47:12 -0600
Subject: [PATCH 0092/1310] kde5.kdeWrapper: use small symlink farms

This partially addresses #21345, but we may need to reduce disk usage
further.
---
 .../libraries/kde-frameworks/default.nix      |  2 +-
 .../libraries/kde-frameworks/kde-wrapper.nix  | 51 +++++++------------
 2 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 936a3953a51..93a8d62ed1d 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -57,7 +57,7 @@ let
       });
 
     kdeWrapper = import ./kde-wrapper.nix {
-      inherit (pkgs) stdenv lib makeWrapper;
+      inherit (pkgs) stdenv lib makeWrapper buildEnv;
     };
 
     attica = callPackage ./attica.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
index 3591e20d11f..890ec1e4eec 100644
--- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
+++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
@@ -1,53 +1,40 @@
-{ stdenv, lib, makeWrapper }:
+{ stdenv, lib, makeWrapper, buildEnv }:
 
 drv:
 
 { targets, paths ? [] }:
 
+let
+  env = buildEnv {
+    inherit (drv) name meta;
+    paths = builtins.map lib.getBin ([drv] ++ paths);
+    pathsToLink = [ "/bin" "/share" "/lib/qt5" "/etc/xdg" ];
+  };
+in
+
 stdenv.mkDerivation {
   inherit (drv) name meta;
+  preferLocalBuild = true;
 
   paths = builtins.map lib.getBin ([drv] ++ paths);
-  inherit drv targets;
+  inherit drv env targets;
   passthru = { unwrapped = drv; };
 
   nativeBuildInputs = [ makeWrapper ];
 
-  unpackPhase = "true";
-  configurePhase = "runHook preConfigure; runHook postConfigure";
-  buildPhase = "true";
-
-  installPhase = ''
-    propagated=
-    for p in $drv $paths; do
-        findInputs $p propagated propagated-user-env-packages
-    done
-
-    wrap_PATH="$out/bin"
-    wrap_XDG_DATA_DIRS=
-    wrap_XDG_CONFIG_DIRS=
-    wrap_QML_IMPORT_PATH=
-    wrap_QML2_IMPORT_PATH=
-    wrap_QT_PLUGIN_PATH=
-    for p in $propagated; do
-        addToSearchPath wrap_PATH "$p/bin"
-        addToSearchPath wrap_XDG_DATA_DIRS "$p/share"
-        addToSearchPath wrap_XDG_CONFIG_DIRS "$p/etc/xdg"
-        addToSearchPath wrap_QML_IMPORT_PATH "$p/lib/qt5/imports"
-        addToSearchPath wrap_QML2_IMPORT_PATH "$p/lib/qt5/qml"
-        addToSearchPath wrap_QT_PLUGIN_PATH "$p/lib/qt5/plugins"
-    done
+  builder = builtins.toFile "builder.sh" ''
+    . $stdenv/setup
 
     for t in $targets; do
         if [ -a "$drv/$t" ]; then
             makeWrapper "$drv/$t" "$out/$t" \
                 --argv0 '"$0"' \
-                --suffix PATH : "$wrap_PATH" \
-                --prefix XDG_CONFIG_DIRS : "$wrap_XDG_CONFIG_DIRS" \
-                --prefix XDG_DATA_DIRS : "$wrap_XDG_DATA_DIRS" \
-                --set QML_IMPORT_PATH "$wrap_QML_IMPORT_PATH" \
-                --set QML2_IMPORT_PATH "$wrap_QML2_IMPORT_PATH" \
-                --set QT_PLUGIN_PATH "$wrap_QT_PLUGIN_PATH"
+                --suffix PATH : "$env/bin" \
+                --prefix XDG_CONFIG_DIRS : "$env/share" \
+                --prefix XDG_DATA_DIRS : "$env/etc/xdg" \
+                --set QML_IMPORT_PATH "$env/lib/qt5/imports" \
+                --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \
+                --set QT_PLUGIN_PATH "$env/lib/qt5/plugins"
         else
             echo "no such file or directory: $drv/$t"
             exit 1

From 76b5f2c24980e99ab4862bd4981a2e27f4c64393 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 22 Dec 2016 15:58:27 +0200
Subject: [PATCH 0093/1310] wineUnstable: 1.9.23 -> 2.0-rc2

Update staging as well
---
 pkgs/misc/emulators/wine/sources.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index f583fbff231..5ad39a914f6 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -30,9 +30,9 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "1.9.23";
-    url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2";
-    sha256 = "131nqkwlss24r8la84s3v1qx376wq0016d2i2767bpxkyqkagvz3";
+    version = "2.0-rc2";
+    url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2";
+    sha256 = "0pjkrvslfksx7m2w52pnd3dfxb82l082cz9dr57x58s9al2jpwb6";
     inherit (stable) mono;
     gecko32 = fetchurl rec {
       version = "2.47";
@@ -48,7 +48,7 @@ in rec {
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "188svpmaba2x5a7g8rk68cl2mqrv1vhf1si2g5j5lps9r6pgq1c0";
+    sha256 = "1xx9bfirij12l278f5f7vpxxay1zacnrsaib6yfzrybm517ynfw3";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From 59ca5d213f99d10f9cc187763876b5c4008bac7d Mon Sep 17 00:00:00 2001
From: Jason Daniel Augustine Gilliland <jdagilliland@gmail.com>
Date: Sat, 17 Dec 2016 00:36:53 -0500
Subject: [PATCH 0094/1310] freebayes: init at 1.1.0

Signed-off-by: zimbatm <zimbatm@zimbatm.com>
---
 lib/maintainers.nix                           |  1 +
 .../science/biology/freebayes/builder.sh      | 11 ++++++++
 .../science/biology/freebayes/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/science/biology/freebayes/builder.sh
 create mode 100644 pkgs/applications/science/biology/freebayes/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f88cd1212fb..7ed8ae953bc 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -206,6 +206,7 @@
   jb55 = "William Casarin <bill@casarin.me>";
   jbedo = "Justin Bedő <cu@cua0.org>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
+  jdagilliland = "Jason Gilliland <jdagilliland@gmail.com>";
   jefdaj = "Jeffrey David Johnson <jefdaj@gmail.com>";
   jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>";
   jfb = "James Felix Black <james@yamtime.com>";
diff --git a/pkgs/applications/science/biology/freebayes/builder.sh b/pkgs/applications/science/biology/freebayes/builder.sh
new file mode 100644
index 00000000000..a9f56e77d7e
--- /dev/null
+++ b/pkgs/applications/science/biology/freebayes/builder.sh
@@ -0,0 +1,11 @@
+source $stdenv/setup
+
+unpackPhase
+
+cd freebayes-*
+
+make
+
+mkdir -p $out/bin
+cp bin/freebayes bin/bamleftalign $out/bin
+cp scripts/* $out/bin
diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix
new file mode 100644
index 00000000000..ef0da619b25
--- /dev/null
+++ b/pkgs/applications/science/biology/freebayes/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake, gcc, zlib}:
+
+stdenv.mkDerivation rec {
+  name    = "freebayes-${version}";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    name = "freebayes-${version}-src";
+    owner  = "ekg";
+    repo   = "freebayes";
+    rev    = "refs/tags/v${version}";
+    sha256 = "0xb8aicb36w9mfs1gq1x7mcp3p82kl7i61d162hfncqzg2npg8rr";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [ cmake gcc zlib ];
+
+  builder = ./builder.sh;
+
+  meta = with stdenv.lib; {
+    description = "Bayesian haplotype-based polymorphism discovery and genotyping";
+    license     = licenses.mit;
+    homepage    = https://github.com/ekg/freebayes;
+    maintainers = with maintainers; [ jdagilliland ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4261200ad6c..82c131b901a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12994,6 +12994,8 @@ in
 
   fossil = callPackage ../applications/version-management/fossil { };
 
+  freebayes = callPackage ../applications/science/biology/freebayes { };
+
   freewheeling = callPackage ../applications/audio/freewheeling { };
 
   fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { };

From 4154adb128c5bc1e7c44fa4a38230f1d6d110b0e Mon Sep 17 00:00:00 2001
From: Laverne Schrock <laverne@schrock.email>
Date: Mon, 21 Nov 2016 18:03:16 -0600
Subject: [PATCH 0095/1310] rstudio: add desktop file

Fixes #20230
---
 pkgs/applications/editors/rstudio/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 0749f58ecea..244b3b67045 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper }:
+{ stdenv, fetchurl, makeDesktopItem, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper }:
 
 let
   version = "0.98.110";
@@ -61,8 +61,23 @@ stdenv.mkDerivation {
 
   cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ];
 
+  desktopItem = makeDesktopItem {
+    name = name;
+    exec = "rstudio %F";
+    icon = "rstudio";
+    desktopName = "RStudio";
+    genericName = "IDE";
+    comment = meta.description;
+    categories = "Development;";
+    mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;";
+  };
+
   postInstall = ''
       wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin
+      mkdir $out/share
+      cp -r ${desktopItem}/share/applications $out/share
+      mkdir $out/share/icons
+      ln $out/rstudio.png $out/share/icons
   '';
 
   meta = with stdenv.lib;

From 9872e65037f03fa45e463dae5c23c35e53e245f4 Mon Sep 17 00:00:00 2001
From: Laverne Schrock <laverne@schrock.email>
Date: Mon, 21 Nov 2016 18:06:28 -0600
Subject: [PATCH 0096/1310] rstudio: make mkDerivation recursive

Needed since we want to access desktopItem from postInstall.
---
 pkgs/applications/editors/rstudio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 244b3b67045..82bcc485da3 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -5,7 +5,7 @@ let
   ginVer = "1.5";
   gwtVer = "2.5.1";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "RStudio-${version}";
 
   buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk makeWrapper ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     sha256 = "0fjr2rcr8lnywj54mzhg9i4xz1b6fh8yv12p5i2q5mgfld2xymy4";
   };
 
-  hunspellDicts = builtins.attrValues hunspellDicts;
+  hunspellDictionaries = builtins.attrValues hunspellDicts;
 
   mathJaxSrc = fetchurl {
     url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip;
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
       mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer
 
       mkdir dependencies/common/dictionaries
-      for dict in $hunspellDicts; do
+      for dict in $hunspellDictionaries; do
           for i in "$dict/share/hunspell/"*
 	  do ln -sv $i dependencies/common/dictionaries/
 	  done

From c52195daaf587ca3573bad92563a9d2c922eb415 Mon Sep 17 00:00:00 2001
From: James Kent <jameschristopherkent@gmail.com>
Date: Thu, 22 Dec 2016 15:36:29 +0000
Subject: [PATCH 0097/1310] gnuchess and xboard definitely work on darwin

---
 pkgs/games/gnuchess/default.nix | 2 +-
 pkgs/games/xboard/default.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix
index 9b0ada3f926..c61d46e9d33 100644
--- a/pkgs/games/gnuchess/default.nix
+++ b/pkgs/games/gnuchess/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     inherit (s) version;
     description = "GNU Chess engine";
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix
index 46d3873659f..442aad46fea 100644
--- a/pkgs/games/xboard/default.nix
+++ b/pkgs/games/xboard/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     inherit (s) version;
     description = ''GUI for chess engines'';
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.gpl3Plus;
   };
 }

From 215b1e519be5bbda6c472de2b851fea3e65d060f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 22 Dec 2016 15:04:49 +0100
Subject: [PATCH 0098/1310] aws-sdk-cpp: 1.0.34 -> 1.0.43

Since this drops the problematic libuuid dependency, enable on Darwin.
---
 .../libraries/aws-sdk-cpp/default.nix          | 14 ++++++++------
 .../aws-sdk-cpp/s3-encryption-headers.patch    | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index d5d7371aebf..bb07b41b059 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl, libuuid, openssl, zlib
+{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib
 , # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
   apis ? ["*"]
 , # Whether to enable AWS' custom memory management.
@@ -7,20 +7,22 @@
 
 stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.0.34";
+  version = "1.0.43";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "09vag1ybfqvw37djmd9g740iqjvg8nwr4p0xb21rfj06vazrdg4b";
+    sha256 = "0sa0pkkbxxfn3h7b19yf296r5g5nqm4aqpwrkij0rq7jix9lxqj6";
   };
 
+  patches = [ ./s3-encryption-headers.patch ];
+
   # FIXME: might be nice to put different APIs in different outputs
   # (e.g. libaws-cpp-sdk-s3.so in output "s3").
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ cmake curl libuuid ];
+  buildInputs = [ cmake curl ];
 
   cmakeFlags =
     lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
@@ -39,13 +41,13 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = lib.concatStringsSep " " (
     (map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib"))
-      [ libuuid curl openssl zlib stdenv.cc.cc ]);
+      [ curl openssl zlib stdenv.cc.cc ]);
 
   meta = {
     description = "A C++ interface for Amazon Web Services";
     homepage = https://github.com/awslabs/aws-sdk-cpp;
     license = lib.licenses.asl20;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = [ lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch b/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch
new file mode 100644
index 00000000000..10e427a1509
--- /dev/null
+++ b/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch
@@ -0,0 +1,18 @@
+diff --git a/aws-cpp-sdk-s3-encryption/CMakeLists.txt b/aws-cpp-sdk-s3-encryption/CMakeLists.txt
+index 0a1a907..cf9ce0e 100644
+--- a/aws-cpp-sdk-s3-encryption/CMakeLists.txt
++++ b/aws-cpp-sdk-s3-encryption/CMakeLists.txt
+@@ -69,9 +69,9 @@ target_link_libraries(${PROJECT_NAME} ${PROJECT_LIBS})
+ 
+ setup_install()
+ 
+-install (FILES ${S3ENCRYPTION_HEADERS} DESTINATION include/aws/s3-encryption)
+-install (FILES ${S3ENCRYPTION_MATERIALS_HEADERS} DESTINATION include/aws/s3-encryption/materials)
+-install (FILES ${S3ENCRYPTION_HANDLERS_HEADERS} DESTINATION include/aws/s3-encryption/handlers)
+-install (FILES ${S3ENCRYPTION_MODULES_HEADERS} DESTINATION include/aws/s3-encryption/modules)
++install (FILES ${S3ENCRYPTION_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption)
++install (FILES ${S3ENCRYPTION_MATERIALS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/materials)
++install (FILES ${S3ENCRYPTION_HANDLERS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/handlers)
++install (FILES ${S3ENCRYPTION_MODULES_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/modules)
+ 
+ do_packaging()

From 9f200422f28e22cc0e059406bcf0373d3e0444fc Mon Sep 17 00:00:00 2001
From: Richard Lupton <rlupton20@users.noreply.github.com>
Date: Thu, 22 Dec 2016 16:21:00 +0000
Subject: [PATCH 0099/1310] kubernetes-helm: 2.0.2 -> 2.1.2 (#21343)

---
 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 58ac31ce49f..a258a802477 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 "dad3791fb07e6cf34f4cf611728cb8ae109a75234498a888529a68ac6923f200"
-             else "d27bd7e40e12c0a5f08782a8a883166008565b28e0b82126d2089300ff3f8465";
+             then "1797ab74720f122432eace591fb415e5e5f5db97f4b6608ca8dbe59bae988374"
+             else "2b522dcfe27e987138f7826c79fb26a187075dd9be5c5a4c76fd6846bf109014";
 in
 stdenv.mkDerivation rec {
   pname = "helm";
-  version = "2.0.2";
+  version = "2.1.2";
   name = "${pname}-${version}";
 
   src = fetchurl {

From 4888bfecc28c0b74a18351a08cce5618c5b54868 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 22 Dec 2016 10:34:56 -0800
Subject: [PATCH 0100/1310] coq_8_6: 8.6 is now default, 8.4 optional, updated
 mathcomp/ssreflect

Addresses #14829
---
 .../logic/coq/{default.nix => 8.4.nix}        |  0
 .../coq-modules/mathcomp/default.nix          | 55 +++++++-----
 .../coq-modules/mathcomp/generic.nix          |  5 +-
 .../coq-modules/ssreflect/default.nix         | 14 +++
 .../coq-modules/ssreflect/generic.nix         |  5 +-
 pkgs/top-level/all-packages.nix               | 87 +++++++------------
 6 files changed, 82 insertions(+), 84 deletions(-)
 rename pkgs/applications/science/logic/coq/{default.nix => 8.4.nix} (100%)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/8.4.nix
similarity index 100%
rename from pkgs/applications/science/logic/coq/default.nix
rename to pkgs/applications/science/logic/coq/8.4.nix
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 189b1220640..81cfdecdfff 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -1,24 +1,39 @@
-{ callPackage, coq, fetchurl }:
+{ callPackage, fetchurl, coq }:
 
-let src = 
-  if coq.coq-version == "8.4" then
-
-    fetchurl {
-      url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
-      sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
-    }
-
-  else if coq.coq-version == "8.5" then
-
-    fetchurl {
-      url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
-      sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
-    }
-
-  else throw "No mathcomp package for Coq version ${coq.coq-version}";
-
-in
+if coq.coq-version == "8.4" then
 
 callPackage ./generic.nix {
-  inherit src;
+
+  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.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 {
+    url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
+    sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
+  };
+
+}
+
+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 b257c81e85f..9a6a98609d2 100644
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ b/pkgs/development/coq-modules/mathcomp/generic.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, coq, ssreflect, ncurses, which
 , graphviz, ocamlPackages, withDoc ? false
-, src
+, src, name
 }:
 
 stdenv.mkDerivation {
 
-  name = "coq-mathcomp-1.6-${coq.coq-version}";
-
+  inherit name;
   inherit src;
 
   nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 8ba49d06bae..16147c4dc2a 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -4,6 +4,7 @@ if coq.coq-version == "8.4" 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";
@@ -15,6 +16,7 @@ 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";
@@ -22,4 +24,16 @@ callPackage ./generic.nix {
 
 }
 
+else if coq.coq-version == "8.6" then
+
+callPackage ./generic.nix {
+
+  name = "coq-ssreflect-1.6.1-${coq.coq-version}";
+  src = fetchurl {
+    url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
+    sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
+  };
+
+}
+
 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 891a4e2885a..3362e8839a7 100644
--- a/pkgs/development/coq-modules/ssreflect/generic.nix
+++ b/pkgs/development/coq-modules/ssreflect/generic.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, coq, ncurses, which
 , graphviz, withDoc ? false
-, src, patches ? []
+, src, name, patches ? []
 }:
 
 stdenv.mkDerivation {
 
-  name = "coq-ssreflect-1.6-${coq.coq-version}";
-
+  inherit name;
   inherit src;
 
   nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82c131b901a..6e5b498f70a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6603,7 +6603,9 @@ in
 
   valkyrie = callPackage ../development/tools/analysis/valkyrie { };
 
-  inherit (ocaml-ng.ocamlPackages_4_02) verasco;
+  verasco = ocaml-ng.ocamlPackages_4_02.verasco.override {
+    coq = coq_8_4;
+  };
 
   visualvm = callPackage ../development/tools/java/visualvm { };
 
@@ -16716,38 +16718,34 @@ in
 
   aspino = callPackage ../applications/science/logic/aspino {};
 
-  coq = callPackage ../applications/science/logic/coq {
-    inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk;
-    camlp5 = ocamlPackages_4_01_0.camlp5_transitional;
-  };
-
-  coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
-    inherit (ocamlPackages) ocaml findlib lablgtk;
-    camlp5 = ocamlPackages.camlp5_transitional;
-  };
-
-  coq_8_6 = callPackage ../applications/science/logic/coq/8.6.nix {
-    inherit (ocamlPackages) ocaml findlib lablgtk;
-    camlp5 = ocamlPackages.camlp5_transitional;
-  };
-
-  coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix {
-    inherit (ocamlPackages) ocaml findlib lablgtk;
-    camlp5 = ocamlPackages.camlp5_transitional;
-  };
-
   coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
     make = pkgs.gnumake3;
     inherit (ocamlPackages_3_12_1) ocaml findlib;
     camlp5 = ocamlPackages_3_12_1.camlp5_transitional;
     lablgtk = ocamlPackages_3_12_1.lablgtk_2_14;
   };
+  coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix {
+    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 {
+    inherit (ocamlPackages) ocaml findlib lablgtk;
+    camlp5 = ocamlPackages.camlp5_transitional;
+  };
+  coq_8_6 = callPackage ../applications/science/logic/coq/8.6.nix {
+    inherit (ocamlPackages) ocaml findlib lablgtk;
+    camlp5 = ocamlPackages.camlp5_transitional;
+  };
+  coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
+    inherit (ocamlPackages) ocaml findlib lablgtk;
+    camlp5 = ocamlPackages.camlp5_transitional;
+  };
+  coq = coq_8_6;
 
   mkCoqPackages_8_4 = self: let callPackage = newScope self; in {
-
     inherit callPackage;
-
-    bedrock = callPackage ../development/coq-modules/bedrock {};
+    coq = coq_8_4;
+    coqPackages = coqPackages_8_4;
 
     contribs =
       let contribs =
@@ -16757,86 +16755,59 @@ in
       in
         recurseIntoAttrs contribs;
 
+    bedrock = callPackage ../development/coq-modules/bedrock {};
     coqExtLib = callPackage ../development/coq-modules/coq-ext-lib {};
-
     coqeal = callPackage ../development/coq-modules/coqeal {};
-
     coquelicot = callPackage ../development/coq-modules/coquelicot {};
-
     domains = callPackage ../development/coq-modules/domains {};
-
     fiat = callPackage ../development/coq-modules/fiat {};
     fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
-
     flocq = callPackage ../development/coq-modules/flocq {};
-
     heq = callPackage ../development/coq-modules/heq {};
-
     interval = callPackage ../development/coq-modules/interval {};
-
     mathcomp = callPackage ../development/coq-modules/mathcomp {};
-
     paco = callPackage ../development/coq-modules/paco {};
-
     QuickChick = callPackage ../development/coq-modules/QuickChick {};
-
     ssreflect = callPackage ../development/coq-modules/ssreflect {};
-
     tlc = callPackage ../development/coq-modules/tlc {};
-
     unimath = callPackage ../development/coq-modules/unimath {};
-
     ynot = callPackage ../development/coq-modules/ynot {};
-
   };
 
   mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec {
-
     inherit callPackage;
-
     coq = coq_8_5;
+    coqPackages = coqPackages_8_5;
 
     coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
-
     coquelicot = callPackage ../development/coq-modules/coquelicot {};
-
     dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
-
     flocq = callPackage ../development/coq-modules/flocq {};
-
     interval = callPackage ../development/coq-modules/interval {};
-
     mathcomp = callPackage ../development/coq-modules/mathcomp { };
-
     ssreflect = callPackage ../development/coq-modules/ssreflect { };
-
     fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
-
   };
 
   mkCoqPackages_8_6 = self: let callPackage = newScope self; in rec {
-
     inherit callPackage;
-
     coq = coq_8_6;
+    coqPackages = coqPackages_8_6;
 
     coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
-
     coquelicot = callPackage ../development/coq-modules/coquelicot {};
-
     dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
-
     flocq = callPackage ../development/coq-modules/flocq {};
-
     interval = callPackage ../development/coq-modules/interval {};
-
+    mathcomp = callPackage ../development/coq-modules/mathcomp { };
+    ssreflect = callPackage ../development/coq-modules/ssreflect { };
     fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
-
   };
 
-  coqPackages = mkCoqPackages_8_4 coqPackages;
+  coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4;
   coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5;
   coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6;
+  coqPackages = coqPackages_8_6;
 
   cryptoverif = callPackage ../applications/science/logic/cryptoverif { };
 

From f06284b0dc28eb7c1a27c57e97bf087ab224a8e7 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 22 Dec 2016 11:04:39 -0800
Subject: [PATCH 0101/1310] coq_8_6: Use ocamlPackages_4_03 rather than 4_01

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e5b498f70a..e367d529dbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16733,8 +16733,8 @@ in
     camlp5 = ocamlPackages.camlp5_transitional;
   };
   coq_8_6 = callPackage ../applications/science/logic/coq/8.6.nix {
-    inherit (ocamlPackages) ocaml findlib lablgtk;
-    camlp5 = ocamlPackages.camlp5_transitional;
+    inherit (ocamlPackages_4_03) ocaml findlib lablgtk;
+    camlp5 = ocamlPackages_4_03.camlp5_transitional;
   };
   coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
     inherit (ocamlPackages) ocaml findlib lablgtk;

From dfe1f721cafc5ddeae79b70592bead719d4f1f05 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 22 Dec 2016 13:36:08 -0500
Subject: [PATCH 0102/1310] all-packages: Whitespace pruning

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e367d529dbc..c75239ff472 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2253,7 +2253,7 @@ in
   ioping = callPackage ../tools/system/ioping { };
 
   iops = callPackage ../tools/system/iops { };
-  
+
   ior = callPackage ../tools/system/ior { };
 
   iodine = callPackage ../tools/networking/iodine { };
@@ -2604,7 +2604,7 @@ in
   libmbim = callPackage ../development/libraries/libmbim { };
 
   libmongo-client = callPackage ../development/libraries/libmongo-client { };
-  
+
   libmesode = callPackage ../development/libraries/libmesode { };
 
   libnabo = callPackage ../development/libraries/libnabo { };

From 94fbbb2ed6487aa5da28c3816e343e263df112c8 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 22 Dec 2016 13:36:37 -0500
Subject: [PATCH 0103/1310] linux_3_12: Drop already applied patches

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c75239ff472..e8d5e8da8ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11005,9 +11005,7 @@ in
 
   linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix {
     kernelPatches = with kernelPatches;
-      [ bridge_stp_helper
-        crc_regression
-        packet_fix_race_condition_CVE_2016_8655
+      [
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From 9a167a35ff87606f18580780d6b6e2ce3ddd3fcc Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 22 Dec 2016 12:44:05 -0800
Subject: [PATCH 0104/1310] coq_8_6: Use ocamlPackages, rather than a specific
 version

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8d5e8da8ad..f76728bd62c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16731,8 +16731,8 @@ in
     camlp5 = ocamlPackages.camlp5_transitional;
   };
   coq_8_6 = callPackage ../applications/science/logic/coq/8.6.nix {
-    inherit (ocamlPackages_4_03) ocaml findlib lablgtk;
-    camlp5 = ocamlPackages_4_03.camlp5_transitional;
+    inherit (ocamlPackages) ocaml findlib lablgtk;
+    camlp5 = ocamlPackages.camlp5_transitional;
   };
   coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
     inherit (ocamlPackages) ocaml findlib lablgtk;

From 3876b4dd94f1803652a4a76592ad519b4da4ddd8 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 22 Dec 2016 14:10:21 -0800
Subject: [PATCH 0105/1310] coq, coqPackages: Roll default back to 8.4, until
 ssreflect is building

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f76728bd62c..e8ccd434664 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16738,7 +16738,7 @@ in
     inherit (ocamlPackages) ocaml findlib lablgtk;
     camlp5 = ocamlPackages.camlp5_transitional;
   };
-  coq = coq_8_6;
+  coq = coq_8_4;
 
   mkCoqPackages_8_4 = self: let callPackage = newScope self; in {
     inherit callPackage;
@@ -16805,7 +16805,7 @@ in
   coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4;
   coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5;
   coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6;
-  coqPackages = coqPackages_8_6;
+  coqPackages = coqPackages_8_4;
 
   cryptoverif = callPackage ../applications/science/logic/cryptoverif { };
 

From 556ca974aa0750c7a120d952601ebaacd1a658c3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 22 Dec 2016 23:47:15 +0100
Subject: [PATCH 0106/1310] linux_3_12: add back bridge_stp_helper patch

See 94fbbb2ed6487aa5da28c3816e343e263df112c8
---
 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 e8ccd434664..a35ef13bb43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11005,7 +11005,7 @@ in
 
   linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix {
     kernelPatches = with kernelPatches;
-      [
+      [ bridge_stp_helper
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From 53a44eff9291a57d75ef8fe8cfe62225a7d8f918 Mon Sep 17 00:00:00 2001
From: Rory McNamara <git@rorym.cnamara.com>
Date: Thu, 22 Dec 2016 23:22:58 +0000
Subject: [PATCH 0107/1310] bspwm: 1.9.1 -> 1.9.2

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

diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index 641716ab2fc..8798d2b3832 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "bspwm-${version}";
-  version = "0.9.1";
+  version = "0.9.2";
 
 
   src = fetchurl {
     url = "https://github.com/baskerville/bspwm/archive/${version}.tar.gz";
-    sha256 = "11dvfcvr8bc116yb3pvl0k1h2gfm9rv652jbxd1c5pmc0yimifq2";
+    sha256 = "1w6wxwgyb14w664xafp3b2ps6zzf9yw7cfhbh9229x2hil9rss1k";
   };
 
   buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];

From 41652f8ce58680a5cb21540677a27854ea668557 Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@traumapony.org>
Date: Fri, 23 Dec 2016 10:33:45 +1000
Subject: [PATCH 0108/1310] ncurses: Create ABI-version'd libtinfo

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

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index bbf7d7108dd..302c8681677 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -104,6 +104,7 @@ stdenv.mkDerivation rec {
 
     # create libtinfo symlink
     ln -svf $out/lib/libncurses.$dylibtype $out/libtinfo.$dylibtype
+    ln -svf $out/lib/libncurses.$dylibtype.${abiVersion} $out/libtinfo.$dylibtype.${abiVersion}
         
     # move some utilities to $bin
     # these programs are used at runtime and don't really belong in $dev

From d8a8e1cd0a358fba75ef7b323d97561b5a26eed0 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Fri, 23 Dec 2016 01:44:30 +0000
Subject: [PATCH 0109/1310] Update GHC 8.0.2 to RC 2

---
 pkgs/development/compilers/ghc/8.0.2.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 5a435508435..b9bece1489f 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -13,21 +13,15 @@ let
   });
 in
 stdenv.mkDerivation rec {
-  version = "8.0.1.20161117";
+  version = "8.0.1.20161213";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/8.0.2-rc1/${name}-src.tar.xz";
-    sha256 = "08hpzvg059ha0knmlngd0winfkplkkb7dk88zfz3s177z38kd874";
+    url = "https://downloads.haskell.org/~ghc/8.0.2-rc2/${name}-src.tar.xz";
+    sha256 = "0l1arhbh3rbs011f0y4pgc35yn07x3hz6lfqlvqbwn96f8ff5529";
   };
 
-  patches = [
-    # Already applied?
-    # ./relocation.patch
-    # Fix https://ghc.haskell.org/trac/ghc/ticket/12130
-    # (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; })
-    (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; })
-  ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
+  patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
 
   buildInputs = [ ghc perl hscolour ];
 

From c826ec60909a00b6093b708aa907f7f1dd018558 Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@traumapony.org>
Date: Fri, 23 Dec 2016 13:18:58 +1000
Subject: [PATCH 0110/1310] ncurses: Fix libtinfo for crossplatform

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

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 302c8681677..c7048cfa8fe 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -91,6 +91,9 @@ stdenv.mkDerivation rec {
           if [ -e "$out/lib/lib''${library}$suffix.$dylibtype" ]; then
             ln -svf lib''${library}$suffix.$dylibtype $out/lib/lib$library$newsuffix.$dylibtype
             ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/lib$library$newsuffix.$dylibtype.${abiVersion}
+            # make libtinfo symlinks
+            ln -svf lib''${library}$suffix.$dylibtype $out/lib/libtinfo$newsuffix.$dylibtype
+            ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/libtinfo$newsuffix.$dylibtype.${abiVersion}
           fi
         done
         for statictype in a dll.a la; do
@@ -102,10 +105,6 @@ stdenv.mkDerivation rec {
       done
     done
 
-    # create libtinfo symlink
-    ln -svf $out/lib/libncurses.$dylibtype $out/libtinfo.$dylibtype
-    ln -svf $out/lib/libncurses.$dylibtype.${abiVersion} $out/libtinfo.$dylibtype.${abiVersion}
-        
     # move some utilities to $bin
     # these programs are used at runtime and don't really belong in $dev
     moveToOutput "bin/clear" "$out"

From 9f6bd82364da34a1244dc5a246f9243b6daa8144 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 23 Dec 2016 10:57:28 +0100
Subject: [PATCH 0111/1310] nvidia-x11: 375.20 -> 375.26

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 69e4de69f9c..967a98d9566 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
 
 let
 
-  versionNumber = "375.20";
+  versionNumber = "375.26";
 
   # Policy: use the highest stable version as the default (on our master).
   inherit (stdenv.lib) makeLibraryPath;
@@ -30,12 +30,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 = "0da3mgfmkhs576wfkdmk8pbmvsksalkwz8a75vnhk0385fnd6yfc";
+        sha256 = "0yv19rkz2wzzj0fygfjb1mh21iy769kff3yg2kzk8bsiwnmcyybw";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run";
-        sha256 = "02v20xns8w4flpllibc684g5yghi5dy28avsarccjyn5knhl03ni";
+        sha256 = "1kqy9ayja3g5znj2hzx8pklz8qi0b0l9da7c3ldg3hlxf31v4hjg";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From d8478c79128cc5220b47ba3fd2f1dccddaa6e31e Mon Sep 17 00:00:00 2001
From: Felix Richter <github@syntax-fehler.de>
Date: Fri, 23 Dec 2016 11:49:35 +0100
Subject: [PATCH 0112/1310] services.nginx: allow startup with ipv6 disabled
 (#21360)

currently services.nginx does not start up if `networking.enableIPv6 = false`
the commit changes the nginx behavior to handle this case accordingly.
The commit resolves #21308
---
 nixos/modules/services/web-servers/nginx/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 698d37133d7..c1bceb13312 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -10,6 +10,7 @@ let
       sslCertificateKey = "/var/lib/acme/${vhostName}/key.pem";
     })
   ) cfg.virtualHosts;
+  enableIPv6 = config.networking.enableIPv6;
 
   configFile = pkgs.writeText "nginx.conf" ''
     user ${cfg.user} ${cfg.group};
@@ -84,7 +85,7 @@ let
       ${optionalString cfg.statusPage ''
         server {
           listen 80;
-          listen [::]:80;
+          ${optionalString enableIPv6 "listen [::]:80;" }
 
           server_name localhost;
 
@@ -92,7 +93,7 @@ let
             stub_status on;
             access_log off;
             allow 127.0.0.1;
-            allow ::1;
+            ${optionalString enableIPv6 "allow ::1;"}
             deny all;
           }
         }
@@ -133,7 +134,9 @@ let
         ${optionalString vhost.forceSSL ''
           server {
             listen 80 ${optionalString vhost.default "default"};
-            listen [::]:80 ${optionalString vhost.default "default"};
+            ${optionalString enableIPv6
+              ''listen [::]:80 ${optionalString vhost.default "default"};''
+            }
 
             server_name ${serverName} ${concatStringsSep " " vhost.serverAliases};
             ${acmeLocation}
@@ -145,7 +148,7 @@ let
 
         server {
           listen ${listenString};
-          listen [::]:${listenString};
+          ${optionalString enableIPv6 "listen [::]:${listenString};"}
 
           server_name ${serverName} ${concatStringsSep " " vhost.serverAliases};
           ${acmeLocation}

From de44544cebe3cec242d752afcff71a8203b81102 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 23 Dec 2016 11:52:44 +0100
Subject: [PATCH 0113/1310] nginx service: use `default_server` parameter
 instead of `default` (#21371)

---
 nixos/modules/services/web-servers/nginx/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index c1bceb13312..68a672c42c9 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -117,7 +117,7 @@ let
         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"
-          + optionalString vhost.default " default";
+          + optionalString vhost.default " default_server";
         acmeLocation = optionalString vhost.enableACME (''
           location /.well-known/acme-challenge {
             ${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"}
@@ -133,9 +133,9 @@ let
       in ''
         ${optionalString vhost.forceSSL ''
           server {
-            listen 80 ${optionalString vhost.default "default"};
+            listen 80 ${optionalString vhost.default "default_server"};
             ${optionalString enableIPv6
-              ''listen [::]:80 ${optionalString vhost.default "default"};''
+              ''listen [::]:80 ${optionalString vhost.default "default_server"};''
             }
 
             server_name ${serverName} ${concatStringsSep " " vhost.serverAliases};

From c8982c015c82de2fcf97e60399d1461076b9d42b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 23 Dec 2016 12:28:06 +0100
Subject: [PATCH 0114/1310] salt: fix patch after upstream code change

fixes #20458
---
 pkgs/tools/admin/salt/fix-libcrypto-loading.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
index c5cc1bde5d0..fa2c5c0aa52 100644
--- a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
+++ b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
@@ -2,10 +2,10 @@ diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py
 index 9eb1f4a..d764f7a 100644
 --- a/salt/utils/rsax931.py
 +++ b/salt/utils/rsax931.py
-@@ -36,7 +36,7 @@ def _load_libcrypto():
+@@ -36,7 +36,6 @@ def _load_libcrypto():
                  'libcrypto.so*'))
              lib = lib[0] if len(lib) > 0 else None
-         if lib:
+-        if lib:
 -            return cdll.LoadLibrary(lib)
-+            return cdll.LoadLibrary('@libcrypto@')
++        return cdll.LoadLibrary('@libcrypto@')
          raise OSError('Cannot locate OpenSSL libcrypto')

From cbe1218cc90de4ddc79b37c52c348b0b4b062edc Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 18 Dec 2016 21:26:47 -0500
Subject: [PATCH 0115/1310] plex: 1.2.7 -> 1.3.3

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

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 467f3ffb1d4..122d5bd7dc9 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -6,9 +6,9 @@
 let
   plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
   plexpkg = if enablePlexPass then plexPass else {
-    version = "1.2.7.2987";
-    vsnHash = "1bef33a";
-    sha256 = "17d1yisbikcp25mgn71rf8w76zhy015f33hxjj93swfm1qrq55hq";
+    version = "1.3.3.3148";
+    vsnHash = "b38628e";
+    sha256 = "1dx8z27l1dwigr3ipcdzn25hnj0206255ihxh9rnh2qchrcqmb5y";
   };
 
 in stdenv.mkDerivation rec {

From 3c10e68c40ebb5419aeb282253ef4d0cd902c646 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 18 Dec 2016 21:59:06 -0500
Subject: [PATCH 0116/1310] plex: fix a minor syntax issue in systemd ExecStart

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

diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index 92b352db416..48d3c05785c 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -127,7 +127,7 @@ in
         User = cfg.user;
         Group = cfg.group;
         PermissionsStartOnly = "true";
-        ExecStart = "/bin/sh -c '${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server'";
+        ExecStart = "/bin/sh -c ${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server";
         Restart = "on-failure";
       };
       environment = {

From f381232a96634c37ecbcfcfa6641963544d71f50 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 15 Dec 2016 17:18:52 +0100
Subject: [PATCH 0117/1310] libgcrypt: 1.7.3 -> 1.7.5

See http://lists.gnu.org/archive/html/info-gnu/2016-12/msg00007.html
for release announcement.
---
 pkgs/development/libraries/libgcrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 8b7f48967e0..f0525789896 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux;
 
 stdenv.mkDerivation rec {
   name = "libgcrypt-${version}";
-  version = "1.7.3";
+  version = "1.7.5";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "0wbh6fq5zi9wg2xcfvfpwh7dv52jihivx1vm4h91c2kx0w8n3b6x";
+    sha256 = "0078pbzm6nlgvnwlylshsg707ifcmfpnpbvhlhqbpwpfic9a9zni";
   };
 
   outputs = [ "out" "dev" "info" ];

From 501e485e75eae8f300210eac7a90ca3730f82951 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 20 Dec 2016 17:17:21 +0100
Subject: [PATCH 0118/1310] gnupg21: 2.1.16 -> 2.1.17

See http://lists.gnu.org/archive/html/info-gnu/2016-12/msg00011.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 a4b47843583..e91f91dbdea 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.16";
+  version = "2.1.17";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0i483m9q032a0s50f1izb213g4h5i7pcgn395m6hvl3sg2kadfa9";
+    sha256 = "1js308b46ifx1gim0c9nivr5yxhans7iq1yvkf7zl2928gdm9p65";
   };
 
   buildInputs = [

From 2fe61cb9dfd3062282d5f264d2d22920e4f48cdb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 23 Dec 2016 15:31:24 +0100
Subject: [PATCH 0119/1310] pythonPackages.lockfile: 0.10.2 -> 0.12.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 53d27af0dd2..a1601ee2d46 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13898,16 +13898,16 @@ in {
   llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_38;};
 
   lockfile = buildPythonPackage rec {
-    name = "lockfile-${version}";
-    version = "0.10.2";
+    pname = "lockfile";
+    version = "0.12.2";
+    name = "${pname}-${version}";
     src = pkgs.fetchurl {
-      sha256 = "0zi7amj3y55lp6339w217zksn1a0ssfvscmv059g2wvnyjqi6f95";
-      url = "https://github.com/openstack/pylockfile/archive/${version}.tar.gz";
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799";
     };
 
-    OSLO_PACKAGE_VERSION = "${version}";
     buildInputs = with self; [
-      pbr nose sphinx_1_2
+      pbr nose
     ];
 
     checkPhase = ''

From fd23914961b7e258a7040af9b10416fe651acb82 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 23 Dec 2016 15:31:36 +0100
Subject: [PATCH 0120/1310] pythonPackages.sphinx: 1.4.6 -> 1.5.1

---
 pkgs/top-level/python-packages.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a1601ee2d46..9a6b3077213 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24436,20 +24436,25 @@ in {
   sphinx = buildPythonPackage (rec {
     name = "${pname}-${version}";
     pname = "Sphinx";
-    version = "1.4.6";
+    version = "1.5.1";
     src = pkgs.fetchurl {
-      url = "mirror://pypi/S/${pname}/${name}.tar.gz";
-      sha256 = "1lvr39ab5sjp894jshk39xidlxw9vc735882cgcfr4dlm4546hwy";
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "8e6a77a20b2df950de322fc32f3b508697d9d654fe984e3cc88f446a5b4c17c5";
     };
     LC_ALL = "en_US.UTF-8";
-    buildInputs = with self; [ nose simplejson mock pkgs.glibcLocales ];
-    patchPhase = '' sed -i '$ d' tests/test_setup_command.py '';
-    checkPhase = '' PYTHON=${python.executable} make test '';
+    buildInputs = with self; [ nose simplejson mock pkgs.glibcLocales html5lib ] ++ optional (pythonOlder "3.4") self.enum34;
+    # Disable two tests that require network access.
+    postPatch = ''
+      substituteInPlace tests/test_build_linkcheck.py --replace test_defaults dont_test_defaults
+      substituteInPlace tests/test_build_linkcheck.py --replace test_anchors_ignored dont_test_anchors_ignored
+    '';
+    checkPhase = ''
+      make test
+    '';
     propagatedBuildInputs = with self; [
       docutils
       jinja2
       pygments
-      sphinx_rtd_theme
       alabaster
       Babel
       snowballstemmer
@@ -24457,6 +24462,7 @@ in {
       sqlalchemy
       whoosh
       imagesize
+      requests2
     ];
     meta = {
       description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects";
@@ -24473,7 +24479,7 @@ in {
       url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz";
       sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04";
     };
-    patches = [];
+    postPatch = '''';
     # Tests requires Pygments >=2.0.2 which isn't worth keeping around for this:
     doCheck = false;
   };

From ef9e7a8d882d1f5b4f6f153771f630c5dbad9062 Mon Sep 17 00:00:00 2001
From: Adam Beckmeyer <adam_git@thebeckmeyers.xyz>
Date: Fri, 23 Dec 2016 11:23:14 -0500
Subject: [PATCH 0121/1310] pythonPackages.markdown: 2.6.4 -> 2.6.7

---
 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 8cc49d53c70..aa94c114371 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14139,12 +14139,12 @@ in {
   };
 
   markdown = buildPythonPackage rec {
-    version = "2.6.4";
+    version = "2.6.7";
     name = "markdown-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/M/Markdown/Markdown-${version}.tar.gz";
-      sha256 = "1kll5b35wqkhvniwm2kh6rqc43wakv9ls0qm6g5318pjmbkywdp4";
+      sha256 = "1h055llfd0ps0ig7qb3v1j9068xv90dc9s7xkhkgz9zg8r4g5sys";
     };
 
     # error: invalid command 'test'

From fcbce33e27f261db83e5a9ebceb1451a2e82d772 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 23 Dec 2016 01:15:24 +0100
Subject: [PATCH 0122/1310] bird: 1.6.2 -> 1.6.3

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

diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index a03b81583c0..0e77aa1d8ee 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -2,11 +2,11 @@
 , enableIPv6 ? false }:
 
 stdenv.mkDerivation rec {
-  name = "bird-1.6.2";
+  name = "bird-1.6.3";
 
   src = fetchurl {
     url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
-    sha256 = "1xlq78mgfyh9yvg9zld9mx75bxg9ajbn4cjjchnf0msh0ibzhlw8";
+    sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r";
   };
 
   buildInputs = [ flex bison readline ];

From 61312a922c1884954fe9821be71d4d223d76702b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 23 Dec 2016 04:17:07 +0100
Subject: [PATCH 0123/1310] grafana: 4.0.0 -> 4.0.2

---
 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 821d049c297..aa14af89c32 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.0";
-  ts = "1480439068";
+  version = "4.0.2";
+  ts = "1481203731";
   name = "grafana-v${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -10,12 +10,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0ps9bi4mnb3k6g2824crhyb804srk2b4d2j9k306vg0cizirn75c";
+    sha256 = "1z71nb4qmp1qavsc101k86hc4yyis3mlqb1csrymkhgl94qpiiqm";
   };
 
   srcStatic = fetchurl {
     url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz";
-    sha256 = "10n3vmmyr1rvq29r5cz1rwz60smavj6fahz4vaqldh1v0qyqzjlm";
+    sha256 = "1jnh2hn95r1ik0z31b4p0niq7apykppf8jcjjhsbqf8yp8i2b737";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From c23032a8b11d0585c1f1aece1d2b0abd82148e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 20 Dec 2016 23:24:17 +0100
Subject: [PATCH 0124/1310] docker: update service units from upstream

All the new options in detail:

Enable docker in multi-user.target make container created with restart=always
to start. We still want socket activation as it decouples dependencies between
the existing of /var/run/docker.sock and the docker daemon. This means that
services can rely on the availability of this socket. Fixes #11478 #21303

  wantedBy = ["multi-user.target"];

This allows us to remove the postStart hack, as docker reports on its own when
it is ready.

  Type=notify

The following will set unset some limits because overhead in kernel's ressource
accounting was observed. Note that these limit only apply to containerd.
Containers will have their own limit set.

  LimitNPROC=infinity
  LimitCORE=infinity
  TasksMax=infinity

Upgrades may require schema migrations. This can delay the startup of dockerd.

  TimeoutStartSec=0

Allows docker to create its own cgroup subhierarchy to apply ressource limits on
containers.

  Delegate=true

When dockerd is killed, container should be not affected to allow
`live restore` to work.

  KillMode=process
---
 .../web-servers/lighttpd/inginious.nix        |  3 +-
 nixos/modules/virtualisation/docker.nix       | 93 +++++++++++--------
 nixos/tests/docker-registry.nix               |  2 -
 3 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/nixos/modules/services/web-servers/lighttpd/inginious.nix b/nixos/modules/services/web-servers/lighttpd/inginious.nix
index 43deccb6aef..669e81d0f14 100644
--- a/nixos/modules/services/web-servers/lighttpd/inginious.nix
+++ b/nixos/modules/services/web-servers/lighttpd/inginious.nix
@@ -191,9 +191,8 @@ in
         virtualisation.docker = {
           enable = true;
           # We need docker to listen on port 2375.
-          extraOptions = "-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock";
+          listenOptions = ["127.0.0.1:2375" "/var/run/docker.sock"];
           storageDriver = mkDefault "overlay";
-          socketActivation = false;
         };
 
         users.extraUsers."lighttpd".extraGroups = [ "docker" ];
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 92fe98f3f9c..8902799936c 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -28,16 +28,42 @@ in
             <command>docker</command> command line tool.
           '';
       };
-    socketActivation =
+
+    listenOptions =
+      mkOption {
+        type = types.listOf types.str;
+        default = ["/var/run/docker.sock"];
+        description =
+          ''
+            A list of unix and tcp docker should listen to. The format follows
+            ListenStream as described in systemd.socket(5).
+          '';
+      };
+
+    enableOnBoot =
       mkOption {
         type = types.bool;
         default = true;
         description =
           ''
-            This option enables docker with socket activation. I.e. docker will
-            start when first called by client.
+            When enabled dockerd is started on boot. This is required for
+            container, which are created with the
+            <literal>--restart=always</literal> flag, to work. If this option is
+            disabled, docker might be started on demand by socket activation.
           '';
       };
+
+    liveRestore =
+      mkOption {
+        type = types.bool;
+        default = true;
+        description =
+          ''
+            Allow dockerd to be restarted without affecting running container.
+            This option is incompatible with docker swarm.
+          '';
+      };
+
     storageDriver =
       mkOption {
         type = types.nullOr (types.enum ["aufs" "btrfs" "devicemapper" "overlay" "overlay2" "zfs"]);
@@ -69,24 +95,6 @@ in
             <command>docker</command> daemon.
           '';
       };
-
-    postStart =
-      mkOption {
-        type = types.lines;
-        default = ''
-          while ! [ -e /var/run/docker.sock ]; do
-            sleep 0.1
-          done
-        '';
-        description = ''
-          The postStart phase of the systemd service. You may need to
-          override this if you are passing in flags to docker which
-          don't cause the socket file to be created. This option is ignored
-          if socket activation is used.
-        '';
-      };
-
-
   };
 
   ###### implementation
@@ -94,44 +102,53 @@ in
   config = mkIf cfg.enable (mkMerge [
     { environment.systemPackages = [ pkgs.docker ];
       users.extraGroups.docker.gid = config.ids.gids.docker;
+      # this unit follows the one provided by upstream see: https://github.com/docker/docker/blob/master/contrib/init/systemd/docker.service
+      # comments below reflect experience from upstream.
       systemd.services.docker = {
         description = "Docker Application Container Engine";
-        wantedBy = optional (!cfg.socketActivation) "multi-user.target";
-        after = [ "network.target" ] ++ (optional cfg.socketActivation "docker.socket") ;
-        requires = optional cfg.socketActivation "docker.socket";
+        wantedBy = optional cfg.enableOnBoot "multi-user.target";
+        after = [ "network.target" "docker.socket" ];
+        requires = ["docker.socket"];
         serviceConfig = {
+          # the default is not to use systemd for cgroups because the delegate issues still
+          # exists and systemd currently does not support the cgroup feature set required
+          # for containers run by docker
           ExecStart = ''${pkgs.docker}/bin/dockerd \
-            --group=docker --log-driver=${cfg.logDriver} \
+            --group=docker \
+            --host=fd:// \
+            --log-driver=${cfg.logDriver} \
             ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \
-            ${optionalString cfg.socketActivation "--host=fd://"} \
+            ${optionalString cfg.liveRestore "--live-restore" } \
             ${cfg.extraOptions}
           '';
-          #  I'm not sure if that limits aren't too high, but it's what
-          #  goes in config bundled with docker itself
+          Type="notify";
+          ExecReload="${pkgs.procps}/bin/kill -s HUP $MAINPID";
           LimitNOFILE = 1048576;
-          LimitNPROC = 1048576;
+          # Having non-zero Limit*s causes performance problems due to accounting overhead
+          # in the kernel. We recommend using cgroups to do container-local accounting.
+          LimitNPROC="infinity";
+          LimitCORE="infinity";
+          TasksMax="infinity";
+          TimeoutStartSec=0;
+          # set delegate yes so that systemd does not reset the cgroups of docker containers
+          Delegate="yes";
+          # kill only the docker process, not all processes in the cgroup
+          KillMode="process";
         } // proxy_env;
 
         path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
-
-        postStart = if cfg.socketActivation then "" else cfg.postStart;
-
-        # Presumably some containers are running we don't want to interrupt
-        restartIfChanged = false;
       };
-    }
-    (mkIf cfg.socketActivation {
       systemd.sockets.docker = {
         description = "Docker Socket for the API";
         wantedBy = [ "sockets.target" ];
         socketConfig = {
-          ListenStream = "/var/run/docker.sock";
+          ListenStream = cfg.listenOptions;
           SocketMode = "0660";
           SocketUser = "root";
           SocketGroup = "docker";
         };
       };
-    })
+    }
   ]);
 
 }
diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix
index df24686aba8..109fca440e5 100644
--- a/nixos/tests/docker-registry.nix
+++ b/nixos/tests/docker-registry.nix
@@ -16,13 +16,11 @@ import ./make-test.nix ({ pkgs, ...} : {
 
     client1 = { config, pkgs, ...}: {
       virtualisation.docker.enable = true;
-      virtualisation.docker.socketActivation = false;
       virtualisation.docker.extraOptions = "--insecure-registry registry:8080";
     };
 
     client2 = { config, pkgs, ...}: {
       virtualisation.docker.enable = true;
-      virtualisation.docker.socketActivation = false;
       virtualisation.docker.extraOptions = "--insecure-registry registry:8080";
     };
   };

From be07d4304e760fefb91104eaebea6350ebae5489 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 23 Dec 2016 23:23:10 +0100
Subject: [PATCH 0125/1310] gexiv2: 0.10.3 -> 0.10.4

---
 pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix
index 7cea9cd8d15..d27e10f104c 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix
@@ -5,11 +5,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "gexiv2-${version}";
-  version = "${majorVersion}.3";
+  version = "${majorVersion}.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz";
-    sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988";
+    sha256 = "190www3b61spfgwx42jw8h5hsz2996jcxky48k63468avjpk33dd";
   };
 
   preConfigure = ''

From 5e3c4b2bf70ff227ffb5c05a3005c7ac390c672e Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 23 Dec 2016 23:24:36 +0100
Subject: [PATCH 0126/1310] shotwell: 0.23.5 -> 0.25.2

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

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 3f9fd132c09..ca74cd1a4aa 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   version = "${major}.${minor}";
-  major = "0.23";
-  minor = "5";
+  major = "0.25";
+  minor = "2";
   name = "shotwell-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
-    sha256 = "0fgs1rgvkmy79bmpxrsvm5w8rvqml4l1vnwma0xqx5zzm02p8a07";
+    sha256 = "1bih5hr3pvpkx3fck55bnhngn4fl92ryjizc34wb8pwigbkxnaj1";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
                   pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
                   which udev libgudev gnome3.gexiv2 hicolor_icon_theme
                   libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
-                  wrapGAppsHook gnome_doc_utils gnome3.rest
+                  wrapGAppsHook gnome_doc_utils gnome3.rest gnome3.gcr
                   gnome3.defaultIconTheme itstool ];
 
   meta = with stdenv.lib; {

From e08f7afc62cbfe038ce5a5bcc9789c76a6548825 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 23 Dec 2016 23:44:45 +0100
Subject: [PATCH 0127/1310] pypi2nix: 1.5.0 -> 1.6.0

---
 pkgs/development/tools/pypi2nix/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 229d680f835..1e6b6690e71 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, python, zip, makeWrapper
+{ stdenv, fetchurl, python, zip, makeWrapper, nix, nix-prefetch-scripts
 }:
 
 let
 
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
-    sha256 = "0s79pp7gkgyk7discnv94m6z81fd67p66rdbd4cwk1ma0qljlh2k";
+    sha256 = "08iad1ad2gnvsnd66ddw3lff19ms2yly4iq63c8800j603d0pdhn";
   };
 
   click = fetchurl {
@@ -16,8 +16,8 @@ let
   };
 
   requests = fetchurl {
-    url = "https://pypi.python.org/packages/2e/ad/e627446492cc374c284e82381215dcd9a0a87c4f6e90e9789afefe6da0ad/requests-2.11.1.tar.gz";
-    sha256 = "0cx1w7m4cpslxz9jljxv0l9892ygrrckkiwpp2hangr8b01rikss";
+    url = "https://pypi.python.org/packages/5b/0b/34be574b1ec997247796e5d516f3a6b6509c4e064f2885a96ed885ce7579/requests-2.12.4.tar.gz";
+    sha256 = "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d";
   };
 
 in stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
     click
     requests
   ];
-  buildInputs = [ python zip makeWrapper ];
+  buildInputs = [ python zip makeWrapper nix.out nix-prefetch-scripts ];
   sourceRoot = ".";
 
   postUnpack = ''
@@ -45,6 +45,11 @@ in stdenv.mkDerivation rec {
     fi
   '';
 
+  patchPhase = ''
+    sed -i -e "s|default='nix-shell',|default='${nix.out}/bin/nix-shell',|" $out/pkgs/pypi2nix/cli.py
+    sed -i -e "s|nix-prefetch-git|${nix-prefetch-scripts}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py
+  '';
+
   commonPhase = ''
     mkdir -p $out/bin
 

From 5bb75ae0126737d1794c0f13b0a1e1c392541a73 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 23 Dec 2016 22:44:18 +0100
Subject: [PATCH 0128/1310] parallel: 20161122 -> 20161222

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 4bc346d41f8..99a933b3243 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20161122";
+  name = "parallel-20161222";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0z5c4r35d926ac04ilaivx67cmflr1rsvmjb2ci7hmab948m0ng2";
+    sha256 = "1chgr3csyc7hbq2wq4jnwnbsr3ix8rzsk2lf4vdnvkjpd6dvw517";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 25c984f940c1080f1da6873ce9dd2d2dede2fda7 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 23 Dec 2016 22:26:44 +0100
Subject: [PATCH 0129/1310] htslib: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index 2609861e319..29fb338c838 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "htslib";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchurl {
     url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "49d53a2395b8cef7d1d11270a09de888df8ba06f70fe68282e8235ee04124ae6";
+    sha256 = "0iq3blw23s55vkr1z88p9y2dqrb2dybzhl6hz2nlk53ncihrxcdr";
   };
 
   buildInputs = [ zlib ];

From 29cb10c0217c0e72cabbe2c43b93ea57ef9a1558 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 23 Dec 2016 22:15:59 +0100
Subject: [PATCH 0130/1310] igv: 2.3.77 -> 2.3.89

---
 pkgs/applications/science/biology/igv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index 3d0f7154e0e..3acf7d96527 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "igv-${version}";
-  version = "2.3.77";
+  version = "2.3.89";
 
   src = fetchurl {
     url = "http://data.broadinstitute.org/igv/projects/downloads/IGV_${version}.zip";
-    sha256 = "9d8c622649f9f02026e92fa44006bb57e897baad4359c8708ca9cdbb71f94bb5";
+    sha256 = "06bmj9jsnk5010ipv0w4qlcvgw67dy8hsvgcx9l74v3s0zp5di3y";
   };
 
   buildInputs = [ unzip jre ];

From c4f46949a6b0c14182ff91c5705aab91d1b2c562 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 23 Dec 2016 21:45:53 +0100
Subject: [PATCH 0131/1310] sudo: 1.8.18p1 -> 1.8.19p1

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

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index b430fd8aad0..f2fede456d1 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.18p1";
+  name = "sudo-1.8.19p1";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "0d4l6y03khmzdd8vhfnq8lrb8gcxplzf7gav0a9sd08jf8f4g875";
+    sha256 = "14pwdwl03kdbbyjkvxrfx409x3c1fjqz8aqz2wgwddinhz7v3bxq";
   };
 
   configureFlags = [

From 0e2f1af5e748df1eacf8c92785a68dde8d03c779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 24 Dec 2016 10:48:09 +0100
Subject: [PATCH 0132/1310] switch packages back to boost-1.60

They don't build with 1.62.
---
 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 d5f1791f355..d7db015d1f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2559,7 +2559,9 @@ in
 
   leafpad = callPackage ../applications/editors/leafpad { };
 
-  leatherman = callPackage ../development/libraries/leatherman {};
+  leatherman = callPackage ../development/libraries/leatherman {
+    boost = boost160;
+  };
 
   leela = callPackage ../tools/graphics/leela { };
 
@@ -10299,6 +10301,7 @@ in
 
   mongodb = callPackage ../servers/nosql/mongodb {
     sasl = cyrus_sasl;
+    boost = boost160;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
@@ -15038,7 +15041,9 @@ in
 
   tuxguitar = callPackage ../applications/editors/music/tuxguitar { };
 
-  twister = callPackage ../applications/networking/p2p/twister { };
+  twister = callPackage ../applications/networking/p2p/twister {
+    boost = boost160;
+  };
 
   twmn = qt5.callPackage ../applications/misc/twmn { };
 
@@ -15713,7 +15718,9 @@ in
 
   dhewm3 = callPackage ../games/dhewm3 {};
 
-  digikam5 = kde5.callPackage ../applications/graphics/digikam/5.nix {};
+  digikam5 = kde5.callPackage ../applications/graphics/digikam/5.nix {
+    boost = boost160;
+  };
 
   drumkv1 = callPackage ../applications/audio/drumkv1 { };
 
@@ -15772,7 +15779,9 @@ in
 
   freedink = callPackage ../games/freedink { };
 
-  freeorion = callPackage ../games/freeorion { };
+  freeorion = callPackage ../games/freeorion {
+    boost = boost160;
+  };
 
   frotz = callPackage ../games/frotz { };
 

From 324a115747ade5e7a3fa932d453ba49cbc1c48df Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@traumapony.org>
Date: Wed, 21 Dec 2016 13:58:45 +1000
Subject: [PATCH 0133/1310] libssh2: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 89e402d2416..0e53d27c889 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurlBoot, openssl, zlib, windows}:
 
 stdenv.mkDerivation rec {
-  name = "libssh2-1.7.0";
+  name = "libssh2-1.8.0";
 
   src = fetchurlBoot {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "116mh112w48vv9k3f15ggp5kxw5sj4b88dzb5j69llsh7ba1ymp4";
+    sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From c4236f65b9319fe176103c3ba65ed5c9c3228103 Mon Sep 17 00:00:00 2001
From: Alex Ivanov <gnidorah@users.noreply.github.com>
Date: Fri, 23 Dec 2016 23:41:41 +0300
Subject: [PATCH 0134/1310] qmmp: 1.1.2 -> 1.1.5

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

diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 7bb8a591612..b28f66aaad7 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
 # handle that.
 
 stdenv.mkDerivation rec {
-  name = "qmmp-1.1.2";
+  name = "qmmp-1.1.5";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "023gvgchk6ybkz3miy0z08j9n5awz5cjvav7fqjdmpix4sivhn5q";
+    sha256 = "1gfx6nm9v6qrx58gxib6grfhb45mnib1n4wdsnjq16br6bs8h4lv";
   };
 
   buildInputs =

From d917dbc51b7f54d784eb04789e90cbaabc9b4162 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Dec 2016 11:38:38 +0100
Subject: [PATCH 0135/1310] pythonPackages.sphinx: use NOSE_EXCLUDE instead of
 patch

---
 pkgs/top-level/python-packages.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9a6b3077213..411b1bea3e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24444,12 +24444,8 @@ in {
     LC_ALL = "en_US.UTF-8";
     buildInputs = with self; [ nose simplejson mock pkgs.glibcLocales html5lib ] ++ optional (pythonOlder "3.4") self.enum34;
     # Disable two tests that require network access.
-    postPatch = ''
-      substituteInPlace tests/test_build_linkcheck.py --replace test_defaults dont_test_defaults
-      substituteInPlace tests/test_build_linkcheck.py --replace test_anchors_ignored dont_test_anchors_ignored
-    '';
     checkPhase = ''
-      make test
+      NOSE_EXCLUDE=test_defaults,test_anchors_ignored make test
     '';
     propagatedBuildInputs = with self; [
       docutils

From 8ba53ffa1622695fe02626704b3991600167a267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 24 Dec 2016 11:48:07 +0100
Subject: [PATCH 0136/1310] switch more packages back to boost-1.60

They don't build with 1.62.
---
 pkgs/top-level/all-packages.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77164a08bbc..d2e46a84a05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1804,16 +1804,16 @@ in
 
   gawp = callPackage ../tools/misc/gawp { };
 
-  gazeboSimulator = recurseIntoAttrs {
+  gazeboSimulator = recurseIntoAttrs rec {
     sdformat = gazeboSimulator.sdformat4;
 
     sdformat3 = callPackage ../development/libraries/sdformat/3.nix { };
 
     sdformat4 = callPackage ../development/libraries/sdformat { };
 
-    gazebo6 = callPackage ../applications/science/robotics/gazebo/6.nix { };
+    gazebo6 = callPackage ../applications/science/robotics/gazebo/6.nix { boost = boost160; };
 
-    gazebo6-headless = callPackage ../applications/science/robotics/gazebo/6.nix { withHeadless = true;  };
+    gazebo6-headless = gazebo6.override { withHeadless = true;  };
 
     gazebo7 = callPackage ../applications/science/robotics/gazebo { };
 
@@ -4959,7 +4959,9 @@ in
 
   hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { };
 
-  hhvm = callPackage ../development/compilers/hhvm { };
+  hhvm = callPackage ../development/compilers/hhvm {
+    boost = boost160;
+  };
 
   hop = callPackage ../development/compilers/hop { };
 
@@ -16938,6 +16940,7 @@ in
 
   kicad = callPackage ../applications/science/electronics/kicad {
     wxGTK = wxGTK30;
+    boost = boost160;
   };
 
   ngspice = callPackage ../applications/science/electronics/ngspice { };

From 65830800bdaac91eae965d16df4473fc2a698fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 24 Dec 2016 11:52:04 +0100
Subject: [PATCH 0137/1310] Revert "libssh2: 1.7.0 -> 1.8.0"

This reverts commit 324a115747ade5e7a3fa932d453ba49cbc1c48df.
Moving to staging.  I'm sorry, I pushed this by accident.
---
 pkgs/development/libraries/libssh2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 0e53d27c889..89e402d2416 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurlBoot, openssl, zlib, windows}:
 
 stdenv.mkDerivation rec {
-  name = "libssh2-1.8.0";
+  name = "libssh2-1.7.0";
 
   src = fetchurlBoot {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr";
+    sha256 = "116mh112w48vv9k3f15ggp5kxw5sj4b88dzb5j69llsh7ba1ymp4";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From d4c7f583017c66434aba907769809bec75a562e3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Dec 2016 12:06:28 +0100
Subject: [PATCH 0138/1310] pythonPackages.numpy: 1.11.2 -> 1.11.3

Furthermore, we fix f2py and use NOSE_EXCLUDE to disable tests.
---
 pkgs/development/python-modules/numpy.nix | 13 ++++++++-----
 pkgs/top-level/python-packages.nix        |  6 +++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix
index 14504d92543..16c919eb4b2 100644
--- a/pkgs/development/python-modules/numpy.nix
+++ b/pkgs/development/python-modules/numpy.nix
@@ -39,15 +39,18 @@ in buildPythonPackage (args // rec {
     runHook postCheck
   '';
 
+  postInstall = ''
+    ln -s $out/bin/f2py* $out/bin/f2py
+  '';
+
   passthru = {
     blas = blas;
   };
 
-  # The large file support test is disabled because it takes forever
-  # and can cause the machine to run out of disk space when run.
-  prePatch = ''
-    sed -i 's/test_large_file_support/donttest/' numpy/lib/tests/test_format.py
-  '';
+  # Disable two tests
+  # - test_f2py: f2py isn't yet on path.
+  # - test_large_file_support: takes a long time and can cause the machine to run out of disk space
+  NOSE_EXCLUDE="test_f2py,test_large_file_support";
 
   meta = {
     description = "Scientific tools for Python";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 411b1bea3e4..0a818909901 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16073,10 +16073,10 @@ in {
   };
 
   numpy_1_11 = self.buildNumpyPackage rec {
-    version = "1.11.2";
+    version = "1.11.3";
     src = pkgs.fetchurl {
-      url = "mirror://pypi/n/numpy/numpy-${version}.tar.gz";
-      sha256 = "04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69";
+      url = "mirror://pypi/n/numpy/numpy-${version}.zip";
+      sha256 = "2e0fc5248246a64628656fe14fcab0a959741a2820e003bd15538226501b82f7";
     };
   };
 

From 7fda8db89153207ba22829f2c47108b28228f48c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 24 Dec 2016 13:36:04 +0100
Subject: [PATCH 0139/1310] borgbackup: 1.0.8 -> 1.0.9 (security fixes)

And bug fixes. Changelog:

https://github.com/borgbackup/borg/blob/1.0.9/docs/changes.rst#version-109-2016-12-20
---
 pkgs/tools/backup/borg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 09821b01700..09c2dddd515 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,18 +2,18 @@
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
-  version = "1.0.8";
+  version = "1.0.9";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/borgbackup/borg/releases/download/"
       + "${version}/${name}.tar.gz";
-    sha256 = "1fdfi0yzzdrrlml6780n4fh61sqm7pw6fcd1y67kfkvw8hy5c0k9";
+    sha256 = "1ciwp9yilcibk0x82y5nn8ps95jrm8rxvff8mjrlp7a2w100i1im";
   };
 
   nativeBuildInputs = with python3Packages; [
     # For building documentation:
-    sphinx
+    sphinx sphinx_rtd_theme
   ];
   propagatedBuildInputs = [
     acl lz4 openssl

From c98f3ffea867f31d1781ba7a4e3fd93a2780db0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 24 Dec 2016 13:47:05 +0100
Subject: [PATCH 0140/1310] wireguard: 0.0.20161218 -> 0.0.20161223

---
 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 b164530938e..06b012fa434 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 "4.1";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20161218";
+  version = "0.0.20161223";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "d805035d3e99768e69d8cdeb8fb5250a59b994ce127fceb71a078582c30f5597";
+    sha256 = "0wmrsap34nd1x4gvz80isgsjjxbplvkrxnw56qlaqxkycvv8zndv";
   };
 
   meta = with stdenv.lib; {

From 591eda8310905e78b16b4224eb677056c68889e3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Dec 2016 16:00:31 +0100
Subject: [PATCH 0141/1310] python27: 2.7.12 -> 2.7.13

---
 .../python/cpython/2.7/default.nix            | 11 +----
 .../python/cpython/2.7/no-ldconfig.patch      | 44 +++++++++++++------
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 4a25382997c..5842f6fb309 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -28,7 +28,7 @@ with stdenv.lib;
 
 let
   majorVersion = "2.7";
-  minorVersion = "12";
+  minorVersion = "13";
   minorVersionSuffix = "";
   pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@@ -37,7 +37,7 @@ let
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp";
+    sha256 = "0cgpk3zk0fgpji59pb4zy9nzljr70qzgv1vpz5hq5xw2d2c47m9m";
   };
 
   hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
@@ -57,13 +57,6 @@ let
 
       ./properly-detect-curses.patch
 
-      # FIXME: get rid of this after the next release, when the commit referenced here makes
-      # it in. We need it until then because it breaks compilation of programs that use
-      # locale with clang 3.8 and higher.
-      (fetchpatch {
-        url    = "https://hg.python.org/cpython/raw-rev/e0ec3471cb09";
-        sha256 = "1jdgb70jw942r4kmr01qll7mk1di8jx0qiabmp20jhnmha246ivq";
-      })
     ] ++ optionals stdenv.isLinux [
 
       # Disable the use of ldconfig in ctypes.util.find_library (since
diff --git a/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch
index 44c38fb2953..2a6b2a20dd1 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch
+++ b/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch
@@ -1,8 +1,18 @@
+From 6b0f329a9f37110020ca02b35c8125391ef282b7 Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk <fridh@fridh.nl>
+Date: Sat, 24 Dec 2016 15:56:10 +0100
+Subject: [PATCH] no ldconfig
+
+---
+ Lib/ctypes/util.py | 35 +----------------------------------
+ Lib/uuid.py        | 47 -----------------------------------------------
+ 2 files changed, 1 insertion(+), 81 deletions(-)
+
 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index b2c514d..a6eca81 100644
+index ab10ec5..f253e34 100644
 --- a/Lib/ctypes/util.py
 +++ b/Lib/ctypes/util.py
-@@ -207,31 +207,7 @@ elif os.name == "posix":
+@@ -235,40 +235,7 @@ elif os.name == "posix":
      else:
  
          def _findSoname_ldconfig(name):
@@ -22,11 +32,20 @@ index b2c514d..a6eca81 100644
 -
 -            # XXX assuming GLIBC's ldconfig (with option -p)
 -            expr = r'\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type)
--            f = os.popen('LC_ALL=C LANG=C /sbin/ldconfig -p 2>/dev/null')
+-
+-            env = dict(os.environ)
+-            env['LC_ALL'] = 'C'
+-            env['LANG'] = 'C'
+-            null = open(os.devnull, 'wb')
 -            try:
--                data = f.read()
--            finally:
--                f.close()
+-                with null:
+-                    p = subprocess.Popen(['/sbin/ldconfig', '-p'],
+-                                          stderr=null,
+-                                          stdout=subprocess.PIPE,
+-                                          env=env)
+-            except OSError:  # E.g. command not found
+-                return None
+-            [data, _] = p.communicate()
 -            res = re.search(expr, data)
 -            if not res:
 -                return None
@@ -36,16 +55,12 @@ index b2c514d..a6eca81 100644
          def find_library(name):
              return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
 diff --git a/Lib/uuid.py b/Lib/uuid.py
-index 7432032..9829d18 100644
+index 7432032..05eeee5 100644
 --- a/Lib/uuid.py
 +++ b/Lib/uuid.py
-@@ -437,57 +437,7 @@ def _netbios_getnode():
-         return ((bytes[0]<<40L) + (bytes[1]<<32L) + (bytes[2]<<24L) +
-                 (bytes[3]<<16L) + (bytes[4]<<8L) + bytes[5])
+@@ -441,53 +441,6 @@ def _netbios_getnode():
  
--# Thanks to Thomas Heller for ctypes and for his help with its use here.
--
--# If ctypes is available, use it to find system routines for UUID generation.
+ # If ctypes is available, use it to find system routines for UUID generation.
  _uuid_generate_time = _UuidCreate = None
 -try:
 -    import ctypes, ctypes.util
@@ -97,3 +112,6 @@ index 7432032..9829d18 100644
  
  def _unixdll_getnode():
      """Get the hardware address on Unix using ctypes."""
+-- 
+2.11.0
+

From b09000e78581f84dff696a7b5296b50ec2c8888c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Dec 2016 16:00:52 +0100
Subject: [PATCH 0142/1310] python36: 3.6.0rc1 -> 3.6.0

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

diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 4654a6e1cb6..8892b0f5c71 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -25,7 +25,7 @@ with stdenv.lib;
 let
   majorVersion = "3.6";
   minorVersion = "0";
-  minorVersionSuffix = "rc1";
+  minorVersionSuffix = "";
   pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
@@ -45,7 +45,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "01sqzz5iq7law93zgdxkb8sv98a493a2wzslynz64cl3hhdqr1pw";
+    sha256 = "08inlbb2vb8lahw6wfq654lqk6l1x7ncpggp6a92vqw5yq2gkidh";
   };
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

From b87a59bc69c33eca12a2e27fc28cde9538558abf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Dec 2016 12:34:48 +0100
Subject: [PATCH 0143/1310] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/4ecc7e6432641e3e44a836d24118e16799e77025.
---
 .../haskell-modules/hackage-packages.nix      | 793 ++++++++++++++----
 1 file changed, 625 insertions(+), 168 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1bdf1256369..7784f79b830 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -726,35 +726,33 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ abbradar ];
      }) {inherit (pkgs) emacs;};
 
-  "Agda_2_5_1_2" = callPackage
+  "Agda_2_5_2" = callPackage
     ({ mkDerivation, alex, array, base, binary, boxes, bytestring
-     , containers, cpphs, data-hash, deepseq, directory, EdisonAPI
-     , EdisonCore, edit-distance, emacs, equivalence, filemanip
-     , filepath, geniplate-mirror, happy, hashable, hashtables
-     , haskeline, haskell-src-exts, monadplus, mtl, parallel, pretty
-     , process, QuickCheck, strict, template-haskell, text, time
-     , transformers, transformers-compat, unordered-containers, xhtml
-     , zlib
+     , containers, cpphs, data-hash, deepseq, directory, EdisonCore
+     , edit-distance, emacs, equivalence, filepath, geniplate-mirror
+     , gitrev, happy, hashable, hashtables, haskeline, ieee754
+     , monadplus, mtl, murmur-hash, parallel, pretty, process
+     , regex-tdfa, strict, template-haskell, text, time, transformers
+     , transformers-compat, unordered-containers, xhtml, zlib
      }:
      mkDerivation {
        pname = "Agda";
-       version = "2.5.1.2";
-       sha256 = "fb272bd6f7d532320c669b96faa85088b37bae02d906e9a9f764bc8e8639fb5e";
+       version = "2.5.2";
+       sha256 = "d812cec3bf7f03c4b27248572475c7e060154102771a8434cc11ba89f5691439";
+       revision = "1";
+       editedCabalFile = "44f0f96c5d26202f964c575e5f94fe52686f4b889078ddfdafef0c6fd2571b47";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base binary boxes bytestring containers data-hash deepseq
-         directory EdisonAPI EdisonCore edit-distance equivalence filepath
-         geniplate-mirror hashable hashtables haskeline haskell-src-exts
-         monadplus mtl parallel pretty process QuickCheck strict
+         directory EdisonCore edit-distance equivalence filepath
+         geniplate-mirror gitrev hashable hashtables haskeline ieee754
+         monadplus mtl murmur-hash parallel pretty process regex-tdfa strict
          template-haskell text time transformers transformers-compat
          unordered-containers xhtml zlib
        ];
        libraryToolDepends = [ alex cpphs happy ];
-       executableHaskellDepends = [
-         base binary containers directory filemanip filepath
-         haskell-src-exts mtl process
-       ];
+       executableHaskellDepends = [ base directory filepath process ];
        executableToolDepends = [ emacs ];
        postInstall = ''
          files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
@@ -1388,6 +1386,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "BioHMM" = callPackage
+    ({ mkDerivation, base, colour, diagrams-cairo, diagrams-lib
+     , directory, either-unwrap, filepath, parsec, ParsecTools
+     , StockholmAlignment, SVGFonts, text, vector
+     }:
+     mkDerivation {
+       pname = "BioHMM";
+       version = "1.0.1";
+       sha256 = "b20fbbd9e38b9f764a9152aa123bbf7296b4be361bddfc7e1bbe833d439f9c20";
+       libraryHaskellDepends = [
+         base colour diagrams-cairo diagrams-lib directory either-unwrap
+         filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
+       ];
+       description = "Libary containing parsing and visualisation functions and datastructures for Hidden Markov Models in HMMER3 format";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "Biobase" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , directory, either-unwrap, file-embed, filemanip, filepath
@@ -16061,6 +16076,23 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "StockholmAlignment" = callPackage
+    ({ mkDerivation, base, colour, diagrams-cairo, diagrams-lib
+     , directory, either-unwrap, filepath, parsec, ParsecTools, SVGFonts
+     , text, vector
+     }:
+     mkDerivation {
+       pname = "StockholmAlignment";
+       version = "1.0.0";
+       sha256 = "0b1234009521e37f69d734391138bec11c7c3d2df2496c939268fbff2cb1c86b";
+       libraryHaskellDepends = [
+         base colour diagrams-cairo diagrams-lib directory either-unwrap
+         filepath parsec ParsecTools SVGFonts text vector
+       ];
+       description = "Libary for Stockholm aligmnent format";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "Stomp" = callPackage
     ({ mkDerivation, base, binary, bytestring, network, time
      , utf8-string
@@ -24252,6 +24284,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-s3-streaming" = callPackage
+    ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base
+     , bytestring, conduit, conduit-extra, dlist, exceptions, lens
+     , lifted-async, mmap, mmorph, mtl, resourcet, text
+     }:
+     mkDerivation {
+       pname = "amazonka-s3-streaming";
+       version = "0.1.0.4";
+       sha256 = "ecd0dfe5b024a326e96224ba6f406b44f1279eaef4d44904167a8f5a1f3d881d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         amazonka amazonka-core amazonka-s3 base bytestring conduit dlist
+         exceptions lens lifted-async mmap mmorph mtl resourcet
+       ];
+       executableHaskellDepends = [
+         amazonka amazonka-core amazonka-s3 base bytestring conduit
+         conduit-extra text
+       ];
+       homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme";
+       description = "Provides conduits to upload data to S3 using the Multipart API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "amazonka-sdb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -25250,6 +25306,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "anonymous-sums_0_6_0_0" = callPackage
+    ({ mkDerivation, base, lens, template-haskell }:
+     mkDerivation {
+       pname = "anonymous-sums";
+       version = "0.6.0.0";
+       sha256 = "c7c5c13cb19ce97fdb621794cd1de7e34ab7aba8bdc5bcc9309107b1ff3ec2ad";
+       libraryHaskellDepends = [ base lens template-haskell ];
+       homepage = "http://www.github.com/massysett/anonymous-sums";
+       description = "Anonymous sum types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "anonymous-sums-tests" = callPackage
     ({ mkDerivation, anonymous-sums, base, QuickCheck }:
      mkDerivation {
@@ -25983,8 +26052,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, lens, wreq }:
      mkDerivation {
        pname = "apioiaf-client";
-       version = "0.1.0.0";
-       sha256 = "8493248ae0d1303afba5f600e7c38fb29b6811d2348f994af056413a3ebbd0ff";
+       version = "0.2.1.0";
+       sha256 = "15561082ee74c3a64786347f9d8206896b70b1d3475e9dfa0318e2ed84703c6a";
        libraryHaskellDepends = [ aeson base bytestring lens wreq ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/kberger/anapioficeandfire-haskell#readme";
@@ -28601,8 +28670,8 @@ self: {
        pname = "avers";
        version = "0.0.17.0";
        sha256 = "3e6b4a39ccb99373a1a574625b86d4948f4ba4a747652e3c5ddd8d8b09fe212d";
-       revision = "1";
-       editedCabalFile = "76f5fea6b94a6dd6041577fd29de245130f3003c73296a94baea62f066b9b474";
+       revision = "3";
+       editedCabalFile = "dd1745f57f0636a5932c361e931feec895221ae612acc37eaf2d819f349c75ae";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -28669,8 +28738,8 @@ self: {
        pname = "avers-server";
        version = "0.0.17.0";
        sha256 = "6da0c28f2b75989805cb4c2c7bf10b1b6ac4211f310d2bb902a4a7725ce05c3c";
-       revision = "1";
-       editedCabalFile = "8fb371992bc5535a3d923ec6e16e975ac3d5efaadbb1ae8d4e08400b318f92dc";
+       revision = "3";
+       editedCabalFile = "025cc10ba6aa604876978781fcfbffbce27867d9155257411a7a40d4c4687988";
        libraryHaskellDepends = [
          aeson avers avers-api base base64-bytestring bytestring
          bytestring-conversion containers cookie cryptonite either
@@ -28824,6 +28893,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aws_0_15" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , base64-bytestring, blaze-builder, byteable, bytestring
+     , case-insensitive, cereal, conduit, conduit-extra, containers
+     , cryptohash, data-default, directory, errors, filepath
+     , http-client, http-client-tls, http-conduit, http-types
+     , lifted-base, monad-control, mtl, network, old-locale, QuickCheck
+     , quickcheck-instances, resourcet, safe, scientific, tagged, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, transformers
+     , transformers-base, unordered-containers, utf8-string, vector
+     , xml-conduit
+     }:
+     mkDerivation {
+       pname = "aws";
+       version = "0.15";
+       sha256 = "53c73595bddd5614d980486a380d4ce83c100fd25b5fa35d477609f1bd03b11b";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring base64-bytestring
+         blaze-builder byteable bytestring case-insensitive cereal conduit
+         conduit-extra containers cryptohash data-default directory filepath
+         http-conduit http-types lifted-base monad-control mtl network
+         old-locale resourcet safe scientific tagged text time transformers
+         unordered-containers utf8-string vector xml-conduit
+       ];
+       testHaskellDepends = [
+         aeson base bytestring errors http-client http-client-tls http-types
+         lifted-base monad-control mtl QuickCheck quickcheck-instances
+         resourcet tagged tasty tasty-hunit tasty-quickcheck text time
+         transformers transformers-base
+       ];
+       homepage = "http://github.com/aristidb/aws";
+       description = "Amazon Web Services (AWS) for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aws-cloudfront-signer" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring
      , bytestring, crypto-pubkey-types, RSA, time
@@ -34286,18 +34391,23 @@ self: {
 
   "bolt" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, cereal, containers
-     , hashable, network, network-uri, scientific, text, transformers
-     , unordered-containers, vector
+     , hashable, network, network-uri, scientific, tasty
+     , tasty-quickcheck, text, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "bolt";
-       version = "0.2.0.0";
-       sha256 = "2a066c5e24a707c7fb418b34c01b7dc0f47b084eb621baefa3a79afe03640e12";
+       version = "0.2.2.0";
+       sha256 = "07d04b418f1106f4fb4e11f8466d18121f7d63d162e86389a69a58f23270339b";
        libraryHaskellDepends = [
          base bifunctors bytestring cereal containers hashable network
          network-uri scientific text transformers unordered-containers
          vector
        ];
+       testHaskellDepends = [
+         base bytestring cereal tasty tasty-quickcheck text
+         unordered-containers vector
+       ];
        homepage = "https://github.com/bflyblue/bolt#readme";
        description = "Bolt driver for Neo4j";
        license = stdenv.lib.licenses.bsd3;
@@ -34618,8 +34728,8 @@ self: {
     ({ mkDerivation, base, gtk, transformers, X11 }:
      mkDerivation {
        pname = "boring-window-switcher";
-       version = "0.1.0.1";
-       sha256 = "4d966b56d3a6badb666c8947df23557db9544e469514d0a5b68934c644f5645b";
+       version = "0.1.0.2";
+       sha256 = "e7e568de0b410fd878c6cd6ce9eae66f51e3e98c83090ad5dec23b5738c9721f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base gtk transformers X11 ];
@@ -35172,9 +35282,9 @@ self: {
 
   "buchhaltung" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, array, async, base, boxes
-     , bytestring, Cabal, cassava, containers, data-default, Decimal
-     , deepseq, directory, edit-distance, file-embed, filepath
-     , formatting, hashable, haskeline, hint, hledger, hledger-lib, lens
+     , 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
@@ -35182,11 +35292,10 @@ self: {
      }:
      mkDerivation {
        pname = "buchhaltung";
-       version = "0.0.1";
-       sha256 = "fd2dd47210a9d7200c0d4259646963b6bc848ff656255b66b14648b949dec70f";
+       version = "0.0.3";
+       sha256 = "6ba38b02094431f1f24e698eed4b4dc3c0169f2154d2b66a584c16162c4cf276";
        isLibrary = false;
        isExecutable = true;
-       setupHaskellDepends = [ base Cabal ];
        executableHaskellDepends = [
          aeson ansi-wl-pprint array async base boxes bytestring cassava
          containers data-default Decimal deepseq directory edit-distance
@@ -39940,6 +40049,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "choice" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "choice";
+       version = "0.1.1.0";
+       sha256 = "96245c66c3e2dd48aec6b9bba3198b336d4d111b10781e53c544b43b98c1a989";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/mboes/choice#readme";
+       description = "A solution to boolean blindness";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "choose" = callPackage
     ({ mkDerivation, base, MonadRandom }:
      mkDerivation {
@@ -41671,8 +41792,10 @@ self: {
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.1.1.1";
-       sha256 = "bb2be5226f6659b709b87ebe593c7c1a2b9447d2b681dc9c97130254ba4e4a61";
+       version = "0.1.1.2";
+       sha256 = "5daac994e7e122d6e009cfbb8e87c9a6134c7157256d2c64dfb87d8b83503367";
+       revision = "1";
+       editedCabalFile = "a00ced1d7dcc50bae6eae37b415f304271ee08bec06b3d15f7ec60fe927bdad8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -43900,8 +44023,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-machines";
-       version = "0.2.3.1";
-       sha256 = "6d67692d241a0e160ace89ecd8bbb2e28cc90651c7d9996f6686de7856731eee";
+       version = "0.2.3.3";
+       sha256 = "e5204231e35181e56b9313f6dbe83d531b3f6c3f6dfbe3a1c465e5b6b2a24924";
        libraryHaskellDepends = [
          async base containers lifted-async machines monad-control
          semigroups time transformers transformers-base
@@ -47864,8 +47987,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptonite-openssl";
-       version = "0.3";
-       sha256 = "43c8f8b4259f103be4408734f604c55a0053e60d302890174ba4773828bdee26";
+       version = "0.4";
+       sha256 = "a8307454de4f85456660686815169d925cb90345f7ac016d0c5562c2755667ea";
        libraryHaskellDepends = [ base bytestring cryptonite memory ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [
@@ -51869,18 +51992,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "declarative_0_4_0" = callPackage
-    ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types
-     , mighty-metropolis, mwc-probability, pipes, primitive
+  "declarative_0_5_1" = callPackage
+    ({ mkDerivation, base, hasty-hamiltonian, kan-extensions, lens
+     , mcmc-types, mighty-metropolis, mwc-probability, pipes, primitive
      , speedy-slice, transformers
      }:
      mkDerivation {
        pname = "declarative";
-       version = "0.4.0";
-       sha256 = "e771c452cbc7f91b67d078a87349de36182fc5e25a9185f18cff7346941c713c";
+       version = "0.5.1";
+       sha256 = "4ed591067e741682da3f319284dbf1d77c70bdf9d5c78e32575d5018d3f4c624";
        libraryHaskellDepends = [
-         base hasty-hamiltonian lens mcmc-types mighty-metropolis
-         mwc-probability pipes primitive speedy-slice transformers
+         base hasty-hamiltonian kan-extensions lens mcmc-types
+         mighty-metropolis mwc-probability pipes primitive speedy-slice
+         transformers
        ];
        testHaskellDepends = [ base mwc-probability ];
        homepage = "http://github.com/jtobin/declarative";
@@ -52504,6 +52628,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "dependent-map_0_2_4_0" = callPackage
+    ({ mkDerivation, base, containers, dependent-sum }:
+     mkDerivation {
+       pname = "dependent-map";
+       version = "0.2.4.0";
+       sha256 = "5db396bdb5d156434af920c074316c3b84b4d39ba8e1cd349c7bb6679cb28246";
+       libraryHaskellDepends = [ base containers dependent-sum ];
+       homepage = "https://github.com/mokus0/dependent-map";
+       description = "Dependent finite maps (partial dependent products)";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dependent-state" = callPackage
     ({ mkDerivation, base, lens, mtl, prologue }:
      mkDerivation {
@@ -56151,22 +56288,23 @@ self: {
      }) {};
 
   "dom-parser" = callPackage
-    ({ mkDerivation, base, data-default, hspec, lens, mtl, open-union
-     , semigroups, shakespeare, text, transformers, type-fun
+    ({ mkDerivation, base, containers, data-default, hspec, lens, mtl
+     , open-union, semigroups, shakespeare, text, transformers, type-fun
      , xml-conduit, xml-lens
      }:
      mkDerivation {
        pname = "dom-parser";
-       version = "0.1.1";
-       sha256 = "e001c486adb3b2c6c6ab18e70205dc759ea018b6db084f8668bb424b623e4e03";
+       version = "1.0.0";
+       sha256 = "6d48ca6cd564919af8574cc91c97f050f50747f358e159797895fd0517dc9583";
        libraryHaskellDepends = [
-         base lens mtl open-union semigroups shakespeare text transformers
+         base containers lens mtl open-union semigroups text transformers
          type-fun xml-conduit xml-lens
        ];
        testHaskellDepends = [
          base data-default hspec lens semigroups shakespeare text
          xml-conduit
        ];
+       homepage = "https://github.com/typeable/dom-parser";
        description = "Simple monadic DOM parser";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -57872,6 +58010,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "echo" = callPackage
+    ({ mkDerivation, base, process }:
+     mkDerivation {
+       pname = "echo";
+       version = "0.1";
+       sha256 = "a7211a9da1fa10dc7d95e89d2c68dadf063b3826d81e42eb085df91c46353e4d";
+       libraryHaskellDepends = [ base process ];
+       homepage = "https://github.com/RyanGlScott/echo";
+       description = "A cross-platform, cross-console way to handle echoing terminal input";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ecma262" = callPackage
     ({ mkDerivation, base, containers, data-default, lens, parsec, safe
      , transformers
@@ -58301,20 +58451,20 @@ self: {
 
   "egison" = callPackage
     ({ mkDerivation, array, base, containers, directory, filepath, ghc
-     , ghc-paths, Glob, haskeline, HUnit, mtl, parsec, process, random
-     , regex-tdfa, test-framework, test-framework-hunit, text
-     , transformers, unordered-containers, vector
+     , ghc-paths, Glob, haskeline, HUnit, monad-parallel, mtl, parsec
+     , process, random, regex-tdfa, test-framework, test-framework-hunit
+     , text, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "egison";
-       version = "3.6.3";
-       sha256 = "178eebc1798fb6d1c2fceeb8f68c2b7cd87a25ff35db9274c2115e6b5100e6d5";
+       version = "3.6.4";
+       sha256 = "8900413b3f0e42c0907bec37dfd2ed0d2f6c618836ea6054615a786ff4fcf5f3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base containers directory ghc ghc-paths haskeline mtl parsec
-         process random regex-tdfa text transformers unordered-containers
-         vector
+         array base containers directory ghc ghc-paths haskeline
+         monad-parallel mtl parsec process random regex-tdfa text
+         transformers unordered-containers vector
        ];
        executableHaskellDepends = [
          array base containers directory filepath ghc ghc-paths haskeline
@@ -62897,6 +63047,27 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "feed";
+       version = "0.3.12.0";
+       sha256 = "cc2d6a3b91027d75b91a0a4c0f83f2df68bee3ce0d7338ea5ae0bcab6dd47942";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "feed-cli" = callPackage
     ({ mkDerivation, base, directory, feed, old-locale, old-time, time
      , xml
@@ -64354,6 +64525,27 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {};
 
+  "fixie" = callPackage
+    ({ mkDerivation, base, containers, data-default-class, either
+     , haskell-src-exts, haskell-src-meta, hspec, hspec-discover, mtl
+     , template-haskell, text, th-orphans, transformers
+     }:
+     mkDerivation {
+       pname = "fixie";
+       version = "1.0.0";
+       sha256 = "b016c231a391816d4dca407f06e64b87d1c29b55fddcae9e0fc28df942bc4f6d";
+       libraryHaskellDepends = [
+         base containers data-default-class either haskell-src-exts
+         haskell-src-meta mtl template-haskell text th-orphans
+       ];
+       testHaskellDepends = [
+         base hspec hspec-discover mtl template-haskell transformers
+       ];
+       homepage = "http://github.com/jxv/fixie#readme";
+       description = "Opininated testing framework for mtl style (spies, stubs, and mocks)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fixplate" = callPackage
     ({ mkDerivation, base, containers, QuickCheck, tasty
      , tasty-quickcheck
@@ -69483,8 +69675,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-prof";
-       version = "1.0.1";
-       sha256 = "3949eb1542f92ed99b38d4f2eb3efb6161fe3250a778b71e638af52463c23de4";
+       version = "1.2.0";
+       sha256 = "fcc0d06e75b6b753b9edec96cda46a4b67138a7ddd489da55dd351f475c08810";
        libraryHaskellDepends = [
          attoparsec base containers scientific text time
        ];
@@ -71421,6 +71613,7 @@ self: {
        homepage = "https://github.com/ElastiLotem/git-mediate";
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-monitor" = callPackage
@@ -73985,6 +74178,8 @@ self: {
        pname = "gogol-core";
        version = "0.1.1";
        sha256 = "8f6c7dee658281c5d006c5ec4b475665544989c4d9141737e040857e15f3d483";
+       revision = "1";
+       editedCabalFile = "54bcd3f073a1f1d76726446c4efb96c8b573c3020ffbf6296313c9f6f76d1436";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit dlist exceptions hashable http-api-data http-client
@@ -79211,6 +79406,8 @@ self: {
        pname = "hackage-security";
        version = "0.5.2.2";
        sha256 = "507a837851264a774c8f4d400f798c3dac5be11dc428fe72d33ef594ca533c41";
+       revision = "1";
+       editedCabalFile = "abb26d1da6e07e187a4494591154080415152787c2583c09acf522ab929b9642";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring Cabal
          containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -85213,8 +85410,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-optparse-applicative";
-       version = "0.2";
-       sha256 = "c006e033547c82b4986e8bbc09997f73bb5bb75a7e08e10fb29ba06117aaa42b";
+       version = "0.2.1";
+       sha256 = "170d8a1322866f048d5d05c19cd04f881bbaee0dc4a06a3503280c7a8491d5ea";
        libraryHaskellDepends = [
          base-prelude hasql hasql-pool optparse-applicative
        ];
@@ -85486,16 +85683,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hasty-hamiltonian_1_2_0" = callPackage
-    ({ mkDerivation, ad, base, lens, mcmc-types, mwc-probability, pipes
-     , primitive, transformers
+  "hasty-hamiltonian_1_3_0" = callPackage
+    ({ mkDerivation, ad, base, kan-extensions, lens, mcmc-types
+     , mwc-probability, pipes, primitive, transformers
      }:
      mkDerivation {
        pname = "hasty-hamiltonian";
-       version = "1.2.0";
-       sha256 = "602e6bff253cae2151b6c4eb8c81a19dc0a2525bf63bdbd5b12396358548cdda";
+       version = "1.3.0";
+       sha256 = "15f713bc72cda97a5efad2c75d38915f3b765966142710f069db72ff49eefb31";
        libraryHaskellDepends = [
-         base lens mcmc-types mwc-probability pipes primitive transformers
+         base kan-extensions lens mcmc-types mwc-probability pipes primitive
+         transformers
        ];
        testHaskellDepends = [ ad base mwc-probability ];
        homepage = "http://github.com/jtobin/hasty-hamiltonian";
@@ -86478,6 +86676,27 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "hdevtools";
+       version = "0.1.5.0";
+       sha256 = "ed81236f3809a367c5f4401905ae283f8de92cd5b26c0b8370586ab7690d04e7";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hdf" = callPackage
     ({ mkDerivation, base, directory, fgl, fgl-visualize, filepath
      , hosc, hsc3, murmur-hash, process, split, transformers
@@ -87836,8 +88055,8 @@ self: {
     ({ mkDerivation, base, bytestring, extra }:
      mkDerivation {
        pname = "hexml";
-       version = "0.2";
-       sha256 = "4c14883bc7fd5e059e05a24d5daabacec295ee71fcf91e3fdd066e7993085a2a";
+       version = "0.3";
+       sha256 = "ace36d4b3a6ca44dad0b4c2f1ab008252acd281e4ff97c3b08c9af41cafb7386";
        libraryHaskellDepends = [ base bytestring extra ];
        testHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/ndmitchell/hexml#readme";
@@ -101003,8 +101222,8 @@ self: {
      }:
      mkDerivation {
        pname = "ideas";
-       version = "1.5";
-       sha256 = "81969d35319518e7c06d67fea99d106c5a8d86d61b889d64414476327fc95e84";
+       version = "1.6";
+       sha256 = "dea77dafcb95fb2cfab6218bb0b242829c6c90a540da33fd082967cda84a8476";
        libraryHaskellDepends = [
          base cgi containers Diff directory filepath parsec QuickCheck
          random time uniplate wl-pprint
@@ -102470,6 +102689,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "indents_0_4_0_0" = callPackage
+    ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "indents";
+       version = "0.4.0.0";
+       sha256 = "9478d3f8ea4dd412ffc56225c4727f295b81daffba408bf1e757b4b23859d495";
+       libraryHaskellDepends = [ base mtl parsec ];
+       testHaskellDepends = [ base mtl parsec tasty tasty-hunit ];
+       homepage = "http://github.com/jaspervdj/indents";
+       description = "indentation sensitive parser-combinators for parsec";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "index-core" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -105817,8 +106050,8 @@ self: {
      }:
      mkDerivation {
        pname = "jni";
-       version = "0.1";
-       sha256 = "1e9545909b89552fb3c65ae6454a40912bf31f2a66fe0d3dcbadfc2af21c255b";
+       version = "0.2";
+       sha256 = "f98f57417cc015219446f2439c543dc0accd45a4bfdd87004c4c5be1b0b862bf";
        libraryHaskellDepends = [
          base bytestring containers inline-c singletons thread-local-storage
        ];
@@ -106165,8 +106398,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, jsaddle }:
      mkDerivation {
        pname = "jsaddle-wkwebview";
-       version = "0.8.0.0";
-       sha256 = "8770e3f9a452502d62025a142aaabc95ac759625fd56f4600217fc8d9ac69dd1";
+       version = "0.8.1.0";
+       sha256 = "10371cdff510c0229a34def4038e9d8e9e796d0a891b2a424b0e8a05b481d3a0";
        libraryHaskellDepends = [ aeson base bytestring jsaddle ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
@@ -107474,10 +107707,8 @@ self: {
      }:
      mkDerivation {
        pname = "kansas-lava";
-       version = "0.2.4.3";
-       sha256 = "3bf057340e4a1953e2eef099e26215cd99d4c595feab82cc43c6be1cbf2c5344";
-       revision = "1";
-       editedCabalFile = "7b1860125ab2958d3831cb2536a6b939879f09951199649182bb848e70b583eb";
+       version = "0.2.4.4";
+       sha256 = "ed44a01f95c72580c3e198ea43f42a582ec44bbdc8897629fe37f874208f6c5d";
        libraryHaskellDepends = [
          base bytestring cmdargs containers data-default data-reify
          directory dotgen filepath netlist netlist-to-vhdl process random
@@ -108786,8 +109017,8 @@ self: {
      }:
      mkDerivation {
        pname = "krapsh";
-       version = "0.1.6.0";
-       sha256 = "12c4c3a9d4e0d013056ad269a51ae77078a6a582b9b5924d5e58b73251176d6e";
+       version = "0.1.6.2";
+       sha256 = "081bebfed17c6bd548c0a3ef69523bad78eb0aa11e17d5ceb0de7baebc24cc9b";
        libraryHaskellDepends = [
          aeson aeson-pretty base base16-bytestring binary bytestring
          containers cryptohash-sha256 deepseq exceptions formatting hashable
@@ -109685,8 +109916,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdacube-gl";
-       version = "0.5.1.2";
-       sha256 = "2b71bfd829096f8ac59f4e37ebdf6d8bdc4c84bdfaa6cd2c83d5e41fd05ef9fe";
+       version = "0.5.2.0";
+       sha256 = "6552d8dc5aa3d1639155d42890934aeaa19afe6c5feafee041199ad98cfbd165";
        libraryHaskellDepends = [
          base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
          vector vector-algorithms
@@ -111718,8 +111949,8 @@ self: {
        pname = "lens";
        version = "4.15.1";
        sha256 = "5cfaa64cb1b9787193c2247a1ed1c248104ba5fadb91cec6432e648e41b1bea6";
-       revision = "2";
-       editedCabalFile = "012be5e38b4fa0f4cb98ad04d6eb82a48eea6d789213a058b08fdc2e64aa1327";
+       revision = "3";
+       editedCabalFile = "d23792e0e14306446fe13c8de692b46cbf0aedd22ea22248d70c9dc71646716f";
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
@@ -112012,22 +112243,23 @@ self: {
     ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
      , filepath, hspec, natural-sort, optparse-applicative, parsec
      , pipes, regex-tdfa, semigroups, terminal-progress-bar, text
+     , transformers
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.0.3.2";
-       sha256 = "7c4fcfd08e2b4369f14a3502215cdb6f70a8f776350a6113d3d6f8dbc7a1c397";
+       version = "1.0.4.0";
+       sha256 = "e990aad8168d8e106ef35a0e8dc1fc707d467dfd87db8127f8ec568a47100f8b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          ansi-wl-pprint base csv directory filemanip filepath natural-sort
          optparse-applicative parsec pipes regex-tdfa semigroups
-         terminal-progress-bar text
+         terminal-progress-bar text transformers
        ];
        testHaskellDepends = [
          ansi-wl-pprint base csv directory filemanip filepath hspec
          natural-sort optparse-applicative parsec pipes regex-tdfa
-         semigroups terminal-progress-bar text
+         semigroups terminal-progress-bar text transformers
        ];
        homepage = "http://www.ariis.it/static/articles/lentil/page.html";
        description = "frugal issue tracker";
@@ -115459,6 +115691,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "logger-thread" = callPackage
+    ({ mkDerivation, base, fast-logger, protolude, safe-exceptions, stm
+     , text, time
+     }:
+     mkDerivation {
+       pname = "logger-thread";
+       version = "0.1.0.2";
+       sha256 = "ac0a54001a69cff6f975209c4d9d399fb58ef59bb0ad6ac742c5ffedeac04a2a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base fast-logger protolude safe-exceptions stm text time
+       ];
+       executableHaskellDepends = [ base protolude stm ];
+       homepage = "https://github.com/joe9/logger-thread#readme";
+       description = "Run FastLogger in a thread and direct all queued messages to it";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "logging" = callPackage
     ({ mkDerivation, base, binary, bytestring, fast-logger, hspec
      , lifted-base, monad-control, old-locale, regex-compat, text, time
@@ -116696,8 +116947,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzma-conduit";
-       version = "1.1.3.0";
-       sha256 = "abf9e7a052a2bbd85923237a6fa7a73e7e077b20908ad3d68e6c24285aef390f";
+       version = "1.1.3.1";
+       sha256 = "2c181aece2c81c9408271e805a00f2833c5ca79f2c7cb55e3a8b6cb0388d612d";
        libraryHaskellDepends = [
          base bindings-DSL bytestring conduit resourcet transformers
        ];
@@ -116839,6 +117090,7 @@ self: {
        homepage = "http://github.com/as-capabl/machinecell";
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines" = callPackage
@@ -120210,16 +120462,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "mighty-metropolis_1_1_0" = callPackage
-    ({ mkDerivation, base, containers, mcmc-types, mwc-probability
-     , pipes, primitive, transformers
+  "mighty-metropolis_1_2_0" = callPackage
+    ({ mkDerivation, base, containers, kan-extensions, mcmc-types
+     , mwc-probability, pipes, primitive, transformers
      }:
      mkDerivation {
        pname = "mighty-metropolis";
-       version = "1.1.0";
-       sha256 = "2a8ac91fe51fa440347ce41edafca463fbf0d822fffca89796250e5e79143f6b";
+       version = "1.2.0";
+       sha256 = "8d3c0b4b65024846291c4f547c45e5c04f587aefd0e8d041d54679bb519871c0";
        libraryHaskellDepends = [
-         base mcmc-types mwc-probability pipes primitive transformers
+         base kan-extensions mcmc-types mwc-probability pipes primitive
+         transformers
        ];
        testHaskellDepends = [ base containers mwc-probability ];
        homepage = "http://github.com/jtobin/mighty-metropolis";
@@ -127530,6 +127783,7 @@ self: {
        homepage = "https://github.com/centromere/nfc#readme";
        description = "libnfc bindings";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {nfc = null;};
 
   "ngrams-loader" = callPackage
@@ -131035,6 +131289,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "ordered-containers" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "ordered-containers";
+       version = "0.0";
+       sha256 = "ea40528ec95f2424bd7231da44b9d96a80b46b4116b2cdfbb57269c88f2419cb";
+       revision = "1";
+       editedCabalFile = "a8de69537c43ab967f7f512466a5a0e32000e9179239b4c10adf3cd3cfd1e524";
+       libraryHaskellDepends = [ base containers ];
+       description = "Set- and Map-like types that remember the order elements were inserted";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "orders" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -131821,6 +132088,8 @@ self: {
        pname = "pandoc";
        version = "1.19.1";
        sha256 = "9d22db0a1536de0984f4a605f1a28649e68d540e6d892947d9644987ecc4172a";
+       revision = "1";
+       editedCabalFile = "6db38c75bdb36377e1424b91b2662205dbe54152995a08ab83127bfb17ee027b";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -131891,8 +132160,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc-preamble";
-       version = "1.2.1";
-       sha256 = "99e0988741a8b820ca951b2aabc35d251119c84e0a8245bf0c9b55cbe0e22121";
+       version = "1.2.2";
+       sha256 = "ee496f052eea0ad9a881d8056025f04cd83ec9773d695e15220151c33890579c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -133738,6 +134007,50 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pdf-slave" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , containers, exceptions, haskintex, HaTeX, optparse-applicative
+     , pdf-slave-template, shelly, system-filepath, text
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "pdf-slave";
+       version = "1.2.0.0";
+       sha256 = "bf45cd593271427ab6f72dffaa1e355a33b59ab20d18a34590a3a1c50d5fe029";
+       revision = "1";
+       editedCabalFile = "cf72f50463292710ceb929edc7cb9e61c41c5da36676e5d0cc7e7cc5d0dd23a4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring containers exceptions
+         haskintex HaTeX pdf-slave-template shelly system-filepath
+         unordered-containers yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring optparse-applicative pdf-slave-template
+         shelly system-filepath text yaml
+       ];
+       homepage = "https://github.com/NCrashed/pdf-slave#readme";
+       description = "Tool to generate PDF from haskintex templates and YAML input";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "pdf-slave-template" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , containers, text
+     }:
+     mkDerivation {
+       pname = "pdf-slave-template";
+       version = "1.2.0.0";
+       sha256 = "63acbe9eb391f698d8428f40cffcf8f3a2f483cd460c8c45d50e297a11b92531";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring containers text
+       ];
+       homepage = "https://github.com/ncrashed/pdf-slave#readme";
+       description = "Template format definition for pdf-slave tool";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pdf-toolbox-content" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
      , containers, io-streams, pdf-toolbox-core, text
@@ -136949,6 +137262,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "plan-applicative" = callPackage
+    ({ mkDerivation, base, bifunctors, comonad, containers, doctest
+     , profunctors, streaming, tasty, tasty-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "plan-applicative";
+       version = "1.0.0.0";
+       sha256 = "911a0d6f69d2dd4c7642abc855c153d90f799035a722324965506ecb2f954dd7";
+       libraryHaskellDepends = [
+         base bifunctors comonad containers profunctors streaming
+         transformers
+       ];
+       testHaskellDepends = [
+         base bifunctors comonad containers doctest profunctors streaming
+         tasty tasty-hunit transformers
+       ];
+       description = "Applicative/Arrow for resource estimation and progress tracking";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "plan-b" = callPackage
     ({ mkDerivation, base, exceptions, hspec, path, path-io
      , transformers
@@ -137314,8 +137647,8 @@ self: {
      }:
      mkDerivation {
        pname = "ply-loader";
-       version = "0.4.2";
-       sha256 = "60adbcb9323fd221b70ed106b9c418636112e989b3364a2eb0227fefce47afaf";
+       version = "0.5.0";
+       sha256 = "70f93a7043531b095f2762fe819ae2ae26a1913c071f179f3e4e936d9223db6f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139146,13 +139479,13 @@ self: {
   "preamble" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, exceptions
      , fast-logger, lens, monad-control, monad-logger, mtl, resourcet
-     , safe, shake, template-haskell, text, text-manipulate, time
+     , safe, shakers, template-haskell, text, text-manipulate, time
      , transformers-base, unordered-containers
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.3";
-       sha256 = "5a4a1a4fa8dcad02d6afbdc99b44d4f9e94571b48b88115b7d1ebb266f776a73";
+       version = "0.0.8";
+       sha256 = "2827df5cd7df280b1ca9092e0a17b585341f758ec91d490be7287483f623b374";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139160,7 +139493,7 @@ self: {
          monad-logger mtl resourcet safe template-haskell text
          text-manipulate time transformers-base unordered-containers
        ];
-       executableHaskellDepends = [ base basic-prelude shake ];
+       executableHaskellDepends = [ base shakers ];
        homepage = "https://github.com/swift-nav/preamble";
        description = "Yet another prelude";
        license = stdenv.lib.licenses.mit;
@@ -139726,8 +140059,8 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-simple";
-       version = "0.2.0.0";
-       sha256 = "f4f9141b0b816ad56918bb92daba2b62295207eb3119afcc3c2baf2ae46bb4d3";
+       version = "0.3.0.0";
+       sha256 = "b34af2742904717e1a46c6aa9816eeffedc4aea67452f61dd98fb06aae1d4f0d";
        libraryHaskellDepends = [
          ansi-terminal base lens mono-traversable mtl parsec semigroups
          transformers
@@ -139736,6 +140069,7 @@ self: {
        homepage = "https://github.com/cdepillabout/pretty-simple";
        description = "Simple pretty printer for any datatype with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-sop" = callPackage
@@ -142554,19 +142888,22 @@ self: {
 
   "qr-imager" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
-     , haskell-qrencode, jose-jwt, JuicyPixels, lens, vector
+     , haskell-qrencode, jose-jwt, JuicyPixels, lens, MissingH
+     , optparse-applicative, process, vector
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "0.1.0.1";
-       sha256 = "2936851586f3e63e7e4aa589d06d88cb6968f5e2c5861f71df62a89fc43d7ef9";
+       version = "0.1.2.1";
+       sha256 = "72e1c72a7e3da7769401b4d1125b3f527274bdc5f97d78be2e14cf619d705d30";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring cryptonite directory haskell-qrencode
-         jose-jwt JuicyPixels lens vector
+         jose-jwt JuicyPixels lens MissingH optparse-applicative process
+         vector
        ];
-       executableHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base process ];
        homepage = "https://github.com/vmchale/QRImager#readme";
        description = "Library to generate QR codes from bytestrings and objects";
        license = stdenv.lib.licenses.bsd3;
@@ -153929,8 +154266,8 @@ self: {
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.1.2.3";
-       sha256 = "f30880e753f8c7e258906ab0a83f15f23b4ae90cd3bbba02719556421dc97f0a";
+       version = "0.1.3.0";
+       sha256 = "ddf321ba0126fde5757f186c5080f3a7ffb7539582040aab263165f83cafcc78";
        libraryHaskellDepends = [
          acid-state aeson aeson-extra base base16-bytestring
          base64-bytestring binary binary-orphans bytestring cereal
@@ -154184,7 +154521,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-auth-cookie_0_4" = callPackage
+  "servant-auth-cookie_0_4_2" = callPackage
     ({ mkDerivation, base, base-compat, base64-bytestring
      , blaze-builder, blaze-html, blaze-markup, bytestring, cereal
      , cookie, cryptonite, data-default, deepseq, exceptions, hspec
@@ -154194,8 +154531,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-cookie";
-       version = "0.4";
-       sha256 = "2b5144612cbf8835b5f069f885d9f32483a63884d5d008c7110dd9273756eef1";
+       version = "0.4.2";
+       sha256 = "e1199517da33d5f0b3735567d2391dcf36ca8ca61edea703b674103192a1ed79";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring cereal cookie
          cryptonite data-default exceptions http-api-data http-types memory
@@ -156169,6 +156506,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "shakers" = callPackage
+    ({ mkDerivation, base, basic-prelude, directory, shake }:
+     mkDerivation {
+       pname = "shakers";
+       version = "0.0.4";
+       sha256 = "b2769d6b01eab98de11c3c072a2cbc2a5706e0dfdcaf916b67fc344d49f1e09f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base basic-prelude directory shake ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/swift-nav/shakers";
+       description = "Shake helpers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "shakespeare" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
@@ -158417,6 +158769,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "skylighting" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, bytestring
+     , case-insensitive, containers, Diff, directory, filepath, HUnit
+     , hxt, mtl, pretty-show, QuickCheck, regex-pcre-builtin, safe
+     , tasty, tasty-golden, tasty-hunit, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "skylighting";
+       version = "0.1.0.1";
+       sha256 = "e7cdbea2909306f97135b4444489cfff0136ec5609c22228a68201440d6304ac";
+       libraryHaskellDepends = [
+         aeson base blaze-html bytestring case-insensitive containers
+         directory filepath hxt mtl regex-pcre-builtin safe text utf8-string
+       ];
+       testHaskellDepends = [
+         aeson base bytestring Diff directory filepath HUnit pretty-show
+         QuickCheck tasty tasty-golden tasty-hunit text
+       ];
+       homepage = "https://github.com/jgm/skylighting";
+       description = "syntax highlighting library";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "skype4hs" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, lifted-base
      , monad-control, mtl, stm, text, time, transformers-base, word8
@@ -161635,16 +162010,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "speedy-slice_0_2_0" = callPackage
-    ({ mkDerivation, base, containers, lens, mcmc-types
+  "speedy-slice_0_3_0" = callPackage
+    ({ mkDerivation, base, containers, kan-extensions, lens, mcmc-types
      , mwc-probability, pipes, primitive, transformers
      }:
      mkDerivation {
        pname = "speedy-slice";
-       version = "0.2.0";
-       sha256 = "9ae1b3241624bfb5e656347cca1f598ae9b67b1abe23b00ddf8d3d5925234963";
+       version = "0.3.0";
+       sha256 = "efbf8a10b681b940078f70fb9aca43fec8ba436c82f3faf719bbe495ba152899";
        libraryHaskellDepends = [
-         base lens mcmc-types mwc-probability pipes primitive transformers
+         base kan-extensions lens mcmc-types mwc-probability pipes primitive
+         transformers
        ];
        testHaskellDepends = [ base containers mwc-probability ];
        homepage = "http://github.com/jtobin/speedy-slice";
@@ -163306,6 +163682,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "staf" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "staf";
+       version = "0.1.0.0";
+       sha256 = "ce066d4b64771489176e72f081b8ec5ba62237ff1f12abe5f515884b0ce8a925";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/lovasko/staf";
+       description = "Numerical statistics for Foldable containers";
+       license = "unknown";
+     }) {};
+
   "standalone-derive-topdown" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
@@ -165833,6 +166221,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "styx" = callPackage
+    ({ mkDerivation, aeson, base, containers, directory, filepath, mtl
+     , optparse-applicative, process, text, yaml
+     }:
+     mkDerivation {
+       pname = "styx";
+       version = "1.0";
+       sha256 = "2fc5e840d35663ca10771758dec362017f32611675e44fe2e988dd12a05e293c";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base containers directory filepath mtl optparse-applicative
+         process text yaml
+       ];
+       description = "A generator of nix files";
+       license = "GPL";
+     }) {};
+
   "sub-state" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances, sets
      , tasty, tasty-hunit, tasty-quickcheck
@@ -168713,6 +169119,25 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "tasty-ant-xml";
+       version = "1.0.4";
+       sha256 = "4d91c509e0e80919d96c16eaa3ee11089b7ee7c87fbe59a947d26bf0c5aef188";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-dejafu" = callPackage
     ({ mkDerivation, base, dejafu, tagged, tasty }:
      mkDerivation {
@@ -170739,6 +171164,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-generic-pretty" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, groom, ixset-typed
+     , protolude, QuickCheck, string-conversions, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, unordered-containers
+     , wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "text-generic-pretty";
+       version = "1.2.1";
+       sha256 = "cff331fdea2f695cf9a2583f4bd7393935b4a6ffa2bd47eb7dd983c6184752c7";
+       libraryHaskellDepends = [
+         base containers ghc-prim groom ixset-typed protolude QuickCheck
+         string-conversions text time unordered-containers wl-pprint-text
+       ];
+       testHaskellDepends = [
+         base containers protolude QuickCheck string-conversions tasty
+         tasty-hunit tasty-quickcheck time unordered-containers
+       ];
+       homepage = "https://github.com/joe9/GenericPretty";
+       description = "A generic, derivable, haskell pretty printer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "text-icu" = callPackage
     ({ mkDerivation, array, base, bytestring, deepseq, directory
      , ghc-prim, HUnit, icu, QuickCheck, random, test-framework
@@ -170781,6 +171229,7 @@ self: {
        homepage = "https://www.lambdanow.us/browser/text-icu-normalized";
        description = "Dealing with Strict Text in NFC normalization";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-icu-translit" = callPackage
@@ -173289,8 +173738,8 @@ self: {
      }:
      mkDerivation {
        pname = "timeseries";
-       version = "0.3.0";
-       sha256 = "0e59e55b0c1346593f752d88fa69ea9c35fb2942ef13f984727a26ede69d1896";
+       version = "0.4.0";
+       sha256 = "a073a252dcdb671e57a784f4b37f2009f6e0890579bf705869c572923047af51";
        libraryHaskellDepends = [
          base bytestring cassava statistics text text-time time vector
        ];
@@ -177358,23 +177807,24 @@ self: {
   "uhc-light" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, fgl, filepath, hashable, mtl, network, old-locale
-     , primitive, process, syb, transformers, uhc-util, uulib, vector
+     , primitive, process, syb, transformers, uhc-util, utf8-string
+     , uulib, vector
      }:
      mkDerivation {
        pname = "uhc-light";
-       version = "1.1.9.4";
-       sha256 = "617fd803d9693cc9c03f071045a892b5a1f8b4564e7764c595014a440261f053";
+       version = "1.1.9.5";
+       sha256 = "eabaf3cdac62afb5c8d37f8ceb0997fd85647493d2d4cc1b0d00d954d586681d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base binary bytestring containers directory fgl filepath
          hashable mtl network old-locale primitive process syb transformers
-         uhc-util uulib vector
+         uhc-util utf8-string uulib vector
        ];
        executableHaskellDepends = [
          array base binary bytestring containers directory fgl filepath
          hashable mtl network old-locale primitive process syb transformers
-         uhc-util uulib vector
+         uhc-util utf8-string uulib vector
        ];
        homepage = "https://github.com/UU-ComputerScience/uhc";
        description = "Part of UHC packaged as cabal/hackage installable library";
@@ -177389,8 +177839,8 @@ self: {
      }:
      mkDerivation {
        pname = "uhc-util";
-       version = "0.1.6.6";
-       sha256 = "b5abc07215168b1f203ce50da8f13b8170269a5e4b2e4c8a872819f13f14bb47";
+       version = "0.1.6.7";
+       sha256 = "d44b27175e9ce45a15c19c2f589772f4b66ca297a28b34b0ac462a7f6e4f4a75";
        libraryHaskellDepends = [
          array base binary bytestring containers directory fclabels fgl
          hashable logict-state mtl pqueue process time time-compat
@@ -178641,6 +179091,26 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "unordered-containers";
+       version = "0.2.7.2";
+       sha256 = "7f5c4344fcab01f6046378c64522f0dfd69e417f6c1a8858a24bdabaadb3e56e";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unordered-containers-rematch" = callPackage
     ({ mkDerivation, base, hashable, hspec, HUnit, rematch
      , unordered-containers
@@ -183515,8 +183985,8 @@ self: {
      }:
      mkDerivation {
        pname = "wave";
-       version = "0.1.0";
-       sha256 = "93c38138c1e85124544eadf0d381ce4ce0505a441060d226e8f09baddc4c5915";
+       version = "0.1.1";
+       sha256 = "13d5475356efc3ae95c971e930d5e4bf18f9395dc1bd7b63e8bb8e7ed26ddf23";
        libraryHaskellDepends = [
          base bytestring cereal containers data-default-class transformers
        ];
@@ -183926,8 +184396,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.3.4.0";
-       sha256 = "64218b2f2f2319fe137834bbb012e948444f80f88e3da03ee6ecff06b5ecfe27";
+       version = "0.4.1.0";
+       sha256 = "ead3b350b138946ec921c1e1c13ae6bf52f2ba89e7626ba79a562a5bef63faac";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring cryptonite
          data-default-class http-client memory mtl template-haskell text
@@ -185268,38 +185738,24 @@ self: {
 
   "wolf" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
-     , amazonka-swf, async, base, basic-prelude, bytestring, conduit
-     , conduit-combinators, conduit-extra, directory, exceptions
-     , fast-logger, filemanip, formatting, http-conduit, http-types
-     , lens, lifted-async, lifted-base, monad-control, monad-logger, mtl
-     , mtl-compat, optparse-applicative, optparse-generic, preamble
-     , process, regex-applicative, regex-compat, resourcet, safe, shake
-     , shelly, system-filepath, tasty, tasty-hunit, template-haskell
-     , text, text-manipulate, time, transformers, transformers-base
-     , unordered-containers, uuid, yaml, zlib
+     , amazonka-swf, base, bytestring, conduit, conduit-combinators
+     , conduit-extra, directory, exceptions, filemanip, lifted-async
+     , monad-control, optparse-applicative, optparse-generic, preamble
+     , process, resourcet, shakers, text, time, uuid, yaml
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.1";
-       sha256 = "441d7c82cca74e12fd097ebb3b4d5e3c7b2e3dff4145e65e00a9fd9f57ee224b";
+       version = "0.3.3";
+       sha256 = "2982a25dbdb4bcbfe563cc49f1bae58d8b837014ad28365eb09405222165f311";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-swf base
-         basic-prelude bytestring conduit conduit-combinators conduit-extra
-         directory exceptions fast-logger filemanip formatting http-conduit
-         http-types lens lifted-async lifted-base monad-control monad-logger
-         mtl mtl-compat optparse-applicative preamble process
-         regex-applicative regex-compat resourcet safe template-haskell text
-         text-manipulate time transformers transformers-base
-         unordered-containers uuid yaml
+         bytestring conduit conduit-combinators conduit-extra directory
+         exceptions filemanip lifted-async monad-control
+         optparse-applicative preamble process resourcet text time uuid yaml
        ];
-       executableHaskellDepends = [
-         aeson amazonka-core async base basic-prelude bytestring directory
-         optparse-applicative optparse-generic resourcet shake shelly
-         system-filepath text transformers yaml zlib
-       ];
-       testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
+       executableHaskellDepends = [ base optparse-generic shakers ];
        homepage = "https://github.com/swift-nav/wolf";
        description = "Amazon Simple Workflow Service Wrapper";
        license = stdenv.lib.licenses.mit;
@@ -185992,6 +186448,7 @@ self: {
        libraryHaskellDepends = [ base cubicbezier wx wxcore ];
        description = "Simple zoomable canvas for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wxc" = callPackage
@@ -188339,8 +188796,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml-light-lens";
-       version = "0.3.3.2";
-       sha256 = "27380c456128dc72f117febaf3ade7e8c7a916abc3052e5de9d8ffd5ca01df0d";
+       version = "0.3.3.3";
+       sha256 = "788a79a1afd97d9c41010b6240261995da9e80f5674b4e335beec47d225211cf";
        libraryHaskellDepends = [
          base bytestring bytestring-lexing containers lens yaml-light
        ];
@@ -189219,7 +189676,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "yesod-bin_1_5_0_1" = callPackage
+  "yesod-bin_1_5_1" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, Cabal, conduit, conduit-extra
      , containers, data-default-class, deepseq, directory, file-embed
@@ -189233,8 +189690,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.5.0.1";
-       sha256 = "5530506d1ddbe0b846f538b366645c416322046aa712d866c422e4778829d3e8";
+       version = "1.5.1";
+       sha256 = "034114dade5a23ec39ffeb9f78a04b7bd9fc0b8942b1a11118475e4c594863cd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [

From 19e2e7290a25819bd66a94db389e7e0d268f7fc0 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 18 Dec 2016 21:38:05 +0100
Subject: [PATCH 0144/1310] haskell: workaround for bug with dynamic libraries
 on darwin

---
 .../haskell-modules/generic-builder.nix       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index f91bd474c6f..dfe9f68ec61 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -245,9 +245,41 @@ stdenv.mkDerivation ({
     runHook postConfigure
   '';
 
+  # The darwin pre/post build sections are a workaround https://github.com/haskell/cabal/issues/4183
+  # It seems like --extra-lib-dirs from the previous steps is not detected properly,
+  # to work around this we build using a DYLD_LIBRARY_PATH and fixup the build afterwards.
   buildPhase = ''
     runHook preBuild
+    ${optionalString stdenv.isDarwin ''
+      local inputClosure=""
+      for i in $propagatedNativeBuildInputs $nativeBuildInputs; do
+        findInputs $i inputClosure propagated-native-build-inputs
+      done
+      local -a inputLibs=()
+      for p in $inputClosure; do
+        if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then
+          continue
+        fi
+        if [ -d "$p/lib" ]; then
+          inputLibs+="$p/lib"
+        fi
+      done
+
+      for lib in $inputLibs; do
+        export DYLD_LIBRARY_PATH="$lib:''${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}"
+      done
+    ''}
     ${setupCommand} build ${buildTarget}${crossCabalFlagsString}
+    ${optionalString stdenv.isDarwin ''
+      unset DYLD_LIBRARY_PATH
+
+      local outputLib=dist/build/*-ghc${ghc.version}.dylib
+      for lib in $inputLib/*.dylib; do
+        for name in $(otool -L $outputLib | awk '$1 ~ /^'$(basename lib)'/ {print $1}' | cat); do
+          install_name_tool -change $name $lib $outputLib
+        done
+      done
+    ''}
     runHook postBuild
   '';
 

From 943f4345dd4dc81fb406e16c36d8faeea2332997 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Dec 2016 10:54:53 +0100
Subject: [PATCH 0145/1310] configuration-hackage2nix.yaml: update list of
 broken builds

---
 .../haskell-modules/configuration-hackage2nix.yaml          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f766b2be8f5..42858390c30 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3829,6 +3829,7 @@ dont-distribute-packages:
   git-date:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-gpush:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-jump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-mediate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-object:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-repair:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-sanity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5440,6 +5441,7 @@ dont-distribute-packages:
   lzma-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   maam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   macbeth-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  machinecell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-zlib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   macosx-make-standalone:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mage:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5826,6 +5828,7 @@ dont-distribute-packages:
   newtype-generics:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   newtype-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   next-ref:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nfc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ngrams-loader:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   NGrams:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   niagra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6209,6 +6212,7 @@ dont-distribute-packages:
   press:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   presto-hdbc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pretty-error:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pretty-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-simd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   PrimitiveArray-Pretty:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-board:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7217,6 +7221,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-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 ]
   text-position:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7705,6 +7710,7 @@ dont-distribute-packages:
   wxFruit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   WxGeneric:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxhnotepad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wxSimpleCanvas:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxturtle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wyvern:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   x-dsp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]

From d82a1abbb4dc2d9ed914535efcc7ba53037ce525 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Dec 2016 10:56:33 +0100
Subject: [PATCH 0146/1310] ghcjs: mark this build as broken

---
 pkgs/development/compilers/ghcjs/base.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index f8b861311d6..393278be49e 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -183,4 +183,5 @@ in mkDerivation (rec {
   license = stdenv.lib.licenses.bsd3;
   platforms = ghc.meta.platforms;
   maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
+  broken = true;  # http://hydra.nixos.org/build/45110274
 })

From c38b4da9946b32267301ccf352731ed2d80cc2f6 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 24 Dec 2016 15:49:51 +0000
Subject: [PATCH 0147/1310] strongswan: 5.5.0 -> 5.5.1

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

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index ed67909db67..1791abf4a48 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "strongswan-${version}";
-  version = "5.5.0";
+  version = "5.5.1";
 
   src = fetchurl {
     url = "http://download.strongswan.org/${name}.tar.bz2";
-    sha256 = "0m449i5s51ikqh36s1sp4rvw60wqyv0j12kyd31yl9b7mjc3jijq";
+    sha256 = "1drahhmwz1jg14rfh67cl231dlg2a9pra6jmipfxwyzpj4ck02vj";
   };
 
   dontPatchELF = true;

From 790818540081420d30a5a04cd8cb4c823c711fee Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Wed, 21 Dec 2016 16:21:31 +0800
Subject: [PATCH 0148/1310] crystal: init at 0.20.3

A compiled language with Ruby like syntax and type inference.
---
 .../development/compilers/crystal/default.nix | 96 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 98 insertions(+)
 create mode 100644 pkgs/development/compilers/crystal/default.nix

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
new file mode 100644
index 00000000000..ed9907a283b
--- /dev/null
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -0,0 +1,96 @@
+{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_39, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  version = "0.20.3";
+  name = "crystal-${version}-1";
+  arch =
+    {
+      "x86_64-linux" = "linux-x86_64";
+      "i686-linux" = "linux-i686";
+      "x86_64-darwin" = "darwin-x86_64";
+    }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+
+  prebuiltBinary = fetchurl {
+    url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz";
+    sha256 =
+      {
+        "x86_64-linux" = "c656dc8092a6161262f527df441aaab4ea9dd9a836a013f7155c6378b26b8cd7";
+        "i686-linux" = "85edfa1dda5e712341869bab87f6de0f7c6860e2a04dec2f00e8dc6aa1418611";
+        "x86_64-darwin" = "0088972c5cad9543f262976ae6c8ee1dbcbefdee3a8bedae851998bfa7098637";
+      }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+  };
+
+  src = fetchurl {
+    url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
+    sha256 = "5372ba2a35d885345207047a51b9389f9190fd12389847e7f7298618bcf59ad6";
+  };
+
+  # crystal on Darwin needs libiconv to build
+  buildInputs = [
+    boehmgc libatomic_ops pcre libevent llvm_39 makeWrapper
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    libiconv
+  ];
+
+  libPath = stdenv.lib.makeLibraryPath ([
+    boehmgc libatomic_ops pcre libevent
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    libiconv
+  ]);
+
+  unpackPhase = ''
+    tar zxf ${src}
+    tar zxf ${prebuiltBinary}
+  '';
+
+  sourceRoot = ".";
+
+  fixPrebuiltBinary = if stdenv.isDarwin then ''
+    wrapProgram $(pwd)/crystal-${version}-1/embedded/bin/crystal \
+        --suffix DYLD_LIBRARY_PATH : $libPath
+  ''
+  else ''
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      crystal-${version}-1/embedded/bin/crystal
+    patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } \
+      crystal-${version}-1/embedded/bin/crystal
+  '';
+
+  buildPhase = ''
+    ${fixPrebuiltBinary}
+
+    cd crystal-${version}
+    make release=1 PATH="../crystal-${version}-1/bin:$PATH"
+    make doc
+  '';
+
+  installPhase = ''
+    install -Dm755 .build/crystal $out/bin/crystal
+    wrapProgram $out/bin/crystal \
+        --suffix CRYSTAL_PATH : $out/lib/crystal \
+        --suffix LIBRARY_PATH : $libPath
+
+    install -dm755 $out/lib/crystal
+    cp -r src/* $out/lib/crystal/
+
+    install -dm755 $out/share/doc/crystal/api
+    cp -r doc/* $out/share/doc/crystal/api/
+    cp -r samples $out/share/doc/crystal/
+
+    install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
+    install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
+
+    install -Dm644 LICENSE $out/share/licenses/crystal/LICENSE
+  '';
+
+  dontStrip = true;
+
+  meta = {
+    description = "A compiled language with Ruby like syntax and type inference";
+    homepage = "https://crystal-lang.org/";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [ mingchuan ];
+    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7df99796df8..6b619add313 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4643,6 +4643,8 @@ in
     '';
   });
 
+  crystal = callPackage ../development/compilers/crystal { };
+
   devpi-client = callPackage ../development/tools/devpi-client {};
 
   drumstick = callPackage ../development/libraries/drumstick { };

From 6db2c983c1d7b2fb994c18b91ce9ed381d4053f4 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Wed, 21 Dec 2016 16:23:01 +0800
Subject: [PATCH 0149/1310] shards: init at 0.7.1

Dependency manager for the Crystal language
---
 .../tools/build-managers/shards/default.nix   | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/shards/default.nix

diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
new file mode 100644
index 00000000000..7db0d89e8b1
--- /dev/null
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, crystal, libyaml, which }:
+
+stdenv.mkDerivation rec {
+  name = "shards-${version}";
+  version = "0.7.1";
+
+  src = fetchurl {
+    url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz";
+    sha256 = "31de819c66518479682ec781a39ef42c157a1a8e6e865544194534e2567cb110";
+  };
+
+  buildInputs = [ crystal libyaml which ];
+
+  buildFlags = [ "CRFLAGS=" "release" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/shards $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://crystal-lang.org/";
+    license = licenses.asl20;
+    description = "Dependency manager for the Crystal language";
+    maintainers = with maintainers; [ mingchuan ];
+    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b619add313..932013bcf29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6495,6 +6495,8 @@ in
   sbt = callPackage ../development/tools/build-managers/sbt { };
   simpleBuildTool = sbt;
 
+  shards = callPackage ../development/tools/build-managers/shards { };
+
   shellcheck = self.haskellPackages.ShellCheck;
 
   shncpd = callPackage ../tools/networking/shncpd { };

From 30074ddfeac5e165eea32b33829bc2bf4185aace Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 24 Dec 2016 22:27:52 +0200
Subject: [PATCH 0150/1310] coreutils: Fix cross build

`make install` was failing presumably due to an upstream cross-compilation bug:

Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually).  Stop.

While at it, remove the old ugly cross buildPhase. It was seemingly
trying to work around the fact that the man pages are generated by
piping each command's --help output to help2man. That obviously doesn't
work while cross-compiling.

Instead, set PERL=missing in the environment to make the build system
think there's no perl available to run help2man. (This approach was
stolen from buildroot.)
---
 pkgs/tools/misc/coreutils/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index ec6be06ede3..8b39e3711e1 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -54,13 +54,13 @@ let
         ++ optional (stdenv.ccCross.libc ? libiconv)
           stdenv.ccCross.libc.libiconv.crossDrv;
 
-      buildPhase = ''
-        make || (
-          pushd man
-          for a in *.x; do
-            touch `basename $a .x`.1
-          done
-          popd; make )
+      # 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 = ${self}/bin/install -c|'
       '';
 
       postInstall = ''

From b64214f66f8f73d850e7ceef4d05dcaed50e5b59 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 18 Dec 2016 21:59:06 -0500
Subject: [PATCH 0151/1310] plex: add config option to open recommended network
 ports

as prescribed at https://support.plex.tv/hc/en-us/articles/201543147-What-network-ports-do-I-need-to-allow-through-my-firewall-
---
 nixos/modules/services/misc/plex.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index 92b352db416..7c2322b7d89 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -19,6 +19,14 @@ in
         description = "The directory where Plex stores its data files.";
       };
 
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open ports in the firewall for the media server
+        '';
+      };
+
       user = mkOption {
         type = types.str;
         default = "plex";
@@ -141,6 +149,11 @@ in
       };
     };
 
+    networking.firewall = mkIf cfg.openFirewall {
+      allowedTCPPorts = [ 32400 3005 8324 32469 ];
+      allowedUDPPorts = [ 1900 5353 32410 32412 32413 32414 ];
+    };
+
     users.extraUsers = mkIf (cfg.user == "plex") {
       plex = {
         group = cfg.group;

From 0e3b56c7b9b38c71bd3a5bac35acfce8b57f5ebb Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 24 Dec 2016 22:41:32 +0200
Subject: [PATCH 0152/1310] alsa-lib: Remove unnecessary crossAttrs

It's breaking the cross build.
---
 pkgs/os-specific/linux/alsa-lib/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix
index b525cbfc261..3205275ff93 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-lib/default.nix
@@ -27,12 +27,6 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  crossAttrs = {
-    patchPhase = ''
-      sed -i s/extern/static/g include/iatomic.h
-    '';
-  };
-
   meta = with stdenv.lib; {
     homepage = http://www.alsa-project.org/;
     description = "ALSA, the Advanced Linux Sound Architecture libraries";

From bc4a6719809f8965c71e2375e5760ef3bc04a0d3 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Sat, 24 Dec 2016 10:53:34 +0100
Subject: [PATCH 0153/1310] unifont: 9.0.04 -> 9.0.06

See https://lists.gnu.org/archive/html/info-gnu/2016-12/msg00014.html
for release information
---
 pkgs/data/fonts/unifont/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index 682c42afa3e..8ac65dcae35 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "unifont-${version}";
-  version = "9.0.04";
+  version = "9.0.06";
 
   ttf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.ttf";
-    sha256 = "052waajjdry67jjl7vy984padyzdrkhf5gylgbnvj90q6d52j02z";
+    sha256 = "0r96giih04din07wlmw8538izwr7dh5v6dyriq13zfn19brgn5z2";
   };
 
   pcf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
-    sha256 = "0736qmlzsf4xlipj4vzihafkigc3xjisxnwcqhl9dzkhxfjq9612";
+    sha256 = "11ivfzpyz54rbz0cvd437abs6qlv28q0qp37kn27jggxlcpfh8vd";
   };
 
   buildInputs = [ mkfontscale mkfontdir ];

From bdc880e49df1515c92c2c9f4f2600d57ad7d686b Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 24 Dec 2016 22:57:25 +0100
Subject: [PATCH 0154/1310] flightgear: 3.4.0 -> 2016.4.3.

---
 .../development/libraries/simgear/default.nix | 10 ++--
 pkgs/games/flightgear/default.nix             | 47 ++++++++++++-------
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index df732c40f57..aef1a1dc822 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -1,20 +1,22 @@
 { stdenv, fetchurl, plib, freeglut, xproto, libX11, libXext, xextproto, libXi
 , inputproto, libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg, freealut
 , openscenegraph, openal, expat, cmake, apr
+, curl
 }:
 
 stdenv.mkDerivation rec {
   name = "simgear-${version}";
-  version = "3.4.0";
+  version = "2016.4.3";
+  shortVersion = "2016.4";
 
   src = fetchurl {
-    url = "http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.tar.bz2";
-    sha256 = "152q3aqlrg3631ppvl6kr1mp5iszplq68l6lrsn9vjxafbz6czcj";
+    url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
+    sha256 = "1gfj0d03jbi0p08baj46ihhyzbgpymmipw2dp11j13412l15acv9";
   };
 
   buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto
                   libICE libSM libXt libXmu mesa boost zlib libjpeg freealut
-                  openscenegraph openal expat cmake apr ];
+                  openscenegraph openal expat cmake apr curl ];
 
   meta = with stdenv.lib; {
     description = "Simulation construction toolkit";
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index b55a37e9985..1a1b3a10895 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -1,22 +1,36 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, makeWrapper
 , freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib
 , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto
 , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr
 , makeDesktopItem, qtbase
 }:
 
+let
+  version = "2016.4.3";
+  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";
+    };
+
+    phases = [ "installPhase" ];
+
+    installPhase = ''
+      mkdir -p "$out/share/FlightGear"
+      tar xf "${src}" -C "$out/share/FlightGear/" --strip-components=1
+    '';
+  };
+in
 stdenv.mkDerivation rec {
-  version = "3.4.0";
   name = "flightgear-${version}";
+  inherit version;
 
   src = fetchurl {
-    url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Source/${name}.tar.bz2";
-    sha256 = "102pg7mahgxzypvyp76x363qy3a4gxavr4hj16gsha07nl2msr5m";
-  };
-
-  datasrc = fetchurl {
-    url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-data-${version}.tar.bz2";
-    sha256 = "12qjvycizg693g5jj5qyp1jiwwywg6p9fg6j3zjxhx6r4g1sgvwc";
+    url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
+    sha256 = "08i8dlia3aral2wwf72n5q5ji4vxj51bnn24g6prqjjy4qww9a9m";
   };
 
   # Of all the files in the source and data archives, there doesn't seem to be
@@ -37,21 +51,22 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
+    makeWrapper
     freeglut freealut mesa libICE libjpeg openal openscenegraph plib
     libSM libunwind libX11 xproto libXext xextproto libXi inputproto
     libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase
   ];
 
-  preConfigure = ''
-    export cmakeFlagsArray=(-DFG_DATA_DIR="$out/share/FlightGear/")
-  '';
-
   postInstall = ''
     mkdir -p "$out/share/applications/"
-    cp "${desktopItem}"/share/applications/* "$out/share/applications/"
+    cp "${desktopItem}"/share/applications/* "$out/share/applications/" #*/
+
+    for f in $out/bin/* #*/
+    do
+      wrapProgram $f --set FG_ROOT "${data}/share/FlightGear"
+    done
+
 
-    mkdir -p "$out/share/FlightGear"
-    tar xvf "${datasrc}" -C "$out/share/FlightGear/" --strip-components=1
   '';
 
   meta = with stdenv.lib; {

From 585c642bf8adf495d66e1f4ea6d96bc767730347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 24 Dec 2016 01:44:10 +0100
Subject: [PATCH 0155/1310] docker: use upstream service file from package

---
 nixos/modules/virtualisation/docker.nix | 61 ++++++++-----------------
 1 file changed, 20 insertions(+), 41 deletions(-)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 8902799936c..92249573a4b 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -99,55 +99,34 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable (mkMerge [
-    { environment.systemPackages = [ pkgs.docker ];
+  config = mkIf cfg.enable (mkMerge [{
+      environment.systemPackages = [ pkgs.docker ];
       users.extraGroups.docker.gid = config.ids.gids.docker;
-      # this unit follows the one provided by upstream see: https://github.com/docker/docker/blob/master/contrib/init/systemd/docker.service
-      # comments below reflect experience from upstream.
+      systemd.packages = [ pkgs.docker ];
+
       systemd.services.docker = {
-        description = "Docker Application Container Engine";
         wantedBy = optional cfg.enableOnBoot "multi-user.target";
-        after = [ "network.target" "docker.socket" ];
-        requires = ["docker.socket"];
         serviceConfig = {
-          # the default is not to use systemd for cgroups because the delegate issues still
-          # exists and systemd currently does not support the cgroup feature set required
-          # for containers run by docker
-          ExecStart = ''${pkgs.docker}/bin/dockerd \
-            --group=docker \
-            --host=fd:// \
-            --log-driver=${cfg.logDriver} \
-            ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \
-            ${optionalString cfg.liveRestore "--live-restore" } \
-            ${cfg.extraOptions}
-          '';
-          Type="notify";
-          ExecReload="${pkgs.procps}/bin/kill -s HUP $MAINPID";
-          LimitNOFILE = 1048576;
-          # Having non-zero Limit*s causes performance problems due to accounting overhead
-          # in the kernel. We recommend using cgroups to do container-local accounting.
-          LimitNPROC="infinity";
-          LimitCORE="infinity";
-          TasksMax="infinity";
-          TimeoutStartSec=0;
-          # set delegate yes so that systemd does not reset the cgroups of docker containers
-          Delegate="yes";
-          # kill only the docker process, not all processes in the cgroup
-          KillMode="process";
+          ExecStart = [
+            ""
+            ''
+              ${pkgs.docker}/bin/dockerd \
+                --group=docker \
+                --host=fd:// \
+                --log-driver=${cfg.logDriver} \
+                ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \
+                ${optionalString cfg.liveRestore "--live-restore" } \
+                ${cfg.extraOptions}
+            ''];
+          ExecReload=[
+            ""
+            "${pkgs.procps}/bin/kill -s HUP $MAINPID"
+          ];
         } // proxy_env;
 
         path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
       };
-      systemd.sockets.docker = {
-        description = "Docker Socket for the API";
-        wantedBy = [ "sockets.target" ];
-        socketConfig = {
-          ListenStream = cfg.listenOptions;
-          SocketMode = "0660";
-          SocketUser = "root";
-          SocketGroup = "docker";
-        };
-      };
+      systemd.sockets.docker.socketConfig.ListenStream = cfg.listenOptions;
     }
   ]);
 

From 4c891ac6388eec03b047b0854ea9c9ea2fc246fc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 25 Dec 2016 03:22:25 +0300
Subject: [PATCH 0156/1310] slade: init at 3.1.1.4

---
 pkgs/applications/misc/slade/default.nix | 26 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 ++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/misc/slade/default.nix

diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix
new file mode 100644
index 00000000000..b50c2f18690
--- /dev/null
+++ b/pkgs/applications/misc/slade/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }:
+
+stdenv.mkDerivation rec {
+  name = "slade-${version}";
+  version = "3.1.1.4";
+
+  src = fetchFromGitHub {
+    owner = "sirjuddington";
+    repo = "SLADE";
+    rev = version;
+    sha256 = "0c2yjkpcwxkid1wczmc9f16x1p40my8jv61jc93ldgjzcprmrpn8";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig zip ];
+  buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Doom editor";
+    homepage = "http://slade.mancubus.net/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20b8853a9c2..a0c98f9100d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1476,6 +1476,10 @@ in
 
   doomseeker = callPackage ../applications/misc/doomseeker { };
 
+  slade = callPackage ../applications/misc/slade {
+    wxGTK = wxGTK30;
+  };
+
   drive = callPackage ../applications/networking/drive { };
 
   driftnet = callPackage ../tools/networking/driftnet {};

From 6af6cec8b279efe864e1fd995aa95ca32bba504e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 25 Dec 2016 01:59:11 +0100
Subject: [PATCH 0157/1310] Revert "thin-provisioning-tools: init at 0.6.1"

This reverts commit 55b18ac486336da8f9bfe352afd3fac564b2671b.

There is already a "thin-provisioning-tools" package (see
cd1ec18b421c3dbbaabfc64f4f5d30371f84e7e1).

Although this one was committed earlier, I'm reverting it because it's
not only older, but it's unreferenced within <nixpkgs>.

Apart from that the packaging of the other package is of higher
packaging quality (maintainer and license, doesn't use "descriptionS",
uses autoreconfHook).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @globin, @dwe11er, @jagajaga
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../linux/thin-provisioning-tools/default.nix | 30 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/thin-provisioning-tools/default.nix

diff --git a/pkgs/os-specific/linux/thin-provisioning-tools/default.nix b/pkgs/os-specific/linux/thin-provisioning-tools/default.nix
deleted file mode 100644
index c075c3f1667..00000000000
--- a/pkgs/os-specific/linux/thin-provisioning-tools/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchFromGitHub, autoconf, pkgconfig, utillinux, coreutils, expat, libaio, boost}:
-
-let
-  version = "0.6.1";
-in
-
-stdenv.mkDerivation {
-  name = "thin-provisioning-tools-${version}";
-
-  src = fetchFromGitHub {
-    owner = "jthornber";
-    repo = "thin-provisioning-tools";
-    rev = "e46bdfd4cc6cdb13852de8aba4e3019425ab0a89";
-    sha256 = "061rw33nw16g71ij05axl713wimawx54h2ggpqxvzy7iyi6lhdcm";
-  };
-
-  nativeBuildInputs = [ autoconf pkgconfig expat libaio boost ];
-
-  preConfigure =
-    ''
-      autoconf
-    '';
-
-  meta = {
-    homepage = https://github.com/jthornber/thin-provisioning-tools;
-    descriptions = "Tools for manipulating the metadata of the device-mapper targets (dm-thin-pool, dm-cache, dm-era)";
-    platforms = stdenv.lib.platforms.linux;
-    inherit version;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0c98f9100d..c204a37c839 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11374,8 +11374,6 @@ in
 
   lvm2 = callPackage ../os-specific/linux/lvm2 { };
 
-  thin_provisioning_tools = callPackage ../os-specific/linux/thin-provisioning-tools { };
-
   mbpfan = callPackage ../os-specific/linux/mbpfan { };
 
   mdadm = callPackage ../os-specific/linux/mdadm { };

From e4f30acb14b5d7bce542a80d17a81298b65e7f1c Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sun, 25 Dec 2016 04:58:31 +0100
Subject: [PATCH 0158/1310] dmd: Fix build for Darwin

---
 pkgs/development/compilers/dmd/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index 3435b94c32e..41162c4e50e 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
       substituteInPlace src/dmd/posix.mak \
           --replace g++ clang++ \
           --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_
-
-      # Was not able to compile on darwin due to "__inline_isnanl"
-      # being undefined.
-      substituteInPlace src/dmd/root/port.c --replace __inline_isnanl __inline_isnan
   '';
 
   # Buid and install are based on http://wiki.dlang.org/Building_DMD

From a216fc4ca9fbaf313f1f9d433fd4b219cfeba98f Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Sun, 25 Dec 2016 05:21:58 +0100
Subject: [PATCH 0159/1310] sonarr: 2.0.0.4409 -> 2.0.0.4427 (#21389)

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

diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index 5deb3ea871b..a742249e794 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sonarr-${version}";
-  version = "2.0.0.4409";
+  version = "2.0.0.4427";
 
   src = fetchurl {
     url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "1kaj1m4ifby8liks8i7fsbgwbajaqwd96yindqp5maf2n6px2nw2";
+    sha256 = "066jhvz57hxrcgn902z25a21sj87wiqz224fjzpk1lpxrylv4ac2";
   };
 
   buildInputs = [

From 5319587d872397ef2a8d59c34e205b3cc186c095 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 10:40:57 +0100
Subject: [PATCH 0160/1310] pythonPackages.pandas: 0.19.1 -> 0.19.2

---
 .../python-modules/pandas/default.nix         | 91 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 72 +--------------
 2 files changed, 92 insertions(+), 71 deletions(-)
 create mode 100644 pkgs/development/python-modules/pandas/default.nix

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
new file mode 100644
index 00000000000..a923e553582
--- /dev/null
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -0,0 +1,91 @@
+{ buildPythonPackage
+, python
+, stdenv
+, fetchurl
+, nose
+, glibcLocales
+, cython
+, dateutil
+, scipy
+, numexpr
+, pytz
+, xlrd
+, bottleneck
+, sqlalchemy
+, lxml
+, html5lib
+, beautifulsoup4
+, openpyxl
+, tables
+, xlwt
+, darwin ? {}
+, libcxx ? null
+}:
+
+let
+  inherit (stdenv.lib) optional optionalString concatStringsSep;
+  inherit (stdenv) isDarwin;
+in buildPythonPackage rec {
+  pname = "pandas";
+  version = "0.19.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "6f0f4f598c2b16746803c8bafef7c721c57e4844da752d36240c0acf97658014";
+  };
+
+  LC_ALL = "en_US.UTF-8";
+  buildInputs = [ nose glibcLocales ] ++ optional isDarwin libcxx;
+  propagatedBuildInputs = [
+    cython
+    dateutil
+    scipy
+    numexpr
+    pytz
+    xlrd
+    bottleneck
+    sqlalchemy
+    lxml
+    html5lib
+    beautifulsoup4
+    openpyxl
+    tables
+    xlwt
+  ] ++ optional isDarwin darwin.locale; # provides the locale command
+
+  # For OSX, we need to add a dependency on libcxx, which provides
+  # `complex.h` and other libraries that pandas depends on to build.
+  patchPhase = optionalString isDarwin ''
+    cpp_sdk="${libcxx}/include/c++/v1";
+    echo "Adding $cpp_sdk to the setup.py common_include variable"
+    substituteInPlace setup.py \
+      --replace "['pandas/src/klib', 'pandas/src']" \
+                "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
+
+  # disable clipboard tests since pbcopy/pbpaste are not open source
+    substituteInPlace pandas/io/tests/test_clipboard.py \
+      --replace pandas.util.clipboard no_such_module \
+      --replace OSError ImportError
+  '';
+
+  # The flag `-A 'not network'` will disable tests that use internet.
+  # The `-e` flag disables a few problematic tests.
+
+  checkPhase = ''
+    runHook preCheck
+    # The flag `-w` provides the initial directory to search for tests.
+    # The flag `-A 'not network'` will disable tests that use internet.
+    nosetests -w $out/${python.sitePackages}/pandas --no-path-adjustment -A 'not slow and not network' --stop \
+      --verbosity=3
+     runHook postCheck
+  '';
+
+  meta = {
+    homepage = "http://pandas.pydata.org/";
+    description = "Python Data Analysis Library";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ raskin fridh ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b062d7d6233..5711faf65b6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17879,77 +17879,7 @@ in {
     };
   };
 
-  pandas = let
-    inherit (pkgs.stdenv.lib) optional optionalString;
-    inherit (pkgs.stdenv) isDarwin;
-  in buildPythonPackage rec {
-    name = "pandas-${version}";
-    version = "0.19.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pandas/${name}.tar.gz";
-      sha256 = "2509feaeda72fce03675e2eccd2284bb1cadb6a0737008a5e741fe2431d47421";
-    };
-
-    LC_ALL = "en_US.UTF-8";
-    buildInputs = with self; [ nose pkgs.glibcLocales ] ++ optional isDarwin pkgs.libcxx;
-    propagatedBuildInputs = with self; [
-      cython
-      dateutil
-      scipy
-      numexpr
-      pytz
-      xlrd
-      bottleneck
-      sqlalchemy
-      lxml
-      html5lib
-      beautifulsoup4
-      openpyxl
-      tables
-      xlwt
-    ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command
-
-    # For OSX, we need to add a dependency on libcxx, which provides
-    # `complex.h` and other libraries that pandas depends on to build.
-    patchPhase = optionalString isDarwin ''
-      cpp_sdk="${pkgs.libcxx}/include/c++/v1";
-      echo "Adding $cpp_sdk to the setup.py common_include variable"
-      substituteInPlace setup.py \
-        --replace "['pandas/src/klib', 'pandas/src']" \
-                  "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
-
-      # disable clipboard tests since pbcopy/pbpaste are not open source
-      substituteInPlace pandas/io/tests/test_clipboard.py \
-        --replace pandas.util.clipboard no_such_module \
-        --replace OSError ImportError
-    '';
-
-    # The flag `-A 'not network'` will disable tests that use internet.
-    # The `-e` flag disables a few problematic tests.
-
-    # Disable two tests that are broken since numpy 1.11. Fixed upstream.
-
-    checkPhase = let
-      testsToSkip = [ "test_range_slice_day" "test_range_slice_seconds" ];
-    in ''
-      runHook preCheck
-      # The flag `-A 'not network'` will disable tests that use internet.
-      # The `-e` flag disables a few problematic tests.
-      ${python.executable} setup.py nosetests -A 'not slow and not network' --stop \
-        -e '${concatStringsSep "|" testsToSkip}' --verbosity=3
-
-      runHook postCheck
-    '';
-
-    meta = {
-      homepage = "http://pandas.pydata.org/";
-      description = "Python Data Analysis Library";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ raskin fridh ];
-      platforms = platforms.unix;
-    };
-  };
+  pandas = callPackage ../development/python-modules/pandas { };
 
   xlrd = buildPythonPackage rec {
     name = "xlrd-${version}";

From 3d455ac9343fd4b9956e2bccd1d6b2a39d5a4eda Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 10:41:36 +0100
Subject: [PATCH 0161/1310] pythonPackages.xlwt: 1.0.0 -> 1.1.2

---
 .../python-modules/xlwt/default.nix           | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +----------
 2 files changed, 37 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/xlwt/default.nix

diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix
new file mode 100644
index 00000000000..ffcdd5ee626
--- /dev/null
+++ b/pkgs/development/python-modules/xlwt/default.nix
@@ -0,0 +1,36 @@
+{ buildPythonPackage
+, fetchurl
+, fetchpatch
+, nose
+, lib
+}:
+
+buildPythonPackage rec {
+  pname = "xlwt";
+  name = "${pname}-${version}";
+  version = "1.1.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "aed648c17731f40f84550dd2a1aaa53569f0cbcaf5610ba895cd2632587b723c";
+  };
+
+  # re.LOCALE was removed in Python 3.6
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/python-excel/xlwt/commit/86564ef26341020316cd8a27c704ef1dc5a6129b.patch";
+      sha256 = "01abxfkmckcxpi6n5wi8ia58fmkzqrxjfjq1mjljygylm8nb3m8i";
+    })
+  ];
+
+  buildInputs = [ nose ];
+  checkPhase = ''
+    nosetests -v
+  '';
+
+  meta = {
+    description = "Library to create spreadsheet files compatible with MS";
+    homepage = https://github.com/python-excel/xlwt;
+    license = with lib.licenses; [ bsdOriginal bsd3 lgpl21 ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5711faf65b6..d83bd7b867e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26796,26 +26796,7 @@ EOF
     };
   };
 
-  xlwt = buildPythonPackage rec {
-    name = "xlwt-${version}";
-    version = "1.0.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/x/xlwt/${name}.tar.gz";
-      sha256 = "1y8w5imsicp01gn749qhw6j0grh9y19zz57ribwaknn8xqwjjhxc";
-    };
-
-    buildInputs = with self; [ nose ];
-    checkPhase = ''
-      nosetests -v
-    '';
-
-    meta = {
-      description = "Library to create spreadsheet files compatible with MS";
-      homepage = https://github.com/python-excel/xlwt;
-      license = with licenses; [ bsdOriginal bsd3 lgpl21 ];
-    };
-  };
+  xlwt = callPackage ../development/python-modules/xlwt { };
 
   youtube-dl = callPackage ../tools/misc/youtube-dl {};
 

From 916a37cd0e54517be9bccf155e6fa3ab133ee6e5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 25 Dec 2016 11:10:00 +0100
Subject: [PATCH 0162/1310] libreoffice-fresh: 5.2.3.3 -> 5.2.4.2

---
 .../libreoffice/default-primary-src.nix       |  6 +--
 .../office/libreoffice/default.nix            |  4 +-
 .../office/libreoffice/libreoffice-srcs.nix   | 40 +++++++++----------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index 52b81595e43..497d4305873 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -3,8 +3,8 @@
 rec {
   major = "5";
   minor = "2";
-  patch = "3";
-  tweak = "3";
+  patch = "4";
+  tweak = "2";
 
   subdir = "${major}.${minor}.${patch}";
 
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "1h9j3j7drhr49nw2p6by5vvrr8nc8rpldn3yp724mwkb2rfkdwd8";
+    sha256 = "047byvyg13baws1bycaq1s6wqhkcr2pk27xbag0npzx1lspx2wwb";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index cbe159857eb..39d4688b639 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -42,14 +42,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "0j0ajli1cbfwbgzrcqkx3db174jv1fgm22ds0gqlgkci9cffa0c4";
+      sha256 = "075f7jpp8qi6piwrw4n8inynvsgp0270pdd9jmc2fqv6j5gsn332";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "0fndi6cv8rw426c3l071z130ks9sqf6ca5yas7am9d666mmy4fs4";
+      sha256 = "10p1xd077278gm3syd3lc54fzjsvrvzm0zr6csn9iq90kmlsgwzy";
     };
 
   };
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index bf9150b98ec..6cacff49fc6 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -112,11 +112,11 @@
     md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
   }
   {
-    name = "curl-7.43.0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/curl-7.43.0.tar.bz2";
-    sha256 = "baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9";
-    md5 = "11bddbb452a8b766b932f859aaeeed39";
-    md5name = "11bddbb452a8b766b932f859aaeeed39-curl-7.43.0.tar.bz2";
+    name = "curl-7.51.0.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz";
+    sha256 = "65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c";
+    md5 = "490e19a8ccd1f4a244b50338a0eb9456";
+    md5name = "490e19a8ccd1f4a244b50338a0eb9456-curl-7.51.0.tar.gz";
   }
   {
     name = "libe-book-0.1.2.tar.bz2";
@@ -224,11 +224,11 @@
     md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz";
   }
   {
-    name = "source-code-font-1.009.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz";
-    sha256 = "9b295127164c81bcf28c7ebb687f1555b71796108b443a04d40202b7364e4cce";
-    md5 = "0279a21fab6f245e85a6f85fea54f511";
-    md5name = "0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz";
+    name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
+    sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f";
+    md5 = "907d6e99f241876695c19ff3db0b8923";
+    md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
   }
   {
     name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
@@ -497,11 +497,11 @@
     md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";
   }
   {
-    name = "mdds-1.2.0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/mdds-1.2.0.tar.bz2";
-    sha256 = "f44fd0635de94c7d490f9a65f74b5e55860d7bdd507951428294f9690fda45b6";
-    md5 = "9f3383fb7bae825eab69f3a6ec1d74b2";
-    md5name = "9f3383fb7bae825eab69f3a6ec1d74b2-mdds-1.2.0.tar.bz2";
+    name = "mdds-1.2.2.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2";
+    sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d";
+    md5 = "8855cf852a6088cfdc792c6f7ceb0243";
+    md5name = "8855cf852a6088cfdc792c6f7ceb0243-mdds-1.2.2.tar.bz2";
   }
   {
     name = "mDNSResponder-576.30.4.tar.gz";
@@ -546,11 +546,11 @@
     md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz";
   }
   {
-    name = "nss-3.22.2-with-nspr-4.12.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz";
-    sha256 = "7bc7e5483fc90071be5facd3043f94c69b153055a369c8f0b751ad374c5ae09e";
-    md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7";
-    md5name = "6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz";
+    name = "nss-3.27-with-nspr-4.13.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/0e3eee39402386cf16fd7aaa7399ebef-nss-3.27-with-nspr-4.13.tar.gz";
+    sha256 = "c74ad468ed5da0304b58ec56fa627fa388b256451b1a44fd184145c6d8203820";
+    md5 = "0e3eee39402386cf16fd7aaa7399ebef";
+    md5name = "0e3eee39402386cf16fd7aaa7399ebef-nss-3.27-with-nspr-4.13.tar.gz";
   }
   {
     name = "libodfgen-0.1.6.tar.bz2";

From 352e167c224e5d98076ca9653d2124c351d969d1 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 25 Dec 2016 10:11:06 +0000
Subject: [PATCH 0163/1310] exim: 4.87 -> 4.88 for CVE-2016-9963

---
 pkgs/servers/mail/exim/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 0918e308d26..68e3ad4ca42 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -1,11 +1,11 @@
 { coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "exim-4.87";
+  name = "exim-4.88";
 
   src = fetchurl {
-    url = "http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/${name}.tar.bz2";
-    sha256 = "1jbxn13shq90kpn0s73qpjnx5xm8jrpwhcwwgqw5s6sdzw6iwsbl";
+    url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.bz2";
+    sha256 = "0bca3wb45hl7h8m8bpvsmrmqa07jhbhqyigs9pl29hhzwgbmz78i";
   };
 
   buildInputs = [ coreutils db openssl pcre perl pkgconfig ];

From bec479482014ad62df6ce6a2a8c3f7517db22647 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 11:11:45 +0100
Subject: [PATCH 0164/1310] pythonPackages.u-msgpack-python: init at 2.3.0

---
 .../u-msgpack-python/default.nix              | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/u-msgpack-python/default.nix

diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix
new file mode 100644
index 00000000000..1daf30d883a
--- /dev/null
+++ b/pkgs/development/python-modules/u-msgpack-python/default.nix
@@ -0,0 +1,32 @@
+{ buildPythonPackage
+, lib
+, fetchurl
+, glibcLocales
+}:
+
+let
+  pname = "u-msgpack-python";
+  version = "2.3.0";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "d8df6bb0e2a838aa227c39cfd14aa147ab32b3df6871001874e9b9da9ce1760c";
+  };
+
+  LC_ALL="en_US.UTF-8";
+
+  buildInputs = [ glibcLocales ];
+
+  checkPhase = ''
+    python -m unittest discover
+  '';
+
+  meta = {
+    description = "A portable, lightweight MessagePack serializer and deserializer written in pure Python";
+    homepage = https://github.com/vsergeev/u-msgpack-python;
+    license = lib.licenses.mit;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d83bd7b867e..45fa07f619f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25867,6 +25867,8 @@ in {
     };
   };
 
+  u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { };
+
   umalqurra = buildPythonPackage rec {
     name = "umalqurra-${version}";
     version = "0.2";

From c1dd42e7d64dc86b96df4aeafbc944f322cf8121 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 11:12:04 +0100
Subject: [PATCH 0165/1310] pythonPackages.webencodings: init at 0.5

---
 .../python-modules/webencodings/default.nix   | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/webencodings/default.nix

diff --git a/pkgs/development/python-modules/webencodings/default.nix b/pkgs/development/python-modules/webencodings/default.nix
new file mode 100644
index 00000000000..54f3517ca00
--- /dev/null
+++ b/pkgs/development/python-modules/webencodings/default.nix
@@ -0,0 +1,29 @@
+{ buildPythonPackage
+, lib
+, fetchurl
+, pytest
+}:
+
+let
+  pname = "webencodings";
+  version = "0.5";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "a5c55ee93b24e740fe951c37b5c228dccc1f171450e188555a775261cce1b904";
+  };
+
+  buildInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test webencodings/tests.py
+  '';
+
+  meta = {
+    description = "Character encoding aliases for legacy web content";
+    homepage = https://github.com/SimonSapin/python-webencodings;
+    license = lib.licenses.bsd3;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 45fa07f619f..47955ae0e57 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26423,6 +26423,8 @@ EOF
     };
   };
 
+  webencodings = callPackage ../development/python-modules/webencodings { };
+
   websockets = callPackage ../development/python-modules/websockets { };
 
   wand = buildPythonPackage rec {

From 9f5e022663ebeb11b0e1300dfcc3fbd492c8e72b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 11:12:19 +0100
Subject: [PATCH 0166/1310] pythonPackages.pytest_expect: init at 1.1.0

---
 .../python-modules/pytest-expect/default.nix  | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-expect/default.nix

diff --git a/pkgs/development/python-modules/pytest-expect/default.nix b/pkgs/development/python-modules/pytest-expect/default.nix
new file mode 100644
index 00000000000..5abfd9423ac
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-expect/default.nix
@@ -0,0 +1,31 @@
+{ buildPythonPackage
+, lib
+, fetchurl
+, pytest
+, u-msgpack-python
+, six
+}:
+
+let
+  pname = "pytest-expect";
+  version = "1.1.0";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "36b4462704450798197d090809a05f4e13649d9cba9acdc557ce9517da1fd847";
+  };
+
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [ u-msgpack-python six ];
+
+  # Tests in neither the archive nor the repo
+  doCheck = false;
+
+  meta = {
+    description = "py.test plugin to store test expectations and mark tests based on them";
+    homepage = https://github.com/gsnedders/pytest-expect;
+    license = lib.licenses.mit;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 47955ae0e57..0105be4d972 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5247,6 +5247,8 @@ in {
     };
   });
 
+  pytest-expect = callPackage ../development/python-modules/pytest-expect { };
+
   pytest-virtualenv = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "pytest-virtualenv";

From 849f2d9e11541c7c580a03761bc8ef1f2c241c89 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 11:12:37 +0100
Subject: [PATCH 0167/1310] pythonPackages.html5lib: fix missing buildInputs
 and tests

---
 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 0105be4d972..1910e5f8bfa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12514,12 +12514,14 @@ in {
       sha256 = "09j6194f5mlnd5xwbavwvnndwl1x91jw74shxl6hcxjp4fxg3h05";
     };
 
-    buildInputs = with self; [ nose flake8 ];
+    buildInputs = with self; [ flake8 pytest pytest-expect mock ];
     propagatedBuildInputs = with self; [
-      six
+      six webencodings
     ] ++ optionals isPy26 [ ordereddict ];
 
-    checkPhase = "nosetests";
+    checkPhase = ''
+      py.test
+    '';
 
     meta = {
       homepage = https://github.com/html5lib/html5lib-python;

From 4383aa26f21a7bc344a4f08dcc987e96b8f86cde Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sat, 24 Dec 2016 10:45:27 -0400
Subject: [PATCH 0168/1310] ats2 : advance to latest version 0.2.13

---
 pkgs/development/compilers/ats2/default.nix   |  8 +-
 .../installed-lib-directory-version.patch     | 99 -------------------
 2 files changed, 3 insertions(+), 104 deletions(-)
 delete mode 100644 pkgs/development/compilers/ats2/installed-lib-directory-version.patch

diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 97e95b29814..59ce006e835 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.12" ;
+  versionPkg = "0.2.13" ;
 
   contrib = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
-    sha256 = "16jzabmwq5yz72dzlkc2hmvf2lan83gayn21gbl65jgpwdsbh170" ;
+    sha256 = "1hsqvdwiydks46sfjmm04rmjcx5v25xpjgnq0b96psrdbd0ky2kf" ;
   };
 
   postInstallContrib = stdenv.lib.optionalString withContrib
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "0m8gmm1pnklixxw76yjjqqqixm2cyp91rnq4sj1k29qp4k9zxpl4";
+    sha256 = "01rkybkwgbpx6blv72n46ml9ii3p6kpxbpczsrpbjkqmf22b4vii";
   };
 
   buildInputs = [ gmp ];
@@ -45,8 +45,6 @@ stdenv.mkDerivation rec {
       builtins.toFile "setupHook.sh"
       (concatMapStringsSep "\n" builtins.readFile hookFiles);
 
-  patches = [ ./installed-lib-directory-version.patch ];
-
   postInstall = postInstallContrib + postInstallEmacs;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/ats2/installed-lib-directory-version.patch b/pkgs/development/compilers/ats2/installed-lib-directory-version.patch
deleted file mode 100644
index 686df69299f..00000000000
--- a/pkgs/development/compilers/ats2/installed-lib-directory-version.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Change the name of the library directory to match the version of the package.
-
-diff -Naur ATS2-Postiats-0.2.12/configure postiats-new/configure
---- ATS2-Postiats-0.2.12/configure	2016-10-13 12:03:20.000000000 -0400
-+++ postiats-new/configure	2016-10-23 20:17:29.912579618 -0400
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.10.
-+# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.12.
- #
- # Report bugs to <gmpostiats@gmail.com>.
- #
-@@ -580,8 +580,8 @@
- # Identity of this package.
- PACKAGE_NAME='ATS2/Postiats'
- PACKAGE_TARNAME='ats2-postiats'
--PACKAGE_VERSION='0.2.10'
--PACKAGE_STRING='ATS2/Postiats 0.2.10'
-+PACKAGE_VERSION='0.2.12'
-+PACKAGE_STRING='ATS2/Postiats 0.2.12'
- PACKAGE_BUGREPORT='gmpostiats@gmail.com'
- PACKAGE_URL=''
- 
-@@ -1242,7 +1242,7 @@
-   # Omit some internal or obsolete options to make the list less imposing.
-   # This message is too long to be a string in the A/UX 3.1 sh.
-   cat <<_ACEOF
--\`configure' configures ATS2/Postiats 0.2.10 to adapt to many kinds of systems.
-+\`configure' configures ATS2/Postiats 0.2.12 to adapt to many kinds of systems.
- 
- Usage: $0 [OPTION]... [VAR=VALUE]...
- 
-@@ -1304,7 +1304,7 @@
- 
- if test -n "$ac_init_help"; then
-   case $ac_init_help in
--     short | recursive ) echo "Configuration of ATS2/Postiats 0.2.10:";;
-+     short | recursive ) echo "Configuration of ATS2/Postiats 0.2.12:";;
-    esac
-   cat <<\_ACEOF
- 
-@@ -1384,7 +1384,7 @@
- test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
-   cat <<\_ACEOF
--ATS2/Postiats configure 0.2.10
-+ATS2/Postiats configure 0.2.12
- generated by GNU Autoconf 2.69
- 
- Copyright (C) 2012 Free Software Foundation, Inc.
-@@ -1936,7 +1936,7 @@
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
--It was created by ATS2/Postiats $as_me 0.2.10, which was
-+It was created by ATS2/Postiats $as_me 0.2.12, which was
- generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   $ $0 $@
-@@ -4226,7 +4226,7 @@
- # report actual input values of CONFIG_FILES etc. instead of their
- # values after options handling.
- ac_log="
--This file was extended by ATS2/Postiats $as_me 0.2.10, which was
-+This file was extended by ATS2/Postiats $as_me 0.2.12, which was
- generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-@@ -4288,7 +4288,7 @@
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
--ATS2/Postiats config.status 0.2.10
-+ATS2/Postiats config.status 0.2.12
- configured by $0, generated by GNU Autoconf 2.69,
-   with options \\"\$ac_cs_config\\"
- 
-diff -Naur ATS2-Postiats-0.2.12/src/CBOOT/config.h postiats-new/src/CBOOT/config.h
---- ATS2-Postiats-0.2.12/src/CBOOT/config.h	2016-10-13 12:03:20.000000000 -0400
-+++ postiats-new/src/CBOOT/config.h	2016-10-23 20:16:34.613836556 -0400
-@@ -44,7 +44,7 @@
- #define PACKAGE_NAME "ATS2/Postiats"
- 
- /* Define to the full name and version of this package. */
--#define PACKAGE_STRING "ATS2/Postiats 0.2.10"
-+#define PACKAGE_STRING "ATS2/Postiats 0.2.12"
- 
- /* Define to the one symbol short name of this package. */
- #define PACKAGE_TARNAME "ats2-postiats"
-@@ -53,7 +53,7 @@
- #define PACKAGE_URL ""
- 
- /* Define to the version of this package. */
--#define PACKAGE_VERSION "0.2.10"
-+#define PACKAGE_VERSION "0.2.12"
- 
- /* The size of `void*', as computed by sizeof. */
- #define SIZEOF_VOIDP 8

From f3287b0aa53e9ff4ec61b3d8d5ed52f193540506 Mon Sep 17 00:00:00 2001
From: taku0 <taku0@users.noreply.github.com>
Date: Sun, 25 Dec 2016 20:32:24 +0900
Subject: [PATCH 0169/1310] flashplayer: 11.2.202.644 -> 24.0.0.186 [Critical
 security fix] (#21337)

* flashplayer: 11.2.202.644 -> 24.0.0.186

* flashplayer: add debug version

* flashplayer-standalone: 11.2.202.644 -> 24.0.0.186
---
 .../mozilla-plugins/flashplayer/default.nix   | 146 ++++++++++++++++++
 .../flashplayer/standalone.nix                | 110 +++++++++++++
 pkgs/top-level/all-packages.nix               |  12 +-
 3 files changed, 264 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
 create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
new file mode 100644
index 00000000000..d199ea3ece3
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -0,0 +1,146 @@
+{ stdenv
+, lib
+, fetchurl
+, alsaLib
+, atk
+, bzip2
+, cairo
+, curl
+, expat
+, fontconfig
+, freetype
+, gdk_pixbuf
+, glib
+, glibc
+, graphite2
+, gtk2
+, harfbuzz
+, libICE
+, libSM
+, libX11
+, libXau
+, libXcomposite
+, libXcursor
+, libXdamage
+, libXdmcp
+, libXext
+, libXfixes
+, libXi
+, libXinerama
+, libXrandr
+, libXrender
+, libXt
+, libXxf86vm
+, libdrm
+, libffi
+, libpng
+, libvdpau
+, libxcb
+, libxshmfence
+, nspr
+, nss
+, pango
+, pcre
+, pixman
+, zlib
+, unzip
+, debug ? false
+
+/* you have to add ~/mm.cfg :
+
+    TraceOutputFileEnable=1
+    ErrorReportingEnable=1
+    MaxWarnings=1
+
+  in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt
+  Then FlashBug (a FireFox plugin) shows the log as well
+*/
+
+}:
+
+let
+  arch =
+    if      stdenv.system == "x86_64-linux" then
+      "x86_64"
+    else if stdenv.system == "i686-linux"   then
+      "i386"
+    else throw "Flash Player is not supported on this platform";
+  lib_suffix =
+      if stdenv.system == "x86_64-linux" then
+      "64"
+    else
+      "";
+in
+stdenv.mkDerivation rec {
+  name = "flashplayer-${version}";
+  version = "24.0.0.186";
+
+  src = fetchurl {
+    url =
+      if debug then
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_npapi_linux_debug.${arch}.tar.gz"
+      else
+        "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
+    sha256 =
+      if debug then
+        if arch == "x86_64" then
+          "0i7c861n42vb2zd9hnp26lxjakkv0fxp53smcwzc9xhdbjr14ail"
+        else
+          "0gj59iinh8gbjm5bn24qi3niyvi8x6byyc1sa6qvqkvjwh1ckdi3"
+      else
+        if arch == "x86_64" then
+          "0qs6hx31p1q2zqsr8jcf7niwsp6nncpqs3igb6l9f9fi0a8va8f7"
+        else
+          "1zcinq7629bgbashx25krby8r91sag2v8382q620951iiww06n1v";
+  };
+
+  nativeBuildInputs = [ unzip ];
+
+  sourceRoot = ".";
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  preferLocalBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/lib/mozilla/plugins
+    cp -pv libflashplayer.so $out/lib/mozilla/plugins
+
+    mkdir -p $out/bin
+    cp -pv usr/bin/flash-player-properties $out/bin
+
+    mkdir -p $out/lib${lib_suffix}/kde4
+    cp -pv usr/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so $out/lib${lib_suffix}/kde4
+
+    patchelf --set-rpath "$rpath" \
+      $out/lib/mozilla/plugins/libflashplayer.so \
+      $out/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so
+
+    patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      --set-rpath "$rpath" \
+      $out/bin/flash-player-properties
+  '';
+
+  passthru = {
+    mozillaPlugin = "/lib/mozilla/plugins";
+  };
+
+  rpath = lib.makeLibraryPath
+    [ stdenv.cc.cc
+      alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk_pixbuf glib
+      glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite
+      libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama
+      libXrandr libXrender libXt libXxf86vm libdrm libffi libpng libvdpau
+      libxcb libxshmfence nspr nss pango pcre pixman zlib
+    ];
+
+  meta = {
+    description = "Adobe Flash Player browser plugin";
+    homepage = http://www.adobe.com/products/flashplayer/;
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [];
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
new file mode 100644
index 00000000000..c9de87f1b25
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -0,0 +1,110 @@
+{ stdenv
+, lib
+, fetchurl
+, alsaLib
+, atk
+, bzip2
+, cairo
+, curl
+, expat
+, fontconfig
+, freetype
+, gdk_pixbuf
+, glib
+, glibc
+, graphite2
+, gtk2
+, harfbuzz
+, libICE
+, libSM
+, libX11
+, libXau
+, libXcomposite
+, libXcursor
+, libXdamage
+, libXdmcp
+, libXext
+, libXfixes
+, libXi
+, libXinerama
+, libXrandr
+, libXrender
+, libXt
+, libXxf86vm
+, libdrm
+, libffi
+, libpng
+, libvdpau
+, libxcb
+, libxshmfence
+, nspr
+, nss
+, pango
+, pcre
+, pixman
+, zlib
+, unzip
+, debug ? false
+}:
+
+let
+  arch =
+    if      stdenv.system == "x86_64-linux" then
+      "x86_64"
+    else if stdenv.system == "i686-linux"   then
+      "i386"
+    else throw "Flash Player is not supported on this platform";
+in
+stdenv.mkDerivation rec {
+  name = "flashplayer-standalone-${version}";
+  version = "24.0.0.186";
+
+  src = fetchurl {
+    url =
+      if debug then
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux_debug.x86_64.tar.gz"
+      else
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux.x86_64.tar.gz";
+    sha256 =
+      if debug then
+        "09653jphzijk3w3dcd05f4pya1ciaymna31qqrmcwhxa0ginxhz2"
+      else
+        "0q0wc2lgjzi1v4lpcr5x5nszigli3vsryfq2zk4qq4pqy3i6aq7q";
+  };
+
+  nativeBuildInputs = [ unzip ];
+
+  sourceRoot = ".";
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  preferLocalBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -pv flashplayer${lib.optionalString debug "debugger"} $out/bin
+
+    patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      --set-rpath "$rpath" \
+      $out/bin/flashplayer${lib.optionalString debug "debugger"}
+  '';
+
+  rpath = lib.makeLibraryPath
+    [ stdenv.cc.cc
+      alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk_pixbuf glib
+      glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite
+      libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama
+      libXrandr libXrender libXt libXxf86vm libdrm libffi libpng libvdpau
+      libxcb libxshmfence nspr nss pango pcre pixman zlib
+    ];
+
+  meta = {
+    description = "Adobe Flash Player standalone executable";
+    homepage = https://www.adobe.com/support/flashplayer/debug_downloads.html;
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c204a37c839..3739c89f651 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13151,13 +13151,17 @@ in
 
   flac = callPackage ../applications/audio/flac { };
 
-  flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
-    debug = config.flashplayer.debug or false;
+  flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer {
+      debug = config.flashplayer.debug or false;
   };
 
-  flashplayer-standalone = pkgsi686Linux.flashplayer.sa;
+  flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix {
+      debug = config.flashplayer.debug or false;
+  };
 
-  flashplayer-standalone-debugger = (pkgsi686Linux.flashplayer.override { debug = true; }).sa;
+  flashplayer-standalone-debugger = flashplayer-standalone.override {
+      debug = true;
+  };
 
   fluxbox = callPackage ../applications/window-managers/fluxbox { };
 

From a623ada9121c73833ef8dabeeb2e616a585d1b96 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 25 Dec 2016 11:33:16 +0000
Subject: [PATCH 0170/1310] flashplayer: removed obsolete files

---
 .../flashplayer-11/default.nix                | 134 ------------------
 1 file changed, 134 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
deleted file mode 100644
index 17168241ed9..00000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ /dev/null
@@ -1,134 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, zlib
-, alsaLib
-, curl
-, nspr
-, fontconfig
-, freetype
-, expat
-, libX11
-, libXext
-, libXrender
-, libXcursor
-, libXt
-, libvdpau
-, gtk2
-, glib
-, pango
-, cairo
-, atk
-, gdk_pixbuf
-, nss
-, unzip
-, debug ? false
-
-/* you have to add ~/mm.cfg :
-
-    TraceOutputFileEnable=1
-    ErrorReportingEnable=1
-    MaxWarnings=1
-
-  in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt
-  Then FlashBug (a FireFox plugin) shows the log as well
-*/
-
-}:
-
-/* When updating this package, test that the following derivations build:
-
-   * flashplayer
-   * flashplayer-standalone
-   * flashplayer-standalone-debugger
-*/
-
-let
-  arch =
-    if      stdenv.system == "x86_64-linux" then
-      if    debug then throw "no x86_64 debugging version available"
-      else  "64bit"
-    else if stdenv.system == "i686-linux"   then
-      if    debug then "32bit_debug"
-      else             "32bit"
-    else throw "Flash Player is not supported on this platform";
-
-  suffix =
-    if      stdenv.system == "x86_64-linux" then
-      if    debug then throw "no x86_64 debugging version available"
-      else             "_linux.x86_64"
-    else if stdenv.system == "i686-linux"   then
-      if    debug then "_linux_debug.i386"
-      else             "_linux.i386"
-    else throw "Flash Player is not supported on this platform";
-
-  saname =
-    if debug then "flashplayerdebugger"
-    else          "flashplayer";
-
-  is-i686 = (stdenv.system == "i686-linux");
-in
-stdenv.mkDerivation rec {
-  name = "flashplayer-${version}";
-  version = "11.2.202.644";
-
-  src = fetchurl {
-    url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip";
-    sha256 = "0hf0hwg4kvz99g9d2arg5dwm3nx0hjnpngz9ay1mihhgjksy585b";
-  };
-
-  nativeBuildInputs = [ unzip ];
-
-  sourceRoot = ".";
-
-  postUnpack = ''
-    cd *${arch}
-
-    tar -xvzf *${suffix}.tar.gz
-
-    ${lib.optionalString is-i686 ''
-       tar -xvzf *_sa[_.]*.tar.gz
-    ''}
-  '';
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  preferLocalBuild = true;
-
-  outputs = [ "out" ] ++ lib.optional is-i686 "sa";
-
-  installPhase = ''
-    mkdir -p $out/lib/mozilla/plugins
-    cp -pv libflashplayer.so $out/lib/mozilla/plugins
-
-    patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
-
-    ${lib.optionalString is-i686 ''
-      install -Dm755 ${saname} $sa/bin/flashplayer
-
-      patchelf \
-        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        --set-rpath "$rpath" \
-        $sa/bin/flashplayer
-    ''}
-  '';
-
-  passthru = {
-    mozillaPlugin = "/lib/mozilla/plugins";
-  };
-
-  rpath = lib.makeLibraryPath
-    [ zlib alsaLib curl nspr fontconfig freetype expat libX11
-      libXext libXrender libXcursor libXt gtk2 glib pango atk cairo gdk_pixbuf
-      libvdpau nss
-    ];
-
-  meta = {
-    description = "Adobe Flash Player browser plugin";
-    homepage = http://www.adobe.com/products/flashplayer/;
-    license = stdenv.lib.licenses.unfree;
-    maintainers = [];
-    platforms = [ "x86_64-linux" "i686-linux" ];
-  };
-}

From 77d495b078e30807948e11a3ae3c42c992149025 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Sun, 25 Dec 2016 12:35:47 +0100
Subject: [PATCH 0171/1310] gitlab-runner: 1.8.0 -> 1.9.0 (#21375)

---
 .../continuous-integration/gitlab-runner/default.nix   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 2a546c8c907..1338201b996 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.8.0";
+  version = "1.9.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 = "0fa8hfdxg903n1dqrqbm4069sr8rq6zx7zzybfyj7qz4mmayp24m";
+    sha256 = "12hcpvc0j6g200qhz12gfsslngbqx4sifrikr05vh2av17hba25s";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "1rvvz34rsjxrgg59rda6v4k8zw16slwprnh4h5b16yhyp7lcx93q";
+    sha256 = "1hqwhg94g514g0ad4h0h7wh7k5clm9i7whzr6c30i8yb00ga628s";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-ci-multi-runner";
     rev = "v${version}";
-    sha256 = "0svmy2dc4h6jll80y8j2ml7k0a9krknsp9d0zpsfkw3wcz1wfipl";
+    sha256 = "1b30daxnpn1psy3vds1m4mnbl2hmvr2bc0zrd3nn9xm3xacm3dqj";
   };
 
   buildInputs = [ go-bindata ];
@@ -57,7 +57,7 @@ buildGoPackage rec {
   '';
 
   meta = with lib; {
-    description = "GitLab Runner the continous integration executor of GitLab";
+    description = "GitLab Runner the continuous integration executor of GitLab";
     license = licenses.mit;
     homepage = "https://about.gitlab.com/gitlab-ci/";
     platforms = platforms.unix;

From 7cd5ef772b891668e220561ff0e00088ae235cd0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Dec 2016 12:47:09 +0100
Subject: [PATCH 0172/1310] rocksdb-haskell: enable Hydra builds on Darwin

https://github.com/NixOS/cabal2nix/commit/ac3ba017bd4407bdc1e5d4565d8f9c5c9db5eff0
tells the automatic re-generation process to do the same thing in the next update.

Required by https://github.com/NixOS/nixpkgs/issues/21215.
---
 pkgs/development/haskell-modules/hackage-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7784f79b830..8b917a56a90 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -149841,7 +149841,6 @@ self: {
        homepage = "http://github.com/agrafix/rocksdb-haskell";
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-linux" ];
      }) {inherit (pkgs) rocksdb;};
 
   "roguestar" = callPackage

From b20fdff5214e760205f7fccbce6848c545f12b0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 23 Dec 2016 17:42:05 +0100
Subject: [PATCH 0173/1310] nixos/prometheus: make
 scrapeConfigs.*.static_configs.*.labels optional

...by providing a default value of "no labels" (an empty attrset).

Without this change we get

  $ nixos-rebuild test -I nixpkgs=.
  building Nix...
  building the system configuration...
  error: The option `services.prometheus.scrapeConfigs.[definition 1-entry 1].static_configs.[definition 1-entry 1].labels' is used but not defined.

which is unneeded, because labels _are_ optional.
---
 nixos/modules/services/monitoring/prometheus/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index d692dd5fc79..a07445ce167 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -191,6 +191,7 @@ let
       };
       labels = mkOption {
         type = types.attrsOf types.str;
+        default = {};
         description = ''
           Labels assigned to all metrics scraped from the targets.
         '';

From 426b2ed9c8233356695d27398bd2d19f6b2eacf7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 16:17:33 +0100
Subject: [PATCH 0174/1310] pythonPackages.u-msgpack-python: use
 python.interpreter

---
 pkgs/development/python-modules/u-msgpack-python/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix
index 1daf30d883a..34d88d74c55 100644
--- a/pkgs/development/python-modules/u-msgpack-python/default.nix
+++ b/pkgs/development/python-modules/u-msgpack-python/default.nix
@@ -2,6 +2,7 @@
 , lib
 , fetchurl
 , glibcLocales
+, python
 }:
 
 let
@@ -20,7 +21,7 @@ in buildPythonPackage rec {
   buildInputs = [ glibcLocales ];
 
   checkPhase = ''
-    python -m unittest discover
+    ${python.interpreter} -m unittest discover
   '';
 
   meta = {
@@ -29,4 +30,4 @@ in buildPythonPackage rec {
     license = lib.licenses.mit;
   };
 
-}
\ No newline at end of file
+}

From 63b0c9d5eacd3fc0e550327cd4c52ed6284c7119 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 16:36:12 +0100
Subject: [PATCH 0175/1310] pythonPackages.txaio: 2.5.1 -> 2.5.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 1910e5f8bfa..de5a4a91a32 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31379,7 +31379,7 @@ EOF
   txaio = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "txaio";
-    version = "2.5.1";
+    version = "2.5.2";
 
     meta = {
       description = "Utilities to support code that runs unmodified on Twisted and asyncio.";
@@ -31398,7 +31398,7 @@ EOF
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/t/${pname}/${name}.tar.gz";
-      sha256 = "1pni1m66mlmbybmaf3py4h7cpkmkssqb5l3rigkxvql2f53pcl32";
+      sha256 = "321d441b336447b72dbe81a4d73470414454baf0543ec701fcfecbf4dcbda0fe";
     };
   };
 

From 8916131012fd7f9931f61b0d6b348e1d2b23e259 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 16:37:51 +0100
Subject: [PATCH 0176/1310] pythonPackages.xlwt: fix patch hash

---
 pkgs/development/python-modules/xlwt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix
index ffcdd5ee626..01f920a387a 100644
--- a/pkgs/development/python-modules/xlwt/default.nix
+++ b/pkgs/development/python-modules/xlwt/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   patches = [
     (fetchpatch {
       url = "https://github.com/python-excel/xlwt/commit/86564ef26341020316cd8a27c704ef1dc5a6129b.patch";
-      sha256 = "01abxfkmckcxpi6n5wi8ia58fmkzqrxjfjq1mjljygylm8nb3m8i";
+      sha256 = "0ifavfld3rrqjb0iyriy4c0drw31gszvlg3nmnn9dmfsh91vxhs6";
     })
   ];
 

From 2469d0bd28ee98742efcc8407876c4d3c0123260 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 16:42:49 +0100
Subject: [PATCH 0177/1310] pythonPackages.buttersink: only with python 2.x

---
 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 de5a4a91a32..0f7c4c44ff1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2229,6 +2229,9 @@ in {
       url = "mirror://pypi/b/buttersink/${name}.tar.gz";
     };
 
+    # Python 2 syntax
+    disabled = isPy3k;
+
     meta = {
       description = "Synchronise btrfs snapshots";
       longDescription = ''

From f2df4cef5cd673b578eceed1ec4d848c5f13509d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 16:48:14 +0100
Subject: [PATCH 0178/1310] pythonPackages.xgboost: only with Python 3.x

---
 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 0f7c4c44ff1..9af257a0088 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30140,6 +30140,9 @@ EOF
     propagatedBuildInputs = with self; [ scipy ];
     buildInputs = with self; [ nose ];
 
+    # Cannot be installed with Python 2.x, most likely due to the patch below.
+    disabled = !isPy3k;
+
     postPatch = ''
       cd python-package
 

From 277080fea0d2cf5017e4179a23e370307502c677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 25 Dec 2016 17:25:18 +0100
Subject: [PATCH 0179/1310] openssh: security 7.3p1 -> 7.4p1

The two removed patches were for issues that should've been fixed.
Minor vulnerabilities addressed: CVE-2016-{10009,10010,10011,10012}.
https://www.openssh.com/txt/release-7.4
---
 ...H-1380296-NEWKEYS-null-pointer-deref.patch | 37 -------------------
 pkgs/tools/networking/openssh/default.nix     |  6 +--
 .../openssh/fix-CVE-2016-8858.patch           | 11 ------
 3 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
 delete mode 100644 pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch

diff --git a/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch b/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
deleted file mode 100644
index 665eff86453..00000000000
--- a/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/kex.c b/kex.c
-index 50c7a0f..823668b 100644
---- a/kex.c
-+++ b/kex.c
-@@ -419,6 +419,8 @@ kex_input_newkeys(int type, u_int32_t seq, void *ctxt)
- 	ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error);
- 	if ((r = sshpkt_get_end(ssh)) != 0)
- 		return r;
-+        if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0)
-+          return r;
- 	kex->done = 1;
- 	sshbuf_reset(kex->peer);
- 	/* sshbuf_reset(kex->my); */
-diff --git a/packet.c b/packet.c
-index d6dad2d..f96566b 100644
---- a/packet.c
-+++ b/packet.c
-@@ -38,7 +38,7 @@
-  */
- 
- #include "includes.h"
-- 
-+
- #include <sys/param.h>	/* MIN roundup */
- #include <sys/types.h>
- #include "openbsd-compat/sys-queue.h"
-@@ -1907,9 +1907,7 @@ ssh_packet_read_poll2(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
- 			return r;
- 		return SSH_ERR_PROTOCOL_ERROR;
- 	}
--	if (*typep == SSH2_MSG_NEWKEYS)
--		r = ssh_set_newkeys(ssh, MODE_IN);
--	else if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
-+	if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
- 		r = ssh_packet_enable_delayed_compress(ssh);
- 	else
- 		r = 0;
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 064f68947b8..ce323bae4e7 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
   # Please ensure that openssh_with_kerberos still builds when
   # bumping the version here!
   name = "openssh-${version}";
-  version = "7.3p1";
+  version = "7.4p1";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1k5y1wi29d47cgizbryxrhc1fbjsba2x8l5mqfa9b9nadnd9iyrz";
+    sha256 = "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv";
   };
 
   prePatch = optionalString hpnSupport
@@ -44,13 +44,11 @@ stdenv.mkDerivation rec {
 
   patches =
     [
-      ./RH-1380296-NEWKEYS-null-pointer-deref.patch
       ./locale_archive.patch
       ./fix-host-key-algorithms-plus.patch
 
       # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
       ./dont_create_privsep_path.patch
-      ./fix-CVE-2016-8858.patch
     ]
     ++ optional withGssapiPatches gssapiSrc;
 
diff --git a/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch b/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch
deleted file mode 100644
index e526161083c..00000000000
--- a/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r1.126 -r1.127
---- ssh/kex.c	2016/09/28 21:44:52	1.126
-+++ ssh/kex.c	2016/10/10 19:28:48	1.127
-@@ -461,6 +461,7 @@
- 	if (kex == NULL)
- 		return SSH_ERR_INVALID_ARGUMENT;
- 
-+	ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
- 	ptr = sshpkt_ptr(ssh, &dlen);
- 	if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
- 		return r;

From 683f25522dea2e0a3667f344657fa604c46a05e9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 18:54:27 +0100
Subject: [PATCH 0180/1310] pythonPackages.datrie: add missing dependencies

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9af257a0088..ef173c6b111 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5457,6 +5457,8 @@ in {
       url = "mirror://pypi/d/datrie/datrie-${version}.tar.gz";
       sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs";
     };
+
+    buildInputs = with self; [ pytest pytestrunner hypothesis ];
     meta = {
       description = "Super-fast, efficiently stored Trie for Python";
       homepage = "https://github.com/kmike/datrie";

From 6cf9b1c970c84590175c9a27e6f67c3b5c4e7106 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 18:58:11 +0100
Subject: [PATCH 0181/1310] pythonPackages.magic: broken

---
 pkgs/top-level/python-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ef173c6b111..25da69df726 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14064,6 +14064,7 @@ in {
     meta = {
       description = "A Python wrapper around libmagic";
       homepage = http://www.darwinsys.com/file/;
+      broken = true;
     };
   };
 

From c9e642c549f9569c08e0f5dffb8c0c11ff343a6f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 19:03:03 +0100
Subject: [PATCH 0182/1310] pythonPackages.zipfile36: disable on python 2.x

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25da69df726..86e72ed5cca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31690,6 +31690,10 @@ EOF
       ${python.interpreter} -m unittest test_zipfile.py
     '';
 
+    # Only works with Python 3.x.
+    # Not supposed to be used with 3.6 and up.
+    disabled = !(isPy3k && (pythonOlder "3.6"));
+
     meta = {
       description = "Read and write ZIP files - backport of the zipfile module from Python 3.6";
       homepage = https://gitlab.com/takluyver/zipfile36;

From 925c59745766c598de32e236a57b93f75fe18223 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Dec 2016 19:20:34 +0100
Subject: [PATCH 0183/1310] pythonPackages.mwclient: 0.8.1 -> 0.8.3

and fix tests.

cc @DamienCassou
---
 pkgs/top-level/python-packages.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86e72ed5cca..7ca61ccbf4d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15084,18 +15084,20 @@ in {
   };
 
   mwclient = buildPythonPackage rec {
-    version = "0.8.1";
-    basename = "mwclient";
-    name = "${basename}-${version}";
+    version = "0.8.3";
+    pname = "mwclient";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/${basename}/${name}.tar.gz";
-      sha256 = "1r322v6i6xps9xh861rbr4ggshydcgp8cycbdlmgy8qbrh8jg2az";
+    src = pkgs.fetchFromGitHub {
+      owner = "mwclient";
+      repo = "mwclient";
+      rev = "v${version}";
+      sha256 = "0kl1yp9z5f1wl6lkm0vix87zkrbl9wcmkrrj1x5c35xvf95laf53";
     };
 
     buildInputs = with self; [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ];
 
-    propagatedBuildInputs = with self; [ six requests2 ];
+    propagatedBuildInputs = with self; [ six requests2 requests_oauthlib ];
 
     checkPhase = ''
       py.test
@@ -15105,6 +15107,7 @@ in {
       description = "Python client library to the MediaWiki API";
       maintainers = with maintainers; [ DamienCassou ];
       license = licenses.mit;
+      homepage = https://github.com/mwclient/mwclient;
     };
   };
 

From 7b2a37f5c8fab26c23907072fe44ac41e2317fc3 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Sun, 25 Dec 2016 11:04:47 -0800
Subject: [PATCH 0184/1310] remmina: add icon packages as soft deps (#21411)

---
 pkgs/applications/networking/remote/remmina/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 2b157604f48..fe097af9c75 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -4,7 +4,10 @@
 , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
 , libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core
-, openssl }:
+, openssl
+# The themes here are soft dependencies; only icons are missing without them.
+, hicolor_icon_theme, adwaita-icon-theme
+}:
 
 let
   version = "1.2.0-rcgit.15";
@@ -51,7 +54,7 @@ stdenv.mkDerivation {
                   pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
                   libvncserver libpthreadstubs libXdmcp libxkbcommon
                   libsecret spice_protocol spice_gtk epoxy at_spi2_core
-                  openssl ];
+                  openssl hicolor_icon_theme adwaita-icon-theme ];
 
   cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3739c89f651..e7b135e2911 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3543,7 +3543,7 @@ in
 
   remind = callPackage ../tools/misc/remind { };
 
-  remmina = callPackage ../applications/networking/remote/remmina {};
+  remmina = callPackage ../applications/networking/remote/remmina { adwaita-icon-theme = gnome3.adwaita-icon-theme; };
 
   renameutils = callPackage ../tools/misc/renameutils { };
 

From f49a23c28e8382d60136efeb3ef47844fe9da6fb Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Sun, 25 Dec 2016 20:43:46 +0100
Subject: [PATCH 0185/1310] os-prober: init at 1.65 (#21409)

* os-prober: init at 1.65

* os-prober: fix source url

* os-prober: use sha256 instead of md5
---
 pkgs/tools/misc/os-prober/default.nix | 77 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 +
 2 files changed, 79 insertions(+)
 create mode 100644 pkgs/tools/misc/os-prober/default.nix

diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
new file mode 100644
index 00000000000..8d2f15734c5
--- /dev/null
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -0,0 +1,77 @@
+{ stdenv, fetchurl, makeWrapper, 
+systemd, # udevadm
+busybox, 
+coreutils, # os-prober desn't seem to work with pure busybox
+devicemapper, # lvs
+# optional dependencies
+cryptsetup ? null,
+libuuid ? null, # blkid and blockdev
+dmraid ? null,
+ntfs3g ? null
+}:
+
+stdenv.mkDerivation rec {
+  version = "1.65";
+  name = "os-prober-${version}";
+  src = fetchurl {
+    url = "mirror://debian/pool/main/o/os-prober/os-prober_${version}.tar.xz";
+    sha256 = "c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84";
+  };
+
+  buildInputs = [ makeWrapper ];
+  installPhase = ''
+    # executables
+    mkdir -p $out/bin
+    mkdir -p $out/lib
+    mkdir -p $out/share
+    cp os-prober linux-boot-prober $out/bin
+    cp newns $out/lib
+    cp common.sh $out/share
+
+    # probes
+    case "${stdenv.system}" in
+        i686*|x86_64*) ARCH=x86;;
+        powerpc*) ARCH=powerpc;;
+        arm*) ARCH=arm;;
+        *) ARCH=other;;
+    esac;
+    for probes in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do
+      mkdir -p $out/lib/$probes;
+      cp $probes/common/* $out/lib/$probes;
+      if [ -e "$probes/$ARCH" ]; then
+        mkdir -p $out/lib/$probes
+        cp -r $probes/$ARCH/* $out/lib/$probes;
+      fi;
+    done
+    if [ $ARCH = "x86" ]; then
+        cp -r os-probes/mounted/powerpc/20macosx $out/lib/os-probes/mounted;
+    fi;
+  '';
+  postFixup = ''
+    for file in $(find $out  -type f ! -name newns) ; do
+      substituteInPlace $file \
+        --replace /usr/share/os-prober/ $out/share/ \
+        --replace /usr/lib/os-probes/ $out/lib/os-probes/ \
+        --replace /usr/lib/linux-boot-probes/ $out/lib/linux-boot-probes/ \
+        --replace /usr/lib/os-prober/ $out/lib/
+    done;
+    for file in $out/bin/*; do
+      wrapProgram $file \
+        --set LVM_SYSTEM_DIR ${devicemapper} \
+        --suffix PATH : "$out/bin${builtins.foldl' (x: y: x + ":" + y) "" (
+          map (x: (toString x) + "/bin") (
+            builtins.filter (x: x!=null)
+              [ devicemapper systemd coreutils cryptsetup libuuid dmraid ntfs3g busybox ]
+            )
+          )
+        }" \
+        --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober"
+    done;
+  '';
+
+  meta = {
+    description = "Utility to detect other OSs on a set of drives";
+    homepage = http://packages.debian.org/source/sid/os-prober;
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7b135e2911..95b8baf7be2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3133,6 +3133,8 @@ in
 
   olsrd = callPackage ../tools/networking/olsrd { };
 
+  os-prober = callPackage ../tools/misc/os-prober {};
+
   ossec = callPackage ../tools/security/ossec {};
 
   ostree = callPackage ../tools/misc/ostree { };

From 661b5a9875cbc37310da5ee53b47a1d121bb5660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 25 Dec 2016 22:14:24 +0100
Subject: [PATCH 0186/1310] Revert "openssh: security 7.3p1 -> 7.4p1"

This reverts commit 277080fea0d2cf5017e4179a23e370307502c677.

I had tested the server on my physical machine before pushing,
but the openssh test got broken so something is clearly wrong.
http://hydra.nixos.org/build/45500080
---
 ...H-1380296-NEWKEYS-null-pointer-deref.patch | 37 +++++++++++++++++++
 pkgs/tools/networking/openssh/default.nix     |  6 ++-
 .../openssh/fix-CVE-2016-8858.patch           | 11 ++++++
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
 create mode 100644 pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch

diff --git a/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch b/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
new file mode 100644
index 00000000000..665eff86453
--- /dev/null
+++ b/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
@@ -0,0 +1,37 @@
+diff --git a/kex.c b/kex.c
+index 50c7a0f..823668b 100644
+--- a/kex.c
++++ b/kex.c
+@@ -419,6 +419,8 @@ kex_input_newkeys(int type, u_int32_t seq, void *ctxt)
+ 	ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error);
+ 	if ((r = sshpkt_get_end(ssh)) != 0)
+ 		return r;
++        if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0)
++          return r;
+ 	kex->done = 1;
+ 	sshbuf_reset(kex->peer);
+ 	/* sshbuf_reset(kex->my); */
+diff --git a/packet.c b/packet.c
+index d6dad2d..f96566b 100644
+--- a/packet.c
++++ b/packet.c
+@@ -38,7 +38,7 @@
+  */
+ 
+ #include "includes.h"
+- 
++
+ #include <sys/param.h>	/* MIN roundup */
+ #include <sys/types.h>
+ #include "openbsd-compat/sys-queue.h"
+@@ -1907,9 +1907,7 @@ ssh_packet_read_poll2(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
+ 			return r;
+ 		return SSH_ERR_PROTOCOL_ERROR;
+ 	}
+-	if (*typep == SSH2_MSG_NEWKEYS)
+-		r = ssh_set_newkeys(ssh, MODE_IN);
+-	else if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
++	if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
+ 		r = ssh_packet_enable_delayed_compress(ssh);
+ 	else
+ 		r = 0;
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index ce323bae4e7..064f68947b8 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
   # Please ensure that openssh_with_kerberos still builds when
   # bumping the version here!
   name = "openssh-${version}";
-  version = "7.4p1";
+  version = "7.3p1";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv";
+    sha256 = "1k5y1wi29d47cgizbryxrhc1fbjsba2x8l5mqfa9b9nadnd9iyrz";
   };
 
   prePatch = optionalString hpnSupport
@@ -44,11 +44,13 @@ stdenv.mkDerivation rec {
 
   patches =
     [
+      ./RH-1380296-NEWKEYS-null-pointer-deref.patch
       ./locale_archive.patch
       ./fix-host-key-algorithms-plus.patch
 
       # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
       ./dont_create_privsep_path.patch
+      ./fix-CVE-2016-8858.patch
     ]
     ++ optional withGssapiPatches gssapiSrc;
 
diff --git a/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch b/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch
new file mode 100644
index 00000000000..e526161083c
--- /dev/null
+++ b/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch
@@ -0,0 +1,11 @@
+diff -u -r1.126 -r1.127
+--- ssh/kex.c	2016/09/28 21:44:52	1.126
++++ ssh/kex.c	2016/10/10 19:28:48	1.127
+@@ -461,6 +461,7 @@
+ 	if (kex == NULL)
+ 		return SSH_ERR_INVALID_ARGUMENT;
+ 
++	ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
+ 	ptr = sshpkt_ptr(ssh, &dlen);
+ 	if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
+ 		return r;

From 6b2ead98cb1570583aa07464ae9d8200321c3ca8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 25 Dec 2016 22:55:48 +0100
Subject: [PATCH 0187/1310] libwacom: 0.19 -> 0.22

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

diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index 0d757d33cf9..ad3cbe119c5 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libwacom-${version}";
-  version = "0.19";
+  version = "0.22";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2";
-    sha256 = "1zsmp2l53fbfy6jykh4c0i127baf503lq2fvd5y1066ihp6qh3b2";
+    sha256 = "1h10awwapj5v8nik220ga0raggv3lgaq0kzwlma2qjmzdhhrrhcp";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 2c616b04738da584d99b1db2832ed8a7a1d4bffc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 25 Dec 2016 22:56:13 +0100
Subject: [PATCH 0188/1310] xf86-input-wacom: 0.32.0 -> 0.34.0

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

diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index 3d3b52acf6f..b308a5ec3c3 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -3,11 +3,11 @@
 , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
 
 stdenv.mkDerivation rec {
-  name = "xf86-input-wacom-0.32.0";
+  name = "xf86-input-wacom-0.34.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
-    sha256 = "03c73vi5rrcr92442k82f4kbabp21yqcrqi6ak2afl41zjdar5wc";
+    sha256 = "0idhkigl0pnyp08sqm6bqfb4h20v6rjrb71z1gdv59gk7d7qwpgi";
   };
 
   buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender

From da70d3da0f11b22eac77756b39b349215e06b2e3 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 25 Dec 2016 01:11:07 +0000
Subject: [PATCH 0189/1310] SDL2: split derivation

---
 pkgs/development/libraries/SDL2/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 16aa4f6c2f7..f94d7051d0d 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
     sha256 = "0jqp46mxxbh9lhpx1ih6sp93k752j2smhpc0ad0q4cb3px0famfs";
   };
 
+  outputs = [ "out" "dev" ];
+
   patches = [ ./find-headers.patch ];
 
   nativeBuildInputs = [ pkgconfig ];
@@ -61,6 +63,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     rm $out/lib/*.a
+    moveToOutput bin/sdl2-config "$dev"
   '';
 
   setupHook = ./setup-hook.sh;

From 2da75adc5da93a40d16eadc7cf5f28a5a6d4419a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Dec 2016 08:49:34 +0100
Subject: [PATCH 0190/1310] pythonPackages.pygame-git: broken

---
 pkgs/development/python-modules/pygame/git.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pygame/git.nix b/pkgs/development/python-modules/pygame/git.nix
index 7f815454713..3140f93aeb4 100644
--- a/pkgs/development/python-modules/pygame/git.nix
+++ b/pkgs/development/python-modules/pygame/git.nix
@@ -41,5 +41,6 @@ buildPythonPackage rec {
     homepage = "http://www.pygame.org/";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
+    broken = true;
   };
 }

From b95b6315af695d07c04f801332eb3f3be9895731 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Dec 2016 08:54:18 +0100
Subject: [PATCH 0191/1310] pythonPackages.memory_profiler: 0.39 -> 0.41

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ca61ccbf4d..e0a86d4bc66 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14365,13 +14365,16 @@ in {
 
   memory_profiler = buildPythonPackage rec {
     name = "memory_profiler-${version}";
-    version = "0.39";
+    version = "0.41";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/m/memory_profiler/${name}.tar.gz";
-      sha256 = "61021f2dade7edd6cc09d7924bfdccc453bd1949608412a3e021d44a410d3a23";
+      sha256 = "dce6e931c281662a500b142595517d095267216472c2926e5ec8edab89898d10";
     };
 
+    # Tests don't import profile
+    doCheck = false;
+
     meta = {
       description = "A module for monitoring memory usage of a python program";
       homepage = http://pypi.python.org/pypi/memory_profiler;

From 762d847d47d5cd43a809ebc86d3b17555f873aa8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Dec 2016 08:57:53 +0100
Subject: [PATCH 0192/1310] pythonPackages.Wand: 0.3.5 -> 0.4.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e0a86d4bc66..9411284ab42 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26443,16 +26443,20 @@ EOF
 
   websockets = callPackage ../development/python-modules/websockets { };
 
-  wand = buildPythonPackage rec {
-    name = "Wand-0.3.5";
+  Wand = buildPythonPackage rec {
+    pname = "Wand";
+    version = "0.4.4";
+    name = "${pname}-${version}";
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/W/Wand/${name}.tar.gz";
-      sha256 = "31e2186ce8d1da0d2ea84d1428fc4d441c2e9d0e25156cc746b35b781026bcff";
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "28e0454c9d16d69c5d5034918d96320d8f9f1377b4fdaf4944eec2f938c74704";
     };
 
     buildInputs = with self; [ pkgs.imagemagick pytest psutil memory_profiler pytest_xdist ];
 
+    # No tests
+    doCheck = false;
     meta = {
       description = "Ctypes-based simple MagickWand API binding for Python";
       homepage = http://wand-py.org/;

From 2876b31ed5fa5234366814ae3d44f1e3d7c42975 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Dec 2016 09:02:15 +0100
Subject: [PATCH 0193/1310] pythonPackages.click-threading: 0.4.0 -> 0.4.2

---
 pkgs/top-level/python-packages.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9411284ab42..466687b3cab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3759,15 +3759,23 @@ in {
   };
 
   click-threading = buildPythonPackage rec {
-    version = "0.4.0";
+    version = "0.4.2";
     name = "click-threading-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/click-threading/${name}.tar.gz";
-      sha256 = "1lrn2inlzz5lr8ay36dz9gmlnqqvdnh14rcm2nmhaxvbbz0gl8qq";
+      sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609";
     };
 
-    propagatedBuildInputs = with self; [ click ];
+    checkInputs = with self; [ pytest ];
+    propagatedBuildInputs = with self; [ click ] ++ optional (!isPy3k) futures;
+
+    checkPhase = ''
+      py.test
+    '';
+
+    # Tests are broken on 3.x
+    doCheck = !isPy3k;
 
     meta = {
       homepage = https://github.com/click-contrib/click-threading/;

From 54be55f47c1cb56c4352208511fea80fef1b5db2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= <anothersms@gmail.com>
Date: Thu, 22 Dec 2016 18:24:22 +0100
Subject: [PATCH 0194/1310] hhpc: init at 0.3.1

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

diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/tools/misc/hhpc/default.nix
new file mode 100644
index 00000000000..b4ee1f2f5c0
--- /dev/null
+++ b/pkgs/tools/misc/hhpc/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchFromGitHub, xorg, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  name = "hhpc-${version}";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "aktau";
+    repo = "hhpc";
+    rev = "v${version}";
+    sha256 = "1djsw1r38mh6zx0rbyn2cfa931hyddib4fl3i27c4z7xinl709ss";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ xorg.libX11 ];
+
+  installPhase = ''
+      mkdir -p $out/bin
+      cp hhpc $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Hides the mouse pointer in X11";
+    maintainers = with maintainers; [ nico202 ];
+    platforms = platforms.unix;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a980ab66387..5da643ef27e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2146,6 +2146,8 @@ in
 
   hevea = callPackage ../tools/typesetting/hevea { };
 
+  hhpc = callPackage ../tools/misc/hhpc { };
+
   hiera-eyaml = callPackage ../tools/system/hiera-eyaml { };
 
   hfsprogs = callPackage ../tools/filesystems/hfsprogs { };

From 620ebf5449b958af34e880099651d0d80a2f2811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= <anothersms@gmail.com>
Date: Mon, 26 Dec 2016 12:42:39 +0100
Subject: [PATCH 0195/1310] unclutter: add missing licence (publicDomain)

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

diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix
index a8468f8387f..84546985f72 100644
--- a/pkgs/tools/misc/unclutter/default.nix
+++ b/pkgs/tools/misc/unclutter/default.nix
@@ -32,5 +32,6 @@ stdenv.mkDerivation {
     '';
     maintainers = with maintainers; [ domenkozar ];
     platforms = platforms.unix;
+    license = stdenv.lib.licenses.publicDomain;
   };
 }

From 0cd5ebb48fd89c94117e897239a638972181a8e8 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sat, 24 Dec 2016 17:37:04 +0000
Subject: [PATCH 0196/1310] Configure checkPhase for ghcHEAD

The testsuite requires python3 so we have to add it as a dependency.
---
 pkgs/development/compilers/ghc/head.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 7573451695c..8cecb4d605b 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
-, autoconf, automake, happy, alex, crossSystem, selfPkgs, cross ? null
+, autoconf, automake, happy, alex, python3, crossSystem, selfPkgs, cross ? null
 }:
 
 let
   inherit (bootPkgs) ghc;
 
-  commonBuildInputs = [ ghc perl autoconf automake happy alex ];
+  commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
   version = "8.1.20161115";
 
@@ -52,6 +52,8 @@ in stdenv.mkDerivation (rec {
   # that in turn causes GHCi to abort
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
 
+  checkTarget = "test";
+
   postInstall = ''
     paxmark m $out/lib/${name}/bin/{ghc,haddock}
 

From d906fb2c9a9c542752c029e2585beb4dc8629292 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sat, 24 Dec 2016 17:37:36 +0000
Subject: [PATCH 0197/1310] Bump ghcHEAD to latest commit

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

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 8cecb4d605b..0deabd0fa98 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -7,7 +7,7 @@ let
 
   commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
-  version = "8.1.20161115";
+  version = "8.1.20161224";
 
   commonPreConfigure =  ''
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
@@ -19,12 +19,12 @@ let
 in stdenv.mkDerivation (rec {
   inherit version;
   name = "ghc-${version}";
-  rev = "017d11e0a36866b05ace32ece1af11adf652a619";
+  rev = "2689a1692636521777f007861a484e7064b2d696";
 
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
     inherit rev;
-    sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y";
+    sha256 = "0rk6xy7kgxx849nprq1ji459p88nyy93236g841m5p6mdh7mmrcr";
   };
 
   postPatch = ''

From 4541b1090491a7ab74d74a5ebee31bd3ccf1be63 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sat, 24 Dec 2016 17:37:58 +0000
Subject: [PATCH 0198/1310] Refactor ghcHEAD postPatch / preConfigure phases

This is for GHC developers using NixOS where patchShebangs is
inconvenient as it dirties the tree but unnecessary for compilation.
---
 pkgs/development/compilers/ghc/head.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 0deabd0fa98..0581038d18d 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -27,19 +27,18 @@ in stdenv.mkDerivation (rec {
     sha256 = "0rk6xy7kgxx849nprq1ji459p88nyy93236g841m5p6mdh7mmrcr";
   };
 
-  postPatch = ''
+  postPatch = "patchShebangs .";
+
+  preConfigure = ''
     echo ${version} >VERSION
     echo ${rev} >GIT_COMMIT_ID
-    patchShebangs .
     ./boot
-  '';
+  '' + commonPreConfigure ;
 
   buildInputs = commonBuildInputs;
 
   enableParallelBuilding = true;
 
-  preConfigure = commonPreConfigure;
-
   configureFlags = [
     "CC=${stdenv.cc}/bin/cc"
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"

From 9f7c7405fbafb24e82028e602242bcc7aecc660b Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sat, 24 Dec 2016 17:41:31 +0000
Subject: [PATCH 0199/1310] Remove nokinds GHC build

This work has since been merged into GHC master branch and is enabled
with the TypeInType extension.
---
 pkgs/development/compilers/ghc/nokinds.nix    |  83 --------------
 .../configuration-ghc-nokinds.nix             | 102 ------------------
 pkgs/top-level/haskell-packages.nix           |   9 --
 3 files changed, 194 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghc/nokinds.nix
 delete mode 100644 pkgs/development/haskell-modules/configuration-ghc-nokinds.nix

diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix
deleted file mode 100644
index a041ff02f93..00000000000
--- a/pkgs/development/compilers/ghc/nokinds.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }:
-
-let
-  inherit (bootPkgs) ghc;
-
-  buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
-    DYNAMIC_BY_DEFAULT = NO
-    SRC_HC_OPTS        = -H64m -O -fasm
-    GhcLibHcOpts       = -O -dcore-lint
-    GhcStage1HcOpts    = -Rghc-timing -O -fasm
-    GhcStage2HcOpts    = -Rghc-timing -O0 -DDEBUG
-    SplitObjs          = NO
-    HADDOCK_DOCS       = NO
-    BUILD_DOCBOOK_HTML = NO
-    BUILD_DOCBOOK_PS   = NO
-    BUILD_DOCBOOK_PDF  = NO
-    LAX_DEPENDENCIES   = YES
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
-    ''}
-  '';
-
-in
-
-stdenv.mkDerivation rec {
-  version = "7.11.20150826";
-  name = "ghc-${version}"; # We cannot add a "nokinds" tag here; see git comment for details.
-  rev = "5f7f64b7fc879b5ecfd6987ec5565bd90f7c0179";
-
-  src = fetchgit {
-    url = "https://github.com/goldfirere/ghc.git";
-    inherit rev;
-    sha256 = "183l4v6aw52r3ydwl8bxg1lh3cwfakb35rpy6mjg23dqmqsynmcn";
-  };
-
-  patches = [ ./relocation.patch ];
-
-  postUnpack = ''
-    pushd ghc-${builtins.substring 0 7 rev}
-    echo ${version} >VERSION
-    echo ${rev} >GIT_COMMIT_ID
-    patchShebangs .
-    ./boot
-    popd
-  '';
-
-  buildInputs = [ ghc perl autoconf automake happy alex ];
-
-  preConfigure = ''
-    echo >mk/build.mk "${buildMK}"
-    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
-  '';
-
-  configureFlags = [
-    "--with-gcc=${stdenv.cc}/bin/cc"
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-  ];
-
-  enableParallelBuilding = true;
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
-
-  passthru = {
-    inherit bootPkgs;
-  };
-
-  meta = {
-    homepage = "http://haskell.org/ghc";
-    description = "The dependently-typed 'nokinds' branch of the Glasgow Haskell Compiler by Richard Eisenberg";
-    maintainers = with stdenv.lib.maintainers; [ deepfire ];
-    inherit (ghc.meta) license platforms;
-  };
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix b/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix
deleted file mode 100644
index 413984a7bd3..00000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-{ pkgs }:
-
-with import ./lib.nix { inherit pkgs; };
-
-self: super: {
-
-  # Use the latest LLVM.
-  inherit (pkgs) llvmPackages;
-
-  # Disable GHC 7.11.x core libraries.
-  array = null;
-  base = null;
-  binary = null;
-  bin-package-db = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  deepseq = null;
-  directory = null;
-  filepath = null;
-  ghc-prim = null;
-  haskeline = null;
-  hoopl = null;
-  hpc = null;
-  integer-gmp = null;
-  pretty = null;
-  process = null;
-  rts = null;
-  template-haskell = null;
-  terminfo = null;
-  time = null;
-  transformers = null;
-  unix = null;
-  xhtml = null;
-
-  # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
-  jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal;
-
-  # GHC 7.10.x's Haddock binary cannot generate hoogle files.
-  # https://ghc.haskell.org/trac/ghc/ticket/9921
-  mkDerivation = drv: super.mkDerivation (drv // { doHoogle = false; doHaddock = false; });
-
-  # haddock: No input file(s).
-  nats = dontHaddock super.nats;
-  bytestring-builder = dontHaddock super.bytestring-builder;
-
-  # We have time 1.5
-  aeson = disableCabalFlag super.aeson "old-locale";
-
-  # Show works differently for record syntax now, breaking haskell-src-exts' parser tests
-  # https://github.com/haskell-suite/haskell-src-exts/issues/224
-  haskell-src-exts = dontCheck super.haskell-src-exts;
-
-  mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
-    url = "https://github.com/snoyberg/mono-traversable/pull/77.patch";
-    sha256 = "1qrvrh3cqfkymi5yb9y9z88rq4n7ag0ac2k00mcnqh4dz1vh4fg1";
-  });
-  yesod-auth = appendPatch super.yesod-auth (pkgs.fetchpatch {
-    url = "https://github.com/yesodweb/yesod/pull/1006.patch";
-    sha256 = "0l6wjj8cfz6jy6j92kywsccafyffhlm5240q82bzirb278adqvar";
-    stripLen = 1;
-  });
-
-  # Setup: At least the following dependencies are missing: base <4.8
-  hspec-expectations = overrideCabal super.hspec-expectations (drv: {
-    postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
-  });
-  utf8-string = overrideCabal super.utf8-string (drv: {
-    postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
-  });
-
-  # bos/attoparsec#92
-  attoparsec = dontCheck super.attoparsec;
-
-  # test suite hangs silently for at least 10 minutes
-  split = dontCheck super.split;
-
-  # Test suite fails with some (seemingly harmless) error.
-  # https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24
-  syb = dontCheck super.syb;
-
-  # Test suite has stricter version bounds
-  retry = dontCheck super.retry;
-
-  # Test suite fails with time >= 1.5
-  http-date = dontCheck super.http-date;
-
-  # Version 1.19.5 fails its test suite.
-  happy = dontCheck super.happy;
-
-  # Workaround for a workaround, see comment for "ghcjs" flag.
-  jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
-            in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
-                                          self.webkitgtk3-javascriptcore ];
-
-  # The compat library is empty in the presence of mtl 2.2.x.
-  mtl-compat = dontHaddock super.mtl-compat;
-
-  # Won't work with LLVM 3.5.
-  llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
-
-}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4cdc70fed4f..b55a86725a3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -56,11 +56,6 @@ rec {
       inherit crossSystem;
       selfPkgs = packages.ghcHEAD;
     };
-    ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix rec {
-      bootPkgs = packages.ghc784;
-      inherit (bootPkgs) alex happy;
-    };
-
     ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
       bootPkgs = packages.ghc7103;
     };
@@ -136,10 +131,6 @@ rec {
       ghc = compiler.ghcHEAD.crossCompiler;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
     };
-    ghcNokinds = callPackage ../development/haskell-modules {
-      ghc = compiler.ghcNokinds;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { };
-    };
     ghcjs = callPackage ../development/haskell-modules {
       ghc = compiler.ghcjs;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };

From a0922271d37ce3ed3c2a6b48d6f284d185d07e26 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Tue, 27 Dec 2016 00:28:51 +0800
Subject: [PATCH 0200/1310] crystal: fix build in chroot environment

previous build failed on hydra because /usr/bin/env
do not exist in a chroot build environment.
---
 pkgs/development/compilers/crystal/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index ed9907a283b..5bb3b60d96d 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -57,6 +57,9 @@ stdenv.mkDerivation rec {
   '';
 
   buildPhase = ''
+    # patch the script which launches the prebuilt compiler
+    substituteInPlace $(pwd)/crystal-${version}-1/bin/crystal --replace \
+      "/usr/bin/env bash" "${stdenv.shell}"
     ${fixPrebuiltBinary}
 
     cd crystal-${version}

From e60bb86d00d49451e18a8181a5aa1276f899b8d2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 26 Dec 2016 18:54:34 +0200
Subject: [PATCH 0201/1310] kexectools: 2.0.13 -> 2.0.14

ARM patch is included upstream now.
---
 pkgs/os-specific/linux/kexectools/arm.patch   | 28 -------------------
 pkgs/os-specific/linux/kexectools/default.nix |  6 ++--
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kexectools/arm.patch

diff --git a/pkgs/os-specific/linux/kexectools/arm.patch b/pkgs/os-specific/linux/kexectools/arm.patch
deleted file mode 100644
index 9c1d482c81a..00000000000
--- a/pkgs/os-specific/linux/kexectools/arm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream kexec-tools 2.0.13 does not pack arm phys_to_virt.h and iomem.h,
-include them here for a temporary fix
-
-diff -uprN kexec-tools/kexec/arch/arm/iomem.h kexec-tools.1/kexec/arch/arm/iomem.h
---- kexec-tools/kexec/arch/arm/iomem.h	1970-01-01 08:00:00.000000000 +0800
-+++ kexec-tools.1/kexec/arch/arm/iomem.h	2016-08-09 15:38:26.938594379 +0800
-@@ -0,0 +1,9 @@
-+#ifndef IOMEM_H
-+#define IOMEM_H
-+
-+#define SYSTEM_RAM		"System RAM\n"
-+#define SYSTEM_RAM_BOOT		"System RAM (boot alias)\n"
-+#define CRASH_KERNEL		"Crash kernel\n"
-+#define CRASH_KERNEL_BOOT	"Crash kernel (boot alias)\n"
-+
-+#endif
-diff -uprN kexec-tools/kexec/arch/arm/phys_to_virt.h kexec-tools.1/kexec/arch/arm/phys_to_virt.h
---- kexec-tools/kexec/arch/arm/phys_to_virt.h	1970-01-01 08:00:00.000000000 +0800
-+++ kexec-tools.1/kexec/arch/arm/phys_to_virt.h	2016-08-09 14:50:30.104143361 +0800
-@@ -0,0 +1,8 @@
-+#ifndef PHYS_TO_VIRT_H
-+#define PHYS_TO_VIRT_H
-+
-+#include <stdint.h>
-+
-+extern uint64_t phys_offset;
-+
-+#endif
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index cd2833617b9..206dc6889e8 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -2,18 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "kexec-tools-${version}";
-  version = "2.0.13";
+  version = "2.0.14";
 
   src = fetchurl {
     urls = [
       "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
       "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
     ];
-    sha256 = "1k75p9h29xx57l1c69ravm4pg9pmriqxmwja12hgrnvi251ayjw7";
+    sha256 = "1ihd3kzw8xnc5skq4pb633rr80007knjm4n1dd67a24xkplygcpz";
   };
 
-  patches = [ ./arm.patch ];
-
   hardeningDisable = [ "format" "pic" "relro" ];
 
   buildInputs = [ zlib ];

From ca2fa4416e59ec72323e8b1bec52b8403d239e8e Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Sun, 25 Dec 2016 23:17:11 -0800
Subject: [PATCH 0202/1310] nginx: Allow GD to be optional.

This commit permits incantations like `pkgs.nginx.override { gd = null; }` to
produce a slimmed-down nginx.

When used, this functionality removes a pile of stuff from nginx's closure.
The resulting nginx's closure:

    $ nix-store -q -R /nix/store/wk3h0a4dmdmjmxkbd0q09iw0wfq0yzpz-nginx-1.10.2 | wc -l
    12
    $ nix-store -q -R /nix/store/gpcx77anqrj05qz0mrwm7hf4wgxry5py-nginx-1.10.2 | wc -l
    24
---
 pkgs/servers/http/nginx/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index b1d70907e28..5d5a98ad8a8 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -27,7 +27,6 @@ stdenv.mkDerivation {
     "--with-http_realip_module"
     "--with-http_addition_module"
     "--with-http_xslt_module"
-    "--with-http_image_filter_module"
     "--with-http_geoip_module"
     "--with-http_sub_module"
     "--with-http_dav_module"
@@ -44,6 +43,7 @@ stdenv.mkDerivation {
     # Install destination problems
     # "--with-http_perl_module"
   ] ++ optional withStream "--with-stream"
+    ++ optional (gd != null) "--with-http_image_filter_module"
     ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
     ++ map (mod: "--add-module=${mod.src}") modules;
 

From 34cc46bfa7b6b22ecbd0c0a82d43e9520a9f8e27 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Sun, 25 Dec 2016 20:34:46 +0100
Subject: [PATCH 0203/1310] docker-compose: 1.8.0 -> 1.9.0

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 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 466687b3cab..875837d1032 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11060,13 +11060,13 @@ in {
   };
 
   docker_compose = buildPythonPackage rec {
-    version = "1.8.0";
+    version = "1.9.0";
     name = "docker-compose-${version}";
     namePrefix = "";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/docker-compose/${name}.tar.gz";
-      sha256 = "1ad28x3marfmyrbibbkzy46bpbgc29k20ik661l8r49nr0m6px35";
+      sha256 = "0zz2jqpxz69q34bp97pbwxda1ik3m8zbhh15mxvhfsn0g566dywq";
     };
 
     # lots of networking and other fails

From c64789937b746b288c586a5658c9e1cab0f8455b Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <skosyrev@ptsecurity.com>
Date: Sun, 25 Dec 2016 16:45:37 +0300
Subject: [PATCH 0204/1310] emacs-packages:  init haskell-unicode-input-method
 at 20110905

---
 pkgs/top-level/emacs-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 430da89fc22..092f352ec5b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -238,6 +238,22 @@ let
     };
   };
 
+  haskell-unicode-input-method = melpaBuild rec {
+    pname = "emacs-haskell-unicode-input-method";
+    version = "20110905.2307";
+    src = fetchFromGitHub {
+      owner = "roelvandijk";
+      repo = "emacs-haskell-unicode-input-method";
+      rev = "d8d168148c187ed19350bb7a1a190217c2915a63";
+      sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";
+    };
+    packageRequires = [];
+    meta = {
+      homepage = "https://melpa.org/#haskell-unicode-input-method/";
+      license = lib.licenses.free;
+    };
+  };
+
   hindent = melpaBuild rec {
     pname = "hindent";
     version = external.hindent.version;

From 19425207c92ef79cb3e8e091e82ace5b2278ea64 Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Mon, 26 Dec 2016 14:55:39 -0600
Subject: [PATCH 0205/1310] cscope: refactor allow builds on non linux

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

diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix
index 2dff98a212d..b737bb7a7da 100644
--- a/pkgs/development/tools/misc/cscope/default.nix
+++ b/pkgs/development/tools/misc/cscope/default.nix
@@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
 
     maintainers = with stdenv.lib.maintainers; [viric];
 
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 124f81785a7bbeb0ca1f4d004a17118d2615e83e Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Mon, 26 Dec 2016 14:55:54 -0600
Subject: [PATCH 0206/1310] duplicity: refactor allow builds on non linux

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

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 4f5601501e9..b08bb0768f2 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -32,6 +32,6 @@ in python2Packages.buildPythonApplication {
     homepage = "http://www.nongnu.org/duplicity";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [viric peti];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From e898a5032547cc0c33ef7f9f1664e9a0ed20d614 Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Mon, 26 Dec 2016 14:56:09 -0600
Subject: [PATCH 0207/1310] duply: refactor allow builds on non linux

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

diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix
index a055b87c263..7917403a915 100644
--- a/pkgs/tools/backup/duply/default.nix
+++ b/pkgs/tools/backup/duply/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation {
     homepage = http://duply.net/;
     license = licenses.gpl2;
     maintainers = [ maintainers.bjornfor ];
-    platforms = platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From b398665a4e59ae2f72da6a40c6df255033ee0cc0 Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Mon, 26 Dec 2016 14:56:34 -0600
Subject: [PATCH 0208/1310] wakelan: refactor allow builds on non linux

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

diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix
index 4f8717e9a11..ff96509e15c 100644
--- a/pkgs/tools/networking/wakelan/default.nix
+++ b/pkgs/tools/networking/wakelan/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
 
     maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From a21640d394e9594bc86a011d6013edbca6bc5a4b Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Mon, 26 Dec 2016 14:56:49 -0600
Subject: [PATCH 0209/1310] pigz: refactor allow builds on non linux

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

diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index 1cadf393a8e..193f1d5cb0b 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.zlib.net/pigz/";
     description = "A parallel implementation of gzip for multi-core machines";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 49d721a88946d652cb1a4270391aeeb779d2c909 Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Mon, 26 Dec 2016 14:57:02 -0600
Subject: [PATCH 0210/1310] pixz: refactor allow builds on non linux

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

diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix
index 8572221572c..5ce79cbf412 100644
--- a/pkgs/tools/compression/pixz/default.nix
+++ b/pkgs/tools/compression/pixz/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     description = ''A parallel compressor/decompressor for xz format'';
     license = stdenv.lib.licenses.bsd2;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 7c0e1f9fe44800605a5b849488350d0bf710a537 Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Mon, 26 Dec 2016 14:57:14 -0600
Subject: [PATCH 0211/1310] lastpass-cli: refactor allow builds on non linux

---
 pkgs/tools/security/lastpass-cli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix
index 88b7316e9d8..7b6720a2139 100644
--- a/pkgs/tools/security/lastpass-cli/default.nix
+++ b/pkgs/tools/security/lastpass-cli/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "Stores, retrieves, generates, and synchronizes passwords securely";
     homepage    = "https://github.com/lastpass/lastpass-cli";
     license     = licenses.gpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = stdenv.lib.platforms.unix;
     maintainers = with maintainers; [ cstrahan ];
   };
 }

From 28d6aee3714bbcb8a0842e83d081792332d8fd4a Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Mon, 26 Dec 2016 22:27:09 +0100
Subject: [PATCH 0212/1310] libstrophe: 0.8.8 -> 0.9.1

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

diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix
index b5eb2ae7dd7..76aa014392b 100644
--- a/pkgs/development/libraries/libstrophe/default.nix
+++ b/pkgs/development/libraries/libstrophe/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libstrophe-${version}";
-  version = "0.8.8";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "strophe";
     repo = "libstrophe";
     rev = version;
-    sha256 = "1xzyqqf99r0jfd0g3v0zwc68sac6y25v1d4m365zpc14l02midis";
+    sha256 = "099iv13c03y1dsn2ngdhfx2cnax0aj2gfh00w55hlzpvmjm8dsml";
   };
 
   buildInputs = [ automake autoconf openssl expat libtool pkgconfig check ];
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
       runs well on both Linux, Unix, and Windows based platforms.
     '';
     homepage = http://strophe.im/libstrophe/;
-    license = stdenv.lib.licenses.gpl3;
+    license = with stdenv.lib.licenses; [gpl3 mit];
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.devhell ];
+    maintainers = with stdenv.lib.maintainers; [devhell flosse];
   };
 }

From 5ba7f33e3a4f8ebee9944e5e7f092edf4cb57f3e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 27 Dec 2016 01:35:10 +0200
Subject: [PATCH 0213/1310] linux_testing: 4.9-rc8 -> 4.10-rc1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 394469d06fa..10bea69a3c4 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.9-rc8";
-  modDirVersion = "4.9.0-rc8";
-  extraMeta.branch = "4.9";
+  version = "4.10-rc1";
+  modDirVersion = "4.10.0-rc1";
+  extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1xyham8by966mavk5wxy6va5cq2lf2d1jiqps70kcc4064v365r7";
+    sha256 = "1s7axcii6jzm77ivmy26llf4z6dprfp3sb1v35fchl9bkzaivaly";
   };
 
   features.iwlwifi = true;

From b33907075f1b8f8b9abc8e7c8bbb3fd20ff81d62 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Mon, 26 Dec 2016 21:33:19 +0200
Subject: [PATCH 0214/1310] awesome: 3.5.9 -> 4.0

---
 .../window-managers/awesome/3.4.nix           | 55 ------------
 .../window-managers/awesome/3.5.nix           | 86 +++++++++++++++++++
 .../window-managers/awesome/default.nix       | 13 +--
 pkgs/top-level/all-packages.nix               | 12 +--
 4 files changed, 100 insertions(+), 66 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/awesome/3.4.nix
 create mode 100644 pkgs/applications/window-managers/awesome/3.5.nix

diff --git a/pkgs/applications/window-managers/awesome/3.4.nix b/pkgs/applications/window-managers/awesome/3.4.nix
deleted file mode 100644
index 961296c6eec..00000000000
--- a/pkgs/applications/window-managers/awesome/3.4.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua
-, glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil
-, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau
-, libXdmcp, pixman, doxygen
-, libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl
-, docbook_xml_dtd_45, libxslt, coreutils, which }:
-
-let
-  version = "3.4.13";
-in
-
-stdenv.mkDerivation rec {
-  name = "awesome-${version}";
- 
-  src = fetchurl {
-    url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
-    sha256 = "0jhsgb8wdzpfmdyl9fxp2w6app7l6zl8b513z3ff513nvdlxj5hr";
-  };
- 
-  buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango
-    imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm
-    libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen
-    asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt which ];
-
-  # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in
-  # the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as
-  # dependencies.
-  prePatch = ''
-    # Fix the tab completion (supporting bash or zsh)
-    sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in
-    # Remove the 'root' PATH override (I don't know why they have that)
-    sed /WHOAMI/d -i utils/awsetbg
-    # Russian manpages fail to be generated:
-    #  [ 56%] Generating manpages/ru/man1/awesome.1.xml
-    #  asciidoc: ERROR: <stdin>: line 3: name section expected
-    #  asciidoc: FAILED: <stdin>: line 3: section title expected
-    #  make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1
-    substituteInPlace CMakeLists.txt \
-      --replace "set(AWE_MAN_LANGS it es fr de ru)" \
-                "set(AWE_MAN_LANGS it es fr de)"
-  '';
- 
-  meta = {
-    homepage = http://awesome.naquadah.org/;
-    description = "Highly configurable, dynamic window manager for X";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-
-  passthru = {
-    inherit lua;
-  };
-
-}
diff --git a/pkgs/applications/window-managers/awesome/3.5.nix b/pkgs/applications/window-managers/awesome/3.5.nix
new file mode 100644
index 00000000000..3a2a030b8a4
--- /dev/null
+++ b/pkgs/applications/window-managers/awesome/3.5.nix
@@ -0,0 +1,86 @@
+{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
+, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
+, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
+, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
+, which, dbus, nettools, git, asciidoc, doxygen
+, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
+}:
+
+let
+  version = "3.5.9";
+in with luaPackages;
+
+stdenv.mkDerivation rec {
+  name = "awesome-${version}";
+
+  src = fetchurl {
+    url    = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
+    sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Highly configurable, dynamic window manager for X";
+    homepage    = http://awesome.naquadah.org/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.linux;
+  };
+
+  nativeBuildInputs = [
+    asciidoc
+    cmake
+    doxygen
+    imagemagick
+    makeWrapper
+    pkgconfig
+    xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs
+  ];
+
+  buildInputs = [
+    cairo
+    dbus
+    gdk_pixbuf
+    gobjectIntrospection
+    git
+    lgi
+    libpthreadstubs
+    libstartup_notification
+    libxdg_basedir
+    lua
+    nettools
+    pango
+    xcb-util-cursor
+    xorg.libXau
+    xorg.libXdmcp
+    xorg.libxcb
+    xorg.libxshmfence
+    xorg.xcbutil
+    xorg.xcbutilimage
+    xorg.xcbutilkeysyms
+    xorg.xcbutilrenderutil
+    xorg.xcbutilwm
+  ];
+
+  #cmakeFlags = "-DGENERATE_MANPAGES=ON";
+
+  LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}";
+  GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
+  LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
+  LUA_PATH  = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";
+
+  postInstall = ''
+    wrapProgram $out/bin/awesome \
+      --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \
+      --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
+      --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}"
+
+    wrapProgram $out/bin/awesome-client \
+      --prefix PATH : "${which}/bin"
+  '';
+
+  passthru = {
+    inherit lua;
+  };
+}
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 3a2a030b8a4..9fa4d6a6d8e 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -4,25 +4,26 @@
 , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
 , which, dbus, nettools, git, asciidoc, doxygen
 , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
+, libxkbcommon, xcbutilxrm
 }:
 
 let
-  version = "3.5.9";
+  version = "4.0";
 in with luaPackages;
 
 stdenv.mkDerivation rec {
   name = "awesome-${version}";
 
   src = fetchurl {
-    url    = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
-    sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67";
+    url    = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz";
+    sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w";
   };
 
   meta = with stdenv.lib; {
     description = "Highly configurable, dynamic window manager for X";
-    homepage    = http://awesome.naquadah.org/;
+    homepage    = https://awesomewm.org/;
     license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ lovek323 ];
+    maintainers = with maintainers; [ lovek323 rasendubi ];
     platforms   = platforms.linux;
   };
 
@@ -59,6 +60,8 @@ stdenv.mkDerivation rec {
     xorg.xcbutilkeysyms
     xorg.xcbutilrenderutil
     xorg.xcbutilwm
+    libxkbcommon
+    xcbutilxrm
   ];
 
   #cmakeFlags = "-DGENERATE_MANPAGES=ON";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95b8baf7be2..3de4fcb5669 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12328,15 +12328,15 @@ in
     ffmpeg = ffmpeg_2;
   };
 
-  awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix {
-    cairo = cairo.override { xcbSupport = true; };
-    lua = lua5_1;
-  };
-  awesome-3-5 = callPackage ../applications/window-managers/awesome {
+  awesome-3-5 = callPackage ../applications/window-managers/awesome/3.5.nix {
     cairo = cairo.override { xcbSupport = true; };
     luaPackages = luaPackages.override { inherit lua; };
   };
-  awesome = awesome-3-5;
+  awesome-4-0 = callPackage ../applications/window-managers/awesome {
+    cairo = cairo.override { xcbSupport = true; };
+    luaPackages = luaPackages.override { inherit lua; };
+  };
+  awesome = awesome-4-0;
 
   awesomebump = qt5.callPackage ../applications/graphics/awesomebump { };
 

From cbb29a26a210f801ab5f8df8f8831d75ab2c470b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 27 Dec 2016 13:03:08 +0100
Subject: [PATCH 0215/1310] libsigrokdecode: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix
index 706b9bde327..539a5bd845d 100644
--- a/pkgs/development/tools/libsigrokdecode/default.nix
+++ b/pkgs/development/tools/libsigrokdecode/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }:
 
 stdenv.mkDerivation rec {
-  name = "libsigrokdecode-0.4.0";
+  name = "libsigrokdecode-0.4.1";
 
   src = fetchurl {
     url = "http://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz";
-    sha256 = "0drmxjc2xavccjl2i6vcjipijrn7459nv8cpmm788pi4fcdrszpx";
+    sha256 = "15aabl9p4586v2bkj4bm4xi7l3309r9zb31sw233s5vi170p0pq6";
   };
 
   buildInputs = [ pkgconfig glib python3 libsigrok check ];

From 346c1db2ac336e15f2c0019292963a9c5ba37f58 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sun, 25 Dec 2016 01:22:31 +0100
Subject: [PATCH 0216/1310] xournal: Allow to build it on darwin with X11
 backend

---
 pkgs/applications/graphics/xournal/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
index 669fc5a28a7..97b418f08c1 100644
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@@ -13,8 +13,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ghostscript atk gtk2 glib fontconfig freetype
-    libgnomecanvas libgnomeprint libgnomeprintui
+    libgnomecanvas
     pango libX11 xproto zlib poppler
+  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+    libgnomeprint libgnomeprintui
   ];
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
@@ -47,11 +49,11 @@ stdenv.mkDerivation rec {
       cp $out/share/xournal/pixmaps/xournal.png $out/share/icons
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://xournal.sourceforge.net/;
     description = "Note-taking application (supposes stylus)";
-    maintainers = [ stdenv.lib.maintainers.guibert ];
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ maintainers.guibert ];
+    license = licenses.gpl2;
+    platforms = with platforms; linux ++ darwin;
   };
 }

From febab15b01fc2ed68e688e3819941a2c62091d8a Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Tue, 27 Dec 2016 08:45:37 +0100
Subject: [PATCH 0217/1310] gtk2: Enable xinput for Darwin

---
 pkgs/development/libraries/gtk+/2.x.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 91407e556c0..ba12b4eea93 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -38,9 +38,13 @@ stdenv.mkDerivation rec {
     ++ optional xineramaSupport libXinerama
     ++ optionals cupsSupport [ cups ];
 
-  configureFlags = if stdenv.isDarwin
-    then "--disable-glibtest --disable-introspection --disable-visibility"
-    else "--with-xinput=yes";
+  configureFlags = [
+    "--with-xinput=yes"
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    "--disable-glibtest"
+    "--disable-introspection"
+    "--disable-visibility"
+  ];
 
   postInstall = ''
     moveToOutput share/gtk-2.0/demo "$devdoc"

From 1765784b5ea2964307a944ab702a0d0cb0b35725 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Date: Tue, 27 Dec 2016 14:23:16 +0100
Subject: [PATCH 0218/1310] enpass: bump to 5.4.0.post4 and fix application
 icon

---
 pkgs/tools/security/enpass/data.json   | 12 ++++++------
 pkgs/tools/security/enpass/default.nix | 22 +++++++---------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json
index 4e245d1c80f..b3625d928b5 100644
--- a/pkgs/tools/security/enpass/data.json
+++ b/pkgs/tools/security/enpass/data.json
@@ -1,12 +1,12 @@
 {
   "amd64": {
-    "path": "pool/main/e/enpass/enpass_5.3.0_amd64.deb", 
-    "sha256": "d9da061c6456281da836bdd78bdb7baeced4b7f1805bb2495e4f1d15038cf86b", 
-    "version": "5.3.0"
+    "path": "pool/main/e/enpass/enpass_5.4.0-4_amd64.deb", 
+    "sha256": "6b460fed2d7d8473e2b5d069dbe60263195b916c8b79a8fc7c2e8cb953134579", 
+    "version": "5.4.0.post4"
   }, 
   "i386": {
-    "path": "pool/main/e/enpass/enpass_5.3.0_i386.deb", 
-    "sha256": "58d9f3b83c2da477c13976e1826d112236eabd46a389de7e8767ee99ac41f469", 
-    "version": "5.3.0"
+    "path": "pool/main/e/enpass/enpass_5.4.0-4_i386.deb", 
+    "sha256": "1ec8088d5c3b2906d6820f96e1868c473e78dbe882f04e74a7816d19d43e3692", 
+    "version": "5.4.0.post4"
   }
 }
\ No newline at end of file
diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix
index b7f7282d292..f2e73e2749e 100644
--- a/pkgs/tools/security/enpass/default.nix
+++ b/pkgs/tools/security/enpass/default.nix
@@ -44,16 +44,6 @@ let
     inherit (data) version;
     name = "enpass-${version}";
 
-    desktopItem = makeDesktopItem {
-      name = "Enpass";
-      exec = "$out/bin/Enpass";
-      #icon = "Enpass";
-      desktopName = "Enpass";
-      genericName = "Password manager";
-      categories = "Application;Security;";
-    };
-
-
     src = fetchurl {
       inherit (data) sha256;
       url = "${baseUrl}/${data.path}";
@@ -74,11 +64,12 @@ let
     installPhase=''
       mkdir $out
       cp -r opt/Enpass/*  $out
+      cp -r usr/* $out
+      rm $out/bin/runenpass.sh
 
-      # Make desktop item
-      mkdir -p "$out"/share/applications
-      cp "$desktopItem"/share/applications/* "$out"/share/applications/
-      mkdir -p "$out"/share/icons
+      sed \
+      	-i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \
+      	$out/share/applications/enpass.desktop 
 
       patchelf  \
         --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
@@ -88,7 +79,8 @@ let
         --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \
         --set QT_PLUGIN_PATH "$out/plugins" \
         --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \
-        --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb"
+        --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \
+        --set HIDE_TOOLBAR_LINE 0
     '';
   };
   updater = {

From 2436fc1b11647ed2ca2398088541a108440d75e6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Dec 2016 08:24:20 -0500
Subject: [PATCH 0219/1310] ghcHEAD comes with a ghci package.

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 559096ebd28..a2b6058b166 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -19,6 +19,7 @@ self: super: {
   directory = null;
   filepath = null;
   ghc-prim = null;
+  ghci = null;
   haskeline = null;
   hoopl = null;
   hpc = null;

From a55bf2b812463c992dad5f441efb8831dde10a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 11 Dec 2016 15:06:20 +0100
Subject: [PATCH 0220/1310] codesearch: init at 20150617

---
 pkgs/tools/text/codesearch/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/tools/text/codesearch/deps.nix    |  3 +++
 pkgs/top-level/all-packages.nix        |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/text/codesearch/default.nix
 create mode 100644 pkgs/tools/text/codesearch/deps.nix

diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix
new file mode 100644
index 00000000000..ccb3f1d9ed9
--- /dev/null
+++ b/pkgs/tools/text/codesearch/default.nix
@@ -0,0 +1,26 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "codesearch-${version}";
+  version = "20150617-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
+
+  goPackagePath = "github.com/google/codesearch";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/google/codesearch";
+    sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = {
+    description = "Fast, indexed regexp search over large file trees";
+    homepage = "https://github.com/google/codesearch";
+    license = [ stdenv.lib.licenses.bsd3 ];
+    maintainers = [ stdenv.lib.maintainers.bennofs ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/tools/text/codesearch/deps.nix b/pkgs/tools/text/codesearch/deps.nix
new file mode 100644
index 00000000000..2d1dad70634
--- /dev/null
+++ b/pkgs/tools/text/codesearch/deps.nix
@@ -0,0 +1,3 @@
+# This file was generated by go2nix.
+[
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index beeed44ba78..c92eae2da9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -779,6 +779,8 @@ in
 
   cpulimit = callPackage ../tools/misc/cpulimit { };
 
+  codesearch = callPackage ../tools/text/codesearch { };
+
   contacts = callPackage ../tools/misc/contacts {
     inherit (darwin.apple_sdk.frameworks) Foundation AddressBook;
   };

From bef30f322f3fb9dee853264193decb3c9552aabf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 27 Dec 2016 15:46:22 +0100
Subject: [PATCH 0221/1310] cgit: 0.12 -> 1.1

---
 .../git-and-tools/cgit/default.nix                   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index d144d484ed3..e7511e10d40 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -5,21 +5,19 @@
 
 stdenv.mkDerivation rec {
   name = "cgit-${version}";
-  version = "0.12";
+  version = "1.1";
 
   src = fetchurl {
     url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
-    sha256 = "1dx54hgfyabmg9nm5qp6d01f54nlbqbbdwhwl0llb9imjf237qif";
+    sha256 = "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288";
   };
 
   # cgit is tightly coupled with git and needs a git source tree to build.
   # IMPORTANT: Remember to check which git version cgit needs on every version
-  # bump (look in the Makefile).
-  # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to
-  # 1.9.2 (see the repository history)
+  # bump (look for "GIT_VER" in the top-level Makefile).
   gitSrc = fetchurl {
-    url    = "mirror://kernel/software/scm/git/git-2.7.0.tar.xz";
-    sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs";
+    url    = "mirror://kernel/software/scm/git/git-2.10.2.tar.xz";
+    sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l";
   };
 
   buildInputs = [

From 1896bf7a7831d612d1e8a188cb83b715aa476a7f Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@aon.at>
Date: Tue, 27 Dec 2016 15:47:27 +0100
Subject: [PATCH 0222/1310] pygraphviz: 1.3.1 -> 1.4rc1

This fixes a segmentation fault during the test phase
https://github.com/pygraphviz/pygraphviz/issues/84
---
 pkgs/top-level/python-packages.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 87cd2970fab..a682a04d7b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15058,14 +15058,15 @@ in {
   };
 
   pygraphviz = buildPythonPackage rec {
-    name = "pygraphviz-1.3.1";
+    name = "pygraphviz-${version}";
+    version = "1.4rc1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pygraphviz/${name}.tar.gz";
-      sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408";
+      sha256 = "00ck696rddjnrwfnh1zw87b9xzqfm6sqjy6kqf6kmn1xwsi6f19a";
     };
 
-    buildInputs = with self; [ doctest-ignore-unicode ];
+    buildInputs = with self; [ doctest-ignore-unicode mock nose ];
     propagatedBuildInputs = [ pkgs.graphviz pkgs.pkgconfig ];
 
     meta = {

From 9de120ff9d2a4cabf0ba0a7fa31a1daabd1ef5d9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Dec 2016 16:22:58 +0100
Subject: [PATCH 0223/1310] pythonPackages.resampy: init at 0.1.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 875837d1032..5dfcb112e10 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22493,6 +22493,28 @@ in {
     };
   };
 
+  resampy = buildPythonPackage rec {
+    pname = "resampy";
+    version = "0.1.4";
+    name = "${pname}-${version}";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "cf4f149d8699af70a1b4b0769fa16fab21835d936ea7ff25e98446aa49e743d4";
+    };
+
+    checkInputs = with self; [ pytest pytestcov ];
+    # No tests included
+    doCheck = false;
+    propagatedBuildInputs = with self; [ numpy scipy cython six ];
+
+    meta = {
+      homepage = https://github.com/bmcfee/resampy;
+      description = "Efficient signal resampling";
+      license = licenses.isc;
+    };
+  };
+
   robomachine = buildPythonPackage rec {
     name = "robomachine-0.6";
 

From 7847a02db9d3bfde2146e8a2e5a7b6ffca36c2fb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Dec 2016 16:23:16 +0100
Subject: [PATCH 0224/1310] pythonPackages.numpydoc: 0.5 -> 0.6.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5dfcb112e10..cf0b2c8a511 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16105,12 +16105,13 @@ in {
   };
 
   numpydoc = buildPythonPackage rec {
-    name = "numpydoc-${version}";
-    version = "0.5";
+    pname = "numpydoc";
+    name = "${pname}-${version}";
+    version = "0.6.0";
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/n/numpydoc/${name}.tar.gz";
-      sha256 = "0d4dnifaxkll50jx6czj05y8cb4ny60njd2wz299sj2jxfy51w4k";
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "1ec573e91f6d868a9940d90a6599f3e834a2d6c064030fbe078d922ee21dcfa1";
     };
 
     buildInputs = [ self.nose ];

From 72385a35f87a998d3ffafd6673e832455a25a22a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Dec 2016 16:23:40 +0100
Subject: [PATCH 0225/1310] pythonPackages.librosa: 0.4.0 -> 0.4.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf0b2c8a511..a062cbcb36a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9304,15 +9304,25 @@ in {
 
 
   librosa = buildPythonPackage rec {
-    name = "librosa-${version}";
-    version = "0.4.0";
+    pname = "librosa";
+    name = "${pname}-${version}";
+    version = "0.4.3";
     src = pkgs.fetchurl {
-      url = "mirror://pypi/l/librosa/librosa-0.4.0.tar.gz";
-      sha256 = "cc11dcc41f51c08e442292e8a2fc7d7ee77e0d47ff771259eb63f57fcee6f6e7";
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "209626c53556ca3922e52d2fae767bf5b398948c867fcc8898f948695dacb247";
     };
 
-    propagatedBuildInputs = with self;
-      [ joblib matplotlib six scikitlearn decorator audioread samplerate ];
+    propagatedBuildInputs = with self; [ joblib matplotlib six scikitlearn
+      decorator audioread resampy ];
+
+    # No tests
+    doCheck = false;
+
+    meta = {
+      description = "Python module for audio and music processing";
+      homepage = http://librosa.github.io/;
+      license = licenses.isc;
+    };
   };
 
   joblib = buildPythonPackage rec {

From 3b050791e47362cb4d6ce4da74bbaa360eaa8ff3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Dec 2016 16:24:02 +0100
Subject: [PATCH 0226/1310] pythonPackages.joblib: 0.9.4 -> 0.10.3

---
 pkgs/top-level/python-packages.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a062cbcb36a..8f312412878 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9326,15 +9326,26 @@ in {
   };
 
   joblib = buildPythonPackage rec {
-    name = "joblib-${version}";
-    version = "0.9.4";
+    pname = "joblib";
+    name = "${pname}-${version}";
+    version = "0.10.3";
     src = pkgs.fetchurl {
-      url = "mirror://pypi/j/joblib/${name}.tar.gz";
-      sha256 = "e5faacf0da7b3035dbca9d56210962b86564aafca71a25f4ea376a405455cd60";
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "29b2965a9efbc90a5fe66a389ae35ac5b5b0c1feabfc7cab7fd5d19f429a071d";
     };
 
-    buildInputs = with self; [ nose ];
+    buildInputs = with self; [ nose sphinx numpydoc ];
 
+    # Failing test on Python 3.x
+    postPatch = '''' + optionalString isPy3k ''
+      sed -i -e '70,84d' joblib/test/test_format_stack.py
+    '';
+
+    meta = {
+      description = "Lightweight pipelining: using Python functions as pipeline jobs";
+      homepage = http://pythonhosted.org/joblib/;
+      license = licenses.bsd3;
+    };
   };
 
   samplerate = buildPythonPackage rec {

From 02c65bdac919fcb0cecc1a157744156ed39b9fc6 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 27 Dec 2016 16:21:56 +0000
Subject: [PATCH 0227/1310] google-chrome: add channel name suffix

Updates would always select the unstable version otherwise. This was
copies from the chromium package.
---
 .../networking/browsers/google-chrome/default.nix            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 2863a595017..938dbe09ebe 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -51,10 +51,13 @@ let
     flac harfbuzz icu libpng opusWithCustomModes snappy speechd
     bzip2 libcap
   ] ++ optional pulseSupport libpulseaudio;
+
+  suffix = if channel != "stable" then "-" + channel else "";
+
 in stdenv.mkDerivation rec {
   inherit version;
 
-  name = "google-chrome-${version}";
+  name = "google-chrome${suffix}-${version}";
 
   src = binary;
 

From 857d0edcfb84364faffcc3de064dec0de1d5fab9 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Wed, 28 Dec 2016 01:01:12 +0800
Subject: [PATCH 0228/1310] facter: use boost160 (#21435)

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c92eae2da9c..7bc807082f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -867,6 +867,7 @@ in
   f3 = callPackage ../tools/filesystems/f3 { };
 
   facter = callPackage ../tools/system/facter {
+    boost = boost160;
     ruby = ruby_2_1;
   };
 

From 12532879b06d816ba88b52ed8ce5fdad53d6edb7 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 27 Dec 2016 17:44:57 +0000
Subject: [PATCH 0229/1310] zerotierone: 1.1.12 -> 1.1.14

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

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index d97a6049745..76385312385 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.12";
+  version = "1.1.14";
   name = "zerotierone";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "0mji6bmxjvxy2mhvzfz4vpdz62n1wv6a02rapzbiad8zr2c869cm";
+    sha256 = "1brlyqk2p5h9sws15nbkmm4qhx911aib1v7crmcm2rhwsad0c1nj";
   };
 
   preConfigure = ''
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     description = "Create flat virtual Ethernet networks of almost unlimited size";
     homepage = https://www.zerotier.com;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ sjmackenzie ];
+    maintainers = with maintainers; [ sjmackenzie zimbatm ];
     platforms = platforms.allBut [ "i686-linux" ];
   };
 }

From df5f88070e239a23d26055c138c1efb0706e0b4e Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Tue, 27 Dec 2016 18:55:10 +0100
Subject: [PATCH 0230/1310] ruby: 2.4.0 (#21419)

---
 pkgs/development/interpreters/ruby/default.nix       | 11 ++++++++++-
 pkgs/development/interpreters/ruby/patchsets.nix     |  5 +++++
 pkgs/development/interpreters/ruby/rvm-patchsets.nix |  6 +++---
 pkgs/top-level/all-packages.nix                      |  4 +++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 9486d030a8b..d5f3a6d3990 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -113,6 +113,7 @@ let
 
         configureFlags = ["--enable-shared" "--enable-pthread"]
           ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
+          ++ op (!docSupport) "--disable-install-doc"
           ++ ops stdenv.isDarwin [
             # on darwin, we have /usr/include/tk.h -- so the configure script detects
             # that tk is installed
@@ -154,7 +155,7 @@ let
           license = stdenv.lib.licenses.ruby;
           homepage = http://www.ruby-lang.org/en/;
           description = "The Ruby language";
-          maintainers = [ stdenv.lib.maintainers.vrthra ];
+          maintainers = with stdenv.lib.maintainers; [ vrthra manveru ];
           platforms = stdenv.lib.platforms.all;
         };
 
@@ -218,4 +219,12 @@ in {
       git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6";
     };
   };
+
+  ruby_2_4_0 = generic {
+    version = rubyVersion "2" "4" "0" "";
+    sha256 = {
+      src = "0gcyn9328w2vma882l71c9v9ygmmsj2z8j1l44c4l2x92nyx0bqm";
+      git = "1w9zyx8xmka8jdiha57snnbfls2r6dc9g03d8cjx0nxkmwf3r2l3";
+    };
+  };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index d21e7d669dc..a3aeaf6a8ba 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -65,4 +65,9 @@ rec {
     "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
+  "2.4.0" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.4.0/railsexpress/01-skip-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.4.0/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.4.0/railsexpress/03-display-more-detailed-stack-trace.patch"
+  ];
 }
diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
index bbe1038bab2..51db26b7823 100644
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@@ -1,8 +1,8 @@
 { fetchFromGitHub }:
 
 fetchFromGitHub {
-  owner  = "skaes";
+  owner  = "manveru";
   repo   = "rvm-patchsets";
-  rev    = "951e47ca1022cd1e41de9177fa87438cfb72d127";
-  sha256 = "18n2frwmn6lcnjywysyjam1zfzfad0r50141xs2h9kifsyak5xcf";
+  rev    = "46e04f230ce91a786f5e583389443efec0ecd594";
+  sha256 = "0ayh8zj8knyz3344an942qdf33pi42jmksqk34frb346zi1ag693";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7bc807082f1..a9c86813cf1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5777,7 +5777,8 @@ in
     ruby_2_0_0
     ruby_2_1_10
     ruby_2_2_5
-    ruby_2_3_3;
+    ruby_2_3_3
+    ruby_2_4_0;
 
   # Ruby aliases
   ruby = ruby_2_3;
@@ -5786,6 +5787,7 @@ in
   ruby_2_1 = ruby_2_1_10;
   ruby_2_2 = ruby_2_2_5;
   ruby_2_3 = ruby_2_3_3;
+  ruby_2_4 = ruby_2_4_0;
 
   scsh = callPackage ../development/interpreters/scsh { };
 

From cfbe501d4ecb6173be204e68a0d7b5e8f52086e8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 27 Dec 2016 17:26:56 +0100
Subject: [PATCH 0231/1310] nixos/graphite: fix beacon config parameter

---
 nixos/modules/services/monitoring/graphite.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index b8be9296bc9..c5352e5887d 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -585,7 +585,7 @@ in {
         serviceConfig = {
           ExecStart = ''
             ${pkgs.pythonPackages.graphite_beacon}/bin/graphite-beacon \
-              --config ${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)}
+              --config=${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)}
           '';
           User = "graphite";
           Group = "graphite";

From 474b35994b5e3b0aa750504ff95bd868ab96ef72 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Tue, 27 Dec 2016 00:46:44 +0200
Subject: [PATCH 0232/1310] syncthing: 0.14.15 -> 0.14.17

---
 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 4263b7e6f77..628e645ab60 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, go, pkgs }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.15";
+  version = "0.14.17";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "0iq7pzb9f0vgikxxxwvrhi5rlgw9frcwy0lgvc61l6lbw3vl0rd7";
+    sha256 = "0l220jnm8xwfc5jrznan15290al05bim5yyy4wngj9c55av6mlzq";
   };
 
   buildInputs = [ go ];

From 228f657a2b486119c088a0e5a4c647bf55215706 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 27 Dec 2016 22:05:06 +0100
Subject: [PATCH 0233/1310] python:graphite_beacon: 0.22.1 -> 0.27.0

---
 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 49783ad83c5..edb81aac60e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28356,14 +28356,14 @@ EOF
   };
 
   graphite_beacon = buildPythonPackage rec {
-    name = "graphite_beacon-0.22.1";
+    name = "graphite_beacon-0.27.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/g/graphite_beacon/${name}.tar.gz";
-      sha256 = "ebde1aba8030c8aeffaeea39f9d44a2be464b198583ad4a390a2bff5f4172543";
+      sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks";
     };
 
-    propagatedBuildInputs = [ self.tornado ];
+    propagatedBuildInputs = [ self.tornado self.pyyaml self.funcparserlib ];
 
     preBuild = "> requirements.txt";
 

From c311871a6d0a3f83a0cec3e6b8804a741b83dcb5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 27 Dec 2016 23:47:29 +0100
Subject: [PATCH 0234/1310] xserver.wacom: update xorg.conf.d name after
 upstream change of the number

---
 nixos/modules/services/x11/hardware/wacom.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix
index 540ed168b48..a27889c36a7 100644
--- a/nixos/modules/services/x11/hardware/wacom.nix
+++ b/nixos/modules/services/x11/hardware/wacom.nix
@@ -22,7 +22,7 @@ in
           which will make Xorg reconfigure the device ?
 
           If you're not satisfied by the default behaviour you can override
-          <option>environment.etc."X11/xorg.conf.d/50-wacom.conf"</option> in
+          <option>environment.etc."X11/xorg.conf.d/70-wacom.conf"</option> in
           configuration.nix easily.
         '';
       };
@@ -40,7 +40,7 @@ in
 
     services.udev.packages = [ pkgs.xf86_input_wacom ];
 
-    environment.etc."X11/xorg.conf.d/50-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/50-wacom.conf";
+    environment.etc."X11/xorg.conf.d/70-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/70-wacom.conf";
 
   };
 

From 6eead52e1252413ea835fa1261bbf73ff569d23d Mon Sep 17 00:00:00 2001
From: Christopher League <league@contrapunctus.net>
Date: Tue, 27 Dec 2016 13:39:53 -0500
Subject: [PATCH 0235/1310] gphoto2: nixos programs module to configure udev

Closes #21420.
---
 lib/maintainers.nix                           |  1 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/programs/gphoto2.nix            | 31 +++++++++++++++++++
 .../libraries/libgphoto2/default.nix          |  6 +++-
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/programs/gphoto2.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7ed8ae953bc..a06f1695294 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -240,6 +240,7 @@
   lassulus = "Lassulus <lassulus@gmail.com>";
   layus = "Guillaume Maudoux <layus.on@gmail.com>";
   ldesgoui = "Lucas Desgouilles <ldesgoui@gmail.com>";
+  league = "Christopher League <league@contrapunctus.net>";
   lebastr = "Alexander Lebedev <lebastr@gmail.com>";
   leenaars = "Michiel Leenaars <ml.software@leenaa.rs>";
   leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index cd12fe4f9b3..b3177589716 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -71,6 +71,7 @@
   ./programs/environment.nix
   ./programs/fish.nix
   ./programs/freetds.nix
+  ./programs/gphoto2.nix
   ./programs/info.nix
   ./programs/java.nix
   ./programs/kbdlight.nix
diff --git a/nixos/modules/programs/gphoto2.nix b/nixos/modules/programs/gphoto2.nix
new file mode 100644
index 00000000000..47822562aee
--- /dev/null
+++ b/nixos/modules/programs/gphoto2.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  meta.maintainers = [ maintainers.league ];
+
+  ###### interface
+  options = {
+    programs.gphoto2 = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = ''
+          Whether to configure system to use gphoto2.
+          To grant digital camera access to a user, the user must
+          be part of the camera group:
+          <code>users.extraUsers.alice.extraGroups = ["camera"];</code>
+        '';
+      };
+    };
+  };
+
+  ###### implementation
+  config = mkIf config.programs.gphoto2.enable {
+    services.udev.packages = [ pkgs.libgphoto2 ];
+    environment.systemPackages = [ pkgs.gphoto2 ];
+    users.extraGroups.camera = {};
+  };
+}
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 68736608ad4..e9b6968d13b 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  postInstall = ''
+    mkdir -p $out/lib/udev/rules.d
+    $out/lib/libgphoto2/print-camera-list udev-rules version 175 group camera >$out/lib/udev/rules.d/40-gphoto2.rules
+  '';
+
   meta = {
     homepage = http://www.gphoto.org/proj/libgphoto2/;
     description = "A library for accessing digital cameras";
@@ -41,4 +46,3 @@ stdenv.mkDerivation rec {
     maintainers = with stdenv.lib.maintainers; [ jcumming ];
   };
 }
-

From 74753d01f8249ab1119314fa3d8ac60ccf6e601e Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 25 Dec 2016 08:11:12 -0800
Subject: [PATCH 0236/1310] release-cross: Reformat to be far more legible

---
 pkgs/top-level/release-cross.nix | 170 +++++++++++++++----------------
 1 file changed, 80 insertions(+), 90 deletions(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index f670eaea98a..9b6d509eae9 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -20,39 +20,34 @@ let
   basic = basicCrossDrv // basicNativeDrv;
 
 in
-(
 
-/* Test some cross builds to the Sheevaplug */
-let
-  crossSystem = {
-    config = "armv5tel-unknown-linux-gnueabi";
-    bigEndian = false;
-    arch = "arm";
-    float = "soft";
-    withTLS = true;
-    platform = pkgs.platforms.sheevaplug;
-    libc = "glibc";
-    openssl.system = "linux-generic32";
-  };
+{
+  /* Test some cross builds to the Sheevaplug */
+  crossSheevaplugLinux = let
+    crossSystem = {
+      config = "armv5tel-unknown-linux-gnueabi";
+      bigEndian = false;
+      arch = "arm";
+      float = "soft";
+      withTLS = true;
+      platform = pkgs.platforms.sheevaplug;
+      libc = "glibc";
+      openssl.system = "linux-generic32";
+    };
+  in mapTestOnCross crossSystem (basic // {
+    ubootSheevaplug.crossDrv = nativePlatforms;
+  });
 
-in {
-  crossSheevaplugLinux = mapTestOnCross crossSystem (
-    basic //
-    {
-      ubootSheevaplug.crossDrv = nativePlatforms;
-    });
-}) // (
 
-/* Test some cross builds on 32 bit mingw-w64 */
-let
-  crossSystem = {
+  /* Test some cross builds on 32 bit mingw-w64 */
+  crossMingw32 = let
+    crossSystem = {
       config = "i686-w64-mingw32";
       arch = "x86"; # Irrelevant
       libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
       platform = {};
-  };
-in {
-  crossMingw32 = mapTestOnCross crossSystem {
+    };
+  in mapTestOnCross crossSystem {
     coreutils.crossDrv = nativePlatforms;
     boehmgc.crossDrv = nativePlatforms;
     gmp.crossDrv = nativePlatforms;
@@ -62,19 +57,18 @@ in {
     libunistring.crossDrv = nativePlatforms;
     windows.wxMSW.crossDrv = nativePlatforms;
   };
-}) // (
 
-/* Test some cross builds on 64 bit mingw-w64 */
-let
-  crossSystem = {
+
+  /* Test some cross builds on 64 bit mingw-w64 */
+  crossMingwW64 = let
+    crossSystem = {
       # That's the triplet they use in the mingw-w64 docs.
       config = "x86_64-w64-mingw32";
       arch = "x86_64"; # Irrelevant
       libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
       platform = {};
-  };
-in {
-  crossMingwW64 = mapTestOnCross crossSystem {
+    };
+  in mapTestOnCross crossSystem {
     coreutils.crossDrv = nativePlatforms;
     boehmgc.crossDrv = nativePlatforms;
     gmp.crossDrv = nativePlatforms;
@@ -84,63 +78,60 @@ in {
     libunistring.crossDrv = nativePlatforms;
     windows.wxMSW.crossDrv = nativePlatforms;
   };
-}) // (
 
-/* Linux on the fuloong */
-let
-  crossSystem = {
-    config = "mips64el-unknown-linux";
-    bigEndian = false;
-    arch = "mips";
-    float = "hard";
-    withTLS = true;
-    libc = "glibc";
-    platform = {
-      name = "fuloong-minipc";
-      kernelMajor = "2.6";
-      kernelBaseConfig = "lemote2f_defconfig";
-      kernelHeadersBaseConfig = "fuloong2e_defconfig";
-      uboot = null;
-      kernelArch = "mips";
-      kernelAutoModules = false;
-      kernelTarget = "vmlinux";
-    };
-    openssl.system = "linux-generic32";
-    gcc = {
-      arch = "loongson2f";
-      abi = "n32";
-    };
-  };
-in {
-  fuloongminipc = mapTestOnCross crossSystem {
 
+  /* Linux on the fuloong */
+  fuloongminipc = let
+    crossSystem = {
+      config = "mips64el-unknown-linux";
+      bigEndian = false;
+      arch = "mips";
+      float = "hard";
+      withTLS = true;
+      libc = "glibc";
+      platform = {
+        name = "fuloong-minipc";
+        kernelMajor = "2.6";
+        kernelBaseConfig = "lemote2f_defconfig";
+        kernelHeadersBaseConfig = "fuloong2e_defconfig";
+        uboot = null;
+        kernelArch = "mips";
+        kernelAutoModules = false;
+        kernelTarget = "vmlinux";
+      };
+      openssl.system = "linux-generic32";
+      gcc = {
+        arch = "loongson2f";
+        abi = "n32";
+      };
+    };
+  in mapTestOnCross crossSystem {
     coreutils.crossDrv = nativePlatforms;
     ed.crossDrv = nativePlatforms;
     patch.crossDrv = nativePlatforms;
   };
-}) // (
 
-/* Linux on Raspberrypi */
-let
-  crossSystem = {
-    config = "armv6l-unknown-linux-gnueabi";
-    bigEndian = false;
-    arch = "arm";
-    float = "hard";
-    fpu = "vfp";
-    withTLS = true;
-    libc = "glibc";
-    platform = pkgs.platforms.raspberrypi;
-    openssl.system = "linux-generic32";
-    gcc = {
-      arch = "armv6";
+
+  /* Linux on Raspberrypi */
+  rpi = let
+    crossSystem = {
+      config = "armv6l-unknown-linux-gnueabi";
+      bigEndian = false;
+      arch = "arm";
+      float = "hard";
       fpu = "vfp";
-      float = "softfp";
-      abi = "aapcs-linux";
+      withTLS = true;
+      libc = "glibc";
+      platform = pkgs.platforms.raspberrypi;
+      openssl.system = "linux-generic32";
+      gcc = {
+        arch = "armv6";
+        fpu = "vfp";
+        float = "softfp";
+        abi = "aapcs-linux";
+      };
     };
-  };
-in {
-  rpi = mapTestOnCross crossSystem {
+  in mapTestOnCross crossSystem {
     coreutils.crossDrv = nativePlatforms;
     ed.crossDrv = nativePlatforms;
     patch.crossDrv = nativePlatforms;
@@ -152,13 +143,12 @@ in {
     binutils.crossDrv = nativePlatforms;
     mpg123.crossDrv = nativePlatforms;
   };
-}) // (
 
-/* Cross-built bootstrap tools for every supported platform */
-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 {
-  bootstrapTools = pkgs.lib.mapAttrs (name: mkBootstrapToolsJob) tools;
-})
+
+  /* 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;
+}

From db0dbd0b81cdcb879186645a3eec47a9882f2366 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 25 Dec 2016 10:17:03 -0800
Subject: [PATCH 0237/1310] release-cross: Use the same genAttrs logic for
 `testOnCross` as `testOn`

Eventually we'll want to test cross-compiling *from* various platforms. For
now, its good to be consistent.
---
 pkgs/top-level/release-cross.nix | 2 +-
 pkgs/top-level/release-lib.nix   | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 9b6d509eae9..cbafc65195d 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -1,4 +1,4 @@
-with import ./release-lib.nix { supportedSystems = []; };
+with import ./release-lib.nix { supportedSystems = [ builtins.currentSystem ]; };
 let
   nativePlatforms = linux;
 
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 5f6dd49d6ec..fba8429c9c7 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -59,10 +59,9 @@ rec {
   /* Similar to the testOn function, but with an additional
      'crossSystem' parameter for allPackages, defining the target
      platform for cross builds. */
-  testOnCross = crossSystem: systems: f: {system ? builtins.currentSystem}:
-    if elem system systems
-    then f (allPackages { inherit system crossSystem; })
-    else {};
+  testOnCross = crossSystem: systems: f: genAttrs
+    (filter (x: elem x supportedSystems) systems)
+    (system: hydraJob' (f (allPackages { inherit system crossSystem; })));
 
 
   /* Given a nested set where the leaf nodes are lists of platforms,

From 916012121cb950d66ab04ff62eff16b2d94edb7f Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 25 Dec 2016 10:38:37 -0800
Subject: [PATCH 0238/1310] release-cross: Factor out system filtering

---
 pkgs/top-level/release-lib.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index fba8429c9c7..5fe87711c01 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -46,21 +46,22 @@ rec {
      interested in the result of cross building a package. */
   crossMaintainers = [ maintainers.viric ];
 
+  forAllSupportedSystems = systems: f:
+    genAttrs (filter (x: elem x supportedSystems) systems) f;
 
   /* Build a package on the given set of platforms.  The function `f'
      is called for each supported platform with Nixpkgs for that
      platform as an argument .  We return an attribute set containing
      a derivation for each supported platform, i.e. ‘{ x86_64-linux =
      f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }’. */
-  testOn = systems: f: genAttrs
-    (filter (x: elem x supportedSystems) systems) (system: hydraJob' (f (pkgsFor system)));
+  testOn = systems: f: forAllSupportedSystems systems
+    (system: hydraJob' (f (pkgsFor system)));
 
 
   /* Similar to the testOn function, but with an additional
      'crossSystem' parameter for allPackages, defining the target
      platform for cross builds. */
-  testOnCross = crossSystem: systems: f: genAttrs
-    (filter (x: elem x supportedSystems) systems)
+  testOnCross = crossSystem: systems: f: forAllSupportedSystems systems
     (system: hydraJob' (f (allPackages { inherit system crossSystem; })));
 
 

From ca3f41d44bd701efd1b252ea7d717a2031ece332 Mon Sep 17 00:00:00 2001
From: Spiros Boosalis <SamBoosalis@gmail.com>
Date: Wed, 28 Dec 2016 03:28:07 +0000
Subject: [PATCH 0239/1310] pocketsphinx: 0.8 -> 5prealpha

---
 .../libraries/pocketsphinx/default.nix        | 33 ++++++++++++++++---
 .../libraries/sphinxbase/default.nix          |  8 +++--
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix
index ac4041ee964..bc37cfb3d18 100644
--- a/pkgs/development/libraries/pocketsphinx/default.nix
+++ b/pkgs/development/libraries/pocketsphinx/default.nix
@@ -1,16 +1,22 @@
-{ stdenv, fetchurl, sphinxbase, pkgconfig }:
+{ stdenv
+, fetchurl
+, sphinxbase
+, pkgconfig
+, python27 # >= 2.6
+, swig2 # 2.0
+}:
 
 stdenv.mkDerivation rec {
-  name = "pocketsphinx-0.8";
+  name = "pocketsphinx-5prealpha";
 
   src = fetchurl {
     url = "mirror://sourceforge/cmusphinx/${name}.tar.gz";
-    sha256 = "0ynf5ik4ib2d3ha3r4i8ywpr2dz5i6v51hmfl8kgzj4i7l44qk47";
+    sha256 = "1n9yazzdgvpqgnfzsbl96ch9cirayh74jmpjf7svs4i7grabanzg";
   };
 
   propagatedBuildInputs = [ sphinxbase ];
 
-  buildInputs = [ pkgconfig ];
+  buildInputs = [ pkgconfig python27 swig2 ];
 
   meta = {
     description = "Voice recognition library written in C";
@@ -19,3 +25,22 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
   };
 }
+
+/* Example usage:
+
+
+1.
+
+$ cat << EOF > vocabulary.txt
+oh mighty computer /1e-40/
+hello world /1e-30/
+EOF
+
+2.
+
+$ pocketsphinx_continuous -inmic yes -kws vocabulary.txt 2> /dev/null
+# after you say "hello world":
+hello world
+...
+
+*/
diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix
index 1b4cf69f704..e82b2fe045b 100644
--- a/pkgs/development/libraries/sphinxbase/default.nix
+++ b/pkgs/development/libraries/sphinxbase/default.nix
@@ -2,18 +2,20 @@
 , fetchurl
 , bison
 , pkgconfig
+, python27 # >= 2.6
+, swig2 # 2.0
 , multipleOutputs ? false #Uses incomplete features of nix!
 }:
 
 stdenv.mkDerivation (rec {
-  name = "sphinxbase-0.8";
+  name = "sphinxbase-5prealpha";
 
   src = fetchurl {
     url = "mirror://sourceforge/cmusphinx/${name}.tar.gz";
-    sha256 = "1a3c91g6rcfb2k8qyfhnd7s68ds6pxwv61xfp0ai1arbhx28jw2m";
+    sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp";
   };
 
-  buildInputs = [ pkgconfig bison ];
+  buildInputs = [ swig2 python27 pkgconfig bison ];
 
   meta = {
     description = "Support Library for Pocketsphinx";

From 0e0fb196cae4224809b3e829e9c6f258b2bcd9ca Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@traumapony.org>
Date: Wed, 28 Dec 2016 13:35:42 +1000
Subject: [PATCH 0240/1310] openntpd: v6+ requires libressl for constraints

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

diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix
index 47d1dbbcbe6..6f3aab3082f 100644
--- a/pkgs/tools/networking/openntpd/default.nix
+++ b/pkgs/tools/networking/openntpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl
+{ stdenv, fetchurl, libressl
 , privsepPath ? "/var/empty"
 , privsepUser ? "ntp"
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
   ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [ libressl ];
 
   installFlags = [
     "sysconfdir=\${out}/etc"

From c6bcc485de63b4eeb8032b5f30611fa308b6740c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 26 Dec 2016 14:56:15 +0100
Subject: [PATCH 0241/1310] linux_4_8: add patch to fix CVE-2016-9919

---
 pkgs/os-specific/linux/kernel/patches.nix | 10 ++++++++++
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 74cf8d156af..1ad1155f8c3 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -165,4 +165,14 @@ rec {
         sha256 = "19viqjjgq8j8jiz5yhgmzwhqvhwv175q645qdazd1k69d25nv2ki";
       };
     };
+
+  panic_on_icmp6_frag_CVE_2016_9919 = rec
+    { name = "panic_on_icmp6_frag_CVE_2016_9919.patch";
+      patch = fetchpatch {
+        inherit name;
+        url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=79dc7e3f1cd323be4c81aa1a94faa1b3ed987fb2";
+        sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p";
+      };
+    };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6a3cd97a17..ab4c2946d13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11079,6 +11079,7 @@ in
         # !!! 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

From 7ae2d221cd13fd13c477387fb93aa5fb33f6bafa Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Dec 2016 06:35:31 +0100
Subject: [PATCH 0242/1310] bird service: add bird to systemPackages

For the tool birdc to monitor and configure bird.
---
 nixos/modules/services/networking/bird.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix
index 174354c9eb4..1a7a1e24b70 100644
--- a/nixos/modules/services/networking/bird.nix
+++ b/nixos/modules/services/networking/bird.nix
@@ -34,6 +34,7 @@ let
 
       ###### implementation
       config = mkIf cfg.enable {
+        environment.systemPackages = [ pkg ];
         systemd.services.${variant} = {
           description = "BIRD Internet Routing Daemon";
           wantedBy = [ "multi-user.target" ];

From 06090a73bbe8b1173b36bdf38ed4cbdd9348a911 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Wed, 28 Dec 2016 01:05:45 +0800
Subject: [PATCH 0243/1310] crystal: fix build in chroot environment, again

forgot to patch interpreter of the script used by Makefile,
carefully ensure it can build without /usr/bin/env this time.
---
 pkgs/development/compilers/crystal/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 5bb3b60d96d..39a06a4b1dc 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -60,6 +60,9 @@ stdenv.mkDerivation rec {
     # patch the script which launches the prebuilt compiler
     substituteInPlace $(pwd)/crystal-${version}-1/bin/crystal --replace \
       "/usr/bin/env bash" "${stdenv.shell}"
+    substituteInPlace $(pwd)/crystal-${version}/bin/crystal --replace \
+      "/usr/bin/env bash" "${stdenv.shell}"
+
     ${fixPrebuiltBinary}
 
     cd crystal-${version}

From 193017646245023735cf07106f6962f72123b5f6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 28 Dec 2016 12:50:24 +0300
Subject: [PATCH 0244/1310] deluge: 1.3.12 -> 1.3.13

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index edb81aac60e..fc48d6eda86 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9990,15 +9990,16 @@ in {
   };
 
   deluge = buildPythonPackage rec {
-    name = "deluge-1.3.12";
+    name = "deluge-${version}";
+    version = "1.3.13";
 
     src = pkgs.fetchurl {
       url = "http://download.deluge-torrent.org/source/${name}.tar.bz2";
-      sha256 = "14rwc5k7q0d36b4jxnmxgnyvx9lnmaifxpyv0z07ymphlfr4amsn";
+      sha256 = "1ig8kv22009f0ny6n77a4lcfddhdsxrdklpmhdqvis1wx8na5crp";
     };
 
     propagatedBuildInputs = with self; [
-      pyGtkGlade pkgs.libtorrentRasterbar_1_0 twisted Mako chardet pyxdg self.pyopenssl service-identity
+      pyGtkGlade pkgs.libtorrentRasterbar twisted Mako chardet pyxdg self.pyopenssl service-identity
     ];
 
     nativeBuildInputs = [ pkgs.intltool ];

From 3414470d9d3ec273bfe255abef6c92febff308b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20P=C3=A4tzel?= <david.a.paetzel+github@gmail.com>
Date: Sun, 23 Oct 2016 16:25:08 +0200
Subject: [PATCH 0245/1310] urlscan: init at 0.8.3

---
 lib/maintainers.nix                        |  1 +
 pkgs/applications/misc/urlscan/default.nix | 25 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix         |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/misc/urlscan/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6e39439e0b6..2431d56d9f8 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -129,6 +129,7 @@
   dochang = "Desmond O. Chang <dochang@gmail.com>";
   domenkozar = "Domen Kozar <domen@dev.si>";
   doublec = "Chris Double <chris.double@double.co.nz>";
+  dpaetzel = "David Pätzel <david.a.paetzel@gmail.com>";
   drets = "Dmytro Rets <dmitryrets@gmail.com>";
   drewkett = "Andrew Burkett <burkett.andrew@gmail.com>";
   dtzWill = "Will Dietz <nix@wdtz.org>";
diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
new file mode 100644
index 00000000000..2d01d203ba1
--- /dev/null
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, isPy35, fetchFromGitHub, urwid }:
+
+buildPythonPackage rec {
+  name = "urlscan-${version}";
+  version = "0.8.3";
+
+  src = fetchFromGitHub {
+    owner = "firecat53";
+    repo = "urlscan";
+    rev = version;
+    # (equivalent but less nice(?): rev = "00333f6d03bf3151c9884ec778715fc605f58cc5")
+    sha256 = "0l40anfznam4d3q0q0jp2wwfrvfypz9ppbpjyzjdrhb3r2nizb0y";
+  };
+
+  propagatedBuildInputs = [ urwid ];
+
+  # FIXME doesn't work with 2.7; others than 2.7 and 3.5 were not tested (yet)
+  disabled = ! isPy35;
+
+  meta = with stdenv.lib; {
+    description = "Mutt and terminal url selector (similar to urlview)";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.dpaetzel ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fc48d6eda86..4a3a7c6e3c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31725,6 +31725,8 @@ EOF
     };
   };
 
+  urlscan = callPackage ../applications/misc/urlscan { };
+
   wp_export_parser = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "wp_export_parser";

From 2d38cad288207e1f8eb27d1ddea097e58a621e01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20P=C3=A4tzel?= <david.a.paetzel+github@gmail.com>
Date: Sun, 23 Oct 2016 23:13:36 +0200
Subject: [PATCH 0246/1310] enhance python version check

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

diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index 2d01d203ba1..b686c4ba9c4 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ urwid ];
 
   # FIXME doesn't work with 2.7; others than 2.7 and 3.5 were not tested (yet)
-  disabled = ! isPy35;
+  disabled = !pythonOlder "3.5";
 
   meta = with stdenv.lib; {
     description = "Mutt and terminal url selector (similar to urlview)";

From 2990cd8aeac6b6a05121eebb0f5ca997eb73a650 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 28 Dec 2016 12:19:09 +0100
Subject: [PATCH 0247/1310] clblas-cuda: use system gtest library

Without this the build attempts to download the library.
---
 .../development/libraries/science/math/clblas/cuda/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/science/math/clblas/cuda/default.nix b/pkgs/development/libraries/science/math/clblas/cuda/default.nix
index c142514b262..6d3faa2fb7f 100644
--- a/pkgs/development/libraries/science/math/clblas/cuda/default.nix
+++ b/pkgs/development/libraries/science/math/clblas/cuda/default.nix
@@ -7,6 +7,7 @@
 , python
 , cudatoolkit
 , nvidia_x11
+, gtest
 }:
 
 stdenv.mkDerivation rec {
@@ -40,6 +41,7 @@ stdenv.mkDerivation rec {
     cmake ../src -DCMAKE_INSTALL_PREFIX=$out \
                  -DCMAKE_BUILD_TYPE=Release \
                  -DOPENCL_ROOT=${cudatoolkit} \
+                 -DUSE_SYSTEM_GTEST=ON
   '';
 
   dontStrip = true; 
@@ -51,6 +53,7 @@ stdenv.mkDerivation rec {
     python
     cudatoolkit
     nvidia_x11
+    gtest
   ]; 
 
   meta = with stdenv.lib; {

From bef1d42300799c0c42fb4c6b12759c47d6f2444c Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Wed, 28 Dec 2016 12:39:51 +0100
Subject: [PATCH 0248/1310] confclerk: init at 0.6.1

---
 pkgs/applications/misc/confclerk/default.nix | 28 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/misc/confclerk/default.nix

diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix
new file mode 100644
index 00000000000..08f654cdec4
--- /dev/null
+++ b/pkgs/applications/misc/confclerk/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, qt4, qmake4Hook }:
+
+let version = "0.6.1"; in
+stdenv.mkDerivation {
+  name = "confclerk-${version}";
+
+  src = fetchurl {
+    url = "http://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz";
+    sha256 = "1wprndshmc7k1919n7k93c4ha2jp171q31gx7xsbzx7g4sw6432g";
+  };
+
+  buildInputs = [ qt4 ];
+
+  nativeBuildInputs = [ qmake4Hook ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp src/bin/confclerk $out/bin
+  '';
+
+  meta = {
+    description = "Offline conference schedule viewer";
+    homepage = "http://www.toastfreeware.priv.at/confclerk";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ ehmry ];
+    inherit (qt4.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4525a73cd67..ee8523342ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12545,6 +12545,8 @@ in
     inherit (gnome2) GConf ORBit2 metacity;
   };
 
+  confclerk = callPackage ../applications/misc/confclerk { };
+
   copyq = callPackage ../applications/misc/copyq { };
 
   coriander = callPackage ../applications/video/coriander {

From 04736aef42e6bb5bad9d703bc9f2b53620d1b7c1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 28 Dec 2016 06:37:08 -0600
Subject: [PATCH 0249/1310] kde5.plasma: 5.8.4 -> 5.8.5

---
 pkgs/desktops/kde-5/plasma/fetch.sh |   2 +-
 pkgs/desktops/kde-5/plasma/srcs.nix | 320 ++++++++++++++--------------
 2 files changed, 161 insertions(+), 161 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh
index 60928c3900d..76f05bad0a7 100644
--- a/pkgs/desktops/kde-5/plasma/fetch.sh
+++ b/pkgs/desktops/kde-5/plasma/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.4/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.5/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix
index 75f44f47bec..03ee867453b 100644
--- a/pkgs/desktops/kde-5/plasma/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma/srcs.nix
@@ -3,323 +3,323 @@
 
 {
   bluedevil = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/bluedevil-5.8.4.tar.xz";
-      sha256 = "1c49f35574948q541q25wsalhdz0yji9x18hpg7lc9mb117114fq";
-      name = "bluedevil-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/bluedevil-5.8.5.tar.xz";
+      sha256 = "07gj3m5f0rk26n0xm4yddsfny6l2sh0airm45hb33p7m5inaqzgv";
+      name = "bluedevil-5.8.5.tar.xz";
     };
   };
   breeze = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/breeze-5.8.4.tar.xz";
-      sha256 = "0jxlvr9yf7pilwjvzzhhx8di6a2gx8812hl08fh4lszbkdia69yw";
-      name = "breeze-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/breeze-5.8.5.tar.xz";
+      sha256 = "1gcns00iq7a5f1a0w6vf8zck669gzcd785fiybnvc6s6q8x4bp61";
+      name = "breeze-5.8.5.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/breeze-grub-5.8.4.tar.xz";
-      sha256 = "1sysdw3agm568l8mc6bv7g2vhxny34h1b4k9wm36c1x1xyac72cm";
-      name = "breeze-grub-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/breeze-grub-5.8.5.tar.xz";
+      sha256 = "12ynrxdfcraphbwv9yrfhvwf3xkzrw0raqvgi7ksz5cvh78kl5qf";
+      name = "breeze-grub-5.8.5.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/breeze-gtk-5.8.4.tar.xz";
-      sha256 = "127hhlxicc3rsxxi9cwcqj32w3yyi20p1sfmfk7gjnklm6zv8b0a";
-      name = "breeze-gtk-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/breeze-gtk-5.8.5.tar.xz";
+      sha256 = "15dx5hl9w9fiash30vgkbww6h7hck0dr42hh8gzysn0xyf0fzpgd";
+      name = "breeze-gtk-5.8.5.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/breeze-plymouth-5.8.4.tar.xz";
-      sha256 = "0lsdincygh75yib1nfyqnwghnpi3pwjyjvkgyza142s49vynkdkj";
-      name = "breeze-plymouth-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/breeze-plymouth-5.8.5.tar.xz";
+      sha256 = "1ryb2jrzw0bzpi7ig4h5k0i33d2qviqsjxw7mnqxcb9q49a4ziq1";
+      name = "breeze-plymouth-5.8.5.tar.xz";
     };
   };
   discover = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/discover-5.8.4.tar.xz";
-      sha256 = "1wkwkk0cqyz9d68d9s651cjahimb9phwr7k55g6mkigdkljd18fx";
-      name = "discover-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/discover-5.8.5.tar.xz";
+      sha256 = "0fr6mksqw46aghfzj78nlq3f89xd63vq2hr4c3gb4vkl5y8v08hg";
+      name = "discover-5.8.5.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kactivitymanagerd-5.8.4.tar.xz";
-      sha256 = "0rb9gc584lhbqfn9q31rl1h0aqiv90b1cb5pd5rcsq6s2yz0g8i2";
-      name = "kactivitymanagerd-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kactivitymanagerd-5.8.5.tar.xz";
+      sha256 = "07cqnbyznn5wy7vrqyid8h5ah7h3sb3pb30qlm83b4m29bkhggwh";
+      name = "kactivitymanagerd-5.8.5.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kde-cli-tools-5.8.4.tar.xz";
-      sha256 = "0vzb5gq94hwyzz32z5gvdrpzj3ysvsqb6k25cfc3sy93hwla3a14";
-      name = "kde-cli-tools-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kde-cli-tools-5.8.5.tar.xz";
+      sha256 = "1ig9x5h9xkzis9izggkjpiiy4sm77pk347jdngx01qpacz68iyp7";
+      name = "kde-cli-tools-5.8.5.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kdecoration-5.8.4.tar.xz";
-      sha256 = "06ch3871yifkimqs67z3j7rv673qw6wa01x6qnc6899rckg1kdl4";
-      name = "kdecoration-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kdecoration-5.8.5.tar.xz";
+      sha256 = "1vhw57pj9i5224i9irk4qmingvkg5bip11vsqiwhmn5307bpnfiq";
+      name = "kdecoration-5.8.5.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kde-gtk-config-5.8.4.tar.xz";
-      sha256 = "15jw7wvk3jl9rbcm2f3vx6i5mjqzibj87l85r9cr33cxaq06wdn4";
-      name = "kde-gtk-config-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kde-gtk-config-5.8.5.tar.xz";
+      sha256 = "1j0mzmmdhqd3a8papps6cad0gqn081mc4kqzi2hjai7038l6951r";
+      name = "kde-gtk-config-5.8.5.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kdeplasma-addons-5.8.4.tar.xz";
-      sha256 = "0f1956dppgyx313ihjv8f21lql387rzzkvmg9y9lh7yidl75gfz4";
-      name = "kdeplasma-addons-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kdeplasma-addons-5.8.5.tar.xz";
+      sha256 = "181kagb4nbl9a7akk79slwkb7m2j4vyhabagih0z8l45wl5wrz9d";
+      name = "kdeplasma-addons-5.8.5.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kgamma5-5.8.4.tar.xz";
-      sha256 = "1r5mzdk2givjmq5j374hgbf17jni4n7836pli2vka4qbjbrlzfg1";
-      name = "kgamma5-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kgamma5-5.8.5.tar.xz";
+      sha256 = "073z4w4i2hwsqqgxcfl0w8d57nhzc069h9zwp7fv93aaw4mgzci2";
+      name = "kgamma5-5.8.5.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/khotkeys-5.8.4.tar.xz";
-      sha256 = "1q766aaq1l6ihgvjxlw69kpm91ai8nbcc9qc6xnz1924p9957nl3";
-      name = "khotkeys-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/khotkeys-5.8.5.tar.xz";
+      sha256 = "1fh0z9vfb908nbwj3snkf9z55jbcb5id87k5sa0v8dhazmp91ylh";
+      name = "khotkeys-5.8.5.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kinfocenter-5.8.4.tar.xz";
-      sha256 = "1mnvp4bkhvmpqfqjag46fcx0kr7w8mq29djqlfd9akypqmzszbvd";
-      name = "kinfocenter-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kinfocenter-5.8.5.tar.xz";
+      sha256 = "1fksnb9klbcrr9ly6dd2yx5y1ngcwcln43zykpc76pr4i49jpggp";
+      name = "kinfocenter-5.8.5.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kmenuedit-5.8.4.tar.xz";
-      sha256 = "0wm40swxarnzv7hs11r1wmj6b0yjby3sxk8n59z6s2zza64n6n8h";
-      name = "kmenuedit-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kmenuedit-5.8.5.tar.xz";
+      sha256 = "1vq5f69w75lj81nz75db88lqxc4zvhicd5w7r6k7amggnwxm9f3m";
+      name = "kmenuedit-5.8.5.tar.xz";
     };
   };
   kscreen = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kscreen-5.8.4.tar.xz";
-      sha256 = "1j43gzxv9j4fjszc839968vmlsrqg7bapwvjnwfc3mc8z2w7a6hl";
-      name = "kscreen-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kscreen-5.8.5.tar.xz";
+      sha256 = "069x3vsfqirmq8r7yfa68srhjvygdwsxcj0b4vvb7zivs29zn1mh";
+      name = "kscreen-5.8.5.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kscreenlocker-5.8.4.tar.xz";
-      sha256 = "1n4wbzfi2h9lxj8g1qii43q205by1bqv48xxyr871mmmikxrk6qv";
-      name = "kscreenlocker-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kscreenlocker-5.8.5.tar.xz";
+      sha256 = "11b2v3chhk1ma5kjbmf35qahfr8gbaw78mcqs8vw5m9x74vlimkj";
+      name = "kscreenlocker-5.8.5.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/ksshaskpass-5.8.4.tar.xz";
-      sha256 = "033mjmry0hbz2daa9w0i2drxrdjyraynxhlnq0b331b6klxhzczc";
-      name = "ksshaskpass-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/ksshaskpass-5.8.5.tar.xz";
+      sha256 = "1gr48f4akrn0yhlnjw4yaas6ah5z40fb8iz06gi1dzry5axfmaxh";
+      name = "ksshaskpass-5.8.5.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/ksysguard-5.8.4.tar.xz";
-      sha256 = "1hmj32c2jzvk6fwbvdh3ij1651bfslfqhy52y79mc6q816wm7fv3";
-      name = "ksysguard-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/ksysguard-5.8.5.tar.xz";
+      sha256 = "1gd81y2a459j5k1mpikfrvwcz7v09m526nrl7kpr4l4a1ps8zfy9";
+      name = "ksysguard-5.8.5.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kwallet-pam-5.8.4.tar.xz";
-      sha256 = "149qwri47yjv85abfv48232ldvl464df4id9gz0kwjp3cd5n12cn";
-      name = "kwallet-pam-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kwallet-pam-5.8.5.tar.xz";
+      sha256 = "0310vr3p9fxl3vwdgklk0acx6w31pcpq8mi9yldahg1mkjqf7l44";
+      name = "kwallet-pam-5.8.5.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kwayland-integration-5.8.4.tar.xz";
-      sha256 = "1s3jy3bb15v49w9ym5d9x352lf57dsg72xqmw3w2jbvmmyacg2a7";
-      name = "kwayland-integration-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kwayland-integration-5.8.5.tar.xz";
+      sha256 = "11f63mq7crsbrpdib16q8xg0hk8jr5x1cyv43q8qdqm0591cglli";
+      name = "kwayland-integration-5.8.5.tar.xz";
     };
   };
   kwin = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kwin-5.8.4.tar.xz";
-      sha256 = "1zglmz2c2aiw46vm813m5hznqjx1phs90djlva9vcvv5rvz7y3fn";
-      name = "kwin-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kwin-5.8.5.tar.xz";
+      sha256 = "182z17d4sad9j15qagx9yz13wwzcyy6hlgpy5nlx6dlfcb8s00x7";
+      name = "kwin-5.8.5.tar.xz";
     };
   };
   kwrited = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kwrited-5.8.4.tar.xz";
-      sha256 = "055054i96yxi2pb5lg42d6yjhvwqc5vgqnrczh8f5g6j3ykl6p7s";
-      name = "kwrited-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kwrited-5.8.5.tar.xz";
+      sha256 = "1nsr244niyq2bk29s0cqq1p2qj0h1hx4nl13nc3x3aycfhfkjfkr";
+      name = "kwrited-5.8.5.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/libkscreen-5.8.4.tar.xz";
-      sha256 = "1vrh4ympdgnvnrl7c4l3hizxza05y0dr4ii6h109r8iqfhbis56p";
-      name = "libkscreen-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/libkscreen-5.8.5.tar.xz";
+      sha256 = "1zj2nzyl0nmg5za3iwr4q4nzfv69f35f0394b6k0g3dgh1zxmby9";
+      name = "libkscreen-5.8.5.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/libksysguard-5.8.4.tar.xz";
-      sha256 = "0mc045qvkzsk1rhvasysbjcqvsm9nvmgha6ljsfn61gnwpb3fjzq";
-      name = "libksysguard-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/libksysguard-5.8.5.tar.xz";
+      sha256 = "1acp4kzdjhipsqw90n3rc1ydbkqhb12afwdsfl25fibv0c39avwp";
+      name = "libksysguard-5.8.5.tar.xz";
     };
   };
   milou = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/milou-5.8.4.tar.xz";
-      sha256 = "169bcdgbqddmfzz39wdy5cbqqm8djayr3bxn8j28pjkc4l8i93c8";
-      name = "milou-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/milou-5.8.5.tar.xz";
+      sha256 = "0lj5cb43jkqs8qg2acs39dkfwskbw135ap65vxiv27ivxscyvz3d";
+      name = "milou-5.8.5.tar.xz";
     };
   };
   oxygen = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/oxygen-5.8.4.tar.xz";
-      sha256 = "1g8zm71k31smyzxc1kmvcl889ljfv6l0ks6g9888qyyzhbqps2p4";
-      name = "oxygen-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/oxygen-5.8.5.tar.xz";
+      sha256 = "199jcn6qzyihxmw38b1cl0ah0rzn7f574khx72n9x5y9143p9lh7";
+      name = "oxygen-5.8.5.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-desktop-5.8.4.tar.xz";
-      sha256 = "07dw8x74j0am52rxvig0jcwhlk3kx762hfw3vk6innjfcrkjx43q";
-      name = "plasma-desktop-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-desktop-5.8.5.tar.xz";
+      sha256 = "045990fvhqpwhfi6jqpkzhgbhc3lwvwhkia1y77m12n1djbynpnr";
+      name = "plasma-desktop-5.8.5.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-integration-5.8.4.tar.xz";
-      sha256 = "18w4ws0ydqf0lfd16svgs1sbf2q6rc1zkzfhxwj2jzdhqjqwdikn";
-      name = "plasma-integration-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-integration-5.8.5.tar.xz";
+      sha256 = "1sm7027ywz8xxqfsjv6jvk8zx11kx83rx88bb8cy31qfjipsakfb";
+      name = "plasma-integration-5.8.5.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-nm-5.8.4.tar.xz";
-      sha256 = "0dzk6wa6dsw9mlwxvhyhq8dmk88ia9paavcnw0am165ahpmkpzjq";
-      name = "plasma-nm-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-nm-5.8.5.tar.xz";
+      sha256 = "1g1yyzc8y2hsgycficvavpl5yizd54ns93cdky9cgsrnxlkfwbvc";
+      name = "plasma-nm-5.8.5.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-pa-5.8.4.tar.xz";
-      sha256 = "1p7f7ahr4xc50cn9iawkpq0xna7s7zar8vlkvizgji566sp1yf4i";
-      name = "plasma-pa-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-pa-5.8.5.tar.xz";
+      sha256 = "0vg1dyxfg8rxzyh0xnk41c95zp8rdbx1w462llrwchzp29p3xg1b";
+      name = "plasma-pa-5.8.5.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-sdk-5.8.4.tar.xz";
-      sha256 = "0nkrppv15l4v2f9g3ihixmgya1ky2zrih1ynak7kqkv43d4827s9";
-      name = "plasma-sdk-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-sdk-5.8.5.tar.xz";
+      sha256 = "13lyb5x4a8aq4fykvdv1137yvc4s4q31fdxhxppza1wkw8lvbvpd";
+      name = "plasma-sdk-5.8.5.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-tests-5.8.4.tar.xz";
-      sha256 = "0hh8rp7sw8lyc61pizhc64138sv41iv9gnn0flbblvd912990i6k";
-      name = "plasma-tests-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-tests-5.8.5.tar.xz";
+      sha256 = "0wgqyqlqygi3z0cccpfrpi259jp4yhh2g4x3mqcxisv58mbjrj1b";
+      name = "plasma-tests-5.8.5.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-5.8.4.tar.xz";
-      sha256 = "1hwdrwc43s0mfy86ywws2myr1byf4d1j7x685z05cvyg3ha2wwwd";
-      name = "plasma-workspace-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-5.8.5.tar.xz";
+      sha256 = "18bf5wmyb198jnbpivjjwsk65sksrvzlvykx3mr3wvj30mr0f9bd";
+      name = "plasma-workspace-5.8.5.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-wallpapers-5.8.4.tar.xz";
-      sha256 = "088vmni3krybg5j6bd0amfqn806pxqjnyb0pvlwbakw53yjbsva3";
-      name = "plasma-workspace-wallpapers-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-wallpapers-5.8.5.tar.xz";
+      sha256 = "116s9qw888lbgxc9ggxf7fa99vggixr2ig1715xb5zmqm14yznyz";
+      name = "plasma-workspace-wallpapers-5.8.5.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.8.4";
+    version = "1-5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/polkit-kde-agent-1-5.8.4.tar.xz";
-      sha256 = "0jh1msiaig47114ccdpxf3zl77vgs5wvbsl2vibc05i19alr99jg";
-      name = "polkit-kde-agent-1-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/polkit-kde-agent-1-5.8.5.tar.xz";
+      sha256 = "1dwk848wljcd9bi0h58h0ljnjlz1qq50rd7i38f3cb848iipisw7";
+      name = "polkit-kde-agent-1-5.8.5.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/powerdevil-5.8.4.tar.xz";
-      sha256 = "1b1cy98zjdc9w8jd0hqrzmvmvfxg5v6imd4pvnlgfix9bm0gcmcy";
-      name = "powerdevil-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/powerdevil-5.8.5.tar.xz";
+      sha256 = "0lj7jcaqfsipiwi7x4q684p4pfsqzflvddr7hrhirfl1p62bc704";
+      name = "powerdevil-5.8.5.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/sddm-kcm-5.8.4.tar.xz";
-      sha256 = "03d2x6hvjvwdmpcs04vs7jqp4nnvw1gmiwfra5xk432argf0nxyx";
-      name = "sddm-kcm-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/sddm-kcm-5.8.5.tar.xz";
+      sha256 = "0dcvk3f3cqq4z5hc63ccpxyl3kknjvd8jsnx7r2hfrwsw0y90fqc";
+      name = "sddm-kcm-5.8.5.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/systemsettings-5.8.4.tar.xz";
-      sha256 = "1j45yvvm8lx1nvwzq2x979s5x3k4i3phjcw73hxyqv9x7y0pnchv";
-      name = "systemsettings-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/systemsettings-5.8.5.tar.xz";
+      sha256 = "0pkwmgbjglbyc8i22hivh5gnaj742df3ff3f998k66k81mfjkwga";
+      name = "systemsettings-5.8.5.tar.xz";
     };
   };
   user-manager = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/user-manager-5.8.4.tar.xz";
-      sha256 = "0m2yv7qlj0y95z5x3f008aww3jzrs5lf32k9czqia3fyy9szpa1d";
-      name = "user-manager-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/user-manager-5.8.5.tar.xz";
+      sha256 = "1ck8x860q3aqgbbgiwfdhs0i0bs2nhqqva19kl9x1b015p64gl5z";
+      name = "user-manager-5.8.5.tar.xz";
     };
   };
 }

From c12613c1110cb8f519295e5c2c21a52ce50acf51 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 Dec 2016 13:46:27 +0100
Subject: [PATCH 0250/1310] botan: 1.10.13 -> 1.10.14, enforce c++11

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

diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 6e8a8cd8d7f..f66e7befeb0 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -2,7 +2,10 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.10";
-  revision = "13";
-  sha256 = "144vl65z7bys43sxgb09mbisyf2nmh49wh0d957y0ksa9cyrgv13";
+  revision = "14";
+  sha256 = "072czy26vfjcqjww4qccsd29fzkb6mb8czamr4x76rdi9lwhpv8h";
   extraConfigureFlags = "--with-gnump";
+  postPatch = ''
+    sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
+  '';
 })

From 21d4d54a38b394daa9ce1b7ffca19e6a7d42b8ab Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 Dec 2016 13:46:51 +0100
Subject: [PATCH 0251/1310] botan: 1.11.32 -> 1.11.34

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

diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index 71366ed32ad..6ae151dcc64 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -2,8 +2,8 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.11";
-  revision = "32";
-  sha256 = "0b4wgqyv6accsdh7fgr9as34r38f8r9024i6s3vhah6wiah7kddn";
+  revision = "34";
+  sha256 = "05hzffp0dxac7414a84z0fgv980cnfx55ch2y4vpg5nvin7m9bar";
   openssl = null;
   postPatch = "sed '1i#include <cmath>' -i src/tests/test_bigint.cpp";
 })

From 842a3010e1593db3a8172117fddb7315eaaa0a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 28 Dec 2016 13:51:19 +0100
Subject: [PATCH 0252/1310] Unbreak nixpkgs eval (urlscan lacked pythonOlder)

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

diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index b686c4ba9c4..3875886266d 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy35, fetchFromGitHub, urwid }:
+{ stdenv, buildPythonPackage, isPy35, fetchFromGitHub, urwid, pythonOlder }:
 
 buildPythonPackage rec {
   name = "urlscan-${version}";

From c24206dc5f89b823d00897a24123410084b99a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 27 Dec 2016 21:35:59 +0100
Subject: [PATCH 0253/1310] lighttpd: 1.4.41 -> 1.4.44

---
 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 549c401fec7..c6f88c24509 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.41";
+  name = "lighttpd-1.4.44";
 
   src = fetchurl {
     url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "0v3b6hp8hfwg7kmmxs64hdn9iqkql5qjv2389wl7pp6nyqz3ik2b";
+    sha256 = "08jlgcy08w1gd8hkmz0bccipv4dzxdairj89nbz5f6b5hnlnrdmd";
   };
 
   buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]

From 9ec867f59fba934c188e9dd4ccf1d35b49ad0c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 27 Dec 2016 23:00:15 +0100
Subject: [PATCH 0254/1310] nixos/prometheus: unbreak alertmanager default
 config

The current default value of listenAddress = null blows up:

  $ nixos-rebuild build
  error: cannot coerce null to a string, at
  .../nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix:97:16

With listenAddress = "" we use the same default as upstream and there is
no blow up :-)
---
 nixos/modules/services/monitoring/prometheus/alertmanager.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index a9c0ce4ed6c..da2cd02eaa3 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@@ -62,8 +62,8 @@ in {
       };
 
       listenAddress = mkOption {
-        type = types.nullOr types.str;
-        default = null;
+        type = types.str;
+        default = "";
         description = ''
           Address to listen on for the web interface and API.
         '';

From 060c8493c78cfb213702e7b2434e662d6a419ed6 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 28 Dec 2016 08:08:22 -0500
Subject: [PATCH 0255/1310] elpa-packages: 2016-12-27

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

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 9118344f024..7cdf9fff5d9 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.7";
+        version = "11.89.8";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-11.89.7.tar";
-          sha256 = "03sxdh6dv4m98yq09hxcph2lgidai8ky22i9acjcp6vfjlsb9mlf";
+          url = "https://elpa.gnu.org/packages/auctex-11.89.8.tar";
+          sha256 = "0rilldzb7sm7k22vfifdsnxz1an94jnn1bn8gfmqkac4g9cskl46";
         };
         packageRequires = [];
         meta = {
@@ -377,10 +377,10 @@
     context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "context-coloring";
-        version = "8.0.1";
+        version = "8.1.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/context-coloring-8.0.1.tar";
-          sha256 = "0c7sb8dzx6f40hz2l6zicc0shpxj3vzsmvdxzx65c4vgvr462js2";
+          url = "https://elpa.gnu.org/packages/context-coloring-8.1.0.tar";
+          sha256 = "01wm36qgxsg7lgdxkn7avzfmxcpilsmvfwz3s7y04i0sdrsjvzp4";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -619,10 +619,10 @@
     el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
     elpaBuild {
         pname = "el-search";
-        version = "1.2";
+        version = "1.2.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.2.tar";
-          sha256 = "0sz78kn9nx390aq5wqz174p8ppw987rzsh892ly166qz4ikwys5a";
+          url = "https://elpa.gnu.org/packages/el-search-1.2.1.tar";
+          sha256 = "1a5gqcl9v0ppizz0c61rcpahym3vr52f8azp2pjvrxvkmx4sj8c1";
         };
         packageRequires = [ emacs stream ];
         meta = {
@@ -1087,10 +1087,10 @@
     loccur = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "loccur";
-        version = "1.2.2";
+        version = "1.2.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/loccur-1.2.2.el";
-          sha256 = "0ij5wzxysaikiccw7mjbw1sfylvih0n6b6yyp55vn8w1z2dba0xk";
+          url = "https://elpa.gnu.org/packages/loccur-1.2.3.el";
+          sha256 = "09pxp03g4pg95cpqiadyv9dz6qrwd9igrkwrhm4s38cscmqm7dzq";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -1364,10 +1364,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20161214";
+        version = "20161224";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20161214.tar";
-          sha256 = "0pa9d0l6axif5wlzi7lvxl0fpjwwvc79cy9d37z7md4hxyjdvwzm";
+          url = "https://elpa.gnu.org/packages/org-20161224.tar";
+          sha256 = "0b10bjypn0w5ja776f8sxl1qpvb61iyz1n3c74jx6fqwypv7dmgi";
         };
         packageRequires = [];
         meta = {

From 4de8a352255543bd4ede6c49d73b6b83b4072fb5 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 28 Dec 2016 08:08:46 -0500
Subject: [PATCH 0256/1310] org-packages: 2016-12-27

---
 .../editors/emacs-modes/org-generated.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 438abd8afed..8de489549b8 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -1,10 +1,10 @@
 { callPackage }: {
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20161214";
+        version = "20161224";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20161214.tar";
-          sha256 = "1x3wvagx7437xr4lawxr24kivb661997bncq2w9iz3fkg9rrr73m";
+          url = "http://orgmode.org/elpa/org-20161224.tar";
+          sha256 = "15fnc65k5mn5ssl53z4f9nlkz5m8a59zkaripcapdcq87ys5imqm";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20161214";
+        version = "20161224";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20161214.tar";
-          sha256 = "1rc3p1cys15i9vnll946w5hlckmmbgkw22yw98mna9cwqdpc387c";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20161224.tar";
+          sha256 = "1pj3h5qllhcqyqvm2kln7056m34k5flipvslnn1rvsk4iwwjlv1a";
         };
         packageRequires = [];
         meta = {

From 7ccd91b067c952adba23ee5f07beaf519840a9de Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 28 Dec 2016 08:09:01 -0500
Subject: [PATCH 0257/1310] melpa-stable-packages: 2016-12-27

---
 .../emacs-modes/melpa-stable-generated.nix    | 340 ++++++++++++------
 1 file changed, 222 insertions(+), 118 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 6d3ec36277c..689995f2e77 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -2617,6 +2617,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bool-flip";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "michaeljb";
+          repo = "bool-flip";
+          rev = "0f7cc9b387429239fb929896511727d4e49a795b";
+          sha256 = "1051gy7izy25jwh079231d4lh9azchbqc6nvfrkv8s9ck407a65a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f56377a7c3f4b75206ad9ba570c35dbf752079e9/recipes/bool-flip";
+          sha256 = "1xfspqxshx7m8gh6g1snkaahka9f71fnq7hx81nik4s9s8pmxj9c";
+          name = "bool-flip";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/bool-flip";
+          license = lib.licenses.free;
+        };
+      }) {};
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
@@ -3828,12 +3849,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "5.6.0";
+        version = "5.6.1";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "2ee4ca6c3a156afac4565ef250b6a3b99e0e8d3d";
-          sha256 = "1n77d6mn2z7v6w52kx6y4d6sqpbx21mnx0s37kkj0zwwj3b9rk2y";
+          rev = "fdbdfb91e0a5731bf9a739b70c5f217c5d12ae6d";
+          sha256 = "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -3849,12 +3870,12 @@
     clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode-extra-font-locking";
-        version = "5.6.0";
+        version = "5.6.1";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "2ee4ca6c3a156afac4565ef250b6a3b99e0e8d3d";
-          sha256 = "1n77d6mn2z7v6w52kx6y4d6sqpbx21mnx0s37kkj0zwwj3b9rk2y";
+          rev = "fdbdfb91e0a5731bf9a739b70c5f217c5d12ae6d";
+          sha256 = "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -5154,22 +5175,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "creamsody-theme";
-        version = "0.1.3";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-creamsody";
-          rev = "41164f285735383848aba1bfef4282bca4e9a8e8";
-          sha256 = "0inql6g8f1nhx0k781ahm26fjpmpqq1cm3i7bf64ib9g5izjf91d";
+          rev = "c897adf63cfd928779d90a54366ca5bdb24d4d35";
+          sha256 = "0bw1p0l52fgvw2bapq9anwxzfwpwr6d2ddskzp2r2whyy0w3jc9b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
           sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7";
           name = "creamsody-theme";
         };
-        packageRequires = [];
+        packageRequires = [ autothemer ];
         meta = {
           homepage = "https://melpa.org/#/creamsody-theme";
           license = lib.licenses.free;
@@ -5533,12 +5554,12 @@
     darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "0.1.60";
+        version = "0.2.100";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "1a5d0dc5ae9c57bcb07085ded6fa82c3512ff80f";
-          sha256 = "0hz3hhkyg6m2wvffanpclc2wq7y8n63sgz726kg87iqgq2lfa096";
+          rev = "380fdcff12f44faf099bc5a38984d88784b495a2";
+          sha256 = "1pragypiv59rrvq2xjzmldkf1v007viwwcvr3f5iyv31n0bmd0cn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -5554,12 +5575,12 @@
     dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dart-mode";
-        version = "0.14";
+        version = "0.15";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "dart-mode";
-          rev = "07edf4d4448ede128d13c27bd76cf06f5ef5bb3b";
-          sha256 = "1vkn95dyc0pppnflyqlrlx32g9zc7wdcgc9fgf1hgvqp313ydfcs";
+          rev = "e6635b390235cf16a8081763768cf925ca2d9133";
+          sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode";
@@ -7196,12 +7217,12 @@
     ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ede-php-autoload";
-        version = "0.4.2";
+        version = "0.4.3";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "ede-php-autoload";
-          rev = "c748354c6398aa7e5d3f00ee4c5422f4eca09a91";
-          sha256 = "1imr45s2a1lilqfgfccgxasqlmh1nkc1ivf5iq01w31wik2hii0z";
+          rev = "c6896c648fbc90f4d083f511353d6b165836d0e8";
+          sha256 = "0dfx0qiyd23jhxi0y1n4s1pk9906b91qnp25xbyiqdacs54l6d8a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -7385,12 +7406,12 @@
     egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "egison-mode";
-        version = "3.6.3";
+        version = "3.6.4";
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "4cf38946096c185ac794d594a791da23675297aa";
-          sha256 = "0k6qh99jbzirgsa3qkhcxsivncbvk5wr4yag2s9c2y9akipxivrq";
+          rev = "62c99118f32dd23a088e2d9c0d6b7b755206cac6";
+          sha256 = "1f0s9pvns4gq6xzp4vp74xxxbmzp06vdv0jgh0x1xy0mfklgll8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -7887,12 +7908,12 @@
     elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elpa-clone";
-        version = "0.0.3";
+        version = "0.0.4";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "elpa-clone";
-          rev = "77e45f3ac7de504ff65e17dfd52bfde7bdfc78f2";
-          sha256 = "09q54j0n52493smhdrngn2isnifvy0x3s6vlicllkm8qykr06z9v";
+          rev = "8d0827b03b08eb4844e2b8465c27d5aa0e12101d";
+          sha256 = "1ik2k6ngzg3znfp4a36f7m5ca6p3iivfb7w280w3gm5x1ja8as2a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone";
@@ -9314,12 +9335,12 @@
     eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
     melpaBuild {
         pname = "eval-in-repl";
-        version = "0.9.2";
+        version = "0.9.4";
         src = fetchFromGitHub {
           owner = "kaz-yos";
           repo = "eval-in-repl";
-          rev = "2b5d1bee767de4f21b14cefd7ce310f862226bd7";
-          sha256 = "077rj7yj6laxyhcsmrmlpg438962jv0fm2yiqx6i365fbgyx0hck";
+          rev = "674873139ebde439fbeecaf0fb217d54f470bc14";
+          sha256 = "1fzsq6fkkrsxg6mimrnls0kn59rq7w332b94gg04j0khl61s1v1s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl";
@@ -10111,12 +10132,12 @@
     eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eyebrowse";
-        version = "0.7.2";
+        version = "0.7.4";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "eyebrowse";
-          rev = "a009536514409fdf0a1745504a7d7e0e376cc2c9";
-          sha256 = "0kw13w3q1q4gb3ql728bk9m0rymkp21rrjmy4hyx8im84xh093ls";
+          rev = "e7c3de9c8b3197f3a310d8d9259761fc70dfa3ef";
+          sha256 = "0d2vc50m2wr6f0fd04xm3bzca25im3ka57y7lg6p0bn5fp6a62vl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@@ -10489,12 +10510,12 @@
     firestarter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "firestarter";
-        version = "0.2.4";
+        version = "0.2.5";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "firestarter";
-          rev = "4b7428477980e12578ebbbb121115696b352d6b2";
-          sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55";
+          rev = "4d6b106f325ac1802eabce3c8a7cd0a4c7a32864";
+          sha256 = "13daz15v0sshl7lxcg1xcbpl64gklgh50pzk0qxmn5ygw7nlifn0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b046eb3b63220b937e1b70f633cb5424dc782a1/recipes/firestarter";
@@ -10958,12 +10979,12 @@
     flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-objc-clang";
-        version = "1.0.2";
+        version = "1.0.5";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-objc-clang";
-          rev = "3140e4c74dbaa10e6f8edd794144d07399a8fda8";
-          sha256 = "0zzb03qxfs5wky40hzmldkzq5gn4c7qknkd5ra2lghzj0az6n9ld";
+          rev = "9dbfad340090523db0b936517d8543d8aa2f2e2c";
+          sha256 = "0cky0zxlfajhq5kh868yh17d0pr5pqjgj8v8xhj14sbch5jvd3bz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -11126,12 +11147,12 @@
     flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-swift3";
-        version = "1.0.5";
+        version = "1.0.6";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-swift3";
-          rev = "846b3045d018a13cadb8a8bfde83587802d7e1a2";
-          sha256 = "06wzsi3lw938mc8sz06jxyclxpvrlyjgvs9998kpiyhz752sgfsw";
+          rev = "6e1079576d30397eefea0300bf31a248a26cf98c";
+          sha256 = "0c8a5bgrirf3ms6v75w4jaiwfxf1acv2isf7x02jms7m8h36bzxz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -11795,22 +11816,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    fontawesome = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "fontawesome";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-fontawesome";
-          rev = "ccb03b8329daa3130491c9c4d285b325dbeb5cc7";
-          sha256 = "0qq13jhn9i2ls6n3fbay4i2r0hfs426pkmmif43b87gjxb510irc";
+          rev = "72b4f2f83c7fdacd225aee58f93acefc53166626";
+          sha256 = "1icwjd1rbyr1g8ifyhvpi21wjff2qrddq2rmp5lmiajnwrlfli0d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93b92f10802ceffc353db3d220dccfd47ea7fa41/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
           name = "fontawesome";
         };
-        packageRequires = [ cl-lib helm-core ];
+        packageRequires = [ emacs helm-core ];
         meta = {
           homepage = "https://melpa.org/#/fontawesome";
           license = lib.licenses.free;
@@ -11819,12 +11840,12 @@
     forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forecast";
-        version = "0.4.1";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "forecast.el";
-          rev = "ff307fd24c64577d204d0c1b7b245f190f70bd61";
-          sha256 = "1x4l24cbgc4apv9cfzf6phmj5pm32hfdgv37wpbh7ml8v3p8xm0w";
+          rev = "8fdd0d4532b81e4bfe114fad548aeb049cd512cf";
+          sha256 = "0ia4k7jxx35g0kdm9z75i3sr1h91nh8fkhbllxpd9za29dw5fs7c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast";
@@ -13316,12 +13337,12 @@
     go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
     melpaBuild {
         pname = "go-playground";
-        version = "1.0";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "go-playground";
-          rev = "2e1497517d13d813768b3f8e25bb3cce7a449acd";
-          sha256 = "08ka2wlwq5v13ni8n5zd5vp4iynwcirsqdw0an20gqg0hrcvs1ba";
+          rev = "97be0b3a19d7b8476663c9b16148c4dfd9783cfe";
+          sha256 = "0wz79iwcfql8kfq5q9b0fccj9590giqlzd2kzjaj0fl89n0sx9gq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground";
@@ -13547,12 +13568,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "0.12.0";
+        version = "0.12.1";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "ab40ac7324b5d45b8f1677d87ec0d26349448d41";
-          sha256 = "0rb55f4yx8wpqs93xy80wn6k8pyrhj8zh3q5lbi78afgscjrgjlr";
+          rev = "6103db21b38cbdfda3100fed08b988fc2d83aa1a";
+          sha256 = "0hlqrqi1s94cr828qyfbr95np5xwr3bn98l4gv59rnqa1vmx49gy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -13955,12 +13976,12 @@
     gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "0.17";
+        version = "0.18.0";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "89b060abf49791cad2639f234b230dc4882bdc39";
-          sha256 = "0bhg2za2a67r6hkb0628zvzxx65rcj7cm3kq3m44wls8q8cr2jxj";
+          rev = "fa9cafdaf2b126a06a0196a668c14821ceba44fa";
+          sha256 = "1fn0dgnharn18xs6aq202y0jyldvg12sbf67jxmxjdn20w44g1d3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -16243,12 +16264,12 @@
     htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "htmlize";
-        version = "1.50";
+        version = "1.51";
         src = fetchFromGitHub {
           owner = "hniksic";
           repo = "emacs-htmlize";
-          rev = "f74ea313ad364ffd648e330b2e6ddabb89f6e797";
-          sha256 = "16jxd5nfpqlg46zzp0yvvn5aynprd5xv655fcql8cvxkkg111d5z";
+          rev = "88e2cb6588827893d7bc619529393887c264d15a";
+          sha256 = "09xpv8dsc39a7w9s6xnilc5kh1krs2jw8cklizxzz4gp36hrsj2n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize";
@@ -20097,12 +20118,12 @@
     mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mb-url";
-        version = "0.0.9";
+        version = "0.1.0";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "mb-url";
-          rev = "178b03d2cbc31e889c095a6c25426c297e5fe6fc";
-          sha256 = "0y22bn4zvyw2qivjrvwkhx96mwvfpx74901r0m4l31nvyh559aq0";
+          rev = "129a0bb6a684be76fb9f09010e710065d0e5baaa";
+          sha256 = "1apy7abjhdbgh8001rzv41q40bfl444rcz62lvgdwj3lg45zb8xc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d/recipes/mb-url";
@@ -20223,12 +20244,12 @@
     mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
     melpaBuild {
         pname = "mentor";
-        version = "0.1.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "skangas";
           repo = "mentor";
-          rev = "f53dac51a29f67e31f1fb82702b19d158cc6fa22";
-          sha256 = "0qqapsp4gpkrj3faii7qbfssddl3vqfmwqcy259s7f896kzwaaky";
+          rev = "256c59ab8562300c8de027afaec989239ad89395";
+          sha256 = "0xlaanyv6k8ski6c45mrha8n4yinqvjgn6kn64mwy4n64fvlrvv5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
@@ -20978,12 +20999,12 @@
     msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "msvc";
-        version = "1.2.2";
+        version = "1.3.0";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "msvc";
-          rev = "e7a61fa5b98a129637f970ac6db9163e330b3d02";
-          sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
+          rev = "71c38323187c98b32250b89088768599bb216ddb";
+          sha256 = "1wwa861a8bnrqv59bx6l5k3qi98wqv6cicvg5gjyx8rdvpcq28dg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -21293,12 +21314,12 @@
     nasm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nasm-mode";
-        version = "1.1.0";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "nasm-mode";
-          rev = "c3f5475c2f4bd930411b6d716765d094b36ce219";
-          sha256 = "0d8bfz41ry5bvkz2894dqkk3244n7xcjk3pf58fcsagvmmkkln7b";
+          rev = "d990ed94d902b74a5c834fb567e03307607cee45";
+          sha256 = "1dyc50a1zskx9fqxl2iy2x74f3bkb2ccz908v0aj13rqfqqnns9j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a832b3bd7c2f2d3cee8bcfb5421d22acf5523e/recipes/nasm-mode";
@@ -21668,11 +21689,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "0.23.3";
+        version = "0.23.4";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "fd7f3d0829725bf9ce209cf597dfb0acd4d59b10";
-          sha256 = "0w1nwr7brgapnzsbp9cjcx30lk90ir5hscllpxzw44sq25ir85g5";
+          rev = "4dde1e677473faa6588909396820f9948e28923f";
+          sha256 = "14675mrlqbp2s5wdj8rs96kz7vdzv3j80d259cybp1ijvncgh1ds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -22196,8 +22217,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "f956929891e77ba4ce2fb1361129d5d3ebc7bb55";
-          sha256 = "1xds6fqs1l6q9vak3v4xlzl1w084mhz86xrnycibcwm8q3q9hmb3";
+          rev = "e7eaa1202486f996121cc0ef17a8d72b915c8165";
+          sha256 = "1f66k2l996vzf5rm2scyz4bv1cyn365a8yfh1cfq13vrmvah57xb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -22618,22 +22639,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "2.2.0";
+        version = "2.5.0";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "d2db2827ff030a8c11b52402adcd3a4b3050f3c1";
-          sha256 = "16wzrq2syk03710iklrayf4s9ap4brvlzyd4b0rya0rxy2q2rck7";
+          rev = "6330511011b7fe8ee04300e82f090ce3efd3b100";
+          sha256 = "18kwiwmq95pf8w07xl3vh2xhlkwnv53b4n6h0xq2fqprkh8n6f0l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
           sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib";
           name = "org-jira";
         };
-        packageRequires = [ cl-lib request ];
+        packageRequires = [ cl-lib emacs request ];
         meta = {
           homepage = "https://melpa.org/#/org-jira";
           license = lib.licenses.free;
@@ -22785,6 +22806,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }:
+    melpaBuild {
+        pname = "org-password-manager";
+        version = "0.0.1";
+        src = fetchgit {
+          url = "https://git.leafac.com/org-password-manager";
+          rev = "d3a33ddfe583180bdb76cfb8bbd772e0078b24a3";
+          sha256 = "0pqmnhd3qdg06agj6h8v8lm4m5q8px0qmd7a1bfn6i5g2bq9zrck";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager";
+          sha256 = "0n07k2nng3zkrcif85f1r2g2l4vha78lmrdnj590axn7l5q5fidm";
+          name = "org-password-manager";
+        };
+        packageRequires = [ org s ];
+        meta = {
+          homepage = "https://melpa.org/#/org-password-manager";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
     melpaBuild {
         pname = "org-pdfview";
@@ -24586,12 +24627,12 @@
     phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "phpunit";
-        version = "0.13.0";
+        version = "0.14.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "phpunit.el";
-          rev = "165ca257d4840c266e1e79e806b4b943b5785fe6";
-          sha256 = "1xgjhq1nxj4zfcns0q8a1kdlmqcjrxlblyj9vrspv1qck3akrp3z";
+          rev = "791d1b33b63887cdeaf287fa657b8109f9d1dd18";
+          sha256 = "0j9ym19pz17wsjh1ky65x9mz8aiiryxbw1nsygvy9isbdzjx591k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit";
@@ -24775,12 +24816,12 @@
     plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plantuml-mode";
-        version = "1.2.2";
+        version = "1.2.3";
         src = fetchFromGitHub {
           owner = "skuro";
           repo = "plantuml-mode";
-          rev = "87417ad75b215ababf153cba533575ac0273a5db";
-          sha256 = "1jrck9wybpm2p2imjn0x6g3ybasiqkfzxc1halm3rq6xvc4zvrsm";
+          rev = "eb380bac5663ec8e73482db6c6ba9d1394766eb3";
+          sha256 = "19zxwmn5mjbzqgk7l444h57ninrlhi22l85l9zphryx2992plf0k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
@@ -26407,6 +26448,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rebecca-theme";
+        version = "1.2.1";
+        src = fetchFromGitHub {
+          owner = "vic";
+          repo = "rebecca-theme";
+          rev = "239115183e0a354ccd5c2cb299893b558fbde05c";
+          sha256 = "0n6xf9s39frnyvchk40zzxbkn0hyga5ridkxbf50n7hr5j19yrmb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
+          sha256 = "1m72jqyqx18i1vpj07v3vkbi0di9dks5sz46wb2h0f23xqyx00md";
+          name = "rebecca-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/rebecca-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "recover-buffers";
@@ -27103,12 +27165,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "2.7";
+        version = "2.8";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "8b6d0cdf57c951769ead8aad1d8538308e1b6861";
-          sha256 = "07qjpvkhv556p3pfm1hxswky4irp7f4wxb2blcvk3s7qmqirqshj";
+          rev = "6ac7740eaf05cdd9b699185f71cc2d1f634a761b";
+          sha256 = "1w506qaklrly1lnq1i5kshl8m9aki8h2ba1y7h578gwx6lph3vhi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -27289,6 +27351,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
+    melpaBuild {
+        pname = "rust-playground";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "grafov";
+          repo = "rust-playground";
+          rev = "6a23f8956bce1deaa38f52c01f5571c5cff77445";
+          sha256 = "1aqcpmzzww4fd63l65rfyj0f8skdqh7j1vznwqnj71x65xlda0ys";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground";
+          sha256 = "1w29plj06ld3iq8xhjnfh8hphcp7aji15y1xqp8bb9m1k07wza7l";
+          name = "rust-playground";
+        };
+        packageRequires = [ emacs rust-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/rust-playground";
+          license = lib.licenses.free;
+        };
+      }) {};
     rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rvm";
@@ -27352,22 +27435,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "0.2.1";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "sagemath";
           repo = "sage-shell-mode";
-          rev = "2cfc3b712796d1ed22e9c8a39d24e11316aab065";
-          sha256 = "14wcnv78dwkxaq4g45kw0p34y5c5snscix0ar22bbryclqr929qy";
+          rev = "e8bc089e8dfd76f688160e2ac77aee985afeade7";
+          sha256 = "166plwg9ggivr3im0yfxw8k6m9ral37jzznnb06kb6g0zycb4aps";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
           sha256 = "0ivqiigmp9cf88j4xapzanjpbx692r70wb4i25mnppqsi3jlwxdv";
           name = "sage-shell-mode";
         };
-        packageRequires = [ cl-lib deferred emacs ];
+        packageRequires = [ cl-lib deferred emacs let-alist ];
         meta = {
           homepage = "https://melpa.org/#/sage-shell-mode";
           license = lib.licenses.free;
@@ -27464,8 +27547,8 @@
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-scala-mode";
-          rev = "4b492b9fa5f97521426f50c8dcfb6c0a251840ea";
-          sha256 = "01d907ph36yzfxgchqvk102ld1mvlb84sjxhmmq5xrzj4zbb0khm";
+          rev = "9b8db623b13fcb0aad9271d1fae73e1257dda13c";
+          sha256 = "0q41dqlhp0cds16inmh7jrvhqrnjsdiv2in6pq3f0srhwms81ff3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -28232,22 +28315,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    sl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sl";
-        version = "0.1.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "sl.el";
-          rev = "76a8eae2b3fc449ed81b2a577c53939434851635";
-          sha256 = "1nkgqva4l4nwpixavky8gm38371z7mrkpqdkgrya4j5mrx4kiw86";
+          rev = "51d92f820f3e93776fff6cdb9690458816888bdc";
+          sha256 = "1faklr7jz1s6hs1xrzhvddlibhbjbqwxsb8iz6i5c8dg9sj3hw45";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl";
           sha256 = "0h90ajikr6kclsy73vs9f50jg8z3d6kqbpanm9ryh2pw3sd4rnii";
           name = "sl";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/sl";
           license = lib.licenses.free;
@@ -28883,22 +28966,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sourcemap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    sourcemap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sourcemap";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-sourcemap";
-          rev = "065a0c3bd8ca5fe6a45e8f983f932c3c9fac5db9";
-          sha256 = "1k2gfw4dydzqxbfdmcghajbb2lyg1j4wgdhp8chlql3dax1f503d";
+          rev = "64c89d296186f48d9135fb8aad501de19f64bceb";
+          sha256 = "115g2mfpbfywp8xnag4gsb50klfvplqfh928a5mabb5s8v4a3582";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557d18259543263932fccdbaf44c4e7986bd277b/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
           name = "sourcemap";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/sourcemap";
           license = lib.licenses.free;
@@ -29009,6 +29092,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "speed-type";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "parkouss";
+          repo = "speed-type";
+          rev = "d9d98b9744e21d5e12a695096efcde288bdb5c18";
+          sha256 = "043ydcik23ykphbh89haagxbdn11s1b44wkziwibnb7d3r9hd8p7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type";
+          sha256 = "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06";
+          name = "speed-type";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/speed-type";
+          license = lib.licenses.free;
+        };
+      }) {};
     sphinx-doc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "sphinx-doc";
@@ -29201,12 +29305,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "1.0.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "94fc9e677c864bd2c302c4842b95f7580cda6cef";
-          sha256 = "1zxgqlfipbympgg8i58r1pwn50fq6vb42y8fmipxy25s0j3x53k7";
+          rev = "3569e5ea6892d6d7f4ef36bf41462af011e1a114";
+          sha256 = "0l3h6w13xc81i6vavfsg617ly8m2y8yjzbwa6zwwkfqi301kgpij";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy";
@@ -29346,12 +29450,12 @@
     string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "string-inflection";
-        version = "1.0.4";
+        version = "1.0.5";
         src = fetchFromGitHub {
           owner = "akicho8";
           repo = "string-inflection";
-          rev = "af1fb965784eff308d6b4031dc2ef5f6961cd38a";
-          sha256 = "017rq1vll53i4xs1l24insjkfvr7nlq6l9g7gjmgnd8g9ck6jqg0";
+          rev = "f11e732a582419e14a36c53130dd3a7b2c9da8c5";
+          sha256 = "1sq7h58v61cdyca5kfhf9rf3ybj25zgbhfdvb29qd7b2b33px7a5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -32918,12 +33022,12 @@
     yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yang-mode";
-        version = "0.9.3";
+        version = "0.9.4";
         src = fetchFromGitHub {
           owner = "mbj4668";
           repo = "yang-mode";
-          rev = "351a17bfd4b78616cf740fc1c7148bc1d85b63a4";
-          sha256 = "14hrr4ix77g795b4xhdwwqkgpbbb3axpim1r4yl1bv9jbbkqllx5";
+          rev = "bcf698acbdb4df91f587942348739b407a8b0807";
+          sha256 = "1rrmailvhxvivmdjamm2vvciym484cw0lqn1hgdw1lz999g5a5vs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";

From 49992887e5d030212b74877c22e9fd9247ea6d54 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 28 Dec 2016 08:09:29 -0500
Subject: [PATCH 0258/1310] melpa-packages: 2016-12-27

---
 .../editors/emacs-modes/melpa-generated.nix   | 1607 ++++++++++-------
 1 file changed, 940 insertions(+), 667 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index b61f26446a9..f2e9e89e9f1 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 = "7d3beb299399bc9d8190190fa59943b2a70a7f63";
-          sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l";
+          rev = "b67a8fed3bbd0af8a69e4359c27fe4646cb92989";
+          sha256 = "1fmr3r83w2vbdh6hrxjad83vnhr2sshlwvmi71zc3rg8vqwc6vdk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -422,8 +422,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-ac-emoji";
-          rev = "92b691efea755c32574f9f7d88f14191971c3981";
-          sha256 = "1x7l2wm76xbrwzskk4jfd2g3smr4cvhdy4zks7h3n2mhf8k6hx83";
+          rev = "40a639764eb654f1b4bb705c817b66032a26ff2b";
+          sha256 = "1gk84bv6w9lg5wrygd7cfab3h46j84k1dwmhzr7jay6n02q6y499";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/15f591f9cba367b071046fef5ae01bbbd0475ce3/recipes/ac-emoji";
@@ -1423,12 +1423,12 @@
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "alchemist";
-        version = "20161122.2304";
+        version = "20161220.2300";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "26762b767419b13211e331251def9159ee3f8c6b";
-          sha256 = "1bss5rgdp37zy4rlyx7j6rngrp9q2ijyr54n5z0r8asmd913r73q";
+          rev = "d90689ad51188711640e6660f449c21232b6815c";
+          sha256 = "0rsds06r53hrk1drq9sj5a2xkw3p2w986ziiqj143qrcp1yaig9z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1465,12 +1465,12 @@
     alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alect-themes";
-        version = "20161022.1101";
+        version = "20161218.1121";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "alect-themes";
-          rev = "ae90b8e05a14e3439a1e4061111fcc3f75776880";
-          sha256 = "0d0dw8xjsvavmsvcgc9n4200mdq9csfxhqsjwpfphqabk89kfsdk";
+          rev = "e01abf039a39de2fdc00a1b7f36842c5f68ff97d";
+          sha256 = "1nbr25003b0jlchy26l4pm1r4gxa2zprnqr8k0qvkhyrszjy78qg";
         };
         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 = "20161214.2250";
+        version = "20161216.415";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "all-ext";
-          rev = "a441c10ef99df2a639dfd9e8892cb6080db40730";
-          sha256 = "1fvha7gkr0ll6dnpp7rb5v6w11i03rbd74g18fd8x0vdi6lw7j10";
+          rev = "456bcf277158fc71f66ec11bff4c826c9b0db778";
+          sha256 = "091sf4m06s7c6wbckzcqfdz5g2lvh2q84hfny202kwq9j7fr7nlm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/all-ext";
@@ -1549,12 +1549,12 @@
     all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20161102.415";
+        version = "20161219.329";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "b2d923e51d23e84198e21b025c656bf862eaced6";
-          sha256 = "0j5230nas9h6rn4wfsaf5pgd3yxxk615j68y2j01pjrrkxvrwqig";
+          rev = "1e4a1a0b53ffcb427fdbc6d13ee6e9c8d23e6216";
+          sha256 = "0nrihr280aqq58x65fjyrpci4bsam9ddhsnid2cf8jmsngpvhcdc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1913,12 +1913,12 @@
     ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ansible";
-        version = "20161016.1658";
+        version = "20161218.1707";
         src = fetchFromGitHub {
           owner = "k1LoW";
           repo = "emacs-ansible";
-          rev = "c5e4c00135ae8860b8301d1227c3382a7c05ab09";
-          sha256 = "0v1asp6q1c744nad3hvhyw3llmpr0jz5yp8dlzfi82pdxk66qhp4";
+          rev = "a712d9b48809c975525cb059ea278cbe8a839f5a";
+          sha256 = "1jfksnk5fvr4h8mqb0mr2czyxnjmcdlrqdylvj0k0ks6xnskza91";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e45bf58b980ff542a5e887707a6361eb5ac0492/recipes/ansible";
@@ -3714,6 +3714,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    autothemer = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "autothemer";
+        version = "20161221.1331";
+        src = fetchFromGitHub {
+          owner = "sebastiansturm";
+          repo = "autothemer";
+          rev = "add7d430e0be2f4cd7ccc622f8fbc8bc44be762f";
+          sha256 = "0av6r2frjsbfxxl7lh9r7ccmsrc9yxmllqq8r1y52dzpc18iihpx";
+        };
+        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;
+        };
+      }) {};
     autumn-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "autumn-light-theme";
@@ -3737,11 +3758,11 @@
       }) {};
     avandu = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "avandu";
-        version = "20140412.1426";
+        version = "20161226.1540";
         src = fetchgit {
           url = "git://ryuslash.org/avandu.git";
-          rev = "891a847b0fff0ec1abfa717ede28250a16d5c429";
-          sha256 = "01mcp4q8qsbcz2nfsfd5wndpnka7qfiqfn2f35y0pm56di7a49v5";
+          rev = "0001e7cfab183f283c18b85bee25b94995beee63";
+          sha256 = "0r92clh3x4w2i717nk9p36wxikdy6vzj0a2nmwbwsswqhzjhdjqg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a67d2cd2d62c5deb4b9bbbe8efcd014c151f58e/recipes/avandu";
@@ -3841,12 +3862,12 @@
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
-        version = "20161129.621";
+        version = "20161215.709";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "f7861aa9607c0f05b3336443df5380a6daba0485";
-          sha256 = "0vxam51g7r4wixw7w8frk1af6m5n7bswjbjya77dnwxcizgwiq6m";
+          rev = "18decb64d1663cae909499e346663bfc1906a937";
+          sha256 = "089lx3fic9blxb1m2jvhg27cg67q1b39ncxnm7r8hajmaq7h0aw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -4135,12 +4156,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20161012.1122";
+        version = "20161227.1040";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "df75fdf19e9159d1249b1708c0d416dc334c97cb";
-          sha256 = "0zqhcm3i2aldhwrrd8wgq85jr5lxgwqvmd34zwykb76pcj0a21a4";
+          rev = "82e8fff5c22acbfeb1c77ea9442aada938b41d19";
+          sha256 = "1k1lm0hlp771vayv0laah2q67751ykc3gkv94s6axj02n8rs2zdv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4841,12 +4862,12 @@
     bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-key";
-        version = "20160227.48";
+        version = "20161218.1520";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "c7adfdde3d50d783dcde21ac3ea8195bbd30369f";
-          sha256 = "1qkcnk2h1k6yv9sbkir2nkbjjnzcj3ndk20cysk2wcmwqxm85840";
+          rev = "5954ad37cf2d3c9237f4d2037e8619be15681cd1";
+          sha256 = "0scn6wrs6040j4z1gfmn9akzknjhaj2kr07kfzx1v42ibm42ihcd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5006,6 +5027,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    blackboard-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "blackboard-theme";
+        version = "20161215.2256";
+        src = fetchFromGitHub {
+          owner = "don9z";
+          repo = "blackboard-theme";
+          rev = "d8b984f2541bb86eb4363a2b4c94631e49843d4a";
+          sha256 = "1jh2960yab6rhdq7ci1slpmnr43619cza0g8bfbq759yz5b7xryh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/eca8cbcc1282bb061f769daf86b1938d1f30f704/recipes/blackboard-theme";
+          sha256 = "19cnfxrm85985ic55y5x7nwxdynjp7djyd33dhj8r7s92cs25fn7";
+          name = "blackboard-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/blackboard-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     blank-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "blank-mode";
         version = "20130824.459";
@@ -5111,12 +5153,12 @@
     blog-admin = callPackage ({ ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }:
     melpaBuild {
         pname = "blog-admin";
-        version = "20160609.1935";
+        version = "20161227.1810";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "blog-admin";
-          rev = "fd97d405a5cd06b6246a433f31fc5af2077bb255";
-          sha256 = "0fia93kxmw5xkzyf434n3j4f0d6gijkli2mqi82j32z8wayrf307";
+          rev = "4a16df2a1e44f5486931af9c79f6ac55ce74b76f";
+          sha256 = "0xn2njbd3jsv7na0z87rhyg115cp2cppkgslldzi6405xkmfc76y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin";
@@ -5257,7 +5299,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20161211.1601";
+        version = "20161221.940";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "05jf7rbaxfxrlmk2vq09p10mj80p529raqfy3ajsk8adgqsxw1lr";
@@ -5276,12 +5318,12 @@
     bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bool-flip";
-        version = "20161030.1654";
+        version = "20161215.739";
         src = fetchFromGitHub {
           owner = "michaeljb";
           repo = "bool-flip";
-          rev = "04354f6412bd096cce59138e2113eb1db3dcba63";
-          sha256 = "1pdylz85sarhaakh8hdvn5mjhh4j3y6yy5sn4cjvqz9xan4g3yyl";
+          rev = "f58a9a7b9ab875bcfbd57c8262697ae404eb4485";
+          sha256 = "06q86a6dhc7jvq25yqqq3dsmrbm67h0ayb6nhd0q5l90yrmfqfjh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f56377a7c3f4b75206ad9ba570c35dbf752079e9/recipes/bool-flip";
@@ -6362,7 +6404,7 @@
         version = "20151009.845";
         src = fetchsvn {
           url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/";
-          rev = "16555";
+          rev = "16556";
           sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
         };
         recipeFile = fetchurl {
@@ -6400,12 +6442,12 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "20161116.35";
+        version = "20161227.1417";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "fb19a7e66f8478578edf7be71dadc1d75876248d";
-          sha256 = "0ksliwv8f2dhrgr423qn4zjmwm37v3hh5wpbfbz6ij6c2lrhx6j4";
+          rev = "156574632e47e49aeb7d17c1d2344e10c06c3acb";
+          sha256 = "00cfddcy60ps7ljw5zx7j14ig62kgf4m9kc7997vdyrsw466r5rz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -6572,8 +6614,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500";
-          sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85";
+          rev = "df9d8a8332c9f75498bfecd870d7296c6ba0b42e";
+          sha256 = "05ay6qkx77yl581jvikkf11dzny0v9h70iahss4bz5a37hawp4dd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6614,8 +6656,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500";
-          sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85";
+          rev = "df9d8a8332c9f75498bfecd870d7296c6ba0b42e";
+          sha256 = "05ay6qkx77yl581jvikkf11dzny0v9h70iahss4bz5a37hawp4dd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -6801,8 +6843,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "334d1fc9b5638725ac7454dee5e95ea4f6ba8793";
-          sha256 = "1n8bz9j5qwkbyfp4jf5wr1injwybwnm66hp2rlfqnlrf9w54pyi2";
+          rev = "df262b76a025d2a837ed0331c4affe1998959249";
+          sha256 = "1lc6pfgn30fj4bcwzkxbpzvx17jdh99z2cp6yy53gmmgiimdm7bd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -6841,7 +6883,7 @@
         version = "20160801.615";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11922";
+          rev = "11929";
           sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl";
         };
         recipeFile = fetchurl {
@@ -7396,22 +7438,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    chruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    chruby = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chruby";
-        version = "20151204.430";
+        version = "20161222.430";
         src = fetchFromGitHub {
           owner = "plexus";
           repo = "chruby.el";
-          rev = "0b210f5bb8c38dbe4581e660055cf9bac93304d0";
-          sha256 = "0gx0bd7j71rlniq64vw8k59yzl070mdia05ry18br8kpsbk3bhrl";
+          rev = "04182d666e19963fa0389cb744fc5cce62049a62";
+          sha256 = "0cj5cs2bj7r5ijhz9vyfyzcq4mfccya34n9gs2vjdr2fg9mhgynx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1989a3c6fa4cd7aaf6b0b202f197eb7db51936b9/recipes/chruby";
           sha256 = "0pk6vdvmifiq52n452lbrkklxa69c40bfyzra9qhrghxr2q5v3mk";
           name = "chruby";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/chruby";
           license = lib.licenses.free;
@@ -7420,12 +7462,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20161201.757";
+        version = "20161227.21";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "d19cf7d9d36c93eda56e1de63705a9c6c92e92ef";
-          sha256 = "1hn6kzbz3n1jxfsv23m49b0rjjzh7inf4klm31avhyndgas3bvgn";
+          rev = "bf80bd4f736dc3323cc8b7f66a8ce2f1485f1db7";
+          sha256 = "080sg0srj576sibbv06rqbxpq60r65yazhq0rl0fgfacsvgllly5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7696,7 +7738,7 @@
         version = "20161004.253";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "289815";
+          rev = "290645";
           sha256 = "1vbngm8xf7i8f3140y0dk704vagcws6is9waj9qsy6yg0vxmqp0y";
         };
         recipeFile = fetchurl {
@@ -7902,12 +7944,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 = "20161211.1451";
+        version = "20161223.1457";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "1b49cddfff0420aa5f1ca7b6d1753b4e1d35cb7d";
-          sha256 = "0ywvww3r3lb90hi41ngkxgxxw2y7kigr2a31nbbg2b6h508r44qr";
+          rev = "46a925305ad9cf3fce09921ce201e7f527d76e77";
+          sha256 = "1dxy1y02x2447ig0cfvjfhkiv8sih5d75hbdy6s9qhy2ljbmnjw3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8082,12 +8124,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20161215.49";
+        version = "20161221.523";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "fe76682dba2b8b231c664d2e0903a791996d89a1";
-          sha256 = "01qvw35wsjlydfdcymy81vcv07j5rmh4zrsy17v6q09n7sz4kg8a";
+          rev = "423c9e4ee43212c42e22b15fff4aa52c050ca90d";
+          sha256 = "09ik49nb40p082ykf2giszbxzlsc5m1zgsmfkq1j571qkn0cdzc9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8107,8 +8149,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "fe76682dba2b8b231c664d2e0903a791996d89a1";
-          sha256 = "01qvw35wsjlydfdcymy81vcv07j5rmh4zrsy17v6q09n7sz4kg8a";
+          rev = "423c9e4ee43212c42e22b15fff4aa52c050ca90d";
+          sha256 = "09ik49nb40p082ykf2giszbxzlsc5m1zgsmfkq1j571qkn0cdzc9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8163,22 +8205,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    clomacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "clomacs";
-        version = "20161124.552";
+        version = "20161227.131";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clomacs";
-          rev = "0938671fef3311c5d7c1e46e06d5264e98254c96";
-          sha256 = "08qaw7g5mldi886hr0i46wihmij2sip81bdj9p8r4zmvm1gxly00";
+          rev = "6d8a3eb84f1c65724680f4a0dcef3d1d0a29f4e6";
+          sha256 = "082y5acfxbbihfxvzbps9f6k5p08nnrk604yvpi2m8hkyspyy4cb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs";
           sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh";
           name = "clomacs";
         };
-        packageRequires = [];
+        packageRequires = [ cider emacs s ];
         meta = {
           homepage = "https://melpa.org/#/clomacs";
           license = lib.licenses.free;
@@ -8313,12 +8355,12 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20161203.804";
+        version = "20161221.455";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "379f8a45e6a210da53b7ee76f081420f371a2c2f";
-          sha256 = "189pvk3kgay05s671dq4xsqvvylz7rl38djr3hw5finjkrb26rkf";
+          rev = "e6ebde34374378b6dc751c6fa5cd3bc195390784";
+          sha256 = "186djm9wr0gjpmzn1940i2fnrzbcc57gb76yzznwfxbd4k8x90j9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8338,8 +8380,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "517c7cca8c856546a93454cf0cf98fe6bad3f856";
-          sha256 = "0hami0cq0sqakh98qw39iyv93jdpwxi0j2frc37az9y2zimbbcwr";
+          rev = "65fb0fa63279b96035a144fd2f6413d1b2def47f";
+          sha256 = "0syap84yayvqvyv0pc7l2w5db0r9mmz2ix6drsr4jcdfhcjkqgg7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8790,12 +8832,12 @@
     color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-modern";
-        version = "20161029.720";
+        version = "20161219.344";
         src = fetchFromGitHub {
           owner = "emacs-jp";
           repo = "replace-colorthemes";
-          rev = "c76b6e8e702457fc2e8907b367efdafd3b7123d9";
-          sha256 = "0ffvjilk59mbq8mn069hr9q0a0w3yqy6v3r3q94ca22bsv0gwcmm";
+          rev = "42a79266f1d7b473e9328e67a455e505e6c3eff5";
+          sha256 = "0mw5rnzzc4yfcflg59viy81ziws680r44xr05qg032b5x02l8ar9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2db82e101916d8709b711034da5ca6e4072e1077/recipes/color-theme-modern";
@@ -9373,8 +9415,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63";
-          sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l";
+          rev = "b67a8fed3bbd0af8a69e4359c27fe4646cb92989";
+          sha256 = "1fmr3r83w2vbdh6hrxjad83vnhr2sshlwvmi71zc3rg8vqwc6vdk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9408,6 +9450,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-erlang = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, ivy-erlang-complete, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-erlang";
+        version = "20161226.206";
+        src = fetchFromGitHub {
+          owner = "s-kostyaev";
+          repo = "company-erlang";
+          rev = "a5e8fad1c21d0ee72f1e6287a95eb88953a356c7";
+          sha256 = "0kdir2m2rdzwwiwpbgagiva4zsicnn5l55aaxdg5his0vc0fzxcl";
+        };
+        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-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-flow";
@@ -9600,12 +9663,12 @@
     company-lua = callPackage ({ company, f, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild, s }:
     melpaBuild {
         pname = "company-lua";
-        version = "20160514.1420";
+        version = "20161227.1139";
         src = fetchFromGitHub {
           owner = "ptrv";
           repo = "company-lua";
-          rev = "fb32b394ebfae63bd3a0468171a864b1cb7eadd4";
-          sha256 = "1fwb333p4yv02msx67p0n4bgzwa73d2zh78mwx79jani32m730ci";
+          rev = "0be8122f3adf57ad27953bf4b03545d6298d3da4";
+          sha256 = "1d9i165apgmwns7b2fd5wcpjpkah3dyj20v5sb8ynvz6qhhr5r9c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8191ab2aaa72041be46091e363d216cf1b73fde/recipes/company-lua";
@@ -9988,8 +10051,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73";
-          sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9";
+          rev = "ca51cbce87f671f2bb133d1df9f327bb8f1bb729";
+          sha256 = "0riz0jj8c80x6p9fcxyni7q3b0dgxjwss8qbihndq8h2jypdhcgd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -10235,12 +10298,12 @@
     copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copy-as-format";
-        version = "20161208.2152";
+        version = "20161216.1810";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "a7f468f8d809ae1d2d9a3c74e8ab0b4fb6728380";
-          sha256 = "1ndksvs1f2xg5gkxzpf06a4wzkx49kjl7lmzf118fijd2cxx92d6";
+          rev = "ba99e97da0ebc85f82e8cbb14fa245aca242e36b";
+          sha256 = "1dsv5vkg4kiqybffrld7idz95y3504b2fan0vsy021jv9j5k75gq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -10340,12 +10403,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20161213.439";
+        version = "20161219.731";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "c2c0e2d7bd79a0c7cb8a6df98d2a87a0891730d8";
-          sha256 = "19v6l6xfhyxnmq7ajc0f4qac1ns5wjl9l78sfpa39jn6cm9wbyy5";
+          rev = "482c3e9842e545db352237d448109154de87aa7d";
+          sha256 = "0znj9s67ir5xmrmifqql4mp433hnas8hz15mbvf1rl4mcn06z3q1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10631,22 +10694,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "creamsody-theme";
-        version = "20161105.144";
+        version = "20161221.120";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-creamsody";
-          rev = "06a1142d7601dd2e9f31bbcd6b33458636c6a2bd";
-          sha256 = "1dmnlsdhcsvlzpfcshlk7p0yjry5626i07yl08rgjhxcgbhillf8";
+          rev = "70d6bd750aee1435913f7e9019451ca0a7e27b3e";
+          sha256 = "0bh7b020dnl7ci8lzyj2570vzxp60i5zp6r8h79xhd8pbv638rmg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
           sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7";
           name = "creamsody-theme";
         };
-        packageRequires = [];
+        packageRequires = [ autothemer ];
         meta = {
           homepage = "https://melpa.org/#/creamsody-theme";
           license = lib.licenses.free;
@@ -10800,12 +10863,12 @@
     crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "crux";
-        version = "20161005.634";
+        version = "20161219.2313";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "crux";
-          rev = "b60d9f49e4874a9f333a9477e2c2440f4e419782";
-          sha256 = "04dnlsfachgigpz8q5nprk2hflh0vabkavhbk8n6fzslaxvxys33";
+          rev = "430235753cda1e9af75d209e36a2c9c4f6599a80";
+          sha256 = "1v16ac9wfvnhy5h8v82ym165lz27bv9p0wma44c8nz24cl848rrm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux";
@@ -11114,8 +11177,8 @@
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "f66ed8d4cf4cd9caa26351e27185329ca74c4cc5";
-          sha256 = "0yh4hynpq7wxwnl10nrhfbxa160p8d211637x665rqqcgsc40sp3";
+          rev = "60779eea3601f62b0d59b0fcf28fd0cfb99383f6";
+          sha256 = "0zwgs1hndx6mbay8mfarwkr524kbjfirkgjwxh9db600xrpiszqr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11378,8 +11441,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "c9bcf1bed3acf367d6deb0c273cf22db0f18dab2";
-          sha256 = "16yd296n0nh96pnkjpdbdz4i7ga4j961pkzm3cbnika26xwndx03";
+          rev = "cbbcdbb32be2de5a6284f5caf888ab582d4a3dfc";
+          sha256 = "1h5k46qk8m7za6x2j7cydq4sg105g3izm97vfr3b9r92gbcj9iqr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11483,8 +11546,8 @@
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "a984cded7522b2cdad7f33542d3b5cb9ad095860";
-          sha256 = "0dhnm3f7dd9wdbpsvnwc0hh1sa6cd48r8sw49f70pf76z58iss53";
+          rev = "af41b9146b8c374477aeb8e739686a2006ce7479";
+          sha256 = "0k60jr11jnvn4fpx7jr7jlcnfsrdv4kp26fd71jv0j4gvin2ljxj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -11500,12 +11563,12 @@
     dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dante";
-        version = "20161125.455";
+        version = "20161221.701";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "6280169aec81fe9deb3a78d722ae0ab15866e78e";
-          sha256 = "0vdvs76bhrq07ak25vasg6pq1hfdjhksl325g5idsjjnhvb0mp83";
+          rev = "19b644824eb29cf3f796db8178544221f6973d37";
+          sha256 = "1qhgj2zxzgw75d0lkswg61pf48aqw7pym79qra7jgsy9ir7xlgli";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -11686,22 +11749,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "20161210.2038";
+        version = "20161227.655";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "9b349813bee4e0b0f1c89e6e9796f43de3930fc5";
-          sha256 = "1iivrz48h8f7rqbihxk2m2ffxlqfikd4bmf57d4z428d6yp31sr5";
+          rev = "37987cccd3f06f02a76cab39bad9a83719e65dcd";
+          sha256 = "1mfpw97y87cccgng7j3chhai1ln1jwppk01i11rzhm96b7vffc5w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
           name = "darktooth-theme";
         };
-        packageRequires = [];
+        packageRequires = [ autothemer ];
         meta = {
           homepage = "https://melpa.org/#/darktooth-theme";
           license = lib.licenses.free;
@@ -11710,12 +11773,12 @@
     dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dart-mode";
-        version = "20161026.1510";
+        version = "20161218.1548";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "dart-mode";
-          rev = "1f65c88dbc55dfc6c7d5322e693d6d30962b27ea";
-          sha256 = "1ki5a104r302cxbmqj8h9ddbrp46la7yz3bxj1kxv8sl9afgbqcd";
+          rev = "e6635b390235cf16a8081763768cf925ca2d9133";
+          sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode";
@@ -11987,8 +12050,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500";
-          sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85";
+          rev = "df9d8a8332c9f75498bfecd870d7296c6ba0b42e";
+          sha256 = "05ay6qkx77yl581jvikkf11dzny0v9h70iahss4bz5a37hawp4dd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -12317,12 +12380,12 @@
     desktop-plus = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "desktop-plus";
-        version = "20160330.612";
+        version = "20161216.19";
         src = fetchFromGitHub {
           owner = "ffevotte";
           repo = "desktop-plus";
-          rev = "5da49fbf2d8c45843466ae9f7f9e2a2295e9b914";
-          sha256 = "1klgf1w2lvb537l48cgpncw51f429vhvy5qcz1p0hkdzav6v5d9z";
+          rev = "3bdce03d0499c5176fa9dd353f618727652a7130";
+          sha256 = "0hgsfcp4b3prrjmz6997zh8bayk7kv6h95ll4qq0bnrd8p99i6f8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b009b42c73490d56d4613dcf5a57447fb4ccab4/recipes/desktop+";
@@ -13952,12 +14015,12 @@
     docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
     melpaBuild {
         pname = "docker";
-        version = "20161214.532";
+        version = "20161221.49";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "9ecfa0b16d86998c380f08f82743c4dce9accf5e";
-          sha256 = "0783v9qf06gy7miw80x1lf1z59yhcmiilprpcjdlf3fyvvym56a7";
+          rev = "9da6013f24fb00ffc1f2f15c3aeb05181df5d36f";
+          sha256 = "1im6aqc26vjw9sc4x2gj16jdz3hh0mz64p81d7gvmfhjysinyfhn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -14104,22 +14167,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 = "20161206.2238";
+        version = "20161223.1807";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "d27dc431972d4b645cc41412e6fe052bf8d9f061";
-          sha256 = "1pqmbq4lbcyxhkzqxany8il9crh8sqgaamn45fbjrm70g6g80yak";
+          rev = "e4694fa64e6b27fef489eec2e60a78507ee0b3f2";
+          sha256 = "0dlh6q9m7h9h4vaf82qw5pdkf64m1pp1kfk8jkilprc273qr4m2j";
         };
         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;
@@ -14555,7 +14618,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1774435";
+          rev = "1776221";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -14656,12 +14719,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20161126.2045";
+        version = "20161218.110";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "14a6751d3858a21a8d4bdeff18f7f7b07daf056d";
-          sha256 = "1khnzv5kzw2654yjalnvabdxrp3ahjl9sfl1x28l4valm8b5ndj4";
+          rev = "0c7fed68916de6bcbbfbc6c9f787d610a3316b1e";
+          sha256 = "1a5jg1344s18bj6v33wfrxxg1cxlx6aha40wyw9dbwj1pjpw7vqd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
@@ -15244,8 +15307,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63";
-          sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l";
+          rev = "b67a8fed3bbd0af8a69e4359c27fe4646cb92989";
+          sha256 = "1fmr3r83w2vbdh6hrxjad83vnhr2sshlwvmi71zc3rg8vqwc6vdk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -15778,8 +15841,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "636c5bca8faf9e116e8447cf73646257a85f1bfc";
-          sha256 = "1a7vlqwyh2c2qfdir52l2f62g53jcign6q65z66rkdqcdizmjqw7";
+          rev = "62c99118f32dd23a088e2d9c0d6b7b755206cac6";
+          sha256 = "1f0s9pvns4gq6xzp4vp74xxxbmzp06vdv0jgh0x1xy0mfklgll8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -15795,12 +15858,12 @@
     ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "ego";
-        version = "20161024.2138";
+        version = "20161219.528";
         src = fetchFromGitHub {
           owner = "emacs-china";
           repo = "EGO";
-          rev = "17364e05fc69cd3c9b554f9675d95bf0a3cf4104";
-          sha256 = "1ikbw771j0a8y4wgx5whmgsfimw6a6bv3bc5qkl8r8ch5lph85z4";
+          rev = "334a1ea3869818ac40e84f9832b8996564286ca1";
+          sha256 = "1fi71fkfl95alkamam1z51ksn2pqchcy2gvnkn0smfs9wcy038s1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego";
@@ -15856,12 +15919,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20161214.1102";
+        version = "20161223.1433";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "d85717bd24ec32c41cceaee2defc0957f2f0b4d3";
-          sha256 = "0z3mw1i5iwmnjd2qqsyw0ka159dalrfsviv1lbi0ff4x0sqxsd5q";
+          rev = "cfd0e8a3d7edd0f82324568bc80ac92c4bdccf91";
+          sha256 = "0fvicmdv6w7jg24fz524c21r239iiqj4xg25i51sp3l242hc74w1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -15919,12 +15982,12 @@
     ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20161117.543";
+        version = "20161216.118";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "646f72944d9fb792cd21346d0234650eb5dc9c87";
-          sha256 = "1jm9fsbyrx7l7bmv50zalxjwrazcmjpdrrqm0y3c56ckix9fpqfv";
+          rev = "6beb80f2f094cd4b4d8a5fdf56b61d9d04d73b39";
+          sha256 = "1jk9vphm30523l8i1qf4iyaf6bds2m9mpz5ivrd62dxldzrs7q8z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -15965,8 +16028,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "ce9dc5ec48dae139338c69a53f9779876038bb54";
-          sha256 = "0wknmkv38zf8q4qd2iasng08mia1x7l813qzvysw8lv1x45gspsy";
+          rev = "bcb05bc970e1dd19e8542b562bafb0ad68cef8cb";
+          sha256 = "0d4sg57fn8xi2s9959lwkdv3k2naqnz2wkzr76ap1g5zllpykw8i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16354,12 +16417,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20161211.1108";
+        version = "20161226.1829";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "4f7699913ee1e9c815276760ced3393e88e506f4";
-          sha256 = "11fsfki4cz2q3xnrm1mrb94sf2achl3g2bwmi21d1xn68z4zg79x";
+          rev = "cb33398b05e2f2d7e1ce8136b2cbcb920f9cee66";
+          sha256 = "1sl59wniwrsqxwhlhsqcagx5hdlyciw5qykfrp0mmw8f2akccrb5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16428,8 +16491,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "4f7699913ee1e9c815276760ced3393e88e506f4";
-          sha256 = "11fsfki4cz2q3xnrm1mrb94sf2achl3g2bwmi21d1xn68z4zg79x";
+          rev = "cb33398b05e2f2d7e1ce8136b2cbcb920f9cee66";
+          sha256 = "1sl59wniwrsqxwhlhsqcagx5hdlyciw5qykfrp0mmw8f2akccrb5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -16533,8 +16596,8 @@
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refs.el";
-          rev = "412dafa219ab4eac6eddcc793588d26d2df6fe21";
-          sha256 = "0nl39ikk8nlc0xar8r8s2g9dp2n52qi1gmksnck7klbphmw6xx3n";
+          rev = "6ef632c8922e01714a25c6e04fd5522be6e5ea26";
+          sha256 = "00c9s60g7rl784q4slfaavqkjhj8j73pglflpjh8pvrgj77c4y6y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -16823,12 +16886,12 @@
     elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elpa-clone";
-        version = "20160724.719";
+        version = "20161222.1009";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "elpa-clone";
-          rev = "77e45f3ac7de504ff65e17dfd52bfde7bdfc78f2";
-          sha256 = "09q54j0n52493smhdrngn2isnifvy0x3s6vlicllkm8qykr06z9v";
+          rev = "8d0827b03b08eb4844e2b8465c27d5aa0e12101d";
+          sha256 = "1ik2k6ngzg3znfp4a36f7m5ca6p3iivfb7w280w3gm5x1ja8as2a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone";
@@ -16865,12 +16928,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20161211.1045";
+        version = "20161221.717";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "6b139ed3f28cfe255288aa07f14c49f1f15132bf";
-          sha256 = "0hmk1pi9mv74ry3mff854qz07rpiirn275wkd6s4vqpy7m8za4rv";
+          rev = "7899993ef4326be427ee18556d08f43d1b169c81";
+          sha256 = "15ww6p95600wgl1smxw47m8bh9pc6ap575laplv69qi6qmrivp91";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17438,11 +17501,11 @@
       }) {};
     emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "emms";
-        version = "20161108.644";
+        version = "20161222.1446";
         src = fetchgit {
           url = "git://git.sv.gnu.org/emms.git";
-          rev = "cf6903c22b49b2e3efe338a9ccbd0df36b6d0cbf";
-          sha256 = "05hqz1rlcl54fgnh40qy60ji60lycpgiqv6nnkzp29c7gc4sa40d";
+          rev = "dde22abffb7a47adfe2cf98e4505ac0048e0b5fd";
+          sha256 = "1r7gkilgmk2gll1ps0z7n0i74wbg66jla9cf8fvppvajxmmng4gv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms";
@@ -17672,8 +17735,8 @@
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "emoji-fontset.el";
-          rev = "e460c9a08e48ec4103e38a7a04acae20880149a9";
-          sha256 = "0xdlqsrwdf0smi5z9rjj46nwrrfpl0gzanf0jmdg8zzn62l6ldck";
+          rev = "10be897fa5165fd40fd35a89e38c759e008fa775";
+          sha256 = "1aanl5dd2m8jlyq27ymhc6l9i00cpi30wwhpaf67dlvk9gk89f64";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60df435eb82fcc9a8a02a0a271bb6a2d5a161bc4/recipes/emoji-fontset";
@@ -17932,12 +17995,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20161203.1059";
+        version = "20161227.301";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "5156f9b1b748c3e2246730d3234121b36e6d7553";
-          sha256 = "08m5ps972fbjwz97s6bs92icf7x32kh2invjdypy59zj2q0pdixv";
+          rev = "42598cab15985e6fc5e95989b0c73e2259cdadf5";
+          sha256 = "1k8nfxfd4y3r1y293r6sqlk4wq59rdvpbhsdvr3j0mx0a9yzdxdm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -18573,8 +18636,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "37933d48e1569bdf538686d8a1f82e7be4125ed5";
-          sha256 = "0h7jm42xj22jb512lsbjjd7gddgx4dh0711kblz3qazkm0ngw0ds";
+          rev = "691a6d0f68c5a2ef64315dd4d7759aa7aa8e2e99";
+          sha256 = "0j3xg5gv77czaldhqk1h53d0wn694xbcs2ybzpigvh51gmpsp0w2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -18587,6 +18650,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    eros = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eros";
+        version = "20161221.826";
+        src = fetchFromGitHub {
+          owner = "xiongtx";
+          repo = "eros";
+          rev = "a42e45c9b2397156c684330b0fc90ee0eba773f5";
+          sha256 = "0whlsq90v13fz69k3wjrwcwb9gkpfxqjd75mg3nrp85j9nwhb5i4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ee5807cfb3973348b901142b317e1c7edc3b38db/recipes/eros";
+          sha256 = "0xry221mj1achsyc8mkmipza2zn2xmsx96fqznf6mqvx4s271nvs";
+          name = "eros";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/eros";
+          license = lib.licenses.free;
+        };
+      }) {};
     ert-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ert-async";
@@ -19090,12 +19174,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20161101.215";
+        version = "20161223.108";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "bcb5fff9e9fc4f17f780149c6ba38002ce044176";
-          sha256 = "1h3jlfblwsrqzw98lw4dq550zidab1f6l557fdcjkqlgjf74c4bb";
+          rev = "ce8b83a6ddd930c74d84b564d55bfcc22b455007";
+          sha256 = "0fbd1l2vnrlx8zkyqwy2hkdp3h31qnxrc8djl2b3w11n6xkhgar9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -19336,12 +19420,12 @@
     euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "euslisp-mode";
-        version = "20160524.747";
+        version = "20161226.840";
         src = fetchFromGitHub {
           owner = "iory";
           repo = "euslisp-mode";
-          rev = "e42a512f5bf204ac9c149a8dfbe9abdfe24c9bc2";
-          sha256 = "1zrf652ipy701s6n5k1aga0l97ws66imhk7dj6ii9qf4587byy7z";
+          rev = "cbbb60cf7d301c19906678bae933060af21c1a86";
+          sha256 = "0xz4asnwg52f02jmyz2flmkl748isacvjylfwi23xdcxqiab454a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode";
@@ -19378,12 +19462,12 @@
     eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
     melpaBuild {
         pname = "eval-in-repl";
-        version = "20160418.1843";
+        version = "20161224.1932";
         src = fetchFromGitHub {
           owner = "kaz-yos";
           repo = "eval-in-repl";
-          rev = "4ac77eb80f6df21f5a8621982bcafc71ac2ef7dd";
-          sha256 = "07jlrngmnfp1jp30hx9vk42h065c74dz92b38sa18swzfmhwd4y5";
+          rev = "674873139ebde439fbeecaf0fb217d54f470bc14";
+          sha256 = "1fzsq6fkkrsxg6mimrnls0kn59rq7w332b94gg04j0khl61s1v1s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl";
@@ -20007,12 +20091,12 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20161213.2138";
+        version = "20161219.1810";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "c8796e3c611cd8ca55e80a0487b93c4b0551d45c";
-          sha256 = "16xs6aj3ws6skhvqfda2i7y1gj0gg20yra99hpnkz05f4gcpjfmh";
+          rev = "1c87e3a510780d9cccaade613d550ce98c828e58";
+          sha256 = "1s0cmp4vg2a6fbrgjkzjflj2jhzjh3v1p70q976awibzb1vnzg6a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -20847,12 +20931,12 @@
     eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eyebrowse";
-        version = "20161119.442";
+        version = "20161226.1438";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "eyebrowse";
-          rev = "a009536514409fdf0a1745504a7d7e0e376cc2c9";
-          sha256 = "0kw13w3q1q4gb3ql728bk9m0rymkp21rrjmy4hyx8im84xh093ls";
+          rev = "e7c3de9c8b3197f3a310d8d9259761fc70dfa3ef";
+          sha256 = "0d2vc50m2wr6f0fd04xm3bzca25im3ka57y7lg6p0bn5fp6a62vl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@@ -21211,22 +21295,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    fasd = callPackage ({ fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
+    fasd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fasd";
-        version = "20161203.2208";
+        version = "20161216.831";
         src = fetchFromGitHub {
           owner = "steckerhalter";
           repo = "emacs-fasd";
-          rev = "9883cf23f632357fa42ffde3e4942bf9022a4fac";
-          sha256 = "12i5n7aw9nhlh1ghj98jsigbj55qx85v0i8j154sqv7spx8anf2c";
+          rev = "5940b84dfa1ea7225b740d3a8dd215290d964873";
+          sha256 = "1wqh7x0c1i0w5lfh0j7xilvp5vmwvbsblp2jd6bz3n5j2ydgpc00";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f0fefb25f03677080c9adeeb48046d6ea163053/recipes/fasd";
           sha256 = "0i49z50bpi7fx0dm5jywlndnq9hb0dm5a906k4017w8y7sfpfl6c";
           name = "fasd";
         };
-        packageRequires = [ grizzl ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/fasd";
           license = lib.licenses.free;
@@ -21827,12 +21911,12 @@
     firestarter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "firestarter";
-        version = "20160318.1342";
+        version = "20161219.523";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "firestarter";
-          rev = "e40af9b4ff53e5d2eccbce66159cffd5f2481edd";
-          sha256 = "0ssx3qjv600n8x83g34smphiyywgl97dh4wx8kzm9pp42jnp29cj";
+          rev = "4d6b106f325ac1802eabce3c8a7cd0a4c7a32864";
+          sha256 = "13daz15v0sshl7lxcg1xcbpl64gklgh50pzk0qxmn5ygw7nlifn0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b046eb3b63220b937e1b70f633cb5424dc782a1/recipes/firestarter";
@@ -22289,12 +22373,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20161117.144";
+        version = "20161216.1227";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "a4dfb0eb5e5d59ab41646dfda06d551b15bfdf21";
-          sha256 = "049r2ycy4gxzmxhfjyq9g00y2jm8byfzh2j214jig3pssx12amwr";
+          rev = "319ba94a8165c886184a233986c4be138db0b523";
+          sha256 = "01xb7iks6804x8is0w3j9k8kbsd53f7i246xnv1davk8sa3w7s9f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -22646,12 +22730,12 @@
     flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-dmd-dub";
-        version = "20160609.14";
+        version = "20161223.856";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "flycheck-dmd-dub";
-          rev = "030ebb45e7eef9e2bb41ccf3b9557ef2207c29b1";
-          sha256 = "1z4z53n8hivshyv15mn31d0hr6qs09xwlxm118a78zfd167xckwj";
+          rev = "8c6220f45c24d662f1c4afae54f311139f0242b1";
+          sha256 = "0n0q5qhwpx3v0d3aw6swzv8w09cs5mlnx9aybfhclzfa44adn6rq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
@@ -22751,12 +22835,12 @@
     flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-gometalinter";
-        version = "20160714.2232";
+        version = "20161225.1721";
         src = fetchFromGitHub {
           owner = "favadi";
           repo = "flycheck-gometalinter";
-          rev = "33cc9c2d7101e0448e5e49e23487c50df163f7db";
-          sha256 = "0fjm1ll2958rjs2kzn8zgdl9ifjah6rrcsgfb1razbhf57qwbc0i";
+          rev = "b6fa2468401d9035b2aeb1dc9bdb12a518e0d13b";
+          sha256 = "08cr2jij9iaa117l4b4mg977hi6klw9qj8knc42lfzz37d91r3i6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter";
@@ -22982,12 +23066,12 @@
     flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-objc-clang";
-        version = "20161214.509";
+        version = "20161227.815";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-objc-clang";
-          rev = "3140e4c74dbaa10e6f8edd794144d07399a8fda8";
-          sha256 = "0zzb03qxfs5wky40hzmldkzq5gn4c7qknkd5ra2lghzj0az6n9ld";
+          rev = "9dbfad340090523db0b936517d8543d8aa2f2e2c";
+          sha256 = "0cky0zxlfajhq5kh868yh17d0pr5pqjgj8v8xhj14sbch5jvd3bz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -23318,12 +23402,12 @@
     flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-swift3";
-        version = "20161214.501";
+        version = "20161218.457";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-swift3";
-          rev = "846b3045d018a13cadb8a8bfde83587802d7e1a2";
-          sha256 = "06wzsi3lw938mc8sz06jxyclxpvrlyjgvs9998kpiyhz752sgfsw";
+          rev = "6e1079576d30397eefea0300bf31a248a26cf98c";
+          sha256 = "0c8a5bgrirf3ms6v75w4jaiwfxf1acv2isf7x02jms7m8h36bzxz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -23385,8 +23469,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73";
-          sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9";
+          rev = "ca51cbce87f671f2bb133d1df9f327bb8f1bb729";
+          sha256 = "0riz0jj8c80x6p9fcxyni7q3b0dgxjwss8qbihndq8h2jypdhcgd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -24425,22 +24509,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    fontawesome = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "fontawesome";
-        version = "20151202.630";
+        version = "20161219.312";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-fontawesome";
-          rev = "66650efea4a044afe0e5f482ccac465082cd5e62";
-          sha256 = "103xz042h8w6c85hn19cglfsa34syjh18asm41rjhr9krp15sdl1";
+          rev = "72b4f2f83c7fdacd225aee58f93acefc53166626";
+          sha256 = "1icwjd1rbyr1g8ifyhvpi21wjff2qrddq2rmp5lmiajnwrlfli0d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93b92f10802ceffc353db3d220dccfd47ea7fa41/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
           name = "fontawesome";
         };
-        packageRequires = [ cl-lib helm-core ];
+        packageRequires = [ emacs helm-core ];
         meta = {
           homepage = "https://melpa.org/#/fontawesome";
           license = lib.licenses.free;
@@ -24449,12 +24533,12 @@
     forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forecast";
-        version = "20160513.1159";
+        version = "20161219.141";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "forecast.el";
-          rev = "ff307fd24c64577d204d0c1b7b245f190f70bd61";
-          sha256 = "1x4l24cbgc4apv9cfzf6phmj5pm32hfdgv37wpbh7ml8v3p8xm0w";
+          rev = "8fdd0d4532b81e4bfe114fad548aeb049cd512cf";
+          sha256 = "0ia4k7jxx35g0kdm9z75i3sr1h91nh8fkhbllxpd9za29dw5fs7c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast";
@@ -24575,12 +24659,12 @@
     forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forth-mode";
-        version = "20161214.1236";
+        version = "20161218.249";
         src = fetchFromGitHub {
           owner = "larsbrinkhoff";
           repo = "forth-mode";
-          rev = "ccb14b4a477e13353ced9658b8e7adfe90bbcd15";
-          sha256 = "1g0dmrlqlwp6zaaixcksns2gzw7nsk4lk138qmfw5l6mvazjy4sk";
+          rev = "a7a5d4ba05d86152da7c1e90111271ce57de5d08";
+          sha256 = "1j1hx3xssw7iwxvlxxr28vql12f278fwl3nghr1dbmv2cmi8fb5v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode";
@@ -24914,8 +24998,8 @@
         version = "20161123.2000";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "20a98a38fb23d61bf92bb25b2062f0d07f7af91d";
-          sha256 = "0wai0z3zf2blmr9f6sfawq9977n2shf4m42771grn65mgmldlzha";
+          rev = "fa090a22929a971dc9667612ab0aff0eb8b245fa";
+          sha256 = "1ijrvhiz0m8vky2zc32c42gv4zjxwi8sq7grj66bra0x8cwyhlir";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25156,12 +25240,12 @@
     fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fzf";
-        version = "20160908.806";
+        version = "20161226.936";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "fzf.el";
-          rev = "383a050920e9b99d37c21d041deb7f38b202485c";
-          sha256 = "14drm6b6rxbcdilcms1jlqyrqbipcqbdil6q06ni9pgafi7xp8hz";
+          rev = "779254fe1ec7a0c9110af36fd039cece3040a312";
+          sha256 = "1p0k71vz9v8vx5h85ph1krb9v0jyhmq73h91ws9zcxpf1bdgy050";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
@@ -25259,12 +25343,12 @@
     geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geben";
-        version = "20161214.650";
+        version = "20161215.1231";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "geben";
-          rev = "6b805aea456f7a899066f3caa7f17bfc3d199cee";
-          sha256 = "05gzdlz5nwz2vd7f7xk9abpv2ifn1w5djcz19v1qh7xyarickszq";
+          rev = "ef154269e7275a5ececa7205b125093eea3d6887";
+          sha256 = "058qsaxv1f9qqi3ala391h6zdin8v8kxhag166mbvc5vwnsg3xik";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben";
@@ -25515,8 +25599,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "8be4885d8638b52acb16f26ce03f4182902c0a7b";
-          sha256 = "1jpf76kmqhmhz6gizm9njiid9ahlk5254ag71fgqhij5a0cqijm7";
+          rev = "b859ca7f40c1a6b0a4250497dca1f1c524e08f14";
+          sha256 = "0lzighzxyz4m8zanhbiz4cis0r4v9j5f2s7h709kpmzzmxr8qd6r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -25805,12 +25889,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20161214.519";
+        version = "20161227.1257";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb";
-          sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw";
+          rev = "991aa241795b8df0ed0b0b41acb1879f2b6fee04";
+          sha256 = "1qqrvxw7nmjvcnj0kjc7zgfv728gc5inn3igpcrz35qrz6x9xpi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -25889,12 +25973,12 @@
     git-gutter-fringe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fringe-helper, git-gutter, lib, melpaBuild }:
     melpaBuild {
         pname = "git-gutter-fringe";
-        version = "20160929.854";
+        version = "20161221.1712";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-gutter-fringe";
-          rev = "b52080a72042d60939db2281c234a6b9c5a56492";
-          sha256 = "08p0nrdwz37yagaaln9xcvyvd9zmj9j6f2hy43nhjhv4bxcapbg6";
+          rev = "0b28a5f2a575cc710473884d6d2bbda5975c11e0";
+          sha256 = "0474y0qxdq9srhc279dndx4338wrjxq4cq4ngx5ig7sj6v12dqn4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter-fringe";
@@ -26894,12 +26978,12 @@
     go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-impl";
-        version = "20161123.512";
+        version = "20161225.1819";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-impl";
-          rev = "3544b590e9867f2697c2be62389a4c1edb39aed8";
-          sha256 = "0dsn8dpfsikchbcsr009sfhics87hzb3fch4wxxxlhgh5j77nxiv";
+          rev = "5d2037e16cf354abffba68fb9ea86790e0be5eb3";
+          sha256 = "1b1628z1rlb2varxk3svwm13s5x6db0503q4d0yb3kk7hk38wpm8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl";
@@ -26936,12 +27020,12 @@
     go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
     melpaBuild {
         pname = "go-playground";
-        version = "20161203.1747";
+        version = "20161227.1105";
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "go-playground";
-          rev = "d0d772bb60c872d81572c5293d5d0a7517e4b839";
-          sha256 = "1gf8djbnm6x9d9s2qg33cfrn2fbxh5pq441rrfi7il13vgf83v70";
+          rev = "8365cac2f5bc2a71c454fe60856da0f97745ef65";
+          sha256 = "1pb5k05x02ccfk52rj97wbf5q2wrcrs60h7ds9j5ri4r1v6baflq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground";
@@ -27276,8 +27360,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "db0a26320f3e930c6ea7225ed53539b4fb31310c";
-          sha256 = "0kwb4vszahr7iwl1znhklsjkmqckj011z6akj9pzz33iabcah6mf";
+          rev = "159b4c81bbca97a9ca00f1195a37174388398a67";
+          sha256 = "15vcdzkfnx36m3dw0744rsdqnridvzdiyly7n3hjck1l87gwvvia";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -27525,8 +27609,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "45a5351755f12668ca9a0b63f1d1c906431157f6";
-          sha256 = "07ympvkvhbbfk7nrzr801qnqyh92nqs050cy4b0y22c3c52i6k6l";
+          rev = "5d78646f635f83ea5f77eee236fbbe4885aca063";
+          sha256 = "105s3jn0yf0q0sv9w8ggqji6wdmkzz20psa89q7mf4gjlynas6q2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28070,22 +28154,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "20161019.1949";
+        version = "20161227.744";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "89b060abf49791cad2639f234b230dc4882bdc39";
-          sha256 = "0bhg2za2a67r6hkb0628zvzxx65rcj7cm3kq3m44wls8q8cr2jxj";
+          rev = "de5eef8af9ceb7adbf9d0076df8c8ff0932bfaa1";
+          sha256 = "10dvyw9icvzhdspr0mj0m9pcshmgmjgcm530f7593vx75bc91bjw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
           sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32";
           name = "gruvbox-theme";
         };
-        packageRequires = [];
+        packageRequires = [ autothemer ];
         meta = {
           homepage = "https://melpa.org/#/gruvbox-theme";
           license = lib.licenses.free;
@@ -28241,12 +28325,12 @@
     gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gxref";
-        version = "20161126.706";
+        version = "20161215.2352";
         src = fetchFromGitHub {
           owner = "dedi";
           repo = "gxref";
-          rev = "7cb746755a47e90aa286e32f49fd3417f632e98b";
-          sha256 = "07qbrk904iw3c4kj5ql5hy9znkpi8hcf5b9aag2x5m2c6jh066y1";
+          rev = "ffb2139cb9a8299ce965c28cb5d3a617405fb1b4";
+          sha256 = "052j24k1svdnryss983dxjpnz4d51wx1vzqqpgckc86bkc4vfjzf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref";
@@ -28887,12 +28971,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20161212.2159";
+        version = "20161225.455";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "3d0e7df0b11bc19a81fb557856821e9fcd38ef85";
-          sha256 = "0a2ww6jw315r7v06s1s65mvsyzna9glsgilpywlhzcci44621jw4";
+          rev = "6487e756cd19750790c0fea6ae33ce0f2c62a670";
+          sha256 = "01gyk0m3wlnasfr3x27wkyhayy9jgk050gfm8a5yfmg5kdnzxrwm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -29454,12 +29538,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20161213.1754";
+        version = "20161225.559";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "3d0e7df0b11bc19a81fb557856821e9fcd38ef85";
-          sha256 = "0a2ww6jw315r7v06s1s65mvsyzna9glsgilpywlhzcci44621jw4";
+          rev = "6487e756cd19750790c0fea6ae33ce0f2c62a670";
+          sha256 = "01gyk0m3wlnasfr3x27wkyhayy9jgk050gfm8a5yfmg5kdnzxrwm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30252,12 +30336,12 @@
     helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-hunks";
-        version = "20161019.144";
+        version = "20161227.633";
         src = fetchFromGitHub {
           owner = "torgeir";
           repo = "helm-hunks.el";
-          rev = "1fb924561748c17b471ce14a5fe4fb11b1b038db";
-          sha256 = "0972vwzhzq2c1axfvxk5vg0y90078pn74bvv3k96a7jmdjbc4yah";
+          rev = "798b727a710b31330d498d24c13c109f9bcb0624";
+          sha256 = "1z0rqsdqa8czp7hhd2l4g3ayils36cnjl0m51hn9lf5xsf0l5gj1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks";
@@ -31690,10 +31774,10 @@
       }) {};
     hexrgb = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hexrgb";
-        version = "20151231.1332";
+        version = "20161223.1205";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hexrgb.el";
-          sha256 = "0rqjidjxa5j6rjknklfks743lczbq3qsyiranrf2z3ghzi0gf7fd";
+          sha256 = "0n09sf15mfvxlxzd1rqq8wlkhd5q2wdbn83zahw81r4qzdz2wdcq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9d7811584920508184a84ee4049e159cce3bb4/recipes/hexrgb";
@@ -31792,10 +31876,10 @@
       }) {};
     hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hide-comnt";
-        version = "20151231.1333";
+        version = "20161227.1008";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hide-comnt.el";
-          sha256 = "1l5jvgjgd0kzv1sn6h467fbnl487hma4h4pkwq4x1dhbc26yvfpz";
+          sha256 = "1g5dflma5hzpr6b2xjraiw4rgh8kgrr3k36dpw2b299jdfk01322";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05a695ab2bc358690c54611d21ef80cb51812739/recipes/hide-comnt";
@@ -31885,10 +31969,10 @@
       }) {};
     highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "highlight";
-        version = "20161127.1729";
+        version = "20161223.1550";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/highlight.el";
-          sha256 = "19niikr5608xq67hcknmg5s7qxcb867ff79xcn58162px8d41v3k";
+          sha256 = "1hpsfnwnhmxcvwijib410pmy2kzn8c3qym0i5ppcp5chii46wihw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight";
@@ -32295,8 +32379,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "4b0b4f44bcf14d603f88842d66a62099f1e81a47";
-          sha256 = "0hfr0njzz5czprqb4sg06vhdfs7vsw079p7v8xilz32s3priz4lq";
+          rev = "c0ec47aff00ec9061d020edffc25616c4316baf2";
+          sha256 = "1kjf6lay8njq3krkwjk4glfkj17l6a9nzbi1r7x938vvgjpvyg0z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -33389,10 +33473,10 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20161127.1745";
+        version = "20161223.1556";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el";
-          sha256 = "1j7x19jlr42mdncc3ignyra1m3w5a5gf0x51hjygrk7fh627i1jr";
+          sha256 = "1337x84fq514khzbvpw94132syba9jqfqymy1cagxqalpsfyql40";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles";
@@ -34425,12 +34509,12 @@
     import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
     melpaBuild {
         pname = "import-js";
-        version = "20161128.1613";
+        version = "20161220.508";
         src = fetchFromGitHub {
           owner = "galooshi";
           repo = "emacs-import-js";
-          rev = "4818ece32dae9df773972815559617b803a3ac2c";
-          sha256 = "08hk5z5n1jk6wkwqn5lwk530ykrdf2v5xzds9z540vmk4dzv406q";
+          rev = "15d395126f57408d770a72db2e5f43271f90fa52";
+          sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js";
@@ -34471,8 +34555,8 @@
         src = fetchFromGitHub {
           owner = "anachronic";
           repo = "importmagic.el";
-          rev = "e536d96fdf4bfcbe44eb22827dec0955551f537e";
-          sha256 = "05ayg63v3a57d0x6lzkb25z7gwf4dwa4j56q25fk0p6y5ynrhfwr";
+          rev = "22c6681f8ebc7e14540640e4d1c94037c7d820b1";
+          sha256 = "1m2a2nxsp3kxq47c99z9rkfjgkh22makb8v8gdvdyjbgnha7lajx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/695534126f0caa52f66bb90b0277d08d524daa21/recipes/importmagic";
@@ -34488,12 +34572,12 @@
     indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "indent-guide";
-        version = "20161207.1714";
+        version = "20161226.2332";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "indent-guide";
-          rev = "38cc1c64d6f897230125c3590157f25c09703044";
-          sha256 = "10ymf5fwkxcs94pxvv754krqnvzz9hjv44ma7bakz0r1rfgn1jhc";
+          rev = "c0343c76362b25148738ccc11317f7ccb89580d0";
+          sha256 = "1r6cq0984yacby96hphvsvvbifa4qz2j6s25mz72l15r344m769q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide";
@@ -34506,6 +34590,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }:
+    melpaBuild {
+        pname = "indent-tools";
+        version = "20161220.856";
+        src = fetchFromGitLab {
+          owner = "emacs-stuff";
+          repo = "indent-tools";
+          rev = "3b0e62e15091123cc6d54bf4d401ccf0d5e22062";
+          sha256 = "1rklsf6x7lwhpvzs9s8sdlfj98wh6zjsdb28pnlha09g2nm5c7jj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d8c79e455b3a567b179812754f82452469dc267/recipes/indent-tools";
+          sha256 = "1i81pk62lnjww80dpi5b55fz7p0z2qxm19z6v3225x2jpylwcab3";
+          name = "indent-tools";
+        };
+        packageRequires = [ hydra s yafolding ];
+        meta = {
+          homepage = "https://melpa.org/#/indent-tools";
+          license = lib.licenses.free;
+        };
+      }) {};
     indicators = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "indicators";
@@ -34614,12 +34719,12 @@
     inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-ruby";
-        version = "20161204.1637";
+        version = "20161218.1754";
         src = fetchFromGitHub {
           owner = "nonsequitur";
           repo = "inf-ruby";
-          rev = "e05cc847385f9160703ae00b8046bb2a9eafdd64";
-          sha256 = "1zgqvsgv6b6bysw22yybkasra45fy9i8v7dp8bhnkiwgldjsk98i";
+          rev = "1dd007201a6f1465791edaea7e80e3adbeda5a45";
+          sha256 = "07hgzwydvg56f9kpg7ch5g1i429s6c8fssn3zzk58rxnc620jv83";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -34821,16 +34926,16 @@
     inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inkpot-theme";
-        version = "20120505.708";
+        version = "20161220.2134";
         src = fetchFromGitHub {
-          owner = "siovan";
-          repo = "emacs24-inkpot";
-          rev = "374a72794ebcb92bd7b50b5578d4c2ffa6049966";
-          sha256 = "063v3a783si5fi8jrnysss60qma1c3whvyb48i10qbrrrx750cmv";
+          owner = "ideasman42";
+          repo = "emacs-inkpot-theme";
+          rev = "e175dbd7d0484ae905525ff157cda4e190977ba6";
+          sha256 = "0cpmc92234xhddb14np8v9fq3cq06ci3qcc25a72dnmjf19kkjcm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bd6ce27c31a1c73d6ee1f6b22147eda8c6b34243/recipes/inkpot-theme";
-          sha256 = "0w4q74w769n88zb2q7x326cxji42278lf95wnpslgjybnaxycgw7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme";
+          sha256 = "1m3iygb8vbqcnsxsnwr7g2mq1n2a9r7qxp3pgm1fpwz1lngvaagf";
           name = "inkpot-theme";
         };
         packageRequires = [];
@@ -34988,12 +35093,12 @@
     interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "interleave";
-        version = "20161214.515";
+        version = "20161225.327";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
           repo = "interleave";
-          rev = "f4a31271362fd3610a83f6c93ea52581c1ffb3c5";
-          sha256 = "0n4p02yf7faajwnrdinphbqc6akq657cndh7h5k7bgsakykflja2";
+          rev = "0e23fad70451607243e6b8ece4df8bb268d42061";
+          sha256 = "1pkxnip07kh21y99czcnvhbf4yihjipwq2qq5hfsqmniwws0bbqn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave";
@@ -35009,12 +35114,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20161204.626";
+        version = "20161218.917";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "c03881e03973972b44fa0e775ed2e832ebb76815";
-          sha256 = "1dlpnnajp1qg4kc99c9zhwxwy36cjicnfvbnlvjwn6flz415lavx";
+          rev = "59ad0002b16a77c2de0cc18862e8e1842c00d6c4";
+          sha256 = "1678zjrdawks59l95x6qsp01man8k7r3si6qk1bb6dz261dh9adl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -35279,12 +35384,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20161106.830";
+        version = "20161227.348";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "bfe703a4c0e91a960c606bf2420b1f118e53a0a6";
-          sha256 = "1dy0as8n5syf4cbpdpw7fpd205jzkj0k7av1c73nxvd4zd28pxj2";
+          rev = "ebc373b0b4f2b3f491c91d3a7f6dc9ce565a2960";
+          sha256 = "1594q15664awzb4ylr74x4ab8lram135rr0fr1l1gq4nsqzv4pg9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -35341,10 +35446,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20161213.1957";
+        version = "20161224.1252";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "1pmp9r48m62zq4r5xbwjm1h2rhlgb5ibfs27gkw5i5lcr2pvvsz3";
+          sha256 = "0zbp6g2wqcdxyqjis180l3nml0bb06q7d31394k0jv7ajy5lhixz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+";
@@ -35567,12 +35672,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20161213.719";
+        version = "20161216.630";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "abdbfa790074632800a449b190a8fc8d0770c738";
-          sha256 = "0g54crkziiw7ll1kifqg3shw9k50rnqvpdkf1w6zk3c2v4h40yll";
+          rev = "482c3e9842e545db352237d448109154de87aa7d";
+          sha256 = "0znj9s67ir5xmrmifqql4mp433hnas8hz15mbvf1rl4mcn06z3q1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -35613,8 +35718,8 @@
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "8d3716a93200226625b11dda8230862933f9bef6";
-          sha256 = "1rfn2jfinqxdqrjns0h9wjbxsy1g28x89g85nyl51xx7n4b2cbgf";
+          rev = "ec8588b1be34b9508a5eaf893c9854e2938d02a2";
+          sha256 = "1f03fyc3x34nzm1hk5snvbkqfcp829whjvs8i7y4byap7m0npaf9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -35655,8 +35760,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "abdbfa790074632800a449b190a8fc8d0770c738";
-          sha256 = "0g54crkziiw7ll1kifqg3shw9k50rnqvpdkf1w6zk3c2v4h40yll";
+          rev = "482c3e9842e545db352237d448109154de87aa7d";
+          sha256 = "0znj9s67ir5xmrmifqql4mp433hnas8hz15mbvf1rl4mcn06z3q1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -35714,12 +35819,12 @@
     ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-rich";
-        version = "20161213.302";
+        version = "20161221.559";
         src = fetchFromGitHub {
           owner = "yevgnen";
           repo = "ivy-rich";
-          rev = "92d7312059f8c1f055f3336580ae77437038b472";
-          sha256 = "098xsg2yggfv1b931yw4r87l8rqmgxbib5ca8bgvr3nafxfya6la";
+          rev = "08da98870a3038f97f75b84606fed9d72abdbe6c";
+          sha256 = "126s3fzv280b0qlsv67bnfl3a0fvvkprldk1d6q9vl57cd4x8rp3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
@@ -36045,6 +36150,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    jastadd-ast-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jastadd-ast-mode";
+        version = "20161219.126";
+        src = fetchFromGitHub {
+          owner = "rudi";
+          repo = "jastadd-ast-mode";
+          rev = "a29fdb470cbf0a398164950a3b0d2217de48e0c0";
+          sha256 = "01fv0ixkshy7i6wzcgq6xvijvh3n402vyhmh3qzjwi9p0vxvdyxv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/32d59dd9e796438f1752d36a30d4e062abbb6dd1/recipes/jastadd-ast-mode";
+          sha256 = "1cwqxzmqx5wxaax12rq0hy0whpaivqncykym43p3an2sl9s6ngva";
+          name = "jastadd-ast-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/jastadd-ast-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     jaunte = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jaunte";
@@ -36216,12 +36342,12 @@
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20161207.1325";
+        version = "20161225.440";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "c4ee9b3fefe42e00475af452d7c664c62dbe067b";
-          sha256 = "11sz08a59hqcyynmd2zyllbvqnh7ll0ql22vj4gxrvkv18sb79za";
+          rev = "a1c2a7a1b723cbe0cb48164f7e31875d874746a1";
+          sha256 = "0vrwdhhg2qgmskqfiz6i10x5yrw4d2866c26hgjacm3l9d1w5v33";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -36595,8 +36721,8 @@
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "js-comint";
-          rev = "067d52cd5f1f30634b7f332b33d0ee181594508f";
-          sha256 = "08k8pcswk8d31mqnld0pk3jawskxjzc4sa1mh15jqpli9phym0va";
+          rev = "2f42249c0a18ad2e17cfb272d75aa9fd3ec5e4ec";
+          sha256 = "17f99cih28lfral5iq43pjrvimlx0bnigirv44wm81n58widismy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
@@ -36633,12 +36759,12 @@
     js-format = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "js-format";
-        version = "20161215.33";
+        version = "20161220.1427";
         src = fetchFromGitHub {
           owner = "futurist";
           repo = "js-format.el";
-          rev = "dc5078de6bfdab3b23b0c5a4cbea4b96066c762e";
-          sha256 = "1b67nv9m30243pwarjqbvd3xwbcxgms21qdlgljpq7pjbjfh26yf";
+          rev = "1fb87a5b21cdc2dc4e29245d14d82e81a5983393";
+          sha256 = "0cwxyfqiwl19gvx0smcdy8immvyj0rnsrxsqy2pch1s6m5sz4wxd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6deaa93f7deaba9f5f36f1963522b6dc5c673a/recipes/js-format";
@@ -37764,8 +37890,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "76138882e7fb7c609ae8f8f83d60d1ff1c11b64f";
-          sha256 = "1gq3wnf2rwm5gcf1kvz3vxhsnsymhnnh17vn9l0n42dy9r2jn50a";
+          rev = "28d9e0708018c09fb4daa995b7c370b0d1e8bd47";
+          sha256 = "0pj093cvmfwq0zp5akh8hw0zh63q0jjfq6sx556i2lc2fkxy4403";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -37781,12 +37907,12 @@
     kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kiwix";
-        version = "20161215.535";
+        version = "20161219.1811";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "kiwix.el";
-          rev = "6fb8354e1770e752ae4eb3b79d5b873f65682904";
-          sha256 = "02k0pvax9gf8gx9gcgm6zv25pvn4962c8zipp1sn5ik7i8z4fcwq";
+          rev = "7b8a799fb2b2c9c1653cc46f04eb517ccc8a576d";
+          sha256 = "0pb3bp8c0is5awhy6zj5r05h3zpbnjgcmqd14v0x7y953fz5cf7h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix";
@@ -38428,12 +38554,12 @@
     leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }:
     melpaBuild {
         pname = "leanote";
-        version = "20161029.756";
+        version = "20161222.1739";
         src = fetchFromGitHub {
           owner = "aborn";
           repo = "leanote-emacs";
-          rev = "f5f0ed732e8fb2316591e5152306e090774c4d49";
-          sha256 = "0cj8nd63sjp8iysmxl1a1qqb5qpmmd95yp5g5b1g4ikak17mx2vq";
+          rev = "d499e7b59bb1f1a2fabc0e4c26fb101ed62ebc7b";
+          sha256 = "1lg4zml26q97bx9jrmjikhnm3d74b12q2li5h8gpxx9m35wc360c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote";
@@ -38702,8 +38828,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "96ca72844dab04a5330e0f33d95a18544b7ba369";
-          sha256 = "1nzixvacppw37z5vfxp5ggg58ppqxrw86xhf2x4mfyyk9vs7jgg7";
+          rev = "c05fa59ecf51e345069787476b9e699e42be8cf6";
+          sha256 = "0s8k4m1w61fz8kx66z3pbzdlyak8yb1v18fjgnak9185sh84mxhq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -38842,12 +38968,12 @@
     link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "link-hint";
-        version = "20160412.2218";
+        version = "20161216.857";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "link-hint.el";
-          rev = "1d97e43fef29338b63c7a3b8c90df14887afc3bd";
-          sha256 = "0w6n6m766vr7d2i5jw30dkq9326r1mx02n222vm8z1mxydkw1n3i";
+          rev = "5c3bac30fea5ff74493712273a64a1a6a9f72957";
+          sha256 = "18s5frmaf7d3l15by9yvr8hzgnk9fing4bjpfj53bcck2nmfd7qj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint";
@@ -39015,12 +39141,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20161212.1048";
+        version = "20161225.448";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "8e4f8c6545520cbb206588bc2989b5f942e95089";
-          sha256 = "0h09niqzzcc42sjrdr56n4ayddv9798naiwi7ws9w45nrpghz9b5";
+          rev = "b9d7f752e215798c23caa08252ade35a9e767c24";
+          sha256 = "1ncvxxfkb606hhggkmxyrkg33wwlrkg6d5z16797pb3iciym8nc4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -39332,8 +39458,8 @@
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "cec5ce8bbfc04ec36c09e349b707f5941c9883b5";
-          sha256 = "075jdy3mpn90kc894lcppmznp78k1csxf3acrrkxm3r6gncf4vkg";
+          rev = "20de882a23b292bf25a28edf70f87d5a979f75bb";
+          sha256 = "1kx0nb35x00xgmzw1q737x1kdvzh0hjhnprpmq1d4mjsfp1l9q1h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -39415,8 +39541,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "152f85e176aa00afd6dde8544d6735151a019991";
-          sha256 = "16jvypkrrnnabxva089k8fy23fvr405jka1bw0a47mlgrdfxan04";
+          rev = "66dc5d6fe74901d105aa28559cc12597f9e50bc3";
+          sha256 = "02wmc553gcw7d334pby4r43ipk35czznhrk97jv7imwfcg4iwgpw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -39492,22 +39618,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    loccur = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    loccur = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "loccur";
-        version = "20161122.1107";
+        version = "20161227.251";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "loccur";
-          rev = "08aeadc69571bddf44f2708dd75f57c7e027d32f";
-          sha256 = "0wlz3skimgxbfvrd0xjj17ymm24c86847hd90wik861a4ig3wby0";
+          rev = "650d91dda0d313c8f445a0803c07809d857dee0f";
+          sha256 = "09xc2207dhlbw0x9pks2gay09adzijzcabdwg55iszrs7pxjjfa0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72550b043794331e85bc4b124f6d8ab70d969eff/recipes/loccur";
           sha256 = "06pv2i05yzjzal4q21krbnp9rp4bsainxcwvpc98020vsmms0z8h";
           name = "loccur";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/loccur";
           license = lib.licenses.free;
@@ -39782,6 +39908,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    lsp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lsp-mode";
+        version = "20161221.2242";
+        src = fetchFromGitHub {
+          owner = "vibhavp";
+          repo = "emacs-lsp";
+          rev = "585029cca6f6221c6846344ee3291b3a0ccb584d";
+          sha256 = "1rq89m2npmrml2cldpi2lkzal2d920b1vxnian7wlsjn28ap84jd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode";
+          sha256 = "0acgfzm9irk8s5lv3chwh9kp7nrwqwlidwaqzf2f4jk3yr3ww9p1";
+          name = "lsp-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lua-mode";
@@ -40034,12 +40181,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20161214.1516";
+        version = "20161227.1853";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb";
-          sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw";
+          rev = "991aa241795b8df0ed0b0b41acb1879f2b6fee04";
+          sha256 = "1qqrvxw7nmjvcnj0kjc7zgfv728gc5inn3igpcrz35qrz6x9xpi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -40192,8 +40339,8 @@
         src = fetchFromGitHub {
           owner = "qoocku";
           repo = "magit-p4";
-          rev = "eb88123f184a20e6727c9829a4a08f2eae850599";
-          sha256 = "10y702vj5p7pbgny2b8w1kkm69bfy1angna8fgz7336bqwcpmf8a";
+          rev = "9c5ef8bbe70c916bc3742025ce0098e3bdf7be6e";
+          sha256 = "12avgqcm7za16m84sx2gnrf6y87gj8g4lxk4hld98myxkvfp04zc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440d47ca465845eaa601ca8a6e4b15fc197e522b/recipes/magit-p4";
@@ -40209,12 +40356,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20161214.519";
+        version = "20161227.1257";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb";
-          sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw";
+          rev = "991aa241795b8df0ed0b0b41acb1879f2b6fee04";
+          sha256 = "1qqrvxw7nmjvcnj0kjc7zgfv728gc5inn3igpcrz35qrz6x9xpi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -40650,12 +40797,12 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20161211.2253";
+        version = "20161224.2223";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "04f1aaf687ad1d3bf6bf032b817032b82a6cd6bb";
-          sha256 = "0pf6hcbd13gfjb58z2cgc4ql2m08kx0inxz1x7sfrpg1cvh8nb8f";
+          rev = "5deef4b677c293e1acef373f705d41c6e25068ab";
+          sha256 = "08qc8ybmziv2wdfdln7z26xb50sjiykmg3hj2gb9fa4fy3sbcz67";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -40776,12 +40923,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20160928.932";
+        version = "20161222.1416";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "c81e26ff477d46f68bcf0c6397d5f5346d9b0129";
-          sha256 = "000g0l3al6qsl6h47jiz7kgny6svd9i8ppza53wj3p1i4yxrzmdx";
+          rev = "df4ac404ce92abdf1a0b78da8ef1675f1cd1f196";
+          sha256 = "1k5bxqbcz174b6g3av6hr2q828bybinq96avab0561zqwqxlhkql";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -40843,8 +40990,8 @@
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "markdown-preview-mode";
-          rev = "b55c8ddba2f9c4e87f0dd9bed586f4d94890350f";
-          sha256 = "18x7mk4xysiihr707xl4s52a73mpj9bwlh53gli37wmpjfgdlp1y";
+          rev = "65f48df07c87d37275cc6a135741df4b585f1836";
+          sha256 = "0gkfwm7zxwdi7x7xd6m9sl9q1p5f2q8mxryq6cd4xldbvbcki71f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode";
@@ -41198,12 +41345,12 @@
     mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mb-url";
-        version = "20160724.725";
+        version = "20161224.1806";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "mb-url";
-          rev = "178b03d2cbc31e889c095a6c25426c297e5fe6fc";
-          sha256 = "0y22bn4zvyw2qivjrvwkhx96mwvfpx74901r0m4l31nvyh559aq0";
+          rev = "129a0bb6a684be76fb9f09010e710065d0e5baaa";
+          sha256 = "1apy7abjhdbgh8001rzv41q40bfl444rcz62lvgdwj3lg45zb8xc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d/recipes/mb-url";
@@ -41492,12 +41639,12 @@
     mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
     melpaBuild {
         pname = "mentor";
-        version = "20161212.1342";
+        version = "20161221.1521";
         src = fetchFromGitHub {
           owner = "skangas";
           repo = "mentor";
-          rev = "c0cf0fcac1a2bbc9887e15bed00dce10fcb6ecab";
-          sha256 = "1v2dqwbfwf21az6qpqxd5bskspampp3mdhdzy7vsmfd50gq3jb5l";
+          rev = "0d8afabca60931c62874c8d5f0c2b8abde2782d9";
+          sha256 = "0iciis2fzlb19rc6jvkich3hyg5aqgla9zicmwrl1v4rbd16zg6l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
@@ -41675,12 +41822,12 @@
     mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mew";
-        version = "20161123.1840";
+        version = "20161224.1535";
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "Mew";
-          rev = "90485fb0f21c250d308d1952ccad1049e766fcd8";
-          sha256 = "03bksshs2n3jxiccbgd86kbbwm79hmvsrbxw4yyjv311w8p2i1gw";
+          rev = "8138c83339071884a2d6c5365a088ba8da4a0fc0";
+          sha256 = "0yvqarinibrg7f362gg1i3r2wgjmzzv0j71zcrp9id30gfwbs6z3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
@@ -42645,12 +42792,12 @@
     monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-theme";
-        version = "20161215.347";
+        version = "20161216.628";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
           repo = "monokai-emacs";
-          rev = "241f7a218d7697efe47ac2fc7751717a1c47ef5c";
-          sha256 = "1fgadbbvsh78xq3gg203jc7c93b3ypmxsnncx0kpq3rhd96ym730";
+          rev = "1a921469d0d3a974bf626a76bc5e9fb342fb32d6";
+          sha256 = "1xby4jxxjwcgpai242y5c6ha2cj07hs1nndvxa6f1ncfkh5a7azx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -42830,10 +42977,10 @@
       }) {};
     mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "mouse3";
-        version = "20151231.1526";
+        version = "20161221.1025";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/mouse3.el";
-          sha256 = "1831jpi06hi5v2jdjgs83jma7fp8xiqdmvvwxfyp2zpbfwi1lkb6";
+          sha256 = "0fy3xrm58shpg977hwrrgjl95v1g2jgf9rhrgg7s0lf7cbs3zhp5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3";
@@ -43101,12 +43248,12 @@
     msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "msvc";
-        version = "20150530.151";
+        version = "20161221.558";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "msvc";
-          rev = "e7a61fa5b98a129637f970ac6db9163e330b3d02";
-          sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
+          rev = "71c38323187c98b32250b89088768599bb216ddb";
+          sha256 = "1wwa861a8bnrqv59bx6l5k3qi98wqv6cicvg5gjyx8rdvpcq28dg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -44113,12 +44260,12 @@
     nasm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nasm-mode";
-        version = "20160525.1826";
+        version = "20161216.736";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "nasm-mode";
-          rev = "c3f5475c2f4bd930411b6d716765d094b36ce219";
-          sha256 = "0d8bfz41ry5bvkz2894dqkk3244n7xcjk3pf58fcsagvmmkkln7b";
+          rev = "d990ed94d902b74a5c834fb567e03307607cee45";
+          sha256 = "1dyc50a1zskx9fqxl2iy2x74f3bkb2ccz908v0aj13rqfqqnns9j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a832b3bd7c2f2d3cee8bcfb5421d22acf5523e/recipes/nasm-mode";
@@ -44285,8 +44432,8 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "9339ad5534676dac089048f9955a77c282862b25";
-          sha256 = "17wq5lsrps94qgxhmk2xgp6j8lr17g8c2liz39ffvvwawcr207k7";
+          rev = "6bfcf05762c38485780f819419e689d3b51db1eb";
+          sha256 = "0xwm7al5nqwkii6y5vr71qv8fp70m3pyzdzwcp0clj2pi0zrsmvq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
@@ -44323,12 +44470,12 @@
     neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20161214.2346";
+        version = "20161226.1807";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "cfef6036b69d53a83689694f5f257e5aaaeef265";
-          sha256 = "0bbhvldxid7g4jg6pp9ywcf0xipbf9y2wqbg3pr7g45sbl3i7zz3";
+          rev = "fa8c4fb32efd2e21683154cb503af37f153d138e";
+          sha256 = "09nvzp51dfjcwzhln44s70rawb3m65ad86fr0j1pa2vmb6czmf4b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -44621,8 +44768,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "5278bb7c16c227d64551fc6578cb1b1b22f3b036";
-          sha256 = "11f3fk1w40ynjzabs9rmzjzbwlkr91bhc5a0wk6m9pmm9lmshl6b";
+          rev = "d0a2db17d91931cfd8d60e93d30cee20d39762c8";
+          sha256 = "0kilga3rxvmqx1mmmlkhhrfslx6q6p02qmjs5k33flymwk6nh3ax";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -44743,12 +44890,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20161212.956";
+        version = "20161223.607";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "0421f2c8aba7d369135d9e7e0d181d0da8c08d8c";
-          sha256 = "1vk4cz12r0aw1rapf9k2g730ak5q8b5rpylhwsr819ixyr9zpz7a";
+          rev = "e7d3ebbd12f176707e63766a7a19bcaa08e01331";
+          sha256 = "0y8wvagn4yf7fwvwzqcrx46wigmvyl25fa94kzvkanjl04zid3i1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -44890,8 +45037,8 @@
         version = "20161215.457";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "5de84d07526d330a46e50d955bdfeed8f629637d";
-          sha256 = "0zz3xg9v8g9vj4lwdx4phwr54ky49bws2amm1cq7yijwzgj2qbjk";
+          rev = "f2a038825b73d4b9fa6cfd3ecbe661f1e6a49840";
+          sha256 = "10qp2x6v9a610mx2khlfh1swl1wlhc0adisz0x92y4xhs9d39s7j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -45596,12 +45743,12 @@
     ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-prolog";
-        version = "20150530.937";
+        version = "20161219.623";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "ob-prolog";
-          rev = "548986d0e6f678789216a882f0a19daf1b89ab93";
-          sha256 = "14scbds1rlmii52i0zr3s0r1wmga7qysj63c2dpinhagxa36d51n";
+          rev = "92dc5af269bd37c3349075c624adb8d03823b43a";
+          sha256 = "00fkm44vri1jminf55m35f8viq8sq4r4s1lsc5hr4vi85c1vjy9p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog";
@@ -45999,8 +46146,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-octicons";
-          rev = "b993e666977e92432eab197c02728f18e81eaa72";
-          sha256 = "13v7nivp2rdqg6ndp553mlkkxh9cz8fn8n62qwl5sib7svcr2jwc";
+          rev = "a61e561966ffd8faa3b48ce5b3a4eec10c59708b";
+          sha256 = "0w98ii2ny57al94a4h927xx1hn99df5if543v2gh36zqdlwc7xci";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c62867eae1a254eb5fe820d4387dd4e8a0ff9be2/recipes/octicons";
@@ -46037,12 +46184,12 @@
     octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "octopress";
-        version = "20161009.1232";
+        version = "20161222.343";
         src = fetchFromGitHub {
           owner = "aaronbieber";
           repo = "octopress.el";
-          rev = "0e06723eb725e775bd4e3d506695f5b902b94b0d";
-          sha256 = "0hj96wcd1dpvm3y4h0chfb4539s1pvaiiyxqy95a6dsl57y38l1j";
+          rev = "85bab12adbd985767233eb1622c4b8f7c1fe7e1a";
+          sha256 = "012g0mf8g602f53x3bc35ahy4bq31s3m7cv13hm46zj8syvdckvq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7205d3d43797755077f19f57f531b4b39e77bae3/recipes/octopress";
@@ -46272,8 +46419,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "f956929891e77ba4ce2fb1361129d5d3ebc7bb55";
-          sha256 = "1xds6fqs1l6q9vak3v4xlzl1w084mhz86xrnycibcwm8q3q9hmb3";
+          rev = "e7eaa1202486f996121cc0ef17a8d72b915c8165";
+          sha256 = "1f66k2l996vzf5rm2scyz4bv1cyn365a8yfh1cfq13vrmvah57xb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -46734,12 +46881,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "20161120.1201";
+        version = "20161209.614";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "cdb62dd5bf1e316d2dcc6da9661231f6c8e3be72";
-          sha256 = "0clpx15lcbjsml10z87zbbi3jwzm76f01f7ikgjj8y5xxj09nhh9";
+          rev = "0fbc67e7675d1780a13e64e01c3665290e7fad7c";
+          sha256 = "1lsk2012fchvcl3i6jgzidn1hxnhwys745qnzy8rysb5yvszcycq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -47381,22 +47528,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "20161209.2253";
+        version = "20161220.2046";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "370c05876f151e7aba9c63562d41d9b7cade30ed";
-          sha256 = "0scslv9il8i6yz2akrz88q7dig1lf2sz34c7hn2adbkl0ykj4wh6";
+          rev = "6330511011b7fe8ee04300e82f090ce3efd3b100";
+          sha256 = "18kwiwmq95pf8w07xl3vh2xhlkwnv53b4n6h0xq2fqprkh8n6f0l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
           sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib";
           name = "org-jira";
         };
-        packageRequires = [ cl-lib request ];
+        packageRequires = [ cl-lib emacs request ];
         meta = {
           homepage = "https://melpa.org/#/org-jira";
           license = lib.licenses.free;
@@ -47471,8 +47618,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "901d2470ddc862b07a2cbf30d3b0e5fed997030b";
-          sha256 = "0absbqlgghp3znlq0pkw4261f3liv5hcn8ydfi66ar6rx2awp92w";
+          rev = "5b8ebe657607964822b61da2cc8c61c74af191af";
+          sha256 = "09l0pdgazf72drz98101y49lh4iv2naavnk95nnww9q7vcw7fpkr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -47491,8 +47638,8 @@
         version = "20161126.239";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "901d2470ddc862b07a2cbf30d3b0e5fed997030b";
-          sha256 = "0absbqlgghp3znlq0pkw4261f3liv5hcn8ydfi66ar6rx2awp92w";
+          rev = "5b8ebe657607964822b61da2cc8c61c74af191af";
+          sha256 = "09l0pdgazf72drz98101y49lh4iv2naavnk95nnww9q7vcw7fpkr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -47622,15 +47769,15 @@
     org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "org-password-manager";
-        version = "20160430.1851";
+        version = "20161226.1624";
         src = fetchgit {
-          url = "https://git.leafac.com/leafac/org-password-manager";
-          rev = "5dffcd5f7d7f1852fdd31a193bea5c70ea130082";
-          sha256 = "023xsyvppq771yvxd9kqhn9lffhr83sfb0h9g405ayfjys94m2xd";
+          url = "https://git.leafac.com/org-password-manager";
+          rev = "a187227f1c6760073a8a62328249d13c2c04f9e8";
+          sha256 = "1n732cqxfddm1mx386920q14fl2y4801zy2a87mhq07qlrmshszc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5a8ee7c233b8dca97fd7a4a0527657050714286e/recipes/org-password-manager";
-          sha256 = "021yhp417b9c8cjh8ynmz2fqyplpr2qvc0djxf74kd8lhn4pl397";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager";
+          sha256 = "0n07k2nng3zkrcif85f1r2g2l4vha78lmrdnj590axn7l5q5fidm";
           name = "org-password-manager";
         };
         packageRequires = [ org s ];
@@ -47837,12 +47984,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20161208.1825";
+        version = "20161222.654";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "f5a5e5e20e5f99d069d3fd8c89ee5b186a02f1de";
-          sha256 = "0szn5rg3xwlfgkq26fadkdsxdx2a1srshwcri9j0rlj4111c2fp4";
+          rev = "81f80575bd32cb94fda841f09b5df3037bc53c66";
+          sha256 = "0f3ymmqcb3ln8ikplw4yc0yfv2q0hyv9ian105p5vpjxis6ss5r6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -47928,6 +48075,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-seek = callPackage ({ ag, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-seek";
+        version = "20161216.2102";
+        src = fetchFromGitHub {
+          owner = "stardiviner";
+          repo = "org-seek.el";
+          rev = "1f51e6634e3b9a6a29d335d0d14370a6ffef2265";
+          sha256 = "0aq3af6fd16lm9iirzya6hmc8g48kfp8pc4dx51mgb5d6jjiizkv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/05a83750e745f16b15cbdf123165a3192363bfd1/recipes/org-seek";
+          sha256 = "08l5zl3wk2f632hslcl5fi9ylaml5my6qx481yvdrbi6m8bchkpp";
+          name = "org-seek";
+        };
+        packageRequires = [ ag emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-seek";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-sync";
@@ -48316,12 +48484,12 @@
     organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "organic-green-theme";
-        version = "20160919.229";
+        version = "20161222.232";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "organic-green-theme";
-          rev = "3b4601264c41ddbe62ba25a78c00365379cd2c9f";
-          sha256 = "0sb17krqla5l2bk14p55dbxxkghsvs6ynsmcjg7qlhspv53zdcn4";
+          rev = "dc66586b8581b35a723f68211fb1efeb7f00ffef";
+          sha256 = "012s9m3cysnfbr0s2l53inm3k06k7ra8jlp68cdnslhb41az2kp7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme";
@@ -48925,12 +49093,12 @@
     ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-clip";
-        version = "20161012.1107";
+        version = "20161106.823";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "6f9cf1691cd8e597f3c6ca20ef299d5c62c9920a";
-          sha256 = "15i877mr3mwzh44dzi1y4rx86kkx783fg3lai78vsby2c7jd0w42";
+          rev = "e6d4920cd688b81fb11eab6e289b1e99d69517ed";
+          sha256 = "0qpp3kzpmj7qk7hvimlyn0njd98k1gzl0a8zi2h5kj6inq78y158";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -49198,12 +49366,12 @@
     ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-rst";
-        version = "20161006.821";
+        version = "20161227.1109";
         src = fetchFromGitHub {
           owner = "masayuko";
           repo = "ox-rst";
-          rev = "b4aceca6babd5f59a14225df1e3e99a3e313bae7";
-          sha256 = "13kk5cb2v1pv0zjrqvhprqpxxh96xv7jv920jgznbvgypvwbs9p0";
+          rev = "7b6095c53211978c73e1d686cd2d672cf28eb4c3";
+          sha256 = "05fb1xflv82600lzlm3icf4vvcfiyh8lmcp0f4w8xybkp0f4kdpc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst";
@@ -49597,12 +49765,12 @@
     pager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pager";
-        version = "20100330.1131";
+        version = "20151201.1720";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "pager";
-          rev = "347e48d150d5e9a1ce2ca33ec12924d5fa89264d";
-          sha256 = "1dq5ibz7rx9a7gm9zq2pz4c1sxgrm59yibyq92bvmi68lvf2q851";
+          rev = "5c791ed23f1136e04040d6f4bc9b4ca5b6dc919f";
+          sha256 = "198zlh7zrql1185b9qjim44a09kbbgs9zyahak9nhv1gxqn7mrdf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/pager";
@@ -49638,10 +49806,10 @@
       }) {};
     palette = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild {
         pname = "palette";
-        version = "20151231.1545";
+        version = "20161224.1325";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/palette.el";
-          sha256 = "1qnv84y0s437xcsjxh0gs9rb36pydba3qfrihvz5pqs9g9w7m94k";
+          sha256 = "0836gn7x8dcsgn6plfbmgbb0lbbzsz5hm2p09ynr84vwsfl07ma4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/palette";
@@ -50078,8 +50246,8 @@
         version = "20151027.1449";
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
-          rev = "0b2f803fe61992af02b8820c400984b1f615a299";
-          sha256 = "011sz1rlr7mbsvn1z1kxl3psjv3g2vkbndcim5jnp1wwlc5bibh3";
+          rev = "bb717d68c5ba07516a6d0a156851792984367b53";
+          sha256 = "1b62vdwqz32icjrxpddbv490nzb9ka1x0kig8h442jchidsbcqf0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
@@ -50765,12 +50933,12 @@
     persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }:
     melpaBuild {
         pname = "persp-fr";
-        version = "20161108.1138";
+        version = "20161226.1241";
         src = fetchFromGitHub {
           owner = "rocher";
           repo = "persp-fr";
-          rev = "0b2a021be802d5a39f1551c0ad1d8bceaa136afa";
-          sha256 = "1m1k6i1h7smfmn68k29bq3w301bwf76l0r8qhq5drd51nk0vp0dc";
+          rev = "ba989ad309c2023d1826e79446908bd1b881a56a";
+          sha256 = "1l9yb14sqxxfxzh76yv415ifnmrdi5qqp4m0858drs9wcm9f23pm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr";
@@ -50786,12 +50954,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20161214.243";
+        version = "20161226.518";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "28eaf5e56e18be4bab1639ce2c31b64bd2828746";
-          sha256 = "1y4l21f81xc1bz9w0jm7vyab00k402zjlbdgki618sas9bk4rfdk";
+          rev = "1116ead88123a11efef346db0045ee8389250bd2";
+          sha256 = "11xncsvzy13xc939qfvlzplsz2izvf16hy45k500h44g2dxcvq3m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -51206,12 +51374,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20161213.806";
+        version = "20161217.537";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "cca3fe0fdbabb9f8256fef948972e5d5d823dd69";
-          sha256 = "11xdjdlvld9xnvwbaglc57n17v56p8jqd2qb6cqz3i1cvqhpfm8y";
+          rev = "3287de50464e908d421e9ad191fe31b8fae89ed3";
+          sha256 = "0m3z96n0nnsjisb1cpxcx17z2q1994qvrisnd47fv7sjj3r9g5vi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -51311,12 +51479,12 @@
     phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "phpunit";
-        version = "20160808.212";
+        version = "20161219.319";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "phpunit.el";
-          rev = "165ca257d4840c266e1e79e806b4b943b5785fe6";
-          sha256 = "1xgjhq1nxj4zfcns0q8a1kdlmqcjrxlblyj9vrspv1qck3akrp3z";
+          rev = "791d1b33b63887cdeaf287fa657b8109f9d1dd18";
+          sha256 = "0j9ym19pz17wsjh1ky65x9mz8aiiryxbw1nsygvy9isbdzjx591k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit";
@@ -51710,12 +51878,12 @@
     plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plantuml-mode";
-        version = "20161111.205";
+        version = "20161225.1142";
         src = fetchFromGitHub {
           owner = "skuro";
           repo = "plantuml-mode";
-          rev = "87417ad75b215ababf153cba533575ac0273a5db";
-          sha256 = "1jrck9wybpm2p2imjn0x6g3ybasiqkfzxc1halm3rq6xvc4zvrsm";
+          rev = "c7e83c260778467be5f82500a5541ce76da662ac";
+          sha256 = "0lf2438ia39idxbz2b7qaagajnlfgf74cgvwppdl53hsy12b421n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
@@ -51917,8 +52085,8 @@
         version = "20160827.857";
         src = fetchgit {
           url = "git://git.savannah.gnu.org/gettext.git";
-          rev = "89b77b3e3229c3df9c67de17fdef1086422fe6cc";
-          sha256 = "1sbdk6ijak2p1wkm9cbgvvml2hx1kc7ny9p0z9zfw9lz9mrwckdi";
+          rev = "3e1b7955c1f95428a974b6f335c62e20dcbca84b";
+          sha256 = "1mzkl025vq3nj5qxbi99fr116mxr2glncz16w4zxd9spfjlaw2z4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
@@ -52057,12 +52225,12 @@
     polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "polymode";
-        version = "20161205.46";
+        version = "20161218.1326";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "polymode";
-          rev = "ef56a732cbfe86e982d5c982c0c7bd3909c7f840";
-          sha256 = "13pj6hxz5018qyv08xh9q3bmng9qrikpnv55a3c1y8v0z68ppmkr";
+          rev = "a29b8a07cc9081bd75114d68fc7afdcef2e5bc94";
+          sha256 = "1vsvnia8px35ip13zc94l7nh4201z6z15dzrhfcj6bd0jnbqpxh6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/polymode";
@@ -52969,12 +53137,12 @@
     projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20161215.443";
+        version = "20161218.148";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "7717fb86c1959e936f13cf2407f1ffd1c9c18e7f";
-          sha256 = "1ycz38bgdgcb57i4l52lqza3ffy9pva8lxicz6adk8vfx2bl85rc";
+          rev = "08d2551260ed17594d02e5e5f6a7f261a5f118b5";
+          sha256 = "195ygas8yy0z3kdm485hjp0rv1q73czq9sv45s4daa74bkr6dq1v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -53351,8 +53519,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "83d681ee2caef1feb009656417830f846382d8ba";
-          sha256 = "12a94bxkg18mfv9a4pkqzyjiinm1b9wflbk9ib3ialmdadrmjdda";
+          rev = "5f65ee6ac7e1c60dc4bdffa3c4247b3f0042e4fd";
+          sha256 = "1bka9sb0hlxqf8q1k47ddnwc4jy6r4qp0rvwgpangrkwm70qkpjm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -53368,12 +53536,12 @@
     psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20161212.1626";
+        version = "20161220.553";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "30ec730fdf887579df7bed9f43b2fc25be2c9307";
-          sha256 = "1znprm47539g5jbygqr9ln1m7y37vgx46rhax13fm4cxgsm657vc";
+          rev = "5a1cce36241cd0ec3781d748d6ef151e685079a3";
+          sha256 = "191gvvliarvvkcjw54ajjfshv6n29sk5m0dj3h8j5zw5ndnlw6cj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
@@ -53473,12 +53641,12 @@
     pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pt";
-        version = "20160119.817";
+        version = "20161226.1159";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "pt.el";
-          rev = "97e04eb77154234d946064a573762bcd72219f75";
-          sha256 = "0ca8j7xlqxbidqfz2iarwn7qq4v12pwvsq6vzj2473n2g1c09xzj";
+          rev = "6d99b2aaded3ece3db19a20f4b8f1d4abe382622";
+          sha256 = "1vi97hgwrf7n8vsbkvvhn398m20755jnbbbz4kxgqfmcgpimc8nc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34c51783af154f203489f5f7df7012ca61932caa/recipes/pt";
@@ -53491,22 +53659,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pug-mode";
-        version = "20161208.2016";
+        version = "20161221.1154";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-pug-mode";
-          rev = "e8099627829aef2d382d9a5df4a24881086879dd";
-          sha256 = "1w9lb3r92l0rcflkivd0k9gz2gy33xpmyxd1ikjbsr2mf7h0r1i7";
+          rev = "8967d57715ad303b9c987f4390a18c51c2f30cb3";
+          sha256 = "0kk5i7dynxg53g7wx5k6lkk1015pqphxzanqw0m6nhvv1p56w84x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
           sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85";
           name = "pug-mode";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/pug-mode";
           license = lib.licenses.free;
@@ -53599,12 +53767,12 @@
     purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "purescript-mode";
-        version = "20161013.911";
+        version = "20161216.133";
         src = fetchFromGitHub {
           owner = "dysinger";
           repo = "purescript-mode";
-          rev = "96c5ce0b22023ff6e2944d43ffeb34a34dd57db6";
-          sha256 = "0znwimxdh0jc3z0y1b9lrv680wi0ixlnmhm5i5xypkxis65n2yrb";
+          rev = "c88126070c052d636f4dad5525846a1b200fce43";
+          sha256 = "1ndclsywvh5x06gmvk44zjlgfamdn55lygdgxf3x1vrznvr0jawy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode";
@@ -54039,12 +54207,12 @@
     pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "pyimport";
-        version = "20161209.557";
+        version = "20161219.302";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "pyimport";
-          rev = "c0c12b64a189f99d3b1477d2dea35528a856c860";
-          sha256 = "1kn38j9fgn0ja2xhvj69jdw5h6j5dqnnqk0zzd6ypk5zbwhxncp6";
+          rev = "2e8657e8ca2c049cef331e8fdc13c43541044f5c";
+          sha256 = "09ly4gi4yd7nl7x4lzgjacfvjbc4mfsw2yfmmxiymj70xa7ffik3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
@@ -54085,8 +54253,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "ea4273cdff22cb5c0bc5fd8a408cd03b454c43bf";
-          sha256 = "18kb7ia9wm9j3iyfhklvb56x0kw1zawa5q80z3vmmfx381v33wj6";
+          rev = "654d64b2390be1b7e67384dce6e72c6b52a03e7f";
+          sha256 = "0qny9ks411l408pc66d2gwnk3hk7jn9xkj949gxdv2n08rnylzp9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -54228,12 +54396,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20161124.930";
+        version = "20161227.29";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "d30c9033fde2f4ce03b4f4792792a9603cd26bab";
-          sha256 = "1bgzkbhl00cc60y0d34cx7i6y560wf9jx9fb3d4wz06vh3322mb4";
+          rev = "0a5a7a755c6106d619d939bcaa12a969bc4a2d00";
+          sha256 = "1hksj76xh8zvfqwgc8hilglhgc281lp658pp9fwp3624fd2ccmzl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -54246,6 +54414,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    python-switch-quotes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "python-switch-quotes";
+        version = "20161227.829";
+        src = fetchFromGitHub {
+          owner = "werehuman";
+          repo = "python-switch-quotes";
+          rev = "1d5d233c5da9d7668d15b45ae872fb641bfb0b0e";
+          sha256 = "0giqpfwiwjz2d4dksxlp4pgra27a4fnzlc3sinrs514l1xx80lnf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d99fbd3d0c486bf89c9c0937e2ebf378be39293f/recipes/python-switch-quotes";
+          sha256 = "1wc27q9ac8p7c5mfk3kznbmdd5ds4ray0csgba79n19g152y5jjc";
+          name = "python-switch-quotes";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/python-switch-quotes";
+          license = lib.licenses.free;
+        };
+      }) {};
     python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-test";
@@ -54585,12 +54774,12 @@
     racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
     melpaBuild {
         pname = "racer";
-        version = "20161209.1533";
+        version = "20161226.1715";
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "485b827cfaca5e4e204e5529912d7999bc29bde7";
-          sha256 = "0xjv8pi8rc0dbmllkv8gchp05j1k20pgqdi97h7s0xwjkwcpbqym";
+          rev = "94637305de53c88bf9b6d4769bdb3918dc0c5654";
+          sha256 = "1s8j49p00hgqgshlvqvc2qc1fnfkik0vsaspv7bh4v55gbqjny0d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
@@ -54960,22 +55149,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild, popup }:
     melpaBuild {
         pname = "rbt";
-        version = "20161109.1506";
+        version = "20161220.1352";
         src = fetchFromGitHub {
           owner = "joeheyming";
           repo = "rbt.el";
-          rev = "402d7465f68706d051e8117b6f00ecdc18134f15";
-          sha256 = "12kqw7cxv54agy7k8y550cixnv4zjpy8rhamwp36bf6nqch4ly2j";
+          rev = "25ed055ffa444cb077042f95622ef253759f3ee2";
+          sha256 = "1gv0bm25c5v6sygpcxg1h7cnn8md8q7njh8jz1was5cmgkq3i3kg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7241985be1e8a26a454b8136a537040b7ae801/recipes/rbt";
           sha256 = "1mrb6v8zybvhh242vvq0kdvg6cvws7gabfhcydrw5g2njhyqkygm";
           name = "rbt";
         };
-        packageRequires = [];
+        packageRequires = [ magit popup ];
         meta = {
           homepage = "https://melpa.org/#/rbt";
           license = lib.licenses.free;
@@ -55278,12 +55467,12 @@
     realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20161209.1829";
+        version = "20161227.1536";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "7689f4910ce081dcecdcc8a7c534af037c65295e";
-          sha256 = "1aq8r2yqwspil9l4jxprkknnj2cl9x9srx4qd8fw07ad7razcf99";
+          rev = "4a5fe992f2b4a68f7b3840bbb24b496738760573";
+          sha256 = "0448qvl33rvnwlwmsmm297w6ghb0gk0s1bkny3q3wagrwsi9zf2f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -55326,12 +55515,12 @@
     realgud-old-debuggers = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }:
     melpaBuild {
         pname = "realgud-old-debuggers";
-        version = "20160805.713";
+        version = "20161225.626";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "realgud-old-debuggers";
-          rev = "1362a42dec1ee859d4c339cbe6cf4813bf826f51";
-          sha256 = "0zf8vxcn0lyajjz2dbmr98k2004qp6ydf3y4a696krvk1gm0vf79";
+          rev = "fd38ebe7d4a59786d34b0cf972c315278871bf47";
+          sha256 = "1p3dk81f1cyisv6fb7fny6a9nij4c0yljypcdwiy79zq3fniskhp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/260b4d5a85c380dda0f7bb0370e3ffa8cc3c0275/recipes/realgud-old-debuggers";
@@ -55386,6 +55575,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rebecca-theme";
+        version = "20161227.1206";
+        src = fetchFromGitHub {
+          owner = "vic";
+          repo = "rebecca-theme";
+          rev = "c72c72a1510af32c2ce6207df6e1b402901998df";
+          sha256 = "1jnyyzmy5hrsjr4fia1cb3bdviysflvaczf9k1n3wrbclp7i9j49";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
+          sha256 = "1m72jqyqx18i1vpj07v3vkbi0di9dks5sz46wb2h0f23xqyx00md";
+          name = "rebecca-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/rebecca-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     rebox2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rebox2";
@@ -55597,8 +55807,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "1a1df16146118d3e4cdfa1730eb7616550b2c4a4";
-          sha256 = "1qvbi0iwbvkyc1wq5kv5jh1lkvmmq56bh53ww921z3fhsvrgkqmj";
+          rev = "466794c0128cd1aaaf60d441f02e9f33afdd4542";
+          sha256 = "1a2aaqgzscyb6y793gc6699g73vw64szn9d6k0qkb4q5j6k1r6mr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -56010,10 +56220,10 @@
       }) {};
     replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "replace-plus";
-        version = "20161209.738";
+        version = "20161224.1248";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/replace+.el";
-          sha256 = "1898bwn0slhvkqcriwipa8d25554npj9b1hkz7rxz1pw7s8hgmck";
+          sha256 = "1l2xssvy51rp3hfnn5ik943yk1z5wj67wpznjig90g9aqlyx88v8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+";
@@ -56092,12 +56302,12 @@
     request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "request";
-        version = "20161121.600";
+        version = "20161221.1711";
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "4f5dd0aa8b788fe825461dbcccfd5a3fb2750f9b";
-          sha256 = "1d3xz5hgb1cpaf1ijk05l1ffr99i621wa0192qiipc6fxxy0gpl6";
+          rev = "ab0a1af532636bfcb797160a1e39512ee26a3932";
+          sha256 = "1vs7aggcqql9spwyrl1mri4blrqrkqhxmwkyiz5kw2534nvmj2hy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request";
@@ -56117,8 +56327,8 @@
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "4f5dd0aa8b788fe825461dbcccfd5a3fb2750f9b";
-          sha256 = "1d3xz5hgb1cpaf1ijk05l1ffr99i621wa0192qiipc6fxxy0gpl6";
+          rev = "ab0a1af532636bfcb797160a1e39512ee26a3932";
+          sha256 = "1vs7aggcqql9spwyrl1mri4blrqrkqhxmwkyiz5kw2534nvmj2hy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred";
@@ -56821,12 +57031,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20161214.1014";
+        version = "20161227.1124";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "66e1d804e53ccbc5bcdcd9d67c77566a08de4b4f";
-          sha256 = "1761658vaav6x6b7j2izbprjm3rs3b8jvqkanwjcmhhhfp4ymwxw";
+          rev = "a12c3424ed3d0fad2122215483fac86452afc5c0";
+          sha256 = "0ri9jj6klgzd3j8dd1lz1frzisjffawk21kq0d8x6zrdz2z3q9b0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -56887,7 +57097,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57085";
+          rev = "57226";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -56967,7 +57177,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57085";
+          rev = "57226";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -57212,6 +57422,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
+    melpaBuild {
+        pname = "rust-playground";
+        version = "20161227.1107";
+        src = fetchFromGitHub {
+          owner = "grafov";
+          repo = "rust-playground";
+          rev = "6a23f8956bce1deaa38f52c01f5571c5cff77445";
+          sha256 = "1aqcpmzzww4fd63l65rfyj0f8skdqh7j1vznwqnj71x65xlda0ys";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground";
+          sha256 = "1w29plj06ld3iq8xhjnfh8hphcp7aji15y1xqp8bb9m1k07wza7l";
+          name = "rust-playground";
+        };
+        packageRequires = [ emacs rust-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/rust-playground";
+          license = lib.licenses.free;
+        };
+      }) {};
     rustfmt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rustfmt";
@@ -57341,12 +57572,12 @@
     sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "20161026.532";
+        version = "20161227.1814";
         src = fetchFromGitHub {
           owner = "sagemath";
           repo = "sage-shell-mode";
-          rev = "ca8930f2f7ba3dcfa6b09d23b9f4cdc5c466d141";
-          sha256 = "0mmbx11k8w26mc4f1x43l9nai6s37yjr98wrl4dgz24bg1qh27q1";
+          rev = "e8bc089e8dfd76f688160e2ac77aee985afeade7";
+          sha256 = "166plwg9ggivr3im0yfxw8k6m9ral37jzznnb06kb6g0zycb4aps";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
@@ -57534,8 +57765,8 @@
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "035af95164f7bce342d4663aa7da00852dfec500";
-          sha256 = "06j16hgvzbbp9d4bvn3fdsmw3isaw017dydjyiqmjpfzbaxg9yac";
+          rev = "6caabd4e68fb878e743a29d16356a2c2c3bd7637";
+          sha256 = "0fq70lwwv5q0mzxli9x1m244i30nkc457mib07qypax9n51vfqyv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -57555,8 +57786,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "51923888a39137f2c46bf3a650fef66206e81b2c";
-          sha256 = "18vf195fd2p8wiw4qag1pq1vrv6ria8j76lgzf3ghkqj0s7bd5rb";
+          rev = "1fd9f05b441e85d5f827ce96154ce79ca334ce32";
+          sha256 = "1rs5j08nbk90rsvrjk074avz1jp3zqqfgbi57ark8bb5hlvzl2rm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -57593,12 +57824,12 @@
     scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scala-mode";
-        version = "20161122.2325";
+        version = "20161222.900";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-scala-mode";
-          rev = "4b492b9fa5f97521426f50c8dcfb6c0a251840ea";
-          sha256 = "01d907ph36yzfxgchqvk102ld1mvlb84sjxhmmq5xrzj4zbb0khm";
+          rev = "9b8db623b13fcb0aad9271d1fae73e1257dda13c";
+          sha256 = "0q41dqlhp0cds16inmh7jrvhqrnjsdiv2in6pq3f0srhwms81ff3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -59144,12 +59375,12 @@
     sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sicp";
-        version = "20161215.428";
+        version = "20161219.542";
         src = fetchFromGitHub {
           owner = "webframp";
           repo = "sicp-info";
-          rev = "c1a6af5719fc8872d40bcf8b41e02745eefd9808";
-          sha256 = "0vq8mkdh7bk5vbf74dln86a3dmlba2iiaxiim8n553qnpm4ln0ay";
+          rev = "d2abe9ef3c4630511bca320161752d1d4babdbef";
+          sha256 = "089mnsaqdr2bcmnrwkrvd0hyq2j0fdnh4ap393m5xnj2riyszdjf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/sicp";
@@ -59604,12 +59835,12 @@
     sl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sl";
-        version = "20161206.730";
+        version = "20161217.604";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "sl.el";
-          rev = "be3ef1bad689ce9f7e20a15728a07d75eb9066a9";
-          sha256 = "18xdny9da1vr79jlnhm34kvjrm0wy82ir7885a64z77pjbnxxs2k";
+          rev = "0882117728be91276b815e18c2a66106bf9d69d3";
+          sha256 = "1cr3ilf96d8kkyc48nasd4iy2q84kkxjssmvlclanss1hj95nj2l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl";
@@ -59898,12 +60129,12 @@
     sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sly";
-        version = "20161003.631";
+        version = "20161217.1623";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "2c772f5a98f8be4a8a10d537690abc64f4d44513";
-          sha256 = "0v4hqgf12hgwyk6zw6mpwp324qrpfkzmav2kl4j9g09px73k2kjg";
+          rev = "87de8e96da7bce0120b4afb037af902c353269e0";
+          sha256 = "1dm1q7sx6hcary1g729231z0g9m1mybidiibzp5zk2pkrdfx6wl5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -60377,12 +60608,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20161203.436";
+        version = "20161216.140";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "f55a741c9e54b271c7fd9c213937fb668e6771d6";
-          sha256 = "0rx8wgpxfc31ynm2lzqnnbqzx8c308hv9flxv2qs1ajj4c55wrpz";
+          rev = "22292c6b9e6f9bff207978908cdc0a6aacbad799";
+          sha256 = "13788rxvj16nk8wi92asi5binnhqwz2dlzmnypkg2h972nvmpbrh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -60754,12 +60985,12 @@
     snapshot-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "snapshot-timemachine";
-        version = "20161004.122";
+        version = "20161221.129";
         src = fetchFromGitHub {
           owner = "mrBliss";
           repo = "snapshot-timemachine";
-          rev = "ceeb0e559d0f25974493c35b580381959633c219";
-          sha256 = "19w4shkhxwx9k5x6abcanh9xln779axwvg8i7363lgixkqdyx05f";
+          rev = "99efcebab309b11ed512a8dc62555d3834df5efb";
+          sha256 = "18qibcyqxjwpvphmpghppb8ky1xcch1dd4pz91qj5f4h42684ips";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69376b802f0687227a78838877d89163b2893c5b/recipes/snapshot-timemachine";
@@ -60880,12 +61111,12 @@
     solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solarized-theme";
-        version = "20161203.301";
+        version = "20161222.109";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "solarized-emacs";
-          rev = "f4840394caba81909eacc8807cab904a0af87419";
-          sha256 = "0s6zs2mmwwq6df8yiwp8ykz3qqfn7scwkz35rj7bzdnbls8rwaaq";
+          rev = "64fa78256efdc11bbc63ec311a976aeddb4808e4";
+          sha256 = "0pg7v1lrf12vigakzcjz3i9yqirqp5m0n7ryp430hyv92mk01l40";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -61136,22 +61367,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sourcemap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    sourcemap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sourcemap";
-        version = "20160511.2137";
+        version = "20161215.2140";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-sourcemap";
-          rev = "c29f0f1fba16622b2349593d420bcc4e3c0f5195";
-          sha256 = "1n33d8pjvmsjq38qw1v405jkmrb2sffhp68w4h2jfsgl4y5w1mdg";
+          rev = "64c89d296186f48d9135fb8aad501de19f64bceb";
+          sha256 = "115g2mfpbfywp8xnag4gsb50klfvplqfh928a5mabb5s8v4a3582";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557d18259543263932fccdbaf44c4e7986bd277b/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
           name = "sourcemap";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/sourcemap";
           license = lib.licenses.free;
@@ -61244,12 +61475,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20161205.1104";
+        version = "20161217.515";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "069cb4c14e33270a6316fa7e60a1cee20eb7f13e";
-          sha256 = "18xr5vy1va2ppd8fbrmrjgm0izly9fzjznp6mp3b85qfczv1wz4k";
+          rev = "3818119a87edb8bb458295a45dc65b41414a77a2";
+          sha256 = "17p3l1qxgz2plr3z99mvbda0bx8qs564r1jhj3arqmz5zc447zvw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -61328,12 +61559,12 @@
     sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "20161127.955";
+        version = "20161219.550";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "1a806aabb8d9405c3d09248f6cd9905883c05b71";
-          sha256 = "07fg44skbkkwwjd3173ilf0p6fp6sp0bwz1s1ccqjcsb7p21mrvn";
+          rev = "e5bedd0b1df135bb1e42b756da850dac5955aeb8";
+          sha256 = "11vpx9cq81ld6k4710nbvnfhpwq0v0bw0zg5aljr2j1pyfyh0pcs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -61408,16 +61639,16 @@
     speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "speed-type";
-        version = "20150120.2034";
+        version = "20161218.650";
         src = fetchFromGitHub {
-          owner = "hagleitn";
+          owner = "parkouss";
           repo = "speed-type";
-          rev = "d3a6745dbaaf6b1eacee10ce9b50108482dbe758";
-          sha256 = "102hjyr9ii2rmq8762irbwansbi023s7dg4a8n6lkadcvzfibmag";
+          rev = "0785ded41c1145804e31fa35187cd5be67c6bb97";
+          sha256 = "1g253axm6x822ap0my7f8v70xcppl5cd4rdlg8lxarjmhnxa5m0z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/18d6365232a78877c78b31afb95103e5c3f6971b/recipes/speed-type";
-          sha256 = "14q423an7v5hhfx1x039fizxcn5hcscqf2jfn9rqifg4jpq8bq5g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type";
+          sha256 = "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06";
           name = "speed-type";
         };
         packageRequires = [ cl-lib ];
@@ -61969,12 +62200,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20161206.2115";
+        version = "20161220.2247";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "740c27df2a6cfc688267e97ee8017b8fb3ac624c";
-          sha256 = "0qy02zifxfwvvy12jfx83lrkdjlglfb6m5ifm4b8waa6nbmfpvy2";
+          rev = "3569e5ea6892d6d7f4ef36bf41462af011e1a114";
+          sha256 = "0l3h6w13xc81i6vavfsg617ly8m2y8yjzbwa6zwwkfqi301kgpij";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy";
@@ -62363,12 +62594,12 @@
     string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "string-inflection";
-        version = "20161213.1737";
+        version = "20161220.1825";
         src = fetchFromGitHub {
           owner = "akicho8";
           repo = "string-inflection";
-          rev = "af1fb965784eff308d6b4031dc2ef5f6961cd38a";
-          sha256 = "017rq1vll53i4xs1l24insjkfvr7nlq6l9g7gjmgnd8g9ck6jqg0";
+          rev = "f11e732a582419e14a36c53130dd3a7b2c9da8c5";
+          sha256 = "1sq7h58v61cdyca5kfhf9rf3ybj25zgbhfdvb29qd7b2b33px7a5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -63130,8 +63361,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "2bc1d7bd8d0f12d5b6b821a0ffa698e6564d865a";
-          sha256 = "0z5hdhb6bgqk2qax59xin8vig2kksmrxf6vyk412kbpa17sm71zm";
+          rev = "482c3e9842e545db352237d448109154de87aa7d";
+          sha256 = "0znj9s67ir5xmrmifqql4mp433hnas8hz15mbvf1rl4mcn06z3q1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -63252,12 +63483,12 @@
     sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }:
     melpaBuild {
         pname = "sx";
-        version = "20161109.1903";
+        version = "20161222.1205";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "sx.el";
-          rev = "cb338d7e314f4d29333f59a947ef27c9d22c6958";
-          sha256 = "1sfvgk61cm0idmviadjsni9gy1kfjcdi455zynjc2181q0ax3qy9";
+          rev = "de73e993930f910862698727b5c0d93a1f656deb";
+          sha256 = "03dah9rn6ray0c65rkqcmak77b1hgyi2fc1nqgb5vfgf65jk7z7c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx";
@@ -64297,12 +64528,12 @@
     tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "tern";
-        version = "20160817.522";
+        version = "20161222.850";
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "de94445e6c4bea4a1342bdf5a093f9104f0884b6";
-          sha256 = "1q5i30lqfr0ah0rj581mn4qhi3ap45wsdfczggwyydscdaxzv8wi";
+          rev = "b26e513f7bb8c7bb3509b7ce7066212673cef285";
+          sha256 = "0w8m30c6da5ahlziwnig2pprqx6w5wrp1mm341fhibfj3gd4qmxp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -64322,8 +64553,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "de94445e6c4bea4a1342bdf5a093f9104f0884b6";
-          sha256 = "1q5i30lqfr0ah0rj581mn4qhi3ap45wsdfczggwyydscdaxzv8wi";
+          rev = "b26e513f7bb8c7bb3509b7ce7066212673cef285";
+          sha256 = "0w8m30c6da5ahlziwnig2pprqx6w5wrp1mm341fhibfj3gd4qmxp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -64343,8 +64574,8 @@
         src = fetchFromGitHub {
           owner = "jacksonrayhamilton";
           repo = "tern-context-coloring";
-          rev = "42e2f0177e8d3017c07826361cc981b2883d34dc";
-          sha256 = "0jdm1s8pqs40xligbhmqgk4vaxkqyb2i5wkx1zgjazq8fhcql9jv";
+          rev = "d191b65ed258da1cd0bfc85a78a5f6717a543a31";
+          sha256 = "1pp1xhp5il7mwpgvkwnw2f4w8v3928bx49ipxikf5jka5akm2gp9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db2119d2c2d167d771ee02c2735b435d59991b93/recipes/tern-context-coloring";
@@ -64773,8 +65004,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "0d9b713b173f35ce02552b2f4372899440a99b25";
-          sha256 = "0rld7j1j5i3f5y9yarg9liabmf597c8yz9bw3jax0azfi5ls6lvm";
+          rev = "476cf694ee80f6d2d6aaa5e46bbda8f915863a49";
+          sha256 = "1516xqlrib1s7jd43p8m3yy0mix0y0x07j7akh9k42q3gjl5x29q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -64830,12 +65061,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20161205.2257";
+        version = "20161217.2302";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "2351b8240faaf7fc7785516c0480d54e78e0d3e3";
-          sha256 = "14wfh3siwsxdicb382w9ygjmz6xxqm1724xypxva4n26666fc2da";
+          rev = "ab0e9fca712c6e890c213198fe9ab20284778f79";
+          sha256 = "1msndmywrj0fny4fys5qj9nh1p01p2vsyn3wfrhj5asshgvp6g48";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -64869,12 +65100,12 @@
     tile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, stream }:
     melpaBuild {
         pname = "tile";
-        version = "20161104.1737";
+        version = "20161224.1957";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "tile";
-          rev = "2e0bb114d8cf9276ee73f616cae0a3baa64fbf5c";
-          sha256 = "06kc90cy5nq5w87f253a70n6r234lq5kw06m5yb19vw7ph94bx9c";
+          rev = "22660f21f6e95de5aba55cd5d293d4841e9a4661";
+          sha256 = "1qxhrm852j93sqi1lznlrjn7s0vscsixm48g46ja70gl320chyzm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/424cfd28378ef328721bb0dc3651808e64c01306/recipes/tile";
@@ -65970,12 +66201,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20161207.1239";
+        version = "20161226.1413";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "18596179aa3da630e544ecb3ad02bcfde8c3a845";
-          sha256 = "1clx74wpb3bp5njy95clvz14zcipf8mcldnp6xsv39x8xwsvgi26";
+          rev = "94ea7028ed96927efcb8f3ba0a89adcf150bd804";
+          sha256 = "0plaji79nl8z9637k2vqz3hcfyszdkiwqxsibv1mnps5as04vrj0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -66426,12 +66657,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20161024.353";
+        version = "20161222.534";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "8c67c84d0486f3398653d7d4f5ed6e0059854b85";
-          sha256 = "0vksd0zay5wp9hmq1xrqb18fqyqgnmp1yp6fgqx9miacfasg18qf";
+          rev = "b62d64b8221c4209fb2d25bd49c85e3bfea19a90";
+          sha256 = "1qzpv3lh51q8f4bvyr0wykvsm1jyf78wf8xvawjspp8vz76r8h7l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -66976,12 +67207,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20161031.1025";
+        version = "20161222.903";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "c7adfdde3d50d783dcde21ac3ea8195bbd30369f";
-          sha256 = "1qkcnk2h1k6yv9sbkir2nkbjjnzcj3ndk20cysk2wcmwqxm85840";
+          rev = "5954ad37cf2d3c9237f4d2037e8619be15681cd1";
+          sha256 = "0scn6wrs6040j4z1gfmn9akzknjhaj2kr07kfzx1v42ibm42ihcd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -67375,12 +67606,12 @@
     vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "vdiff";
-        version = "20160803.1035";
+        version = "20161221.450";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-vdiff";
-          rev = "eda4b1bee033d3fde19a70ccfd2abbe278230f0e";
-          sha256 = "1yhvizfcl71j6j8dz2la7z90zn4x1mka3qavpmgjcrpck77a9k5x";
+          rev = "cfad650c53b4fcaad8f24bbb7d44623678d2edff";
+          sha256 = "06ajkby1762i3pnsq0k9048qvxldk0ajrqvq4wwcqgc1xpbcdq7l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
@@ -68002,12 +68233,12 @@
     vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
     melpaBuild {
         pname = "vue-mode";
-        version = "20161009.1916";
+        version = "20161227.133";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "vue-mode";
-          rev = "3847c3132dc743932507b622dadb83bed935b6f9";
-          sha256 = "0m541ib25fcva8kzbpxi3bwyimdqzzx3w6m9m4yz90cxc3hzvl9i";
+          rev = "addc8637f9ab645b758b48b785a5a4c74c8ccc71";
+          sha256 = "0pkjvil3wdcpwm7gq998lqr5dwp8qdzc025qjq0f3pqv9sq4yqq3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -68396,12 +68627,12 @@
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20161210.243";
+        version = "20161227.1153";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "98be3285362a512d28a96ce4220c6dc295d5fee8";
-          sha256 = "1mylmz3xl4yj80i1n8xv8jiszrqywhiavd7db0qxx04lrl71n02b";
+          rev = "3cb73f72086ae81aed2a13afca40df738a644598";
+          sha256 = "141nd5995p6jh7g9jyp8s1gg8hjf05kd3p1ylx65s3fhrc2c2qhd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -68732,12 +68963,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20161207.714";
+        version = "20161222.1221";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "f0eb183af6ce87344af40813a20fbe81bf98c80a";
-          sha256 = "0p1hzhcqy17cb90hsii1xiy9bw5129q847wpdbz8i58345svzm83";
+          rev = "49ab7afd93ef36e5f0261eff7151360edeeea4e6";
+          sha256 = "0cqq1w9cjrp61mjzi7y49yrbhclpf0cab9fcylq14v1ilhipfdxa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -69284,6 +69515,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "winum";
+        version = "20161226.1051";
+        src = fetchFromGitHub {
+          owner = "deb0ch";
+          repo = "winum.el";
+          rev = "430d24dd29cf5a96eb31ea4bc6af150e4d530331";
+          sha256 = "0ayj466md5xz6gflwl5sa81grpiydy5i2lkdpz7m8wlc81q3ng9j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b6b0219b7855e4137d3980d732c93df1bf46d15c/recipes/winum";
+          sha256 = "0fa3gjyapajaagwkkw3sgmn500bc6jg818663if3f1q1220m7jkc";
+          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";
@@ -69332,8 +69584,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "ee41302fea917eb113182bc1eb8d44de882233f8";
-          sha256 = "165shk1bi5lhbx06mavvlpcqvdjpnwdp29l9gqnyxclc7nm0i05b";
+          rev = "fb1e10a7ee237b60b758f72b7db246eacf45c705";
+          sha256 = "03knvy4hh0q6kvnzxvx477hdzzd5kqy86g27gbzhyj6535mhwckj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -69832,12 +70084,12 @@
     xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-css-mode";
-        version = "20161210.2152";
+        version = "20161218.2250";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-css-mode";
-          rev = "c2ca5a4422e8c05ff1428c76b3b9c20d38bcfcb7";
-          sha256 = "1wkibjznxg1khvgnabgh8808hp31i2zrkzq9crjc37xv65vkb3v1";
+          rev = "80f46b8699aff1ee83ba43d636d765a852df0b4a";
+          sha256 = "1zhzh1vih468zlycr3pmnjk1f2jr8qqg61n1jbjw58daxh4jj6jd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode";
@@ -69853,12 +70105,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20161210.2135";
+        version = "20161218.2229";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "d541d7940a078c7cec64578bf51fa1023df7d931";
-          sha256 = "0l3jadf5zlkva7lcrd7z7gfhb71p8dccsbn5mwwwhcfv449z0a5x";
+          rev = "c8debd687c0418669eaa0329d6d77df28057d2f2";
+          sha256 = "0ya54pki1yvj6h1bkf3l9zpzpyxrl3z5lgkbjs62pqhjg4yc4q5y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -69871,148 +70123,169 @@
           license = lib.licenses.free;
         };
       }) {};
-    xah-find = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-find";
-        version = "20161116.1515";
+        version = "20161221.1705";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-find";
-          rev = "44a8ccf067e86bf9db7c7e73016b23ddcb212254";
-          sha256 = "02zx485l9ilfblz2ma5wqb97prbnvph9a7ija66sac2aklw19i8w";
+          rev = "27fabf6ef557007ba93b667d0a79823420a0144f";
+          sha256 = "0pli4p1q43hk2zy9lgm324njm82jwmpldhbvdiv4f6zbkv44xrhr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find";
           sha256 = "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq";
           name = "xah-find";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/xah-find";
           license = lib.licenses.free;
         };
       }) {};
-    xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20161210.2112";
+        version = "20161227.443";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "a6c454132d00f7140f8130b55981c343b4c1b7a6";
-          sha256 = "07h9x74g66z3nw6d07sa0pkjsb1ddnyrs2pmka9ly9n35irix2ms";
+          rev = "1012ccaa2db07a072486dc22cc2c871f7e0e2b5a";
+          sha256 = "0lfwk8avlhcjarj49w3whka05mp8hlpc2lp528ygjcx3cf6xdyf5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
           sha256 = "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs";
           name = "xah-fly-keys";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/xah-fly-keys";
           license = lib.licenses.free;
         };
       }) {};
-    xah-get-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-get-thing";
-        version = "20161210.2058";
+        version = "20161218.2145";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-get-thing-or-selection";
-          rev = "1604ebb340b31eae31596716489b99043c237ccc";
-          sha256 = "19wjiwdlmpj9yax0zv401ah0zp80dvr2mhxwyhqsnfd802yp1n00";
+          rev = "14bf7ad0d8366b3b8754c252ca45660181ba5a1d";
+          sha256 = "0025g3ikdfpmcaa6pkdyh1vp7wxbbdd5slxxdzyvshmi7lm2p2nc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing";
           sha256 = "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg";
           name = "xah-get-thing";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/xah-get-thing";
           license = lib.licenses.free;
         };
       }) {};
-    xah-lookup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-lookup";
-        version = "20160928.1232";
+        version = "20161218.2303";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "lookup-word-on-internet";
-          rev = "e391dc7b6667e60802606500d475fb4ea529408d";
-          sha256 = "1wrf9fmqjig7iamrl4h40xff19qgkja2kqj1zz2mnlmcr4hml3vh";
+          rev = "219b0d58760bad26b2e07c55c229d989b983c089";
+          sha256 = "1n1w9jcq1bz4qqps33p3dmmjv9hyvpa0zrxhxcp2q3vh7j0714qj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup";
           sha256 = "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc";
           name = "xah-lookup";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/xah-lookup";
           license = lib.licenses.free;
         };
       }) {};
-    xah-math-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-math-input";
-        version = "20161206.1107";
+        version = "20161222.327";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-math-input";
-          rev = "4f36d0d949ec8d930aa5e3a0cdaa9fb136244436";
-          sha256 = "184kciyvs9qgzlf33y11y8x4rixfg1sx067qh67yjwgl2wzwbwfm";
+          rev = "4ab83f7d9bcd6f2697a77507930542bc2a00a1a3";
+          sha256 = "13h7gkdy47mnks1r80j94j3h825s93fwi43l9r7wp9jbngdx057f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input";
           sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a";
           name = "xah-math-input";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/xah-math-input";
           license = lib.licenses.free;
         };
       }) {};
-    xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    xah-reformat-code = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xah-reformat-code";
+        version = "20161222.525";
+        src = fetchFromGitHub {
+          owner = "xahlee";
+          repo = "xah-reformat-code";
+          rev = "a5034360857b8d795a8b9a9be72d53737c9e5c66";
+          sha256 = "0sdxh9m3h9ain9ginarwia28qx19bia6f89788d6nvh1swlwxfi9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/45e731ccee5ccbf97169e32a16300b5fb78e1155/recipes/xah-reformat-code";
+          sha256 = "1sj407nbh4x586hvsq4ycr0ahhxin0wgfwdj0551cz8793wvjpzp";
+          name = "xah-reformat-code";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/xah-reformat-code";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-replace-pairs";
-        version = "20161210.2059";
+        version = "20161218.2147";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-replace-pairs";
-          rev = "2cf602c6d8136a44799e8799f17c3b12e2bec5c8";
-          sha256 = "09bb516srdjkdibv5p2gsmwhqahwnlka0wbpcx4064w54afgh5a6";
+          rev = "a4e278440afc237907fd3d8c7ada45d2c9ff0141";
+          sha256 = "0jz59iprd8s0ijay4l6mk7j47vd61v28y7l6xhgz9008gn9qbbzi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs";
           sha256 = "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x";
           name = "xah-replace-pairs";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/xah-replace-pairs";
           license = lib.licenses.free;
         };
       }) {};
-    xahk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    xahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xahk-mode";
-        version = "20150504.1611";
+        version = "20161218.2311";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xahk-mode.el";
-          rev = "91301b8eae7fd703b258a4c68066d9d5af943c4b";
-          sha256 = "0dc74kqwi0hpihdbb9a9lrqb7823w6j96mah47zyd9d4rd3vx850";
+          rev = "24aa00cd0a8c47f7d8906379eeccbeca22c1a50b";
+          sha256 = "1npa30kp5jaqn7qmsca0a3ch0428l4n8w0hix0bvlfwr5s4zksfy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d6422756b435f59ead15fa7e8081f5c88b2e93f/recipes/xahk-mode";
           sha256 = "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9";
           name = "xahk-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/xahk-mode";
           license = lib.licenses.free;
@@ -70609,12 +70882,12 @@
     yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yang-mode";
-        version = "20161213.1247";
+        version = "20161220.157";
         src = fetchFromGitHub {
           owner = "mbj4668";
           repo = "yang-mode";
-          rev = "351a17bfd4b78616cf740fc1c7148bc1d85b63a4";
-          sha256 = "14hrr4ix77g795b4xhdwwqkgpbbb3axpim1r4yl1bv9jbbkqllx5";
+          rev = "bcf698acbdb4df91f587942348739b407a8b0807";
+          sha256 = "1rrmailvhxvivmdjamm2vvciym484cw0lqn1hgdw1lz999g5a5vs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
@@ -70774,12 +71047,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20161211.1918";
+        version = "20161221.1953";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "e878afb8832ecf05d654d99cd7ecb3406f7a425e";
-          sha256 = "0nlw4c9cfcg04zfjfv1z097yn8cqv1l6dsbdcmf34ccgmncr076y";
+          rev = "48cd7163b2475bbbea166cd0d02b4bf588f1435f";
+          sha256 = "1y5bip792p76lx2hx0z459jyvx7f7y8sncd7q8rcfd581vlsyc04";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -70877,12 +71150,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 = "20161128.358";
+        version = "20161222.1039";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73";
-          sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9";
+          rev = "ca51cbce87f671f2bb133d1df9f327bb8f1bb729";
+          sha256 = "0riz0jj8c80x6p9fcxyni7q3b0dgxjwss8qbihndq8h2jypdhcgd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -71367,8 +71640,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-zoom-window";
-          rev = "eefe36d26e04a9f89aad27671d1f06e9d4736ac6";
-          sha256 = "08splg49ncgfsap3ivpc974wmg22ikshwv33l0i6advjjv9cskhm";
+          rev = "759517e1116c9162181db3aa74438d448b5e1233";
+          sha256 = "04m9mhsmmi40n8qx1axfvg490j4afkj694jjq6r954dz2f4h2h98";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window";
@@ -71489,12 +71762,12 @@
     ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ztree";
-        version = "20161026.1249";
+        version = "20161227.426";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "ztree";
-          rev = "6826c3f3f3735fbf060206072392d67f0990f817";
-          sha256 = "1ybrx6p9i55zsjnxa7cgali6x77aam2h55b8g5fqw23wnvr11x4q";
+          rev = "2751b96aca36cc5c31dc105ec985c269126420a0";
+          sha256 = "099w5z28aznzc8ri26lz8fkql4lvv23j0cqijif7bfmiz6zq5l1h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree";

From 040d5162be94eade7a64a7fd05a2782d97d6f93b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 Dec 2016 14:08:40 +0100
Subject: [PATCH 0259/1310] imagemagick: 6.9.6-7 -> 6.9.7-0

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

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 8030302cdcf..e7f0a6b11d9 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -11,8 +11,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "6.9.6-7";
-    sha256 = "1ls3g4gpdh094n03szr9arpr0rfwd1krv2s9gnck8j0ab10ccgs5";
+    version = "6.9.7-0";
+    sha256 = "0c6ff1am2mhc0dc26h50l78yx6acwqymwpwgkxgx69cb6jfpwrdx";
     patches = [];
   }
     # Freeze version on mingw so we don't need to port the patch too often.

From de99dc50495e0fb75a039586b882d1cd1b51eb0b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 Dec 2016 14:15:53 +0100
Subject: [PATCH 0260/1310] imagemagick7: init at 7.0.4-0

---
 .../applications/graphics/ImageMagick/7.0.nix | 89 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 26 ++++++
 2 files changed, 115 insertions(+)
 create mode 100644 pkgs/applications/graphics/ImageMagick/7.0.nix

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
new file mode 100644
index 00000000000..3a0771a73ef
--- /dev/null
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -0,0 +1,89 @@
+{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool
+, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
+, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
+}:
+
+let
+  arch =
+    if stdenv.system == "i686-linux" then "i686"
+    else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
+    else if stdenv.system == "armv7l-linux" then "armv7l"
+    else throw "ImageMagick is not supported on this platform.";
+
+  cfg = {
+    version = "7.0.4-0";
+    sha256 = "0hfkdvfl60f9ksh07c06cpq8ib05apczl767yyvc671gd90n11ds";
+    patches = [];
+  };
+in
+
+stdenv.mkDerivation rec {
+  name = "imagemagick-${version}";
+  inherit (cfg) version;
+
+  src = fetchurl {
+    urls = [
+      "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"
+      # the original source above removes tarballs quickly
+      "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"
+      "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz"
+    ];
+    inherit (cfg) sha256;
+  };
+
+  patches = [ ./imagetragick.patch ] ++ cfg.patches;
+
+  outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
+  outputMan = "out"; # it's tiny
+
+  enableParallelBuilding = true;
+
+  configureFlags =
+    [ "--with-frozenpaths" ]
+    ++ [ "--with-gcc-arch=${arch}" ]
+    ++ lib.optional (librsvg != null) "--with-rsvg"
+    ++ lib.optionals (ghostscript != null)
+      [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
+        "--with-gslib"
+      ]
+    ++ lib.optionals (stdenv.cross.libc or null == "msvcrt")
+      [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM
+    ;
+
+  nativeBuildInputs = [ pkgconfig libtool ];
+
+  buildInputs =
+    [ zlib fontconfig freetype ghostscript
+      libpng libtiff libxml2
+    ]
+    ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
+      [ openexr librsvg openjpeg ]
+    ;
+
+  propagatedBuildInputs =
+    [ bzip2 freetype libjpeg lcms2 ]
+    ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
+      [ libX11 libXext libXt libwebp ]
+    ;
+
+  postInstall = ''
+    (cd "$dev/include" && ln -s ImageMagick* ImageMagick)
+    moveToOutput "bin/*-config" "$dev"
+    moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params
+    for file in "$dev"/bin/*-config; do
+      substituteInPlace "$file" --replace pkg-config \
+        "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'"
+    done
+  '' + lib.optionalString (ghostscript != null) ''
+    for la in $out/lib/*.la; do
+      sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.imagemagick.org/;
+    description = "A software suite to create, edit, compose, or convert bitmap images";
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ the-kenny wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee8523342ff..b5d5cd53291 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13571,6 +13571,32 @@ in
 
   imagemagickBig = callPackage ../applications/graphics/ImageMagick { };
 
+  imagemagick7_light = lowPrio (imagemagick.override {
+    bzip2 = null;
+    zlib = null;
+    libX11 = null;
+    libXext = null;
+    libXt = null;
+    fontconfig = null;
+    freetype = null;
+    ghostscript = null;
+    libjpeg = null;
+    lcms2 = null;
+    openexr = null;
+    libpng = null;
+    librsvg = null;
+    libtiff = null;
+    libxml2 = null;
+    openjpeg = null;
+    libwebp = null;
+  });
+
+  imagemagick7 = lowPrio (imagemagickBig.override {
+    ghostscript = null;
+  });
+
+  imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { });
+
   # Impressive, formerly known as "KeyJNote".
   impressive = callPackage ../applications/office/impressive { };
 

From 5952897ec499f4e04d952aaa71f748910c1f3661 Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <np@users.noreply.github.com>
Date: Wed, 28 Dec 2016 14:51:28 +0100
Subject: [PATCH 0261/1310] ricochet: 1.1.2 -> 1.1.4 (#21458)

---
 .../networking/instant-messengers/ricochet/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index 15cc5a0f093..d1af2ad70d1 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "ricochet-${version}";
-  version = "1.1.2";
+  version = "1.1.4";
 
   src = fetchurl {
     url = "https://github.com/ricochet-im/ricochet/archive/v${version}.tar.gz";
-    sha256 = "1szb5vmlqal0vhan87kgbks184f7xbfay1hr3d3vm8r1lvcjjfkr";
+    sha256 = "1kfj42ksvj7axc809lb8siqzj5hck2pib427b63a3ipnqc5h1faf";
   };
 
   desktopItem = makeDesktopItem {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     description = "Anonymous peer-to-peer instant messaging";
     homepage = "https://ricochet.im";
     license = licenses.bsd3;
-    maintainers = [ maintainers.codsl maintainers.jgillich ];
+    maintainers = [ maintainers.codsl maintainers.jgillich maintainers.np ];
     platforms = platforms.linux;
   };
 }

From 33d07c7ea9f0d05d47dd4b41ded3b261380acfac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 28 Dec 2016 14:57:06 +0100
Subject: [PATCH 0262/1310] zfs cannot be distributed. Disabling it in the
 isos.

It seems that it is a GPL violation to distribute zfs in the
installation ISOs.

https://sfconservancy.org/blog/2016/feb/25/zfs-and-linux/

If anyone knows the issue better and has a reason to reenable it
legally, feel free to reenable it. I don't know much about it.
---
 nixos/modules/profiles/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index f90d0d992ec..687cd9d80d3 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -45,7 +45,7 @@
   ];
 
   # Include support for various filesystems.
-  boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ];
+  boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
 
   # Configure host id for ZFS to work
   networking.hostId = lib.mkDefault "8425e349";

From 442623e49918f0c6b5b7ee91e519ab38558ca032 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 Dec 2016 15:02:24 +0100
Subject: [PATCH 0263/1310] qemu_28: init at 2.8.0; not updating the main Qemu
 expression yet because there were some claims about NixOS test fragility

---
 pkgs/applications/virtualization/qemu/2.8.nix | 93 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +
 2 files changed, 98 insertions(+)
 create mode 100644 pkgs/applications/virtualization/qemu/2.8.nix

diff --git a/pkgs/applications/virtualization/qemu/2.8.nix b/pkgs/applications/virtualization/qemu/2.8.nix
new file mode 100644
index 00000000000..677386819d3
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/2.8.nix
@@ -0,0 +1,93 @@
+{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib
+, ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex
+, bison, lzo, snappy, libaio, gnutls, nettle, curl
+, makeWrapper
+, attr, libcap, libcap_ng
+, CoreServices, Cocoa, rez, setfile
+, numaSupport ? stdenv.isLinux, numactl
+, seccompSupport ? stdenv.isLinux, libseccomp
+, pulseSupport ? !stdenv.isDarwin, libpulseaudio
+, sdlSupport ? !stdenv.isDarwin, SDL
+, vncSupport ? true, libjpeg, libpng
+, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir
+, x86Only ? false
+, nixosTestRunner ? false
+}:
+
+with stdenv.lib;
+let
+  version = "2.8.0";
+  audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+    + optionalString pulseSupport "pa,"
+    + optionalString sdlSupport "sdl,";
+in
+
+stdenv.mkDerivation rec {
+  name = "qemu-"  
+    + stdenv.lib.optionalString x86Only "x86-only-"
+    + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-"
+    + version;
+
+  src = fetchurl {
+    url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
+    sha256 = "0qjy3rcrn89n42y5iz60kgr0rrl29hpnj8mq2yvbc1wrcizmvzfs";
+  };
+
+  buildInputs =
+    [ python2 zlib pkgconfig glib ncurses perl pixman
+      vde2 texinfo libuuid flex bison makeWrapper lzo snappy
+      gnutls nettle curl
+    ]
+    ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ]
+    ++ optionals seccompSupport [ libseccomp ]
+    ++ optionals numaSupport [ numactl ]
+    ++ optionals pulseSupport [ libpulseaudio ]
+    ++ optionals sdlSupport [ SDL ]
+    ++ optionals vncSupport [ libjpeg libpng ]
+    ++ optionals spiceSupport [ spice_protocol spice usbredir ]
+    ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ];
+
+  enableParallelBuilding = true;
+
+  patches = [
+    ./no-etc-install.patch
+  ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
+  hardeningDisable = [ "stackprotector" ];
+
+  configureFlags =
+    [ "--smbd=smbd" # use `smbd' from $PATH
+      "--audio-drv-list=${audio}"
+      "--sysconfdir=/etc"
+      "--localstatedir=/var"
+    ]
+    ++ optional numaSupport "--enable-numa"
+    ++ optional seccompSupport "--enable-seccomp"
+    ++ optional spiceSupport "--enable-spice"
+    ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"
+    ++ optional stdenv.isDarwin "--enable-cocoa"
+    ++ optional stdenv.isLinux "--enable-linux-aio";
+
+  postFixup =
+    ''
+      for exe in $out/bin/qemu-system-* ; do
+        paxmark m $exe
+      done
+    '';
+
+  postInstall =
+    ''
+      # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
+      p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}"
+      if [ -e "$p" ]; then
+        makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"
+      fi
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.qemu.org/;
+    description = "A generic and open source machine emulator and virtualizer";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ viric eelco ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5d5cd53291..39ddbf8022f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14481,6 +14481,11 @@ in
     inherit (darwin.stubs) rez setfile;
   };
 
+  qemu_28 = callPackage ../applications/virtualization/qemu/2.8.nix {
+    inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa;
+    inherit (darwin.stubs) rez setfile;
+  };
+
   qgis = callPackage ../applications/gis/qgis {};
 
   qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { };

From 35e3ea0966bcdf3483fc25e78a5e9e1887befe9b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 Dec 2016 15:04:41 +0100
Subject: [PATCH 0264/1310] dovecot: 2.2.25 -> 2.2.27

---
 pkgs/servers/mail/dovecot/2.2.x-module_dir.patch | 10 +++++-----
 pkgs/servers/mail/dovecot/default.nix            |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
index 66059cff6f7..1914933c558 100644
--- a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
+++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
@@ -98,15 +98,15 @@ diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream
 index a0659ab..dba3729 100644
 --- a/src/lib-ssl-iostream/iostream-ssl.c
 +++ b/src/lib-ssl-iostream/iostream-ssl.c
-@@ -29,7 +29,7 @@ static int ssl_module_load(const char **error_r)
- 	memset(&mod_set, 0, sizeof(mod_set));
+@@ -34,7 +34,7 @@ static int ssl_module_load(const char **error_r)
  	mod_set.abi_version = DOVECOT_ABI_VERSION;
  	mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
+ 	mod_set.require_init_funcs = TRUE;
 -	ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set);
 +	ssl_module = module_dir_load("/etc/dovecot/modules", plugin_name, &mod_set);
- 
- 	ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");
- 	if (ssl_vfuncs == NULL) {
+ 	if (module_dir_try_load_missing(&ssl_module, MODULE_DIR, plugin_name,
+ 					&mod_set, error_r) < 0)
+ 		return -1;
 diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
 index e2233bf..bbf981e 100644
 --- a/src/lib-storage/mail-storage-settings.c
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 2be20323f25..36d45672150 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.2.25";
+  name = "dovecot-2.2.27";
 
   nativeBuildInputs = [ perl pkgconfig ];
   buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
-    sha256 = "0rwn5wc5b8j9fzqcjggdgpzmb77myrf4ra294z1gg5v3hhng7nfq";
+    sha256 = "1s8qvr6fa9d0n179kdwgpsi72zkvpbh9q57q8fr2fjysgjl94zw9";
   };
 
   preConfigure = ''

From e4f23bc8af1b02018cd8bf5c01025fe00275f3d9 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Wed, 28 Dec 2016 16:02:11 +0100
Subject: [PATCH 0265/1310] ncurses: fix bug with libtinfo symlink that caused
 vim to fail

---
 pkgs/development/libraries/ncurses/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index c7048cfa8fe..4ffaee9be5a 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -91,9 +91,12 @@ stdenv.mkDerivation rec {
           if [ -e "$out/lib/lib''${library}$suffix.$dylibtype" ]; then
             ln -svf lib''${library}$suffix.$dylibtype $out/lib/lib$library$newsuffix.$dylibtype
             ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/lib$library$newsuffix.$dylibtype.${abiVersion}
-            # make libtinfo symlinks
-            ln -svf lib''${library}$suffix.$dylibtype $out/lib/libtinfo$newsuffix.$dylibtype
-            ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/libtinfo$newsuffix.$dylibtype.${abiVersion}
+            if [ "ncurses" = "$library" ]
+            then
+              # make libtinfo symlinks
+              ln -svf lib''${library}$suffix.$dylibtype $out/lib/libtinfo$newsuffix.$dylibtype
+              ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/libtinfo$newsuffix.$dylibtype.${abiVersion}
+            fi
           fi
         done
         for statictype in a dll.a la; do

From 897b10998b5953622c475e80518f2788155c91c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 28 Dec 2016 16:05:01 +0100
Subject: [PATCH 0266/1310] Tune mksquashfs for smaller isos.

Bigger block size, more suitable for xz.
---
 nixos/lib/make-squashfs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix
index 2baa4f66760..4100af27bec 100644
--- a/nixos/lib/make-squashfs.nix
+++ b/nixos/lib/make-squashfs.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation {
 
       # Generate the squashfs image.
       mksquashfs nix-path-registration $storePaths $out \
-        -keep-as-directory -all-root -comp xz
+        -keep-as-directory -all-root -b 1048576 -comp xz -Xdict-size 100%
     '';
 }

From e0078b2cb536c3af0f820d484f46dc9b83547678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 28 Dec 2016 16:05:30 +0100
Subject: [PATCH 0267/1310] Make the minimal iso not use profile/minimal, +vim

The profile minimal has several drawbacks: no man pages, unusual 'dbus'
lib that makes many X11 pieces to rebuild, etc.

With xz compression in the squashfs, despite these additions, the iso is
smaller than what it was in 16.09.
---
 .../modules/installer/cd-dvd/installation-cd-minimal.nix  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
index 4641b8fcf9d..f4122ab0e51 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -1,11 +1,15 @@
 # This module defines a small NixOS installation CD.  It does not
 # contain any graphical stuff.
 
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   imports =
     [ ./installation-cd-base.nix
-      ../../profiles/minimal.nix
+    ];
+
+  environment.systemPackages =
+    [
+      pkgs.vim
     ];
 }

From 45338a307730a527127c7ee5caf7aa6a13c0cca0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 23 Dec 2016 01:04:17 +0200
Subject: [PATCH 0268/1310] fuse: Minor cleanup

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

diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 46f242b2ea0..34b6aa1378c 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -1,13 +1,10 @@
 { stdenv, fetchFromGitHub, utillinux
-  ,autoconf, automake, libtool, gettext }:
+, autoconf, automake, libtool, gettext }:
 
 stdenv.mkDerivation rec {
   name = "fuse-${version}";
-
   version = "2.9.7";
 
-  #builder = ./builder.sh;
-
   src = fetchFromGitHub {
     owner = "libfuse";
     repo = "libfuse";
@@ -17,8 +14,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ utillinux autoconf automake libtool gettext ];
 
-  inherit utillinux;
-
   preConfigure =
     ''
       export MOUNT_FUSE_PATH=$out/sbin
@@ -32,7 +27,7 @@ stdenv.mkDerivation rec {
 
       sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c
       sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
-      
+
       ./makeconf.sh
     '';
 

From d150e409757d1174192dfa6bdaf37b8b627bb504 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 Dec 2016 16:34:51 +0100
Subject: [PATCH 0269/1310] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-1-gac3ba01 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/8db11916ad7a5d7f0d0aa25e615fff3db2cf6ddf.
---
 .../haskell-modules/hackage-packages.nix      | 906 +++++++++++++-----
 1 file changed, 667 insertions(+), 239 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8b917a56a90..641968a4d39 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1675,8 +1675,8 @@ self: {
      }:
      mkDerivation {
        pname = "BitStringRandomMonad";
-       version = "0.1.0.0";
-       sha256 = "70acdb3e821d9fb17190b6bb9882217f31ae44e6d2ddf28f644a8f271156b785";
+       version = "0.1.1.1";
+       sha256 = "496715852ecfd5651fee81eba635b88865ef6dbc87792e56ea47eeac36fd9c36";
        libraryHaskellDepends = [
          base bitstring bytestring mtl parallel primitive transformers
          vector
@@ -9696,6 +9696,8 @@ self: {
        pname = "IPv6Addr";
        version = "0.6.2.0";
        sha256 = "c0123cbacaba0266ea6eed1cf0ceb0cf323600e9eaa0ca855090edae0b085926";
+       revision = "1";
+       editedCabalFile = "7da9aae32a048aca882ec02c1f184ed24e53119de5345ff8b8d6fc62ccd6808e";
        libraryHaskellDepends = [
          attoparsec base iproute network network-info random text
        ];
@@ -9707,6 +9709,28 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "IPv6Addr";
+       version = "0.6.3";
+       sha256 = "d51d7316a72e7cbe680cafda0b422d07bf9755261f040061ae72351aaf470e02";
+       revision = "1";
+       editedCabalFile = "55425a8e76d1b236298bd447f5ff7d4280a8eb51e0c1e363ed2c6a418dadbb85";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "IcoGrid" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -10878,8 +10902,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, List, transformers }:
      mkDerivation {
        pname = "ListTree";
-       version = "0.2.2";
-       sha256 = "b261ac13493c992c44156f81ad194e43f2ab5aa2ae5ea0596414280c3a8addba";
+       version = "0.2.3";
+       sha256 = "0b3aa1d34193d9f7f90b4afeea681a79ab1595e8e651cae093f8fca3c50f60cc";
        libraryHaskellDepends = [
          base directory filepath List transformers
        ];
@@ -15815,12 +15839,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "Spintax_0_3_0_0" = callPackage
+  "Spintax_0_3_1" = callPackage
     ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
      mkDerivation {
        pname = "Spintax";
-       version = "0.3.0.0";
-       sha256 = "b417809b3734c582f1a08be3a14845b913562077bfc35b3bf067ced2309b0ffc";
+       version = "0.3.1";
+       sha256 = "335e13554aa0a13c97b4f9258be904e3007c35a56e8131bdb363c5f7930fc521";
        libraryHaskellDepends = [
          attoparsec base extra mtl mwc-random text
        ];
@@ -18303,6 +18327,8 @@ self: {
        pname = "YamlReference";
        version = "0.10.0";
        sha256 = "4d89cd7714f25c82c6a49a99e8d8b1789640222a1b5863da0a7aa3f4566b9205";
+       revision = "1";
+       editedCabalFile = "987331ab821e7171c21f2b79eb678f2ece44759d4eb1155e5ca93ac2396a99dd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32983,7 +33009,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bitcoin-payment-channel_0_6_0_0" = callPackage
+  "bitcoin-payment-channel_0_6_0_1" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
      , bytestring, cereal, errors, haskoin-core, hexstring, QuickCheck
      , scientific, string-conversions, tagged, test-framework
@@ -32991,8 +33017,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitcoin-payment-channel";
-       version = "0.6.0.0";
-       sha256 = "487e5bb74a3a6c6829971d1071576b302c70298160f9b03654911e2094bcc011";
+       version = "0.6.0.1";
+       sha256 = "10085ef9254d88a4494986f372b07d4109d1767196cc6d230c02ffe18f5f1abd";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cereal errors haskoin-core
          hexstring QuickCheck scientific string-conversions tagged text time
@@ -34858,6 +34884,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bower-json_1_0_0_1" = callPackage
+    ({ mkDerivation, aeson, aeson-better-errors, base, bytestring
+     , deepseq, ghc-prim, mtl, scientific, tasty, tasty-hunit, text
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "bower-json";
+       version = "1.0.0.1";
+       sha256 = "7aa954e2b1bf79307db710c158108bd9ddb45b333ca96072cdbfaf96c77b7e73";
+       libraryHaskellDepends = [
+         aeson aeson-better-errors base bytestring deepseq ghc-prim mtl
+         scientific text transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring tasty tasty-hunit text unordered-containers
+       ];
+       homepage = "https://github.com/hdgarrood/bower-json";
+       description = "Read bower.json from Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bowntz" = callPackage
     ({ mkDerivation, base, containers, GLUT, hosc, hsc3, random }:
      mkDerivation {
@@ -38964,6 +39012,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cayley-client_0_3_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
+     , mtl, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cayley-client";
+       version = "0.3.0";
+       sha256 = "6c2d35f5c70df4744c3cac4a3cda952bd6a36f0f40cbdcf79ec54670ab1c5e1a";
+       revision = "1";
+       editedCabalFile = "7bc68d5b02fa41ebd7652a4e0d080417f4a66e179f24e6cc70845dac0fbb9f63";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring exceptions http-client
+         http-conduit lens lens-aeson mtl text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec unordered-containers ];
+       homepage = "https://github.com/MichelBoucey/cayley-client";
+       description = "A Haskell client for the Cayley graph database";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cayley-dickson" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -45057,14 +45128,14 @@ self: {
      }) {};
 
   "constraint-classes" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, constraints, transformers }:
      mkDerivation {
        pname = "constraint-classes";
-       version = "0.4.0";
-       sha256 = "0a5dda19ad7688081e43ec1445eac7a1ae0c4ae54139c4b92fd91e5f872a45b8";
-       libraryHaskellDepends = [ base ];
+       version = "0.5.1";
+       sha256 = "5e26e76d7d1bcbdf77a384ffc74eb36a39f82e23a29d3ee80b6bf29ab7ce6921";
+       libraryHaskellDepends = [ base constraints transformers ];
        homepage = "http://github.com/guaraqe/constraint-classes#readme";
-       description = "Prelude classes using ConstraintKinds";
+       description = "Various typeclasses using ConstraintKinds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -47542,8 +47613,8 @@ self: {
        pname = "crypto-enigma";
        version = "0.0.2.6";
        sha256 = "eb162e2b4ea2d73bb3594e12438f02988e338ae58c602e817a31970163533142";
-       revision = "1";
-       editedCabalFile = "4cc74c0744e15e1149d7419e47232db6f0bf53a56360f35d71665b180c2f2a53";
+       revision = "3";
+       editedCabalFile = "c94ac05824b4eb891ee0351c533f6b7a12586437b58c4615538903bfd807317c";
        libraryHaskellDepends = [ base containers MissingH mtl split ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        homepage = "https://github.com/orome/crypto-enigma-hs";
@@ -50128,8 +50199,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "data-flags";
-       version = "0.0.3.2";
-       sha256 = "9e8944d63a314a116d1cc8ecb115ad0ea8dabd5ccb84dbbefd332e641430794a";
+       version = "0.0.3.3";
+       sha256 = "a1e390d6a58b45c5f9a193c8244badf31f104fad26d5178298c8043ad136faaa";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/mvv/data-flags";
        description = "A package for working with bit masks and flags in general";
@@ -50700,14 +50771,14 @@ self: {
 
   "data-serializer" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, data-endian
-     , parsers, tasty, tasty-quickcheck
+     , parsers, semigroups, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "data-serializer";
-       version = "0.2";
-       sha256 = "1e134ab268125d0202ed95c723cd903283e8dc111918498cf27696820285a584";
+       version = "0.3";
+       sha256 = "c8befa7acf0293b0a367bf8100d19e8cf1ad4b4b48358394daa578103a505e2e";
        libraryHaskellDepends = [
-         base binary bytestring cereal data-endian parsers
+         base binary bytestring cereal data-endian parsers semigroups
        ];
        testHaskellDepends = [
          base binary bytestring cereal tasty tasty-quickcheck
@@ -50810,8 +50881,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-sword";
-       version = "0.2";
-       sha256 = "57db4db48eb3bda4a8b70c781c64342241ee7d7b53f020262dc3c7506f8eec95";
+       version = "0.2.0.1";
+       sha256 = "d2348ed2515a484866d92185640db0d20991ec9b0c6a891ed229ff41d5f304d1";
        libraryHaskellDepends = [
          base data-bword hashable template-haskell
        ];
@@ -60873,6 +60944,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "eths-rlp" = callPackage
+    ({ mkDerivation, base, binary, binary-strict, bytestring, doctest
+     , hspec, QuickCheck, quickcheck-instances
+     }:
+     mkDerivation {
+       pname = "eths-rlp";
+       version = "0.1.0.0";
+       sha256 = "aa24e8f30bbb1eff7bd4cbfc635224f772d5bdba26a1db6ef346415b8d2ea09b";
+       libraryHaskellDepends = [ base binary binary-strict bytestring ];
+       testHaskellDepends = [
+         base bytestring doctest hspec QuickCheck quickcheck-instances
+       ];
+       description = "Ethereum Recursive Length Prefix Encoding";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ety" = callPackage
     ({ mkDerivation, base, bytestring, curl, random, text-icu
      , utf8-string, xml
@@ -62417,6 +62504,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fast-nats" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "fast-nats";
+       version = "0.1.0.1";
+       sha256 = "8197f83252621182c32350c20f995fb3ad3549499e2fbf2687235ff80024e3ce";
+       libraryHaskellDepends = [ base ];
+       description = "Natural Numbers with no overhead";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fast-tags" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers, cpphs
      , deepseq, directory, filepath, mtl, tasty, tasty-hunit, text
@@ -62557,6 +62655,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fastpbkdf2" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, openssl
+     , tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "fastpbkdf2";
+       version = "0.1.0.0";
+       sha256 = "843103419b79f8fc21062e6842dace2a6e0c214f20c496a4268e1377c512f2f9";
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring tasty tasty-hunit
+       ];
+       homepage = "https://github.com/adinapoli/fastpbkdf2-hs#readme";
+       description = "Haskell bindings to the fastpbkdf2 C library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) openssl;};
+
   "fathead-util" = callPackage
     ({ mkDerivation, base, bytestring, cassava, hxt, network-uri, text
      }:
@@ -70293,18 +70409,18 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) atk;};
 
-  "gi-atk_2_0_9" = callPackage
+  "gi-atk_2_0_11" = callPackage
     ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-atk";
-       version = "2.0.9";
-       sha256 = "246b50192e25a6f125cb51b2c57a38cb76702fe02c7b87b89e548851479598bf";
+       version = "2.0.11";
+       sha256 = "32594ce32ab70fcf7b7e4d2fd212a4714c72d28776be7649f88a989b40632d9b";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi-base text
-         transformers
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ atk ];
        doHaddock = false;
@@ -70339,18 +70455,19 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-cairo_1_0_9" = callPackage
+  "gi-cairo_1_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-cairo";
-       version = "1.0.9";
-       sha256 = "acdc06c2543aae4462dee525b7fb806fd974e58d3d1b3482167f5bde2eb14a99";
+       version = "1.0.11";
+       sha256 = "a70bbb9b120d10c95e1bc603511d542b38cecf1025bed870e6dbe2bd2d7e552f";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers haskell-gi-base text transformers
+         base bytestring containers haskell-gi haskell-gi-base text
+         transformers
        ];
        libraryPkgconfigDepends = [ cairo gobjectIntrospection ];
        doHaddock = false;
@@ -70387,19 +70504,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
-  "gi-gdk_3_0_9" = callPackage
+  "gi-gdk_3_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
      , haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "3.0.9";
-       sha256 = "6a908ed5be0a79c0d25a82ddcad4c910e2e65f756696141aaac970ac853fee22";
+       version = "3.0.11";
+       sha256 = "b1947f5abad3e500ac748ccea44275050c8a7261d0f81e49aee21a4266cf34b1";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
-         gi-gobject gi-pango haskell-gi-base text transformers
+         gi-gobject gi-pango haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        doHaddock = false;
@@ -70435,18 +70552,18 @@ self: {
      }) {inherit (pkgs) gdk_pixbuf; 
          inherit (pkgs) gobjectIntrospection;};
 
-  "gi-gdkpixbuf_2_0_9" = callPackage
+  "gi-gdkpixbuf_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
      , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
      , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
-       version = "2.0.9";
-       sha256 = "880089ae75884e8e89b2ebba3d524c9f07864b37f3dc8475fea14ed18a01efb0";
+       version = "2.0.11";
+       sha256 = "068c4e9df68a03180dc0f174414af010877ffc781d35d2776e01a63bd1a80149";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject
+         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ];
@@ -70483,19 +70600,19 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-gio_2_0_9" = callPackage
+  "gi-gio_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, gobjectIntrospection, haskell-gi
      , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gio";
-       version = "2.0.9";
-       sha256 = "fb08fb617f7d845d8e6f50802ad6f30e6063ee71c05dc10da29f581227f16bb8";
+       version = "2.0.11";
+       sha256 = "d63f1c32a935cb818f8f2c1d70dbf4f71cc65a23e200744a93dee66ade50f039";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi-base text
-         transformers
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ glib gobjectIntrospection ];
        doHaddock = false;
@@ -70513,12 +70630,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-girepository";
-       version = "1.0.9";
-       sha256 = "773fc9bb6d55006f12f68fdb4a68edc25fdc74448549a819ecb4f88a2f0b0efb";
+       version = "1.0.11";
+       sha256 = "3779ee7c9e97a96b05f43607adbde81addf0451b0a1f21e94a9a4353cec1fde2";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-gobject haskell-gi-base text
-         transformers
+         base bytestring containers gi-gobject haskell-gi haskell-gi-base
+         text transformers
        ];
        libraryPkgconfigDepends = [ gobjectIntrospection ];
        doHaddock = false;
@@ -70549,18 +70666,19 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-glib_2_0_9" = callPackage
+  "gi-glib_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-glib";
-       version = "2.0.9";
-       sha256 = "1b295151c9d5f83c13c01204f67c10d071173377a67d6c1d4e8093a253c86555";
+       version = "2.0.11";
+       sha256 = "f707cc142c6c7a202b86a5804af38c53fd74c99ee2092946e3f39451220d94e9";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers haskell-gi-base text transformers
+         base bytestring containers haskell-gi haskell-gi-base text
+         transformers
        ];
        libraryPkgconfigDepends = [ glib gobjectIntrospection ];
        doHaddock = false;
@@ -70592,18 +70710,18 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-gobject_2_0_9" = callPackage
+  "gi-gobject_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-gobject";
-       version = "2.0.9";
-       sha256 = "8525c707a7f6569ac57da4c16fc5c2ea174f4282c8436ba789d36d22cdbe7f1a";
+       version = "2.0.11";
+       sha256 = "fcfe35af13e118db109b9b0d969b89bb5c2a0162a1c3d1fc9413cafcd173058c";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-glib haskell-gi-base text
+         base bytestring containers gi-glib haskell-gi haskell-gi-base text
          transformers
        ];
        libraryPkgconfigDepends = [ glib gobjectIntrospection ];
@@ -70622,12 +70740,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gst";
-       version = "1.0.9";
-       sha256 = "4ed3756052c41b4198d7c3cfd5d179f2d0f49d2a43d20f2be320d85c0a61b22e";
+       version = "1.0.11";
+       sha256 = "36e63c2330cb274ac6ac8b1a5d4b06a590e10d91ed4209555a72a85dc0c2591a";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi-base text
-         transformers
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ gstreamer ];
        doHaddock = false;
@@ -70644,12 +70762,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstaudio";
-       version = "1.0.9";
-       sha256 = "c6021390e020c2d5c21b003bffb6340059feca7ea416fcad60d5c6bb0c0841c8";
+       version = "1.0.11";
+       sha256 = "faca30e17c95fc5fc00e72bbaef20bbb9edf2a4785f6bad6f6b4a742006d2f5d";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
        libraryPkgconfigDepends = [ gst_plugins_base ];
@@ -70668,11 +70786,11 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstbase";
-       version = "1.0.9";
-       sha256 = "5e86bc44fcc16d4009a5cd881169d29abffbd08e8ff0a07098b9e54729137e5d";
+       version = "1.0.11";
+       sha256 = "ca1cf846609ee3a340161747df48885432304b4a4339d3328d3f8b5e683ff577";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject gi-gst
+         base bytestring containers gi-glib gi-gobject gi-gst haskell-gi
          haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
@@ -70692,12 +70810,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstvideo";
-       version = "1.0.9";
-       sha256 = "1d36e8f907c6ece57c1db76b9a3ebf866b2ce57f9312c0153ab2e1259356c6ab";
+       version = "1.0.11";
+       sha256 = "9f2b49fc2ee31fb4ee4f2bf82f509a8b9d4dc963eff0da62efa6b60e760f42e7";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
        libraryPkgconfigDepends = [ gst_plugins_base ];
@@ -70732,19 +70850,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
-  "gi-gtk_3_0_9" = callPackage
+  "gi-gtk_3_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "3.0.9";
-       sha256 = "5b7b6d064b97066c058288a366e37dffa0b330a4a1d15f3018ed46d2b3a877f3";
+       version = "3.0.11";
+       sha256 = "a4bce9a9ea706a880bb9e8f6a2f8eb872b66acf550f8f42dd13a552b4d725f3f";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-pango haskell-gi-base text
+         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text
          transformers
        ];
        libraryPkgconfigDepends = [ gtk3 ];
@@ -70782,12 +70900,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtkosxapplication";
-       version = "2.0.9";
-       sha256 = "d4661ae492916d4fc16f34b234e6c22917f3fc8bf37aef0ae6f2dd17123b7834";
+       version = "2.0.11";
+       sha256 = "4d64ad35431052f221a37998b8ca7fa8850a9a98d2741133f64f978b2e3bcad7";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        doHaddock = false;
@@ -70805,13 +70923,13 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtksource";
-       version = "3.0.9";
-       sha256 = "3ba4e8d8b446c4c37248748535951e31803140a69cf53a69bdb0e68e254b5090";
+       version = "3.0.11";
+       sha256 = "fb130bc4894aa689ecccb01be94ef246585ddba296fef5145a688e9c14027646";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi-base text
-         transformers
+         gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi
+         haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ gtksourceview ];
        doHaddock = false;
@@ -70842,17 +70960,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;};
 
-  "gi-javascriptcore_4_0_9" = callPackage
+  "gi-javascriptcore_4_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
      , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "4.0.9";
-       sha256 = "9acd59b75799a572919c3a65541de73296b6f33f54572902c91eeb93ee7a5375";
+       version = "4.0.11";
+       sha256 = "d67899269ffeba7fa266644fb6d540c74d36fa9e15ca1890fc2c6bb1fa19e066";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers haskell-gi-base text transformers
+         base bytestring containers haskell-gi haskell-gi-base text
+         transformers
        ];
        libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ];
        doHaddock = false;
@@ -70870,12 +70989,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-notify";
-       version = "0.7.9";
-       sha256 = "7c87c5003d96303398ccca3c2e256d409c8853a7007158e052469ac650aa0221";
+       version = "0.7.11";
+       sha256 = "206eaf4d06e5837e21f665212517c27c201e48bb306ea0ea77e05ce9e8d059ce";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ libnotify ];
        doHaddock = false;
@@ -70912,19 +71031,19 @@ self: {
      }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; 
          inherit (pkgs.gnome2) pango;};
 
-  "gi-pango_1_0_9" = callPackage
+  "gi-pango_1_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
      , haskell-gi-base, pango, text, transformers
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "1.0.9";
-       sha256 = "2410b013c336f70b0711aa52b2ff9145945b5fd4b246b09703adac86ca00df1b";
+       version = "1.0.11";
+       sha256 = "8e709c61b8e6a8d2973d7206b15e324327d79ec4b6c301b949837d33d1f7ec66";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi-base text
-         transformers
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ cairo gobjectIntrospection pango ];
        doHaddock = false;
@@ -70947,12 +71066,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.9";
-       sha256 = "7c9e3c78703852ab5e879f8b3ecbb3e6898389d10d1458e3b6341ada252464a4";
+       version = "1.0.11";
+       sha256 = "604c2759510e6987fb2ca63c4b20940147fd07fcf56f701c221bf836de0481ad";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ pango ];
        doHaddock = false;
@@ -70969,12 +71088,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-poppler";
-       version = "0.18.9";
-       sha256 = "6566f9698ff21dc0eac6b8fb79db191ad48044b424a8d7a2b931ca69a1d517a8";
+       version = "0.18.11";
+       sha256 = "76ec68a35a83c99d3c8fd3374b02b0fede275ced4c21d4c967d817411a8c581b";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ poppler ];
        doHaddock = false;
@@ -71004,18 +71123,18 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome2) libsoup;};
 
-  "gi-soup_2_4_9" = callPackage
+  "gi-soup_2_4_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-soup";
-       version = "2.4.9";
-       sha256 = "e4e45ac1d877e1334ee6b57154422dad87e3e03c2f453f34c05e75aafb7a5daa";
+       version = "2.4.11";
+       sha256 = "5488104e98b7a295b44990d0063b162c951b8a1eec5df35a42bd4ba828dbd0ad";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject
+         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ libsoup ];
@@ -71033,12 +71152,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "2.91.10";
-       sha256 = "8da2e88e7b00ac3f7ab1523836415a53cb92f3c6da576d48fc9fd363f88b3bf0";
+       version = "2.91.12";
+       sha256 = "c286d581ad3f3e25dc4f7b5b8439d4e6a0e2d6312218e5cc528c490c07573670";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
-         gi-gtk gi-pango haskell-gi-base text transformers
+         gi-gtk gi-pango haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ vte ];
        doHaddock = false;
@@ -71071,7 +71190,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit = null;};
 
-  "gi-webkit_3_0_9" = callPackage
+  "gi-webkit_3_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
@@ -71079,13 +71198,13 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit";
-       version = "3.0.9";
-       sha256 = "5cd7b6d244b3aeb9eba3f437d40e3b3fbc2fcb253d84d1d5e1e105e7deefc976";
+       version = "3.0.11";
+       sha256 = "d707c10a9f758d5bee1fe59639fb6773a1fcdb596bc86b46c7ce19639556ff3f";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ webkit ];
        doHaddock = false;
@@ -71103,13 +71222,13 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "4.0.9";
-       sha256 = "982635e1c9f7f726100ed980eb12f7bee523d4b8aae14889c10024409f112be5";
+       version = "4.0.11";
+       sha256 = "bc43fb893695cd0395ffdd3381e857d5201e2a7209feb6f6024e0d832219070b";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
-         gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi-base text
-         transformers
+         gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi
+         haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ webkit2gtk webkitgtk ];
        doHaddock = false;
@@ -71127,12 +71246,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
-       version = "4.0.9";
-       sha256 = "df4bac3557c8b29c1fd6b8e7da859a394eef2df5bed12dab5491a57b585835ac";
+       version = "4.0.11";
+       sha256 = "b16b5b2f54bceaa777c64bb5ed19244815892dafcd8b4ce949c6a858ccf19033";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gobject gi-gtk gi-javascriptcore
-         gi-soup haskell-gi-base text transformers
+         gi-soup haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ webkit2gtk-web-extension webkitgtk ];
        doHaddock = false;
@@ -71602,15 +71721,17 @@ self: {
      }:
      mkDerivation {
        pname = "git-mediate";
-       version = "1.0";
-       sha256 = "0ec4f74b30997f05059ac4dc1433a3618cd40240bbb93b6ec434d90f40390790";
+       version = "1.0.1";
+       sha256 = "12320be6a3a0c8f982346c3fdb15e2102339ca2ae454b413d2664124f08c3c57";
+       revision = "1";
+       editedCabalFile = "208ad1540eab41d7530395ef31095f6aa8a1c0e415f6e9f6236418f6d4ebb32d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          ansi-terminal base base-compat Diff directory filepath mtl
          optparse-applicative process unix
        ];
-       homepage = "https://github.com/ElastiLotem/git-mediate";
+       homepage = "https://github.com/Peaker/git-mediate";
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72254,8 +72375,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitter";
-       version = "0.0.0.1";
-       sha256 = "cc755243b8be4a235aaf8ed3dc4aa6d1b5dcecf602c3457131ac96e6bd665a97";
+       version = "0.1";
+       sha256 = "640371046315d609811e3062edc202e386722165f84fbe1f15e22a5e2d66324a";
        libraryHaskellDepends = [
          aeson base bytestring exceptions lens lens-aeson mtl text wreq
        ];
@@ -72342,15 +72463,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "glabrous_0_2_0_1" = callPackage
+  "glabrous_0_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , cereal, cereal-text, directory, either, hspec, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "glabrous";
-       version = "0.2.0.1";
-       sha256 = "cb2f9a9f60395f0abc062311a7cbea8505ecd546f1cb71e51b01291aea323327";
+       version = "0.2.1";
+       sha256 = "79793394c25a1f7bdb0c57e634a8ad37824a2a108272d521cf9fe78bdf9a70a4";
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring cereal cereal-text
          either text unordered-containers
@@ -76046,6 +76167,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "google-oauth2-jwt_0_1_3" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
+     , RSA, text, unix-time
+     }:
+     mkDerivation {
+       pname = "google-oauth2-jwt";
+       version = "0.1.3";
+       sha256 = "1597575b4d03fea87e7411dd905b2db59221a6050986bd4cffadf4473da1c00b";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring HsOpenSSL RSA text unix-time
+       ];
+       homepage = "https://github.com/MichelBoucey/google-oauth2-jwt";
+       description = "Get a signed JWT for Google Service Accounts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "google-search" = callPackage
     ({ mkDerivation, base, free, nats, text, time }:
      mkDerivation {
@@ -82097,8 +82235,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.0.2";
-       sha256 = "0ef9006c38adb2d4caf4de88c1ac9b3ad26175fc2c4c54ac70ac5e4750062462";
+       version = "0.1.0.4";
+       sha256 = "d17bffafa4c729eab2e9b288c636d201013dd05ed04656e40de5a5fb7bc052a4";
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 data-default
          hex network network-simple text transformers
@@ -82407,8 +82545,8 @@ self: {
        pname = "hashing";
        version = "0.1.0.1";
        sha256 = "e5a4a19c6cd6f0a0adda381db76d608d23f8d303e68f1d744735433f91f49410";
-       revision = "1";
-       editedCabalFile = "a50b8538d365ef9fbdc0083c3de91fbdbcebe5e630f36330475e0d10243e2596";
+       revision = "2";
+       editedCabalFile = "98861f16791946cdf28e3c7a6ee9ac8b72d546d6e33c569c7087ef18253294e7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base bytestring ];
@@ -87258,6 +87396,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "helf" = callPackage
+    ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "helf";
+       version = "0.2016.12.25";
+       sha256 = "7d96b7bb7716b16d0b7b744629b3702766ec5e825cdd9b5015ada24d34a71a0e";
+       revision = "1";
+       editedCabalFile = "a3d5ffe78978b357890472700f2c0d5ac796f312909777476d89941753994385";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base containers mtl pretty QuickCheck
+       ];
+       executableToolDepends = [ alex happy ];
+       homepage = "http://www2.tcs.ifi.lmu.de/~abel/projects.html#helf";
+       description = "Typechecking terms of the Edinburgh Logical Framework (LF)";
+       license = "unknown";
+     }) {};
+
   "helics" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-show
      , data-default-class, newrelic-collector-client, newrelic-common
@@ -88055,8 +88214,8 @@ self: {
     ({ mkDerivation, base, bytestring, extra }:
      mkDerivation {
        pname = "hexml";
-       version = "0.3";
-       sha256 = "ace36d4b3a6ca44dad0b4c2f1ab008252acd281e4ff97c3b08c9af41cafb7386";
+       version = "0.3.1";
+       sha256 = "90d31d91beb87bfb9c0f1b867061b3db6d14dcbf9da87a483d620617aca0b1b0";
        libraryHaskellDepends = [ base bytestring extra ];
        testHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/ndmitchell/hexml#readme";
@@ -92001,8 +92160,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.6";
-       sha256 = "fd151310dcdb4fc8c317aabe0faf0b9563ccd59471de12ea3f10136c6f134712";
+       version = "5.0.7";
+       sha256 = "a6ef18db8d3e10707771c216af33e166130ba664eae380b060a1669e44454409";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97869,7 +98028,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "http-client_0_5_4" = callPackage
+  "http-client_0_5_5" = callPackage
     ({ mkDerivation, array, async, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
      , deepseq, directory, exceptions, filepath, ghc-prim, hspec
@@ -97878,8 +98037,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.5.4";
-       sha256 = "f226b9dd4b7a6b5ef3becddd02baeabe3429b88584a42609ca3733c84bfe7300";
+       version = "0.5.5";
+       sha256 = "d1fdda6035e0bab95d3294f5175ac8c3629f9cd1d32e1bce5d0aa27226751c85";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie deepseq exceptions filepath
@@ -102931,6 +103090,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inflections_0_3_0_0" = callPackage
+    ({ mkDerivation, base, exceptions, hspec, hspec-megaparsec
+     , megaparsec, QuickCheck, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "inflections";
+       version = "0.3.0.0";
+       sha256 = "0391cb804f012fb27edc9d11c45bb60412bd703b5a7ebca5ccbf776d338926f1";
+       libraryHaskellDepends = [
+         base exceptions megaparsec text unordered-containers
+       ];
+       testHaskellDepends = [
+         base hspec hspec-megaparsec megaparsec QuickCheck text
+       ];
+       homepage = "https://github.com/stackbuilders/inflections-hs";
+       description = "Inflections library for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inflist" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -103138,8 +103317,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-java";
-       version = "0.6";
-       sha256 = "364c14c0003b6bdbb6338c017ff706ca2bd57dde828c801a1b588356ce15a4c1";
+       version = "0.6.1";
+       sha256 = "f722733b43839d12f936c5d2e3e8f2d33aae6752a605d4582959a7ad71ce2045";
        libraryHaskellDepends = [
          base binary bytestring Cabal containers directory
          distributed-closure filepath ghc-heap-view inline-c jni jvm
@@ -103839,6 +104018,25 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "intro" = callPackage
+    ({ mkDerivation, base, bifunctors, binary, bytestring, containers
+     , deepseq, dlist, extra, hashable, mtl, safe, string-conversions
+     , tagged, text, transformers, unordered-containers, writer-cps-mtl
+     }:
+     mkDerivation {
+       pname = "intro";
+       version = "0.0.2.0";
+       sha256 = "21cab2d2d744ace03a892f06970db52f9f12294b9e04aa8dfca1c91d3ccef1c4";
+       libraryHaskellDepends = [
+         base bifunctors binary bytestring containers deepseq dlist extra
+         hashable 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";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "introduction" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , exceptions, filepath, ghc-prim, lifted-base, monad-control, mtl
@@ -104277,6 +104475,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ip6addr_0_5_2" = callPackage
+    ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
+     mkDerivation {
+       pname = "ip6addr";
+       version = "0.5.2";
+       sha256 = "ad460bf7d2765aa050968154188ba51a1b8483b6a27b179042528058b0e9549f";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ipatch" = callPackage
     ({ mkDerivation, base, bytestring, darcs, directory, filepath
      , hashed-storage, process, unix
@@ -106050,8 +106263,8 @@ self: {
      }:
      mkDerivation {
        pname = "jni";
-       version = "0.2";
-       sha256 = "f98f57417cc015219446f2439c543dc0accd45a4bfdd87004c4c5be1b0b862bf";
+       version = "0.2.2";
+       sha256 = "67c1dc21d8f8a3d85e7b4ced2834d1bac4857e9102bb39f3c9d78618c1e72ea4";
        libraryHaskellDepends = [
          base bytestring containers inline-c singletons thread-local-storage
        ];
@@ -106231,6 +106444,29 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "jose-jwt";
+       version = "0.7.4";
+       sha256 = "747088658aee2b57bce8dc27fa921f9c4181f2f01677dde9a4c17de18bd3febd";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jpeg" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -106308,8 +106544,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-dom";
-       version = "0.7.0.3";
-       sha256 = "3ee57a6d2640833a511ac1b0aadbfa46bd0be09efabde9bb5e32ddb6d330a2df";
+       version = "0.7.1.0";
+       sha256 = "e93ea7dccd9aa640226a162fb6674b0c71c7acebf0ce9b85d76b0d388f06d53a";
        libraryHaskellDepends = [
          base base-compat jsaddle lens text transformers
        ];
@@ -107396,6 +107632,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "jvm-streaming" = callPackage
+    ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni
+     , jvm, singletons, streaming
+     }:
+     mkDerivation {
+       pname = "jvm-streaming";
+       version = "0.1";
+       sha256 = "45788461c552dc2cdcbbe389f3783c67942341e38fa7ba17bd0a906db573d256";
+       revision = "1";
+       editedCabalFile = "f0e204ab4b6d0a8aedb7105800727d22a990a4761787d5abfaa70d016832b184";
+       libraryHaskellDepends = [
+         base distributed-closure inline-java jni jvm singletons streaming
+       ];
+       testHaskellDepends = [ base hspec inline-java jvm streaming ];
+       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;
+     }) {};
+
   "jwt" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, cryptonite
      , data-default, doctest, http-types, HUnit, lens, lens-aeson
@@ -111712,22 +111967,21 @@ self: {
 
   "legion" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, binary-conduit
-     , bytestring, canteven-http, canteven-log, conduit, conduit-extra
-     , containers, data-default-class, data-dword, directory, exceptions
-     , http-types, monad-logger, network, Ranged-sets, scotty
-     , scotty-resource, stm, text, time, transformers, unix, uuid, wai
-     , wai-extra, warp
+     , bytestring, canteven-http, conduit, conduit-extra, containers
+     , data-default-class, data-dword, directory, exceptions, http-types
+     , monad-logger, network, Ranged-sets, scotty, scotty-resource, stm
+     , text, transformers, unix, uuid, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "legion";
-       version = "0.7.0.0";
-       sha256 = "c2dddc486653344bfe1c5c38c279f5fe8800f725d8778d8df4ef25856d6aed27";
+       version = "0.8.0.1";
+       sha256 = "5756a0ca948e17db7d6d5a904e2e444c9f0e74108e2a5ed139453a650e84f7f7";
        libraryHaskellDepends = [
          aeson attoparsec base binary binary-conduit bytestring
-         canteven-http canteven-log conduit conduit-extra containers
-         data-default-class data-dword directory exceptions http-types
-         monad-logger network Ranged-sets scotty scotty-resource stm text
-         time transformers unix uuid wai wai-extra warp
+         canteven-http conduit conduit-extra containers data-default-class
+         data-dword directory exceptions http-types monad-logger network
+         Ranged-sets scotty scotty-resource stm text transformers unix uuid
+         wai wai-extra warp
        ];
        homepage = "https://github.com/owensmurray/legion#readme";
        description = "Distributed, stateful, homogeneous microservice framework";
@@ -111736,23 +111990,23 @@ self: {
      }) {};
 
   "legion-discovery" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, Cabal
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, Cabal
      , canteven-http, canteven-log, conduit, containers
-     , data-default-class, http-types, legion, legion-extra
-     , monad-logger, scotty, scotty-resource, SHA, text, time
-     , transformers, wai, wai-extra, warp
+     , data-default-class, graphviz, http-types, legion, legion-extra
+     , monad-logger, scotty, scotty-format, scotty-resource, SHA, text
+     , time, transformers, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "legion-discovery";
-       version = "0.2.1.1";
-       sha256 = "9ecb4471cf9a52fd973d95c356d35542e4b12306eb7078f43e4a279d0c478131";
+       version = "0.2.2.1";
+       sha256 = "5338e9ffb14ced8f1ec8bde7c9138e769ef643da8930937fc79cdbac970d6096";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary bytestring Cabal canteven-http canteven-log
-         conduit containers data-default-class http-types legion
-         legion-extra monad-logger scotty scotty-resource SHA text time
-         transformers wai wai-extra warp
+         aeson attoparsec base binary bytestring Cabal canteven-http
+         canteven-log conduit containers data-default-class graphviz
+         http-types legion legion-extra monad-logger scotty scotty-format
+         scotty-resource SHA text time transformers wai wai-extra warp
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
@@ -111769,8 +112023,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion-discovery-client";
-       version = "0.1.0.1";
-       sha256 = "6235b5f23411bfe0807274e4e31b5e9f805045b214f63a2cfbefed29d9fe27f1";
+       version = "0.1.0.2";
+       sha256 = "d9f8b1f24d90b3711ec81555c21e722280bcb59914c2341bb89e21f9b699dd5d";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers data-default-class
          http-client http-types load-balancing network text
@@ -111787,8 +112041,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion-extra";
-       version = "0.1.0.5";
-       sha256 = "f61dc20ac3380725dbf34b934623131c37c4072f081d6d649ffb2a6d4be007f6";
+       version = "0.1.0.6";
+       sha256 = "e9471ff2b1d50596bbe86fd414e78bcd31aa78b867ac3439fddd58e21d24c0c5";
        libraryHaskellDepends = [
          aeson base bytestring canteven-log containers data-default-class
          legion network safe split yaml
@@ -112247,8 +112501,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.0.4.0";
-       sha256 = "e990aad8168d8e106ef35a0e8dc1fc707d467dfd87db8127f8ec568a47100f8b";
+       version = "1.0.6.0";
+       sha256 = "9a55ddd34f6e41ba274fa1b303262dc883868ffcb0e24810b432441e5ebe220a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -127810,8 +128064,8 @@ self: {
     ({ mkDerivation, async, base, bytestring, template-haskell, unix }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.2.5.0";
-       sha256 = "160e9f29ddc659a39c96de3971de7086528f608e372912a3f4e5b5f11a94590b";
+       version = "0.2.5.1";
+       sha256 = "d61e25c00736a33cd5f16555751047fb5e1d79cdc606622f4cba400c6f3df008";
        libraryHaskellDepends = [
          async base bytestring template-haskell unix
        ];
@@ -128777,22 +129031,20 @@ self: {
      }) {};
 
   "numerals" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, containers
-     , containers-unicode-symbols, fingertree, HUnit, integer-gmp
+    ({ mkDerivation, base, containers, fingertree, HUnit, integer-gmp
      , QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text
      }:
      mkDerivation {
        pname = "numerals";
-       version = "0.4";
-       sha256 = "15139b63ec44ce2c308176c96184b3b2d94537f64298a1e128c32e641ca77dba";
+       version = "0.4.1";
+       sha256 = "d2a46b9535bd57ed386adad95e145da4c3e72f595328ebd61302e3887583e1d2";
        libraryHaskellDepends = [
-         base base-unicode-symbols containers containers-unicode-symbols
-         fingertree integer-gmp text
+         base containers fingertree integer-gmp text
        ];
        testHaskellDepends = [
-         base base-unicode-symbols HUnit integer-gmp QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2 text
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 text
        ];
        homepage = "https://github.com/roelvandijk/numerals";
        description = "Convert numbers to number words";
@@ -129073,6 +129325,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nvim-hs-ghcid" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , ghcid, nvim-hs, nvim-hs-contrib, resourcet, yaml
+     }:
+     mkDerivation {
+       pname = "nvim-hs-ghcid";
+       version = "0.1.0";
+       sha256 = "c0f900633873759e49a08be61d8c91c1507f95b2e108d39d1d517adf9adc7bde";
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath ghcid nvim-hs
+         nvim-hs-contrib resourcet yaml
+       ];
+       homepage = "https://github.com/saep/nvim-hs-ghcid";
+       description = "Neovim plugin that runs ghcid to update the quickfix list";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "nvvm" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, directory
      , filepath, template-haskell
@@ -131293,10 +131562,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "ordered-containers";
-       version = "0.0";
-       sha256 = "ea40528ec95f2424bd7231da44b9d96a80b46b4116b2cdfbb57269c88f2419cb";
-       revision = "1";
-       editedCabalFile = "a8de69537c43ab967f7f512466a5a0e32000e9179239b4c10adf3cd3cfd1e524";
+       version = "0.1.0";
+       sha256 = "cb089747cfffd5affedcd08a7e7fed02e5dd90defb513e84440b76f307f35587";
        libraryHaskellDepends = [ base containers ];
        description = "Set- and Map-like types that remember the order elements were inserted";
        license = stdenv.lib.licenses.bsd3;
@@ -133487,8 +133754,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.4.5.0";
-       sha256 = "d60fb0d72ad518e3f3cf49fe6576ad5f2c1f371d75884394791fe2dcf417c5c9";
+       version = "0.4.6.0";
+       sha256 = "166d22f0e1cc2c3e965b84556c07a8ce51537b36aa5ff07d7fd4893a5bcdfd01";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -136265,6 +136532,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pipes-cacophony_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, cacophony, hlint, memory, pipes
+     }:
+     mkDerivation {
+       pname = "pipes-cacophony";
+       version = "0.4.1";
+       sha256 = "bcf15287c4ae951ed12e83c41795dfe212b87cc9b93420dc74783b44e54c5360";
+       libraryHaskellDepends = [ base bytestring cacophony memory pipes ];
+       testHaskellDepends = [ base hlint ];
+       homepage = "https://github.com/centromere/pipes-cacophony";
+       description = "Pipes for Noise-secured network connections";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-cellular" = callPackage
     ({ mkDerivation, base, bytestring, data-cell, pipes }:
      mkDerivation {
@@ -139463,8 +139745,8 @@ self: {
      }:
      mkDerivation {
        pname = "praglude";
-       version = "0.2.1.0";
-       sha256 = "6d0a637bccc13464149d75482e61ed8f10caf93d721d43f49e583032aad6d776";
+       version = "0.3.0.0";
+       sha256 = "8c5c2cdbff18b89b61b28680d92ad9c8204abcf9ef264b5b4622f1ee21f744da";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring casing containers
          data-default deepseq directory filepath hashable lens mtl random
@@ -139480,18 +139762,18 @@ self: {
     ({ mkDerivation, aeson, base, basic-prelude, exceptions
      , fast-logger, lens, monad-control, monad-logger, mtl, resourcet
      , safe, shakers, template-haskell, text, text-manipulate, time
-     , transformers-base, unordered-containers
+     , transformers-base, unordered-containers, uuid
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.8";
-       sha256 = "2827df5cd7df280b1ca9092e0a17b585341f758ec91d490be7287483f623b374";
+       version = "0.0.13";
+       sha256 = "12d47c88d2ea714d58cd4527fb2826d49e2b5d49bc3d8dda8f6fd52bd4dd830a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base basic-prelude exceptions fast-logger lens monad-control
          monad-logger mtl resourcet safe template-haskell text
-         text-manipulate time transformers-base unordered-containers
+         text-manipulate time transformers-base unordered-containers uuid
        ];
        executableHaskellDepends = [ base shakers ];
        homepage = "https://github.com/swift-nav/preamble";
@@ -142331,6 +142613,8 @@ self: {
        pname = "purescript";
        version = "0.10.3";
        sha256 = "261e2afde8bf1d58a9c9c23296b37b57dfcd47d4f25cc7798a36a6e73978c5c2";
+       revision = "2";
+       editedCabalFile = "cd4a6818028652cb5c630372f872072197ef5822edf1814eaf8cd672c75683b7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146685,6 +146969,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "refresht" = callPackage
+    ({ mkDerivation, base, data-default, exceptions, lens, mtl }:
+     mkDerivation {
+       pname = "refresht";
+       version = "0.1.0.1";
+       sha256 = "5c910830cc9ee1272602d84ef8545f31120bf456205d18553e2e7cb8fc9c223e";
+       libraryHaskellDepends = [ base data-default exceptions lens mtl ];
+       homepage = "https://github.com/konn/refresht#readme";
+       description = "Environment Monad with automatic resource refreshment";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "regex-applicative" = callPackage
     ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit
      , tasty-smallcheck, transformers
@@ -146789,10 +147085,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-do";
-       version = "3.1";
-       sha256 = "487ab5968208a0d7ad7b37016145e4a864dc35ae36976ea77328ae3d6b9d590b";
-       revision = "3";
-       editedCabalFile = "ca32ec1c90923370783cfe79bbdae877f4f98f8e816a32dde618874842c2f178";
+       version = "3.2";
+       sha256 = "a7e8a864ee66c2a37fbf4574153dd42ee727283f8f5d0d142f7946172131977b";
        libraryHaskellDepends = [
          array base bytestring regex-base regex-pcre stringsearch tagged
          text
@@ -148481,6 +148775,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "resolve" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-binary, base, bv
+     , bytestring, hashable, hashmap, hslogger, iproute, network, parsec
+     , stm, stm-containers, transformers
+     }:
+     mkDerivation {
+       pname = "resolve";
+       version = "0.1.0.0";
+       sha256 = "4c011446e1cd2865abbcb3d4979f6bbd65d5bd4f54d11819b5a5777cb4b6aa39";
+       libraryHaskellDepends = [
+         attoparsec attoparsec-binary base bv bytestring hashable hashmap
+         hslogger iproute network parsec stm stm-containers transformers
+       ];
+       homepage = "https://github.com/riaqn/resolve#readme";
+       description = "A name resolusion library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "resolve-trivial-conflicts" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory
      , filepath, mtl, optparse-applicative, process, unix
@@ -151134,6 +151446,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "safe-money" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, cereal
+     , constraints, deepseq, hashable, store, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "safe-money";
+       version = "0.2";
+       sha256 = "c328e6c36589ad133c8172ce82e64103ad1efd475b311b65a1e7e708dd651636";
+       libraryHaskellDepends = [
+         aeson base binary cereal constraints deepseq hashable store
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring cereal constraints deepseq hashable
+         store tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/k0001/safe-money";
+       description = "Type-safe and lossless encoding and manipulation of money, world currencies and precious metals";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "safe-plugins" = callPackage
     ({ mkDerivation, base, directory, filepath, haskell-src-exts
      , plugins, Unixutils
@@ -152725,10 +153058,8 @@ self: {
      }:
      mkDerivation {
        pname = "scotty-format";
-       version = "0.1.0.2";
-       sha256 = "848a326a18445c1c7f39a7aa5a46d3f042c2e9abfd1ef8f972751f51b4c00968";
-       revision = "1";
-       editedCabalFile = "64c796f66dd445224f06820feec9d91717a1de9d2d24d993d5db1d6021240d32";
+       version = "0.1.1.0";
+       sha256 = "cb6da220c05c95b8deb0fb8cc1505447d462456dbb36bfacee6467d8207f3599";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base http-media http-types scotty text ];
@@ -156546,6 +156877,33 @@ self: {
        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
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "shakespeare";
+       version = "2.0.12.1";
+       sha256 = "057d7153a19a4f28a012f30b5d54b9e1296695ff94ccdfa23c28fa82bd3488ac";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim parsec process scientific template-haskell text
+         time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim hspec HUnit parsec process template-haskell
+         text time transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
+       description = "A toolkit for making compile-time interpolated templates";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "shakespeare-babel" = callPackage
     ({ mkDerivation, base, classy-prelude, data-default, directory
      , process, shakespeare, template-haskell
@@ -157152,6 +157510,18 @@ self: {
        license = "GPL";
      }) {};
 
+  "show-please" = callPackage
+    ({ mkDerivation, base, mtl, parsec, template-haskell }:
+     mkDerivation {
+       pname = "show-please";
+       version = "0.3";
+       sha256 = "1abd203bf8f0ac863f38f1be813594e0ab30ad5b79aa31730926586c40db642e";
+       libraryHaskellDepends = [ base mtl parsec template-haskell ];
+       homepage = "https://github.com/ddssff/show-please";
+       description = "A wrapper type V with improved Show instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "show-prettyprint" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }:
      mkDerivation {
@@ -163209,8 +163579,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.3.0";
-       sha256 = "060ed345ee724b916427430004548c519eb0219242a019ee06c8afd9a793497b";
+       version = "1.3.2";
+       sha256 = "488b9292ea605c92f6ebf79b233e8e374d857b21053051cb44b305dad8f0d3f7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165279,6 +165649,29 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "streaming-bytestring";
+       version = "0.1.4.5";
+       sha256 = "e77047f4027ac7dc4128fdbf651c8a288dab34e580c944bd8eef23e5a236d84e";
+       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
@@ -169811,8 +170204,8 @@ self: {
      }:
      mkDerivation {
        pname = "telegram-bot";
-       version = "0.5.1.0";
-       sha256 = "525fc12654179fa7c57ae062741bb236f5821dc1b5c0c8b9a5c62946d8817fd3";
+       version = "0.5.4.0";
+       sha256 = "a163600c8b5bca5b545f7701d14165961ce499263e3a27dac8acdca3fe29b072";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -171457,8 +171850,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-printer";
-       version = "0.4";
-       sha256 = "b878db9dfb786368324c35cb3e1070264eaa6b1d0f1459bf1581114bfbeb9149";
+       version = "0.5";
+       sha256 = "8f0c01a6a15b4314c2d47ab5f0772d176ec38f1c1fe190b9fa7db5149a6c4a0b";
        libraryHaskellDepends = [
          base bytestring pretty semigroups text text-latin1
        ];
@@ -171782,8 +172175,8 @@ self: {
      }:
      mkDerivation {
        pname = "textlocal";
-       version = "0.1.0.3";
-       sha256 = "56237c4982513680358a13d5bba261e55ce4ec2346e402b8ba438f7a11d06e1c";
+       version = "0.1.0.5";
+       sha256 = "8954ff6270c9920fc390be6b9f398975ea06dd6808a411cbf8fa5fb4a9cf3087";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls http-conduit text
          unix-time
@@ -173413,42 +173806,50 @@ self: {
      }) {};
 
   "time-warp" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
-     , data-default, data-msgpack, exceptions, formatting, hslogger
-     , hspec, lens, lifted-base, monad-control, monad-loops, MonadRandom
-     , mtl, network-msgpack-rpc, pqueue, QuickCheck
-     , quickcheck-instances, random, safe, serokell-util, stm
-     , template-haskell, text, text-format, time, time-units
-     , transformers, transformers-base
+    ({ mkDerivation, ansi-terminal, array, async, attoparsec, base
+     , binary, binary-conduit, bytestring, conduit, conduit-extra
+     , containers, data-default, data-msgpack, deepseq, exceptions
+     , extra, formatting, hashable, hspec, lens, lifted-base, log-warper
+     , mmorph, monad-control, monad-loops, MonadRandom, mtl, network
+     , pqueue, QuickCheck, quickcheck-instances, random, safe
+     , semigroups, serokell-util, slave-thread, stm, stm-chans
+     , stm-conduit, streaming-commons, template-haskell, text
+     , text-format, time, time-units, transformers, transformers-base
+     , unordered-containers
      }:
      mkDerivation {
        pname = "time-warp";
-       version = "0.1.1.2";
-       sha256 = "8a919958cbef95ff3960046f5854801b649b60c8e1fbd187ce1ae298c3c11187";
+       version = "1.1.1.0";
+       sha256 = "4e9fa28d8c67801fc302a7eec2457a2dda41b556129aebf0821bc250307ded4d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal base bytestring containers data-default data-msgpack
-         exceptions formatting hslogger lens lifted-base monad-control
-         monad-loops MonadRandom mtl network-msgpack-rpc pqueue QuickCheck
-         quickcheck-instances random safe serokell-util stm template-haskell
-         text text-format time time-units transformers transformers-base
+         ansi-terminal array attoparsec base binary binary-conduit
+         bytestring conduit conduit-extra containers data-default
+         data-msgpack deepseq exceptions extra formatting hashable lens
+         lifted-base log-warper mmorph monad-control monad-loops MonadRandom
+         mtl network pqueue QuickCheck quickcheck-instances random safe
+         semigroups serokell-util slave-thread stm stm-chans stm-conduit
+         streaming-commons template-haskell text text-format time time-units
+         transformers transformers-base unordered-containers
        ];
        executableHaskellDepends = [
-         async base data-default data-msgpack exceptions formatting hspec
-         lens MonadRandom mtl network-msgpack-rpc QuickCheck random
-         serokell-util stm text text-format time-units transformers
+         async base binary binary-conduit conduit data-default data-msgpack
+         exceptions formatting hspec lens log-warper MonadRandom mtl
+         QuickCheck random serokell-util stm text text-format time-units
+         transformers
        ];
        testHaskellDepends = [
-         async base data-default data-msgpack exceptions hspec lens mtl
-         network-msgpack-rpc QuickCheck random serokell-util stm text
-         text-format time-units transformers
+         async base data-default data-msgpack exceptions hspec lens
+         log-warper mtl QuickCheck random serokell-util stm text text-format
+         time-units transformers
        ];
        homepage = "https://github.com/serokell/time-warp";
        description = "Distributed systems execution emulation";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       broken = true;
+     }) {log-warper = null;};
 
   "timecalc" = callPackage
     ({ mkDerivation, base, haskeline, uu-parsinglib }:
@@ -173737,8 +174138,8 @@ self: {
      }:
      mkDerivation {
        pname = "timeseries";
-       version = "0.4.0";
-       sha256 = "a073a252dcdb671e57a784f4b37f2009f6e0890579bf705869c572923047af51";
+       version = "0.4.1";
+       sha256 = "4e7a17717484225b904c5511152087b6ff9cb1d155fde7277b4bcc9b58c5151e";
        libraryHaskellDepends = [
          base bytestring cassava statistics text text-time time vector
        ];
@@ -173756,8 +174157,8 @@ self: {
     ({ mkDerivation, base, time }:
      mkDerivation {
        pname = "timespan";
-       version = "0.2.0.0";
-       sha256 = "4e6ce1f32725700c4b78ed4806d90a5ce1275dce9504f78164a454a4ef4b8fe6";
+       version = "0.3.0.0";
+       sha256 = "46a51e1e0d776d65d0094bf8158c938255491fbaa4d4f39b0a1477806312851f";
        libraryHaskellDepends = [ base time ];
        homepage = "https://github.com/agrafix/timespan#readme";
        description = "Useful timespan datatype and functions";
@@ -180573,6 +180974,8 @@ self: {
        pname = "validity";
        version = "0.3.0.4";
        sha256 = "9ae590d34aeb41f096bd7432ff8c8cb07a4da010825c0190d4ef630ef6370f7f";
+       revision = "1";
+       editedCabalFile = "73bff6370f4e90101291fb3904f388ea57013a6a45997b273b578332149a8d19";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity typeclass";
@@ -183984,8 +184387,8 @@ self: {
      }:
      mkDerivation {
        pname = "wave";
-       version = "0.1.1";
-       sha256 = "13d5475356efc3ae95c971e930d5e4bf18f9395dc1bd7b63e8bb8e7ed26ddf23";
+       version = "0.1.2";
+       sha256 = "930d16bc03779c42bdf117ba2a2ac30b3ab08f9d214d9ca52526150d9eec07e3";
        libraryHaskellDepends = [
          base bytestring cereal containers data-default-class transformers
        ];
@@ -185744,8 +186147,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.3";
-       sha256 = "2982a25dbdb4bcbfe563cc49f1bae58d8b837014ad28365eb09405222165f311";
+       version = "0.3.4";
+       sha256 = "8d22d044f67a1edf37cbb59cc3226585dcaa15f1c2b83696d7e191d50053aea2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -192293,6 +192696,31 @@ self: {
        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
+     , resourcet, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "zip";
+       version = "0.1.5";
+       sha256 = "92ea1f4b28f89f77e065046095f0d7c1fedadef402ccd4f04ee09bac68556974";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zip-archive" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , digest, directory, filepath, HUnit, mtl, old-time, pretty

From ca41610e8aef4a958f6a24f9fba2b125b5442338 Mon Sep 17 00:00:00 2001
From: Laverne Schrock <laverne@schrock.email>
Date: Fri, 23 Dec 2016 12:23:35 -0600
Subject: [PATCH 0270/1310] ghc-8.0.1: enable documentation builds by passing
 the required XML/XSLT toolchain

---
 pkgs/development/compilers/ghc/8.0.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index db9e0682096..58e2ff18c1b 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
-, hscolour, patchutils
+, hscolour, patchutils, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42
 }:
 
 let
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; })
   ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
 
-  buildInputs = [ ghc perl hscolour ];
+  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
 
   enableParallelBuilding = true;
 

From 1a78981b2f5141bac2f8d0255998b9465b0043a9 Mon Sep 17 00:00:00 2001
From: Laverne Schrock <laverne@schrock.email>
Date: Sun, 25 Dec 2016 07:57:58 -0600
Subject: [PATCH 0271/1310] ghc-8.0.1: switch to sphinx for documentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #20281

"Since GHC 8.0, the User’s Guide is authored in ReStructuredText (or ReST
or RST, for short) a rich but light-weight mark-up language aimed at
producing documentation. The Sphinx tool is used to produce the final
PDF and HTML documentation."
- http://ghc.readthedocs.io/en/8.0.1/editing-guide.html
---
 pkgs/development/compilers/ghc/8.0.1.nix | 4 ++--
 pkgs/top-level/haskell-packages.nix      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index 58e2ff18c1b..1834f3ae50b 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
-, hscolour, patchutils, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42
+, hscolour, patchutils, sphinx
 }:
 
 let
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; })
   ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
 
-  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
+  buildInputs = [ ghc perl hscolour sphinx];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4cdc70fed4f..59c737dce6d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -45,6 +45,7 @@ rec {
     ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix rec {
       bootPkgs = packages.ghc7103;
       inherit (bootPkgs) hscolour;
+      sphinx = pkgs.python27Packages.sphinx;
     };
     ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec {
       bootPkgs = packages.ghc7103;

From 527468209c66b53e37121e67edc39acadb6da9da Mon Sep 17 00:00:00 2001
From: Laverne Schrock <laverne@schrock.email>
Date: Mon, 26 Dec 2016 08:15:32 -0600
Subject: [PATCH 0272/1310] ghc-8.0.2: add sphinx to inputs for documentation

Closes https://github.com/NixOS/nixpkgs/pull/21434.
---
 pkgs/development/compilers/ghc/8.0.2.nix | 4 ++--
 pkgs/top-level/haskell-packages.nix      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 977a0fb39b6..b2ae92e02c6 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
-, hscolour, patchutils
+, hscolour, patchutils, sphinx
 }:
 
 let
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
 
-  buildInputs = [ ghc perl hscolour ];
+  buildInputs = [ ghc perl hscolour sphinx ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 59c737dce6d..f229fb8a35c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -50,6 +50,7 @@ rec {
     ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec {
       bootPkgs = packages.ghc7103;
       inherit (bootPkgs) hscolour;
+      sphinx = pkgs.python27Packages.sphinx;
     };
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
       bootPkgs = packages.ghc7103;

From 9459dc42c80feae1c2ad2c7737a96bddb9a973d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Dec 2016 15:59:17 +0100
Subject: [PATCH 0273/1310] haskell-stack: use latest http-client library

---
 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 a9ad1a695ac..646db06bb35 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -998,7 +998,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_4;
+    http-client = self.http-client_0_5_5;
     http-client-tls = self.http-client-tls_0_3_3;
     http-conduit = self.http-conduit_2_2_3;
     optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;

From 49ba174e7aa7d553214b8ee829753b5bb1a4ba23 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Wed, 14 Dec 2016 11:17:48 -0800
Subject: [PATCH 0274/1310] elm-export: jailbreak

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 646db06bb35..9b03d4633bc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1136,4 +1136,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;
 }

From 93fc4281ba4cb0464909941a59a60057bd6c9cd3 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Wed, 14 Dec 2016 11:18:53 -0800
Subject: [PATCH 0275/1310] hackage2nix.yaml: update jb55's packages

---
 .../haskell-modules/configuration-hackage2nix.yaml           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 42858390c30..06480f59f28 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2068,10 +2068,13 @@ package-maintainers:
     - ghc-srcspan-plugin
     - located-base
   jb55:
-    - skeletons
+    - bson-lens
     - cased
+    - elm-export-persistent
     - pipes-csv
     - pipes-mongodb
+    - skeletons
+    - streaming-wai
   khumba:
     - hoppy-docs
     - hoppy-generator

From e912145eae01c8f7aa6c9deb279c4160c9f4cf5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Wed, 28 Dec 2016 13:26:00 +0100
Subject: [PATCH 0276/1310] urlscan: remove 'isPy35' dependency, as it's no
 longer needed

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

diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index 3875886266d..dc9cb3189d5 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy35, fetchFromGitHub, urwid, pythonOlder }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, urwid, pythonOlder }:
 
 buildPythonPackage rec {
   name = "urlscan-${version}";

From 5ac7da93760905148581a543fdb24ce376b69441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Dec 2016 19:08:17 +0100
Subject: [PATCH 0277/1310] tzdata: 2016f -> 2016j

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

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 0e59e2e04e3..7784e59e4b2 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
-  version = "2016f";
+  version = "2016j";
 
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "1c024mg4gy572vgdj9rk4dqnb33iap06zs8ibasisbyi1089b37d";
+        sha256 = "1j4xycpwhs57qnkcxwh3np8wnf3km69n3cf4w6p2yv2z247lxvpm";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1vb6n29ik7dzhffzzcnskbhmn6h1dxzan3zanbp118wh8hw5yckj";
+        sha256 = "1dxhrk4z0n2di8p0yd6q00pa6bwyz5xqbrfbasiz8785ni7zrvxr";
       })
     ];
 

From 90c762c5e101cc34e68aaddbb46b17391c3e23b0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Dec 2016 12:40:31 -0600
Subject: [PATCH 0278/1310] bloaty: 2016.11.16 -> 2016.12.28

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

diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index c8e667722c5..8970f7a86d1 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -1,13 +1,13 @@
 { stdenv, binutils, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2016.11.16";
+  version = "2016.12.28";
   name = "bloaty-${version}";
 
   src = fetchgit {
     url = "https://github.com/google/bloaty.git";
-    rev = "d040e4821ace478f9b43360acd6801aefdd323f7";
-    sha256 = "1qk2wgd7vzr5zy0332y9h69cwkqmy8x7qz97xpgwwnk54amm8i3k";
+    rev = "2234386bcee7297dfa1b6d8a5d20f95ea4ed9bb0";
+    sha256 = "0cfsjgbp9r16d6qi8v4k609bbhjff4vhdiapfkhr34z1cik1md4l";
     fetchSubmodules = true;
   };
 

From 384185f9427d6722335a28a881fad4f904aafbeb Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Wed, 28 Dec 2016 16:42:47 -0200
Subject: [PATCH 0279/1310] openmw: 0.40.0 -> 0.41.0

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

diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index f9be01aa928..8b3998aa619 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -11,14 +11,14 @@ let
     };
   });
 in stdenv.mkDerivation rec {
-  version = "0.40.0";
+  version = "0.41.0";
   name = "openmw-${version}";
 
   src = fetchFromGitHub {
     owner = "OpenMW";
     repo = "openmw";
     rev = name;
-    sha256 = "0mqd4gpwvczwqfkw5zvnw7cl1nzv9lkiqq2yc2a0qasaby8qv94w";
+    sha256 = "1qay278965i7ja2rjllhcqfq7zpbapd7w57xly02apniadyfg0yz";
   };
 
   enableParallelBuilding = true;

From e243ec43f3728a7e1ddf617af58f18f72b79415d Mon Sep 17 00:00:00 2001
From: Jeremy Shaw <jeremy@n-heptane.com>
Date: Wed, 28 Dec 2016 13:48:50 -0500
Subject: [PATCH 0280/1310] netbpm: tell config.mk where to find JPEGLIB and
 JPEGHDR_DIR or jpegtopnm and friends will not be built.

---
 pkgs/tools/graphics/netpbm/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index d0381e91251..7fafc5218e9 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -24,7 +24,9 @@ stdenv.mkDerivation rec {
     echo "STATICLIB_TOO = n" >> config.mk
     substituteInPlace "config.mk" \
         --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \
-        --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include"
+        --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" \
+        --replace "JPEGLIB = NONE" "JPEGLIB = ${libjpeg.out}/lib/libjpeg.so" \
+        --replace "JPEGHDR_DIR =" "JPEGHDR_DIR = ${libjpeg.dev}/include"
    '' + stdenv.lib.optionalString stdenv.isDarwin ''
     echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
     echo "NETPBMLIBTYPE = dylib" >> config.mk

From 10b8cfbdbdee3afce0d48ec2cc35d5ec7953708d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Dec 2016 12:56:55 -0600
Subject: [PATCH 0281/1310] llvm: 3.9.0 -> 3.9.1

---
 pkgs/development/compilers/llvm/3.9/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/3.9/default.nix        | 6 +++---
 pkgs/development/compilers/llvm/3.9/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/3.9/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/3.9/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/3.9/llvm.nix           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index 6eadb91141d..e6c804c96b1 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -6,7 +6,7 @@ let
     name = "clang-${version}";
 
     unpackPhase = ''
-      unpackFile ${fetch "cfe" "0a1x32rxrq4ln079xf58irg56gjdxcfgwa00ws4hqv9pv73sg5km"}
+      unpackFile ${fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"}
       mv cfe-${version}.src clang
       sourceRoot=$PWD/clang
       unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index 49fdad931b6..a01e47efb75 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -2,7 +2,7 @@
 let
   callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
-  version = "3.9.0";
+  version = "3.9.1";
 
   fetch = fetch_v version;
   fetch_v = ver: name: sha256: fetchurl {
@@ -10,8 +10,8 @@ let
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "16m5g0hf8yg9npnw25j2a86g34nsvk9rsm3c84gbch2prm7j5rg0";
-  clang-tools-extra_src = fetch "clang-tools-extra" "052zg0h5vbmxnh2ikc743rw3649f112dfyn8hg39x6cfxi3fqyjv";
+  compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk";
+  clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999";
 
   self = {
     llvm = callPackage ./llvm.nix {
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
index 3b7caaa24bf..7a53ffa0d8f 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "01jvgwi9zd46bb1f93c561212bjzg02q2akacvsj4qsw6r8qvcyh";
+  src = fetch "libcxx" "0qbl3afl2p2h87p977lsqr5kykl6cgjpkzczs0g6a3pn53j1bri5";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
index 2baac6386a5..aff4205d6a9 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "06c05jlwfgm2q5xhy5wzmsi9bmfphzh22wpmbph84s452wksjdxh";
+  src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj";
 
   buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix
index 55c00eb07fc..5d8878b3b06 100644
--- a/pkgs/development/compilers/llvm/3.9/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.9/lldb.nix
@@ -15,7 +15,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "1113s6crh94hzk9h9lqrvng0lsy174ml2rq0r962ngqy843hwa31";
+  src = fetch "lldb" "1z30ljmcpp261bjng1i5k3bb9jkrs1cr97z04qs4s3zql6r12cvy";
 
   postUnpack = ''
     # Hack around broken standalone build as of 3.8
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 8086f980bcf..b64cf4fed5b 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -19,7 +19,7 @@
 }:
 
 let
-  src = fetch "llvm" "0j49lkd5d7nnpdqzaybs2472bvcxyx0i4r3iccwf3kj2v9wk3iv6";
+  src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z";
   shlib = if stdenv.isDarwin then "dylib" else "so";
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib

From 86d55f0380188d6e91c76cbbd79af82182842455 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Wed, 28 Dec 2016 20:06:14 +0100
Subject: [PATCH 0282/1310] openbabel: 2.3.2 -> 2.4.1

---
 pkgs/development/libraries/openbabel/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index 3c4cd8bb6c8..b124e592f36 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -1,23 +1,23 @@
-{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pkgconfig }:
+{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "openbabel-2.3.2";
+  name = "openbabel-${version}";
+  version = "2.4.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/openbabel/${name}.tar.gz";
-    sha256 = "122if0jkm71ngd1b0dic8k567b3j2hcikbwnpxgchv5ag5ka5b2f";
+    url = "https://github.com/openbabel/openbabel/archive/openbabel-${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz";
+    sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r";
   };
 
   # TODO : perl & python bindings;
   # TODO : wxGTK: I have no time to compile
   # TODO : separate lib and apps
-  buildInputs = [ zlib libxml2 eigen python cairo ];
+  buildInputs = [ zlib libxml2 eigen python cairo pcre ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = {
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.urkud ];
-    broken = true; # doesn't build with GCC 5; fix in GitHub
   };
 }

From 421a7f37fa62c92921e4d0b8853427317f561733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Dec 2016 20:16:12 +0100
Subject: [PATCH 0283/1310] gdk-pixbuf: security 2.36.0 -> 2.36.2

/cc #21457.  The rebuild impact is probably only a few thousand.
The new utility is put into $out/bin/.
---
 .../libraries/gdk-pixbuf/default.nix           | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index f3db9bf5977..736014d665c 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,18 +3,17 @@
 
 let
   ver_maj = "2.36";
-  ver_min = "0";
+  ver_min = "2";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c";
+    sha256 = "3a082ad67d68b55970aed0b2034a06618167be98a42d5c70de736756b45d325d";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
-  outputBin = "dev";
 
   setupHook = ./setup-hook.sh;
 
@@ -27,14 +26,21 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
 
+  configureFlags = "--with-libjasper --with-x11"
+    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
+    ;
+
   # on darwin, tests don't link
   preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
     substituteInPlace Makefile --replace "docs tests" "docs"
   '';
 
-  configureFlags = "--with-libjasper --with-x11"
-    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
-    ;
+  postInstall =
+    # All except one utility seem to be only useful during building.
+    ''
+      moveToOutput "bin" "$dev"
+      moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
+    '';
 
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
   inherit (doCheck);

From e4a25aabf26082ac11ecb98371bef595fad4ba33 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 28 Dec 2016 13:41:19 -0600
Subject: [PATCH 0284/1310] Add top-level attr for lldb. (#21476)

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39ddbf8022f..5b261c83b65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5140,6 +5140,8 @@ in
 
   lizardfs = callPackage ../tools/filesystems/lizardfs { };
 
+  lldb = llvmPackages.lldb;
+
   llvm = llvmPackages.llvm;
 
   llvm_39 = llvmPackages_39.llvm;

From 310d3fb910c95598aaccea3415e70657b1a77f50 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Wed, 28 Dec 2016 17:36:34 -0200
Subject: [PATCH 0285/1310] freeciv: 2.5.3 -> 2.5.6

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

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index b5619644bd8..c5f3dfeabab 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -10,14 +10,14 @@ let
   gtkName = if gtkClient then "-gtk" else "";
 
   name = "freeciv";
-  version = "2.5.3";
+  version = "2.5.6";
 in
 stdenv.mkDerivation {
   name = "${name}${sdlName}${gtkName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2";
-    sha256 = "0p40bpkhbldsnlqdvfn3qd2vzadxfrfsf1r57x1akwabqs0h62s8";
+    sha256 = "16wrnsx5rmbz6rjs03bhy0vn20i6n6g73lx7fjpai98ixhzc5bfg";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 00c46ecd74ee8c85c30191652e3bb25f9c91867a Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Wed, 28 Dec 2016 18:32:34 -0200
Subject: [PATCH 0286/1310] freeciv: add enable_sqlite

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

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index c5f3dfeabab..9e2a8b19609 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext
 , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth
 , gtkClient ? false, gtk2
-, server ? true, readline }:
+, server ? true, enable_sqlite ? true, readline, sqlite }:
 
 let
   inherit (stdenv.lib) optional optionals;
@@ -25,10 +25,12 @@ stdenv.mkDerivation {
   buildInputs = [ zlib bzip2 curl lzma gettext ]
     ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ]
     ++ optionals gtkClient [ gtk2 ]
-    ++ optional server readline;
+    ++ optional server readline
+    ++ optional enable_sqlite sqlite;
 
   configureFlags = []
     ++ optional sdlClient "--enable-client=sdl"
+    ++ optional enable_sqlite "--enable-fcdb=sqlite3"
     ++ optional (!gtkClient) "--enable-fcmp=cli"
     ++ optional (!server) "--disable-server";
 

From a36a2412ee99d0e7714143e174b1f994635cc1d9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 28 Dec 2016 18:50:54 +0300
Subject: [PATCH 0287/1310] libudev0-shim: init at 1

---
 .../linux/libudev0-shim/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/os-specific/linux/libudev0-shim/default.nix

diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/os-specific/linux/libudev0-shim/default.nix
new file mode 100644
index 00000000000..203d1defa28
--- /dev/null
+++ b/pkgs/os-specific/linux/libudev0-shim/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, udev }:
+
+stdenv.mkDerivation rec {
+  name = "libudev0-shim-${version}";
+  version = "1";
+
+  src = fetchFromGitHub {
+    owner = "archlinux";
+    repo = "libudev0-shim";
+    rev = "v${version}";
+    sha256 = "1460qm6rp1cqnns39lj24z7191m8sbpvbjabqbzb55dkdd2kw50z";
+  };
+
+  buildInputs = [ udev ];
+
+  installPhase = ''
+    name="$(echo libudev.so.*)"
+    install -Dm755 "$name" "$out/lib/$name"
+    ln -s "$name" "$out/lib/libudev.so.0"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Shim to preserve libudev.so.0 compatibility";
+    homepage = "https://github.com/archlinux/libudev0-shim";
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b261c83b65..a73e0ad1781 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11671,6 +11671,7 @@ in
 
   # libudev.so.0
   udev182 = callPackage ../os-specific/linux/udev/182.nix { };
+  libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { };
 
   udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
   udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };

From cdf306909f3bf25fe962195c584dbe5b18ee9896 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 28 Dec 2016 18:51:01 +0300
Subject: [PATCH 0288/1310] udev182: remove

---
 pkgs/games/steam/runtime-wrapped.nix |  2 +-
 pkgs/os-specific/linux/udev/145.nix  | 53 ----------------------------
 pkgs/os-specific/linux/udev/182.nix  | 39 --------------------
 pkgs/top-level/all-packages.nix      |  2 --
 4 files changed, 1 insertion(+), 95 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/udev/145.nix
 delete mode 100644 pkgs/os-specific/linux/udev/182.nix

diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 38d73f59dee..d9d6e0ecf0d 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -44,7 +44,7 @@ let
     libav
     atk
     # Only libraries are needed from those two
-    udev182
+    libudev0-shim
     networkmanager098
 
     # Verified games requirements
diff --git a/pkgs/os-specific/linux/udev/145.nix b/pkgs/os-specific/linux/udev/145.nix
deleted file mode 100644
index 6dd551e1ce1..00000000000
--- a/pkgs/os-specific/linux/udev/145.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, gperf, pkgconfig, glib, acl, libusb, usbutils, pciutils }:
-
-assert stdenv ? glibc;
-
-stdenv.mkDerivation rec {
-  name = "udev-145";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
-    sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv";
-  };
-
-  buildInputs = [gperf pkgconfig glib acl libusb usbutils];
-
-  configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids";
-
-  preConfigure =
-    ''
-      substituteInPlace extras/keymap/Makefile.in \
-        --replace /usr/include ${stdenv.glibc.dev}/include
-    '';
-
-  postInstall =
-    ''
-      # Install some rules that really should be installed by default.
-      for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do
-        cp rules/packages/$i $out/libexec/rules.d/
-      done
-
-      # The path to rule_generator.functions in write_cd_rules and
-      # write_net_rules is broken.  Also, don't store the mutable
-      # persistant rules in /etc/udev/rules.d but in
-      # /var/lib/udev/rules.d.
-      for i in $out/libexec/write_cd_rules $out/libexec/write_net_rules; do
-        substituteInPlace $i \
-          --replace /lib/udev $out/libexec \
-          --replace /etc/udev/rules.d /var/lib/udev/rules.d
-      done
-
-      # Don't set PATH to /bin:/sbin; won't work in NixOS.
-      substituteInPlace $out/libexec/rule_generator.functions \
-        --replace 'PATH=' '#PATH='
-
-      # Don't hardcore the FIRMWARE_DIRS variable; obtain it from the
-      # environment of the caller.
-      sed '3,4d' -i $out/libexec/firmware.sh
-    '';
-
-  meta = {
-    homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
-    description = "Udev manages the /dev filesystem";
-  };
-}
diff --git a/pkgs/os-specific/linux/udev/182.nix b/pkgs/os-specific/linux/udev/182.nix
deleted file mode 100644
index 33a4907c7ca..00000000000
--- a/pkgs/os-specific/linux/udev/182.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, pkgconfig
-, pciutils, utillinux, kmod, usbutils, gperf
-}:
-
-assert stdenv ? glibc;
-
-stdenv.mkDerivation rec {
-  name = "udev-182";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
-    sha256 = "143qvm0kij26j2l5icnch4x38fajys6li7j0c5mpwi6kqmc8hqx0";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  buildInputs = [ utillinux kmod usbutils #glib gobjectIntrospection
-                  gperf
-                ];
-
-  configureFlags = [ "--with-pci-ids-path=${pciutils}/share/pci.ids"
-                     "--disable-gudev"
-                     "--disable-introspection"
-                   ];
-
-  postPatch = ''
-    sed -i 's:input.h:input-event-codes.h:' Makefile.in
-    sed -i '20a#include <stdint.h>' src/mtd_probe/mtd_probe.h
-  '';
-
-  NIX_LDFLAGS = [ "-lrt" ];
-
-  meta = with stdenv.lib; {
-    homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
-    description = "Udev manages the /dev filesystem";
-    platforms = platforms.linux;
-    license = licenses.gpl2;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a73e0ad1781..d9e462a208f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11669,8 +11669,6 @@ in
 
   eudev = callPackage ../os-specific/linux/eudev {};
 
-  # libudev.so.0
-  udev182 = callPackage ../os-specific/linux/udev/182.nix { };
   libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { };
 
   udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };

From d479639187d0b3142aa158e15f1014e928a9f90c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 29 Dec 2016 00:33:13 +0300
Subject: [PATCH 0289/1310] freeciv: build with shared (not static) libraries

---
 pkgs/games/freeciv/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index d33d0bf80a8..608b1a01120 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -16,6 +16,7 @@ let
 in
 stdenv.mkDerivation {
   name = "${name}${sdlName}${gtkName}-${version}";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2";
@@ -30,7 +31,7 @@ stdenv.mkDerivation {
     ++ optional server readline
     ++ optional enableSqlite sqlite;
 
-  configureFlags = []
+  configureFlags = [ "--enable-shared" ]
     ++ optional sdlClient "--enable-client=sdl"
     ++ optional enableSqlite "--enable-fcdb=sqlite3"
     ++ optional (!gtkClient) "--enable-fcmp=cli"

From 81d8a457ed83a83f2cb4a0151ce0a9451f77eb20 Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Wed, 28 Dec 2016 23:04:58 +0100
Subject: [PATCH 0290/1310] Fix asterisk & asterisk: 13.6.0 -> 14.1.2 (#20788)

* fix/asterisk-module: use unix-group for asterisk-files
* fix/asterisk-module: add configOption to use some default config-files
* fix/asterisk-module: correction of skel copy
* fix/asterisk-module: use /etc/asterisk as configDir
* fix/asterisk-module: add reload; do not restart unit
* asterisk: 13.6.0 -> 14.1.2
* fix/asterisk: compile with lua, pjsip, format_mp3
* fix/asterisk: fix indentation
* fix/asterisk: remove broken flag
---
 nixos/modules/misc/ids.nix                    |  2 +-
 .../modules/services/networking/asterisk.nix  | 60 +++++++++++++++----
 pkgs/servers/asterisk/default.nix             | 44 +++++++++-----
 pkgs/servers/asterisk/disable-download.patch  |  8 +--
 pkgs/servers/asterisk/runtime-vardirs.patch   |  6 +-
 5 files changed, 83 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 70705771183..eb6f8e70689 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -467,7 +467,7 @@
       ihaskell = 189;
       i2p = 190;
       lambdabot = 191;
-      #asterisk = 192; # unused
+      asterisk = 192;
       plex = 193;
       sabnzbd = 194;
       #grafana = 196; #unused
diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix
index 13617a1b6c5..5c71a1d8dda 100644
--- a/nixos/modules/services/networking/asterisk.nix
+++ b/nixos/modules/services/networking/asterisk.nix
@@ -6,29 +6,38 @@ let
   cfg = config.services.asterisk;
 
   asteriskUser = "asterisk";
+  asteriskGroup = "asterisk";
 
   varlibdir = "/var/lib/asterisk";
   spooldir = "/var/spool/asterisk";
   logdir = "/var/log/asterisk";
 
+  # Add filecontents from files of useTheseDefaultConfFiles to confFiles, do not override
+  defaultConfFiles = subtractLists (attrNames cfg.confFiles) cfg.useTheseDefaultConfFiles;
+  allConfFiles =
+    cfg.confFiles //
+    builtins.listToAttrs (map (x: { name = x;
+                                    value = builtins.readFile (pkgs.asterisk + "/etc/asterisk/" + x); })
+                              defaultConfFiles);
+
   asteriskEtc = pkgs.stdenv.mkDerivation
   ((mapAttrs' (name: value: nameValuePair
         # Fudge the names to make bash happy
         ((replaceChars ["."] ["_"] name) + "_")
         (value)
-      ) cfg.confFiles) //
+      ) allConfFiles) //
   {
     confFilesString = concatStringsSep " " (
-      attrNames cfg.confFiles
+      attrNames allConfFiles
     );
 
-    name = "asterisk.etc";
+    name = "asterisk-etc";
 
     # Default asterisk.conf file
     # (Notice that astetcdir will be set to the path of this derivation)
     asteriskConf = ''
       [directories]
-      astetcdir => @out@
+      astetcdir => /etc/asterisk
       astmoddir => ${pkgs.asterisk}/lib/asterisk/modules
       astvarlibdir => /var/lib/asterisk
       astdbdir => /var/lib/asterisk
@@ -169,6 +178,16 @@ in
         '';
       };
 
+      useTheseDefaultConfFiles = mkOption {
+        default = [ "ari.conf" "acl.conf" "agents.conf" "amd.conf" "calendar.conf" "cdr.conf" "cdr_syslog.conf" "cdr_custom.conf" "cel.conf" "cel_custom.conf" "cli_aliases.conf" "confbridge.conf" "dundi.conf" "features.conf" "hep.conf" "iax.conf" "pjsip.conf" "pjsip_wizard.conf" "phone.conf" "phoneprov.conf" "queues.conf" "res_config_sqlite3.conf" "res_parking.conf" "statsd.conf" "udptl.conf" "unistim.conf" ];
+        type = types.listOf types.str;
+        example = [ "sip.conf" "dundi.conf" ];
+        description = ''Sets these config files to the default content. The default value for
+          this option contains all necesscary files to avoid errors at startup.
+          This does not override settings via <option>services.asterisk.confFiles</option>.
+        '';
+      };
+
       extraArguments = mkOption {
         default = [];
         type = types.listOf types.str;
@@ -182,12 +201,22 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers = singleton
-    { name = asteriskUser;
-      uid = config.ids.uids.asterisk;
-      description = "Asterisk daemon user";
-      home = varlibdir;
-    };
+    environment.systemPackages = [ pkgs.asterisk ];
+
+    environment.etc.asterisk.source = asteriskEtc;
+
+    users.extraUsers.asterisk =
+      { name = asteriskUser;
+        group = asteriskGroup;
+        uid = config.ids.uids.asterisk;
+        description = "Asterisk daemon user";
+        home = varlibdir;
+      };
+
+    users.extraGroups.asterisk =
+      { name = asteriskGroup;
+        gid = config.ids.gids.asterisk;
+      };
 
     systemd.services.asterisk = {
       description = ''
@@ -196,14 +225,17 @@ in
 
       wantedBy = [ "multi-user.target" ];
 
+      # Do not restart, to avoid disruption of running calls. Restart unit by yourself!
+      restartIfChanged = false;
+
       preStart = ''
         # Copy skeleton directory tree to /var
         for d in '${varlibdir}' '${spooldir}' '${logdir}'; do
           # TODO: Make exceptions for /var directories that likely should be updated
           if [ ! -e "$d" ]; then
             mkdir -p "$d"
-            cp --recursive ${pkgs.asterisk}/"$d" "$d"
-            chown --recursive ${asteriskUser} "$d"
+            cp --recursive ${pkgs.asterisk}/"$d"/* "$d"/
+            chown --recursive ${asteriskUser}:${asteriskGroup} "$d"
             find "$d" -type d | xargs chmod 0755
           fi
         done
@@ -215,7 +247,9 @@ in
             # FIXME: This doesn't account for arguments with spaces
             argString = concatStringsSep " " cfg.extraArguments;
           in
-          "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C ${asteriskEtc}/asterisk.conf ${argString} -F";
+          "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F";
+        ExecReload = ''${pkgs.asterisk}/bin/asterisk -x "core reload"
+          '';
         Type = "forking";
         PIDFile = "/var/run/asterisk/asterisk.pid";
       };
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index ed772e7b247..2433750ce45 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -1,20 +1,25 @@
-{ stdenv, fetchurl, fetchgit, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux }:
-
+{ stdenv, pkgs, fetchurl, fetchgit,
+  jansson, libxml2, libxslt, ncurses, openssl, sqlite,
+  utillinux, dmidecode, libuuid, binutils, newt,
+  lua,
+  srtp, wget, curl,
+  subversionClient
+}:
 stdenv.mkDerivation rec {
   name = "asterisk-${version}";
-  version = "13.6.0";
+  version = "14.1.2";
 
   src = fetchurl {
     url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz";
-    sha256 = "0nh0fnqx84as92kk9d73s0386cndd17l06y1c72jl2bdjhyba0ca";
+    sha256 = "0w9s4334rwvpyxm169grmnb4k9yq0l2al73dyh4cb8769qcs0ij8";
   };
 
   # Note that these sounds are included with the release tarball. They are
   # provided here verbatim for the convenience of anyone wanting to build
   # Asterisk from other sources.
   coreSounds = fetchurl {
-    url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.26.tar.gz;
-    sha256 = "2300e3ed1d2ded6808a30a6ba71191e7784710613a5431afebbd0162eb4d5d73";
+    url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz;
+    sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd";
   };
   mohSounds = fetchurl {
     url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz;
@@ -22,7 +27,7 @@ stdenv.mkDerivation rec {
   };
   # TODO: Sounds for other languages could be added here
 
-  buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux ];
+  buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua srtp wget curl subversionClient ];
 
   patches = [
     # Disable downloading of sound files (we will fetch them
@@ -38,14 +43,24 @@ stdenv.mkDerivation rec {
 
   # Use the following preConfigure section when building Asterisk from sources
   # other than the release tarball.
-#   preConfigure = ''
-#     ln -s ${coreSounds} sounds/asterisk-core-sounds-en-gsm-1.4.26.tar.gz
-#     ln -s ${mohSounds} sounds/asterisk-moh-opsound-wav-2.03.tar.gz
-#   '';
+  # preConfigure = ''
+  #   ln -s ${coreSounds} sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz
+  #   ln -s ${mohSounds} sounds/asterisk-moh-opsound-wav-2.03.tar.gz
+  #'';
 
   # The default libdir is $PREFIX/usr/lib, which causes problems when paths
   # compiled into Asterisk expect ${out}/usr/lib rather than ${out}/lib.
-  configureFlags = "--libdir=\${out}/lib";
+  configureFlags = [
+    "--libdir=\${out}/lib"
+    "--with-lua=${lua}/lib"
+    "--with-pjproject-bundled"
+  ];
+
+  preBuild = ''
+    make menuselect.makeopts
+    substituteInPlace menuselect.makeopts --replace 'format_mp3 ' ""
+    ./contrib/scripts/get_mp3_source.sh
+  '';
 
   postInstall = ''
     # Install sample configuration files for this version of Asterisk
@@ -56,9 +71,6 @@ stdenv.mkDerivation rec {
     description = "Software implementation of a telephone private branch exchange (PBX)";
     homepage = http://www.asterisk.org/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ auntie ];
-    # Marked as broken due to needing an update for security issues.
-    # See: https://github.com/NixOS/nixpkgs/issues/18856
-    broken = true;
+    maintainers = with maintainers; [ auntie DerTim1 ];
   };
 }
diff --git a/pkgs/servers/asterisk/disable-download.patch b/pkgs/servers/asterisk/disable-download.patch
index 8b15ecdfaaa..670886bfe3c 100644
--- a/pkgs/servers/asterisk/disable-download.patch
+++ b/pkgs/servers/asterisk/disable-download.patch
@@ -1,7 +1,7 @@
-diff -ruN asterisk-13.2.0/sounds/Makefile asterisk-13.2.0-patched/sounds/Makefile
---- asterisk-13.2.0/sounds/Makefile	2014-09-09 14:01:11.000000000 -0600
-+++ asterisk-13.2.0-patched/sounds/Makefile	2015-03-31 16:12:00.549133670 -0600
-@@ -89,7 +89,7 @@
+diff -ruN asterisk-14.1.2/sounds/Makefile asterisk-14.1.2-patched/sounds/Makefile 
+--- asterisk-14.1.2/sounds/Makefile	2016-11-10 20:43:02.000000000 +0100
++++ asterisk-14.1.2-patched/sounds/Makefile	2016-11-16 10:08:46.591615147 +0100
+@@ -90,7 +90,7 @@
  	  ) && touch "$(1)$(if $(3),/$(3),)/$$@"; \
  	fi
  
diff --git a/pkgs/servers/asterisk/runtime-vardirs.patch b/pkgs/servers/asterisk/runtime-vardirs.patch
index dfc00186d13..17959bac9a0 100644
--- a/pkgs/servers/asterisk/runtime-vardirs.patch
+++ b/pkgs/servers/asterisk/runtime-vardirs.patch
@@ -1,6 +1,6 @@
-diff -rupN asterisk-13.3.2/build_tools/make_defaults_h asterisk-13.3.2-patched/build_tools/make_defaults_h
---- asterisk-13.3.2/build_tools/make_defaults_h	2012-01-30 14:21:16.000000000 -0700
-+++ asterisk-13.3.2-patched/build_tools/make_defaults_h	2015-04-15 19:07:46.760351155 -0600
+diff -rupN asterisk-14.1.2/build_tools/make_defaults_h asterisk-14.1.2-patched/build_tools/make_defaults_h
+--- asterisk-14.1.2/build_tools/make_defaults_h	2016-11-10 20:43:02.000000000 +0100
++++ asterisk-14.1.2-patched/build_tools/make_defaults_h	2016-11-16 10:09:04.189625495 +0100
 @@ -1,4 +1,13 @@
  #!/bin/sh
 +

From e5cd7189749588e3f07f813a03b8dc9c37bc57cd Mon Sep 17 00:00:00 2001
From: Roman Naumann <namor@hemio.de>
Date: Tue, 27 Dec 2016 23:41:44 +0100
Subject: [PATCH 0291/1310] gorilla: init at 1.5.3.7

---
 lib/maintainers.nix                         |  1 +
 pkgs/tools/security/gorilla-bin/default.nix | 41 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/tools/security/gorilla-bin/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7ed8ae953bc..89d17213239 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -314,6 +314,7 @@
   mudri = "James Wood <lamudri@gmail.com>";
   muflax = "Stefan Dorn <mail@muflax.com>";
   myrl = "Myrl Hex <myrl.0xf@gmail.com>";
+  namore = "Roman Naumann <namor@hemio.de>";
   nand0p = "Fernando Jose Pando <nando@hex7.com>";
   Nate-Devv = "Nathan Moore <natedevv@gmail.com>";
   nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix
new file mode 100644
index 00000000000..cbd260455d8
--- /dev/null
+++ b/pkgs/tools/security/gorilla-bin/default.nix
@@ -0,0 +1,41 @@
+{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }:
+
+stdenv.mkDerivation rec {
+  name = "gorilla-bin-${version}";
+  version = "1.5.3.7";
+
+  src = fetchurl {
+    name = "gorilla1537_64.bin";
+    url = "http://gorilla.dp100.com/downloads/gorilla1537_64.bin";
+    sha256 = "19ir6x4c01825hpx2wbbcxkk70ymwbw4j03v8b2xc13ayylwzx0r";
+  };
+
+  buildInputs = [ patchelf makeWrapper ];
+  phases = [ "unpackPhase" "installPhase" ];
+
+  unpackCmd = ''
+    mkdir gorilla;
+    cp $curSrc gorilla/gorilla-${version};
+  '';
+
+  installPhase = let
+    interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")";
+    libPath = stdenv.lib.makeLibraryPath [ libXft libX11 freetype fontconfig libXrender libXScrnSaver libXext ];
+  in ''
+    mkdir -p $out/opt/password-gorilla
+    mkdir -p $out/bin
+    cp gorilla-${version} $out/opt/password-gorilla
+    chmod ugo+x $out/opt/password-gorilla/gorilla-${version}
+    patchelf --set-interpreter "${interpreter}" "$out/opt/password-gorilla/gorilla-${version}"
+    makeWrapper "$out/opt/password-gorilla/gorilla-${version}" "$out/bin/gorilla" \
+      --prefix LD_LIBRARY_PATH : "${libPath}"
+  '';
+
+  meta = {
+    description = "Password Gorilla is a Tk based password manager";
+    homepage = https://github.com/zdia/gorilla/wiki;
+    maintainers = [ stdenv.lib.maintainers.namore ];
+    platforms = [ "x86_64-linux" ];
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index beeed44ba78..bce15bdb9b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -902,6 +902,8 @@ in
 
   goa = callPackage ../development/tools/goa { };
 
+  gorilla-bin = callPackage ../tools/security/gorilla-bin { };
+
   gringo = callPackage ../tools/misc/gringo { };
 
   gti = callPackage ../tools/misc/gti { };

From f969f42b2b1103a57cb856a8125a77d0a50baa40 Mon Sep 17 00:00:00 2001
From: Milan Svoboda <milan.svoboda@centrum.cz>
Date: Wed, 28 Dec 2016 23:47:39 +0100
Subject: [PATCH 0292/1310] ranger 1.7.2 -> 1.8.0 (#21480)

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

diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 048a7877362..673e4b02085 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages, w3m, file, less }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "ranger-1.7.2";
+  name = "ranger-1.8.0";
 
   meta = {
     description = "File manager with minimalistic curses interface";
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
 
   src = fetchurl {
     url = "http://ranger.nongnu.org/${name}.tar.gz";
-    sha256 = "0yaviybviwdvfg2a0pf2kk28g10k245499xmbpqlai7fv91f7xll";
+    sha256 = "14j067n1azk6vc6cxlhi5w5bsn2wcz4hypvgxc0vjl9xp5n4f0nf";
   };
 
   propagatedBuildInputs = [ file ];

From d8ef63fc73ca169aa6d022c9ed7f10c57a5a5a9a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 17 Oct 2016 12:51:06 +0200
Subject: [PATCH 0293/1310] crowd module: fix OpenID server

---
 .../services/web-apps/atlassian/crowd.nix       | 17 +++++++++++++----
 pkgs/servers/atlassian/crowd.nix                | 16 +++++++++++++++-
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index 5e79678023d..ada26f8057b 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -6,7 +6,12 @@ let
 
   cfg = config.services.crowd;
 
-  pkg = pkgs.atlassian-crowd;
+  pkg = pkgs.atlassian-crowd.override {
+    home = cfg.home;
+    port = cfg.listenPort;
+    proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}";
+    openidPassword = cfg.openidPassword;
+  };
 
 in
 
@@ -45,6 +50,11 @@ in
         description = "Port to listen on.";
       };
 
+      openidPassword = mkOption {
+        type = types.str;
+        description = "Application password for OpenID server.";
+      };
+
       catalinaOptions = mkOption {
         type = types.listOf types.str;
         default = [];
@@ -119,10 +129,10 @@ in
       };
 
       preStart = ''
-        mkdir -p ${cfg.home}/{logs,work}
+        mkdir -p ${cfg.home}/{logs,work,database}
 
         mkdir -p /run/atlassian-crowd
-        ln -sf ${cfg.home}/{work,server.xml} /run/atlassian-crowd
+        ln -sf ${cfg.home}/{database,work,server.xml} /run/atlassian-crowd
 
         chown -R ${cfg.user} ${cfg.home}
 
@@ -134,7 +144,6 @@ in
       '';
 
       script = "${pkg}/start_crowd.sh";
-      #stopScript  = "${pkg}/bin/stop_crowd.sh";
 
       serviceConfig = {
         User = cfg.user;
diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix
index d84ddd00882..05b88cf9cf3 100644
--- a/pkgs/servers/atlassian/crowd.nix
+++ b/pkgs/servers/atlassian/crowd.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, home ? "/var/lib/crowd" }:
+{ stdenv, fetchurl, home ? "/var/lib/crowd"
+, port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }:
 
 stdenv.mkDerivation rec {
   name = "atlassian-crowd-${version}";
@@ -18,9 +19,22 @@ stdenv.mkDerivation rec {
     rm -rf apache-tomcat/work
     ln -s /run/atlassian-crowd/work apache-tomcat/work
 
+    ln -s /run/atlassian-crowd/database database
+
     substituteInPlace apache-tomcat/bin/startup.sh --replace start run
 
     echo "crowd.home=${home}" > crowd-webapp/WEB-INF/classes/crowd-init.properties
+    substituteInPlace build.properties \
+      --replace "openidserver.url=http://localhost:8095/openidserver" \
+                "openidserver.url=http://localhost:${toString port}/openidserver"
+    substituteInPlace crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \
+      --replace "http://localhost:8095/" \
+                "http://localhost:${toString port}/"
+    sed -r -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \
+      -e 's,application.password\s+password,application.password ${openidPassword},'
+  '' + stdenv.lib.optionalString (proxyUrl != null) ''
+    sed -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \
+      -e 's,http://localhost:${toString port}/openidserver,${proxyUrl}/openidserver,'
   '';
 
   installPhase = ''

From 825c0d892a7ad308872371065cdf6209823c712e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 6 Sep 2016 13:37:39 +0200
Subject: [PATCH 0294/1310] terminator: fix build and use
 buildPythonApplication

---
 pkgs/applications/misc/terminator/default.nix | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
index 29befb7f25a..79029eb4268 100644
--- a/pkgs/applications/misc/terminator/default.nix
+++ b/pkgs/applications/misc/terminator/default.nix
@@ -1,19 +1,28 @@
-{ stdenv, fetchurl, pythonPackages, keybinder, vte, gettext, intltool }:
+{ stdenv, fetchurl, python2Packages, pango, keybinder, vte, gettext, intltool, file
+}:
 
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
   name = "terminator-${version}";
   version = "0.98";
-  
+
   src = fetchurl {
     url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz";
     sha256 = "1h965z06dsfk38byyhnsrscd9r91qm92ggwgjrh7xminzsgqqv8a";
   };
-  
-  propagatedBuildInputs = with pythonPackages; [ pygtk notify keybinder vte gettext intltool ];
 
-  #setupPyBuildFlags = [ "--without-icon-cache" ];
+  nativeBuildInputs = [ file intltool ];
 
-  doCheck = false;
+  pythonPath = with python2Packages; [
+    pygtk pygobject2 vte keybinder notify gettext pango
+  ];
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  checkPhase = ''
+    ./run_tests
+  '';
 
   meta = with stdenv.lib; {
     description = "Terminal emulator with support for tiling and tabs";
@@ -25,7 +34,7 @@ pythonPackages.buildPythonApplication rec {
     '';
     homepage = http://gnometerminator.blogspot.no/p/introduction.html;
     license = licenses.gpl2;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor globin ];
     platforms = platforms.linux;
   };
 }

From 3f426f6f55a6a38a920b3c8117044ffb0d9a8c88 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 29 Dec 2016 01:19:55 +0100
Subject: [PATCH 0295/1310] terminator: 0.98 -> 1.0

---
 pkgs/applications/misc/terminator/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
index 79029eb4268..3959ad88ece 100644
--- a/pkgs/applications/misc/terminator/default.nix
+++ b/pkgs/applications/misc/terminator/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, python2Packages, pango, keybinder, vte, gettext, intltool, file
+{ stdenv, fetchurl, pythonPackages, pango, keybinder, vte, gettext, intltool, file
 }:
 
-python2Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "terminator-${version}";
-  version = "0.98";
+  version = "1.0";
 
   src = fetchurl {
     url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz";
-    sha256 = "1h965z06dsfk38byyhnsrscd9r91qm92ggwgjrh7xminzsgqqv8a";
+    sha256 = "1pfspcxsbax8a835kcld32fax6vcxsn1fmkny9zzvi4icplhkal8";
   };
 
   nativeBuildInputs = [ file intltool ];
 
-  pythonPath = with python2Packages; [
-    pygtk pygobject2 vte keybinder notify gettext pango
+  pythonPath = with pythonPackages; [
+    pygtk pygobject2 vte keybinder notify gettext pango psutil
   ];
 
   postPatch = ''

From 63f7d535725e6ef6053c0282b942b7304e18af1c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 24 Feb 2016 14:07:55 +0100
Subject: [PATCH 0296/1310] libgig: Configure script warns about missing
 libuuid

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

diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix
index 8975c4fa074..fd6e4a7aa48 100644
--- a/pkgs/development/libraries/libgig/default.nix
+++ b/pkgs/development/libraries/libgig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, autoconf, automake, libsndfile, libtool, pkgconfig }:
+{ stdenv, fetchsvn, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }:
 
 stdenv.mkDerivation rec {
   name = "libgig-svn-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0i7sj3zm6banl5avjdxblx0mlbxxzbsbr4x5hsl2fhrdsv5dnxhc";
   };
 
-  buildInputs = [ autoconf automake libsndfile libtool pkgconfig ];
+  buildInputs = [ autoconf automake libsndfile libtool pkgconfig libuuid ];
 
   preConfigure = "make -f Makefile.cvs";
 

From 8837b4a1c66b41be096d947bed159ff22a62a556 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 9 Nov 2016 21:00:48 +0100
Subject: [PATCH 0297/1310] libivykis: 0.39 -> 0.40

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

diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix
index 8e2a659b3f0..d9e438da131 100644
--- a/pkgs/development/libraries/libivykis/default.nix
+++ b/pkgs/development/libraries/libivykis/default.nix
@@ -3,16 +3,18 @@
 stdenv.mkDerivation rec {
   name = "libivykis-${version}";
 
-  version = "0.39";
+  version = "0.40";
 
   src = fetchurl {
     url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz";
-    sha256 = "11d7sjbhcll932rlvx9sf3vk60b5bazmjf4vlr4qd9cz0cashizz";
+    sha256 = "1rn32dijv0pn9y2mbdg1n7al4h4i5pwwhhihr9pyakwyb6qgmqxj";
   };
 
-  buildInputs = [ autoreconfHook pkgconfig file protobufc ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ file protobufc ];
 
   meta = with stdenv.lib; {
+    homepage = "http://libivykis.sourceforge.net/";
     description = ''
       A thin wrapper over various OS'es implementation of I/O readiness
       notification facilities

From 8376f5cc3a2d7b74c1fd800dc76139977b30f5bd Mon Sep 17 00:00:00 2001
From: oida <oida@users.noreply.github.com>
Date: Wed, 5 Oct 2016 16:30:18 +0200
Subject: [PATCH 0298/1310] prometheus-snmp-exporter: init at v0.1.0

---
 lib/maintainers.nix                           |  1 +
 .../monitoring/prometheus/snmp-exporter.nix   | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/snmp-exporter.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 2431d56d9f8..5fa30e86374 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -332,6 +332,7 @@
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   odi = "Oliver Dunkl <oliver.dunkl@gmail.com>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
+  oida = "oida <oida@posteo.de>";
   okasu = "Okasu <oka.sux@gmail.com>";
   olcai = "Erik Timan <dev@timan.info>";
   olejorgenb = "Ole Jørgen Brønner <olejorgenb@yahoo.no>";
diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
new file mode 100644
index 00000000000..a52e1abad87
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "snmp_exporter-${version}";
+  version = "0.1.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/prometheus/snmp_exporter";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "prometheus";
+    repo = "snmp_exporter";
+    sha256 = "1faa1gla5nqkhf1kq60v22bcph41qix3dn9db0w0fh2pkxpdxvrp";
+  };
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "SNMP Exporter for Prometheus";
+    homepage = https://github.com/prometheus/snmp_exporter;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ oida ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af4f24e9284..73b2510122e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10435,6 +10435,7 @@ in
   prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { };
   prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { };
   prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { };
+  prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
   prometheus-statsd-bridge = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { };
 
   psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };

From 655f7043b8b904068ac12ba6d179276bab113874 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 21 Oct 2016 02:04:38 +0200
Subject: [PATCH 0299/1310] libmilter: 8.14.8 -> 8.15.2

---
 .../libraries/libmilter/default.nix           | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix
index a5db2d23572..bd0cd9fe904 100644
--- a/pkgs/development/libraries/libmilter/default.nix
+++ b/pkgs/development/libraries/libmilter/default.nix
@@ -1,14 +1,15 @@
-{stdenv, fetchurl, m4}:
+{ stdenv, fetchurl, m4 }:
 
 stdenv.mkDerivation rec {
-  name = "libmilter-8.14.8";
-  
+  name = "libmilter-${version}";
+  version = "8.15.2";
+
   src = fetchurl {
-    url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.8.tar.gz";
-    sha256 = "1zmhzkj3gzx8022hsrysr3nzlcmv1qisb5i4jbx91661bw96ksq2";
+    url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${version}.tar.gz";
+    sha256 = "0fdl9ndmspqspdlmghzxlaqk56j3yajk52d7jxcg21b7sxglpy94";
   };
 
-  buildPhase = '' 
+  buildPhase = ''
     mkdir -p $out/lib
     cd libmilter
     cat > a.m4 <<EOF
@@ -29,10 +30,12 @@ stdenv.mkDerivation rec {
   '';
 
   patches = [ ./install.patch ./sharedlib.patch];
-  
-  buildInputs = [m4];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  buildInputs = [ m4 ];
+
+  meta = with stdenv.lib; {
+    description = "Sendmail Milter mail filtering API library";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ fpletz ];
   };
 }

From 3c104ca71c37b664b4bb62d32c6ffa398e716b18 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 22 Nov 2016 21:19:14 +0100
Subject: [PATCH 0300/1310] gnupg: build with sqlite to enable TOFU

See https://lists.gnupg.org/pipermail/gnupg-users/2015-October/054608.html.
---
 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 e91f91dbdea..b96226d5c3f 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libiconv, npth
-, gettext, texinfo, pcsclite
+, gettext, texinfo, pcsclite, sqlite
 
 # Each of the dependencies below are optional.
 # Gnupg can be built without them at the cost of reduced functionality.
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libgcrypt libassuan libksba libiconv npth gettext texinfo
-    readline libusb gnutls adns openldap zlib bzip2
+    readline libusb gnutls adns openldap zlib bzip2 sqlite
   ];
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";

From f3e8a6df6bb15196edf7d59813e4100b7094231a Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Thu, 29 Dec 2016 01:33:39 +0000
Subject: [PATCH 0301/1310] multimc: update to Java 8 (#21485)

Technically, this changes the version of Java depended on from 7 to
the default, which is currently 7 on darwin and 8 on all other
systems.
---
 pkgs/games/multimc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index 00d4fbf8451..71c7e300a63 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk7, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }:
 
 let
   libnbt = fetchFromGitHub {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50";
     sha256 = "179vc1iv57fx4g4h1wy8yvyvdm671jnvp6zi8pcr1n6azqhwklds";
   };
-  buildInputs = [ cmake qt5Full jdk7 zlib file makeWrapper ];
+  buildInputs = [ cmake qt5Full jdk zlib file makeWrapper ];
 
   libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
   postUnpack = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     cp -v MultiMC $out/bin/
     cp -v jars/*.jar $out/bin/jars/ #*/
     cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib
-    wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk7}/bin/
+    wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk}/bin/
   '';
 
   meta = with stdenv.lib; {

From 5ca180fa084e45665ecb0ec8d74461a0a8e43f29 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 28 Dec 2016 19:02:49 -0500
Subject: [PATCH 0302/1310] apacheHttpd: 2.4.23 -> 2.4.25 for CVE-2016-8743,
 CVE-2016-2161, CVE-2016-0736

---
 pkgs/servers/http/apache-httpd/2.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 5e87164c1b1..e9c1ec8b724 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert http2Support -> nghttp2 != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.23";
+  version = "2.4.25";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "0n2yx3gjlpr4kgqx845fj6amnmg25r2l6a7rzab5hxnpmar985hc";
+    sha256 = "1cl0bkqg6srb1sypga0cn8dcmdyxldavij73zmmkxvlz3kgw4zpq";
   };
 
   # FIXME: -dev depends on -doc

From a5dd31120873ece433de07683fc48646568f877e Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 28 Dec 2016 23:36:49 +0100
Subject: [PATCH 0303/1310] qemu: fix CVE-2016-9911

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

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index a99b37f0d17..21a859a7181 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -137,6 +137,12 @@ stdenv.mkDerivation rec {
 
     # from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06
     ./CVE-2016-9102.patch
+
+    (fetchpatch {
+      name = "qemu-CVE-2016-9911.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=patch;h=791f97758e223de3290592d169f8e6339c281714";
+      sha256 = "0952mpc81h42k5kqsw42prnw5vw86r3j88wk5z4sr1xd1sg428d6";
+    })
   ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
   hardeningDisable = [ "stackprotector" ];
 

From bc63738c6f5fa0e8da611a1035cea251f99c13fc Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Thu, 29 Dec 2016 00:47:38 +0100
Subject: [PATCH 0304/1310] qemu: fix CVE-2016-9921 and CVE-2016-9922

---
 pkgs/applications/virtualization/qemu/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 21a859a7181..eb167210126 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -143,6 +143,11 @@ stdenv.mkDerivation rec {
       url = "http://git.qemu.org/?p=qemu.git;a=patch;h=791f97758e223de3290592d169f8e6339c281714";
       sha256 = "0952mpc81h42k5kqsw42prnw5vw86r3j88wk5z4sr1xd1sg428d6";
     })
+    (fetchpatch {
+      name = "qemu-CVE-2016-9921_9922.patch";
+      url = "http://git.qemu.org/?p=qemu.git;a=commit;h=4299b90e9ba9ce5ca9024572804ba751aa1a7e70";
+      sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
+    })
   ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
   hardeningDisable = [ "stackprotector" ];
 

From c2a979fbfd5da392441b6b2ee368d725aa8022b6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 01:34:02 +0200
Subject: [PATCH 0305/1310] cryptsetup: 1.7.0 -> 1.7.1

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

diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 5e028ffc74a..76a3c3ebf2f 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -5,11 +5,11 @@
 assert enablePython -> python2 != null;
 
 stdenv.mkDerivation rec {
-  name = "cryptsetup-1.7.0";
+  name = "cryptsetup-1.7.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/cryptsetup/v1.7/${name}.tar.xz";
-    sha256 = "0j6iwf64pdrl4nm5ypc2r33b3k0aflb939wz2496vcqdrjkj8m87";
+    sha256 = "1v0zj4181ahckn5hn95kg3zbqw944raz769wdam5cjwqriiqmp3k";
   };
 
   configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ]

From 3e8bb7237d5f33336a5593047c0c57295c411d76 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 29 Dec 2016 02:43:32 +0100
Subject: [PATCH 0306/1310] cryptsetup: 1.7.1 -> 1.7.3

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

diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 76a3c3ebf2f..f61a5497c4b 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -5,11 +5,11 @@
 assert enablePython -> python2 != null;
 
 stdenv.mkDerivation rec {
-  name = "cryptsetup-1.7.1";
+  name = "cryptsetup-1.7.3";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/cryptsetup/v1.7/${name}.tar.xz";
-    sha256 = "1v0zj4181ahckn5hn95kg3zbqw944raz769wdam5cjwqriiqmp3k";
+    sha256 = "00nwd96m9yq4k3cayc04i5y7iakkzana35zxky6hpx2w8zl08axg";
   };
 
   configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ]

From 1cbb04e72e465e4df82a29d59be31f1b4266dcd4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 13 Nov 2016 16:21:02 +0100
Subject: [PATCH 0307/1310] iproute: 4.7.0 -> 4.8.0

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

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 6f6c0c66cc3..00aceda472c 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "iproute2-${version}";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
-    sha256 = "14kvpdlxq8204f5ayfdfb6mc0423mbf3px9q0spdly9sng7xnq4g";
+    sha256 = "12dk5hn1zlraqk2p0z8dv2xgsz0x9v8l3vcvf51fzj0v8b45j2d3";
   };
 
   patches = lib.optionals enableFan [

From 3fcdbedbef35e0d01e09af832c5636382dfd2450 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 29 Dec 2016 02:52:26 +0100
Subject: [PATCH 0308/1310] iproute: 4.8.0 -> 4.9.0

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

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 00aceda472c..1ff68fc0408 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "iproute2-${version}";
-  version = "4.8.0";
+  version = "4.9.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
-    sha256 = "12dk5hn1zlraqk2p0z8dv2xgsz0x9v8l3vcvf51fzj0v8b45j2d3";
+    sha256 = "1i0n071hiqxw1gisngw2jln3kcp9sh47n6fj5hdwqrvp7w20zwy0";
   };
 
   patches = lib.optionals enableFan [

From e948a6d1f9da64302804e9b5d196be9db7eb714b Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Wed, 28 Dec 2016 16:52:42 -0200
Subject: [PATCH 0309/1310] freeorion: 0.4.5 -> 0.4.6

---
 pkgs/games/freeorion/92455f9.patch    | 19 -------------------
 pkgs/games/freeorion/default.nix      | 11 ++++++-----
 pkgs/games/freeorion/fix_rpaths.patch | 11 +++++++++++
 3 files changed, 17 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/games/freeorion/92455f9.patch
 create mode 100644 pkgs/games/freeorion/fix_rpaths.patch

diff --git a/pkgs/games/freeorion/92455f9.patch b/pkgs/games/freeorion/92455f9.patch
deleted file mode 100644
index e40ee78de6d..00000000000
--- a/pkgs/games/freeorion/92455f9.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur GG/src/Font.cpp
---- /GG/src/Font.cpp
-+++ /GG/src/Font.cpp
-@@ -1586,8 +1586,13 @@
-     using boost::lexical_cast;
-     FT_UInt index = FT_Get_Char_Index(face, ch);
-     if (index) {
--        if (FT_Load_Glyph(face, index, FT_LOAD_DEFAULT))
--            ThrowBadGlyph("GG::Font::GetGlyphBitmap : Freetype could not load the glyph for character '%1%'", ch);
-+        if (FT_Load_Glyph(face, index, FT_LOAD_DEFAULT)) {
-+            // loading of a glpyh failed so we replace it with
-+            // the 'Replacement Character' at codepoint 0xFFFD
-+            FT_UInt tmp_index = FT_Get_Char_Index(face, 0xFFFD);
-+            if (FT_Load_Glyph(face, tmp_index, FT_LOAD_DEFAULT))
-+                ThrowBadGlyph("GG::Font::GetGlyphBitmap : Freetype could not load the glyph for character '%1%'", ch);
-+        }
- 
-         FT_GlyphSlot glyph = face->glyph;
- 
diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix
index e143b6ebcf3..91d4db32b68 100644
--- a/pkgs/games/freeorion/default.nix
+++ b/pkgs/games/freeorion/default.nix
@@ -2,18 +2,19 @@
 , libxslt, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.5";
+  version = "0.4.6";
   name = "freeorion-${version}";
 
   src = fetchurl {
-    url = "https://github.com/freeorion/freeorion/releases/download/v0.4.5/FreeOrion_v0.4.5_2015-09-01.f203162_Source.tar.gz";
-    sha256 = "3b99b92eeac72bd059566dbabfab54368989ba83f72e769bc94eb8dd4fe414c0";
+    url = "https://github.com/freeorion/freeorion/releases/download/v0.4.6/FreeOrion_v0.4.6_2016-09-16.49f9123_Source.tar.gz";
+    sha256 = "04g3x1cymf7mnmc2f5mm3c2r5izjmy7z3pvk2ykzz8f8b2kz6gry";
   };
 
   buildInputs = [ cmake boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg mesa glew doxygen makeWrapper ];
 
-  # cherry pick for acceptable performance https://github.com/freeorion/freeorion/commit/92455f97c28055e296718230d2e3744eccd738ec
-  patches = [ ./92455f9.patch ];
+  patches = [
+    ./fix_rpaths.patch
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/games/freeorion/fix_rpaths.patch b/pkgs/games/freeorion/fix_rpaths.patch
new file mode 100644
index 00000000000..f53e9821e5d
--- /dev/null
+++ b/pkgs/games/freeorion/fix_rpaths.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,7 +46,7 @@
+     set(FreeOrion_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/freeorion")
+ endif()
+ 
+-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${FreeOrion_INSTALL_LIBDIR}")
++set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}/freeorion")
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 
+ if (WIN32)

From 373fb99e982f7f02c502e7fcb25584a5628e1fde Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 25 Dec 2016 16:52:20 +0900
Subject: [PATCH 0310/1310] thunderbird-bin: 45.5.1 -> 45.6.0

---
 .../mailreaders/thunderbird-bin/sources.nix   | 466 +++++++++---------
 1 file changed, 233 insertions(+), 233 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 79b5f7b737f..5d385eeb950 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -1,585 +1,585 @@
 {
-  version = "45.5.1";
+  version = "45.6.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ar/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ar/thunderbird-45.6.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "b5760210c14df4648d6bbd48136dbb3221c682ecebb649be848f8fbecf89d2251630c8d8208438f0ab66b73964bbdf8e05035bb88f0c773ea253cab163b569b1";
+      sha512 = "7a2976d272ecc0a3727e34b0841865fea6de9f05195089aa912831836c6f74b9fd34de0ed327cf96cf5b8c0e39829e2db5dd364a92e4ffc48e7139a0fd9cf066";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ast/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ast/thunderbird-45.6.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "64028617fe76832663fd69e2305ca84dfd576507348dcffc680d94d6d1de640fdd13874a73638767d3aedd2c84d38fd370e57ba3f95281a0fc0ad9d21b4d727d";
+      sha512 = "fcb1efd553617825e5ca55afe56a6e36cd8a0c067f4e851c6527058fe1b8169da2e548932e21bc7a52eacec9fa2c55b0cc1369a850a9927ba6c686ed6f5940e6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/be/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/be/thunderbird-45.6.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "932f0dbe85e6cf43c70ea6f9537785322bc5280106c97b4e21ea828ebc5d997d027c260f4e1b4441909c3a3b7e61f51b95167cf6a632bce98fd2b6aa33eb413d";
+      sha512 = "7ca8e07771a984510f2114bcf58397e49e6d64013dfba94e3312ad926e05afb01dc5beced22e5c00f0e43d742752f8a96b5ef167f4d892a01fbaedc194b76d49";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/bg/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/bg/thunderbird-45.6.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "359973dc382c7565623f63ede93e37b1d1a2bbcf9690710e05fc066a8c7f67b059b9d14c978c93741d65544029e5970f520d7a64dd07902d89f0331b9a3330f3";
+      sha512 = "fe717fc5590f420e13a0c8bedba031b8ed5e2379ddf613fc14d82f718afe9341d953baf4f056fca88366248a5f3777cbcc3c12e5bccc33ac07698d3de8306370";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/bn-BD/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/bn-BD/thunderbird-45.6.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "f2d5b0c3fadb19d89733feecb50a7507b1c29dd93b5064a0db95292be1635c29bb3d98b84fb29ac38224c97dc7af29ff6024652562273eeca2a6ee38a0d19de3";
+      sha512 = "9e87ff7976eed19137767b0e9ee2b43b41701edc060201da8d54c68d40f26d88f07c3972d59d59e74191bf30163eec642d6b72f7e633fe48d5cc34f1624d7983";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/br/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/br/thunderbird-45.6.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "3d1aba23ef4d969548b2fa729ad1795496f7123b4437f7692bfcbda4c87b0bd7edd1caf00cdb207eb4aaaf6c8ec8d0554d553a7db5a85e1e24d07c401d507794";
+      sha512 = "2c829c85255d15aa6ad9a941404290a546dbe7522877bfc0b9869415e6f806f853252bb646650d8a9f9729cfd139121dceafc4c1c052030ff7ff7b17e9cef4c3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ca/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ca/thunderbird-45.6.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "a1c04f9846edba32587b1f62379e703a62af0b9886f1e56e86854629a034657d86a4f06ace3bca9f75a21c734b559f17522692e4c90607ab353669bfe02a3dc4";
+      sha512 = "452f701dd496fe6da40372188f7db2628cbe9b7db737b167d052a4dd75c668fb2505e68b6ec299b8a9d0e4cb448a57f8805aabd0d898e21cb67e89eba0163014";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/cs/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/cs/thunderbird-45.6.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "f93ab27ec7e126aa309ba4d6d5900be7c427a29ccbbe141cd4e7f211daaeca6459163711204f02fafda285020173417d89a9c46f593114c81b73ce430a2c7743";
+      sha512 = "2574febad30bf072d7a0674ff821ca35845d6a5fda09cfce9cff18960af210ded42370bd148324e3599b14977cea770e59e8425c1bf0e6a52824c52f0a864457";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/cy/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/cy/thunderbird-45.6.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "9166a6c737dde179411e1a0d509141f29c7df7e3fe7e4f6def229be08bba4ccf5963804a86490d08e5ae3dd602f246c2fdce717562616445257b81b8c17ee795";
+      sha512 = "f07456acf596b6e3e98586177ebe41cdc09a7476c465371153062b394f0e89a0bf17ead255375cd0616c2db063dce3ac9aeba8d29f7e5906fc1c323000b49f22";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/da/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/da/thunderbird-45.6.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "6965968613889d69182ddf3dadf7e109e958d7561cb2b1a3936d9302b725d9c59c8cb8730ecf62e422a38c108da2ffa6ae5b012df348dd9250047a15b046e760";
+      sha512 = "7bda2aeb26814fc9b2b1afb4470ec17f0b069b779e99ddd3ee423ac3776ca47d23223009cd35d2f6e495e7b5523787a228fa55db6e56f0c724b45e5ba2bac9d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/de/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/de/thunderbird-45.6.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "2a33d8104e1149181e91e9588a4236b481a8837835af2a1b08f3cc2dd55eecb3059aafbabccae8b0dbb8cfc632bdc8fc6198bb600b60a9dbff5a96a8609699d1";
+      sha512 = "7a9c629f957c74e54c2e82912836fc1f2688f37ceee43a31b29d1d4b9b2c477e7ebff3f4b4969386e7aee458215f22a76ede4abba9138fd8d64411a0bd7103d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/dsb/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/dsb/thunderbird-45.6.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "91314f8c8c7a9e1d13f618a1b71df8141933e6fe5f3317da06ac84ce1ea269bfe0740d94b2d8e240005a315a469cab39e79f70c06169712fdf318c9b3b5ac9c8";
+      sha512 = "666a64764cbd0f216f9b960f78b1e45d63c008332efd93b9e233842f37478d9c0f2d1faac494a5b28d43ff21a9e01059fa8b46554d05f47d919483b6d63befab";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/el/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/el/thunderbird-45.6.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "601ed7cd8f6f1e867647036ab3f8fadca0507f4441998ac29dfd15a6c8cf0c65b94cd647b0b4602d7624f041a8fd14a8210fde26a7c09763746d31008699e0d3";
+      sha512 = "02a7f06adfb93ee1694e0389e01b6bd2fe51e5e2379cf3c0fd34b8c7c8d7f58a848679fae19a7cea851bbfcf96fae493a020701841b2753678a142e3925b56e8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/en-GB/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/en-GB/thunderbird-45.6.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "07222127e045d41f912baa160b08e22a373ba605f857d001c92792ebbcf789e1094c68e0f16bf9c609fda0321ee0a0f702c7d47481f4da6a9cb80071b7e21095";
+      sha512 = "1e45378d32c04db6b802480e245663f3c4522105da6c548d6ff1e5eebead55f53322909b87ecf0b97b85fab30b684ef8e9f3c0175a033824bccadffbb42cad7f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/en-US/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/en-US/thunderbird-45.6.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "3dfeaa5e64b4063e0b5ae552bc47db1ab06e4381c55ccd35b05766aeac5add880804f07a40d39db08395a467ffa96d67261971359c46bce8d9ec6adde5948f2a";
+      sha512 = "ab06b894f881ebc847cdcc11ffabcf7d9b626da9ce17c4195e7c401963bb3937b8a05eb73ea2fb988662f318568af3ad7142d3fc556cfe139d4393249c353446";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/es-AR/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/es-AR/thunderbird-45.6.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "087caecb722222c3950c8a644cf7af37cd356b62b4802fcac1a4b93620fa086e2b3e97a6c5f6b22aa61d3478dad41bc7b8ab39d31bf76b710f2e53b36cea2049";
+      sha512 = "07be1c0f88aa49a8264bfccbc6db3e738dcde83d93f86939bf3ffb5f85c835252f2f4a74a8cb3eb5d2ea6a1b4af31d3d84418090a23be36aa11965cd4ed67b66";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/es-ES/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/es-ES/thunderbird-45.6.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "f335002365f68e28cf0e28c407843f8de3184b33a7e57638104d1ac3515cfcbd14842ecc6d61a7de012e2cb1d7c5ff170598b5f81dbcbb71b81549f6a8bb5531";
+      sha512 = "2c51ff6931dea175ad6d8eb64c768792f61bef1cb5762efa3e7261cbf14c7619c81ef44a8d6e1ebe7d9764d2608b85e6ddbe47ec437f500c65037d6be8341d88";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/et/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/et/thunderbird-45.6.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "555874dfde25076892647a451bd9e02879eb5c8584dd22d5bb73f9c5deab5f64103d80c57292ed6a04b73fe27aa28d78210a1a5da7147fdae0980faaa8d19641";
+      sha512 = "e726a397cecb1d624fef5840b89a177591c8a10d397042b2c5f47574d9b88d0725a1b53999e2d268a67c4efd1b4551ffa2052398c1ad14903a8b0217b5b353bc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/eu/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/eu/thunderbird-45.6.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "5f4361f43bca179613f24045835fe31e17fe949da0e2f9e470635d714f521abac45d0104e663ab44806a7e45f4d44d515b002508e8388c2c72e0b91c793ec8bf";
+      sha512 = "85c2fdc7e27a8298d8e553f221595ae0d7872eae4e78d143d533a18582d8f40195db38f179aa2ed558e790fb7c58510a8ad6037c698ab149d3bd582e34528e5c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fi/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fi/thunderbird-45.6.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "5ee311ba705cdfd7a6687a1a17e7c5b40fda22fa7acb3a9a0c236e2aa3d8037bbf568d9be29853abf3d52d6840ea96b7ee59cf9264709973aee3bc43e8c07979";
+      sha512 = "ad4516f11670424d31e7fc5c9b12bcf1f0c63110b81ab45a3c5b5a897e1d0a3ce1855117254902ca177a04fc422c193c742098a431dbd8b760bdefe1d7c4c6a3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fr/thunderbird-45.6.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "ffa44a92d3ab3ac8bcdd945b910e6da6a4c0b05f4c95572fd2a56fe73f935f7a387fb98100c7a84e4adc22c9b1cf8a0aa84ac04eb14c4b60b7989053c2021a0a";
+      sha512 = "4abb3fd8430867262811a4aa56304666ad6a1336959afff73fcdc38f157505975d6c340219db4980157f38dcb4b2596cdf623f311f6fbd29e613a89bed35beca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fy-NL/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fy-NL/thunderbird-45.6.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "3cf5e391adca05195ea24be90a2414640f0fd72ffc858e971fc82675f49def7238c30f3ac48c08312414f436f9bde0ac2b05e11db94b40079c9d37f3d1a8ac5c";
+      sha512 = "dddab8f7453bfc074f3cd8d6aea33402f66be1bec08ea7c152873af63c802e03edf01e74db236dac6e088f836f188258d3dc62fefa833ffc525ca15b71cfbf21";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ga-IE/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ga-IE/thunderbird-45.6.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "4260f3a7245d8c7f0b6f3a0a47793c84eb83be44e19105a3efbc35ef1a1455f872a987c714eb95a1cfd4157816cd9eb09c5a6098460e90584e9d630812d66716";
+      sha512 = "66acfc92a997ef6a2f1dfdf6a6952eebd7788b14d3080867349619b3f9559bbac4cfe6e983ad87900e089a0cb15dab2b9f77dcac69adb66ef0f97f9b5cc4e809";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/gd/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/gd/thunderbird-45.6.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "b9ce9839cd3a4e8fbbba4f107a934ab4733b1feb65dd1e40a1c064f39026d03d1208b67b413ed4c643c7039f91e1ceb8747f3a46cc44d1bedb22275512f867b8";
+      sha512 = "e4d2fefb8e7c0c14395af7f695e216f6fdb685ca150cb803a347228aaea988169a7093747e770921716123a9333bbc00560e6324ff2f4f966cd895c2fbe6e21d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/gl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/gl/thunderbird-45.6.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "fbd8a4eae6a94d966f8e1e9e2bcc7a6aed8b5a9991fc8367de28c11fc7b341fcf745c983f8259b89767a762604e55ade6212f5c1496dbf843c8eb49f89e8810c";
+      sha512 = "6cc628399fa0adce0fe740e77a8e708988f7dee4d004bcb785fe567ca680fca79fde756e479cab9017828cebe48fa091e402d52d6bed54aae9cc5b6e28f246d8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/he/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/he/thunderbird-45.6.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "51f3acbaf8971bd0bc93502605526f6d0be5093810f8a91f43c2597541dc23eb590a10b4f2839cd9ce1e13685fc7e38668184b12a23ae99356ffacf3f6481d83";
+      sha512 = "82bbf5a5fe84953d9118948fe3e9d4d6a46ceaafe42f76ea3dda36134458d30f0c73f2ab61682d2627b8c3d598d2174d549d8b4b80bf5c3071627b57b713329a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hr/thunderbird-45.6.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "65110b98cea4a6174dd31de4aea53d2efb1fee822025f9a7ccd6ef3ac80c0baa605fefd7078c3528451ffad7d9e86400c5b7b527b026aaca022a0099673442af";
+      sha512 = "c70dcfc8506132ce0764de325c8e0debafdc8460052bfa4901172f880b935d1c0bd70b1f7d227604f6bfd155c2ff165c1ad7a5b509d512483b54eff80e910a1a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hsb/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hsb/thunderbird-45.6.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "d50057bc3cdff3820f0bc09679f672d14a35240fc3e997836f9c04bd8aa922e41b627e0f632c2e76982439d4510262618d7d59adaa530708cadaf1fb111159e3";
+      sha512 = "5baeaa2ae960514551d062979cd60644971b6603ab33b9773a3eff10e267f0029b2edd5d48734dfcf99697ec77c88e12f4f240ea18a7433a0a2eb07f70283389";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hu/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hu/thunderbird-45.6.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "bbff40d50155756c0d06fc4c9f7bf31f770901139b0a8d475ee0d8bd7ff1b2d4e8f5f3343fffd7af83f5f53f0567845f6c7ddde8abbd3f9f004c31a1479ec4ed";
+      sha512 = "bbba8bfef9168efcf0aca6fa98596b3d7bbfaf456ceca263825d2f96b054d6dbc672e1086db645a48966f82cd0d6f4c85e9846935dc7b2595faeefa81c66904f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hy-AM/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hy-AM/thunderbird-45.6.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "570815807b0ea61bcf506effb2acc52ee6e8089b1328a046a8c55de0e3e72227a2d097ffe61f383733ca6f11405e5689595bc31f931f41e854f71770e18230de";
+      sha512 = "b58088defd9a2f76aa779bf080135a5735e1531de065b1a3ac6f9048266e763bee8a22be634f435584d308aa5a532b72687bbddc8f7dedaca39642ed04137bfa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/id/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/id/thunderbird-45.6.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "ac9a78df1a8c6228560247e07cd7695eedf9ef0afd2c25a770aaffc8d96555f229e9332204e73ba803df2b8a7f590b970020b277123668ff20375608b093dc8c";
+      sha512 = "c83198b8ac60132f3124253c082ea0d5a45f1db7a7a6509ea18e3d084e26796364e6ced3c20675620cfc7f849b4e7fe342c86d0cea24eee48c815dc02730074f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/is/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/is/thunderbird-45.6.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "cb78e3c2e1824d1da479e8ca5cdbdf420f7e046895a60b8912d44cbecf6966a32acbe2811545961a6da72f22052d8d2bed8d8ee1208b9c4e16250e6900265335";
+      sha512 = "285427b6f53c181889b78d005071f71211a2a51b6fa5f3eaf5a573a4a5e15cd83d946b97f3da89d383fd797a6985f8c1d589fe40e1267a73224848080af9b79c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/it/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/it/thunderbird-45.6.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "84c053e27ecd67a15d84bb2c222ed97061c130fde590db558c7f5919dd8acc8bcc5f032f84c53fe364f95607aa04bcf43375d2cc9fac2d4990535aa38d939793";
+      sha512 = "5e763b01fce3bb3ce5deaea0d3e4bb51b5cd752ab5fa191a064400f7961d237924b98013179f0d32017bc527478d665d6fbc74482680aaf041444d3c376497ae";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ja/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ja/thunderbird-45.6.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "dada1c9e859b27a1bad7ba277749e77d68a20ad4c033861ee5ec54f78627efcaf336d082b1a8f9e4dfc91f6b16adde3eda873ae261351c3292c73c7f7ff05526";
+      sha512 = "7dd7b1f9fcfe103d8b70587e2a8307bec93766b504390ee138cab52bb8b8f76759af84568eccc71e5a88ee8cf3e326313930760cc92267ecf7e0fb29fc09f8e8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ko/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ko/thunderbird-45.6.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "3eead074a7c82570db1923b8a64afdd8d8d802d33c4087c8b647f905f580d27ede2913e1323b98c46fdeb83a91db1a43dd155d013d3f42b54a7daac1d541b449";
+      sha512 = "1776ae557e7f7d6df013d178a68f969aee4da9de6049f0055e290a808da61af4bd712d7915ac05a04c159db93fab7d994bd0317a471dc0498c2b5c0b8696cf71";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/lt/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/lt/thunderbird-45.6.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "2926b5ec95101dc682723a3157de86fcfd9974a7a74486c1d80481145feeb49264bc661621fed4739238e852ca2759dda155a2c22094da90c6d5dcf43107b3d4";
+      sha512 = "499a710619b3e9f86fe7e77e35ddbfece5609af92d79b50b697ea8539cd0b198ec88702a7c19a9169cdb2b1dead19fe786d0af16bc6fe2b9f3e0414780a1e1e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nb-NO/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nb-NO/thunderbird-45.6.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "cde8fcd4b1cd8202085aa7a04b5781cd561a2d2ad3e1551af420397816addee8d57f4c49036ba79e49bd6f4452107cf8f3acc7c238beca5814ac5522aff2195d";
+      sha512 = "d97a5f532a000f3cf44e1b741a3a7026d07bf2c6012b4f6361021b81058aa93876304014d3d8d7181695c526cfd887523e217b7b502c493f5327bb4ba4d00461";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nl/thunderbird-45.6.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "a78658fcd3cd6c9cf5c775d37e5ebb38f72e0317e30abf7dcbd57c0f400355bbe242ae4ae9862eeeccdfe0fe2cdfe6c6b1c06b8bda3010e941041bdeb6a51fab";
+      sha512 = "06df0ab52f6a9916bef1605283c7669a1afbe5ce7f6bed5746673ad5ad222034333bb41a6a1d81e87165105e3493d095bc90c5a910cb48041042367972dd9d61";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nn-NO/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nn-NO/thunderbird-45.6.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "e76bbf55d900e8c7c92e3ad130e58c061685f2abeb2f3ced71e52c36bd0d979eca58cc3a74daa394469281011e7339c15b423847bc43631bd6b3da7f1d4aecd5";
+      sha512 = "3509fbcb2955b226d869e43812665c7d2752956f68cff8cd4df3dbb3d0bda2b060218ede3eb9fdae285ed6765ce89c720793f905e09a97d6d22c2e36db890261";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pa-IN/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pa-IN/thunderbird-45.6.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "0de6495b746c39e5117f5662b4896b206cb7a4f22a8a8c4f6c080f434b856fdf1f4029c7b8aa9a3372b6bd66d883c26ec82dc2aa17ce89005f462d58b6e3ecea";
+      sha512 = "b113f1134df372dd4d369eb9d4c9c30dfe15fc8d65c153ca2087a6ce3ade368554ea2e9561b7d4642f7ec52247071bb323649e884ebd89b8472bc046c1e3be5e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pl/thunderbird-45.6.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "4179561c6fdb2b48a0ab87ac6d823b702181b18c3ca7f28f28a546cd7bbd7453a525e80600a5cebd89912fd69b78d768e136bf12398e5b0471a6fac310fafbe9";
+      sha512 = "4ea27afc66451ba40c8cfa22930598925dc18b4b074ab190d8c8866d0f516e9887e8c006ec1564b490a79f67b0b2c88d3fdfa616727e36bf705d780af82a27f3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pt-BR/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pt-BR/thunderbird-45.6.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "ed1c438050b3e0a22d61f39b9771f22e2425a9b7cca1fc9ae41606f708b32354f5cfe7321f87f3a77dd50270a7e38554215c6f8fbaa0ffbbc1a1c7f01c8c4c6c";
+      sha512 = "263ac30d26e20733eb332c6ae6837e3ebe7b8c41ff1cc15e47951f22e89873a620218e9caa2a3cfb74a93e619575a4812b362d4908372fd3ce05406d7ef295d5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pt-PT/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pt-PT/thunderbird-45.6.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "07b00355b73786d61dfa2cf1752fe42f8c464291f77f8192117414b66ef5f3c627064a608abb18c6938c8a2b1e4dfe223ebeb4f1c4590bb8c80dadb0b77841d7";
+      sha512 = "90ed68c12871e11165f9357a1e836fe8cf872bf654303c07e26f1bf30979d756e9fe6f034b4265d8f22fe8d31853ba76a983a8c7fe3759d7793f904f8cd0f788";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/rm/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/rm/thunderbird-45.6.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "b95336e5ae9bf794e35dcf58fb8b4c17c4b4e58b4fd8552d708f15e6d9518640f42599350fcb6f140bac57e7d54d49946ab5c910ed67ac453b0c1c3150a195ed";
+      sha512 = "ba6aa5a07a06e57a4241f1e9962f4a28b4221032b8b3220cbfec2f3675f808367c586da0fba987e7d1309bb3bcc4d2ed48ea8ef98a6f4a3e65d4fd9fe06c527d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ro/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ro/thunderbird-45.6.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "8a613cf9fbf8a96ee2b3a6610ad2638f388530601cb7af4bf9c44f73e92f21e97ea3a147887ebcb5080570bf6f7d9c0965e834eec011c646fc57100d8fcb7df1";
+      sha512 = "caeecf69a9da3dfeb2c3ef8b0d8733e81e32ac201c0c5b60206160d47172863c91f2a0fddf3e7d2f707918934467c01a0dbbe1f63e3859a7106974b3a5f084a8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ru/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ru/thunderbird-45.6.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "e74578096eca86f68e993f620eaf66f220cc577522e73592092b6c63657640cea95d0b41ea035d505580aee258629e2f36e2abca9952372d102bcb0136e995d8";
+      sha512 = "22727502ca4dec94470a71456c19ffd7f01b75118480ae67ed4849510bf77c8ec1359ddb0233e41c1b1dbad219ad5111d0b11c6c7ae7258ec10167f27b08f197";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/si/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/si/thunderbird-45.6.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "00666797cc9b4ba2b3ec7c9914639ef5fda3df3c124aaa3255b37f721289f1b2e33a99e6e68d40a66daf96860b21c6af10a68a216b6e3a35d8261ba704be7081";
+      sha512 = "b872fb53f0380f77dd4dd87ccde7151db206adaa81801aa907db398df1a51bf3ae65510c452b035cf71c9000dd949106c9d64f44cbde7f1419cc41e403ac6d29";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sk/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sk/thunderbird-45.6.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "5ce7dbdf5f9ac2b46c1a27aace9607011dd064de64a778ae39009d9ae6d729da903f5a3c09def1ad7d571a8b717a3f66889053abb38eddfe4146b04597fc2a0c";
+      sha512 = "32b1e962e7e4e6aa8d198e080a09b43d21cb307bb8a3af50fc7170748604ce3b6f96b5f59b56b5c0edd61f7af31ccec9446aac50ef9eb94e5ef7a48c71e99541";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sl/thunderbird-45.6.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "673413e23de2de7daa9c4230105c6e58f21d4ebfc55b1df58c0351448d2f252e128c03ee59ba43525d6c92e2578af4c073e08f6250b4c94bb42beba81ae20f7a";
+      sha512 = "c9192435795c677aae642884e773362d17e5afd8e5943e2759d1486e4ca5bddb35be3c99a4b6869aa7018db4bffa09f0b63e500eb26a00cd35c141543eec0a00";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sq/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sq/thunderbird-45.6.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "aa560ee3859d3bed0c5d5c4203b05ff47f7357b674c9d4ddad403a5f0c403994ecb982ca15b542ec9a32d0f27a5e04f41c574a1cbdc5f056c8a57e62de778f7b";
+      sha512 = "2150abcdded45107ce54ee58f55bbb78f9fdd0fae143fe423e14f4debfa4819c23b021c8d4d36dfe606e206d3dc3deda0671cd08f6d82f7ceca7e7591e7df3a6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sr/thunderbird-45.6.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "5a86b2a9c67d489b21077eda647585291ddea2ea98d678b60fda134e11ee074ee39b06f84d3263d04b43358a10c04d4b238a65e9e3015801847e319850643bd3";
+      sha512 = "a9bdf3062d72095d080ad309f25bb8aa27635d3497fd99e6982ae3ba635f61c97e66fe9aefb88466f6f22c6e691692d70abe00c10294353d88fc288111dad6f1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sv-SE/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sv-SE/thunderbird-45.6.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "5d044f32243d99ffa8ab0b7345b0ea1a78d83cf6a921af0e89154c4f9f7caa21260f1e3c2c8287050dc44381f2979af51ab028efca7d197310d175dc86aecfcc";
+      sha512 = "4353836558baf234d4dd3376a6262ac0af576f16d725c71ec5eb994a72599e748d2334cb916a3050db8f719aa68f2f9d7204aaa4a41ff9da339db933fb64d496";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ta-LK/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ta-LK/thunderbird-45.6.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "e8f88dbf82414cf680d9748c606ef73fef11a37bafd82a3cd79b5c5abebedf629993e7ecb3e3d6dcd3524fbda10b8b0af743e2948ac49141c76d008432706c4f";
+      sha512 = "9f4c8192c6d683325efcfed3d5ccea7218e2eaf3193ccde00be8542f13e8b3771d2a3690ff212cabaef067452f72061fb47a8184ef16fdf59d687e3b760126a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/tr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/tr/thunderbird-45.6.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "cc5c84cd0854c0626e6c880e1abf4090f5488c84f39f52d466f2deb871ed55ad9890bf9f4a104c182ec292979eda56e4de114d328deddac5746ec9e969b6ecc6";
+      sha512 = "12f567a390f44a79af8615f677b87164d74172f7540ebe6d08023e017576493b0da5a63c466ffc2c3a4c406b0d9e8753e00aaa45dd1acb751621cbb8d9e53415";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/uk/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/uk/thunderbird-45.6.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "42e535767e82c01868d2cd574805c814e7d67caaab9e531d0b82d36df92a2e42e19d8d6593b28c237b645e60035100d85a54b8acaba8c7a48ef83e865553cfc8";
+      sha512 = "844e7ee825d304ae19edfbd4c324ba11c2037c9a97fc96f8b99da7fc3ad0137d3106069fdfb06814d2df20a75c6051416b52448ec56980858c70110676294f90";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/vi/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/vi/thunderbird-45.6.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "9a5b7cae14bcb8e390f7c8b7924a107058dc382e2627984f8c9eb5f380eb1d38b1152c928a5852d387d5d2b7ef7aa0d7393176a03dec0d3f1c1fade399149b7d";
+      sha512 = "35c0fee2083c922284fc11a048150d53a343fe7980160d2c4cf2046e588056457b4e5876dfceb51b79a828886d9671a1934d51079c6d1e64e9af979927d9d8db";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/zh-CN/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/zh-CN/thunderbird-45.6.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "d025a3d878c6bf3ae9c1d07c023d89fc83b1c1314179f986fdac46066d334e209689d662bc7fef0fb7bfd7943cc741db5f397188b258ab42247a85c559ac27d7";
+      sha512 = "039cb44b4e07fdaf6d9b1eb717baf798b3f3a3cf8726ce97b4fa7ab7e938b9365158597747e406916ae35150c9cf96af74590c5189a64ddfbf65740c1cd45c5c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/zh-TW/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/zh-TW/thunderbird-45.6.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "6c750b1f7f1253f1702178cdc80a1f8962961e16fd1f2e3f2f9d91062785349183e52799a399e60dcf7a3b7208a0755c3d7c137c28ee0b6ac99ccfa75e63b60f";
+      sha512 = "4721eed25de2cc71728d7cee651fdf51ef5b791873a3e59df2720c0f46269bf375e0e9456024ca4ec9ca31f8178b5af704e2fa9cb057860fa46b72ff4b22970c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ar/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ar/thunderbird-45.6.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "a2495d8d9a56104b5c5d87e795689d0334563fdb98fa751a2d7bedc9993ba66d3b1cfdc9d0d3711b8c8a2f91d8267c97035d1120051baa4aefcba1b968b9edc8";
+      sha512 = "e149770dd3229d3a00e56cd34848afbb1ff6765e66da4fa449156dc58c6990bd35e442ea8c14cf90e63541a34fbcfec8d8714350186e863ded72391b60622c69";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ast/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ast/thunderbird-45.6.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "b1ccb4d51d9f5aec0cef3ccb0d5fcd14ca69a446cb18fc8b9f22d98325c0be45ea608f9c9ac15fb33e2b426b84c53e908a05331e360af728e088ad9c3cc77107";
+      sha512 = "3bf557b9e9ce9f4b84e3407dfed2fbaaa280893033d4bee0724543b6951e0533050b8feeb0a01b4693140815ced705a5ef16e800d149f967bb39329dcbecb5f7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/be/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/be/thunderbird-45.6.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "32d89785e95667d17b7b4d19d37557c7d592370e42613c8c171e1b816d38a16197fdf8397211f61a9261457ea426f6de84af721462e4296c825f931655e64e66";
+      sha512 = "ace07c8982b68ed259b344aab73790fc9f90f98f39b65a57c6be7463c3918d545c4a0a6ff6df5b8ef7b7b07ae44c7e69a1bfa84c7cc82b9dd62bba075a2a113c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/bg/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/bg/thunderbird-45.6.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b5d2ed68959cc6a473e83db35634c6322f4638edae1a19f81d5ae1ab0080aed0940b751e96d3d3a562aa1811ca3c5435f2f3b0a205948f06c2d479cd98109e88";
+      sha512 = "fed2ed25fe530939c4116daa3a3a09075812b005a937c36cab385bfb867d703a84feef50e2006f83009a25c0736c9b032c17605b2364d8fde4799d1e9f479b8c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/bn-BD/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/bn-BD/thunderbird-45.6.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "a76fb786e1cb0485b4e212097685fa259ff76386bce3cbbec1d47e061c7116df76adb8bf419e51ade098fdb9b55a7aad5348e13917104d22a0aa39518205ca47";
+      sha512 = "84190d0cc6884f14ccf4ce06dbd69193f90591becd5d8064ea89c7ec12ec411bf766bff1bc5d5c6f142fa53ed2b9ce494718f7d32a74a027819de32381b24526";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/br/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/br/thunderbird-45.6.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "51c1402350cec63a60f4ea96cdaedb1aa74250583a3cfed575060fb5990294446a8254108fcbd99607a286b8bde43357ccc8e0195330352d1497b8c173a7b283";
+      sha512 = "619857fadb8721ccf103a3739a1336e2cafbfa62a0a2ab074254481d50f0d301f7718d47b5a3d42922fa562f1382de2aa8b5256bc62d829400926a494bc19403";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ca/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ca/thunderbird-45.6.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "1df09781962fdfc7abc425f9f96d2efcc7471bb9bb8cf2c0152846673c7fbfc86b6b4c05d73d3c949607d056478661be0e0d24b769f816820d1e4670fdf240f7";
+      sha512 = "3314b1129be6ce854a6b028849167af5f93c289073f962f5de09eb37fc7a2c40eb75b8b361289c879c4b7f752170f05a01dc6ae996bba4a5b706c1deb037cfc4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/cs/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/cs/thunderbird-45.6.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "463f336f49ababdb13397a10db3b189e3d364b07f9f42a4d31e770edd846c56fdb81f79228ffa51ab7f6555818bc3a0a3e5f1e546727bb3cd81f95f2264c392d";
+      sha512 = "07d21c5f4aef38b9f7b330bf0c06f10ba3fc7cfeedcdd45e45ffb9ad4e5b1f729cb5d249028a87a8ce122da96c240447a6eed4be2220e302a2c55ac39cb1628a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/cy/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/cy/thunderbird-45.6.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "8a4802763162dd32577e02f878482094b3bae4c51b9ac7c109d188c8b5ab9fd0053c34eb2fabaed873e0ba9e7f5fac2ebe6604a0da00b806594e28fd0f823721";
+      sha512 = "b2f86ed9ebfd8124611f6d9e20cf36322e36cecc2fea688649b9f6df231d65ed4cad192e12b7a27367b3b7706e510c5547c5bb22aedab76d420540cea9b81ee5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/da/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/da/thunderbird-45.6.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "bc430839b463ee22e4d1736be48f8f9e958307c3069b337b0ad816e3f88274b22b98ce66fec267f4ed134750fed656b1ebad0bce29637594d053bd82d1be3d34";
+      sha512 = "00ef125afcb33ebd5f11b765c9c3ea9e3e240e3416d00012cbf1b82377f8d610ab2b4aac800d7a0ae0f443447840b35d92e58600d83dfb6c6dd76e8ecabd3924";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/de/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/de/thunderbird-45.6.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "0a9ac8af9a823d69c8b2671f24bb203239a888d1423656241926dc5fa978e989ca5df303211e4a5208624d01ba34dd93915463eb88b0ee8ed027dad592a057c0";
+      sha512 = "05e1cae57b9a2e2fb274c2efc130e596c5f6c35ce14055156f728a662e9f8f5423a42708629726e0a70e3420aeb1d9b3b224c019cbbaa6f4a0cee69f78c740ac";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/dsb/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/dsb/thunderbird-45.6.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "9f089cc93ed4660250ebb0d4c677d36515d9dbf29f78947c88558c69362663fffff293fbb3acaf4fca2e40a88d093d7637e385db757812cad29c31b6b746e87c";
+      sha512 = "dd0dadb02dd11dc9c39c6aa67eb995b786fdec47e966cb79177bde56400300b214ba90509a50ad839b36908da18829eb02431a4e1cae3e878dcb3debed258bc1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/el/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/el/thunderbird-45.6.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "1099c8443c089ac7f430023960802ab2ce914f103983d68dd283f0f1bb7d36ff8b35e44b7e766237cf19e9c6f02e5dbbab5f62e4cfdd8b80816d0892779732bd";
+      sha512 = "12fc5fe4fb9fcccc295cd05c46850dab1ebfa81e0fc1ea073c493ef7c8db73e2c96999e9b1a29cda8f8cfa5437920f8a6b88d3b6911fd88dfde2673563e2afc1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/en-GB/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/en-GB/thunderbird-45.6.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "1efadd60994808919b24214c1610dccda0a76bf0de6cf3518b6eb665d035272f1a2e5e4e9e09fc2d4eb5a7021bdfaf3c3391e166737824355bb859b1d3fa54b8";
+      sha512 = "0e195cd68923d8b8bedb4028d17b08d029eecc82d0b40de575b55d573dda6227684043cf50c959c790746a6b38089e02cc996cc8a23cb31011c6fe4c3fd2ae89";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/en-US/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/en-US/thunderbird-45.6.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "663ff453dfc556bd85633030e271174d96f039d8ea77bb1a338df02298feaea297ca7b4010d9c2973d19ba988b6e2b807486ca40f69bbfce84d0b7f8b21f7c32";
+      sha512 = "d3ceea1ef1e3562d682882b14f518f917143e4c4417ac07e8a474c52a57ccf0169fe1580355dcda0710e03c67b46eeb78fd59b31b831b8f431ef1a0cd9a37c2e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/es-AR/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/es-AR/thunderbird-45.6.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "34fbd5a614ef5a0b9c46b63c80292dfe7caf2f65758a52d130ad4567311cde3e84ca1ab41d5fa87509b5ad9c6ce4ab136a4c08f1977b3695e5471265a758bd7d";
+      sha512 = "19a3703f4f3fc5ce82ac8f69468fabb494ff663ed0b507af4a7cb74fcfefc5eb7e8090771392a800cbec88897c9c00315b457289eb1be860e1b47dff2f25a5d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/es-ES/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/es-ES/thunderbird-45.6.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "e429e936f7d022b421c995ea8df18d72a3abf8a9dd2a0a6ae87435333c94a8abdcfa3c2416e36f883b1d2b5f573a17d8a38161fed5ff323767fc25756dc72d69";
+      sha512 = "706987651522f9c843c8771a4e58c474661da8a45104e1dfdd1b72be74c3a43d9eaaf4f9eb3661718c4237515afc90272c535579d0db1fa3715a29d03bef36af";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/et/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/et/thunderbird-45.6.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "3ec9056dc49cbc6b7734498ab5522fef93eeb6f08668cd04bb610bf0d2519759c614de07562706a3efc2b5e64325a70c04b18fb3138c2ce3cabe6ba1a51bdde5";
+      sha512 = "3ec0d0fa4ab85a3ce958b8c637e4d208f803e861f3b544d3f15a79ac1e1704efa963eb127f1687cbe5f4e75926bf1731bd9fd781a6e7fdda07035766eba8d39d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/eu/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/eu/thunderbird-45.6.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "951a9fcb82f77cb45a5ccaf300d0516da7d1be069931fde87e729b9c9d99a0a07ee810a4bf4791698741ff52128f66d6ecc3d8c7887cf22462006929c582cacf";
+      sha512 = "54eaeebfce0f0c805954be911c3ac666993d9bf927ccdb01ce0f322524451523ccb7d6d8fee473eebd9cac14d6653655de8f0e6861f8d4fb0953658cd808b74e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fi/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fi/thunderbird-45.6.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "e28371194085e689d6445ce3a0de77c7b8127aeb740769ff2aaa8f0345cfbc7b3e8ad5f2d891c8ca34c2fa004cfcaace649b900248493e5c6ac4404b6f581e19";
+      sha512 = "51d09e9b7ecbf4891ceee5fde9fe00ce2ac9cbf4a2fc0a3f1433e7004677d6fc35067734c3f0506362b346953423f71844937c1187db9194ebe952adad1abef6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fr/thunderbird-45.6.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "f135ff1b365df65cc9fab35941628be6f6264d2c91d8394d22fc35e945207640c8238cf2e0046598348d7521c1684eccdae0d7f0dc2bb22f415a862cad72d67a";
+      sha512 = "0c3b9635cf107cdfb91c4cdc4771c25b112fd7d87341c88259a5670c5fa716e105cb910b1b6b85d8c22d518abba5a538f87250c8bb34c71df4cb98bf7026f8be";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fy-NL/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fy-NL/thunderbird-45.6.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "c90579ec9607992f4e551d327a3122d6bfd87ef3f1fb4708579c1a07deb2270a252c7443f3a3551bb725ef46a8cd9fa61cf59910260f9775eb8805e5e8acd61e";
+      sha512 = "45adb1b96d4d57c5302ca373f193b5a7e0a9f8577fabcb37c184bc8aaa66cdd4b0136e810af0ca8f1a7727fd51d60ee1006f6dc3e5fd182ff45056fc923d7d13";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ga-IE/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ga-IE/thunderbird-45.6.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "a6a9f52acd576b615075f8829cff2ed085e7254e8a4a2380c0eb088cba1986ac81f9d0badecbf0ece1f7ba7b7b169c8cda23fb32a9e79fa78d29fe8c0cb4c8de";
+      sha512 = "4c3453566e747b57f94ef980a7d9b4d2a1c5b78584b0bcf1eea4d8c6b26ca177f18cf94811e5301a12e7de8939a11bbebe202683449b367f29a391a94d020cb1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/gd/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/gd/thunderbird-45.6.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "12edcfd67dbc5d093d1c22eb707668e4f534a6baf96986e436684c9271d165fb2f422a2e84ef35b72063f1a91100230c92df2b08aee428ea0b384d6658f6bcb3";
+      sha512 = "ba0f0ee9c8a2a64c414e1621c8d5ce47194ef144f026e3306cf2c81d214fd0e1df541fea11dfdc2de7629cdc8ba2a4aaccb16dc7cc0c3404925177b893ca5d73";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/gl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/gl/thunderbird-45.6.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "d357cc4f8a9ba8ff47458b03d17e4d10dc7be8bb16493ac3e896f63a3229962034012c7ecda4a70d4dd1d9c4aa76c349bf21725c6164fc96e6fc36f9b0fea9ea";
+      sha512 = "f1d948b366842bfc2fd349ccae3c6c9f586fd69e99f0a0f9804bf3bff25ce6262451513952ad30f128626bffd6f9719d377868fb7d2fa56d8b6f54b2f4751ea8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/he/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/he/thunderbird-45.6.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "440a86fb6a94657f05eda2bde2a2e74d17398468a0b603866a03a7f37458e69a921e81d2ac1af2718f1168a56ee03ad596c39e8d88c933576efecb99a724957e";
+      sha512 = "1e0f048b272b4927d19f66390577ae2a37a32dadc24e36a7cdfd48e4257db09f5433c2812429c1700a5fa1f3630deb3c43db316de921d8e9be58f41388d2502d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hr/thunderbird-45.6.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "1b5960e4df8a6247c63fb3f5e80b1795b4e098f446debd96b6344dbf97694337d6437dad53635fac57036ed6551b8a780ca4880dc35626aee83860a5934f3f9f";
+      sha512 = "a821b66d67f32c84d0bf4172fb82ee487c13703122821042b00739890777573288c31c5178f4dfb6fce587eb58a19eaccd6f23b4b8f3d851fc203293674fb510";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hsb/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hsb/thunderbird-45.6.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "bba6aa43cfee2422414c526f0c40fdc70984acb54e25e5eb75ef684e674b17a8dbf606e31d5d609bd572647ab3a9bbd78c76669156a1d2d4d45d8402650148b5";
+      sha512 = "c756ae475fc1964ae915a68313411ec8ab4a7d4744685de2ffeaaae33d58fcc08712657a2f030b1b358d02d9653c26478515ecbd915881e33cdaca9d9842fb38";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hu/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hu/thunderbird-45.6.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "026a686dbe81a4c52bd3997de66e0919ea870954a3d14c4483f5f76f618424013b82a2478ec9eb3f506a1f666ef3333832a3e4533adcce41901db79120d2a454";
+      sha512 = "d2f68c86f57fb9351c5c2ba74a8976bc89810634dbf5a521c34a553ccb6ff27eaf66fdc92e50c0f226246e9fc25316d4305feea1c3801513f418f58dff1955bd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hy-AM/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hy-AM/thunderbird-45.6.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "a798c9581cdb2debbe773ed952bbc56f7d7444eac5a448fce0f17ba2b260405526cdcec306c39c39b2e80ce7addba810bc659312505af8c0a928c8a2f8107245";
+      sha512 = "42ad523ad7f30638a69d8d549491af06ab9f740f8eb0b81e681236a09ce39de3758e2af61f2857293d085603f3530df3edaa23c19a014034528d3d130517fcef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/id/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/id/thunderbird-45.6.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "ce54045626941976435a94bc5cf7513b79bc4e3e6a3b03bf1036ce9433cc6042689735b95d60afc4bf1de2ea31fe0ebc55b856bb51f0ba468744931a8c0727fa";
+      sha512 = "42a023e474e440b8201dbe5caaa7354546f89d5e4e9fcd34152dae93349bab8872f6060e5029fa629fd9853999ecf08688e51a2d9a16400265bc5c61a9abf783";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/is/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/is/thunderbird-45.6.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "7e0a2c31968102010d1fba379a25c4bcbbf447f2a0005e01271faf1e19dc7e71a5f8cfcfbf36ed510743d53886864aa4164284e99f7ab86ac27629ffaca6000a";
+      sha512 = "6fe784f65ee584a1fb9fdc962be412e09ff43e88afa29365ddabf6a237ae7a1c854c05d5e3b3bbef83653fae94646c7a32144c2f7907304573b5f71e5f978ac9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/it/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/it/thunderbird-45.6.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "4852e13d1be422f107e18537bb364b04fb06fbb4854bb30f97753b0e0138ca2d9073e29c4b5905154fcd215701b300c0680025310479c6dca4294e3a591ff841";
+      sha512 = "dae36c69bfa5cc80ad9489c76acdc6094f5fcd2c41f8c2f5dcd5d8d103aca564daaa96b27426f8096aaf555b6786f7d2c2227cbf1096d7eae53285b337d8221c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ja/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ja/thunderbird-45.6.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "c539473ab434e20528f252f76f542f1938accde06b7d460b8e4a767a2721cded73710cca2264d2b18cd533a6118dfa9ae1c2701a6e1b18afe398f42a109439e9";
+      sha512 = "c33ba443ee0556b28b60ba4517913d54a931cc2b63339262b35a1d576166e9abe1e7f6297f11683397a13f5c7b71cd96f97e60ad1a956aa27ba9fbd7f0c5fb43";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ko/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ko/thunderbird-45.6.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "59421684c74f6c9fce41c4769ef725445bc84224357db21f1f4c9f5154c695a337445bfa05fca1f045d0e05ce64faf2d2e5a9be8cac0d62dfa17bf1571f9db57";
+      sha512 = "0587a7bb7218b16c859717e99a3fd96e697b3a32dd322361edfbaf0b069522914e84b74160466d3b25fac76d925af485b9688fb5a3e072f1eff94dabb0239669";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/lt/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/lt/thunderbird-45.6.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "317315c0c436ddf882ac2d5a5c76a942f0fe04f80c1d7634ff7223b363b5fedd0778b127e1cbe21e737acdb869e770b9c828a9df075eb19f4d4870767297b912";
+      sha512 = "0789f1357a0c2a61fa676c9c375c79c29e78c3b3bf8faa2a392ec90714e1e581bd07eb75628284e6873c66553c613e7b43a18532a01cc66510f0bdcbef5f5b83";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nb-NO/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nb-NO/thunderbird-45.6.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "36638e01b76b608c2af0dd6f6336877fab6e0c8b8d16c5f90095c0bb24d475bf5486782fc26061dea134e7817288d84b8b805351411b7e70f39f3a76c9354b92";
+      sha512 = "906ebc96274cc490b82b434f648ba33f16a4f2b641e99142fcf18cd24701ed0b4b34558b2b380a0ff1d4ebe253ffd99d6b2cf4b9cf059a3f071c9e3bee94dd0b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nl/thunderbird-45.6.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "03aa22ab612c39e9a7df2a346a338b70c6ee13802860ab9359322e6fae425c1f8416cab762b9e061e3d8b34417043c3979e49a5c7079bc8327c0a317e5b98abf";
+      sha512 = "d18b521eddf0e71cecb33473275bb44038717cefadddc648441b0d4c7a01aaa08e45fad28e3eb74e8d01d1a637db1ef4d999d45a83c2fcb3aa3e7430b73b666f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nn-NO/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nn-NO/thunderbird-45.6.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "4594fdc88d66a61567652f4ef7fbf43b55853933f098526671801e0fcd6256367e71c5a179419b1015d410b49a26505879ba0397013c8b510a2462798e5b3821";
+      sha512 = "66f7b07352f7a6064d3a805d8d348ae4956240b42359a2d3fbd1d96291a025e1f4920ddcb0cd9312e1d8f146fcceae4e0d9811a9e6ae43479307aa204d8de8d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pa-IN/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pa-IN/thunderbird-45.6.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "590b974b9785db9843b35dfdd9aa9d8422379570b6511a02564d5a0edbaeafad38f99aba403cb996ed47416a9944ca7fcc74d8aacda74c8113de7f112b10f397";
+      sha512 = "828e57876a063979f945d0cee371b57e43d2f26eba4723a8983b448b85a091a303da068f17ba73f1eb23b35e06d9b3a37b56d9a3be49c202c950d2bd2ed9db05";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pl/thunderbird-45.6.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "f03e723aebf1c7709a0f08b9416acef98b5e4082b981fae3276d26e3c11650153cc56fd8f96653eb9d2b5213f5ccc42e062b42cf6182dc910c56a24f07440102";
+      sha512 = "6ca824649b5f030423213dd573018af5b6a8033fa86b6b23c5b99e59afdd5234cd2c7a8237124dabbf75175511afff980dd3d971f59967c3522b633680d7277a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pt-BR/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pt-BR/thunderbird-45.6.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "906510719e6d7149fe2c8cee9d5a88ae0a86cbd4bb6e2c4ec0bc4d77b252f71b98939f4002dab69a24db75d022e485d1711350ca1f26b3b55b05701dfff6f9da";
+      sha512 = "399dc86d31375ea3af21e6032b686ffdec65a3c0ca403d95bc89e0e7715e6c998dc846057ff4a6b919fda794a9fdabb53eafd7a07d8894a65e1109c9c52e43d1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pt-PT/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pt-PT/thunderbird-45.6.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "1ed53b8ac706dc2750276928b507c072e3b2e49f7df2ab6d382b31b0618da6e41ce3fcf50f7815b4736859fe899017ea4a646f4594f4ac7ef5c272ccdd6d69a7";
+      sha512 = "f758fb69c99c02fe1bcab8c9a4b02eeebcc190c30e73f4b009521c36956cc7f076e1f544181a332807bee93ec39d7d170cca3f0d87fc6ed89b60a4515c394749";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/rm/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/rm/thunderbird-45.6.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "6fa680229b2dadfe6984af37d1ec93ef9d5f2d9014bc62618690c2e71a6bf8bd7d945fb0312553f0f2858fee89b454b84375a65fbb90f8479d1812d838ef1109";
+      sha512 = "d338c243cbfa41e5b54195923bc12876e45683271df477d492058973dbc0f7352d59863a3bde571ab001612b8ce5704512f1bc0ad1e8af066f7aa448b5c89f0a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ro/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ro/thunderbird-45.6.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "102b3a1c23742bf9fad04c1d87a43cf4b6f805b93528ec7139d5b3eecf141990594f32c2c89a7a950aa4257801ec2e5aa91ca6fcf2e1a067978f47cec500f6b3";
+      sha512 = "2c011b2cef9c5761c1297b2cc2dcd442ae9fd8d0f28d0f469aa2abbd6da80fe11bd607df8fb224ff03bd21932bdd40591532722756c467b498313da0f639c3fc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ru/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ru/thunderbird-45.6.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "6d2a1bb3db76516f1011b701827b43e66099a50d575facd3b5be9718be21d4b7ef80feba091e4273960af8f56f416514c2d308877b039be06898bb50365e9e27";
+      sha512 = "90fe536806f6e2ec20c470c72812ff8e54af58499ba220f9b6a5b6043c3a6072c78dc834c4204ca4e1f9d5ab71093296c958fe12409e50435136903f3ea3d544";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/si/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/si/thunderbird-45.6.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "9900c9462c97d7e783dc9893a4a6f87a0e000866ddb3dffefd67548b30ffa4e9db8a2e93247027a45aae03c9d0bac305991a1684de17e8bd28f3c2d3e5a38309";
+      sha512 = "36fed4f969775870a3e224aef66b36d8b8f1adec2471b4b45d75c52318b9481bdd81a9f583589b4c5450045e4a8abff91f3fb9083f4bafd237c742015626291f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sk/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sk/thunderbird-45.6.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "ca001243f8359c38b781fea53c3ede7baabea25af516d852e75b6beaca9ea1b9ce4964c345ff5754657a1a953a18bef2c631e962d92f699e2dc5a31a9d594d39";
+      sha512 = "e89ac23a25ae446f69e9c31478cc844253ba57de01893bd12b6b2bbe0e599fa09bf1506e9cfcbeab506998d81bc170fe1cff2d0e9aa13411299a5441d40d8959";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sl/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sl/thunderbird-45.6.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "ff9784d31a9233c925d1745752497cbe055df378b702169ed4cf1df144b00936566d9dbef4ae5ed9821933e70bec3ef71de4086b0a89f639df2bd57e1796ef3c";
+      sha512 = "6a74cc252d64d6d11a98af51e8fffc8a4bba8c74e2647afee9cfaae55ffcabe7ef9d82ee95a1a4d169fc057025c84f1253f455c6bd5e8f5fb9e33d7372c96a01";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sq/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sq/thunderbird-45.6.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "f2e3bccba1c8ad67d696e54e2001726cabe6f61e41daaa9dab2eee00cac7877a8af15c4876993ebed6042fe540c68b25fcee52888a6bd5ad6726875bb4489e05";
+      sha512 = "2ab4b18e5560eb495093aa0e5867f6e91148fe1cf7123f50306cb19b646b0834cde8cbd449df46f7e12b597465ee69910ad386e9920e26cdadc2085ca92e7af9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sr/thunderbird-45.6.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "9739c33d30b7e6d6c28fc29f8f1badb06d32ae686fc684ec6743a5ffc4ba42d6060ba95c2bd1e3c2486c4d36ee0f14a1201f74768197073136991e49acec79ff";
+      sha512 = "dc23ac3a9c3fc8b0105bdac2b14f24a0cd76b7f6c3bcd3994d979ef2db44a9f11bc2e5648148bd45008ea832261399898737b39727c0a61a03b8315aeede6bde";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sv-SE/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sv-SE/thunderbird-45.6.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "e394654340d4f2da306149ed7cf0413ac0d40fb1488402e12e15c09c831585ecfcf6c355b420a902d76ec0aea7a5c9e234004f1ee19ed295d7b52343ab67c9a6";
+      sha512 = "ebcac4ddcb84291613eeb64289e1f9f374a6085eb587df3cffc906dd7d7950f7564be1aed17c794d37f415840459b82c0c6edebefab2d8ba6f3e34c20426757a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ta-LK/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ta-LK/thunderbird-45.6.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "08154b5030c58cb52ef6b6584fc3d20d62e02cc0ee919f37c3a2e97f5afdac777f9dc6dd5881e3a87e5c20dfefdf816c068da014e42e111a3a8c7043b6e9002a";
+      sha512 = "b164c7e70aa313517ecd85828a3734113f504f7e86ae615a24465a4334f41197af42b181f1f0048782d841422c3847eff1b8868450d190e362a36ffb5d1f2b6d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/tr/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/tr/thunderbird-45.6.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "63bcbce3c8f6e635cbfc73f83b33c6c6e9fd5f45f8878aa500772f807f1acdf611dcf4002084902937f95cd1abab1a76e00822327235e7b61ffb369b327974de";
+      sha512 = "6c3d65c4c277382961238e491f90e0f33a265614614428f2abeeb3779cc3b23b068d8ddf7f4a7c98a4c7497b22df79b3ba16ef0191b9cfb752aa24316d4fb8e3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/uk/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/uk/thunderbird-45.6.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "c55ae7ae3e388ec11d8c9bbeb3f18fa5883a5ea5b90d924e5f9a7d61876142a7b336eb50d35e54a405cee803ab7ad4d754a7ceb02cb9a2b9adeb415c44bd0c88";
+      sha512 = "6754bead8887f244c6d87a6c76f45247933fae42fc74240c453bbef8acfa7a85ba282db4185c1fb6ec9e93115e3d9e4ac0ee113c00db9634f26a4eec6f79ea6b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/vi/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/vi/thunderbird-45.6.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "52e05acb6c681ba62b608cb60d24816aaa35f296b6552b7006fe56b2f2d908a71736490c85e8bfb350d468510a031deedad65f691e4b77fc1dfee26bd30bdb41";
+      sha512 = "34110501557ea23c1c854fbba9e6c043e25634f5993f34197b8d5842ee88d4717c87a0a8fe326a35dd12e74fcfbf9ddb0b6e7db0b09a058d710680e37cd5b939";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/zh-CN/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/zh-CN/thunderbird-45.6.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "caa4533f57b85ed57ef66fe4807f8079d8bef73ad9a454e23a90154253c205a110e13fe1376c0a7d644b326f7dde888d8ed97ffedb8282d8887bb7131749f510";
+      sha512 = "493073bee16e9e22db0d3c2700f13f1304129c28528a80fb9a548afbabaaa147b7ac46a254cc3b05619d47e94e61c29ff7cc80618c8af09b3659e6c91883c017";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/zh-TW/thunderbird-45.5.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/zh-TW/thunderbird-45.6.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "d3e44f2f92ec4bf6b4a5dfebbcd2f05b323050ff88a1eb3b19301224a6815051e0e884e663dde834cef0a6889217ae94e446669aa0c97201c2d1f1bc2729c1b3";
+      sha512 = "7ac66a0ee967e7f87d084acda72120c65bb64c2572f42249b97baf9755b0b7dc314a1d88049941a7be86846f98f236cdfe54b87b22ff7f66b6099397788373b2";
     }
     ];
 }

From d6254e0bbd87f025cd13f684664a642021a531e4 Mon Sep 17 00:00:00 2001
From: Dhananjay Balan <dhananjay@cliqz.com>
Date: Wed, 28 Dec 2016 16:41:29 +0100
Subject: [PATCH 0311/1310] shellinabox: 2.19 -> 2.20

should fix shellinabox vulnarabilities from https://github.com/NixOS/nixpkgs/issues/21457
---
 pkgs/servers/shellinabox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
index c9f4e2d253f..cad349c4b51 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pam, openssl, openssh, shadow, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "2.19";
+  version = "2.20";
   name = "shellinabox-${version}";
 
   src = fetchFromGitHub {
     owner = "shellinabox";
     repo = "shellinabox";
-    rev = "1a8010f2c94a62e7398c4fa130dfe9e099dc55cd";
-    sha256 = "16cr7gbnh6vzsxlhg9j9avqrxbhbkqhsbvh197b0ccdwbb04ysan";
+    rev = "v${version}";
+    sha256 = "1hmfayh21cks2lyj572944ll0mmgsxbnj981b3hq3nhdg8ywzjfr";
   };
 
   patches = [ ./shellinabox-minus.patch ];

From 8f4098f0873c3ee4368fddb56d88fb95d39b5b14 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 28 Dec 2016 20:56:47 -0500
Subject: [PATCH 0312/1310] cryptopp: 5.6.4 -> 5.6.5

for CVE-2016-7420: CVE-2016-7420
---
 pkgs/development/libraries/crypto++/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index d1476df2b60..c1bf789c59b 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -1,22 +1,21 @@
-{ fetchurl, stdenv, unzip }:
+{ fetchurl, fetchFromGitHub, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "crypto++-${version}";
   majorVersion = "5.6";
-  version = "${majorVersion}.4";
+  version = "${majorVersion}.5";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/cryptopp/cryptopp564.zip";
-    sha256 = "1msar24a38rxzq0xgmjf09hzaw2lv6s48vnbbhfrf5awn1vh6hxy";
+  src = fetchFromGitHub {
+    owner = "weidai11";
+    repo = "cryptopp";
+    rev = "CRYPTOPP_5_6_5";
+    sha256 = "1yk7jyf4va9425cg05llskpls2jm7n3jwy2hj5jm74zkr4mwpvl7";
   };
 
   patches = with stdenv;
     lib.optional (system != "i686-cygwin") ./dll.patch
     ++ lib.optional isDarwin ./GNUmakefile-darwin.patch;
 
-  buildInputs = [ unzip ];
-
-  sourceRoot = ".";
 
   configurePhase = let
     marchflags =

From a1f595c870ceea5fb1bc4fbf44270f1e3288468b Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 29 Dec 2016 11:07:10 +0900
Subject: [PATCH 0313/1310] thunderbird: 45.5.1 -> 45.6.0

---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index fb78c3cca24..cd16b73dc5d 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -13,7 +13,7 @@
   enableOfficialBranding ? false
 }:
 
-let version = "45.5.1"; in
+let version = "45.6.0"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
-    sha512 = "f6dc5f526e50facb9947627fcbc8db222cc20438fa62c552090dcabeabcc31dba2c66c20345090deaf5b58fd42b54938935eb1b3904528dce5949fd4cfc1ceb7";
+    sha512 = "1f4579ac37b8ab98c91fe2e3e6742ba1b005ca9346d23f467d19e6af45eb457cab749bf91ed2a79f2058bd66f54da661da3ea5d5786f8c4b472d8a2a6c34db4b";
   };
 
   buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx

From 7fa4b0f2c94156dfcb177ed8fbadc8c8d1162dad Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Thu, 29 Dec 2016 09:55:38 +0200
Subject: [PATCH 0314/1310] rustc: 1.13.0 -> 1.14.0

---
 pkgs/development/compilers/rust/bootstrap.nix      | 12 ++++++------
 pkgs/development/compilers/rust/default.nix        | 14 +++++++-------
 .../patches/disable-lockfile-check-stable.patch    |  3 ++-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index b912a9d7933..93deee01e56 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -14,16 +14,16 @@ let
     then "x86_64-apple-darwin"
     else abort "missing boostrap url for platform ${stdenv.system}";
 
-  # fetch hashes by running `print-hashes.sh 1.12.1`
+  # fetch hashes by running `print-hashes.sh 1.13.0`
   bootstrapHash =
     if stdenv.system == "i686-linux"
-    then "ede9b9d14d1ddbc29975d1ead73fcf2758719b4b371363afe1c32eb8d6e96bb3"
+    then "239734113f6750d31085c7a08c260d492991cc1ef10817b6d44154515f3f9439"
     else if stdenv.system == "x86_64-linux"
-    then "9e546aec13e389429ba2d86c8f4e67eba5af146c979e4faa16ffb40ddaf9984c"
+    then "95f4c372b1b81ac1038161e87e932dd7ab875d25c167a861c3949b0f6a65516d"
     else if stdenv.system == "i686-darwin"
-    then "2648645c4fe1ecf36beb7de63501dd99e9547a7a6d5683acf2693b919a550b69"
+    then "f6e01cab3bf8d0a6fe9cc2447aa10ce894569daaa72d44063c229da918b96023"
     else if stdenv.system == "x86_64-darwin"
-    then "0ac5e58dba3d24bf09dcc90eaac02d2df053122b0def945ec4cfe36ac6d4d011"
+    then "f538ca5732b844cf7f00fc4aaaf200a49a845b58b4ec8aef38da0b00e2cf6efe"
     else throw "missing boostrap hash for platform ${stdenv.system}";
 
   needsPatchelf = stdenv.isLinux;
@@ -33,7 +33,7 @@ let
      sha256 = bootstrapHash;
   };
 
-  version = "1.12.1";
+  version = "1.13.0";
 in
 
 rec {
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index c090cc07d01..4d9668da2e3 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -7,12 +7,12 @@ in
 
 rec {
   rustc = callPackage ./rustc.nix {
-    shortVersion = "1.13";
+    shortVersion = "1.14";
     isRelease = true;
     forceBundledLLVM = false;
     configureFlags = [ "--release-channel=stable" ];
-    srcRev = "2c6933acc05c61e041be764cb1331f6281993f3f";
-    srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp";
+    srcRev = "e8a0123241f0d397d39cd18fcc4e5e7edde22730";
+    srcSha = "1sla3gnx9dqvivnyhvwz299mc3jmdy805q2y5xpmpi1vhfk0bafx";
 
     patches = [
       ./patches/disable-lockfile-check-stable.patch
@@ -25,10 +25,10 @@ rec {
   };
 
   cargo = callPackage ./cargo.nix rec {
-    version = "0.14.0";
-    srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55";
-    srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s";
-    depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr";
+    version = "0.15.0";
+    srcRev = "298a0127f703d4c2500bb06d309488b92ef84ae1";
+    srcSha = "0v74r18vszapw2rfk7w72czkp9gbq4s1sggphm5vx0kyh058dxc5";
+    depsSha256 = "0ksiywli8r4lkprfknm0yz1w27060psi3db6wblqmi8sckzdm44h";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
diff --git a/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch
index 0c01cb1a7f1..c5009b7ba67 100644
--- a/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch
+++ b/pkgs/development/compilers/rust/patches/disable-lockfile-check-stable.patch
@@ -11,12 +11,13 @@ diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
 index 2839bbd..50142ff 100644
 --- a/src/tools/tidy/src/main.rs
 +++ b/src/tools/tidy/src/main.rs
-@@ -47,7 +47,7 @@ fn main() {
+@@ -48,7 +48,7 @@ fn main() {
      errors::check(&path, &mut bad);
      cargo::check(&path, &mut bad);
      features::check(&path, &mut bad);
 -    cargo_lock::check(&path, &mut bad);
 +    //cargo_lock::check(&path, &mut bad);
+     pal::check(&path, &mut bad);
  
      if bad {
          panic!("some tidy checks failed");

From 31ec0795f6bcad548ae6b73097ce1d045400bd78 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Thu, 29 Dec 2016 09:56:19 +0200
Subject: [PATCH 0315/1310] cargo: 0.14 -> 0.15

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

diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 537764ebca2..2b544d754d7 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   LIBGIT2_SYS_USE_PKG_CONFIG=1;
 
   configurePhase = ''
-    ./configure --enable-optimize --prefix=$out --local-cargo=${rustPlatform.rust.cargo}/bin/cargo
+    ./configure --enable-optimize --prefix=$out
   '';
 
   buildPhase = "make";
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec {
     cargo test
   '';
 
-  # Disable check phase as there are failures (author_prefers_cargo test fails)
+  # Disable check phase as there are failures (4 tests fail)
   doCheck = false;
 
   meta = with stdenv.lib; {

From 38793dd995c7ab0b9b82b19f67bf930ad2a85e88 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Thu, 29 Dec 2016 09:57:03 +0200
Subject: [PATCH 0316/1310] rustRegistry: 2016-12-16 -> 2016-12-28

---
 pkgs/top-level/rust-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 29fbac38bd0..14ef3cfef43 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2016-12-16";
-  rev = "1da5a7d0cd31d72324481760067bde5cf2e07be5";
-  sha256 = "0kbh3aq738sqns8w6yfia17fwrk98g6m763wqsqwhnrg2ndqrp8d";
+  version = "2016-12-28";
+  rev = "3399254d4a021d07736944b339a8794eddcda517";
+  sha256 = "1vbixbgzv21anqayz8ya0x1qlzndb7fpdf9dyh4yyscl1kaibvg9";
 
   src = fetchFromGitHub {
       inherit rev;

From cfbbac7cb407cba2082e19581efa034034d26381 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Thu, 29 Dec 2016 09:57:22 +0200
Subject: [PATCH 0317/1310] cfdyndns: mark as broken

---
 pkgs/applications/networking/dyndns/cfdyndns/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index d3be9c28df3..a79404e77c8 100644
--- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -27,5 +27,6 @@ buildRustPackage rec {
     license = stdenv.lib.licenses.mit;
     maintainers = with maintainers; [ colemickens ];
     platforms = with platforms; linux;
+    broken = true;
   };
 }

From d27a6588467fc80ca5ef7970509448f56bf83b16 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Thu, 29 Dec 2016 09:57:39 +0200
Subject: [PATCH 0318/1310] pijul: mark as broken

---
 pkgs/applications/version-management/pijul/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 4f1f28a7aac..04a91a6b4a4 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -33,5 +33,6 @@ buildRustPackage rec {
     license = licenses.gpl3;
     platforms = stdenv.lib.platforms.x86_64;  # i686 builds fail due to lmdb
     maintainers = with maintainers; [ puffnfresh ];
+    broken = true;
   };
 }

From 2f977b4af111288318bab3823e850ebe9aef3af6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 29 Dec 2016 09:23:43 +0100
Subject: [PATCH 0319/1310] pythonPackages.bleach: 1.4.3 -> 1.5.0, closes
 #21450

Unfortunately bleach depends on an older version of html5lib and cannot
use the latest version because the sanitizer module has been moved out.
https://github.com/mozilla/bleach/issues/217
---
 pkgs/top-level/python-packages.nix | 34 ++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a3a7c6e3c9..15496a9dcc1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2808,17 +2808,39 @@ in {
     };
   };
 
+  # Needed for bleach 1.5.0
+  html5lib_0_9999999 = self.html5lib.override rec {
+    name = "html5lib-${version}";
+    buildInputs = with self; [ nose flake8 ];
+    propagatedBuildInputs = with self; [ six ];
+    checkPhase = ''
+      nosetests
+    '';
+
+    version = "0.9999999";
+    src = pkgs.fetchurl {
+      url = "https://github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz";
+      sha256 = "1s6wdbrjzw5jhyfbskf4nj1i5bjpjqq9f89a7r1rl59rhpwmfhhq";
+    };
+  };
+
   bleach = buildPythonPackage rec {
-    version = "v1.4.3";
-    name = "bleach-${version}";
+    pname = "bleach";
+    version = "1.5.0";
+    name = "${pname}-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://github.com/jsocol/bleach/archive/${version}.tar.gz";
-      sha256 = "0mk8780ilip0m890rapbckngw8k42gca3551kri297pyylr06l5m";
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "978e758599b54cd3caa2e160d74102879b230ea8dc93871d0783721eef58bc65";
     };
 
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [ six html5lib ];
+    buildInputs = with self; [ pytest pytestrunner ];
+    propagatedBuildInputs = with self; [ six html5lib_0_9999999 ];
+
+    postPatch = ''
+      substituteInPlace setup.py --replace "==3.0.3" ""
+      substituteInPlace setup.py --replace ">=0.999,!=0.9999,!=0.99999,<0.99999999" ""
+    '';
 
     meta = {
       description = "An easy, HTML5, whitelisting HTML sanitizer";

From 37632cbf5f317b9ab3c98a4cf00efa4d4879695c Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 29 Dec 2016 10:30:48 +0100
Subject: [PATCH 0320/1310] idea-ultimate: 2016.3.1 -> 2016.3.2

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 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 dc85b5402bd..e9f887fe621 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -208,12 +208,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2016.3.1";
+    version = "2016.3.2";
     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 = "1696gfmqi76ybgi5r84kisjx9mv0hd70hsn16banw61zy4rfllhw";
+      sha256 = "13pd95zad29c3i9qpwhjii601ixb4dgcld0kxk3liq4zmnv6wqxa";
     };
     wmClass = "jetbrains-idea";
   };

From 93d917fa220c159ea2f785ecb967efab2d55a4a6 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 25 Dec 2016 17:35:20 +0900
Subject: [PATCH 0321/1310] firefox, thunderbird: add updateScript

---
 .../networking/browsers/firefox/default.nix   | 18 +++++--
 .../networking/browsers/firefox/update.nix    | 54 +++++++++++++++++++
 .../mailreaders/thunderbird/default.nix       |  9 ++++
 3 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/firefox/update.nix

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index a170b7fbab8..3b0eb140516 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -5,6 +5,7 @@
 , hunspell, libevent, libstartup_notification, libvpx
 , cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
 , autoconf213, which
+, writeScript, xidel, coreutils, gnused, gnugrep, curl, ed
 , enableGTK3 ? false
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
@@ -19,7 +20,7 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
 let
 
-common = { pname, version, sha512 }: stdenv.mkDerivation rec {
+common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
   name = "${pname}-unwrapped-${version}";
 
   src = fetchurl {
@@ -135,7 +136,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
   };
 
   passthru = {
-    inherit nspr version;
+    inherit nspr version updateScript;
     gtk = gtk2;
     isFirefox3Like = true;
     browserName = "firefox";
@@ -148,13 +149,22 @@ in {
   firefox-unwrapped = common {
     pname = "firefox";
     version = "50.1.0";
-    sha512 = "2jwpk3aymkcq9f4xhzc31sb1c90vy3dvyqq2hvw97vk9dw7rgvv2cki10ns5cshbc4k57yd3j8nm7ppy2kw6na6771mj6sbijdjw39p";
+    sha512 = "370d2e9b8c4b1b59c3394659c3a7f0f79e6a911ccd9f32095b50b3a22d087132b1f7cb87b734f7497c4381b1df6df80d120b4b87c13eecc425cc66f56acccba5";
+    updateScript = import ./update.nix {
+        name = "firefox";
+        inherit writeScript xidel coreutils gnused gnugrep curl ed;
+    };
   };
 
   firefox-esr-unwrapped = common {
     pname = "firefox-esr";
     version = "45.6.0esr";
-    sha512 = "086ci461hmz6kdn0ly9dlc723gc117si4a11a1c51gh79hczhahdaxg5s4r3k59rb43gpwxrlvm4wx1aka36bsihnh8a4caxnp72v5r";
+    sha512 = "b96c71aeed8a1185a085512f33d454a1735237cd9ddf37c8caa9cc91892eafab0615fc0ca6035f282ca8101489fa84c0de1087d1963c05b64df32b0c86446610";
+    updateScript = import ./update.nix {
+        name = "firefox-esr";
+        versionSuffix = "esr";
+        inherit writeScript xidel coreutils gnused gnugrep curl ed;
+    };
   };
 
 }
diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix
new file mode 100644
index 00000000000..33c9f307918
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/update.nix
@@ -0,0 +1,54 @@
+{ name
+, writeScript
+, xidel
+, coreutils
+, gnused
+, gnugrep
+, curl
+, ed
+, sourceSectionRegex ? "${name}-unwrapped = common"
+, basePath ? "pkgs/applications/networking/browsers/firefox"
+, baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/"
+, versionSuffix ? ""
+}:
+
+let
+  version = (builtins.parseDrvName name).version;
+in writeScript "update-${name}" ''
+  PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${ed}/bin
+
+  pushd ${basePath}
+
+  url=${baseUrl}
+
+  # retriving latest released version
+  #  - extracts all links from the $url
+  #  - extracts lines only with number and dots followed by a slash
+  #  - removes trailing slash
+  #  - sorts everything with semver in mind
+  #  - picks up latest release
+  version=`xidel -q $url --extract "//a" | \
+           grep "^[0-9.]*${versionSuffix}/$" | \
+           sed s/[/]$// | \
+           sort --version-sort | \
+           tail -n 1`
+
+  shasum=`curl --silent $url$version/SHA512SUMS | grep 'source\.tar\.xz' | cut -d ' ' -f 1`
+
+  ed default.nix <<COMMANDS
+  # search line
+    /${sourceSectionRegex}/
+  # search version number line
+    /version/
+  # update the version
+    s/".*"/"$version"/
+  # search hash line
+    /sha512/
+  # update the hash
+    s/".*"/"$shasum"/
+  # write then quit
+    wq
+  COMMANDS
+
+  popd
+''
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index cd16b73dc5d..2ea0f6127de 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -4,6 +4,7 @@
 , yasm, mesa, sqlite, unzip, makeWrapper
 , hunspell, libevent, libstartup_notification, libvpx
 , cairo, gstreamer, gst_plugins_base, icu
+, writeScript, xidel, coreutils, gnused, gnugrep, curl, ed
 , debugBuild ? false
 , # If you want the resulting program to call itself "Thunderbird"
   # instead of "Earlybird", enable this option.  However, those
@@ -128,4 +129,12 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.pierron maintainers.eelco ];
     platforms = platforms.linux;
   };
+
+  passthru.updateScript = import ./../../browsers/firefox/update.nix {
+    name = "thunderbird";
+    sourceSectionRegex = ".";
+    basePath = "pkgs/applications/networking/mailreaders/thunderbird";
+    baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
+    inherit writeScript xidel coreutils gnused gnugrep curl ed;
+  };
 }

From c2d90eaa91118d7ea17441658016f8402cd10212 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Wed, 28 Dec 2016 21:17:10 +0100
Subject: [PATCH 0322/1310] nerdfonts: 0.8.0 -> 1.0.0

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

diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix
index aee4a63c308..d0d831f8cc7 100644
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ b/pkgs/data/fonts/nerdfonts/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, bash, which, withFont ? "" }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.0";
+  version = "1.0.0";
   name = "nerdfonts-${version}";
   src = fetchFromGitHub {
     owner = "ryanoasis";
     repo = "nerd-fonts";
     rev = version;
-    sha256 = "0n7idfk4460j8g0rw73hzz195pdh4c916hpc5r6dxpvgcmvryzc5";
+    sha256 = "1kz4hhshi3lsaja20kg258jc220q1b6nhwiyv0w433m0kvsgzdqd";
   };
   dontPatchShebangs = true;
   buildInputs = [ which ];

From 774435d0aa2c5e0cddb11a553ec1b1eaef748ed5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Dec 2016 12:18:28 +0100
Subject: [PATCH 0323/1310] maude: update to 2.7.1

---
 .../interpreters/maude/default.nix            | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index e833e7b0c6d..7632784463f 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, unzip, makeWrapper
-, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx,
+{ stdenv, fetchurl, unzip, makeWrapper , flex, bison, ncurses, buddy, tecla
+, libsigsegv, gmpxx, cvc4, cln
 }:
 
 let
 
-  version = "2.7";
+  version = "2.7.1";
 
   fullMaude = fetchurl {
-    url = "https://raw.githubusercontent.com/maude-team/full-maude/master/full-maude27c.maude";
-    sha256 = "08bg3gn1vyjy5k69hnynpzc9s1hnrbkyv6z08y1h2j37rlc4c18y";
+    url = "http://maude.cs.illinois.edu/w/images/c/ca/Full-Maude-${version}.zip";
+    sha256 = "0y4gn7n8vh24r24vckhpkd46hb5hqsbrm4w9zr6dz4paafq12fjc";
   };
 
 in
@@ -17,11 +17,13 @@ stdenv.mkDerivation rec {
   name = "maude-${version}";
 
   src = fetchurl {
-    url = "https://github.com/maude-team/maude/archive/v${version}-ext-hooks.tar.gz";
-    sha256 = "02p0snxm69rs8pvm93r91p881dw6p3bxmazr3cfw5pnxpgz0vjl0";
+    url = "http://maude.cs.illinois.edu/w/images/d/d8/Maude-${version}.tar.gz";
+    sha256 = "0jskn5dm8vvbd3mlryjxdb6wfpkvyx174wk7ci9a31aylxzpr25i";
   };
 
-  buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip];
+  buildInputs = [
+    flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip cvc4 cln
+  ];
 
   hardeningDisable = [ "stackprotector" ] ++
     stdenv.lib.optionals stdenv.isi686 [ "pic" "fortify" ];
@@ -30,6 +32,7 @@ stdenv.mkDerivation rec {
     configureFlagsArray=(
       --datadir="$out/share/maude"
       TECLA_LIBS="-ltecla -lncursesw"
+      LIBS="-lcln"
       CFLAGS="-O3" CXXFLAGS="-O3"
     )
   '';
@@ -38,11 +41,12 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
-    install -D -m 444 ${fullMaude} $out/share/maude/full-maude.maude
+    unzip ${fullMaude}
+    install -D -m 444 full-maude.maude $out/share/maude/full-maude.maude
   '';
 
   meta = {
-    homepage = "http://maude.cs.uiuc.edu/";
+    homepage = "http://maude.cs.illinois.edu/";
     description = "High-level specification language";
     license = stdenv.lib.licenses.gpl2;
 

From 3705b1a429cff4047f6e4dd98c085fe86263e76a Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Wed, 28 Dec 2016 20:09:14 -0200
Subject: [PATCH 0324/1310] opendungeons: 0.6.0 -> 0.7.1

---
 pkgs/games/opendungeons/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix
index fe3a381c7f5..94a44446b6c 100644
--- a/pkgs/games/opendungeons/default.nix
+++ b/pkgs/games/opendungeons/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, ogre, cegui, boost, sfml, openal, cmake, ois }:
+{ stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "opendungeons-${version}";
-  version = "0.6.0";
+  version = "0.7.1";
 
-  src = fetchurl {
-    url = "ftp://download.tuxfamily.org/opendungeons/${version}/${name}.tar.xz";
-    sha256 = "1g0sjh732794h26cbkr0p96i3c0avm0mx9ip5zbvb2y3sbpjcbib";
+  src = fetchFromGitHub {
+    owner = "OpenDungeons";
+    repo = "OpenDungeons";
+    rev = version;
+    sha256 = "0nipb2h0gn628yxlahjgnfhmpfqa19mjdbj3aqabimdfqds9pryh";
   };
 
   patches = [ ./cmakepaths.patch ];
 
-  buildInputs = [ cmake ogre cegui boost sfml openal ois ];
+  buildInputs = [ cmake ogre cegui boost sfml openal ois pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius.";

From 581070147e32b20c48513159f6e1c47673e11623 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 29 Dec 2016 15:32:19 +0100
Subject: [PATCH 0325/1310] go_bootstrap (go_1_4): 1.4.3 ->
 1.4-bootstrap-20161024

---
 pkgs/development/compilers/go/1.4.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 3f0726e2aef..eb4c64ed334 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -9,11 +9,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.4.3";
+  version = "1.4-bootstrap-20161024";
+  revision = "79d85a4965ea7c46db483314c3981751909d7883";
 
   src = fetchurl {
-    url = "https://github.com/golang/go/archive/go${version}.tar.gz";
-    sha256 = "0rcrhb3r997dw3d02r37zp26ln4q9n77fqxbnvw04zs413md5s35";
+    url = "https://github.com/golang/go/archive/${revision}.tar.gz";
+    sha256 = "1ljbllwjysya323xxm9s792z8y9jdw19n8sj3mlc8picjclrx5xf";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -89,7 +90,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./remove-tools-1.4.patch
-    ./new-binutils.patch
     ./creds-test-1.4.patch
   ];
 

From 5b1dad79cd870fd25f3eecafb975a013b61a1825 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 29 Dec 2016 15:33:35 +0100
Subject: [PATCH 0326/1310] go_1_6, go_1_7: comment out testLoadFixed in a way
 recommended by vcunat. The test depends on specific timezone names, and the
 latest tzdata changed the naming. Upstream only agrees to fix the test in the
 1.8 branch that has no stable releases yer

---
 pkgs/development/compilers/go/1.6.nix | 2 ++
 pkgs/development/compilers/go/1.7.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index ce68b007eaa..982446f4fdb 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -72,6 +72,8 @@ stdenv.mkDerivation rec {
     sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
     # Remove the coverage test as we have removed this utility
     sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
+    # Remove the timezone naming test
+    sed -i '/TestLoadFixed/areturn' src/time/time_test.go
 
     sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
     sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index c33e45c2983..0df2e8d6f7e 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -66,6 +66,8 @@ stdenv.mkDerivation rec {
     sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
     # Remove the coverage test as we have removed this utility
     sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
+    # Remove the timezone naming test
+    sed -i '/TestLoadFixed/areturn' src/time/time_test.go
 
     sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
     sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go

From 996e0ef7774642877139ba4aedb1af4951ec5ebb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 29 Dec 2016 13:59:52 +0100
Subject: [PATCH 0327/1310] test-driver: Show test duration

---
 nixos/lib/test-driver/test-driver.pl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl
index 8ad0d67f68c..854be99552a 100644
--- a/nixos/lib/test-driver/test-driver.pl
+++ b/nixos/lib/test-driver/test-driver.pl
@@ -8,6 +8,7 @@ use IO::Pty;
 use Logger;
 use Cwd;
 use POSIX qw(_exit dup2);
+use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
 
 $SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly
 
@@ -179,7 +180,12 @@ END {
     $log->close();
 }
 
+my $now1 = clock_gettime(CLOCK_MONOTONIC);
 
 runTests;
 
+my $now2 = clock_gettime(CLOCK_MONOTONIC);
+
+printf STDERR "test script finished in %.2fs\n", $now2 - $now1;
+
 exit ($nrSucceeded < $nrTests ? 1 : 0);

From bb0ce819b37b57df15c223fd7e9edaaa737678aa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 29 Dec 2016 16:19:43 +0100
Subject: [PATCH 0328/1310] nixos/tests/gnome3.nix: Speed up test

It turns out that "journalctl -f | grep -m 1 pattern" will block for
one more line after "pattern" appears, which can take a long time.
---
 nixos/tests/gnome3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index bd8f9502e2f..4787d42d695 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
       $machine->succeed("xauth merge ~alice/.Xauthority");
       $machine->waitForWindow(qr/Terminal/);
-      $machine->mustSucceed("timeout 900 bash -c 'journalctl -f|grep -m 1 \"GNOME Shell started\"'");
+      $machine->succeed("timeout 900 bash -c 'while read msg; do if [[ \$msg =~ \"GNOME Shell started\" ]]; then break; fi; done < <(journalctl -f)'");
       $machine->sleep(10);
       $machine->screenshot("screen");
     '';

From 3e84523ed74a51e2a463c5811bbfc162d6f4e34f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 29 Dec 2016 16:25:58 +0100
Subject: [PATCH 0329/1310] aws-sdk-cpp: 1.0.43 -> 1.0.48

---
 .../libraries/aws-sdk-cpp/default.nix          |  6 ++----
 .../aws-sdk-cpp/s3-encryption-headers.patch    | 18 ------------------
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index bb07b41b059..54d490b77af 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -7,17 +7,15 @@
 
 stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.0.43";
+  version = "1.0.48";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "0sa0pkkbxxfn3h7b19yf296r5g5nqm4aqpwrkij0rq7jix9lxqj6";
+    sha256 = "1k73ir1w6457y9mdv2xnk8cr1y1xxhzzd4095rzvn2y7fr3zgz01";
   };
 
-  patches = [ ./s3-encryption-headers.patch ];
-
   # FIXME: might be nice to put different APIs in different outputs
   # (e.g. libaws-cpp-sdk-s3.so in output "s3").
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch b/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch
deleted file mode 100644
index 10e427a1509..00000000000
--- a/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/aws-cpp-sdk-s3-encryption/CMakeLists.txt b/aws-cpp-sdk-s3-encryption/CMakeLists.txt
-index 0a1a907..cf9ce0e 100644
---- a/aws-cpp-sdk-s3-encryption/CMakeLists.txt
-+++ b/aws-cpp-sdk-s3-encryption/CMakeLists.txt
-@@ -69,9 +69,9 @@ target_link_libraries(${PROJECT_NAME} ${PROJECT_LIBS})
- 
- setup_install()
- 
--install (FILES ${S3ENCRYPTION_HEADERS} DESTINATION include/aws/s3-encryption)
--install (FILES ${S3ENCRYPTION_MATERIALS_HEADERS} DESTINATION include/aws/s3-encryption/materials)
--install (FILES ${S3ENCRYPTION_HANDLERS_HEADERS} DESTINATION include/aws/s3-encryption/handlers)
--install (FILES ${S3ENCRYPTION_MODULES_HEADERS} DESTINATION include/aws/s3-encryption/modules)
-+install (FILES ${S3ENCRYPTION_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption)
-+install (FILES ${S3ENCRYPTION_MATERIALS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/materials)
-+install (FILES ${S3ENCRYPTION_HANDLERS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/handlers)
-+install (FILES ${S3ENCRYPTION_MODULES_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/modules)
- 
- do_packaging()

From 6d455dd1f8f47c4a3c9dc879676176f2c9232237 Mon Sep 17 00:00:00 2001
From: risicle <github@humanleg.org.uk>
Date: Thu, 29 Dec 2016 16:23:29 +0000
Subject: [PATCH 0330/1310] opencv 3.1.0: add patch fixing python use of
 FlannBasedMatcher.add (#21086)

Patch is from https://github.com/opencv/opencv/pull/6009. Upstream doesn't
seem particularly enthusiastic about a 3.1.x point release, so who knows
when this fix would otherwise see the light of day.
---
 pkgs/development/libraries/opencv/3.x.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 388167319c1..978b28aaa48 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -52,7 +52,11 @@ stdenv.mkDerivation rec {
         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";
+    });
 
   preConfigure =
     let ippicvVersion = "20151201";

From d7bda1ed40cc7271ea76477a1d63cdd2de8b70de Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 29 Dec 2016 17:36:55 +0100
Subject: [PATCH 0331/1310] clisp-tip: init at 2.50pre20161201. There hasn't
 been a release for quite some time, but there has been some development. It
 is rumored that the fresh version can be built on darwin, but I don't know
 and cannot test

---
 pkgs/development/interpreters/clisp/hg.nix | 97 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 98 insertions(+)
 create mode 100644 pkgs/development/interpreters/clisp/hg.nix

diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix
new file mode 100644
index 00000000000..b4930e7d57d
--- /dev/null
+++ b/pkgs/development/interpreters/clisp/hg.nix
@@ -0,0 +1,97 @@
+# there are the following linking sets:
+# - boot (not installed): without modules, only used when building clisp
+# - base (default): contains readline and i18n, regexp and syscalls modules
+#   by default
+# - full: contains base plus modules in withModules
+{ stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11
+, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
+, libffi
+, libffcall
+, coreutils
+# build options
+, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
+, x11Support ? (stdenv.isi686 || stdenv.isx86_64)
+, dllSupport ? true
+, withModules ? [
+    "pcre"
+    "rawsock"
+  ]
+  ++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ]
+  ++ stdenv.lib.optional x11Support "clx/new-clx"
+}:
+
+assert x11Support -> (libX11 != null && libXau != null && libXt != null
+  && libXpm != null && xproto != null && libXext != null && xextproto != null);
+
+stdenv.mkDerivation rec {
+  v = "2.50pre20161201";
+  name = "clisp-${v}";
+
+  src = fetchhg {
+    url = "http://hg.code.sf.net/p/clisp/clisp";
+    rev = "536a48";
+    sha256 = "097igsfpn8xipnjapyf5hx6smzh04v4ncskxl747xxn6pgpq813z";
+  };
+
+  inherit libsigsegv gettext coreutils;
+
+  ffcallAvailable = stdenv.isLinux && (libffcall != null);
+
+  buildInputs = [libsigsegv]
+  ++ stdenv.lib.optional (gettext != null) gettext
+  ++ stdenv.lib.optional (ncurses != null) ncurses
+  ++ stdenv.lib.optional (pcre != null) pcre
+  ++ stdenv.lib.optional (zlib != null) zlib
+  ++ stdenv.lib.optional (readline != null) readline
+  ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
+  ++ stdenv.lib.optional ffcallAvailable libffcall
+  ++ stdenv.lib.optionals x11Support [
+    libX11 libXau libXt libXpm xproto libXext xextproto
+  ];
+
+  # First, replace port 9090 (rather low, can be used)
+  # with 64237 (much higher, IANA private area, not
+  # anything rememberable).
+  # Also remove reference to a type that disappeared from recent glibc
+  # (seems the correct thing to do, found no reference to any solution)
+  postPatch = ''
+    sed -e 's@9090@64237@g' -i tests/socket.tst
+    sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
+    find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
+
+    substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" ""
+  '';
+
+  configureFlags = "builddir"
+  + stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules"
+  + stdenv.lib.optionalString (readline != null) " --with-readline"
+  # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
+  + stdenv.lib.optionalString (ffcallAvailable && (libffi != null)) " --with-dynamic-ffi"
+  + stdenv.lib.optionalString ffcallAvailable " --with-ffcall"
+  + stdenv.lib.optionalString (!ffcallAvailable) " --without-ffcall"
+  + stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules
+  + stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS";
+
+  preBuild = ''
+    sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
+    cd builddir
+  '';
+
+  postInstall =
+    stdenv.lib.optionalString (withModules != [])
+      (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''
+      + stdenv.lib.concatMapStrings (x: " " + x) withModules);
+
+  NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
+
+  # TODO : make mod-check fails
+  doCheck = false;
+
+  meta = {
+    description = "ANSI Common Lisp Implementation";
+    homepage = http://clisp.cons.org;
+    maintainers = with stdenv.lib.maintainers; [raskin tohl];
+    # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73b2510122e..465a872aa2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5437,6 +5437,7 @@ in
   ceptre = callPackage ../development/interpreters/ceptre { };
 
   clisp = callPackage ../development/interpreters/clisp { };
+  clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { };
 
   # compatibility issues in 2.47 - at list 2.44.1 is known good
   # for sbcl bootstrap.

From 1d0e91831be906e63bdcd9d32ff721b67462699b Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 25 Dec 2016 10:50:53 -0800
Subject: [PATCH 0332/1310] release-cross: Test for unchanged native
 derivations

These derivations do not care about the target platform, and thus should
not be affected by cross-compiling. Currently, these tests *fail*, but they
will be fixed soon by a latter PR. The release-cross job doesn't block a
channel, so this should be no problem.
---
 pkgs/top-level/release-cross.nix | 36 ++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index cbafc65195d..de64c2b3cc7 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -1,5 +1,7 @@
 with import ./release-lib.nix { supportedSystems = [ builtins.currentSystem ]; };
 let
+  lib = import ../../lib;
+
   nativePlatforms = linux;
 
   /* Basic list of packages to cross-build */
@@ -22,6 +24,40 @@ let
 in
 
 {
+  # These `nativeDrv`s should be identical to their vanilla ones --- cross
+  # compiling should not affect the native derivation.
+  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
+    # any special casing.
+    crossSystem = {
+      config = "foosys";
+      libc = "foolibc";
+    };
+
+    # Converting to a string (drv path) before checking equality is probably a
+    # 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;
+
+    testEqual = path: systems: forAllSupportedSystems systems (testEqualOne path);
+
+    mapTestEqual = lib.mapAttrsRecursive testEqual;
+
+  in mapTestEqual {
+    boehmgc = nativePlatforms;
+    libffi = nativePlatforms;
+    libiconv = nativePlatforms;
+    libtool = nativePlatforms;
+    zlib = nativePlatforms;
+    readline = nativePlatforms;
+    libxml2 = nativePlatforms;
+    guile = nativePlatforms;
+  };
+
+
   /* Test some cross builds to the Sheevaplug */
   crossSheevaplugLinux = let
     crossSystem = {

From d15c62a2a0135bb8968f17326ebda271748cb7f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 29 Dec 2016 18:00:56 +0100
Subject: [PATCH 0333/1310] haskellPackages.Glob: jailbreak to support GHC
 8.0.2-rc2

---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 +++
 1 file changed, 3 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 b01620e7a9a..27604897701 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -63,4 +63,7 @@ self: super: {
   # https://github.com/christian-marie/xxhash/issues/3
   xxhash = doJailbreak super.xxhash;
 
+  # https://github.com/Deewiant/glob/issues/8
+  Glob = doJailbreak super.Glob;
+
 }

From 9d03fe2dfbdc68e0d5b72f27226536796004a4fa Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 29 Dec 2016 22:30:05 +0300
Subject: [PATCH 0334/1310] qtcreator: 4.1.0 -> 4.2.0

---
 pkgs/development/qtcreator/default.nix | 10 +++++++---
 pkgs/top-level/all-packages.nix        |  4 +---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index 339ecab870a..1461e6232e6 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -6,17 +6,17 @@
 with stdenv.lib;
 
 let
-  baseVersion = "4.1";
+  baseVersion = "4.2";
   revision = "0";
-  version = "${baseVersion}.${revision}";
 in
 
 stdenv.mkDerivation rec {
   name = "qtcreator-${version}";
+  version = "${baseVersion}.${revision}";
 
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
-    sha256 = "00xlzw01ngza54ssmwz2ryahjlrbniy2q3p174xri1pxvcih4b21";
+    sha256 = "0yzj1i6hkzl9w1g8d5vidz7z6amwpj8p3cfibn9slf1sphxph18f";
   };
 
   buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs";
 
+  preBuild = optional withDocumentation ''
+    ln -s ${qtbase}/share/doc $NIX_QT5_TMP/share
+  '';
+
   postInstall = ''
     # Install desktop file
     mkdir -p "$out/share/applications"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 465a872aa2b..45da2f10e82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6455,9 +6455,7 @@ in
 
   premake = premake4;
 
-  qtcreator = qt5.callPackage ../development/qtcreator {
-    withDocumentation = false; # 'true' is currently broken with qt>=5.5
-  };
+  qtcreator = qt5.callPackage ../development/qtcreator { };
 
   r10k = callPackage ../tools/system/r10k { };
 

From bbd03e236a58e9344c91861513699e070186a3c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 29 Dec 2016 21:23:21 +0100
Subject: [PATCH 0335/1310] Use looser 9pfs caching in VM tests/builds

This can give significant speed ups, see
https://github.com/edolstra/linux/commit/7e20254412c780a2102761fee92cb1d32ceeaefd.
---
 nixos/modules/virtualisation/qemu-vm.nix  | 4 ++--
 pkgs/build-support/vm/default.nix         | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix           | 1 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 041c7dbec70..586f5d9c0a3 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -440,13 +440,13 @@ in
         ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} =
           { device = "store";
             fsType = "9p";
-            options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
+            options = [ "trans=virtio" "version=9p2000.L" "veryloose" ];
             neededForBoot = true;
           };
         "/tmp/xchg" =
           { device = "xchg";
             fsType = "9p";
-            options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
+            options = [ "trans=virtio" "version=9p2000.L" "veryloose" ];
             neededForBoot = true;
           };
         "/tmp/shared" =
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 47f61ab64d6..d03265c089a 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -130,7 +130,7 @@ rec {
 
     echo "mounting Nix store..."
     mkdir -p /fs${storeDir}
-    mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose
+    mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,veryloose
 
     mkdir -p /fs/tmp /fs/run /fs/var
     mount -t tmpfs -o "mode=1777" none /fs/tmp
@@ -139,7 +139,7 @@ rec {
 
     echo "mounting host's temporary directory..."
     mkdir -p /fs/tmp/xchg
-    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,cache=loose
+    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,veryloose
 
     mkdir -p /fs/proc
     mount -t proc none /fs/proc
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 1ad1155f8c3..68117e14181 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -175,4 +175,13 @@ rec {
       };
     };
 
+  p9_caching_4_4 = rec
+    { name = "9p-caching.patch";
+      patch = fetchpatch {
+        inherit name;
+        url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch;
+        sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2";
+      };
+    };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45da2f10e82..d9842aaede3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11069,6 +11069,7 @@ 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

From 02a839bffc2544ab2764d3573b24c2ffd763d233 Mon Sep 17 00:00:00 2001
From: Massimo Zaniboni <massimo.zaniboni@docmelody.com>
Date: Thu, 22 Dec 2016 00:01:04 +0100
Subject: [PATCH 0336/1310] pythonPackages.sphinxcontrib_newsfeed: init at
 0.1.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8cc49d53c70..f2ae3e4ecab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24571,6 +24571,22 @@ in {
     };
   });
 
+  sphinxcontrib_newsfeed = buildPythonPackage (rec {
+    name = "sphinxcontrib-newsfeed-${version}";
+    version = "0.1.4";
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/s/sphinxcontrib-newsfeed/${name}.tar.gz";
+      sha256 = "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p";
+    };
+
+    propagatedBuildInputs = with self; [sphinx];
+
+    meta = {
+      description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website";
+      homepage = http://bitbucket.org/prometheus/sphinxcontrib-newsfeed;
+      license = licenses.bsd2;
+    };
+  });
 
   sphinxcontrib_plantuml = buildPythonPackage (rec {
     name = "sphinxcontrib-plantuml-0.7";

From 11e8ed5ff4bf9930b321186c3e606b3320784a38 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 28 Dec 2016 19:14:24 -0500
Subject: [PATCH 0337/1310] Revert "Revert "openssh: security 7.3p1 -> 7.4p1""

This reverts commit 661b5a9875cbc37310da5ee53b47a1d121bb5660.
---
 ...H-1380296-NEWKEYS-null-pointer-deref.patch | 37 -------------------
 pkgs/tools/networking/openssh/default.nix     |  6 +--
 .../openssh/fix-CVE-2016-8858.patch           | 11 ------
 3 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
 delete mode 100644 pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch

diff --git a/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch b/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
deleted file mode 100644
index 665eff86453..00000000000
--- a/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/kex.c b/kex.c
-index 50c7a0f..823668b 100644
---- a/kex.c
-+++ b/kex.c
-@@ -419,6 +419,8 @@ kex_input_newkeys(int type, u_int32_t seq, void *ctxt)
- 	ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error);
- 	if ((r = sshpkt_get_end(ssh)) != 0)
- 		return r;
-+        if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0)
-+          return r;
- 	kex->done = 1;
- 	sshbuf_reset(kex->peer);
- 	/* sshbuf_reset(kex->my); */
-diff --git a/packet.c b/packet.c
-index d6dad2d..f96566b 100644
---- a/packet.c
-+++ b/packet.c
-@@ -38,7 +38,7 @@
-  */
- 
- #include "includes.h"
-- 
-+
- #include <sys/param.h>	/* MIN roundup */
- #include <sys/types.h>
- #include "openbsd-compat/sys-queue.h"
-@@ -1907,9 +1907,7 @@ ssh_packet_read_poll2(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
- 			return r;
- 		return SSH_ERR_PROTOCOL_ERROR;
- 	}
--	if (*typep == SSH2_MSG_NEWKEYS)
--		r = ssh_set_newkeys(ssh, MODE_IN);
--	else if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
-+	if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side)
- 		r = ssh_packet_enable_delayed_compress(ssh);
- 	else
- 		r = 0;
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 064f68947b8..ce323bae4e7 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
   # Please ensure that openssh_with_kerberos still builds when
   # bumping the version here!
   name = "openssh-${version}";
-  version = "7.3p1";
+  version = "7.4p1";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1k5y1wi29d47cgizbryxrhc1fbjsba2x8l5mqfa9b9nadnd9iyrz";
+    sha256 = "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv";
   };
 
   prePatch = optionalString hpnSupport
@@ -44,13 +44,11 @@ stdenv.mkDerivation rec {
 
   patches =
     [
-      ./RH-1380296-NEWKEYS-null-pointer-deref.patch
       ./locale_archive.patch
       ./fix-host-key-algorithms-plus.patch
 
       # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
       ./dont_create_privsep_path.patch
-      ./fix-CVE-2016-8858.patch
     ]
     ++ optional withGssapiPatches gssapiSrc;
 
diff --git a/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch b/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch
deleted file mode 100644
index e526161083c..00000000000
--- a/pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r1.126 -r1.127
---- ssh/kex.c	2016/09/28 21:44:52	1.126
-+++ ssh/kex.c	2016/10/10 19:28:48	1.127
-@@ -461,6 +461,7 @@
- 	if (kex == NULL)
- 		return SSH_ERR_INVALID_ARGUMENT;
- 
-+	ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
- 	ptr = sshpkt_ptr(ssh, &dlen);
- 	if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
- 		return r;

From 8ed4c8b73bee52f04499500020d4a0a750501789 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Dec 2016 09:49:19 -0500
Subject: [PATCH 0338/1310] openssh: 7.4p1 no longer backgrounds when systemd
 is starting it.

---
 nixos/modules/services/networking/ssh/sshd.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 073391ffdbb..80659f19c59 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -264,8 +264,7 @@ in
                 StandardInput = "socket";
               } else {
                 Restart = "always";
-                Type = "forking";
-                PIDFile = "/run/sshd.pid";
+                Type = "simple";
               });
           };
 
@@ -322,8 +321,6 @@ in
 
     services.openssh.extraConfig = mkOrder 0
       ''
-        PidFile /run/sshd.pid
-
         Protocol 2
 
         UsePAM yes

From bf659128a031842a479ea1cda8ca62772b23e6de Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Dec 2016 09:49:43 -0500
Subject: [PATCH 0339/1310] openssh: test that startWhenNeeded works

---
 nixos/tests/openssh.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index 390363b88e2..29154499688 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -35,6 +35,18 @@ in {
         ];
       };
 
+    server_lazy =
+      { config, pkgs, ... }:
+
+      {
+        services.openssh = { enable = true; startWhenNeeded = true; };
+        security.pam.services.sshd.limits =
+          [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ];
+        users.extraUsers.root.openssh.authorizedKeys.keys = [
+          snakeOilPublicKey
+        ];
+      };
+
     client =
       { config, pkgs, ... }: { };
 
@@ -50,6 +62,8 @@ in {
     subtest "manual-authkey", sub {
       $server->succeed("mkdir -m 700 /root/.ssh");
       $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
+      $server_lazy->succeed("mkdir -m 700 /root/.ssh");
+      $server_lazy->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
 
       $client->succeed("mkdir -m 700 /root/.ssh");
       $client->copyFileFromHost("key", "/root/.ssh/id_ed25519");
@@ -58,6 +72,10 @@ in {
       $client->waitForUnit("network.target");
       $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");
       $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024");
+
+      $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2");
+      $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024");
+
     };
 
     subtest "configured-authkey", sub {
@@ -66,6 +84,11 @@ in {
       $client->succeed("ssh -o UserKnownHostsFile=/dev/null" .
                        " -o StrictHostKeyChecking=no -i privkey.snakeoil" .
                        " server true");
+
+      $client->succeed("ssh -o UserKnownHostsFile=/dev/null" .
+                       " -o StrictHostKeyChecking=no -i privkey.snakeoil" .
+                       " server_lazy true");
+
     };
   '';
 })

From 0163f0c4276bccae683cf076903c8c304f1a0802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 29 Dec 2016 22:51:07 +0100
Subject: [PATCH 0340/1310] openssh: update the gssapi patch

Only building was tested.
---
 pkgs/tools/networking/openssh/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index ce323bae4e7..1c66900c06b 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -19,8 +19,10 @@ let
 
   # **please** update this patch when you update to a new openssh release.
   gssapiSrc = fetchpatch {
-    url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=477bb7636238c106f8cd7c868a8c0c5eabcfb3db";
-    sha256 = "1kcx2rw6z7y591vr60ww2m2civ0cx6f6awdpi66p1sric9b65si3";
+    name = "openssh-gssapi.patch";
+    url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian"
+        + "/patches/gssapi.patch?id=255b8554a50b5c75fca63f76b1ac837c0d4fb7aa";
+    sha256 = "0yg9iq7vb2fkvy36ar0jxk29pkw0h3dhv5vn8qncc3pgwx3617n2";
   };
 
 in

From eb01090301bff2cd72712cfd24b8773dae0e43cd Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 29 Dec 2016 17:45:15 -0500
Subject: [PATCH 0341/1310] ceph: mark as broken

---
 pkgs/tools/filesystems/ceph/generic.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index a5df46b6ba4..d21d790dac8 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -285,6 +285,9 @@ stdenv.mkDerivation {
     license = licenses.lgpl21;
     maintainers = with maintainers; [ ak wkennington ];
     platforms = platforms.unix;
+    # Broken because of https://lwn.net/Vulnerabilities/709844/
+    # and our version is quite out of date.
+    broken = true;
   };
 
   passthru.version = version;

From 0465b1407bc0b69c2b35e281fbafb615715ef280 Mon Sep 17 00:00:00 2001
From: Guillaume Koenig <guillaume.edward.koenig@gmail.com>
Date: Sun, 4 Dec 2016 17:25:35 +0100
Subject: [PATCH 0342/1310] enpass: fix install to work with browser extensions

---
 pkgs/tools/security/enpass/default.nix | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix
index f2e73e2749e..257af4645f6 100644
--- a/pkgs/tools/security/enpass/default.nix
+++ b/pkgs/tools/security/enpass/default.nix
@@ -1,7 +1,8 @@
 {stdenv, system, fetchurl, dpkg, openssl, xorg
 , glib, mesa, libpulseaudio, zlib, dbus, fontconfig, freetype
 , gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig
-, makeWrapper , makeDesktopItem, python, pythonPackages, lib}:
+, makeWrapper , makeDesktopItem, python, pythonPackages, lib
+, libredirect, lsof}:
 assert system == "i686-linux" || system == "x86_64-linux";
 let
   all_data = (with builtins; fromJSON (readFile ./data.json));
@@ -13,7 +14,7 @@ let
   data = (with builtins; getAttr (getAttr system system_map) all_data);
 
   baseUrl = http://repo.sinew.in;
-  
+
   # used of both wrappers and libpath
   libPath = lib.makeLibraryPath (with xorg; [
     openssl
@@ -66,28 +67,34 @@ let
       cp -r opt/Enpass/*  $out
       cp -r usr/* $out
       rm $out/bin/runenpass.sh
+      cp $out/bin/EnpassHelper/EnpassHelper{,.untampered}
 
       sed \
       	-i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \
-      	$out/share/applications/enpass.desktop 
+      	$out/share/applications/enpass.desktop
 
-      patchelf  \
-        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        $out/bin/Enpass
+      for i in $out/bin/{Enpass,EnpassHelper/EnpassHelper}; do
+        patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i
+      done
 
+      # The helper's sha256 sum must match, hence the use of libredirect.
+      # Also, lsof must be in the path for proper operation.
       wrapProgram $out/bin/Enpass \
         --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \
         --set QT_PLUGIN_PATH "$out/plugins" \
         --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \
         --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \
-        --set HIDE_TOOLBAR_LINE 0
+        --set HIDE_TOOLBAR_LINE 0 \
+        --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+        --set NIX_REDIRECTS "$out/bin/EnpassHelper/EnpassHelper=$out/bin/EnpassHelper/EnpassHelper.untampered" \
+        --prefix PATH : ${lsof}/bin
     '';
   };
   updater = {
     update = stdenv.mkDerivation rec {
       name = "enpass-update-script";
       SCRIPT =./update_script.py;
-      
+
       buildInputs = with pythonPackages; [python requests pathlib2 six attrs ];
       shellHook = ''
       exec python $SCRIPT --target pkgs/tools/security/enpass/data.json --repo ${baseUrl}
@@ -95,4 +102,4 @@ let
 
     };
   };
-in (package // {refresh = updater;}) 
+in (package // {refresh = updater;})

From 1cc599307fcb01775f5fe97eab1bf04fdc3fd049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 30 Dec 2016 03:59:33 +0100
Subject: [PATCH 0343/1310] neomutt: 20161104 -> 20161126

---
 .../networking/mailreaders/neomutt/default.nix           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 2033dfc8e91..57f633d2c99 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchFromGitHub, which, autoconf, automake, ncurses, perl
-, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl }:
+, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb }:
 
 stdenv.mkDerivation rec {
-  version = "20161104";
+  version = "20161126";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner = "neomutt";
     repo = "neomutt";
     rev = "neomutt-${version}";
-    sha256 = "070p18khvxsrcn30jhyrnagka5mgza9mi5vmrrr6xl8mpgkyrlaw";
+    sha256 = "10ycfya11pvwv0rdyyak56r6f8ia8yf0h8qyi904bbpvm8lqvqfd";
   };
 
   buildInputs =
     [ autoconf automake cyrus_sasl gdbm gpgme kerberos libidn ncurses
-      notmuch which openssl perl ];
+      notmuch which openssl perl lmdb ];
 
   configureFlags = [
     "--enable-debug"
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
     "--with-curses"
     "--with-regex"
     "--with-idn"
+    "--with-lmdb"
 
     # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
     "ac_cv_path_SENDMAIL=sendmail"

From 64f45520b972d5ea01c0ca0d0dad5245752a863f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 30 Dec 2016 05:33:53 +0100
Subject: [PATCH 0344/1310] dnscrypt-proxy: 1.7.0 -> 1.9.0

Release notes at:
https://github.com/jedisct1/dnscrypt-proxy/releases/tag/1.9.0

Packaging tweaks:
- No longer split man page, kind of pointless ...
- No longer install libtool files, they are now optional
---
 .../networking/dnscrypt-proxy/default.nix     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index 1eac3cf6c02..73dfd3ab9ba 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, libsodium, pkgconfig, systemd }:
+{ stdenv, fetchurl, pkgconfig, libsodium, systemd }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "dnscrypt-proxy-${version}";
-  version = "1.7.0";
+  version = "1.9.0";
 
   src = fetchurl {
     url = "https://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
-    sha256 = "1qw2nib0d5ia8581lbdnjxgn9c7pf2qw8vhpnnh1wjcjj3gpgbqx";
+    sha256 = "0v5rsn9zdakzn6rcf2qhjqfd2y4h8q0hj4xr5hwhvaskg213rsyp";
   };
 
   configureFlags = optional stdenv.isLinux "--with-systemd";
@@ -17,7 +17,19 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libsodium ] ++ optional stdenv.isLinux systemd;
 
-  outputs = [ "out" "man" ];
+  postInstall = ''
+    # 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 = {
     description = "A tool for securing communications between a client and a DNS resolver";

From a6df66e0d8a58a1eaa1f72a42cb319fde55a3488 Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Fri, 30 Dec 2016 00:34:13 -0500
Subject: [PATCH 0345/1310] ppl-address-book: init at 2.4.0

---
 .../office/ppl-address-book/Gemfile           |  2 +
 .../office/ppl-address-book/Gemfile.lock      | 34 +++++++
 .../office/ppl-address-book/default.nix       | 38 ++++++++
 .../office/ppl-address-book/gemset.nix        | 90 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 166 insertions(+)
 create mode 100644 pkgs/applications/office/ppl-address-book/Gemfile
 create mode 100644 pkgs/applications/office/ppl-address-book/Gemfile.lock
 create mode 100644 pkgs/applications/office/ppl-address-book/default.nix
 create mode 100644 pkgs/applications/office/ppl-address-book/gemset.nix

diff --git a/pkgs/applications/office/ppl-address-book/Gemfile b/pkgs/applications/office/ppl-address-book/Gemfile
new file mode 100644
index 00000000000..0039c436696
--- /dev/null
+++ b/pkgs/applications/office/ppl-address-book/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'ppl'
diff --git a/pkgs/applications/office/ppl-address-book/Gemfile.lock b/pkgs/applications/office/ppl-address-book/Gemfile.lock
new file mode 100644
index 00000000000..5054bb8b9c8
--- /dev/null
+++ b/pkgs/applications/office/ppl-address-book/Gemfile.lock
@@ -0,0 +1,34 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    colored (1.2)
+    greencard (0.0.5)
+    i18n (0.7.0)
+    inifile (2.0.2)
+    mail (2.5.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    morphine (0.1.1)
+    polyglot (0.3.5)
+    ppl (2.4.0)
+      colored (= 1.2)
+      greencard (= 0.0.5)
+      inifile (= 2.0.2)
+      mail (= 2.5.3)
+      morphine (= 0.1.1)
+      rugged (= 0.17.0.b6)
+    rugged (0.17.0.b6)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ppl
+
+BUNDLED WITH
+   1.12.5
diff --git a/pkgs/applications/office/ppl-address-book/default.nix b/pkgs/applications/office/ppl-address-book/default.nix
new file mode 100644
index 00000000000..1c48fc50842
--- /dev/null
+++ b/pkgs/applications/office/ppl-address-book/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, lib, bundlerEnv, ruby, makeWrapper, which }:
+
+let
+  pname = "ppl-address-book";
+
+  version = (import ./gemset.nix).ppl.version;
+
+  env = bundlerEnv rec {
+    name = "${pname}-env-${version}";
+    inherit ruby;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+
+    gemConfig.rugged = attrs: { buildInputs = [ which ]; };
+  };
+
+in stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  phases = [ "installPhase" ];
+
+  buildInputs = [ env makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/ppl $out/bin/ppl
+  '';
+
+  meta = with lib; {
+    description = "Address book software for command-line users";
+    homepage    = http://ppladdressbook.org/;
+    license     = with licenses; mit;
+    maintainers = with maintainers; [ chris-martin ];
+    platforms   = platforms.unix;
+  };
+
+}
diff --git a/pkgs/applications/office/ppl-address-book/gemset.nix b/pkgs/applications/office/ppl-address-book/gemset.nix
new file mode 100644
index 00000000000..e8229f6153f
--- /dev/null
+++ b/pkgs/applications/office/ppl-address-book/gemset.nix
@@ -0,0 +1,90 @@
+{
+  colored = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
+      type = "gem";
+    };
+    version = "1.2";
+  };
+  greencard = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11pxrl1w8c7m7rmnnmdaplrv53qgylyvkv8bzsfyjna7k16hynvq";
+      type = "gem";
+    };
+    version = "0.0.5";
+  };
+  i18n = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
+      type = "gem";
+    };
+    version = "0.7.0";
+  };
+  inifile = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03rpacxnrnisjhd2zhc7629ica958bkdbakicl5kipw1wbprck25";
+      type = "gem";
+    };
+    version = "2.0.2";
+  };
+  mail = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1afr3acz7vsvr4gp6wnrkw1iwbjhf14mh8g8mlm40r86wcwzr39k";
+      type = "gem";
+    };
+    version = "2.5.3";
+  };
+  mime-types = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
+      type = "gem";
+    };
+    version = "1.25.1";
+  };
+  morphine = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05aw93cijd1gq39ikw2dw3i2c79bjq05kvxrs81mqxqdlini5wwa";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  polyglot = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  ppl = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vpp4s12ggbk5kpl9z1i7vi9vvghgxrc8my35yk8knckg5waxg47";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  rugged = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "025rj3rkj5yxf4pjj1s8x4yzshlyni3hgrjwhggg54nvw6b688qi";
+      type = "gem";
+    };
+    version = "0.17.0.b6";
+  };
+  treetop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz";
+      type = "gem";
+    };
+    version = "1.4.15";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9842aaede3..23b70e40998 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14441,6 +14441,8 @@ in
 
   posterazor = callPackage ../applications/misc/posterazor { };
 
+  ppl-address-book = callPackage ../applications/office/ppl-address-book { };
+
   pqiv = callPackage ../applications/graphics/pqiv { };
 
   qiv = callPackage ../applications/graphics/qiv { };

From ebefef6f6d4914325e99527cd7217f4bd75d864c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 30 Dec 2016 15:27:28 +0800
Subject: [PATCH 0346/1310] nim: wrap gcc

---
 pkgs/development/compilers/nim/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 0dfdea6d3d1..c3eaf705986 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,26 +1,32 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, lib, fetchurl, makeWrapper, gcc }:
 
 stdenv.mkDerivation rec {
-  name = "nim-0.15.2";
+  name = "nim-${version}";
+  version = "0.15.2";
 
   src = fetchurl {
     url = "http://nim-lang.org/download/${name}.tar.xz";
     sha256 = "12pyzjx7x4hclzrf3zf6r1qjlp60bzsaqrz0rax2rak2c8qz4pch";
   };
 
+  buildInputs  = [ makeWrapper ];
+
   buildPhase   = "sh build.sh";
+
   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 ]}
     '';
 
   meta = with stdenv.lib;
     { description = "Statically typed, imperative programming language";
       homepage = http://nim-lang.org/;
       license = licenses.mit;
-      maintainers = with maintainers; [ ehmry ];
+      maintainers = with maintainers; [ ehmry peterhoeg ];
       platforms = platforms.linux ++ platforms.darwin; # arbitrary
     };
 }

From 74caf88a5856aa68d99828e23dd5a827c0e553a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 30 Dec 2016 10:22:19 +0100
Subject: [PATCH 0347/1310] impressive: 0.10.5 -> 0.11.1

fixes #21501
---
 pkgs/applications/office/impressive/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix
index 1a4461e2f8c..3232abfb268 100644
--- a/pkgs/applications/office/impressive/default.nix
+++ b/pkgs/applications/office/impressive/default.nix
@@ -1,9 +1,9 @@
 { fetchurl, stdenv, python2Packages, makeWrapper, lib
-, xpdf, mesa, freeglut }:
+, xpdf, mesa, SDL, freeglut }:
 
 let
   inherit (python2Packages) python pyopengl pygame setuptools pillow;
-  version = "0.10.5";
+  version = "0.11.1";
 in stdenv.mkDerivation {
     # This project was formerly known as KeyJNote.
     # See http://keyj.s2000.ws/?p=77 for details.
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
 
     src = fetchurl {
       url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz";
-      sha256 = "0fz1zahxlfjang53wn06svy4s4aw28c79v24gwadvjvv3h1g5wam";
+      sha256 = "0b3rmy6acp2vmf5nill3aknxvr9a5aawk1vnphkah61anxp62gsr";
     };
 
     # Note: We need to have `setuptools' in the path to be able to use
@@ -39,13 +39,13 @@ in stdenv.mkDerivation {
       # honors $LIBRARY_PATH.  See
       # http://python.net/crew/theller/ctypes/reference.html#id1 .
       wrapProgram "$out/bin/impressive" \
-         --prefix PATH ":" "${xpdf}" \
+         --prefix PATH ":" "${xpdf}/bin" \
          --prefix PYTHONPATH ":" \
                   ${lib.concatStringsSep ":"
                      (map (path:
                             path + "/lib/${python.libPrefix}/site-packages")
                           [ pillow pyopengl pygame setuptools ])} \
-         --prefix LIBRARY_PATH ":" "${lib.makeLibraryPath [ mesa freeglut ]}"
+         --prefix LIBRARY_PATH ":" "${lib.makeLibraryPath [ mesa freeglut SDL ]}"
     '';
 
     meta = {

From db90dd8de2e272728cea296c7d7b951b276f8718 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 30 Dec 2016 19:03:47 +0800
Subject: [PATCH 0348/1310] remarshal: 0.3.0 -> 0.6.0

---
 pkgs/development/tools/remarshal/default.nix | 21 +++++++++++--------
 pkgs/top-level/python-packages.nix           | 22 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix
index ecf919a9829..ac4a39f0692 100644
--- a/pkgs/development/tools/remarshal/default.nix
+++ b/pkgs/development/tools/remarshal/default.nix
@@ -1,20 +1,23 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, pythonPackages, fetchFromGitHub }:
 
-buildGoPackage rec {
-  name = "remarshal-${rev}";
-  rev = "0.3.0";
-  goPackagePath = "github.com/dbohdan/remarshal";
+pythonPackages.buildPythonApplication rec {
+  name = "remarshal-${version}";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
-    rev = "v${rev}";
     owner  = "dbohdan";
     repo   = "remarshal";
-    sha256 = "0lhsqca3lq3xvdwsmrngv4p6b7k2lkbfnxnk5qj6jdd5y7f4b496";
+    rev    = "v${version}";
+    sha256 = "0jslawpzghv3chamrfddnyn5p5068kjxy8d38fxvi5h06qgfb4wp";
   };
 
-  goDeps = ./deps.nix;
+  propagatedBuildInputs = with pythonPackages; [
+    dateutil
+    pytoml
+    pyyaml
+  ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Convert between TOML, YAML and JSON";
     license = licenses.mit;
     homepage = https://github.com/dbohdan/remarshal;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 15496a9dcc1..7849c955c00 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31653,6 +31653,28 @@ EOF
     };
   };
 
+  pytoml = buildPythonPackage rec {
+    name = "pytoml-${version}";
+    version = "0.1.11";
+
+    checkPhase = "${python.interpreter} test/test.py";
+
+    # fetchgit used to ensure test submodule is available
+    src = pkgs.fetchgit {
+      url = "${meta.homepage}.git";
+      rev = "refs/tags/v${version}";
+      sha256 = "1jiw04zk9ccynr8kb1vqh9r1p2kh0al7g7b1f94911iazg7dgs9j";
+    };
+
+    meta = {
+      description = "A TOML parser/writer for Python";
+      homepage    = https://github.com/avakar/pytoml;
+      license     = licenses.mit;
+      maintainers = with maintainers; [ peterhoeg ];
+    };
+
+  };
+
   ROPGadget = buildPythonPackage rec {
     name = "ROPGadget-5.4";
     src = pkgs.fetchurl {

From 970a09eb741b773384d2155c0a6fccba188c9072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=BB=D0=BE=20=D0=93=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=81=D1=8C=D0=BA=D0=B8=D0=B9=20=28Danylo=20Hlynskyi=29?=
 <abcz2.uprola@gmail.com>
Date: Fri, 30 Dec 2016 13:29:43 +0200
Subject: [PATCH 0349/1310] Fix typo

---
 nixos/modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 4fc8bf5428f..fea1c884953 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -178,7 +178,7 @@ in
         image. It significantly increases image size. Use that when
         you want to be able to keep all the sources needed to build your
         system or when you are going to install the system on a computer
-        with slow on non-existent network connection.
+        with slow or non-existent network connection.
       '';
     };
 

From dbde4eb4657fddca43b11db072ebe896063342ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 30 Dec 2016 12:28:03 +0100
Subject: [PATCH 0350/1310] gitAndTools.qgitGit: remove

It's rather old and abandoned, the source is dead, and our stable qgit
version seems more recent.  /cc @MarcWeber.
---
 .../git-and-tools/default.nix                 |  2 --
 .../git-and-tools/qgit/qgit-git.nix           | 21 -------------------
 2 files changed, 23 deletions(-)
 delete mode 100644 pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 994dcb38f80..92d41b2b31a 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -80,8 +80,6 @@ rec {
 
   qgit = callPackage ./qgit { };
 
-  qgitGit = callPackage ./qgit/qgit-git.nix { };
-
   stgit = callPackage ./stgit {
   };
 
diff --git a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix
deleted file mode 100644
index c3d3c77ad33..00000000000
--- a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, libXext, libX11, sourceFromHead }:
-
-stdenv.mkDerivation rec {
-  name = "qgit-git";
-
-  meta =
-  {
-    license = stdenv.lib.licenses.gpl2;
-    homepage = "http://digilander.libero.it/mcostalba/";
-    description = "Graphical front-end to Git";
-  };
-
-  # REGION AUTO UPDATE:    { name="qgit"; type="git"; url="git://git.kernel.org/pub/scm/qgit/qgit4.git"; }
-  src = sourceFromHead "qgit-a0252ed2a6a72b50e65d027adce8afa22e874277.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/qgit-a0252ed2a6a72b50e65d027adce8afa22e874277.tar.gz"; sha256 = "17e4727ac68b4f2e8503289d5b6a2c042547e7be133e7f8195b79e33eab61b93"; });
-  # END
-
-  buildInputs = [ qt4 libXext libX11 ];
-
-  nativeBuildInputs = [ qmake4Hook ];
-}

From 652a87018b9c86e02d7c7b5c627a19bd7b73543c Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Thu, 29 Dec 2016 04:13:27 -0500
Subject: [PATCH 0351/1310] googleAuthenticator: 1.0 -> 1.03

---
 .../linux/google-authenticator/default.nix      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index 0e5f6208382..119621d9278 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -1,27 +1,28 @@
-{ stdenv, lib, fetchurl, pam, qrencode }:
+{ stdenv, lib, fetchurl, autoreconfHook, pam, qrencode }:
 
 stdenv.mkDerivation rec {
-  name = "google-authenticator-1.0";
+  name = "google-authenticator-libpam-${version}";
+  version = "1.03";
 
   src = fetchurl {
-    url = "https://google-authenticator.googlecode.com/files/libpam-${name}-source.tar.bz2";
-    sha1 = "017b7d89989f1624e360abe02d6b27a6298d285d";
+    url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz";
+    sha256 = "0wb95z5v1w4sk0p7y9pbn4v95w9hrbf80vw9k2z2sgs0156ljkb7";
   };
 
-  buildInputs = [ pam ];
+  buildInputs = [ autoreconfHook pam ];
 
   preConfigure = ''
-    sed -i 's|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|' google-authenticator.c
+    sed -i "s|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|" src/google-authenticator.c
   '';
 
   installPhase = ''
     mkdir -p $out/bin $out/lib/security
-    cp pam_google_authenticator.so $out/lib/security
+    cp ./.libs/pam_google_authenticator.so $out/lib/security
     cp google-authenticator $out/bin
   '';
 
   meta = with lib; {
-    homepage = https://code.google.com/p/google-authenticator/;
+    homepage = https://github.com/google/google-authenticator-libpam;
     description = "Two-step verification, with pam module";
     license = licenses.asl20;
     maintainers = with maintainers; [ aneeshusa ];

From 59361a2a81bf86f203de5c6cb14801f4915c55e7 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@gmail.com>
Date: Fri, 30 Dec 2016 18:14:05 +0400
Subject: [PATCH 0352/1310] i2pd module: fix typo (#21525)

---
 nixos/modules/services/networking/i2pd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 578376764eb..abb7a4e9137 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -147,7 +147,7 @@ let
   host = ${tun.address}
   port = ${tun.port}
   inport = ${tun.inPort}
-  accesslist = ${concatStringSep "," tun.accessList}
+  accesslist = ${builtins.concatStringsSep "," tun.accessList}
   '')
   }
   '';

From 087c244c067a1bc881874bda8fd7b4dac2331fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 30 Dec 2016 16:18:18 +0100
Subject: [PATCH 0353/1310] fix #21521

---
 .../libraries/libpaper/default.nix            | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix
index 7bc4b316673..a423727b913 100644
--- a/pkgs/development/libraries/libpaper/default.nix
+++ b/pkgs/development/libraries/libpaper/default.nix
@@ -9,6 +9,25 @@ stdenv.mkDerivation rec {
     sha256 = "0zhcx67afb6b5r936w5jmaydj3ks8zh83n9rm5sv3m3k8q8jib1q";
   };
 
+  # The configure script of libpaper is buggy: it uses AC_SUBST on a headerfile
+  # to compile sysconfdir into the library. Autoconf however defines sysconfdir
+  # as "${prefix}/etc", which is not expanded by AC_SUBST so libpaper will look
+  # for config files in (literally, without expansion) '${prefix}/etc'. Manually
+  # setting sysconfdir fixes this issue.
+  preConfigure = ''
+    configureFlagsArray+=(
+      "--sysconfdir=$out/etc"
+    )
+  '';
+
+  # Set the default paper to letter (this is what libpaper uses as default as well,
+  # if you call getdefaultpapername()).
+  # The user can still override this with the PAPERCONF environment variable.
+  postInstall = ''
+    mkdir -p $out/etc
+    echo letter > $out/etc/papersize
+  '';
+
   meta = {
     description = "Library for handling paper characteristics";
     homepage = "http://packages.debian.org/unstable/source/libpaper";

From ea14a143572cc98f54ffa2a31510a2ce52f102ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 30 Dec 2016 16:54:41 +0100
Subject: [PATCH 0354/1310] man-db: make apropos search and not just behave
 like whatis

Before this fix, apropos behaved exactly like whatis and looked for
an exact match. Now, it actually provides the apropos-functionality
of searching.
---
 pkgs/tools/misc/man-db/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index 9c1dabc7584..8685b89d6d0 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -29,8 +29,11 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    for i in "$out/bin/"*; do
-      wrapProgram "$i" --prefix PATH : "${groff}/bin"
+    # apropos/whatis uses program name to decide whether to act like apropos or whatis
+    # (multi-call binary). `apropos` is actually just a symlink to whatis. So we need to
+    # make sure that we don't wrap symlinks (since that changes argv[0] to the -wrapped name)
+    find "$out/bin" -type f | while read file; do
+      wrapProgram "$file" --prefix PATH : "${groff}/bin"
     done
   '';
 

From cab497ee6da35745ac8f5dc8f5d4c10ce73ea3d4 Mon Sep 17 00:00:00 2001
From: Dhananjay Balan <dhananjay@cliqz.com>
Date: Fri, 30 Dec 2016 18:13:10 +0100
Subject: [PATCH 0355/1310] unbound 1.5.6 > 1.6.0

---
 pkgs/tools/networking/unbound/default.nix | 4 ++--
 pkgs/tools/networking/unbound/python.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 4362dc57e68..83d3d88729d 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.5.10";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "11lli8jgq4n917gcx6nw728g1hqc2lszwlxa5mdb78m2ri7qp6x3";
+    sha256 = "1dzsxyp34ianp08wk4vf13qzl5ss5rr9v1p8zr1aggfywrsbhzbb";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix
index 5d7096ab168..911afdd18bb 100644
--- a/pkgs/tools/networking/unbound/python.nix
+++ b/pkgs/tools/networking/unbound/python.nix
@@ -5,11 +5,11 @@ let
 in stdenv.mkDerivation rec {
   pname = "pyunbound";
   name = "${pname}-${version}";
-  version = "1.5.9";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/unbound-${version}.tar.gz";
-    sha256 = "01328cfac99ab5b8c47115151896a244979e442e284eb962c0ea84b7782b6990";
+    sha256 = "1dzsxyp34ianp08wk4vf13qzl5ss5rr9v1p8zr1aggfywrsbhzbb";
   };
 
   buildInputs = [ openssl expat libevent swig python ];

From 57c4ed837cf80b2566f3c7a5c833f5c0ea5e09fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 30 Dec 2016 18:12:53 +0100
Subject: [PATCH 0356/1310] chessx: disable parallel make

http://hydra.nixos.org/build/45653907
/cc maintainer @luispedro.
---
 pkgs/games/chessx/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index 404b3b90d7c..f1dd86d67b9 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -17,7 +17,9 @@ stdenv.mkDerivation rec {
    qmakeHook
   ];
 
-  enableParallelBuilding = true;
+  # RCC: Error in 'resources.qrc': Cannot find file 'i18n/chessx_da.qm'
+  #enableParallelBuilding = true;
+
   installPhase = ''
       runHook preInstall
       mkdir -p "$out/bin"

From 456cf826e01506ecf88bc0740ff3433fa5cc10f6 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 24 Dec 2016 15:16:19 -0500
Subject: [PATCH 0357/1310] rivet: 2.5.2 -> 2.5.3

---
 pkgs/development/libraries/physics/rivet/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index 775ee75f61f..b42ee7a3411 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -2,19 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "rivet-${version}";
-  version = "2.5.2";
+  version = "2.5.3";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
-    sha256 = "01agf0bswqvci8nwp67kvrlwc2k0sg1s0lxpq2a9q58l99v2gakh";
+    sha256 = "1r0x575ivvm68nnh9qlfvdra5298i047qcbxcg37ki2aaqq07qcr";
   };
 
   pythonPath = []; # python wrapper support
 
-  patches = [
-    ./key_val.patch
-    ./zaxis_fix.patch
-  ];
 
   latex = texlive.combine { inherit (texlive)
     scheme-basic

From 3dbf6b4a093fc42a2da85fe08daac69973125fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 30 Dec 2016 18:58:32 +0100
Subject: [PATCH 0358/1310] font-manager: fix missing icons

Fixes #21454, or at least most of it.
---
 pkgs/applications/misc/font-manager/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index 5f8d00ce996..6d67d3a340f 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
     gnome3.gucharmap
     gnome3.libgee
     gnome3.file-roller
+    gnome3.defaultIconTheme
   ];
 
   enableParallelBuilding = true;

From 10836bdd3675babf9898d729838be99ffa5904d0 Mon Sep 17 00:00:00 2001
From: Matthew Daiter <mdaiter8121@gmail.com>
Date: Fri, 30 Dec 2016 19:16:20 +0100
Subject: [PATCH 0359/1310] wxGTK29: fixed Darwin build

---
 pkgs/development/libraries/wxGTK-2.9/default.nix | 14 ++++++++++----
 pkgs/top-level/all-packages.nix                  |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix
index 82ba9daed80..b2f40978f51 100644
--- a/pkgs/development/libraries/wxGTK-2.9/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
 , gstreamer, gst_plugins_base, GConf, setfile
-, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
+, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
+, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
 }:
 
 assert withMesa -> mesa != null;
@@ -22,10 +23,12 @@ stdenv.mkDerivation {
     [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst_plugins_base GConf ]
     ++ optional withMesa mesa
-    ++ optional stdenv.isDarwin setfile;
+    ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
 
   nativeBuildInputs = [ pkgconfig ];
 
+  propagatedBuildInputs = optional stdenv.isDarwin AGL;
+
   configureFlags =
     [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
       (if compat24 then "--enable-compat24" else "--disable-compat24")
@@ -34,7 +37,7 @@ stdenv.mkDerivation {
     ++ optional withMesa "--with-opengl"
     ++ optionals stdenv.isDarwin
       # allow building on 64-bit
-      [ "--with-cocoa" "--enable-universal-binaries" ];
+      [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ];
 
   SEARCH_LIB = optionalString withMesa "${mesa}/lib";
 
@@ -46,6 +49,9 @@ stdenv.mkDerivation {
     substituteInPlace configure --replace \
       'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
       'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
+    substituteInPlace configure --replace \
+      "-framework System" \
+      -lSystem
   '';
 
   postInstall = "
@@ -60,6 +66,6 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
   
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; darwin ++ linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9c86813cf1..dbc70dbb416 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9670,6 +9670,7 @@ in
   wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
     inherit (gnome2) GConf;
     inherit (darwin.stubs) setfile;
+    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 

From d8659f24e62a3867f5fce630e978a907c6cf9856 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 27 Dec 2016 19:20:23 +0100
Subject: [PATCH 0360/1310] dnscrypt-proxy service: order before
 nss-lookup.target

---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 82bf178f4cb..462039803f8 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -263,6 +263,8 @@ in
     systemd.services.dnscrypt-proxy = {
       description = "dnscrypt-proxy daemon";
 
+      before = [ "nss-lookup.target" ];
+
       after = [ "network.target" ]
         ++ optional apparmorEnabled "apparmor.service"
         ++ optional useUpstreamResolverList "init-dnscrypt-proxy-statedir.service";

From b4c5916e85301bb39148678a069fb7b35a3d8dba Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 30 Dec 2016 19:54:42 +0100
Subject: [PATCH 0361/1310] cvsps: get source from Debian, fix build

The cobite.com urls seem to have disappeared or been moved.  I've failed
to find where they might have gone, so use debian's mirrored sources
instead.
---
 pkgs/applications/version-management/cvsps/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix
index 9bc4401e068..9137cc16c3b 100644
--- a/pkgs/applications/version-management/cvsps/default.nix
+++ b/pkgs/applications/version-management/cvsps/default.nix
@@ -1,9 +1,10 @@
 { fetchurl, stdenv, cvs, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "cvsps-2.1";
+  name = "cvsps-${version}";
+  version = "2.1";
   src = fetchurl {
-    url = "http://www.cobite.com/cvsps/${name}.tar.gz";
+    url = "mirror://debian/pool/main/c/cvsps/cvsps_${version}.orig.tar.gz";
     sha256 = "0nh7q7zcmagx0i63h6fqqkkq9i55k77myvb8h6jn2f266f5iklwi";
   };
 
@@ -17,6 +18,7 @@ stdenv.mkDerivation rec {
   installPhase = "make install prefix=$out";
 
   meta = {
+    description = ''A tool to generate CVS patch set information'';
     longDescription = ''
       CVSps is a program for generating `patchset' information from a
       CVS repository.  A patchset in this case is defined as a set of
@@ -25,5 +27,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.cobite.com/cvsps/;
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 25164720501d143fc27c2cea921c1ea92f14584d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 30 Dec 2016 20:05:13 +0100
Subject: [PATCH 0362/1310] cvsps: fetch patches from debian 2.1-7 sources

---
 .../cvsps/01_ignoretrunk.dpatch               |  23 ----
 .../cvsps/02_dynamicbufferalloc.dpatch        | 125 ------------------
 .../cvsps/03_diffoptstypo.dpatch              |  19 ---
 .../version-management/cvsps/default.nix      |  39 +++++-
 4 files changed, 34 insertions(+), 172 deletions(-)
 delete mode 100644 pkgs/applications/version-management/cvsps/01_ignoretrunk.dpatch
 delete mode 100644 pkgs/applications/version-management/cvsps/02_dynamicbufferalloc.dpatch
 delete mode 100644 pkgs/applications/version-management/cvsps/03_diffoptstypo.dpatch

diff --git a/pkgs/applications/version-management/cvsps/01_ignoretrunk.dpatch b/pkgs/applications/version-management/cvsps/01_ignoretrunk.dpatch
deleted file mode 100644
index 39185ae2bfa..00000000000
--- a/pkgs/applications/version-management/cvsps/01_ignoretrunk.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_ignoretrunk.dpatch by  <crafterm@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Ignore TRUNK branch name patch
-
-@DPATCH@
-
-diff -urN cvsps-2.1.orig/cvsps.c cvsps-2.1/cvsps.c
---- cvsps-2.1.orig/cvsps.c	2005-05-25 22:39:40.000000000 -0500
-+++ cvsps-2.1/cvsps.c	2005-06-19 23:07:20.000000000 -0500
-@@ -2104,6 +2109,11 @@
-     
-     if (!get_branch_ext(rev, eot, &leaf))
-     {
-+	if (strcmp(tag, "TRUNK") == 0)
-+	{
-+	    debug(DEBUG_STATUS, "ignoring the TRUNK branch/tag");
-+	    return;
-+	}
- 	debug(DEBUG_APPERROR, "malformed revision");
- 	exit(1);
-     }
diff --git a/pkgs/applications/version-management/cvsps/02_dynamicbufferalloc.dpatch b/pkgs/applications/version-management/cvsps/02_dynamicbufferalloc.dpatch
deleted file mode 100644
index 70ffb02a21a..00000000000
--- a/pkgs/applications/version-management/cvsps/02_dynamicbufferalloc.dpatch
+++ /dev/null
@@ -1,125 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_dynamicbufferalloc.dpatch by  <crafterm@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Dynamic buffer allocation
-
-@DPATCH@
-
-diff -urN cvsps-2.1-orig/cache.c cvsps-2.1/cache.c
---- cvsps-2.1-orig/cache.c	2005-05-25 22:39:40.000000000 -0500
-+++ cvsps-2.1/cache.c	2005-07-26 15:21:29.716569500 -0500
-@@ -108,10 +108,19 @@
-     int tag_flags = 0;
-     char branchbuff[LOG_STR_MAX] = "";
-     int branch_add = 0;
--    char logbuff[LOG_STR_MAX] = "";
-+    int logbufflen = LOG_STR_MAX + 1;
-+    char * logbuff = malloc(logbufflen);
-     time_t cache_date = -1;
-     int read_version;
- 
-+    if (logbuff == NULL)
-+    {
-+	debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in read_cache", logbufflen);
-+	exit(1);
-+    }
-+
-+    logbuff[0] = 0;
-+
-     if (!(fp = cache_open("r")))
- 	goto out;
- 
-@@ -299,8 +308,19 @@
- 	    else
- 	    {
- 		/* Make sure we have enough in the buffer */
--		if (strlen(logbuff)+strlen(buff)<LOG_STR_MAX)
--		    strcat(logbuff, buff);
-+		int len = strlen(buff);
-+		if (strlen(logbuff) + len >= LOG_STR_MAX)
-+		{
-+		    logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX);
-+		    char * newlogbuff = realloc(logbuff, logbufflen);
-+		    if (newlogbuff == NULL)
-+		    {
-+			debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in read_cache", logbufflen);
-+			exit(1);
-+		    }
-+		    logbuff = newlogbuff;
-+		}
-+		strcat(logbuff, buff);
- 	    }
- 	    break;
- 	case CACHE_NEED_PS_MEMBERS:
-@@ -332,6 +352,7 @@
-  out_close:
-     fclose(fp);
-  out:
-+    free(logbuff);
-     return cache_date;
- }
- 
-diff -urN cvsps-2.1-orig/cvsps.c cvsps-2.1/cvsps.c
---- cvsps-2.1-orig/cvsps.c	2005-05-25 22:39:40.000000000 -0500
-+++ cvsps-2.1/cvsps.c	2005-07-26 15:22:02.558230700 -0500
-@@ -265,7 +265,8 @@
-     PatchSetMember * psm = NULL;
-     char datebuff[20];
-     char authbuff[AUTH_STR_MAX];
--    char logbuff[LOG_STR_MAX + 1];
-+    int logbufflen = LOG_STR_MAX + 1;
-+    char * logbuff = malloc(logbufflen);
-     int loglen = 0;
-     int have_log = 0;
-     char cmd[BUFSIZ];
-@@ -273,6 +274,12 @@
-     char use_rep_buff[PATH_MAX];
-     char * ltype;
- 
-+    if (logbuff == NULL)
-+    {
-+	debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in load_from_cvs", logbufflen);
-+	exit(1);
-+    }
-+
-     if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG))
-     {
- 	ltype = "rlog";
-@@ -480,24 +487,22 @@
- 		 */
- 		if (have_log || !is_revision_metadata(buff))
- 		{
--		    /* if the log buffer is full, that's it.  
--		     * 
--		     * Also, read lines (fgets) always have \n in them
--		     * which we count on.  So if truncation happens,
--		     * be careful to put a \n on.
--		     * 
--		     * Buffer has LOG_STR_MAX + 1 for room for \0 if
--		     * necessary
--		     */
--		    if (loglen < LOG_STR_MAX)
-+		    /* If the log buffer is full, try to reallocate more. */
-+		    if (loglen < logbufflen)
- 		    {
- 			int len = strlen(buff);
- 			
--			if (len >= LOG_STR_MAX - loglen)
-+			if (len >= logbufflen - loglen)
- 			{
--			    debug(DEBUG_APPMSG1, "WARNING: maximum log length exceeded, truncating log");
--			    len = LOG_STR_MAX - loglen;
--			    buff[len - 1] = '\n';
-+			    debug(DEBUG_STATUS, "reallocating logbufflen to %d bytes for file %s", logbufflen, file->filename);
-+			    logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX);
-+			    char * newlogbuff = realloc(logbuff, logbufflen);
-+			    if (newlogbuff == NULL)
-+			    {
-+				debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in load_from_cvs", logbufflen);
-+				exit(1);
-+			    }
-+			    logbuff = newlogbuff;
- 			}
- 
- 			debug(DEBUG_STATUS, "appending %s to log", buff);
diff --git a/pkgs/applications/version-management/cvsps/03_diffoptstypo.dpatch b/pkgs/applications/version-management/cvsps/03_diffoptstypo.dpatch
deleted file mode 100644
index eb3818ed97e..00000000000
--- a/pkgs/applications/version-management/cvsps/03_diffoptstypo.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_diffoptstypo.dpatch by  <crafterm@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Diff opts typo fix
-
-@DPATCH@
-
---- cvsps-2.1-orig/cvsps.1	2005-05-26 05:39:40.000000000 +0200
-+++ cvsps-2.1/cvsps.1	2005-07-28 15:17:48.885112048 +0200
-@@ -83,7 +83,7 @@
- disable the use of rlog internally.  Note: rlog is
- required for stable PatchSet numbering.  Use with care.
- .TP
--.B \-\-diffs\-opts <option string>
-+.B \-\-diff\-opts <option string>
- send a custom set of options to diff, for example to increase
- the number of context lines, or change the diff format.
- .TP
diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix
index 9137cc16c3b..c1c28761a2a 100644
--- a/pkgs/applications/version-management/cvsps/default.nix
+++ b/pkgs/applications/version-management/cvsps/default.nix
@@ -1,17 +1,46 @@
-{ fetchurl, stdenv, cvs, zlib }:
+{ stdenv, fetchurl, fetchpatch, cvs, zlib }:
 
 stdenv.mkDerivation rec {
   name = "cvsps-${version}";
   version = "2.1";
+
   src = fetchurl {
     url = "mirror://debian/pool/main/c/cvsps/cvsps_${version}.orig.tar.gz";
     sha256 = "0nh7q7zcmagx0i63h6fqqkkq9i55k77myvb8h6jn2f266f5iklwi";
   };
 
-  # Patches from Debian's `cvsps-2.1-4'.
-  patches = [ ./01_ignoretrunk.dpatch
-              ./02_dynamicbufferalloc.dpatch
-	      ./03_diffoptstypo.dpatch ];
+  # Patches from https://sources.debian.net/src/cvsps/2.1-7/debian/patches
+  patches =
+    [ (fetchpatch {
+        url = "https://sources.debian.net/data/main/c/cvsps/2.1-7/debian/patches/01_ignoretrunk.patch";
+        sha256 = "1gzb97dw2a6bm0bmim7p7wvsn0r82y3a8n22ln6rbbkkd8vlnzcb";
+      })
+
+      (fetchpatch {
+        url = "https://sources.debian.net/data/main/c/cvsps/2.1-7/debian/patches/02_dynamicbufferalloc.patch";
+        sha256 = "0dm7azxnw0g9pdqkb3y4y2h047zgrclbh40av6c868wfp2j6l9sc";
+      })
+
+      (fetchpatch {
+        url = "https://sources.debian.net/data/main/c/cvsps/2.1-7/debian/patches/03_diffoptstypo.patch";
+        sha256 = "06n8652g7inpv8cgqir7ijq00qw1fr0v44m2pbmgx7ilmna2vrcw";
+      })
+
+      (fetchpatch {
+        url = "https://sources.debian.net/data/main/c/cvsps/2.1-7/debian/patches/05-inet_addr_fix.patch";
+        sha256 = "10w6px96dz8bb69asjzshvp787ccazmqnjsggqc4gwdal95q3cn7";
+      })
+
+      (fetchpatch {
+        url = "https://sources.debian.net/data/main/c/cvsps/2.1-7/debian/patches/fix-makefile";
+        sha256 = "0m92b55hgldwg6lwdaybbj0n3lw1b3wj2xkk1cz1ywq073bpf3jm";
+      })
+
+      (fetchpatch {
+        url = "https://sources.debian.net/data/main/c/cvsps/2.1-7/debian/patches/fix-manpage";
+        sha256 = "0gky14rhx82wv0gj8bkc74ki5xilhv5i3k1jc7khklr4lb6mmhpx";
+      })
+    ];
 
   buildInputs = [ cvs zlib ];
 

From f2c5bc6d7dabcda519cb9e6db8988081e16b1134 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 30 Dec 2016 20:07:38 +0100
Subject: [PATCH 0363/1310] cvsps: use standard install phase

---
 pkgs/applications/version-management/cvsps/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix
index c1c28761a2a..aa3bcb27394 100644
--- a/pkgs/applications/version-management/cvsps/default.nix
+++ b/pkgs/applications/version-management/cvsps/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cvs zlib ];
 
-  installPhase = "make install prefix=$out";
+  installFlags = [ "prefix=$(out)" ];
 
   meta = {
     description = ''A tool to generate CVS patch set information'';

From 9a5e34facad643a6231682db0ed3667a7b437166 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 30 Dec 2016 12:03:52 -0500
Subject: [PATCH 0364/1310] kakoune: 2016-12-10 -> 2016-12-30, fix on Darwin

---
 pkgs/applications/editors/kakoune/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 73ee7ed64cd..14b13c394f3 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -4,17 +4,18 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "kakoune-nightly-${version}";
-  version = "2016-12-10";
+  version = "2016-12-30";
   src = fetchFromGitHub {
     repo = "kakoune";
     owner = "mawww";
-    rev = "e44129577a010ebb4dc609b806104d3175659074";
-    sha256 = "1jkpbk6wa9x5nlv002y1whv6ddhqawxzbp3jcbzcb51cg8bz0b1l";
+    rev = "76c58aa022a896dc170c207ff821992ee354d934";
+    sha256 = "0hgpcp6444cyg4bm0a9ypywjwfh19qpqpfr5w0wcd2y3clnsvsdz";
   };
   buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ];
 
   buildPhase = ''
     sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' src/Makefile
+    substituteInPlace src/Makefile --replace "boost_regex-mt" "boost_regex"
     export PREFIX=$out
     (cd src && make )
   '';
@@ -28,6 +29,6 @@ stdenv.mkDerivation rec {
     description = "A vim inspired text editor";
     license = licenses.publicDomain;
     maintainers = with maintainers; [ vrthra ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 3c3e2dfd0a0a0ee734f9bb733cdf91560c5363bf Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 30 Dec 2016 12:32:03 -0500
Subject: [PATCH 0365/1310] fastnlo: init at 2.3.1pre-2212

---
 .../libraries/physics/fastnlo/default.nix     | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/physics/fastnlo/default.nix

diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix
new file mode 100644
index 00000000000..70368133706
--- /dev/null
+++ b/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, boost, lhapdf, root, yoda }:
+
+stdenv.mkDerivation rec {
+  name = "fastnlo_toolkit-${version}";
+  version = "2.3.1pre-2212";
+
+  src = fetchurl {
+    url = "http://fastnlo.hepforge.org/code/v23/${name}.tar.gz";
+    sha256 = "0xgnnwc002awvz6dhn7792jc8kdff843yjgvwmgcs60yvcj6blgp";
+  };
+
+  buildInputs = [ boost lhapdf root yoda ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    descritption = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes";
+    license      = stdenv.lib.licenses.gpl3;
+    homepage     = http://fastnlo.hepforge.org;
+    platforms    = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9842aaede3..cb9e18bdc39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17129,6 +17129,8 @@ in
 
   fastjet = callPackage ../development/libraries/physics/fastjet { };
 
+  fastnlo = callPackage ../development/libraries/physics/fastnlo { };
+
   geant4 = callPackage ../development/libraries/physics/geant4 {
     enableMultiThreading = true;
     enableG3toG4         = false;

From 8fb6895614e5c69b4994c0299c376bd5041dc6f9 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 30 Dec 2016 12:32:53 -0500
Subject: [PATCH 0366/1310] sherpa: init at 2.2.1

---
 .../science/physics/sherpa/default.nix        | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/science/physics/sherpa/default.nix

diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix
new file mode 100644
index 00000000000..d863964ad90
--- /dev/null
+++ b/pkgs/applications/science/physics/sherpa/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gfortran, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "sherpa-${version}";
+  version = "2.2.1";
+
+  src = fetchurl {
+    url = "http://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
+    sha256 = "13vkz6w8kqyv8sgy3mxnlps5ykml5rnlj50vjj0pp9rgbl5y8ali";
+  };
+
+  buildInputs = [ gfortran sqlite ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions";
+    license     = stdenv.lib.licenses.gpl2;
+    homepage    = https://sherpa.hepforge.org;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb9e18bdc39..768a6c0ce11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16777,6 +16777,8 @@ in
 
   sacrifice = callPackage ../applications/science/physics/sacrifice {};
 
+  sherpa = callPackage ../applications/science/physics/sherpa {};
+
   ### SCIENCE/PROGRAMMING
 
   plm = callPackage ../applications/science/programming/plm { };

From 2dd8aea4bbd5b7eb9cc3b9f173de9cfd6ef66e55 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 30 Dec 2016 12:33:51 -0500
Subject: [PATCH 0367/1310] mcgrid: init at 2.0.2

---
 .../libraries/physics/mcgrid/default.nix      | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/physics/mcgrid/default.nix

diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix
new file mode 100644
index 00000000000..033bf2f214f
--- /dev/null
+++ b/pkgs/development/libraries/physics/mcgrid/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, fastnlo, rivet, sherpa }:
+
+stdenv.mkDerivation rec {
+  name = "mcgrid-${version}";
+  version = "2.0.2";
+
+  src = fetchurl {
+    url = "http://www.hepforge.org/archive/mcgrid/${name}.tar.gz";
+    sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy";
+  };
+
+  buildInputs = [ fastnlo rivet ];
+
+  preConfigure = ''
+    substituteInPlace mcgrid.pc.in \
+      --replace "Cflags:" "Cflags: -std=c++11"
+  '';
+
+  CXXFLAGS = "-std=c++11";
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A software package that provides access to the APPLgrid and fastNLO interpolation tools for Monte Carlo event generator codes, allowing for fast and flexible variations of scales, coupling parameters and PDFs in cutting edge leading- and next-to-leading-order QCD calculations";
+    license     = stdenv.lib.licenses.gpl3;
+    homepage    = http://mcgrid.hepforge.org;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 768a6c0ce11..665d191b577 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17165,6 +17165,8 @@ in
 
   lhapdf = callPackage ../development/libraries/physics/lhapdf { };
 
+  mcgrid = callPackage ../development/libraries/physics/mcgrid { };
+
   nlojet = callPackage ../development/libraries/physics/nlojet { };
 
   pythia = callPackage ../development/libraries/physics/pythia { };

From a715adf960dad647e82d482c99cf2fb04f6b90f8 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Thu, 29 Dec 2016 13:26:05 -0800
Subject: [PATCH 0368/1310] matrix-synapse: 0.18.5 -> 0.18.6-rc2

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

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 00f9287bea5..7eac25afd78 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -24,13 +24,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.18.5";
+  version = "0.18.6-rc2";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "1l9vfx08alf71323jrfjjvcb7pww613dwxskdgc1bplnva4khj4f";
+    sha256 = "0alsby8hghhzgpzism2f9v5pmz91v20bd18nflfka79f3ss03h0q";
   };
 
   patches = [ ./matrix-synapse.patch ];

From b1ac86db875ab498b184630bdb5f856f5bea7c11 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 29 Dec 2016 21:04:29 +0100
Subject: [PATCH 0369/1310] libmd: init at 0.0.0

---
 pkgs/development/libraries/libmd/default.nix | 30 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/libmd/default.nix

diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix
new file mode 100644
index 00000000000..989670bc059
--- /dev/null
+++ b/pkgs/development/libraries/libmd/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "libmd";
+  version = "0.0.0";
+
+  src = fetchurl {
+    url = "https://archive.hadrons.org/software/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "121s73pgbqsnmy6xblbrkj9y44c5zzzpf2hcmh6zvcvg4dk26gzx";
+  };
+
+  buildInputs = [ autoreconfHook ];
+
+  # Writing the version to a .dist-version file is required for the get-version
+  # shell script because fetchgit removes the .git directory.
+  prePatch = ''
+    echo '${version}' > .dist-version;
+  '';
+
+  autoreconfPhase = "./autogen";
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.hadrons.org/software/${pname}/";
+    description = "Message Digest functions from BSD systems";
+    license = with licenses; [ bsd3 bsd2 isc beerware publicDomain ];
+    maintainers = with maintainers; [ primeos ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9d51d68c88..3d890d331c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8199,6 +8199,8 @@ in
 
   libmcs = callPackage ../development/libraries/libmcs { };
 
+  libmd = callPackage ../development/libraries/libmd { };
+
   libmemcached = callPackage ../development/libraries/libmemcached { };
 
   libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { };

From e9d60c5636a8ba2a9685a741d06641a4b86398f9 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 30 Dec 2016 15:58:03 -0500
Subject: [PATCH 0370/1310] libc++3.7: fix to use with modern compilers

Modern compiler will issue a following error whenever '#include <string>'
is done:

/nix/store/yxpwamjdapjcp53mmsdh1j2c9bc26h4k-libc++-3.7.1/include/c++/v1/string:1938:44:
error: 'basic_string<_CharT, _Traits, _Allocator>' is missing exception specification 'noexcept(is_nothrow_copy_constructible<allocator_type>::value)'
basic_string<_CharT, _Traits, _Allocator>::basic_string(const allocator_type& __a)
                                           ^
/nix/store/yxpwamjdapjcp53mmsdh1j2c9bc26h4k-libc++-3.7.1/include/c++/v1/string:1326:40:
note: previous declaration is here
    _LIBCPP_INLINE_VISIBILITY explicit basic_string(const allocator_type& __a)
                                       ^
1 error generated.

This happens because modern clang is more strict about checking
exception specification for forward declaration and definition.

http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/string?r1=242056&r2=242623&diff_format=h
---
 .../compilers/llvm/3.7/libc++/default.nix        |  5 ++++-
 .../compilers/llvm/3.7/libc++/r242056.patch      | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/llvm/3.7/libc++/r242056.patch

diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
index 62402142a12..1196645b923 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
@@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
     cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include")
   '';
 
-  patches = [ ./darwin.patch ];
+  patches = [
+    ./darwin.patch
+    ./r242056.patch
+  ];
 
   buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch b/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch
new file mode 100644
index 00000000000..96245e76653
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch
@@ -0,0 +1,16 @@
+--- a/include/string	2015/07/13 20:04:56	242056
++++ b/include/string	2015/07/18 20:40:46	242623
+@@ -1936,7 +1936,12 @@
+ template <class _CharT, class _Traits, class _Allocator>
+ inline _LIBCPP_INLINE_VISIBILITY
+ basic_string<_CharT, _Traits, _Allocator>::basic_string(const allocator_type& __a)
+-    : __r_(__a)
++#if _LIBCPP_STD_VER <= 14
++        _NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value)
++#else
++        _NOEXCEPT
++#endif
++: __r_(__a)
+ {
+ #if _LIBCPP_DEBUG_LEVEL >= 2
+     __get_db()->__insert_c(this);

From 0a16269198bdc71109e5c8b77b7e3ed5e601bdab Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 31 Dec 2016 02:13:04 +0400
Subject: [PATCH 0371/1310] Revert "releaseTools.debBuild: split checkinstall
 into separate phase"

---
 pkgs/build-support/release/debian-build.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index 74e061966bc..f4bc3e73056 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -16,14 +16,17 @@ with stdenv.lib;
 vmTools.runInLinuxImage (stdenv.mkDerivation (
 
   {
-    name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
-
     doCheck = true;
 
     prefix = "/usr";
 
-    prePhases = [ "installExtraDebsPhase" "sysInfoPhase" ];
-    postPhases = [ "debInstallPhase" ];
+    prePhases = "installExtraDebsPhase sysInfoPhase";
+  }
+
+  // removeAttrs args ["vmTools"] //
+
+  {
+    name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
 
     # !!! cut&paste from rpm-build.nix
     postHook = ''
@@ -69,12 +72,6 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
       mkdir -p $out/debs
       find . -name "*.deb" -exec cp {} $out/debs \;
 
-      eval "$postInstall"
-    '';
-
-    debInstallPhase = ''
-      eval "$preDebInstall"
-
       [ "$(echo $out/debs/*.deb)" != "" ]
 
       for i in $out/debs/*.deb; do
@@ -90,12 +87,12 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
         echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products
       done
 
-      eval "$postDebInstall"
+      eval "$postInstall"
     ''; # */
 
     meta = (if args ? meta then args.meta else {}) // {
       description = "Deb package for ${diskImage.fullName}";
     };
-  } // removeAttrs args ["name" "meta" "vmTools"]
+  }
 
 ))

From 6bded45883eb7f6ead12494917e1ecd92c3b4458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 30 Dec 2016 20:36:03 +0100
Subject: [PATCH 0372/1310] flex: 2.6.1 -> 2.6.3

This resolves some warnings and errors introduced in 2.6.x.
---
 pkgs/development/tools/parsing/flex/default.nix | 7 ++++---
 pkgs/os-specific/linux/libsepol/default.nix     | 4 ----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index 7ee2e27e60a..3bb34f5bc90 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, bison, m4 }:
 
 stdenv.mkDerivation rec {
-  name = "flex-2.6.1";
+  name = "flex-${version}";
+  version = "2.6.3";
 
   src = fetchurl {
-    url = "https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.gz";
-    sha256 = "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw";
+    url = "https://github.com/westes/flex/releases/download/v${version}/flex-${version}.tar.gz";
+    sha256 = "1an2cn2z85mkpgqcinh1fhhcd7993qm2lil1yxic8iz76ci79ck8";
   };
 
   buildInputs = [ bison ];
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index 3021ce20b46..0417bf59cfa 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -13,10 +13,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ flex ];
 
-  # Temporary work-around for problems after flex security update:
-  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835542
-  NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
-
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")

From 5776e6c99bb9bed65197792f803656a53f788911 Mon Sep 17 00:00:00 2001
From: Matthew Daiter <mdaiter8121@gmail.com>
Date: Sat, 31 Dec 2016 03:03:51 +0100
Subject: [PATCH 0373/1310] wxGTK30: added Darwin support

---
 pkgs/development/libraries/wxGTK-3.0/default.nix | 12 +++++++++---
 pkgs/top-level/all-packages.nix                  |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix
index 313e99f1087..5c45b29ec5c 100644
--- a/pkgs/development/libraries/wxGTK-3.0/default.nix
+++ b/pkgs/development/libraries/wxGTK-3.0/default.nix
@@ -2,6 +2,7 @@
 , gstreamer, gst_plugins_base, GConf, setfile
 , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
 , withWebKit ? false, webkitgtk2 ? null
+, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
 }:
 
 
@@ -26,10 +27,12 @@ stdenv.mkDerivation {
       gst_plugins_base GConf ]
     ++ optional withMesa mesa
     ++ optional withWebKit webkitgtk2
-    ++ optional stdenv.isDarwin setfile;
+    ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
 
   nativeBuildInputs = [ pkgconfig ];
 
+  propagatedBuildInputs = optional stdenv.isDarwin AGL;
+
   configureFlags =
     [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
       (if compat24 then "--enable-compat24" else "--disable-compat24")
@@ -38,7 +41,7 @@ stdenv.mkDerivation {
     ++ optional withMesa "--with-opengl"
     ++ optionals stdenv.isDarwin
       # allow building on 64-bit
-      [ "--with-cocoa" "--enable-universal-binaries" ]
+      [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]
     ++ optionals withWebKit
       ["--enable-webview" "--enable-webview-webkit"];
 
@@ -52,6 +55,9 @@ stdenv.mkDerivation {
     substituteInPlace configure --replace \
       'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
       'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
+    substituteInPlace configure --replace \
+      "-framework System" \
+      -lSystem
   '';
 
   postInstall = "
@@ -66,6 +72,6 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
   
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; darwin ++ linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 334ee02ebcc..cbc393531aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9686,6 +9686,7 @@ in
   wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix {
     inherit (gnome2) GConf;
     inherit (darwin.stubs) setfile;
+    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 

From 59dbcefaa74b940f9b7490c034dc4ff885fa2627 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 6 Dec 2016 21:31:10 +0100
Subject: [PATCH 0374/1310] physlock: git-20150126 -> 0.5

---
 pkgs/misc/screensavers/physlock/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix
index 683b7012058..e580c9efea8 100644
--- a/pkgs/misc/screensavers/physlock/default.nix
+++ b/pkgs/misc/screensavers/physlock/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "git-20150126";
-  name = "physlock-${version}";
+  version = "0.5";
+  name = "physlock-v${version}";
   src = fetchFromGitHub {
-    owner  = "muennich";
-    repo   = "physlock";
-    rev    = "b64dccc8c22710f8bf01eb5419590cdb0e65cabb";
-    sha256 = "1dapkwj3y6bb4j8q4glms7zsqm7drr37nrnr30sbahwq67rnvzcc";
+    owner = "muennich";
+    repo = "physlock";
+    rev = "v${version}";
+    sha256 = "102kdixrf7xxsxr69lbz73i1ss7959716cmdf8d5kbnhmk6argv7";
   };
 
   preConfigure = ''

From c7bff3d71d6ffa8fa4a2c0daa0b974ee011ce469 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 31 Dec 2016 09:12:41 +0100
Subject: [PATCH 0375/1310] calibre: 2.73.0 -> 2.76.0, fix html5lib, closes
 #21504

---
 pkgs/applications/misc/calibre/default.nix | 6 +++---
 pkgs/top-level/python-packages.nix         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index b98d327d3b8..5c05d1e1787 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.73.0";
+  version = "2.76.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "17qs7dakzd25wbshsny2x82ppdqa6kwwfbp2vp1i8qmfc1nq61gc";
+    sha256 = "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8";
   };
 
   patches = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow
     python pyqt5 sip
     # the following are distributed with calibre, but we use upstream instead
-    chardet cherrypy html5lib odfpy routes
+    chardet cherrypy html5lib_0_9999999 odfpy routes
   ]);
 
   installPhase = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 06fe9cbf1b2..d94c2021d3f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2808,7 +2808,7 @@ in {
     };
   };
 
-  # Needed for bleach 1.5.0
+  # Needed for bleach 1.5.0 and calibre 2.76.0
   html5lib_0_9999999 = self.html5lib.override rec {
     name = "html5lib-${version}";
     buildInputs = with self; [ nose flake8 ];

From 6c94d6437daa5d9d46ea3b4fc8cb4b4e6eb145cf Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Tue, 27 Dec 2016 22:06:31 +0100
Subject: [PATCH 0376/1310] nixos/glance: init at liberty version

This commit is based on initial works made by domenkozar.
---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../virtualisation/openstack/common.nix       |  30 +++
 .../virtualisation/openstack/glance.nix       | 249 ++++++++++++++++++
 4 files changed, 282 insertions(+)
 create mode 100644 nixos/modules/virtualisation/openstack/glance.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index eb6f8e70689..6ab4b24a349 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -281,6 +281,7 @@
       riak-cs = 263;
       infinoted = 264;
       keystone = 265;
+      glance = 266;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -532,6 +533,7 @@
       riak-cs = 263;
       infinoted = 264;
       keystone = 265;
+      glance = 266;
 
       # 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 cd12fe4f9b3..aa1ec0df018 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -632,4 +632,5 @@
   ./virtualisation/xen-dom0.nix
   ./virtualisation/xe-guest-utilities.nix
   ./virtualisation/openstack/keystone.nix
+  ./virtualisation/openstack/glance.nix
 ]
diff --git a/nixos/modules/virtualisation/openstack/common.nix b/nixos/modules/virtualisation/openstack/common.nix
index 3fce54a2fa5..2feb0a87395 100644
--- a/nixos/modules/virtualisation/openstack/common.nix
+++ b/nixos/modules/virtualisation/openstack/common.nix
@@ -51,4 +51,34 @@ rec {
 	      };
             };});
   };
+  
+  databaseOption = name: {
+    host = mkOption {
+      type = types.str;
+      default = "localhost";
+      description = ''
+        Host of the database.
+      '';
+    };
+
+    name = mkOption {
+      type = types.str;
+      default = name;
+      description = ''
+        Name of the existing database.
+      '';
+    };
+
+    user = mkOption {
+      type = types.str;
+      default = name;
+      description = ''
+        The database user. The user must exist and has access to
+        the specified database.
+      '';
+    };
+    password = mkSecretOption {
+      name = name + "MysqlPassword";
+      description = "The database user's password";};
+  };
 }
diff --git a/nixos/modules/virtualisation/openstack/glance.nix b/nixos/modules/virtualisation/openstack/glance.nix
new file mode 100644
index 00000000000..a7baee985b7
--- /dev/null
+++ b/nixos/modules/virtualisation/openstack/glance.nix
@@ -0,0 +1,249 @@
+{ config, lib, pkgs, ... }:
+
+with lib; with import ./common.nix {inherit lib;};
+
+let
+  cfg = config.virtualisation.openstack.glance;
+  commonConf = ''
+    [database]
+    connection = "mysql://${cfg.database.user}:${cfg.database.password.pattern}@${cfg.database.host}/${cfg.database.name}"
+    notification_driver = noop
+
+    [keystone_authtoken]
+    auth_url = ${cfg.authUrl}
+    auth_plugin = password
+    project_name = service
+    project_domain_id = default
+    user_domain_id = default
+    username = ${cfg.serviceUsername}
+    password = ${cfg.servicePassword.pattern}
+
+    [glance_store]
+    default_store = file
+    filesystem_store_datadir = /var/lib/glance/images/
+  '';
+  glanceApiConfTpl = pkgs.writeText "glance-api.conf" ''
+    ${commonConf}
+
+    [paste_deploy]
+    flavor = keystone
+    config_file = ${cfg.package}/etc/glance-api-paste.ini
+  '';
+  glanceRegistryConfTpl = pkgs.writeText "glance-registry.conf" ''
+    ${commonConf}
+
+    [paste_deploy]
+    config_file = ${cfg.package}/etc/glance-registry-paste.ini
+  '';
+  glanceApiConf = "/var/lib/glance/glance-api.conf";
+  glanceRegistryConf = "/var/lib/glance/glance-registry.conf";
+
+in {
+  options.virtualisation.openstack.glance = {
+    package = mkOption {
+      type = types.package;
+      example = literalExample "pkgs.glance";
+      description = ''
+        Glance package to use.
+      '';
+    };
+
+    enable = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        This option enables Glance as a single-machine
+        installation. That is, all of Glance's components are
+        enabled on this machine. This is useful for evaluating and
+        experimenting with Glance. Note we are currently not
+        providing any configurations for a multi-node setup.
+      '';
+    };
+
+    authUrl = mkOption {
+      type = types.str;
+      default = http://localhost:5000;
+      description = ''
+        Complete public Identity (Keystone) API endpoint. Note this is
+        unversionned.
+      '';
+    };
+
+    serviceUsername = mkOption {
+      type = types.str;
+      default = "glance";
+      description = ''
+        The Glance service username. This user is created if bootstrap
+        is enable, otherwise it has to be manually created before
+        starting this service.
+      '';
+    };
+
+    servicePassword = mkSecretOption {
+      name = "glanceAdminPassword";
+      description = ''
+        The Glance service user's password.
+      '';
+    };
+
+    database = databaseOption "glance";
+
+    bootstrap = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Bootstrap the Glance service by creating the service tenant,
+          an admin account and a public endpoint. This option provides
+          a ready-to-use glance service. This is only done at the
+          first Glance execution by the systemd post start section.
+          The keystone admin account is used to create required
+          Keystone resource for the Glance service.
+
+          <note><para> This option is a helper for setting up
+          development or testing environments.</para></note>
+        '';
+      };
+
+      endpointPublic = mkOption {
+        type = types.str;
+        default = "http://localhost:9292";
+        description = ''
+          The public image endpoint. The link <link
+          xlink:href="http://docs.openstack.org/liberty/install-guide-rdo/keystone-services.html">
+          create endpoint</link> provides more informations
+          about that.
+        '';
+      };
+
+      keystoneAdminUsername = mkOption {
+        type = types.str;
+        default = "admin";
+        description = ''
+          The keystone admin user name used to create the Glance account.
+        '';
+      };
+
+      keystoneAdminPassword = mkSecretOption {
+        name = "keystoneAdminPassword";
+        description = ''
+          The keystone admin user's password.
+        '';
+      };
+
+      keystoneAdminTenant = mkOption {
+        type = types.str;
+        default = "admin";
+        description = ''
+          The keystone admin tenant used to create the Glance account.
+        '';
+      };
+      keystoneAuthUrl = mkOption {
+        type = types.str;
+        default = "http://localhost:5000/v2.0";
+        description = ''
+          The keystone auth url used to create the Glance account.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # Note: when changing the default, make it conditional on
+    # ‘system.stateVersion’ to maintain compatibility with existing
+    # systems!
+    virtualisation.openstack.glance.package = mkDefault pkgs.glance;
+
+    users.extraUsers = [{
+      name = "glance";
+      group = "glance";
+      uid = config.ids.gids.glance;
+
+    }];
+    users.extraGroups = [{
+      name = "glance";
+      gid = config.ids.gids.glance;
+    }];
+
+    systemd.services.glance-registry = {
+      description = "OpenStack Glance Registry Daemon";
+      after = [ "network.target"];
+      path = [ pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        mkdir -m 775 -p /var/lib/glance/{images,scrubber,image_cache}
+        chown glance:glance /var/lib/glance/{images,scrubber,image_cache}
+
+        # Secret file managment
+        cp ${glanceRegistryConfTpl} ${glanceRegistryConf};
+        chown glance:glance ${glanceRegistryConf};
+        chmod 640 ${glanceRegistryConf}
+        ${replaceSecret cfg.database.password glanceRegistryConf}
+        ${replaceSecret cfg.servicePassword glanceRegistryConf}
+
+        cp ${glanceApiConfTpl} ${glanceApiConf};
+        chown glance:glance ${glanceApiConf};
+        chmod 640 ${glanceApiConf}
+        ${replaceSecret cfg.database.password glanceApiConf}
+        ${replaceSecret cfg.servicePassword glanceApiConf}
+
+        # Initialise the database
+        ${cfg.package}/bin/glance-manage --config-file=${glanceApiConf} --config-file=${glanceRegistryConf} db_sync
+      '';
+      postStart = ''
+        set -eu
+        export OS_AUTH_URL=${cfg.bootstrap.keystoneAuthUrl}
+        export OS_USERNAME=${cfg.bootstrap.keystoneAdminUsername}
+        export OS_PASSWORD=${getSecret cfg.bootstrap.keystoneAdminPassword}
+        export OS_TENANT_NAME=${cfg.bootstrap.keystoneAdminTenant}
+
+        # Wait until the keystone is available for use
+        count=0
+        while ! keystone user-get ${cfg.bootstrap.keystoneAdminUsername} > /dev/null
+        do
+            if [ $count -eq 30 ]
+            then
+                echo "Tried 30 times, giving up..."
+                exit 1
+            fi
+
+            echo "Keystone not yet started. Waiting for 1 second..."
+            count=$((count++))
+            sleep 1
+        done
+
+        # If the service glance doesn't exist, we consider glance is
+        # not initialized
+        if ! keystone service-get glance
+        then
+            keystone service-create --type image --name glance
+            ID=$(keystone service-get glance | awk '/ id / { print $4 }')
+            keystone endpoint-create --region RegionOne --service $ID --internalurl http://localhost:9292 --adminurl http://localhost:9292 --publicurl ${cfg.bootstrap.endpointPublic}
+
+            keystone user-create --name ${cfg.serviceUsername} --tenant service --pass ${getSecret cfg.servicePassword}
+            keystone user-role-add --tenant service --user ${cfg.serviceUsername} --role admin
+        fi
+        '';
+      serviceConfig = {
+        PermissionsStartOnly = true; # preStart must be run as root
+        TimeoutStartSec = "600"; # 10min for initial db migrations
+        User = "glance";
+        Group = "glance";
+        ExecStart = "${cfg.package}/bin/glance-registry --config-file=${glanceRegistryConf}";
+      };
+    };
+    systemd.services.glance-api = {
+      description = "OpenStack Glance API Daemon";
+      after = [ "glance-registry.service" "network.target"];
+      requires = [ "glance-registry.service" "network.target"]; 
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        PermissionsStartOnly = true; # preStart must be run as root
+        User = "glance";
+        Group = "glance";
+        ExecStart = "${cfg.package}/bin/glance-api --config-file=${glanceApiConf}";
+      };
+    };
+  };
+
+}

From 165089f9d7419df1bda1d33ebc8b08a4a9be1c20 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Thu, 29 Dec 2016 15:29:51 +0100
Subject: [PATCH 0377/1310] nixos/glance: add test

The test starts the glance service, creates a nixos image and ensures Glance
list it.

Note the test also starts the Keystone service since it is required
by Glance.
---
 nixos/release.nix      |  1 +
 nixos/tests/glance.nix | 77 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 nixos/tests/glance.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 366eecf773e..dfa9b67654f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -242,6 +242,7 @@ in rec {
   tests.firewall = callTest tests/firewall.nix {};
   tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; });
   #tests.gitlab = callTest tests/gitlab.nix {};
+  tests.glance = callTest tests/glance.nix {};
   tests.gocd-agent = callTest tests/gocd-agent.nix {};
   tests.gocd-server = callTest tests/gocd-server.nix {};
   tests.gnome3 = callTest tests/gnome3.nix {};
diff --git a/nixos/tests/glance.nix b/nixos/tests/glance.nix
new file mode 100644
index 00000000000..992b77227a4
--- /dev/null
+++ b/nixos/tests/glance.nix
@@ -0,0 +1,77 @@
+{ system ? builtins.currentSystem }:
+
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
+
+let
+  glanceMysqlPassword = "glanceMysqlPassword";
+  glanceAdminPassword = "glanceAdminPassword";
+
+  createDb = pkgs.writeText "db-provisionning.sql" ''
+    create database keystone;
+    GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY 'keystone';
+    GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY 'keystone';
+
+    create database glance;
+    GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'localhost' IDENTIFIED BY '${glanceMysqlPassword}';
+    GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'%' IDENTIFIED BY '${glanceMysqlPassword}';
+  '';
+
+  image =
+    (import ../lib/eval-config.nix {
+      inherit system;
+      modules = [ ../../nixos/modules/virtualisation/nova-image.nix ];
+    }).config.system.build.novaImage;
+
+  # The admin keystone account
+  adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=keystone OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack";
+
+in makeTest {
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ lewo ];
+  };
+  machine =
+    { config, pkgs, ... }:
+    {
+      services.mysql.enable = true;
+      services.mysql.package = pkgs.mysql;
+      services.mysql.initialScript = createDb;
+
+      virtualisation = {
+        openstack.keystone = {
+          enable = true;
+          database.password = { value = "keystone"; storage = "fromNixStore"; };
+          adminToken = { value = "adminToken"; storage = "fromNixStore"; };
+          bootstrap.enable = true;
+          bootstrap.adminPassword = { value = "keystone"; storage = "fromNixStore"; };
+        };
+
+        openstack.glance = {
+          enable = true;
+          database.password = { value = glanceMysqlPassword; storage = "fromNixStore"; };
+          servicePassword = { value = glanceAdminPassword; storage = "fromNixStore"; };
+
+          bootstrap = {
+            enable = true;
+            keystoneAdminPassword = { value = "keystone"; storage = "fromNixStore"; };
+          };
+        };
+
+        memorySize = 2096;
+        diskSize = 4 * 1024;
+        };
+
+      environment.systemPackages = with pkgs.pythonPackages; with pkgs; [
+        openstackclient
+      ];
+    };
+
+  testScript =
+    ''
+     $machine->waitForUnit("glance-api.service");
+
+     # Since Glance api can take time to start, we retry until success
+     $machine->waitUntilSucceeds("${adminOpenstackCmd} image create nixos --file ${image}/nixos.img --disk-format qcow2 --container-format bare --public");
+     $machine->succeed("${adminOpenstackCmd} image list") =~ /nixos/ or die;
+    '';
+}

From 49efa083c780cf24a65a90adf0caac4cb70df415 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Sat, 31 Dec 2016 09:10:22 +0100
Subject: [PATCH 0378/1310] nixos/glance: set default glance package

Before, it was overridden in the config section to avoid problem related
to manual generation.
---
 nixos/modules/virtualisation/openstack/glance.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/openstack/glance.nix b/nixos/modules/virtualisation/openstack/glance.nix
index a7baee985b7..4d85718e369 100644
--- a/nixos/modules/virtualisation/openstack/glance.nix
+++ b/nixos/modules/virtualisation/openstack/glance.nix
@@ -42,6 +42,7 @@ in {
   options.virtualisation.openstack.glance = {
     package = mkOption {
       type = types.package;
+      default = pkgs.glance;
       example = literalExample "pkgs.glance";
       description = ''
         Glance package to use.
@@ -149,11 +150,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    # Note: when changing the default, make it conditional on
-    # ‘system.stateVersion’ to maintain compatibility with existing
-    # systems!
-    virtualisation.openstack.glance.package = mkDefault pkgs.glance;
-
     users.extraUsers = [{
       name = "glance";
       group = "glance";

From 0cb52dc8364be8ee8a3ae87c6fdf6098fde8ee9d Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Sat, 31 Dec 2016 08:08:41 +0000
Subject: [PATCH 0379/1310] flexget: use html5lib 1.0b8

html5lib 1.0b9 made a breaking API change that requires beautifulsoup
4.5 or newer, which would require upgrading flexget to support.
---
 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 d94c2021d3f..072144b8ef2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11503,7 +11503,7 @@ in {
     buildInputs = with self; [ nose ];
     propagatedBuildInputs = with self; [
       paver feedparser sqlalchemy pyyaml rpyc
-      beautifulsoup_4_1_3 html5lib pyrss2gen pynzb progressbar jinja2 flask
+      beautifulsoup_4_1_3 html5lib_0_9999999 pyrss2gen pynzb progressbar jinja2 flask
       cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3
       guessit pathpy apscheduler ]
     # enable deluge and transmission plugin support, if they're installed

From 361dae67d49ac20dc4e568fe6d32e0a0dbbb5f1a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 31 Dec 2016 09:52:45 +0100
Subject: [PATCH 0380/1310] flexget: move out of python-packages.nix

because it is an application and not a library.
---
 nixos/modules/services/torrent/flexget.nix |  6 ++--
 pkgs/top-level/all-packages.nix            |  2 ++
 pkgs/top-level/python-packages.nix         | 32 ----------------------
 3 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix
index 1252aa1c549..4b9038e3e25 100644
--- a/nixos/modules/services/torrent/flexget.nix
+++ b/nixos/modules/services/torrent/flexget.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
   cfg = config.services.flexget;
-  pkg = pkgs.python27Packages.flexget;
+  pkg = pkgs.flexget;
   ymlFile = pkgs.writeText "flexget.yml" ''
     ${cfg.config}
 
@@ -54,12 +54,12 @@ in {
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.python27Packages.flexget ];
+    environment.systemPackages = [ pkg ];
 
     systemd.services = {
       flexget = {
         description = "FlexGet Daemon";
-        path = [ pkgs.pythonPackages.flexget ];
+        path = [ pkg ];
         serviceConfig = {
           User = cfg.user;
           Environment = "TZ=${config.time.timeZone}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63cce742d7b..96ea68a9dd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13009,6 +13009,8 @@ in
 
   flacon = callPackage ../applications/audio/flacon { };
 
+  flexget = callPackage ../applications/networking/flexget { };
+
   fldigi = callPackage ../applications/audio/fldigi { };
 
   fluidsynth = callPackage ../applications/audio/fluidsynth {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 072144b8ef2..da008a7d6a3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11488,38 +11488,6 @@ in {
     };
   };
 
-  flexget = buildPythonPackage rec {
-    version = "1.2.337";
-    name = "FlexGet-${version}";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/F/FlexGet/${name}.tar.gz";
-      sha256 = "0f7aaf0bf37860f0c5adfb0ba59ca228aa3f5c582131445623a4c3bc82d45346";
-    };
-
-    doCheck = false;
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [
-      paver feedparser sqlalchemy pyyaml rpyc
-      beautifulsoup_4_1_3 html5lib_0_9999999 pyrss2gen pynzb progressbar jinja2 flask
-      cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3
-      guessit pathpy apscheduler ]
-    # enable deluge and transmission plugin support, if they're installed
-    ++ stdenv.lib.optional (pkgs.config.pythonPackages.deluge or false)
-      pythonpackages.deluge
-    ++ stdenv.lib.optional (pkgs.transmission != null)
-      self.transmissionrpc;
-
-    meta = {
-      homepage = http://flexget.com/;
-      description = "Multipurpose automation tool for content like torrents";
-      license = licenses.mit;
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  };
-
   # py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067
   graph-tool = if isPy3k then throw "graph-tool in Nix doesn't support py3k yet"
     else callPackage ../development/python-modules/graph-tool/2.x.x.nix { boost = pkgs.boost159; };

From 9a330645d1b90e17d1238fe1a61ac9b460f9241b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 31 Dec 2016 10:02:30 +0100
Subject: [PATCH 0381/1310] flexget: forgot to include file in commit

---
 .../networking/flexget/default.nix            | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/applications/networking/flexget/default.nix

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
new file mode 100644
index 00000000000..caa5a3e0b7a
--- /dev/null
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, pythonPackages
+, fetchurl
+, transmission
+, deluge
+, config
+}:
+
+with pythonPackages;
+
+buildPythonPackage rec {
+  version = "1.2.337";
+  name = "FlexGet-${version}";
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "mirror://pypi/F/FlexGet/${name}.tar.gz";
+    sha256 = "0f7aaf0bf37860f0c5adfb0ba59ca228aa3f5c582131445623a4c3bc82d45346";
+  };
+
+  doCheck = false;
+
+  buildInputs = [ nose ];
+  propagatedBuildInputs = [
+    paver feedparser sqlalchemy pyyaml rpyc
+    beautifulsoup_4_1_3 html5lib_0_9999999 pyrss2gen pynzb progressbar jinja2 flask
+    cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3
+    guessit pathpy apscheduler ]
+  # enable deluge and transmission plugin support, if they're installed
+  ++ lib.optional (config.deluge or false) deluge
+  ++ lib.optional (transmission != null) transmissionrpc;
+
+  meta = {
+    homepage = http://flexget.com/;
+    description = "Multipurpose automation tool for content like torrents";
+    license = licenses.mit;
+    maintainers = with maintainers; [ domenkozar ];
+  };
+}
\ No newline at end of file

From 6210641031fadb93c3b6adbcb24a875f38531e38 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 31 Dec 2016 10:09:16 +0100
Subject: [PATCH 0382/1310] flexget: fix eval

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

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index caa5a3e0b7a..f7dd9618307 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = {
     homepage = http://flexget.com/;
     description = "Multipurpose automation tool for content like torrents";
-    license = licenses.mit;
-    maintainers = with maintainers; [ domenkozar ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ domenkozar ];
   };
 }
\ No newline at end of file

From 5f1ebf8ff41c62ca755eb9274a89118494d99574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 31 Dec 2016 11:10:35 +0100
Subject: [PATCH 0383/1310] rivet: fixup sandboxed build after update

There's no /bin/bash.  http://hydra.nixos.org/build/45754059
---
 pkgs/development/libraries/physics/rivet/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index b42ee7a3411..91b5881d1a8 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "1r0x575ivvm68nnh9qlfvdra5298i047qcbxcg37ki2aaqq07qcr";
   };
 
-  pythonPath = []; # python wrapper support
+  postPatch = "patchShebangs ./src/Analyses/cat_with_lines";
 
+  pythonPath = []; # python wrapper support
 
   latex = texlive.combine { inherit (texlive)
     scheme-basic

From 2dcbb8e81f9952b177ec7979669d7a7eb1a564d0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 30 Dec 2016 10:48:06 +0800
Subject: [PATCH 0384/1310] kirigami: add pre-release v2

It requires qt5.7
---
 pkgs/development/libraries/kirigami/v2.nix    | 23 +++++++++++++++++++
 .../libraries/qt-5/5.7/default.nix            |  1 +
 .../libraries/qt-5/5.7/qtquickcontrols2.nix   |  6 +++++
 pkgs/top-level/all-packages.nix               |  9 +++++++-
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/kirigami/v2.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix

diff --git a/pkgs/development/libraries/kirigami/v2.nix b/pkgs/development/libraries/kirigami/v2.nix
new file mode 100644
index 00000000000..8476eebfd50
--- /dev/null
+++ b/pkgs/development/libraries/kirigami/v2.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, ecm, pkgconfig, plasma-framework, qtbase, qtquickcontrols2 }:
+
+stdenv.mkDerivation rec {
+  pname = "kirigami";
+  version = "1.90.0";
+  name = "${pname}2-${version}";
+
+  src = fetchurl {
+    url = "mirror://kde/unstable/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "a5ca094a60d1cc48116cbed07bbe68be016773d2488a91e278859c90f59e64a8";
+  };
+
+  buildInputs = [ qtbase qtquickcontrols2 plasma-framework ];
+
+  nativeBuildInputs = [ cmake pkgconfig ecm ];
+
+  meta = with stdenv.lib; {
+    license = licenses.lgpl2;
+    homepage = http://www.kde.org;
+    maintainers = with maintainers; [ ttuegel peterhoeg ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix
index 9c35e814a04..d62bd3d1b51 100644
--- a/pkgs/development/libraries/qt-5/5.7/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/default.nix
@@ -82,6 +82,7 @@ let
         inherit (pkgs.gst_all_1) gstreamer gst-plugins-base;
       };
       qtquickcontrols = callPackage ./qtquickcontrols.nix {};
+      qtquickcontrols2 = callPackage ./qtquickcontrols2.nix {};
       qtscript = callPackage ./qtscript {};
       qtsensors = callPackage ./qtsensors.nix {};
       qtserialport = callPackage ./qtserialport {};
diff --git a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix
new file mode 100644
index 00000000000..19750f2fd99
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtquickcontrols2";
+  qtInputs = [ qtdeclarative ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6a3cd97a17..e0f5c08e380 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9082,7 +9082,14 @@ in
 
     grantlee = callPackage ../development/libraries/grantlee/5.x.nix { };
 
-    kirigami = callPackage ../development/libraries/kirigami { };
+    kirigami_1 = callPackage ../development/libraries/kirigami { };
+
+    kirigami_2 = callPackage ../development/libraries/kirigami/v2.nix {
+      # kirigami v2 requires qt 5.7 and above
+      inherit (qt57) qtbase qtquickcontrols2;
+    };
+
+    kirigami = kirigami_1;
 
     libcommuni = callPackage ../development/libraries/libcommuni { };
 

From 76923648afac56e817018e0903d6425b3455f201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 31 Dec 2016 12:18:31 +0100
Subject: [PATCH 0385/1310] nixos/gnome3: add gnome-settings-daemon udev rules
 (enables bluetooth GUI)

Without this, gnome-settings-daemon will not have write access to
/dev/rfkill, which in turn cause it to advertise no "airplane mode" over
D-Bus, which in turn the bluetooth panel code in gnome-control-center
interprets as "there are no bluetooth dongles" (and the button to turn
on bluetooth is grayed out). The end result that bluetooth operations
cannot be done in the GNOME desktop.

See upstream discussion:

http://lists.usefulinc.com/pipermail/gnome-bluetooth/2016-July/thread.html
http://lists.usefulinc.com/pipermail/gnome-bluetooth/2016-December/thread.html
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 5d1af09e7aa..17e84b1d9a1 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -123,6 +123,7 @@ in {
     services.packagekit.enable = mkDefault true;
     hardware.bluetooth.enable = mkDefault true;
     services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
+    services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ];
 
     fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];
 

From dc70cd102658c7632f39536d4437d646a65ed69b Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Mon, 26 Dec 2016 21:10:09 +0200
Subject: [PATCH 0386/1310] syncthing-gtk: 0.6.3 -> 0.9.2.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index da008a7d6a3..dee76b8bf29 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25056,19 +25056,28 @@ in {
   };
 
   syncthing-gtk = buildPythonPackage rec {
-    version = "0.6.3";
+    version = "0.9.2.3";
     name = "syncthing-gtk-${version}";
     src = pkgs.fetchFromGitHub {
       owner = "syncthing";
       repo = "syncthing-gtk";
       rev = "v${version}";
-      sha256 = "1qa5bw2qizjiqvkms8i31wsjf8cw9p0ciamxgfgq6n37wcalv6ms";
+      sha256 = "0chl0f0kp6z0z00d1f3xjlicjfr9rzabw39wmjr66fwb5w5hcc42";
     };
 
     disabled = isPy3k;
 
-    propagatedBuildInputs = with self; [ pkgs.syncthing dateutil pyinotify pkgs.libnotify pkgs.psmisc
-      pygobject3 pkgs.gtk3 ];
+    propagatedBuildInputs = with self; [ pkgs.syncthing dateutil pyinotify
+      pkgs.libnotify
+      (pkgs.librsvg.override { withGTK = true; })
+      pkgs.psmisc pygobject3 pkgs.gtk3
+    ];
+
+    preFixup = ''
+      wrapProgram $out/bin/syncthing-gtk \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
+    '';
 
     patchPhase = ''
       substituteInPlace "scripts/syncthing-gtk" \

From 68b2d43c883e1f402c856696834691a2419ef063 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 31 Dec 2016 13:51:10 +0100
Subject: [PATCH 0387/1310] lean: 2016-12-08 -> 2016-12-30

---
 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 d1f4bc0a414..af338338550 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 = "2016-12-08";
+  version = "2016-12-30";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
-    rev    = "7b63d6566faaf1dc0f2c8e873c61f51dce9ab618";
-    sha256 = "0xxr7dnh7pmdbpxhl3cq9clwamxjk54zcxplsrz6xirk0qy7ga4l";
+    rev    = "fd4fffea27c442b12a45f664a8680ebb47482ca3";
+    sha256 = "1izbjxbr1nvv5kv2b7qklqjx2b1qmwrxhmvk0f2lrl9pxz9h0bmd";
   };
 
   buildInputs = [ gmp mpfr cmake gperftools ];

From 9c61571f1a4119689d001bf1902869ca12f1c0b3 Mon Sep 17 00:00:00 2001
From: Falco Peijnenburg <fpeijnenburg@gmail.com>
Date: Sat, 31 Dec 2016 14:26:17 +0100
Subject: [PATCH 0388/1310] Strongswan: enable rdrand and aes-ni only on X86

Strongswan fails to compile on armv7l-linux with `--enable-aesni` and  `--enable-rdrand` enabled. Errors are thrown about impossible constraints in asm (`--enable-rdrand`) or about gcc getting unknown command line parameters about aes (`--enable-aesni`). The options only makes sense on X86_64 processors.

The rdrand plugin is designed for Ivy Bridge processors:

> High quality / high performance random source using the Intel rdrand instruction found on Ivy Bridge processors

The aes-ni plugin also only exists on X86 processors (which have the AES instruction set)

Tested with a local override. The change triggers a (successful) rebuild on my X86_64 system. On armv7-linux this change fixes build errors.

See:
https://wiki.strongswan.org/issues/337
---
 pkgs/tools/networking/strongswan/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 1791abf4a48..7bcbb4fddb6 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -37,8 +37,9 @@ stdenv.mkDerivation rec {
       "--enable-eap-mschapv2" "--enable-xauth-eap" "--enable-ext-auth"
       "--enable-forecast" "--enable-connmark" "--enable-acert"
       "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound"
-      "--enable-aesni" "--enable-af-alg" "--enable-rdrand" ]
-    ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock" 
+      "--enable-af-alg" ]
+    ++ stdenv.lib.optional stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ]
+    ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock"
     ++ stdenv.lib.optionals enableTNC [
          "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf"
          "--enable-curl" "--enable-openssl"

From 39366c14d8dd593f6bae9ae5ed1ae2064f68e1f6 Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Fri, 30 Dec 2016 18:42:10 +0100
Subject: [PATCH 0389/1310] gnome-encfs-manager: 1.8.16 -> 1.8.18

---
 pkgs/tools/security/gencfsm/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index 871ba1d8b85..fbd32cdc22d 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -1,19 +1,18 @@
 { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs
-, glib , gnome3, gtk3, libgnome_keyring, vala_0_23, wrapGAppsHook, xorg
-, libgee_0_6
+, glib , gnome3, gtk3, libgnome_keyring, vala, wrapGAppsHook, xorg
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.8.16";
+  version = "1.8.18";
   name = "gnome-encfs-manager-${version}";
 
   src = fetchurl {
-    url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.gz";
-    sha256 = "06sz6zcmvxkqww5gx4brcqs4hlpy9d8sal9nmw0pdsvh8k5vmpgn";
+    url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz";
+    sha256 = "1rpf683lxa78fmxxb0hnq7vdh3yn7qid2gqq67q9mk65sp9vdhdj";
   };
 
-  buildInputs = [ autoconf automake intltool libtool pkgconfig vala_0_23 glib encfs
-    gtk3 libgnome_keyring libgee_0_6 xorg.libSM xorg.libICE
+  buildInputs = [ autoconf automake intltool libtool pkgconfig vala glib encfs
+    gtk3 libgnome_keyring gnome3.libgee xorg.libSM xorg.libICE
     wrapGAppsHook ];
 
   patches = [ ./makefile-mkdir.patch ];
@@ -28,10 +27,10 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.libertyzero.com/GEncfsM/;
+    downloadPage = https://launchpad.net/gencfsm/;
     description = "EncFS manager and mounter with GNOME3 integration";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.spacefrogg ];
-    broken = true;
   };
 }

From fc50edf4979463de80a1c7a19818d1ed47eb9b46 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 31 Dec 2016 15:22:22 +0100
Subject: [PATCH 0390/1310] rofi: 1.2.0 -> 1.3.0

---
 pkgs/applications/misc/rofi/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index d6ff999b23d..c7da77a3a03 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git
 , cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.0";
+  version = "1.3.0";
   name = "rofi-${version}";
 
   src = fetchurl {
     url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz";
-    sha256 = "0xxx0xpxhrhlhi2axq9867zqrhwqavc1qrr833k1xr0pvm5m0aqc";
+    sha256 = "1a65ai93ygras5bi7wc0s5i3zqslzqlnw3klq3sdnp2p0d6hjjqn";
   };
 
   preConfigure = ''
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
     sed -i 's/~root/~nobody/g' test/helper-expand.c
   '';
 
-  buildInputs = [ autoreconfHook pkgconfig libxkbcommon pango cairo
-    libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm
+  buildInputs = [ autoreconfHook pkgconfig libxkbcommon pango cairo git
+    libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
   ];
   doCheck = true;
 

From ae5c3f6fc5c318a11e99387b94eecf700684f130 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 31 Dec 2016 15:37:41 +0100
Subject: [PATCH 0391/1310] nano: 2.7.2 -> 2.7.3

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

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 738476b98e2..0b45f9502fa 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -12,10 +12,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.7.2";
+  version = "2.7.3";
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "1hlhwgvzdgkc7k74fbbn49hn6vmvzqr7h8gclgl7r1c6qrrny0bp";
+    sha256 = "1z0bfyc5cvv83l3bjmlcwl49mpxrp65k5ffsfpnayfyjc18fy9nr";
   };
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
   buildInputs = [ ncurses ];

From 61027b7fcea9aef25b5a61700ccb21788365645f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 31 Dec 2016 18:06:11 +0100
Subject: [PATCH 0392/1310] bmon: 3.9 -> 4.0

---
 pkgs/tools/misc/bmon/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix
index 30412016e50..9c7eafe351f 100644
--- a/pkgs/tools/misc/bmon/default.nix
+++ b/pkgs/tools/misc/bmon/default.nix
@@ -1,23 +1,21 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, ncurses, confuse
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses, confuse
 , libnl }:
 
 stdenv.mkDerivation rec {
   name = "bmon-${version}";
-  version = "3.9";
+  version = "4.0";
 
   src = fetchFromGitHub {
     owner = "tgraf";
     repo = "bmon";
     rev = "v${version}";
-    sha256 = "1a4sj8pf02392zghr9wa1dc8x38fj093d4hg1fcakzrdjvrg1p2h";
+    sha256 = "1ilba872c09mnlvylslv4hqv6c9cz36l76q74rr99jvis1dg69gf";
   };
 
-  nativeBuildInputs = [ autoconf automake pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   buildInputs = [ ncurses confuse libnl ];
 
-  preConfigure = "sh ./autogen.sh";
-
   meta = with stdenv.lib; {
     description = "Network bandwidth monitor";
     homepage = https://github.com/tgraf/bmon;

From e3dedd4b57755153cb7e904720aa1ff18557bb3e Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Sat, 31 Dec 2016 14:59:30 -0500
Subject: [PATCH 0393/1310] darktable: 2.0.7 -> 2.2.0

---
 pkgs/applications/graphics/darktable/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index a9ad0210baa..ea5113246ba 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -11,12 +11,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "2.0.7";
+  version = "2.2.0";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "1aqxiaw89xdx0s0h3gb9nvdzw4690y3kp7h794sihf2581bn28m9";
+    sha256 = "3eca193831faae58200bb1cb6ef29e658bce43a81706b54420953a7c33d79377";
   };
 
   buildInputs =
@@ -34,6 +34,16 @@ stdenv.mkDerivation rec {
     "-DBUILD_USERMANUAL=False"
   ];
 
+  # darktable changed its rpath handling in commit
+  # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the
+  # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in
+  # the wrappers:
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable"
+    )
+  '';
+  
   meta = with stdenv.lib; {
     description = "Virtual lighttable and darkroom for photographers";
     homepage = https://www.darktable.org;

From 06b372f24f20dd36cc2b120dbaf0347041fefed3 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 31 Dec 2016 20:03:27 +0000
Subject: [PATCH 0394/1310] miredo: init at 1.2.6

---
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/networking/miredo.nix | 93 ++++++++++++++++++++
 pkgs/tools/networking/miredo/default.nix     | 34 +++++++
 pkgs/top-level/all-packages.nix              |  2 +
 4 files changed, 130 insertions(+)
 create mode 100644 nixos/modules/services/networking/miredo.nix
 create mode 100644 pkgs/tools/networking/miredo/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index cd12fe4f9b3..5900a4ce0d2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -392,6 +392,7 @@
   ./services/networking/minidlna.nix
   ./services/networking/miniupnpd.nix
   ./services/networking/mosquitto.nix
+  ./services/networking/miredo.nix
   ./services/networking/mstpd.nix
   ./services/networking/murmur.nix
   ./services/networking/namecoind.nix
diff --git a/nixos/modules/services/networking/miredo.nix b/nixos/modules/services/networking/miredo.nix
new file mode 100644
index 00000000000..e4422e7f5b0
--- /dev/null
+++ b/nixos/modules/services/networking/miredo.nix
@@ -0,0 +1,93 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.miredo;
+  pidFile = "/run/miredo.pid";
+  miredoConf = pkgs.writeText "miredo.conf" ''
+    InterfaceName ${cfg.interfaceName}
+    ServerAddress ${cfg.serverAddress}
+    ${optionalString (cfg.bindAddress != null) "BindAddress ${cfg.bindAddress}"}
+    ${optionalString (cfg.bindPort != null) "BindPort ${cfg.bindPort}"}
+  '';
+in
+{
+
+  ###### interface
+
+  options = {
+
+    services.miredo = {
+
+      enable = mkEnableOption "Whether miredo should be run on startup.";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.miredo;
+        defaultText = "pkgs.miredo";
+        description = ''
+          The package to use for the miredo daemon's binary.
+        '';
+      };
+
+      serverAddress = mkOption {
+        default = "teredo.remlab.net";
+        type = types.str;
+        description = ''
+          The hostname or primary IPv4 address of the Teredo server.
+          This setting is required if Miredo runs as a Teredo client.
+          "teredo.remlab.net" is an experimental service for testing only.
+          Please use another server for production and/or large scale deployments.
+        '';
+      };
+
+      interfaceName = mkOption {
+        default = "teredo";
+        type = types.str;
+        description = ''
+          Name of the network tunneling interface.
+        '';
+      };
+
+      bindAddress = mkOption {
+        default = null;
+        type = types.nullOr types.str;
+        description = ''
+          Depending on the local firewall/NAT rules, you might need to force
+          Miredo to use a fixed UDP port and or IPv4 address.
+        '';
+      };
+
+      bindPort = mkOption {
+        default = null;
+        type = types.nullOr types.str;
+        description = ''
+          Depending on the local firewall/NAT rules, you might need to force
+          Miredo to use a fixed UDP port and or IPv4 address.
+        '';
+      };
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.miredo = {
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      description = "Teredo IPv6 Tunneling Daemon";
+      serviceConfig = {
+        Restart = "always";
+        RestartSec = "5s";
+        ExecStartPre = "${cfg.package}/bin/miredo-checkconf -f ${miredoConf}";
+        ExecStart = "${cfg.package}/bin/miredo -c ${miredoConf} -p ${pidFile} -f";
+        ExecReload = "/bin/kill -HUP $MAINPID";
+      };
+    };
+
+  };
+
+}
diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix
new file mode 100644
index 00000000000..efe2847ae35
--- /dev/null
+++ b/pkgs/tools/networking/miredo/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, nettools, iproute, judy }:
+
+stdenv.mkDerivation rec {
+  version = "1.2.6";
+  name = "miredo-${version}";
+
+  buildInputs = [ judy ];
+
+  src = fetchurl {
+    url = "http://www.remlab.net/files/miredo/miredo-${version}.tar.xz";
+    sha256 = "0j9ilig570snbmj48230hf7ms8kvcwi2wblycqrmhh85lksd49ps";
+  };
+
+  postPatch = ''
+    substituteInPlace misc/client-hook.bsd \
+      --replace '/sbin/route' '${nettools}/bin/route' \
+      --replace '/sbin/ifconfig' '${nettools}/bin/ifconfig'
+    substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute}/bin/ip'
+  '';
+
+  configureFlags = [ "--with-Judy" ];
+
+  postInstall = ''
+    rm -rf $out/lib/systemd $out/var $out/etc/miredo/miredo.conf
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Teredo IPv6 Tunneling Daemon";
+    homepage = http://www.remlab.net/miredo/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.volth ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9fc474a5821..d6ef7e83760 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2801,6 +2801,8 @@ in
 
   minixml = callPackage ../development/libraries/minixml { };
 
+  miredo = callPackage ../tools/networking/miredo { };
+
   mjpegtoolsFull = callPackage ../tools/video/mjpegtools { };
 
   mjpegtools = self.mjpegtoolsFull.override {

From 4073aaa7e19d043f0cac4938102fa9cb528aeb92 Mon Sep 17 00:00:00 2001
From: tkatchev <tkatchev@gmail.com>
Date: Fri, 30 Dec 2016 22:22:15 +0300
Subject: [PATCH 0395/1310] makerpm: init at 1.0

---
 lib/maintainers.nix                        |  1 +
 pkgs/development/tools/makerpm/default.nix | 28 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/makerpm/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 5fa30e86374..d078aee7dc4 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -201,6 +201,7 @@
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
   igsha = "Igor Sharonov <igor.sharonov@gmail.com>";
   ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>";
+  ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>";
   j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>";
   jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>";
   javaguirre = "Javier Aguirre <contacto@javaguirre.net>";
diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix
new file mode 100644
index 00000000000..404f3758ced
--- /dev/null
+++ b/pkgs/development/tools/makerpm/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }: 
+
+stdenv.mkDerivation rec { 
+  version = "1.0";
+  name = "makerpm-${version}";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp makerpm $out/bin
+  '';
+
+  buildInputs = [ zlib libarchive openssl ];
+
+  src = fetchFromGitHub {
+    owner = "ivan-tkatchev";
+    repo = "makerpm";
+    rev = "${version}";
+    sha256 = "089dkbh5705ppyi920rd0ksjc0143xmvnhm8qrx93rsgwc1ggi1y";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ivan-tkatchev/makerpm/;
+    description = "A clean, simple RPM packager reimplemented completely from scratch";
+    license = licenses.free;
+    platforms = platforms.all;
+    maintainers = [ maintainers.ivan-tkatchev ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9842aaede3..d156e00ecc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2712,6 +2712,8 @@ in
 
   makemkv = callPackage ../applications/video/makemkv { };
 
+  makerpm = callPackage ../development/tools/makerpm { };
+
   # See https://github.com/NixOS/nixpkgs/issues/15849. I'm switching on isLinux because
   # it looks like gnulib is broken on non-linux, so it seems likely that this would cause
   # trouble on bsd and/or cygwin as well.

From 5195e0d70fd648e4d3e2c33dbe95537b4b480b81 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 31 Dec 2016 20:44:47 +0100
Subject: [PATCH 0396/1310] borgbackup: cleanup inputs

tox/detox are removed; they are used to test multiple python
implementations in parallel, which isn't really appropriate for a Nix
install check.  Also, because these were added to the propagated build
inputs, lots of unnecessary stuff ended up in the resulting closure.
Note that removing tox does not imply tests are not run; they never were
to begin with; this is a separate issue.

This fixes https://github.com/NixOS/nixpkgs/issues/16171

Also, for "correctness" ordinary build-time dependencies are added to
`buildInputs`; only inputs that are to be added to the python path are
added to `propagatedBuildInputs`.
---
 pkgs/tools/backup/borg/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 09c2dddd515..b27d5c834b1 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -15,11 +15,12 @@ python3Packages.buildPythonApplication rec {
     # For building documentation:
     sphinx sphinx_rtd_theme
   ];
-  propagatedBuildInputs = [
-    acl lz4 openssl
-  ] ++ (with python3Packages; [
-    cython msgpack llfuse tox detox setuptools_scm
-  ]);
+  buildInputs = [
+    acl lz4 openssl python3Packages.setuptools_scm
+  ];
+  propagatedBuildInputs = with python3Packages; [
+    cython llfuse msgpack
+  ];
 
   preConfigure = ''
     export BORG_OPENSSL_PREFIX="${openssl.dev}"

From dd45691fe04a49a5a28053f7f5b28ab33c2e5849 Mon Sep 17 00:00:00 2001
From: Ruslan Babayev <ruslan@babayev.com>
Date: Sat, 31 Dec 2016 16:22:52 -0800
Subject: [PATCH 0397/1310] dpdk: 16.07 -> 16.07.2

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

diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index 0f55fa963a4..cd561df0ec4 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -4,11 +4,11 @@ assert lib.versionAtLeast kernel.version "3.18";
 
 stdenv.mkDerivation rec {
   name = "dpdk-${version}-${kernel.version}";
-  version = "16.07";
+  version = "16.07.2";
 
   src = fetchurl {
-    url = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${version}.tar.gz";
-    sha256 = "1sgh55w3xpc0lb70s74cbyryxdjijk1fbv9b25jy8ms3lxaj966c";
+    url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
+    sha256 = "1mzwazmzpq8mvwiham80y6h53qpvjpp76v0d58gz9bfiphbi9876";
   };
 
   buildInputs = [ pkgconfig libvirt ];

From aeb41bbf754b1a9f8ddb815f5ad5f966fa82d25a Mon Sep 17 00:00:00 2001
From: Ruslan Babayev <ruslan@babayev.com>
Date: Sat, 31 Dec 2016 16:23:47 -0800
Subject: [PATCH 0398/1310] odp-dpdk: 2016-08-16 -> 1.12.0.0

---
 pkgs/os-specific/linux/odp-dpdk/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix
index e8b6cea08eb..8182394536c 100644
--- a/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/pkgs/os-specific/linux/odp-dpdk/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "odp-dpdk-${version}";
-  version = "2016-08-16";
+  version = "1.12.0.0";
 
   src = fetchgit {
     url = "https://git.linaro.org/lng/odp-dpdk.git";
-    rev = "7068593f600e2b5a23ee1780d5c722c54e966df1";
-    sha256 = "0pz0zkxqaac193x21wmj3x88gfza6bvhmv5yf8fzkpm9zxnl2sy4";
+    rev = "5e370e1113973feafb43a8e57d4c59be40e9aeab";
+    sha256 = "0rrakbxnbsqaj148xaz2hwxjvg3cmzlynfkvcp8w56sqyly75d0n";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
@@ -16,12 +16,6 @@ stdenv.mkDerivation rec {
   RTE_SDK = "${dpdk}";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
 
-  patchPhase = ''
-    substituteInPlace scripts/git_hash.sh --replace /bin/bash /bin/sh
-    substituteInPlace scripts/get_impl_str.sh --replace /bin/bash /bin/sh
-    echo -n ${version} > .scmversion
-  '';
-
   dontDisableStatic = true;
 
   configureFlags = [

From 605b8095ca11a678af83364549d8fc72ba3f4219 Mon Sep 17 00:00:00 2001
From: Ruslan Babayev <ruslan@babayev.com>
Date: Sat, 31 Dec 2016 16:43:11 -0800
Subject: [PATCH 0399/1310] pktgen: 3.0.13 -> 3.1.0

---
 pkgs/os-specific/linux/pktgen/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index 3ce9617ec5b..2aa4d26f913 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "pktgen-${version}";
-  version = "3.0.13";
+  version = "3.1.0";
 
   src = fetchurl {
-    url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.gz";
-    sha256 = "64629b454ed8dc036d5e9bb30b3ae84a0bab0142b651c72da85ab1454e9ae0d6";
+    url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-v${version}.tar.gz";
+    sha256 = "1a1dl8h8p76wlcjlvn736mz4nc2nc5c3764rlydiz86wl45mb0nb";
   };
 
   nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ];
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = [ "-march=core2" ];
 
-  postPatch = ''
-    substituteInPlace lib/lua/src/luaconf.h --replace /usr/local $out
-    substituteInPlace lib/common/wr_lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu
-  '';
-
   installPhase = ''
     install -d $out/bin
     install -m 0755 app/app/${RTE_TARGET}/app/pktgen $out/bin

From 7f0143b89dd480e866e337fc4cff55f960c27d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Sun, 1 Jan 2017 03:32:31 +0100
Subject: [PATCH 0400/1310] kcov: 29 -> 32

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

diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix
index cf5b974b50f..cbe6e5fdde9 100644
--- a/pkgs/development/tools/analysis/kcov/default.nix
+++ b/pkgs/development/tools/analysis/kcov/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "kcov-${version}";
-  version = "29";
+  version = "32";
 
   src = fetchurl {
     url = "https://github.com/SimonKagstrom/kcov/archive/v${version}.tar.gz";
-    sha256 = "0nspf1bfq8zv7zmcmvkbgg3c90k10qcd56gyg8ln5z64nadvha9d";
+    sha256 = "0ic5w6r3cpwb32iky1jmyvfclgkqr0rnfyim7j2r6im21846sa85";
   };
 
   preConfigure = "patchShebangs src/bin-to-c-source.py";

From 0d5a5307bee0c9fd303b1cda9473808797d84eeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 1 Jan 2017 05:13:46 +0100
Subject: [PATCH 0401/1310] iproute: remove broken fan patch

---
 .../iproute/1000-ubuntu-poc-fan-driver.patch  |  65 -------
 .../1001-ubuntu-poc-fan-driver-v3.patch       | 133 -------------
 .../1002-ubuntu-poc-fan-driver-vxlan.patch    | 177 ------------------
 pkgs/os-specific/linux/iproute/default.nix    |  12 +-
 4 files changed, 1 insertion(+), 386 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch
 delete mode 100644 pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch
 delete mode 100644 pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch

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
deleted file mode 100644
index e0c8278d488..00000000000
--- a/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: POC fan driver support
- POC Fan driver support
-Author: Jay Vosburgh <jay.vosburgh@canonical.com>
-
-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,
- 	IFLA_IPTUN_ENCAP_SPORT,
- 	IFLA_IPTUN_ENCAP_DPORT,
-+
-+	IFLA_IPTUN_FAN_UNDERLAY = 32,
-+
- 	__IFLA_IPTUN_MAX,
- };
- #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
-Index: iproute2-4.1.1/ip/link_iptnl.c
-===================================================================
---- iproute2-4.1.1.orig/ip/link_iptnl.c
-+++ iproute2-4.1.1/ip/link_iptnl.c
-@@ -66,6 +66,7 @@ static int iptunnel_parse_opt(struct lin
- 	__u32 link = 0;
- 	__u32 laddr = 0;
- 	__u32 raddr = 0;
-+	__u32 underlay = 0;
- 	__u8 ttl = 0;
- 	__u8 tos = 0;
- 	__u8 pmtudisc = 1;
-@@ -174,6 +175,9 @@ get_failed:
- 				raddr = get_addr32(*argv);
- 			else
- 				raddr = 0;
-+		} else if (strcmp(*argv, "underlay") == 0) {
-+			NEXT_ARG();
-+			underlay = get_addr32(*argv);
- 		} else if (strcmp(*argv, "local") == 0) {
- 			NEXT_ARG();
- 			if (strcmp(*argv, "any"))
-@@ -318,6 +322,9 @@ get_failed:
- 		}
- 	}
- 
-+	if (underlay)
-+		addattr32(n, 1024, IFLA_IPTUN_FAN_UNDERLAY, underlay);
-+
- 	return 0;
- }
- 
-@@ -349,6 +356,14 @@ static void iptunnel_print_opt(struct li
- 
- 	fprintf(f, "local %s ", local);
- 
-+	if (tb[IFLA_IPTUN_FAN_UNDERLAY]) {
-+		unsigned addr = rta_getattr_u32(tb[IFLA_IPTUN_FAN_UNDERLAY]);
-+
-+		if (addr)
-+			fprintf(f, "underlay %s ",
-+				format_host_r(AF_INET, 4, &addr, s1, sizeof(s1)));
-+	}
-+
- 	if (tb[IFLA_IPTUN_LINK] && rta_getattr_u32(tb[IFLA_IPTUN_LINK])) {
- 		unsigned link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);
- 		const char *n = if_indextoname(link, s2);
diff --git a/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch b/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch
deleted file mode 100644
index 634daa0de29..00000000000
--- a/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Description: Fan driver support v3
- Fan driver support v3
-Author: Jay Vosburgh <jay.vosburgh@canonical.com>
-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
-@@ -59,6 +59,7 @@ enum {
- 	IFLA_IPTUN_ENCAP_DPORT,
- 
- 	IFLA_IPTUN_FAN_UNDERLAY = 32,
-+	IFLA_IPTUN_FAN_MAP = 33,
- 
- 	__IFLA_IPTUN_MAX,
- };
-@@ -134,4 +135,20 @@ enum {
- };
- 
- #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)
-+
-+enum {
-+	IFLA_FAN_UNSPEC,
-+	IFLA_FAN_MAPPING,
-+	__IFLA_FAN_MAX,
-+};
-+
-+#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
-+
-+struct ip_tunnel_fan_map {
-+	__be32		underlay;
-+	__be32		overlay;
-+	__u16		underlay_prefix;
-+	__u16		overlay_prefix;
-+};
-+
- #endif /* _IF_TUNNEL_H_ */
-Index: iproute2-4.1.1/ip/link_iptnl.c
-===================================================================
---- iproute2-4.1.1.orig/ip/link_iptnl.c
-+++ iproute2-4.1.1/ip/link_iptnl.c
-@@ -49,6 +49,42 @@ static void usage(int sit)
- 	print_usage(stderr, sit);
- 	exit(-1);
- }
-+static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
-+{
-+	inet_prefix underlay, overlay;
-+	struct ip_tunnel_fan_map map;
-+	struct rtattr *nest;
-+	char **argv = *argvp;
-+	int argc = *argcp;
-+
-+	nest = addattr_nest(n, 1024, IFLA_IPTUN_FAN_MAP);
-+	while (argc > 0) {
-+		char *colon = strchr(*argv, ':');
-+
-+		if (!colon)
-+			break;
-+		*colon = '\0';
-+
-+		if (get_prefix(&overlay, *argv, AF_INET))
-+			invarg("invalid fan-map overlay", *argv);
-+		if (get_prefix(&underlay, colon + 1, AF_INET))
-+			invarg("invalid fan-map underlay", colon + 1);
-+		
-+		memcpy(&map.underlay, underlay.data, 4);
-+		map.underlay_prefix = underlay.bitlen;
-+		memcpy(&map.overlay, overlay.data, 4);
-+		map.overlay_prefix = overlay.bitlen;
-+
-+		argc--, argv++;
-+
-+		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));
-+	}
-+	addattr_nest_end(n, nest);
-+
-+	*argcp = argc;
-+	*argvp = argv;
-+	return 0;
-+}
- 
- static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
- 			      struct nlmsghdr *n)
-@@ -178,6 +214,10 @@ get_failed:
- 		} else if (strcmp(*argv, "underlay") == 0) {
- 			NEXT_ARG();
- 			underlay = get_addr32(*argv);
-+		} else if (strcmp(*argv, "fan-map") == 0) {
-+			NEXT_ARG();
-+			if (fan_parse_map(&argc, &argv, n))
-+				invarg("invalid fan-map", *argv);
- 		} else if (strcmp(*argv, "local") == 0) {
- 			NEXT_ARG();
- 			if (strcmp(*argv, "any"))
-@@ -328,6 +368,28 @@ get_failed:
- 	return 0;
- }
- 
-+static void fan_print_map(FILE *f, struct rtattr *attr)
-+{
-+	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
-+	struct ip_tunnel_fan_map *m;
-+	struct rtattr *i;
-+	int rem;
-+	int p;
-+
-+	fprintf(f, "fan-map ");
-+
-+	rem = RTA_PAYLOAD(attr);
-+	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
-+		p = RTA_PAYLOAD(i);
-+		m = RTA_DATA(i);
-+		fprintf(f, "%s/%d:%s/%d ",
-+			rt_addr_n2a_r(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN),
-+			m->overlay_prefix,
-+			rt_addr_n2a_r(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN),
-+			m->underlay_prefix);
-+	}
-+}
-+
- static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
- {
- 	char s1[1024];
-@@ -364,6 +426,9 @@ static void iptunnel_print_opt(struct li
- 				format_host(AF_INET, 4, &addr, s1, sizeof(s1)));
- 	}
- 
-+	if (tb[IFLA_IPTUN_FAN_MAP])
-+		fan_print_map(f, tb[IFLA_IPTUN_FAN_MAP]);
-+
- 	if (tb[IFLA_IPTUN_LINK] && rta_getattr_u32(tb[IFLA_IPTUN_LINK])) {
- 		unsigned link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);
- 		const char *n = if_indextoname(link, s2);
diff --git a/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch b/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch
deleted file mode 100644
index 070023d0b92..00000000000
--- a/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Description: Fan driver support VXLAN (p4)
- Fan driver setup support for vxlan interfaces.
-
-Index: iproute2-4.3.0/include/linux/if_link.h
-===================================================================
---- iproute2-4.3.0.orig/include/linux/if_link.h
-+++ iproute2-4.3.0/include/linux/if_link.h
-@@ -392,6 +392,7 @@ enum {
- 	IFLA_VXLAN_COLLECT_METADATA,
- 	IFLA_VXLAN_LABEL,
- 	IFLA_VXLAN_GPE,
-+	IFLA_VXLAN_FAN_MAP = 33,
- 	__IFLA_VXLAN_MAX
- };
- #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)
-Index: iproute2-4.3.0/include/linux/if_tunnel.h
-===================================================================
---- iproute2-4.3.0.orig/include/linux/if_tunnel.h
-+++ iproute2-4.3.0/include/linux/if_tunnel.h
-@@ -145,7 +145,7 @@ enum {
- 
- #define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
- 
--struct ip_tunnel_fan_map {
-+struct ifla_fan_map {
- 	__be32		underlay;
- 	__be32		overlay;
- 	__u16		underlay_prefix;
-Index: iproute2-4.3.0/ip/iplink_vxlan.c
-===================================================================
---- iproute2-4.3.0.orig/ip/iplink_vxlan.c
-+++ iproute2-4.3.0/ip/iplink_vxlan.c
-@@ -15,7 +15,10 @@
- #include <net/if.h>
- #include <linux/ip.h>
- #include <linux/if_link.h>
-+#include <linux/types.h>
- #include <arpa/inet.h>
-+#include <linux/in6.h>
-+#include <linux/if_tunnel.h>
- 
- #include "rt_names.h"
- #include "utils.h"
-@@ -43,6 +46,45 @@ static void explain(void)
- 	print_explain(stderr);
- }
- 
-+static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
-+{
-+	inet_prefix underlay, overlay;
-+	struct ifla_fan_map map;
-+	struct rtattr *nest;
-+	char **argv = *argvp;
-+	int argc = *argcp;
-+
-+	nest = addattr_nest(n, 1024, IFLA_VXLAN_FAN_MAP);
-+	while (argc > 0) {
-+		char *colon = strchr(*argv, ':');
-+
-+		if (!colon) {
-+			PREV_ARG();
-+			break;
-+		}
-+		*colon = '\0';
-+
-+		if (get_prefix(&overlay, *argv, AF_INET))
-+			invarg("invalid fan-map overlay", *argv);
-+		if (get_prefix(&underlay, colon + 1, AF_INET))
-+			invarg("invalid fan-map underlay", colon + 1);
-+
-+		memcpy(&map.underlay, underlay.data, 4);
-+		map.underlay_prefix = underlay.bitlen;
-+		memcpy(&map.overlay, overlay.data, 4);
-+		map.overlay_prefix = overlay.bitlen;
-+
-+		argc--, argv++;
-+
-+		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));
-+	}
-+	addattr_nest_end(n, nest);
-+
-+	*argcp = argc;
-+	*argvp = argv;
-+	return 0;
-+}
-+
- static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
- 			  struct nlmsghdr *n)
- {
-@@ -201,6 +243,10 @@ static int vxlan_parse_opt(struct link_u
- 			gbp = 1;
- 		} else if (!matches(*argv, "gpe")) {
- 			gpe = 1;
-+		} else if (!matches(*argv, "fan-map")) {
-+			NEXT_ARG();
-+			if (fan_parse_map(&argc, &argv, n))
-+				invarg("invalid fan-map", *argv);
- 		} else if (matches(*argv, "help") == 0) {
- 			explain();
- 			return -1;
-@@ -279,6 +325,28 @@ static int vxlan_parse_opt(struct link_u
- 	return 0;
- }
- 
-+static void fan_print_map(FILE *f, struct rtattr *attr)
-+{
-+	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
-+	struct ifla_fan_map *m;
-+	struct rtattr *i;
-+	int rem;
-+	int p;
-+
-+	fprintf(f, "fan-map ");
-+
-+	rem = RTA_PAYLOAD(attr);
-+	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
-+		p = RTA_PAYLOAD(i);
-+		m = RTA_DATA(i);
-+		fprintf(f, "%s/%d:%s/%d ",
-+			rt_addr_n2a_r(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN),
-+			m->overlay_prefix,
-+			rt_addr_n2a_r(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN),
-+			m->underlay_prefix);
-+	}
-+}
-+
- static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
- {
- 	__u32 vni;
-@@ -321,6 +389,9 @@ static void vxlan_print_opt(struct link_
- 		}
- 	}
- 
-+	if (tb[IFLA_VXLAN_FAN_MAP])
-+		fan_print_map(f, tb[IFLA_VXLAN_FAN_MAP]);
-+
- 	if (tb[IFLA_VXLAN_LOCAL]) {
- 		__be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_LOCAL]);
- 		if (addr)
-Index: iproute2-4.3.0/ip/link_iptnl.c
-===================================================================
---- iproute2-4.3.0.orig/ip/link_iptnl.c
-+++ iproute2-4.3.0/ip/link_iptnl.c
-@@ -49,10 +49,11 @@ static void usage(int sit)
- 	print_usage(stderr, sit);
- 	exit(-1);
- }
-+
- static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
- {
- 	inet_prefix underlay, overlay;
--	struct ip_tunnel_fan_map map;
-+	struct ifla_fan_map map;
- 	struct rtattr *nest;
- 	char **argv = *argvp;
- 	int argc = *argcp;
-@@ -61,8 +62,10 @@ static int fan_parse_map(int *argcp, cha
- 	while (argc > 0) {
- 		char *colon = strchr(*argv, ':');
- 
--		if (!colon)
-+		if (!colon) {
-+			PREV_ARG();
- 			break;
-+		}
- 		*colon = '\0';
- 
- 		if (get_prefix(&overlay, *argv, AF_INET))
-@@ -371,7 +374,7 @@ get_failed:
- static void fan_print_map(FILE *f, struct rtattr *attr)
- {
- 	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
--	struct ip_tunnel_fan_map *m;
-+	struct ifla_fan_map *m;
- 	struct rtattr *i;
- 	int rem;
- 	int p;
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 1ff68fc0408..aab2ecbcab9 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,6 +1,4 @@
-{ fetchurl, stdenv, lib, flex, bison, db, iptables, pkgconfig
-, enableFan ? false
-}:
+{ fetchurl, stdenv, lib, flex, bison, db, iptables, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "iproute2-${version}";
@@ -11,14 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "1i0n071hiqxw1gisngw2jln3kcp9sh47n6fj5hdwqrvp7w20zwy0";
   };
 
-  patches = lib.optionals enableFan [
-    # These patches were pulled from:
-    # https://launchpad.net/ubuntu/xenial/+source/iproute2
-    ./1000-ubuntu-poc-fan-driver.patch
-    ./1001-ubuntu-poc-fan-driver-v3.patch
-    ./1002-ubuntu-poc-fan-driver-vxlan.patch
-  ];
-
   preConfigure = ''
     patchShebangs ./configure
     sed -e '/ARPDDIR/d' -i Makefile

From 75ce71481842b0b9b1f81cd99cebf7aeba64243d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 1 Jan 2017 06:00:47 +0100
Subject: [PATCH 0402/1310] grsecurity: 4.8.15-201612151923 -> 201612301949

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 68117e14181..e54189b078a 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -96,8 +96,8 @@ rec {
 
   grsecurity_testing = grsecPatch
     { kver   = "4.8.15";
-      grrev  = "201612151923";
-      sha256 = "1di4v0b0sn7ibg9vrn8w7d5vjxd2mdlxdmqsnyd6xyn8g00fra89";
+      grrev  = "201612301949";
+      sha256 = "1083r30ipvdi3kjixlsp3f1mmf7848f2p32ds956caarvr4vkm3b";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 48f270db52b6b17d917e447eb236ccaac03c2b55 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 1 Jan 2017 01:36:45 +0100
Subject: [PATCH 0403/1310] make-system-tarball.sh: use numeric uids

Ownership should now always be 0/0.

Pointed out by @dezgeg at
https://github.com/NixOS/nixpkgs/pull/21305#discussion_r93258149
---
 nixos/lib/make-system-tarball.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh
index efb83d91428..73a009d8488 100644
--- a/nixos/lib/make-system-tarball.sh
+++ b/nixos/lib/make-system-tarball.sh
@@ -54,7 +54,7 @@ mkdir -p $out/tarball
 
 rm env-vars
 
-tar --sort=name --mtime='1970-01-01' -cvJf $out/tarball/$fileName.tar.xz * $extraArgs
+tar --sort=name --mtime='@1' --owner=0 --group=0 --numeric-owner -cvJf $out/tarball/$fileName.tar.xz * $extraArgs
 
 mkdir -p $out/nix-support
 echo $system > $out/nix-support/system

From 7a720abc03c5340cc84b6d053d07e66eb9e407ad Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 30 Dec 2016 16:30:13 +0800
Subject: [PATCH 0404/1310] nrpl: init at 20150521

---
 pkgs/development/tools/nrpl/default.nix | 44 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/tools/nrpl/default.nix

diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix
new file mode 100644
index 00000000000..d6a35723590
--- /dev/null
+++ b/pkgs/development/tools/nrpl/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, nim, pcre, tinycc }:
+
+stdenv.mkDerivation rec {
+  name = "nrpl-${version}";
+  version = "20150522";
+
+  src = fetchFromGitHub {
+    owner  = "wheineman";
+    repo   = "nrpl";
+    rev    = "6d6c189ab7d1c905cc29dc678d66e9e132026f69";
+    sha256 = "1cly9lhrawnc42r31b7r0p0i6hcx8r00aa17gv7w9pcpj8ngb4v2";
+  };
+
+  buildInputs = [ makeWrapper nim pcre ];
+
+  patches = [
+    (fetchpatch {
+      url    = https://patch-diff.githubusercontent.com/raw/wheineman/nrpl/pull/12.patch;
+      name   = "update_for_new_nim.patch";
+      sha256 = "1zff7inhn3l1jnxcnidy705lzi3wqib1chf4rayh1g9i23an7wg1";
+    })
+  ];
+
+  NIX_LDFLAGS = [
+    "-lpcre"
+  ];
+
+  buildPhase = "nim c -d:release nrpl.nim";
+
+  installPhase = "install -Dt $out/bin nrpl";
+
+  postFixup = ''
+    wrapProgram $out/bin/nrpl \
+      --prefix PATH : ${lib.makeBinPath [ nim tinycc ]}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "REPL for the Nim programming language";
+    homepage = https://github.com/wheineman/nrpl;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6a3cd97a17..90122df9d1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5223,6 +5223,7 @@ in
 
   nim = callPackage ../development/compilers/nim { };
   nimble = callPackage ../development/tools/nimble { };
+  nrpl = callPackage ../development/tools/nrpl { };
 
   neko = callPackage ../development/compilers/neko { };
 

From c08556fea52bd93a35596ee10f1d9c9fca490854 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 1 Jan 2017 14:18:36 +0800
Subject: [PATCH 0405/1310] dropbox: 16.4.29 -> 16.4.30

---
 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 20d50bd0f7a..e78230a74b4 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.29";
+  version = "16.4.30";
   sha256 =
     {
-      "x86_64-linux" = "0zng19qisbr3c9d312ar43p1b44xidabj4x2l3g3q85i300vj661";
-      "i686-linux"   = "0hc5fs0akc437valbxwlymk7ncjkdnhc51pja5bbiy48gqmd42bb";
+      "x86_64-linux" = "0inwc12d14i6gyfllxbhizb434a7vy0l5nvc07kz0bca7c4665wb";
+      "i686-linux"   = "0pdn8558ll317k3jrrjir90pn6abwbm99y9wzdq39wxj4dmrlh6w";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From ce99e34b17dea68234bbfe297b522bdd920859e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 1 Jan 2017 09:01:03 +0100
Subject: [PATCH 0406/1310] docker: deprecate socketActivation option

---
 nixos/modules/virtualisation/docker.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 92249573a4b..4b30a38f832 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -130,4 +130,8 @@ in
     }
   ]);
 
+  imports = [
+    (mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed in favor of starting docker at boot")
+  ];
+
 }

From db8c9ef3ffabd401004484158463526240a7e318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 1 Jan 2017 10:27:09 +0100
Subject: [PATCH 0407/1310] bcc: git-2016-08-30 -> 0.2.0

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

diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index d6593b4ee50..f3b262f1f7d 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -2,14 +2,14 @@
   flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }:
 
 stdenv.mkDerivation rec {
-  version = "git-2016-08-30";
+  version = "0.2.0";
   name = "bcc-${version}";
 
   src = fetchFromGitHub {
     owner = "iovisor";
     repo = "bcc";
-    rev = "4c2b5388f8d685a127a4d757c254a380e0aa915c";
-    sha256 = "1bd4darmr60vfr5414zq0bd9rq42r6h3cwiiwjllksbi4v2jvx77";
+    rev = "v${version}";
+    sha256 = "1xifh8lcqmn4mk6w4srjf4zk6mlwgck4fpcyhhliy39963ch5k08";
   };
 
   buildInputs = [ makeWrapper cmake llvmPackages.llvm llvmPackages.clang-unwrapped kernel

From 11fe837758d87cea8865159486cb0dcd34870436 Mon Sep 17 00:00:00 2001
From: Robin Stumm <dermetfan@users.noreply.github.com>
Date: Sun, 1 Jan 2017 11:44:07 +0100
Subject: [PATCH 0408/1310] rename sound.enableMediaKeys to
 sound.mediaKeys.enable and add volumeStep

---
 nixos/modules/rename.nix              |  3 ++
 nixos/modules/services/audio/alsa.nix | 41 ++++++++++++++++++---------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index a89ce2c743d..8102e0e1f64 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -150,6 +150,9 @@ with lib;
     # tarsnap
     (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives.<name>.cachedir")
 
+    # alsa
+    (mkRenamedOptionModule [ "sound" "enableMediaKeys" ] [ "sound" "mediaKeys" "enable" ])
+
     # Options that are obsolete and have no replacement.
     (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
     (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")
diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index c63f4dc8d7f..53786dbc627 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -33,16 +33,6 @@ in
         '';
       };
 
-      enableMediaKeys = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable volume and capture control with keyboard media keys.
-
-          Enabling this will turn on <option>services.actkbd</option>.
-        '';
-      };
-
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -54,6 +44,31 @@ in
         '';
       };
 
+      mediaKeys = {
+
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Whether to enable volume and capture control with keyboard media keys.
+
+            Enabling this will turn on <option>services.actkbd</option>.
+          '';
+        };
+
+        volumeStep = mkOption {
+          type = types.string;
+          default = "1";
+          example = "1%";
+          description = ''
+            The value by which to increment/decrement volume on media keys.
+
+            See amixer(1) for allowed values.
+          '';
+        };
+
+      };
+
     };
 
   };
@@ -90,17 +105,17 @@ in
         };
       };
 
-    services.actkbd = mkIf config.sound.enableMediaKeys {
+    services.actkbd = mkIf config.sound.mediaKeys.enable {
       enable = true;
       bindings = [
         # "Mute" media key
         { keys = [ 113 ]; events = [ "key" ];       command = "${alsaUtils}/bin/amixer -q set Master toggle"; }
 
         # "Lower Volume" media key
-        { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master 1- unmute"; }
+        { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute"; }
 
         # "Raise Volume" media key
-        { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master 1+ unmute"; }
+        { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute"; }
 
         # "Mic Mute" media key
         { keys = [ 190 ]; events = [ "key" ];       command = "${alsaUtils}/bin/amixer -q set Capture toggle"; }

From 002f3c8760db7d37356209c51328c4d61745b661 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Sun, 1 Jan 2017 13:46:39 +0100
Subject: [PATCH 0409/1310] mpd: listen on 127.0.0.1 by default

---
 nixos/modules/services/audio/mpd.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 5ec2e2c2623..a89215d7382 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -83,11 +83,11 @@ in {
 
         listenAddress = mkOption {
           type = types.str;
-          default = "any";
+          default = "127.0.0.1";
+          example = "any";
           description = ''
-            This setting sets the address for the daemon to listen on. Careful attention
-            should be paid if this is assigned to anything other then the default, any.
-            This setting can deny access to control of the daemon.
+            The address for the daemon to listen on.
+            Use <literal>any</literal> to listen on all addresses.
           '';
         };
 

From 49d444416cf88dad03da0ec71573cd9747245581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 1 Jan 2017 16:41:34 +0100
Subject: [PATCH 0410/1310] nixos: cosmetic refactor of
 environment.etc."hostid"

Create the file using attrset instead of list, to make it easier to
later provide other files in the same module.
---
 nixos/modules/tasks/network-interfaces.nix | 24 +++++++++-------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index aaa78daeb3a..74f7e5fcc2c 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -910,20 +910,16 @@ in
         domainname "${cfg.domain}"
       '';
 
-    environment.etc = mkIf (cfg.hostId != null)
-      [
-        {
-          target = "hostid";
-          source = pkgs.runCommand "gen-hostid" {} ''
-            hi="${cfg.hostId}"
-            ${if pkgs.stdenv.isBigEndian then ''
-              echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out
-            '' else ''
-              echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > $out
-            ''}
-          '';
-        }
-      ];
+    environment.etc."hostid" = mkIf (cfg.hostId != null)
+      { source = pkgs.runCommand "gen-hostid" {} ''
+          hi="${cfg.hostId}"
+          ${if pkgs.stdenv.isBigEndian then ''
+            echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out
+          '' else ''
+            echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > $out
+          ''}
+        '';
+      };
 
     environment.systemPackages =
       [ pkgs.host

From aec8872e2398ddc83916ca9eab30d55cacb96c06 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 21 Oct 2016 12:27:01 +0800
Subject: [PATCH 0411/1310] xca: qt4 -> qt5

Compile against qt5 instead of qt4.
---
 pkgs/applications/misc/xca/default.nix | 26 +++++++++++++++++++-------
 pkgs/top-level/all-packages.nix        |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index e861973b13c..8515efc56bc 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, which, openssl, qt4, libtool, gcc, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, which, makeQtWrapper,
+  libtool, openssl, qtbase, qttools }:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "xca-${version}";
@@ -9,19 +12,28 @@ stdenv.mkDerivation rec {
     sha256 = "1r2w9gpahjv221j963bd4vn0gj4cxmb9j42f3cd9qdn890hizw84";
   };
 
-  postInstall = ''
-    wrapProgram "$out/bin/xca" \
-      --prefix LD_LIBRARY_PATH : \
-        "${gcc.cc.lib}/lib64:${stdenv.lib.makeLibraryPath [ qt4 gcc.cc openssl libtool ]}"
+  enableParallelBuilding = false;
+
+  buildInputs = [ libtool openssl qtbase qttools ];
+
+  nativeBuildInputs = [ makeQtWrapper pkgconfig which ];
+
+  preBuild = ''
+    substituteInPlace Local.mak \
+      --replace ${qtbase}/bin/moc ${qtbase.dev}/bin/moc \
+      --replace ${qtbase}/bin/uic ${qtbase.dev}/bin/uic
   '';
 
-  buildInputs = [ openssl qt4 libtool gcc makeWrapper ];
-  nativeBuildInputs = [ pkgconfig ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/xca"
+    wrapQtProgram "$out/bin/xca_db_stat"
+  '';
 
   meta = with stdenv.lib; {
     description = "Interface for managing asymetric keys like RSA or DSA";
     homepage = http://xca.sourceforge.net/;
     platforms = platforms.all;
     license = licenses.bsd3;
+    maintainers = with maintainers; [ offline peterhoeg ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 465a872aa2b..2f39b72a495 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15476,7 +15476,7 @@ in
   };
   xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers;
 
-  xca = callPackage ../applications/misc/xca { };
+  xca = qt5.callPackage ../applications/misc/xca { };
 
   xcalib = callPackage ../tools/X11/xcalib { };
 

From 039e90c9d34ee471f725d22307d4a14893f46597 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 1 Jan 2017 18:19:02 +0100
Subject: [PATCH 0412/1310] fityk: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix
index 7d9f8542eed..1c1cac203f8 100644
--- a/pkgs/applications/science/misc/fityk/default.nix
+++ b/pkgs/applications/science/misc/fityk/default.nix
@@ -3,7 +3,7 @@
 
 let
   name    = "fityk";
-  version = "1.3.0";
+  version = "1.3.1";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "wojdyr";
     repo = "fityk";
     rev = "v${version}";
-    sha256 = "07xzhy47q5ddg1qn51qds4wp6r5g2cx8bla0hm0a9ipr2hg92lm9";
+    sha256 = "0kmrjjjwrh6xgw590awcd52b86kksmv6rfgih75zvpiavr1ygwsi";
   };
 
   buildInputs = [ autoreconfHook wxGTK30 boost lua zlib bzip2 xylib readline

From 3b754e525fea495e90a9542a41140803214c1fcc Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 1 Jan 2017 18:19:14 +0100
Subject: [PATCH 0413/1310] xylib: 1.4 -> 1.5

---
 pkgs/development/libraries/xylib/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix
index 030e2f0857b..c9c84f4e1d8 100644
--- a/pkgs/development/libraries/xylib/default.nix
+++ b/pkgs/development/libraries/xylib/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, boost, zlib, bzip2 }:
+{ stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }:
 
 stdenv.mkDerivation rec {
   name = "xylib-${version}";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchurl {
-    url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${name}-${version}.tar.bz2";
-    sha256 = "09j426qjbg3damch1hfw16j992kn2hj8gs4lpvqgfqdw61kvqivh";
+    url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${name}.tar.bz2";
+    sha256 = "1r2kx80zhdvz39k6h2fsncm2742xxvxl3z8a3fnr13jl9sl7mnnd";
   };
 
-  buildInputs = [ boost zlib bzip2 ];
+  buildInputs = [ boost zlib bzip2 wxGTK30 ];
 
   meta = with stdenv.lib; {
     description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods";

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 0414/1310] 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 e98bd77ef356443c3afd106f416d0a355f11472e Mon Sep 17 00:00:00 2001
From: Aaron Bull Schaefer <aaron@elasticdog.com>
Date: Sun, 1 Jan 2017 11:49:22 -0800
Subject: [PATCH 0415/1310] transcrypt: 0.9.9 -> 1.0.0

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

diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index 3047ca02342..44a00238a5c 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "transcrypt-${version}";
-  version = "0.9.9";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "elasticdog";
     repo = "transcrypt";
     rev = "v${version}";
-    sha256 = "0brsgj3qmvkgxzqqamk8krwyarwff1dlb3jjd09snnbfl0kdq1a5";
+    sha256 = "195hi8lq1i9rfcwj3raw4pa7fhvv3ghznxp4crmbjm7c0sqilcpd";
   };
 
   buildInputs = [ git makeWrapper openssl ];

From bd0595ea802616319aa82bc1d4b5441f4032d967 Mon Sep 17 00:00:00 2001
From: Elmar Athmer <elmar@athmer.org>
Date: Thu, 29 Dec 2016 13:52:22 +0100
Subject: [PATCH 0416/1310] vultr: init at 1.12.0

---
 lib/maintainers.nix                      |  1 +
 pkgs/development/tools/vultr/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/tools/vultr/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0306d6802bf..95b6fc8e6d3 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -507,6 +507,7 @@
   yurrriq = "Eric Bailey <eric@ericb.me>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
   zagy = "Christian Zagrodnick <cz@flyingcircus.io>";
+  zauberpony = "Elmar Athmer <elmar@athmer.org>";
   zef = "Zef Hemel <zef@zef.me>";
   zimbatm = "zimbatm <zimbatm@zimbatm.com>";
   zohl = "Al Zohali <zohl@fmap.me>";
diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix
new file mode 100644
index 00000000000..fe4b6584651
--- /dev/null
+++ b/pkgs/development/tools/vultr/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "vultr-${version}";
+  version = "1.12.0";
+  goPackagePath = "github.com/JamesClonk/vultr";
+
+  src = fetchFromGitHub {
+    owner = "JamesClonk";
+    repo = "vultr";
+    rev = "${version}";
+    sha256 = "0fzwzp0vhf3cgl9ij5zpdyn29w9rwwxghr50jjfbagpkfpy4g686";
+  };
+
+  meta = {
+    description = "A command line tool for Vultr services, a provider for cloud virtual private servers";
+    homepage = "https://github.com/JamesClonk/vultr";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.zauberpony ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72101e97c72..8651af35c69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6638,6 +6638,8 @@ in
 
   visualvm = callPackage ../development/tools/java/visualvm { };
 
+  vultr = callPackage ../development/tools/vultr { };
+
   xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
 
   xcbuild  = callPackage ../development/tools/xcbuild/wrapper.nix {

From f3052035ee758b853adbb4c218e90e39db72538f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 1 Jan 2017 21:18:13 +0100
Subject: [PATCH 0417/1310] wireguard: 0.0.20161223 -> 0.0.20161230

fixes #21572
---
 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 06b012fa434..c8169c52e80 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 "4.1";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20161223";
+  version = "0.0.20161230";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "0wmrsap34nd1x4gvz80isgsjjxbplvkrxnw56qlaqxkycvv8zndv";
+    sha256 = "15p3k8msk3agr0i96k12y5h4fxv0gc8zqjk15mizd3wwmw6pgjb9";
   };
 
   meta = with stdenv.lib; {

From 6da8b0d49de784c72a3411b86656fa62656ea98e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@enlambda.com>
Date: Sun, 1 Jan 2017 21:35:52 +0100
Subject: [PATCH 0418/1310] Time passing by

---
 COPYING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYING b/COPYING
index 0408a7e40b7..a632d6f58b1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2016 Eelco Dolstra and the Nixpkgs/NixOS contributors
+Copyright (c) 2003-2017 Eelco Dolstra and the Nixpkgs/NixOS contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

From cf9e1a03f7ce26f4f23e03dd094e2a2615e7457a Mon Sep 17 00:00:00 2001
From: Brandon Dimcheff <bdimchef-git@wieldim.com>
Date: Sat, 31 Dec 2016 18:13:19 -0500
Subject: [PATCH 0419/1310] add introspection to gmime

This was necessary for astroid to work with gmime, and I thought it
would be generally useful.
---
 pkgs/development/libraries/gmime/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix
index 4239b4458b8..8796a5f6740 100644
--- a/pkgs/development/libraries/gmime/default.nix
+++ b/pkgs/development/libraries/gmime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror }:
+{ stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "gmime-2.6.20";
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
   propagatedBuildInputs = [ glib zlib libgpgerror ];
+  configureFlags = [ "--enable-introspection=yes" ];
 
   enableParallelBuilding = true;
 

From 0890ce6f09787096c878b14c9b5d37831093a404 Mon Sep 17 00:00:00 2001
From: Brandon Dimcheff <bdimchef-git@wieldim.com>
Date: Sat, 31 Dec 2016 18:14:09 -0500
Subject: [PATCH 0420/1310] astroid: init at 0.6

---
 .../mailreaders/astroid/default.nix           | 36 +++++++++++++++++++
 .../astroid/propagate-environment.patch       | 13 +++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/astroid/default.nix
 create mode 100644 pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch

diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
new file mode 100644
index 00000000000..31cad15296c
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x
+  , libsass, notmuch, boost, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "astroid-${version}";
+  version = "0.6";
+
+  src = fetchFromGitHub {
+    owner = "astroidmail";
+    repo = "astroid";
+    rev = "v${version}";
+    sha256 = "0zashjmqv8ips9q8ckyhgm9hfyf01wpgs6g21cwl05q5iklc5x7r";
+  };
+
+  patches = [ ./propagate-environment.patch ];
+
+  buildInputs = [ scons pkgconfig gnome3.gtkmm gmime webkitgtk24x libsass
+                  gnome3.libpeas notmuch boost gnome3.gsettings_desktop_schemas
+                  makeWrapper ];
+
+  buildPhase = "scons --prefix=$out build";
+  installPhase = "scons --prefix=$out install";
+
+  preFixup = ''
+    wrapProgram "$out/bin/astroid" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = {
+    homepage = "https://astroidmail.github.io/";
+    description = "GTK+ frontend to the notmuch mail system";
+    maintainers = [ stdenv.lib.maintainers.bdimcheff ];
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch b/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch
new file mode 100644
index 00000000000..db536ea721f
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch
@@ -0,0 +1,13 @@
+diff --git a/SConstruct b/SConstruct
+index a80bca3..ed2cd6d 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -5,7 +5,7 @@ from subprocess import *
+ def getGitDesc():
+   return Popen('git describe --abbrev=8 --tags --always', stdout=PIPE, shell=True).stdout.read ().strip ()
+ 
+-env = Environment ()
++env = Environment(ENV = os.environ)
+ 
+ AddOption ("--release", action="store", dest="release", default="git", help="Make a release (default: git describe output)")
+ AddOption ("--enable-debug", action="store", dest="debug", default=None, help="Enable the -g flag for debugging (default: true when release is git)")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72101e97c72..ac48186d58f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12317,6 +12317,8 @@ in
     giflib = giflib_4_1;
   };
 
+  astroid = callPackage ../applications/networking/mailreaders/astroid { };
+
   audacious = callPackage ../applications/audio/audacious { };
   audaciousQt5 = qt5.callPackage ../applications/audio/audacious/qt-5.nix { };
 

From f37c7e01d551d111fc25e3a9a9f71d6654840941 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 30 Dec 2016 21:57:50 -0500
Subject: [PATCH 0421/1310] youcompleteme: fix compilation

1) Replace --system-libclang with an explicit setting for the path to
nix libclang 3.9. Otherwise it will find system's libclang on darwin.

2) Remove clang/llvm from build inputs. This prevents ycm itself from
being compiled by clang 3.9. stdenv's standard compiler (gcc or
clang 3.7) will suffice.

3) Enable C++11 again as #16212 is caused by incopatibility between
clang 3.9 and libc++ 3.7, but we don't compile YCM with clang 3.9, so
this is not needed anymore.
---
 pkgs/misc/vim-plugins/default.nix                  | 12 +++++++-----
 .../patches/youcompleteme/1-top-cmake.patch        | 14 --------------
 .../vim2nix/additional-nix-code/youcompleteme      | 12 +++++++-----
 3 files changed, 14 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 08cdb3465c8..b277f9268bc 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1309,17 +1309,18 @@ rec {
     dependencies = [];
     buildInputs = [
       python go cmake
-      (if stdenv.isDarwin then llvmPackages.clang else llvmPackages.clang-unwrapped)
-      llvmPackages.llvm
     ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
     propagatedBuildInputs = stdenv.lib.optional (!stdenv.isDarwin) rustracerd;
 
     patches = [
-      ./patches/youcompleteme/1-top-cmake.patch
       ./patches/youcompleteme/2-ycm-cmake.patch
     ];
 
+    # YCM requires path to external libclang 3.9
+    # For explicit use and as env variable for ../third_party/ycmd/build.py
+    EXTRA_CMAKE_ARGS="-DEXTERNAL_LIBCLANG_PATH=${llvmPackages.clang.cc}/lib/libclang.${if stdenv.isDarwin then "dylib" else "so"}";
+
     buildPhase = ''
       patchShebangs .
       substituteInPlace plugin/youcompleteme.vim \
@@ -1327,9 +1328,10 @@ rec {
 
       mkdir build
       pushd build
-      cmake -G "Unix Makefiles" . ../third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
+      cmake -G "Unix Makefiles" . ../third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON \
+        $EXTRA_CMAKE_ARGS
       make ycm_core -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
-      ${python}/bin/python ../third_party/ycmd/build.py --gocode-completer --clang-completer --system-libclang
+      ${python}/bin/python ../third_party/ycmd/build.py --gocode-completer --clang-completer
       popd
     '';
 
diff --git a/pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch b/pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch
deleted file mode 100644
index fddf91b1c57..00000000000
--- a/pkgs/misc/vim-plugins/patches/youcompleteme/1-top-cmake.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-
---- ./third_party/ycmd/cpp/CMakeLists.txt
-+++ ./third_party/ycmd/cpp/CMakeLists.txt
-@@ -121,8 +121,8 @@
-     set( CPP11_AVAILABLE true )
-   endif()
- elseif( COMPILER_IS_CLANG )
--  set( CPP11_AVAILABLE true )
--  set( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11" )
-+  #set( CPP11_AVAILABLE true )
-+  #  set( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11" )
-   set( CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++" )
- endif()
- 
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
index 4b81be5205b..8da267837fb 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
@@ -1,16 +1,17 @@
     buildInputs = [
       python go cmake
-      (if stdenv.isDarwin then llvmPackages.clang else llvmPackages.clang-unwrapped)
-      llvmPackages.llvm
     ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
     propagatedBuildInputs = stdenv.lib.optional (!stdenv.isDarwin) rustracerd;
 
     patches = [
-      ./patches/youcompleteme/1-top-cmake.patch
       ./patches/youcompleteme/2-ycm-cmake.patch
     ];
 
+    # YCM requires path to external libclang 3.9
+    # For explicit use and as env variable for ../third_party/ycmd/build.py
+    EXTRA_CMAKE_ARGS="-DEXTERNAL_LIBCLANG_PATH=${llvmPackages.clang.cc}/lib/libclang.${if stdenv.isDarwin then "dylib" else "so"}";
+
     buildPhase = ''
       patchShebangs .
       substituteInPlace plugin/youcompleteme.vim \
@@ -18,9 +19,10 @@
 
       mkdir build
       pushd build
-      cmake -G "Unix Makefiles" . ../third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
+      cmake -G "Unix Makefiles" . ../third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON \
+        $EXTRA_CMAKE_ARGS
       make ycm_core -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
-      ${python}/bin/python ../third_party/ycmd/build.py --gocode-completer --clang-completer --system-libclang
+      ${python}/bin/python ../third_party/ycmd/build.py --gocode-completer --clang-completer
       popd
     '';
 

From c7bcb99ff266a8fc93ced3f4205ca305ec2e9186 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 30 Dec 2016 22:02:50 -0500
Subject: [PATCH 0422/1310] root: 6.04.18 -> 6.08.02

This relies on
e9d60c56 ('libc++3.7: fix to use with modern compilers')
---
 pkgs/applications/science/misc/root/default.nix   | 8 ++------
 pkgs/applications/science/misc/root/sw_vers.patch | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index d1106a75847..220b2e06360 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "root-${version}";
-  version = "6.04.18";
+  version = "6.08.02";
 
   src = fetchurl {
     url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
-    sha256 = "00f3v3l8nimfkcxpn9qpyh3h23na0mi4wkds2y5gwqh8wh3jryq9";
+    sha256 = "0530v1r4rvds52hgb13f00l3phhn76z6vii550mwv8bj3sl5070k";
   };
 
   buildInputs = [ cmake pcre pkgconfig python2 zlib lzma gsl ]
@@ -16,10 +16,6 @@ stdenv.mkDerivation rec {
     ;
 
   patches = [
-    (fetchpatch {
-      url = "https://github.com/root-mirror/root/commit/ee9964210c56e7c1868618a4434c5340fef38fe4.patch";
-      sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r";
-    })
     ./sw_vers.patch
 
     # this prevents thisroot.sh from setting $p, which interferes with stdenv setup
diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch
index 3de2b839bf4..c4632d62b4f 100644
--- a/pkgs/applications/science/misc/root/sw_vers.patch
+++ b/pkgs/applications/science/misc/root/sw_vers.patch
@@ -42,12 +42,12 @@ diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
 @@ -38,27 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
         SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
-        SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64")
+        SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
 -    else(${SYSCTL_OUTPUT} MATCHES 64)
 -       MESSAGE(STATUS "Found a 32bit system")
 -       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
 -       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
--       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32")
+-       SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
 -    endif(${SYSCTL_OUTPUT} MATCHES 64)
 -  endif()
 -

From 1bead812759e5de28afdf11bcb7c1ca869cb6b68 Mon Sep 17 00:00:00 2001
From: Ruslan Babayev <ruslan@babayev.com>
Date: Sun, 1 Jan 2017 15:37:59 -0800
Subject: [PATCH 0423/1310] pktgen: fix runtime paths

The Lua and lscpu path substitution got accidentally removed in
with commit 605b8095ca11a678af83364549d8fc72ba3f4219
---
 pkgs/os-specific/linux/pktgen/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index 2aa4d26f913..68237d70f51 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = [ "-march=core2" ];
 
+  postPatch = ''
+    substituteInPlace lib/lua/src/luaconf.h --replace /usr/local $out
+    substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu
+  '';
+
   installPhase = ''
     install -d $out/bin
     install -m 0755 app/app/${RTE_TARGET}/app/pktgen $out/bin

From 1fa75a5bb7cdb9f2413d8b20726ce69523bfe4c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Mon, 2 Jan 2017 08:09:18 +0100
Subject: [PATCH 0424/1310] sysdig: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 1088e0befdf..281ee101eac 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -2,14 +2,14 @@
 let
   inherit (stdenv.lib) optional optionalString;
   baseName = "sysdig";
-  version = "0.12.0";
+  version = "0.13.0";
 in
 stdenv.mkDerivation {
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "17nf2h5ajy333rwh91hzaw8zq2mnkb3lxy8fmbbs8qazgsvwz6c3";
+    sha256 = "0ghxj473v471nnry8h9accxpwwjp8nbzkgw8dniqld0ixx678pia";
   };
 
   buildInputs = [

From d68aba4cfb5d7998fbd087f7bf6f5d6f9fb5416a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 1 Jan 2017 17:57:26 +0100
Subject: [PATCH 0425/1310] Python: script names now include full path

Certain programs, like zim, calibre and now also apparently mercurial,
rely on sys.argv[0] providing not just the script name but the full
path.

The Python docs [1] state the following on the matter:

> argv[0] is the script name (it is operating system dependent whether
this is a full pathname or not).

Therefore, scripts should not expect to receive a full path.
Unfortunately some do. While this can be considered a bug, there doesn't
seem any reason not to provide the full path. Therefore we now provide
the full path.

[1]
https://docs.python.org/3.5/library/sys.html?highlight=sys.argv#sys.argv
---
 pkgs/development/interpreters/python/wrap-python.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/wrap-python.nix b/pkgs/development/interpreters/python/wrap-python.nix
index b965ff5350b..1efd777bb05 100644
--- a/pkgs/development/interpreters/python/wrap-python.nix
+++ b/pkgs/development/interpreters/python/wrap-python.nix
@@ -35,7 +35,7 @@ makeSetupHook {
           import sys
           import site
           import functools
-          sys.argv[0] = '"'$(basename "$f")'"'
+          sys.argv[0] = '"'$(readlink -f "$f")'"'
           functools.reduce(lambda k, p: site.addsitedir(p, k), ['"$([ -n "$program_PYTHONPATH" ] && (echo "'$program_PYTHONPATH'" | sed "s|:|','|g") || true)"'], site._init_pathinfo())
         '';
 

From 21f6cb79a7082e36d3a6374ea5b25a1645875f78 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 1 Jan 2017 21:58:27 +0100
Subject: [PATCH 0426/1310] zim: remove postFixup, include checkPhase, disable
 tests

- wrap-python.nix used to set sys.argv[0] to the name of the script, but
it now sets the path so we won't have to do it here anymore
- tests were not found, so the correct file is now invoked
---
 pkgs/applications/office/zim/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 93f51ce3f8b..313239581a1 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -30,12 +30,13 @@ pythonPackages.buildPythonApplication rec {
     export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped"
   '';
 
-  postFixup = ''
-    substituteInPlace $out/bin/.zim-wrapped \
-    --replace "sys.argv[0] = 'zim'" "sys.argv[0] = '$out/bin/zim'"
+  # RuntimeError: could not create GtkClipboard object
+  doCheck = false;
+
+  checkPhase = ''
+    python test.py
   '';
 
-  doCheck = true;
 
   meta = {
       description = "A desktop wiki";

From 9e3b2cbd210f5c021439877c5efffb78887b585d Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Mon, 2 Jan 2017 14:02:19 +0200
Subject: [PATCH 0427/1310] luaPackages.lgi: 0.7.2 -> 0.9.1

---
 pkgs/top-level/lua-packages.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 4087edd2127..839db36ca7a 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -382,18 +382,20 @@ let
 
   lgi = stdenv.mkDerivation rec {
     name = "lgi-${version}";
-    version = "0.7.2";
+    version = "0.9.1";
 
-    src = fetchzip {
-      url    = "https://github.com/pavouk/lgi/archive/${version}.tar.gz";
-      sha256 = "10i2ssfs01d49fdmmriqzxc8pshys4rixhx30wzd9p1m1q47a5pn";
+    src = fetchFromGitHub {
+      owner = "pavouk";
+      repo = "lgi";
+      rev = version;
+      sha256 = "09pbapjhyc3sn0jgx747shqr9286wqfzw02h43p4pk8fv2b766b9";
     };
 
     meta = with stdenv.lib; {
       description = "GObject-introspection based dynamic Lua binding to GObject based libraries";
       homepage    = https://github.com/pavouk/lgi;
       license     = "custom";
-      maintainers = with maintainers; [ lovek323 ];
+      maintainers = with maintainers; [ lovek323 rasendubi ];
       platforms   = platforms.unix;
     };
 

From 86a6083498d581e78d09d862127ac46eba86feac Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 3 Dec 2016 20:38:18 +0100
Subject: [PATCH 0428/1310] i2p: 0.9.26 -> 0.9.28

update patch
---
 pkgs/tools/networking/i2p/default.nix |  4 ++--
 pkgs/tools/networking/i2p/i2p.patch   | 34 +++++++++++++++------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index fb2f4358694..d5b9ff665d4 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,10 +1,10 @@
 { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
 
 stdenv.mkDerivation rec {
-  name = "i2p-0.9.26";
+  name = "i2p-0.9.28";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "0h672w69a5xzgcrls64bpss3ga9hgpnrq90dr5lb5912pwwq9pa1";
+    sha256 = "1xagyywnck2c5xalr7bc7cv5ikk4igf7avmc0n28nz9pkais1y1y";
   };
   buildInputs = [ jdk ant gettext which ];
   patches = [ ./i2p.patch ];
diff --git a/pkgs/tools/networking/i2p/i2p.patch b/pkgs/tools/networking/i2p/i2p.patch
index 2ae6446ed28..74031eb7aef 100644
--- a/pkgs/tools/networking/i2p/i2p.patch
+++ b/pkgs/tools/networking/i2p/i2p.patch
@@ -1,6 +1,21 @@
+diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
+index 365737d89..2ea14db3e 100644
+--- a/installer/resources/i2prouter
++++ b/installer/resources/i2prouter
+@@ -49,7 +49,7 @@ APP_LONG_NAME="I2P Service"
+ 
+ # gettext - we look for it in the path
+ # fallback to echo is below, we can't set it to echo here.
+-GETTEXT=$(which gettext > /dev/null 2>&1)
++GETTEXT=%gettext%
+ 
+ # Where to install the systemd service
+ SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service"
+diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
+index eb4995dfe..0186cede3 100644
 --- a/installer/resources/runplain.sh
 +++ b/installer/resources/runplain.sh
-@@ -21,7 +21,7 @@
+@@ -25,7 +25,7 @@ CP=
  
  # Try using the Java binary that I2P was installed with.
  # If it's not found, try looking in the system PATH.
@@ -9,10 +24,10 @@
  
  if [ -z $JAVA ] || [ ! -x $JAVA ]; then
      echo "Error: Cannot find java." >&2
-@@ -40,15 +40,4 @@
+@@ -44,15 +44,4 @@ if [ $(uname -s) = "Darwin" ]; then
      export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
  fi
- JAVAOPTS="-Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
+ JAVAOPTS="${MAXMEMOPT} -Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
 -(
 -    nohup ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1
 -) &
@@ -25,15 +40,4 @@
 -    echo "I2P failed to start." >&2
 -    exit 1
 -fi
-+${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch
---- a/installer/resources/i2prouter
-+++ b/installer/resources/i2prouter
-@@ -49,7 +49,7 @@
- 
- # gettext - we look for it in the path
- # fallback to echo is below, we can't set it to echo here.
--GETTEXT=$(which gettext > /dev/null 2>&1)
-+GETTEXT=%gettext%
- 
- # Where to install the systemd service
- SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service"
++exec ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch

From cd9edbb15bab0f908f91f85557cf148a0ac191fd Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 3 Nov 2016 11:10:48 +0100
Subject: [PATCH 0429/1310] wine: 1.8.4 -> 1.8.6

wine: 2.0-rc2 -> 2.0-rc3
winetricks: 20160724 -> 20170101
---
 pkgs/misc/emulators/wine/sources.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 5ad39a914f6..6a87ff395b3 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -6,9 +6,9 @@ let fetchurl = args@{url, sha256, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "1.8.4";
+    version = "1.8.6";
     url = "https://dl.winehq.org/wine/source/1.8/wine-${version}.tar.bz2";
-    sha256 = "0yahh1n3s3y0bp1a1sr3zpna56749jdgr85hwmpq393pjx1i0pai";
+    sha256 = "1lq6770pkv3342ss2ih18s2hw6i1srbcfg3mljwalqrvxfb7hydi";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {
@@ -30,9 +30,9 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "2.0-rc2";
+    version = "2.0-rc3";
     url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2";
-    sha256 = "0pjkrvslfksx7m2w52pnd3dfxb82l082cz9dr57x58s9al2jpwb6";
+    sha256 = "0sq8li7p30h2a5bbpv27vxpzihr8h890qm78nq21fnh0zflg8x8y";
     inherit (stable) mono;
     gecko32 = fetchurl rec {
       version = "2.47";
@@ -48,15 +48,15 @@ in rec {
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "1xx9bfirij12l278f5f7vpxxay1zacnrsaib6yfzrybm517ynfw3";
+    sha256 = "1nk8s54nrlws0d8wpyj1vv2z0l2jansn990xw73v15wzwc3j9p6l";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
   };
 
   winetricks = fetchFromGitHub rec {
-    version = "20160724";
-    sha256 = "0nl8gnmsqwwrc8773q8py64kv3r5836xjxsnxjv91n4hhmvgyrzs";
+    version = "20170101";
+    sha256 = "0c2aam68x3nlvc6f4r6rnfw6y3a86644zb0qirwkmh3p04mpdl39";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;

From 858f8f27fa6433a0097fa7d365c55b84fda99439 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 30 Dec 2016 12:40:28 +0800
Subject: [PATCH 0430/1310] audacity: fix library path using NIX_LDFLAGS

---
 pkgs/applications/audio/audacity/default.nix | 38 ++++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index cc96f6dbbb3..f91fc03ec01 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk2, glib, zlib, perl, intltool,
+{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, glib, zlib, perl, intltool,
   libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, fetchpatch,
   expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */
   }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   version = "2.1.2";
   name = "audacity-${version}";
@@ -23,12 +25,34 @@ stdenv.mkDerivation rec {
     mkdir lib-src
     mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms,libnyquist} lib-src/
     rm -r lib-src-rm/
+
+    # we will get a (possibly harmless) warning during configure without this
+    substituteInPlace configure \
+      --replace /usr/bin/file ${file}/bin/file
   '';
 
-  configureFlags = [ "--with-libsamplerate" ];
+  configureFlags = [
+    "--with-libsamplerate"
+  ];
+
+  # audacity only looks for lame and ffmpeg at runtime, so we need to link them in manually
+  NIX_LDFLAGS = [
+    # LAME
+    "-lmp3lame"
+    # ffmpeg
+    "-lavcodec"
+    "-lavdevice"
+    "-lavfilter"
+    "-lavformat"
+    "-lavresample"
+    "-lavutil"
+    "-lpostproc"
+    "-lswresample"
+    "-lswscale"
+  ];
 
   buildInputs = [
-    pkgconfig gettext wxGTK30 expat alsaLib
+    pkgconfig file gettext wxGTK30 expat alsaLib
     libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2
     ffmpeg libmad lame libvorbis flac soundtouch
   ]; #ToDo: detach sbsms
@@ -36,11 +60,11 @@ stdenv.mkDerivation rec {
   dontDisableStatic = true;
   doCheck = false; # Test fails
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Sound editor with graphical UI";
     homepage = http://audacityteam.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    license = licenses.gpl2Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ the-kenny ];
   };
 }

From db0120dea2ff39ef63c28f4e1c9dae231448f1bf Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 31 Dec 2016 19:13:02 +0100
Subject: [PATCH 0431/1310] emscriptenfastcomp: build using cmake and use
 cc-wrapper

---
 .../compilers/emscripten-fastcomp/default.nix | 42 +++++++++++--------
 .../compilers/emscripten/default.nix          |  2 +-
 pkgs/top-level/all-packages.nix               | 13 +++++-
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index 5403c29baab..f76a7d4fd0c 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchFromGitHub, python }:
+{ stdenv, fetchFromGitHub, cmake, python, ... }:
 
 let
   rev = "1.36.4";
+  gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in
-
 stdenv.mkDerivation rec {
   name = "emscripten-fastcomp-${rev}";
 
-  srcFC = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp";
     sha256 = "0838rl0n9hyq5dd0gmj5rvigbmk5mhrhzyjk0zd8mjs2mk8z510l";
@@ -21,24 +21,32 @@ stdenv.mkDerivation rec {
     inherit rev;
   };
 
-  buildInputs = [ python ];
-  buildCommand = ''
-    cp -as ${srcFC} $TMPDIR/src
-    chmod +w $TMPDIR/src/tools
-    cp -as ${srcFL} $TMPDIR/src/tools/clang
-
-    chmod +w $TMPDIR/src
-    mkdir $TMPDIR/src/build
-    cd $TMPDIR/src/build
-
-    ../configure --enable-optimized --disable-assertions --enable-targets=host,js
-    make
-    cp -a Release/bin $out
+  nativeBuildInputs = [ cmake python ];
+  preConfigure = ''
+    cp -Lr ${srcFL} tools/clang
+    chmod +w -R tools/clang
   '';
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'"
+    "-DLLVM_INCLUDE_EXAMPLES=OFF"
+    "-DLLVM_INCLUDE_TESTS=OFF"
+    # "-DCLANG_INCLUDE_EXAMPLES=OFF"
+    "-DCLANG_INCLUDE_TESTS=OFF"
+  ] ++ (stdenv.lib.optional stdenv.isLinux
+    # necessary for clang to find crtend.o
+    "-DGCC_INSTALL_PREFIX=${gcc}"
+  );
+  enableParallelBuilding = true;
+
+  passthru = {
+    isClang = true;
+    inherit gcc;
+  };
 
   meta = with stdenv.lib; {
     homepage = https://github.com/kripken/emscripten-fastcomp;
-    description = "Emscripten llvm";
+    description = "Emscripten LLVM";
     platforms = platforms.all;
     maintainers = with maintainers; [ qknight matthewbauer ];
     license = stdenv.lib.licenses.ncsa;
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index c78808b81bc..4939fb4c1f0 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     ln -s $out/${appdir}/{em++,em-config,emar,embuilder.py,emcc,emcmake,emconfigure,emlink.py,emmake,emranlib,emrun,emscons} $out/bin
 
     echo "EMSCRIPTEN_ROOT = '$out/${appdir}'" > $out/${appdir}/config
-    echo "LLVM_ROOT = '${emscriptenfastcomp}'" >> $out/${appdir}/config
+    echo "LLVM_ROOT = '${emscriptenfastcomp}/bin'" >> $out/${appdir}/config
     echo "PYTHON = '${python}/bin/python'" >> $out/${appdir}/config
     echo "NODE_JS = '${nodejs}/bin/node'" >> $out/${appdir}/config
     echo "JS_ENGINES = [NODE_JS]" >> $out/${appdir}/config
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac48186d58f..43878fe8f33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1555,7 +1555,18 @@ in
 
   emscripten = callPackage ../development/compilers/emscripten { };
 
-  emscriptenfastcomp = callPackage ../development/compilers/emscripten-fastcomp { };
+  emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { };
+  emscriptenfastcomp-wrapped = wrapCC emscriptenfastcomp-unwrapped;
+  emscriptenfastcomp = symlinkJoin {
+    name = "emscriptenfastcomp";
+    paths = [ emscriptenfastcomp-wrapped emscriptenfastcomp-unwrapped ];
+    preferLocalBuild = false;
+    allowSubstitutes = true;
+    postBuild = ''
+      # replace unwrapped clang-3.9 binary by wrapper
+      ln -sf $out/bin/clang $out/bin/clang-[0-9]*
+    '';
+  };
 
   emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });
 

From 3fa62094395bd89e7978f224eec2e31729fc26e5 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 3 Nov 2016 12:03:39 +0100
Subject: [PATCH 0432/1310] webkitgtk: 2.14.1 -> 2.14.2

Add dependencies
---
 pkgs/development/libraries/webkitgtk/2.14.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix
index 3c92527ea70..6835f59f586 100644
--- a/pkgs/development/libraries/webkitgtk/2.14.nix
+++ b/pkgs/development/libraries/webkitgtk/2.14.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
 , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
 , gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
-, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
+, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit
+, libidn
 , enableGeoLocation ? true, geoclue2, sqlite
 , gst-plugins-base
 }:
@@ -11,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.14.1";
+  version = "2.14.2";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "1dffnz20psgc604azhbzn9a6cdhafar9dw74w3bbwrfy531pcb9f";
+    sha256 = "0mjmcxhafh6l6j062z2nwfqbbvfyx16iqrzrbajswijh23awpnrf";
   };
 
   # see if we can clean this up....
@@ -49,8 +50,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gtk2 wayland libwebp enchant libnotify gnutls
-    libxml2 libsecret libxslt harfbuzz libpthreadstubs
+    gtk2 wayland libwebp enchant libnotify gnutls pcre nettle libidn
+    libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit
     gst-plugins-base libxkbcommon epoxy at_spi2_core
   ] ++ optional enableGeoLocation geoclue2
     ++ (with xlibs; [ libXdmcp libXt libXtst ]);

From 802c09f21d35a82eed90e38b1bb9cc1908c50674 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 3 Nov 2016 12:29:22 +0100
Subject: [PATCH 0433/1310] webkitgtk: make 2.14 the default

---
 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 ac48186d58f..8aff1324bfe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9646,7 +9646,7 @@ in
 
   wcslib = callPackage ../development/libraries/wcslib { };
 
-  webkitgtk = webkitgtk212x;
+  webkitgtk = webkitgtk214x;
 
   webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix {
     harfbuzz = harfbuzz-icu;

From 09f66a7457eaf4feb6b2c98ecc1a5e7d98e0809f Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 20 Dec 2016 10:16:14 +0100
Subject: [PATCH 0434/1310] pypy: 5.4.1 -> 5.6.0

---
 pkgs/development/interpreters/python/pypy/2.7/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index 1fd9eaee430..467c9a078bb 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -8,8 +8,8 @@
 assert zlibSupport -> zlib != null;
 
 let
-  majorVersion = "5.4";
-  minorVersion = "1";
+  majorVersion = "5.6";
+  minorVersion = "0";
   minorVersionSuffix = "";
   pythonVersion = "2.7";
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@@ -23,7 +23,7 @@ let
 
     src = fetchurl {
       url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
-      sha256 = "1x8sa5x1nkrb8wrmicri94ji8kvyxihyryi8br5fk7gak0agcai0";
+      sha256 = "145a0kd5c0s1v2rpavw9ihncfb05s2x7chc70v8fssvyxq601911";
     };
 
    # http://bugs.python.org/issue27369

From 08121638f8b0ef0725a1913e5b0cf33eac3d5bc7 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 12 Dec 2016 22:31:17 +0100
Subject: [PATCH 0435/1310] chromium: 55.0.2883.75 -> 55.0.2883.87

---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index fa24ed9146f..2337cd51cbb 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "0mafk3cxwc16qbd7jzqj8rw1ys6s2bv7f9byixjcgssvjf073ksv";
-    sha256bin64 = "0sb2d7vyrckkbg823rnl7y3k6q3kvmxp13lpm0ncy821cx89m89a";
-    version = "55.0.2883.75";
+    sha256 = "00mq90h5kjj3x7asclp97x5mqy6pvcj0vqxcf77djlyjmsy1q10i";
+    sha256bin64 = "1prmj546sp627crnjfj2sxprr6ahb59ajgqp8jwy4wiy1x5c3j88";
+    version = "56.0.2924.28";
   };
   dev = {
-    sha256 = "1g4jy8zpmgqh9br2jcvbrnnr8fc5i4s5hvv01bs433rlcgaqk066";
-    sha256bin64 = "08vzar0zshf39390xhr8l7gvzai9pxcqzwqzrmizaaqi9m5pijdr";
-    version = "56.0.2924.18";
+    sha256 = "1dnqqlhdxawwy4zdk2p8zn6vg0cpi3hqpl9rf3j0xylvm3knr9a1";
+    sha256bin64 = "1hnmca8jqvammsb3y847p2n9hm93129li5zfi5pacqizqlakmv3z";
+    version = "57.0.2950.4";
   };
   stable = {
-    sha256 = "0mafk3cxwc16qbd7jzqj8rw1ys6s2bv7f9byixjcgssvjf073ksv";
-    sha256bin64 = "0qfqj8067vjqklg1zm203dh6c29sbhk6w7flvi8h3z28y1pws2qw";
-    version = "55.0.2883.75";
+    sha256 = "0n0sp3f3cmac2lblzn3mjkkhm8p6vy34dafr0kpdz14w1lad66z8";
+    sha256bin64 = "1cvp9fvdpd8qrl48lzs7f6k43bqd43gp0sbzz6h7yrpzw1c49r0m";
+    version = "55.0.2883.87";
   };
 }

From 39e8a72faff6c3cb7bfe9fd48a85bf4dccc7b1f5 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 2 Jan 2017 14:26:20 +0100
Subject: [PATCH 0436/1310] emscripten, emscriptenfastcomp: 1.36.4 -> 1.37.1

---
 pkgs/development/compilers/emscripten-fastcomp/default.nix | 6 +++---
 pkgs/development/compilers/emscripten/default.nix          | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index f76a7d4fd0c..c457ae15838 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python, ... }:
 
 let
-  rev = "1.36.4";
+  rev = "1.37.1";
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in
 stdenv.mkDerivation rec {
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp";
-    sha256 = "0838rl0n9hyq5dd0gmj5rvigbmk5mhrhzyjk0zd8mjs2mk8z510l";
+    sha256 = "08jci6h73j4pcd6iq5r4zn8c6qpd6qxc7xivxh3iama9hghmxyk9";
     inherit rev;
   };
 
   srcFL = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp-clang";
-    sha256 = "169hfabamv3jmf88flhl4scwaxdh24196gwpz3sdb26lzcns519q";
+    sha256 = "053svm8vnsma61jzzr8n1224brmjw4pzvklh572bm1p7yg32chaw";
     inherit rev;
   };
 
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index 4939fb4c1f0..f94e826defb 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
 
 let
-  rev = "1.36.4";
+  rev = "1.37.1";
   appdir = "share/emscripten";
 in
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten";
-    sha256 = "1c9592i891z1v9rp4a4lnsp14nwiqfxnh37g6xwwjd1bqx7x4hn7";
+    sha256 = "0xl8lv0ihxsnwnhma3i34pkbz0v1yyc93ac6mdqmzv6fx2wczm04";
     inherit rev;
   };
 
@@ -23,6 +23,8 @@ stdenv.mkDerivation {
     sed -i -e "s,EM_CONFIG = '~/.emscripten',EM_CONFIG = '$out/${appdir}/config'," $out/${appdir}/tools/shared.py
     sed -i -e 's,^.*did not see a source tree above the LLVM.*$,      return True,' $out/${appdir}/tools/shared.py
     sed -i -e 's,def check_sanity(force=False):,def check_sanity(force=False):\n  return,' $out/${appdir}/tools/shared.py
+    # fixes cmake support
+    sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" $out/${appdir}/emcc.py
     mkdir $out/bin
     ln -s $out/${appdir}/{em++,em-config,emar,embuilder.py,emcc,emcmake,emconfigure,emlink.py,emmake,emranlib,emrun,emscons} $out/bin
 

From 06bcdc177cf4dfe8935a100793d759bab3bc163f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:09:50 +0100
Subject: [PATCH 0437/1310] postgrey: extended configuration

---
 nixos/modules/services/mail/postgrey.nix | 110 +++++++++++++++++++----
 1 file changed, 95 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 0db631868cc..1c84841f397 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -4,6 +4,39 @@ with lib; let
 
   cfg = config.services.postgrey;
 
+  natural = with types; addCheck int (x: x >= 0);
+  natural' = with types; addCheck int (x: x > 0);
+
+  socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? "path" || x ? "port");
+
+  inetSocket = with types; {
+    addr = mkOption {
+      type = nullOr string;
+      default = null;
+      example = "127.0.0.1";
+      description = "The address to bind to. Localhost if null";
+    };
+    port = mkOption {
+      type = natural';
+      default = 10030;
+      description = "Tcp port to bind to";
+    };
+  };
+
+  unixSocket = with types; {
+    path = mkOption {
+      type = path;
+      default = "/var/run/postgrey.sock";
+      description = "Path of the unix socket";
+    };
+
+    mode = mkOption {
+      type = string;
+      default = "0777";
+      description = "Mode of the unix socket";
+    };
+  };
+
 in {
 
   options = {
@@ -13,21 +46,68 @@ in {
         default = false;
         description = "Whether to run the Postgrey daemon";
       };
-      inetAddr = mkOption {
-        type = nullOr string;
-        default = null;
-        example = "127.0.0.1";
-        description = "The inet address to bind to. If none given, bind to /var/run/postgrey.sock";
-      };
-      inetPort = mkOption {
-        type = int;
-        default = 10030;
-        description = "The tcp port to bind to";
+      socket = mkOption {
+        type = socket;
+        default = { path = "/var/run/postgrey.sock"; };
+        example = {
+          addr = "127.0.0.1";
+          port = 10030;
+        };
+        description = "Socket to bind to";
       };
       greylistText = mkOption {
         type = string;
         default = "Greylisted for %%s seconds";
-        description = "Response status text for greylisted messages";
+        description = "Response status text for greylisted messages; use %%s for seconds left until greylisting is over and %%r for mail domain of recipient";
+      };
+      greylistAction = mkOption {
+        type = string;
+        default = "DEFER_IF_PERMIT";
+        description = "Response status for greylisted messages (see access(5))";
+      };
+      greylistHeader = mkOption {
+        type = string;
+        default = "X-Greylist: delayed %%t seconds by postgrey-%%v at %%h; %%d";
+        description = "Prepend header to greylisted mails; use %%t for seconds delayed due to greylisting, %%v for the version of postgrey, %%d for the date, and %%h for the host";
+      };
+      delay = mkOption {
+        type = natural;
+        default = 300;
+        description = "Greylist for N seconds";
+      };
+      maxAge = mkOption {
+        type = natural;
+        default = 35;
+        description = "Delete entries from whitelist if they haven't been seen for N days";
+      };
+      retryWindow = mkOption {
+        type = either string natural;
+        default = 2;
+        example = "12h";
+        description = "Allow N days for the first retry. Use string with appended 'h' to specify time in hours";
+      };
+      lookupBySubnet = mkOption {
+        type = bool;
+        default = true;
+        description = "Strip the last N bits from IP addresses, determined by IPv4CIDR and IPv6CIDR";
+      };
+      IPv4CIDR = mkOption {
+        type = natural;
+        default = 24;
+      };
+      IPv6CIDR = mkOption {
+        type = natural;
+        default = 64;
+      };
+      privacy = mkOption {
+        type = bool;
+        default = true;
+        description = "Store data using one-way hash functions (SHA1)";
+      };
+      autoWhitelist = mkOption {
+        type = nullOr natural';
+        default = 5;
+        description = "Whitelist clients after successful delivery of N messages";
       };
     };
   };
@@ -52,10 +132,10 @@ in {
     };
 
     systemd.services.postgrey = let
-      bind-flag = if isNull cfg.inetAddr then
-        "--unix=/var/run/postgrey.sock"
+      bind-flag = if cfg.socket ? "path" then
+        ''--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}''
       else
-        "--inet=${cfg.inetAddr}:${cfg.inetPort}";
+        ''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${cfg.socket.port}'';
     in {
       description = "Postfix Greylisting Service";
       wantedBy = [ "multi-user.target" ];
@@ -67,7 +147,7 @@ in {
       '';
       serviceConfig = {
         Type = "simple";
-        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --pidfile=/var/run/postgrey.pid --group=postgrey --user=postgrey --dbdir=/var/postgrey --greylist-text="${cfg.greylistText}"'';
+        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --group=postgrey --user=postgrey --dbdir=/var/postgrey --delay=${cfg.delay} --max-age=${cfg.maxAge} --retry-window=${cfg.retryWindow} ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} --ipv4cidr=${cfg.IPv4CIDR} --ipv6cidr=${cfg.IPv6CIDR} ${optionalString cfg.privacy "--privacy"} --auto-whitelist-clients=${if cfg.autoWhitelist == null then "0" else cfg.autoWhitelist} --greylist-text="${cfg.greylistText}" --x-greylist-header="${cfg.greylistHeader}" --greylist-action=${cfg.greylistAction}'';
         Restart = "always";
         RestartSec = 5;
         TimeoutSec = 10;

From e196ad2c66c13eefa109259e60e91b20b0eb2d55 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:12:39 +0100
Subject: [PATCH 0438/1310] postgrey: add descriptions to IPv?CIDR

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

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 1c84841f397..c6fec566c0b 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -94,10 +94,12 @@ in {
       IPv4CIDR = mkOption {
         type = natural;
         default = 24;
+        description = "Strip N bits from IPv4 addresses if lookupBySubnet is true";
       };
       IPv6CIDR = mkOption {
         type = natural;
         default = 64;
+        description = "Strip N bits from IPv6 addresses if lookupBySubnet is true";
       };
       privacy = mkOption {
         type = bool;

From e2dd0799a8cf252d4a8b59006f7b43fa536ee3fb Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:19:00 +0100
Subject: [PATCH 0439/1310] postgrey: fix submodule syntax

---
 nixos/modules/services/mail/postgrey.nix | 42 +++++++++++++-----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index c6fec566c0b..73f271d2a31 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -10,30 +10,34 @@ with lib; let
   socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? "path" || x ? "port");
 
   inetSocket = with types; {
-    addr = mkOption {
-      type = nullOr string;
-      default = null;
-      example = "127.0.0.1";
-      description = "The address to bind to. Localhost if null";
-    };
-    port = mkOption {
-      type = natural';
-      default = 10030;
-      description = "Tcp port to bind to";
+    options = {
+      addr = mkOption {
+        type = nullOr string;
+        default = null;
+        example = "127.0.0.1";
+        description = "The address to bind to. Localhost if null";
+      };
+      port = mkOption {
+        type = natural';
+        default = 10030;
+        description = "Tcp port to bind to";
+      };
     };
   };
 
   unixSocket = with types; {
-    path = mkOption {
-      type = path;
-      default = "/var/run/postgrey.sock";
-      description = "Path of the unix socket";
-    };
+    options = {
+      path = mkOption {
+        type = path;
+        default = "/var/run/postgrey.sock";
+        description = "Path of the unix socket";
+      };
 
-    mode = mkOption {
-      type = string;
-      default = "0777";
-      description = "Mode of the unix socket";
+      mode = mkOption {
+        type = string;
+        default = "0777";
+        description = "Mode of the unix socket";
+      };
     };
   };
 

From 3c0d02c3877bea0d796ff3617a3f4e828295b56d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:27:00 +0100
Subject: [PATCH 0440/1310] postgrey: coerce integers

---
 nixos/modules/services/mail/postgrey.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 73f271d2a31..ab0ffe7515d 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -141,7 +141,7 @@ in {
       bind-flag = if cfg.socket ? "path" then
         ''--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}''
       else
-        ''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${cfg.socket.port}'';
+        ''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${toString cfg.socket.port}'';
     in {
       description = "Postfix Greylisting Service";
       wantedBy = [ "multi-user.target" ];
@@ -153,7 +153,7 @@ in {
       '';
       serviceConfig = {
         Type = "simple";
-        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --group=postgrey --user=postgrey --dbdir=/var/postgrey --delay=${cfg.delay} --max-age=${cfg.maxAge} --retry-window=${cfg.retryWindow} ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} --ipv4cidr=${cfg.IPv4CIDR} --ipv6cidr=${cfg.IPv6CIDR} ${optionalString cfg.privacy "--privacy"} --auto-whitelist-clients=${if cfg.autoWhitelist == null then "0" else cfg.autoWhitelist} --greylist-text="${cfg.greylistText}" --x-greylist-header="${cfg.greylistHeader}" --greylist-action=${cfg.greylistAction}'';
+        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --group=postgrey --user=postgrey --dbdir=/var/postgrey --delay=${toString cfg.delay} --max-age=${toString cfg.maxAge} --retry-window=${toString cfg.retryWindow} ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} --ipv4cidr=${toString cfg.IPv4CIDR} --ipv6cidr=${toString cfg.IPv6CIDR} ${optionalString cfg.privacy "--privacy"} --auto-whitelist-clients=${toString (if cfg.autoWhitelist == null then 0 else cfg.autoWhitelist)} --greylist-text="${cfg.greylistText}" --x-greylist-header="${cfg.greylistHeader}" --greylist-action=${cfg.greylistAction}'';
         Restart = "always";
         RestartSec = 5;
         TimeoutSec = 10;

From 82291bae49fd9e6aa2b899fb5464747a58051822 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:32:50 +0100
Subject: [PATCH 0441/1310] postgrey: more verbose default socket

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

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index ab0ffe7515d..7bf1c30fc67 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -52,7 +52,10 @@ in {
       };
       socket = mkOption {
         type = socket;
-        default = { path = "/var/run/postgrey.sock"; };
+        default = {
+          path = "/var/run/postgrey.sock";
+          mode = "0777";
+        };
         example = {
           addr = "127.0.0.1";
           port = 10030;

From 277e7119be926b4fcdf4e73654490caaf350b3e1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 15:38:46 +0100
Subject: [PATCH 0442/1310] openvpn: 2.3.13 -> 2.4.0

---
 pkgs/tools/networking/openvpn/default.nix          |  9 ++++++---
 pkgs/tools/networking/openvpn/systemd-notify.patch | 14 +++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 13e1c68befd..f609c90ad50 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -7,11 +7,12 @@ assert pkcs11Support -> (pkcs11helper != null);
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "openvpn-2.3.12";
+  name = "openvpn-${version}";
+  version = "2.4.0";
 
   src = fetchurl {
-    url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
-    sha256 = "1zqwq19xg6yf90nv35yr8r0ljas5f42v4n9hjjmhlnzpan69plzm";
+    url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz";
+    sha256 = "0zpqnbhjaifdalyxwmvk5kcyd7cpxbcigbn7967nbsyvl54vl8vg";
   };
 
   patches = optional stdenv.isLinux ./systemd-notify.patch;
@@ -39,8 +40,10 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A robust and highly flexible tunneling application";
     homepage = http://openvpn.net/;
+    downloadPage = "https://openvpn.net/index.php/open-source/downloads.html";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.viric ];
     platforms = stdenv.lib.platforms.unix;
+    updateWalker = true;
   };
 }
diff --git a/pkgs/tools/networking/openvpn/systemd-notify.patch b/pkgs/tools/networking/openvpn/systemd-notify.patch
index 9291f7a4664..c0ac8ae89d3 100644
--- a/pkgs/tools/networking/openvpn/systemd-notify.patch
+++ b/pkgs/tools/networking/openvpn/systemd-notify.patch
@@ -10,13 +10,13 @@ diff -ru -x '*~' openvpn-2.3.1-orig/src/openvpn/init.c openvpn-2.3.1/src/openvpn
  static struct context *static_context; /* GLOBAL */
  
  /*
-@@ -1241,6 +1243,9 @@
- {
-   static const char message[] = "Initialization Sequence Completed";
+@@ -1375,6 +1375,9 @@
+     /* Reset the unsuccessful connection counter on complete initialisation */
+     c->options.unsuccessful_attempts = 0;
  
-+  /* Tell systemd we're ready. */
-+  sd_notify(0, "READY=1");
++    /* Tell systemd we're ready. */
++    sd_notify(0, "READY=1");
 +
-   /* If we delayed UID/GID downgrade or chroot, do it now */
-   do_uid_gid_chroot (c, true);
+     /* If we delayed UID/GID downgrade or chroot, do it now */
+     do_uid_gid_chroot (c, true);
  

From 58fa71b39c9e5d0af7b8329a0c3ebf99f305bc71 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:40:54 +0100
Subject: [PATCH 0443/1310] postgrey: allow additional whitelists

---
 nixos/modules/services/mail/postgrey.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 7bf1c30fc67..7db4e4d1c21 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -118,6 +118,16 @@ in {
         default = 5;
         description = "Whitelist clients after successful delivery of N messages";
       };
+      whitelistClients = mkOption {
+        type = listOf path;
+        default = [];
+        description = "Client address whitelist files (see postgrey(8))";
+      };
+      whitelistRecipients = mkOption {
+        type = listOf path;
+        default = [];
+        description = "Recipient address whitelist files (see postgrey(8))";
+      };
     };
   };
 
@@ -156,7 +166,7 @@ in {
       '';
       serviceConfig = {
         Type = "simple";
-        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --group=postgrey --user=postgrey --dbdir=/var/postgrey --delay=${toString cfg.delay} --max-age=${toString cfg.maxAge} --retry-window=${toString cfg.retryWindow} ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} --ipv4cidr=${toString cfg.IPv4CIDR} --ipv6cidr=${toString cfg.IPv6CIDR} ${optionalString cfg.privacy "--privacy"} --auto-whitelist-clients=${toString (if cfg.autoWhitelist == null then 0 else cfg.autoWhitelist)} --greylist-text="${cfg.greylistText}" --x-greylist-header="${cfg.greylistHeader}" --greylist-action=${cfg.greylistAction}'';
+        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --group=postgrey --user=postgrey --dbdir=/var/postgrey --delay=${toString cfg.delay} --max-age=${toString cfg.maxAge} --retry-window=${toString cfg.retryWindow} ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} --ipv4cidr=${toString cfg.IPv4CIDR} --ipv6cidr=${toString cfg.IPv6CIDR} ${optionalString cfg.privacy "--privacy"} --auto-whitelist-clients=${toString (if cfg.autoWhitelist == null then 0 else cfg.autoWhitelist)} --greylist-text="${cfg.greylistText}" --x-greylist-header="${cfg.greylistHeader}" --greylist-action=${cfg.greylistAction} ${concatMapStringsSep " " (x: "--whitelist-clients=" + x) cfg.whitelistClients} ${concatMapStringsSep " " (x: "--whitelist-recipients=" + x) cfg.whitelistRecipients}'';
         Restart = "always";
         RestartSec = 5;
         TimeoutSec = 10;

From 65f0ddbd534c1bd74d7fdbd8db3dff0d00a89c5a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:42:51 +0100
Subject: [PATCH 0444/1310] postgrey: improve formatting

---
 nixos/modules/services/mail/postgrey.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 7db4e4d1c21..d4ae25c066a 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -166,7 +166,23 @@ in {
       '';
       serviceConfig = {
         Type = "simple";
-        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --group=postgrey --user=postgrey --dbdir=/var/postgrey --delay=${toString cfg.delay} --max-age=${toString cfg.maxAge} --retry-window=${toString cfg.retryWindow} ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} --ipv4cidr=${toString cfg.IPv4CIDR} --ipv6cidr=${toString cfg.IPv6CIDR} ${optionalString cfg.privacy "--privacy"} --auto-whitelist-clients=${toString (if cfg.autoWhitelist == null then 0 else cfg.autoWhitelist)} --greylist-text="${cfg.greylistText}" --x-greylist-header="${cfg.greylistHeader}" --greylist-action=${cfg.greylistAction} ${concatMapStringsSep " " (x: "--whitelist-clients=" + x) cfg.whitelistClients} ${concatMapStringsSep " " (x: "--whitelist-recipients=" + x) cfg.whitelistRecipients}'';
+        ExecStart = ''${pkgs.postgrey}/bin/postgrey \
+          ${bind-flag} \
+          --group=postgrey --user=postgrey \
+          --dbdir=/var/postgrey \
+          --delay=${toString cfg.delay} \
+          --max-age=${toString cfg.maxAge} \
+          --retry-window=${toString cfg.retryWindow} \
+          ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} \
+          --ipv4cidr=${toString cfg.IPv4CIDR} --ipv6cidr=${toString cfg.IPv6CIDR} \
+          ${optionalString cfg.privacy "--privacy"} \
+          --auto-whitelist-clients=${toString (if cfg.autoWhitelist == null then 0 else cfg.autoWhitelist)} \
+          --greylist-action=${cfg.greylistAction} \
+          --greylist-text="${cfg.greylistText}" \
+          --x-greylist-header="${cfg.greylistHeader}" \
+          ${concatMapStringsSep " " (x: "--whitelist-clients=" + x) cfg.whitelistClients} \
+          ${concatMapStringsSep " " (x: "--whitelist-recipients=" + x) cfg.whitelistRecipients}
+        '';
         Restart = "always";
         RestartSec = 5;
         TimeoutSec = 10;

From b11264a282657ec42b77b95f7339aa5dcc6c46fd Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 1 Jan 2017 22:04:45 +0800
Subject: [PATCH 0445/1310] rubber: 1.3 -> 1.4

---
 pkgs/tools/typesetting/rubber/default.nix | 35 ++++++++++++++---------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix
index a9403020e41..bbcda05dc80 100644
--- a/pkgs/tools/typesetting/rubber/default.nix
+++ b/pkgs/tools/typesetting/rubber/default.nix
@@ -1,23 +1,30 @@
 { fetchurl, stdenv, python2Packages, texinfo }:
 
-stdenv.mkDerivation rec {
-  name = "rubber-1.3";
+python2Packages.buildPythonApplication rec {
+  name = "rubber-${version}";
+  version = "1.4";
 
   src = fetchurl {
-    url = "https://launchpad.net/rubber/trunk/1.3/+download/rubber-1.3.tar.gz";
-    sha256 = "09715apfd6a0haz1mqsxgm8sj4rwzi38gcz2kz020zxk5rh0dksh";
+    url = "https://launchpad.net/rubber/trunk/${version}/+download/${name}.tar.gz";
+    sha256 = "1d7hq19vpb3l31grldbxg8lx1qdd18f5f3gqw96q0lhf58agcjl2";
   };
 
-  buildInputs = [ python2Packages.python texinfo ];
-  nativeBuildInputs = [ python2Packages.wrapPython ];
+  propagatedBuildInputs = [ texinfo ];
 
-  patchPhase = ''
-    substituteInPlace configure --replace which "type -P"
+  # I couldn't figure out how to pass the proper parameter to disable pdf generation, so we
+  # use sed to change the default
+  preBuild = ''
+    sed -i -r 's/pdf\s+= True/pdf = False/g' setup.py
   '';
 
-  postInstall = "wrapPythonPrograms";
+  # the check scripts forces python2. If we need to use python3 at some point, we should use
+  # the correct python
+  checkPhase = ''
+    sed -i 's|python=python2|python=${python2Packages.python.interpreter}|' tests/run.sh
+    cd tests && ${stdenv.shell} run.sh
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Wrapper for LaTeX and friends";
     longDescription = ''
       Rubber is a program whose purpose is to handle all tasks related
@@ -28,9 +35,9 @@ stdenv.mkDerivation rec {
       produce PostScript documents is also included, as well as usage
       of pdfLaTeX to produce PDF documents.
     '';
-    license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/;
-    maintainers = [ stdenv.lib.maintainers.ttuegel ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl2Plus;
+    homepage = https://launchpad.net/rubber;
+    maintainers = with maintainers; [ ttuegel peterhoeg ];
+    platforms = platforms.unix;
   };
 }

From c049463520f676301a9d6422999a2f98b2fe68cb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Mon, 2 Jan 2017 23:19:59 +0800
Subject: [PATCH 0446/1310] puddletag: get rid of pypkgs variable

---
 pkgs/applications/audio/puddletag/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index 631a5701591..c140e1a46e5 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -1,10 +1,9 @@
 { stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
 
 let
-  pypkgs = python2Packages;
   pname = "puddletag";
 
-in pypkgs.buildPythonApplication rec {
+in python2Packages.buildPythonApplication rec {
   name = "${pname}-${version}";
   version = "1.2.0";
 
@@ -17,11 +16,9 @@ in pypkgs.buildPythonApplication rec {
 
   sourceRoot = "${pname}-v${version}-src/source";
 
-  disabled = pypkgs.isPy3k; # work to support python 3 has not begun
+  disabled = python2Packages.isPy3k; # work to support python 3 has not begun
 
-  outputs = [ "out" ];
-
-  propagatedBuildInputs = [ chromaprint ] ++ (with pypkgs; [
+  propagatedBuildInputs = [ chromaprint ] ++ (with python2Packages; [
     configobj
     mutagen
     pyparsing
@@ -35,7 +32,7 @@ in pypkgs.buildPythonApplication rec {
     siteDir=$(toPythonPath $out)
     mkdir -p $siteDir
     PYTHONPATH=$PYTHONPATH:$siteDir
-    ${pypkgs.python.interpreter} setup.py install --prefix $out
+    ${python2Packages.python.interpreter} setup.py install --prefix $out
   '';
 
   meta = with stdenv.lib; {

From 3c1ade7d15198c8af5cb1a4b04cc0e800afa3b80 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 2 Jan 2017 19:05:12 +0300
Subject: [PATCH 0447/1310] qutebrowser: 0.8.4 -> 0.9.0

---
 .../networking/browsers/qutebrowser/default.nix             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 5e5f8848ebe..3746bbe4f7e 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -24,12 +24,12 @@ let
 
 in buildPythonApplication rec {
   name = "qutebrowser-${version}";
-  version = "0.8.4";
+  version = "0.9.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0wc6iq7rw89625v595bs4y8spzhid6nnz2gq67f2kbjppk2rikpm";
+    sha256 = "1fp7yddx8xmy6hx01gg4z3vnw8b9qa5ixam7150i3xaalx0gjzfq";
   };
 
   # Needs tox
@@ -79,7 +79,7 @@ in buildPythonApplication rec {
   '';
 
   meta = {
-    homepage = https://github.com/The-Compiler/qutebrowser;
+    homepage = "https://github.com/The-Compiler/qutebrowser";
     description = "Keyboard-focused browser with a minimal GUI";
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = [ stdenv.lib.maintainers.jagajaga ];

From 90deca3a0ce2144370277febca2c8d0870225433 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 2 Jan 2017 19:20:28 +0300
Subject: [PATCH 0448/1310] nixos-generate-config: detect CPU governor

* cpu-freq: Try powersave if ondemand is not available

* Revert "cpu-freq: Try powersave if ondemand is not available"

This reverts commit 4dc56db37e32dcfecd667ebbf88263e47b296097.
Consult available scaling governors; for freshly generated configs, this provides a better experience than relying on a default that might not work everywhere.
---
 nixos/modules/config/power-management.nix         |  2 +-
 .../installer/tools/nixos-generate-config.pl      | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
index fbd7867a095..a4a4d6e1a6a 100644
--- a/nixos/modules/config/power-management.nix
+++ b/nixos/modules/config/power-management.nix
@@ -69,7 +69,7 @@ in
 
   config = mkIf cfg.enable {
 
-    # FIXME: Implement powersave governor for sandy bridge or later Intel CPUs
+    # Leftover for old setups, should be set by nixos-generate-config now
     powerManagement.cpuFreqGovernor = mkDefault "ondemand";
 
     systemd.targets.post-resume = {
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index f1874f23977..e17c02d1374 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -94,6 +94,21 @@ sub hasCPUFeature {
 my $cpus = scalar (grep {/^processor\s*:/} (split '\n', $cpuinfo));
 
 
+# Determine CPU governor to use
+if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") {
+    my $governors = read_file("/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors");
+    # ondemand governor is not available on sandy bridge or later Intel CPUs
+    my @desired_governors = ("ondemand", "powersave");
+    my $e;
+
+    foreach $e (@desired_governors) {
+        if (index($governors, $e) != -1) {
+            last if (push @attrs, "powerManagement.cpuFreqGovernor = \"$e\";");
+        }
+    }
+}
+
+
 # Virtualization support?
 push @kernelModules, "kvm-intel" if hasCPUFeature "vmx";
 push @kernelModules, "kvm-amd" if hasCPUFeature "svm";

From 2c31127edc01ce155fb8de7fef90b79f900d6a62 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sun, 1 Jan 2017 16:27:15 -0400
Subject: [PATCH 0449/1310] eclipse-sdk-46: 4.6.1 -> 4.6.2

---
 pkgs/applications/editors/eclipse/default.nix | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 4663e8c64f8..02efb3feef6 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -85,22 +85,7 @@ rec {
 
   ### Eclipse Platform
 
-  eclipse-platform = eclipse-platform-46;
-
-  eclipse-platform-46 = buildEclipse {
-    name = "eclipse-platform-4.6.1";
-    description = "Eclipse platform";
-    sources = {
-      "x86_64-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz;
-          sha256 = "1mr7sj4whz23iwz5j6mbqd80a39177qv0r7b6cip7dji4n2agl8j";
-        };
-      "i686-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk.tar.gz;
-          sha256 = "0kgj0zpgzwx90q13c4mr8swf63azd56532ycxgq2rbs0d1qbl87j";
-        };
-    };
-  };
+  eclipse-platform = eclipse-sdk-46;
 
   ### Eclipse Scala SDK
 
@@ -123,16 +108,16 @@ rec {
   ### Eclipse SDK
 
   eclipse-sdk-46 = buildEclipse {
-    name = "eclipse-sdk-4.6.1";
-    description = "Eclipse Neon Classic";
+    name = "eclipse-sdk-4.6.2";
+    description = "Eclipse Neon 2 Classic";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz;
-          sha256 = "1mr7sj4whz23iwz5j6mbqd80a39177qv0r7b6cip7dji4n2agl8j";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-SDK-4.6.2-linux-gtk-x86_64.tar.gz;
+          sha256 = "0g3nk1gcz178j8xk6nblkfsaysm8gq8101383fx60x6w25rdfgjb";
         };
       "i686-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk.tar.gz;
-          sha256 = "0kgj0zpgzwx90q13c4mr8swf63azd56532ycxgq2rbs0d1qbl87j";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-SDK-4.6.2-linux-gtk.tar.gz;
+          sha256 = "09wlkcxs5h3j8habqxgr4all99vkgmyixc0vr9dj3qs0kl85k5mz";
         };
     };
   };

From f16eda3fb1cdd25a2cee322c20ea8a904b764176 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Mon, 2 Jan 2017 10:53:02 -0400
Subject: [PATCH 0450/1310] eclipse-platform: add Neon 2 Platform

---
 pkgs/applications/editors/eclipse/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 02efb3feef6..cde3475196f 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -85,7 +85,22 @@ rec {
 
   ### Eclipse Platform
 
-  eclipse-platform = eclipse-sdk-46;
+  eclipse-platform = eclipse-platform-46;
+
+  eclipse-platform-46 = buildEclipse {
+    name = "eclipse-platform-4.6.2";
+    description = "Eclipse Platform Neon 2";
+    sources = {
+      "x86_64-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-platform-4.6.2-linux-gtk-x86_64.tar.gz;
+          sha256 = "1fmpirjkp210angyfz3nr5jp58snjy6784zkkbmdxkiyg9kg2wqq";
+        };
+      "i686-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-platform-4.6.2-linux-gtk.tar.gz;
+          sha256 = "0274g6ypiqsqkch10868ygbm6avc5pa57saz9wd196kdivl1bdpm";
+        };
+    };
+  };
 
   ### Eclipse Scala SDK
 

From 9383b2cf347c4181bbdd14b5c8bcb929e4cdcb8b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 18:01:42 +0100
Subject: [PATCH 0451/1310] postgrey: backwards compatability

---
 nixos/modules/rename.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 8102e0e1f64..758f229d59d 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -153,6 +153,17 @@ with lib;
     # alsa
     (mkRenamedOptionModule [ "sound" "enableMediaKeys" ] [ "sound" "mediaKeys" "enable" ])
 
+    # postgrey
+    (mkMergedOptionModule [ [ "services" "postgrey" "inetAddr" ] [ "services" "postgrey" "inetPort" ] ] [ "services" "postgrey" "socket" ] (config: let
+        value = p: getAttrFromPath p config;
+        inetAddr = [ "services" "postgrey" "inetAddr" ];
+        inetPort = [ "services" "postgrey" "inetPort" ];
+      in
+        if value inetAddr == null
+        then { path = "/var/run/postgrey.sock"; }
+        else { addr = value inetAddr; port = value inetPort; }
+    ))
+
     # Options that are obsolete and have no replacement.
     (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
     (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")

From cb9195b7bcde7ec8a2d5fa99df0a93afacd5c537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 1 Jan 2017 16:44:32 +0100
Subject: [PATCH 0452/1310] nixos: provide /etc/hostname

/etc/hostname is the file used by hostnamectl(1) and the
org.freedesktop.hostname1 dbus service (both provided by systemd) to get
the "static hostname". Better provide it so that users of those
tools/services get a proper hostname.

An example of an issue created by the lack of /etc/hostname is that the
bluetooth stack on NixOS identifies itself to peers as "BlueZ $VERSION"
instead of the hostname.

References:
https://www.freedesktop.org/software/systemd/man/hostname.html

Changes v1 -> v2:
  * ensure /etc/hostname ends with a newline
---
 nixos/modules/tasks/network-interfaces.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 74f7e5fcc2c..83d9854d351 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -921,6 +921,13 @@ in
         '';
       };
 
+    # static hostname configuration needed for hostnamectl and the
+    # org.freedesktop.hostname1 dbus service (both provided by systemd)
+    environment.etc."hostname" = mkIf (cfg.hostName != "")
+      {
+        text = cfg.hostName + "\n";
+      };
+
     environment.systemPackages =
       [ pkgs.host
         pkgs.iproute

From 237af1853a795356bb8d693c29ad1d319943f94e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 2 Jan 2017 18:48:48 +0100
Subject: [PATCH 0453/1310] Revert "nixos/cjdns: do not ammend /etc/hosts"

This reverts commit 60ded3f3632d221ca3f82a52392e155517880456.

We want to make this optional instead.
---
 nixos/modules/services/networking/cjdns.nix | 51 +++++++++++++--------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 0dd028997f4..839a5bf0738 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -19,21 +19,30 @@ let
         type = types.str;
         description = "Public key at the opposite end of the tunnel.";
       };
+      hostname = mkOption {
+        default = "";
+        example = "foobar.hype";
+        type = types.str;
+        description = "Optional hostname to add to /etc/hosts; prevents reverse lookup failures.";
+      };
     };
   };
 
-  # check for the required attributes, otherwise
-  # permit attributes not undefined here
-  checkPeers = x:
-    x // {
-      connectTo = mapAttrs
-        (name: value:
-          if !hasAttr "publicKey" value then abort "cjdns peer ${name} missing a publicKey" else
-          if !hasAttr "password"  value then abort "cjdns peer ${name} missing a password"  else
-          value
-        )
-      x.connectTo;
-    };
+  # Additional /etc/hosts entries for peers with an associated hostname
+  cjdnsExtraHosts = import (pkgs.runCommand "cjdns-hosts" {}
+    # Generate a builder that produces an output usable as a Nix string value
+    ''
+      exec >$out
+      echo \'\'
+      ${concatStringsSep "\n" (mapAttrsToList (k: v:
+          optionalString (v.hostname != "")
+            "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}")
+          (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))}
+      echo \'\'
+    '');
+
+  parseModules = x:
+    x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; };
 
   # would be nice to  merge 'cfg' with a //,
   # but the json nesting is wacky.
@@ -44,8 +53,8 @@ let
     };
     authorizedPasswords = map (p: { password = p; }) cfg.authorizedPasswords;
     interfaces = {
-      ETHInterface = if (cfg.ETHInterface.bind != "") then [ (checkPeers cfg.ETHInterface) ] else [ ];
-      UDPInterface = if (cfg.UDPInterface.bind != "") then [ (checkPeers cfg.UDPInterface) ] else [ ];
+      ETHInterface = if (cfg.ETHInterface.bind != "") then [ (parseModules cfg.ETHInterface) ] else [ ];
+      UDPInterface = if (cfg.UDPInterface.bind != "") then [ (parseModules cfg.UDPInterface) ] else [ ];
     };
 
     privateKey = "@CJDNS_PRIVATE_KEY@";
@@ -125,12 +134,12 @@ in
           '';
          };
         connectTo = mkOption {
-          type = types.attrsOf (types.attrsOf types.str);
+          type = types.attrsOf ( types.submodule ( connectToSubmodule ) );
           default = { };
           example = {
             "192.168.1.1:27313" = {
-              user      = "foobar";
-              password  = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
+              hostname = "homer.hype";
+              password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
               publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
             };
           };
@@ -170,12 +179,12 @@ in
         };
 
         connectTo = mkOption {
-          type = types.attrsOf (types.attrsOf types.str);
+          type = types.attrsOf ( types.submodule ( connectToSubmodule ) );
           default = { };
           example = {
             "01:02:03:04:05:06" = {
-              user      = "foobar";
-              password  = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
+              hostname = "homer.hype";
+              password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
               publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
             };
           };
@@ -248,6 +257,8 @@ in
       };
     };
 
+    networking.extraHosts = cjdnsExtraHosts;
+
     assertions = [
       { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null );
         message = "Neither cjdns.ETHInterface.bind nor cjdns.UDPInterface.bind defined.";

From bdb9cd1e172af5895cb47c1266350cd53edd0a47 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Mon, 2 Jan 2017 19:26:48 +0100
Subject: [PATCH 0454/1310] cjdns service: optionally add cjdns hosts to
 networking.extraHosts

Enabling this incurs a heavy eval-time cost, but it's a nice usability
enhancement; satisfy both concerns by making it optional (default
false).
---
 nixos/modules/services/networking/cjdns.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 839a5bf0738..a10851c1652 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -195,6 +195,16 @@ in
         };
       };
 
+      addExtraHosts = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to add cjdns peers with an associated hostname to
+          <filename>/etc/hosts</filename>.  Beware that enabling this
+          incurs heavy eval-time costs.
+        '';
+      };
+
     };
 
   };
@@ -257,7 +267,7 @@ in
       };
     };
 
-    networking.extraHosts = cjdnsExtraHosts;
+    networking.extraHosts = mkIf cfg.addExtraHosts cjdnsExtraHosts;
 
     assertions = [
       { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null );

From 66c745e30d26ee30de4a6fa4dfc7862b48ee2697 Mon Sep 17 00:00:00 2001
From: Balletie <skip_meesie@hotmail.com>
Date: Sun, 18 Dec 2016 20:48:41 +0100
Subject: [PATCH 0455/1310] pommed-light: init at 1.50lw

---
 .../linux/pommed-light/default.nix            | 65 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 67 insertions(+)
 create mode 100644 pkgs/os-specific/linux/pommed-light/default.nix

diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix
new file mode 100644
index 00000000000..a039984ff33
--- /dev/null
+++ b/pkgs/os-specific/linux/pommed-light/default.nix
@@ -0,0 +1,65 @@
+{
+  stdenv
+, fetchurl
+, pciutils
+, confuse
+, alsaLib
+, audiofile
+, pkgconfig
+, zlib
+, eject
+}:
+
+stdenv.mkDerivation rec {
+  pkgname = "pommed-light";
+  version = "1.50lw";
+  name = "${pkgname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/bytbox/${pkgname}/archive/v${version}.tar.gz";
+
+    sha256 = "1r2f28zqmyvzgymd0ng53hscbrq8vcqhxdnkq5dppjf9yrzn018b";
+  };
+
+  postPatch = ''
+    substituteInPlace pommed.conf.mactel --replace /usr $out
+    substituteInPlace pommed.conf.pmac --replace /usr $out
+    substituteInPlace pommed/beep.h --replace /usr $out
+    substituteInPlace pommed/cd_eject.c --replace /usr/bin/eject ${eject}/bin/eject
+  '';
+
+  buildInputs = [
+    pciutils
+    confuse
+    alsaLib
+    audiofile
+    pkgconfig
+    zlib
+    eject
+  ];
+
+  installPhase = ''
+    install -Dm755 pommed/pommed $out/bin/pommed
+    install -Dm644 pommed.conf.mactel $out/etc/pommed.conf.mactel
+    install -Dm644 pommed.conf.pmac $out/etc/pommed.conf.pmac
+
+    # Man page
+    install -Dm644 pommed.1 $out/share/man/man1/pommed.1
+
+    # Sounds
+    install -Dm644 pommed/data/goutte.wav $out/share/pommed/goutte.wav
+    install -Dm644 pommed/data/click.wav $out/share/pommed/click.wav
+  '';
+
+  meta = {
+    description = "A trimmed version of the pommed hotkey handler for MacBooks";
+    longDescription = ''
+      This is a stripped-down version of pommed with client, dbus, and
+      ambient light sensor support removed, optimized for use with dwm
+      and the like.
+    '';
+    homepage = https://github.com/bytbox/pommed-light;
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2de21fe9006..5f4300337c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14455,6 +14455,8 @@ in
 
   pommed = callPackage ../os-specific/linux/pommed {};
 
+  pommed_light = callPackage ../os-specific/linux/pommed-light {};
+
   pond = callPackage ../applications/networking/instant-messengers/pond { };
 
   ponymix = callPackage ../applications/audio/ponymix { };

From e5f5aa52e5bb4415c3111aa34de0654fa8999ea2 Mon Sep 17 00:00:00 2001
From: Balletie <skip_meesie@hotmail.com>
Date: Sun, 18 Dec 2016 20:50:49 +0100
Subject: [PATCH 0456/1310] pommed service: use pommed-light

The pommed package was marked as broken. It is also severely
unmaintained. I therefore chose to replace it entirely with
`pommed-light`, for now.
---
 nixos/modules/services/hardware/pommed.nix | 36 ++++++++++++----------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/hardware/pommed.nix b/nixos/modules/services/hardware/pommed.nix
index 7be4dc1e846..bf7d6a46a29 100644
--- a/nixos/modules/services/hardware/pommed.nix
+++ b/nixos/modules/services/hardware/pommed.nix
@@ -2,7 +2,9 @@
 
 with lib;
 
-{
+let cfg = config.services.hardware.pommed;
+    defaultConf = "${pkgs.pommed_light}/etc/pommed.conf.mactel";
+in {
 
   options = {
 
@@ -12,37 +14,37 @@ with lib;
         type = types.bool;
         default = false;
         description = ''
-          Whether to use the pommed tool to handle Apple laptop keyboard hotkeys.
+          Whether to use the pommed tool to handle Apple laptop
+          keyboard hotkeys.
         '';
       };
 
       configFile = mkOption {
-        type = types.path;
+        type = types.nullOr types.path;
+        default = null;
         description = ''
-          The path to the <filename>pommed.conf</filename> file.
+          The path to the <filename>pommed.conf</filename> file. Leave
+          to null to use the default config file
+          (<filename>/etc/pommed.conf.mactel</filename>). See the
+          files <filename>/etc/pommed.conf.mactel</filename> and
+          <filename>/etc/pommed.conf.pmac</filename> for examples to
+          build on.
         '';
       };
     };
 
   };
 
-  config = mkIf config.services.hardware.pommed.enable {
-    environment.systemPackages = [ pkgs.polkit ];
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.polkit pkgs.pommed_light ];
 
-    environment.etc."pommed.conf".source = config.services.hardware.pommed.configFile;
-
-    services.hardware.pommed.configFile = "${pkgs.pommed}/etc/pommed.conf";
-
-    services.dbus.packages = [ pkgs.pommed ];
+    environment.etc."pommed.conf".source =
+      if cfg.configFile == null then defaultConf else cfg.configFile;
 
     systemd.services.pommed = {
-      description = "Pommed hotkey management";
+      description = "Pommed Apple Hotkeys Daemon";
       wantedBy = [ "multi-user.target" ];
-      after = [ "dbus.service" ];
-      postStop = "rm -f /var/run/pommed.pid";
-      script = "${pkgs.pommed}/bin/pommed";
-      serviceConfig.Type = "forking";
-      path = [ pkgs.eject ];
+      script = "${pkgs.pommed_light}/bin/pommed -f";
     };
   };
 }

From a541999d77a5495f023518450d02be278424f81f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 17:11:38 +0100
Subject: [PATCH 0457/1310] libgphoto2: 2.5.10 -> 2.5.11

---
 pkgs/development/libraries/libgphoto2/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index e9b6968d13b..6a7b747f7f9 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -7,15 +7,10 @@ stdenv.mkDerivation rec {
     owner = "gphoto";
     repo = "libgphoto2";
     rev = "${meta.tag}";
-    sha256 = "17k3jxib2jcr2wk83p34h3lvvjbs2gqhqfcngm8zmlrwb385yalh";
+    sha256 = "01nirw0xb8fjjv0jz88bmddv26bgg82w1wg65q51iblmy9z8azfh";
   };
 
-  patches = [(fetchpatch {
-    name = "libjpeg_turbo_1.5.0_fix.patch";
-    url = "https://anonscm.debian.org/cgit/pkg-phototools/libgphoto2.git/plain"
-      + "/debian/patches/libjpeg_turbo_1.5.0_fix.patch?id=8ce79a2a02d";
-    sha256 = "1zclgg20nv4krj8gigq3ylirxqiv1v8p59cfji041m156hy80gy2";
-  })];
+  patches = [];
 
   nativeBuildInputs = [ pkgconfig gettext autoreconfHook ];
   buildInputs = [ libtool libjpeg libusb1  ];
@@ -38,8 +33,8 @@ stdenv.mkDerivation rec {
       MTP, and other vendor specific protocols for controlling and transferring data
       from digital cameras.
     '';
-    version = "2.5.10";
-    tag = "libgphoto2-2_5_10-release";
+    version = "2.5.11";
+    tag = "libgphoto2-2_5_11-release";
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = with stdenv.lib.platforms; unix;

From f2abc2d4a0e3dba0da87a7c118c5371d3d3ff901 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 17:13:38 +0100
Subject: [PATCH 0458/1310] imagemagick7: fix references in the lighter
 versions

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f4300337c7..37fa0389543 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13595,7 +13595,7 @@ in
 
   imagemagickBig = callPackage ../applications/graphics/ImageMagick { };
 
-  imagemagick7_light = lowPrio (imagemagick.override {
+  imagemagick7_light = lowPrio (imagemagick7.override {
     bzip2 = null;
     zlib = null;
     libX11 = null;
@@ -13615,7 +13615,7 @@ in
     libwebp = null;
   });
 
-  imagemagick7 = lowPrio (imagemagickBig.override {
+  imagemagick7 = lowPrio (imagemagick7Big.override {
     ghostscript = null;
   });
 

From d94706ed6660e44f3265ccf205a04d3d0177c4a9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 17:14:03 +0100
Subject: [PATCH 0459/1310] baresip: 0.4.20 -> 0.5.0

---
 .../networking/instant-messengers/baresip/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index dbb7b3fe237..3ce638e6b58 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,11 +4,11 @@
 , gsm, speex, portaudio, spandsp, libuuid, ccache
 }:
 stdenv.mkDerivation rec {
-  version = "0.4.20";
+  version = "0.5.0";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "0m8afbfdc9a57cy94ny7g6jv2ndfmrvkx0lgk64i8w870958gkwb";
+    sha256 = "0dhlgjkqn7jkd1pmdyid41c829clzmi5kczjdwxzh5ygn95lydjc";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
     cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good

From 41dc1e5237dfef30b657f6d639bf155d6d588ab8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 17:14:33 +0100
Subject: [PATCH 0460/1310] ecl: 16.1.2 -> 16.1.3

---
 pkgs/development/compilers/ecl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index 60293fa2ec1..e506e3aace1 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -9,11 +9,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="ecl";
-    version="16.1.2";
+    version="16.1.3";
     name="${baseName}-${version}";
-    hash="16ab8qs3awvdxy8xs8jy82v8r04x4wr70l9l2j45vgag18d2nj1d";
-    url="https://common-lisp.net/project/ecl/static/files/release/ecl-16.1.2.tgz";
-    sha256="16ab8qs3awvdxy8xs8jy82v8r04x4wr70l9l2j45vgag18d2nj1d";
+    hash="0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn";
+    url="https://common-lisp.net/project/ecl/static/files/release/ecl-16.1.3.tgz";
+    sha256="0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn";
   };
   buildInputs = [
     libtool autoconf automake makeWrapper

From 11bfe018468af2e82b374b83e7c52536c24ce697 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 17:18:09 +0100
Subject: [PATCH 0461/1310] firejail: 0.9.42 -> 0.9.44.2

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

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 30fdbadd87b..6b3afc1d63c 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.42";
+    version="0.9.44.2";
     name="${baseName}-${version}";
-    hash="0iwv97c0ygxrgxg997618a7cq3hl1l3b0njx7bqzv11vjzpcwfsg";
-    url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.42.tar.xz";
-    sha256="0iwv97c0ygxrgxg997618a7cq3hl1l3b0njx7bqzv11vjzpcwfsg";
+    hash="0lc8vq6lj0669q4vx08m3dzqjayhl0cmm7n3qi4k18ys8ccyzbf5";
+    url="https://kent.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.2.tar.xz";
+    sha256="0lc8vq6lj0669q4vx08m3dzqjayhl0cmm7n3qi4k18ys8ccyzbf5";
   };
   buildInputs = [
     which
@@ -24,8 +24,6 @@ stdenv.mkDerivation {
   preConfigure = ''
     sed -e 's@/bin/bash@${stdenv.shell}@g' -i $( grep -lr /bin/bash .)
     sed -e "s@/bin/cp@$(which cp)@g" -i $( grep -lr /bin/cp .)
-    sed -e '/void fs_var_run(/achar *vrcs = get_link("/var/run/current-system")\;' -i ./src/firejail/fs_var.c
-    sed -e '/ \/run/iif(vrcs!=NULL){symlink(vrcs, "/var/run/current-system")\;free(vrcs)\;}' -i ./src/firejail/fs_var.c
   '';
 
   preBuild = ''

From 0af8ddb2f8d8e907207ebe9ffe7a32e103b917f9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 17:20:13 +0100
Subject: [PATCH 0462/1310] libpng: 1.6.26 -> 1.6.27; a security update;
 @grahamc should this be ported to stable immediately or together with some
 other mass-rebuild change

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

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index a20bc7e5f3c..8c6e1c4af15 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,10 +3,12 @@
 assert zlib != null;
 
 let
-  version = "1.6.26";
-  sha256 = "1ybkgcqqsd4iiiyv60pxjfi1csszb50bd2cxxsy3sv4q4sil6rr6";
+  version = "1.6.27";
+  patchVersion = "1.6.26";
+  # patchVersion = version;
+  sha256 = "0yxmajq2ri1smpz5spi0f055izbdkmmr7a5zp7d6qd9nfgczz8pw";
   patch_src = fetchurl {
-    url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
+    url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
     sha256 = "0b6p2k4afvhk1svargpllcvhxb4g3p857wkqk85cks0yv42ckph1";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;

From 8dc53b17eae3e82d50643f784aac7c5e02e2cec7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 17:35:28 +0100
Subject: [PATCH 0463/1310] ipmiutil: 3.0.0 -> 3.0.1

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

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index 37f5131a037..059a5d9e416 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "3.0.0";
+  version = "3.0.1";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "0r986mvh6q1f7369qry2vq4rqc6kc4kq957s2g5qsl8m1pyw2mvx";
+    sha256 = "179hvarw0mk3j1z4102q4692q4mx06y259llr891by0pri0bsb3n";
   };
 
   buildInputs = [ openssl ];

From a36c7deb04a586b07919b86349afd6dcc26fe4fc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 17:37:19 +0100
Subject: [PATCH 0464/1310] apache-jena-fuseki: 2.4.0 -> 2.4.1

---
 pkgs/servers/nosql/apache-jena/fuseki-binary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
index bc83d0cccab..12543b336dd 100644
--- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
+++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="apache-jena-fuseki";
-    version = "2.4.0";
+    version = "2.4.1";
     name="${baseName}-${version}";
     url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
-    sha256 = "0jjrgvnc571wdkv722k0xc43n94w0rn1ci4ndxya9fvlag1rjhlb";
+    sha256 = "01yjpghgz637wwgnk5n9d7kchc3mmrbyrm8fs4rh2hkh66mq3ya4";
   };
   buildInputs = [
     makeWrapper

From f38f46ee41bff5ae78d7b9673f4c8055af55f944 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:04:30 +0100
Subject: [PATCH 0465/1310] graphviz: 2.38.0 -> 2.40.1

---
 pkgs/tools/graphics/graphviz/default.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 1162b338ed7..e815cded09a 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -4,23 +4,17 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.38.0";
+  version = "2.40.1";
   name = "graphviz-${version}";
 
   src = fetchurl {
     url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
-    sha256 = "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1";
+    sha256 = "08d4ygkxz2f553bxj6087da56a23kx1khv0j8ycxa102vvx1hlna";
   };
 
   hardeningDisable = [ "fortify" ];
 
-  patches =
-    [ ./0001-vimdot-lookup-vim-in-PATH.patch
-
-      # NOTE: Once this patch is removed, flex can probably be removed from
-      # buildInputs.
-      ./cve-2014-9157.patch
-    ];
+  patches = [ ];
 
   buildInputs =
     [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango
@@ -33,11 +27,13 @@ stdenv.mkDerivation rec {
 
   configureFlags = stdenv.lib.optional (xorg == null) "--without-x";
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = (stdenv.lib.optionalString stdenv.isDarwin ''
     for foo in cmd/dot/Makefile.in cmd/edgepaint/Makefile.in \
                     cmd/mingle/Makefile.in plugin/gdiplus/Makefile.in; do
       substituteInPlace "$foo" --replace "-lstdc++" "-lc++"
     done
+  '') + ''
+      substituteInPlace "plugin/xlib/vimdot.sh" --replace "/usr/bin/vim" "\$(command -v vim)"
   '';
 
   preBuild = ''

From 99e4bd8627a12ba33d897ff8b132fd08edf5c799 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:06:09 +0100
Subject: [PATCH 0466/1310] sgtpuzzles: 20160429.b31155b -> 20161228.7cae89f

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

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index 0500a456269..26278dd031c 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -1,6 +1,6 @@
 {stdenv, gtk3, pkgconfig, libX11, perl, fetchurl, automake115x, autoconf}:
 let
-  version = "20160429.b31155b";
+  version = "20161228.7cae89f";
   buildInputs = [
     gtk3 pkgconfig libX11 perl automake115x autoconf
   ];
@@ -8,7 +8,7 @@ in
 stdenv.mkDerivation {
   src = fetchurl {
    url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-   sha256 = "0y807srhf6571ijdwpa493qzsx161f0a1pmh2qi44f6ixfcrkgzi";
+   sha256 = "0kqy3gdgfjgaqbjl95pnljz44v91i79qphwdp91k0n5alswxwn76";
   };
   name = "sgt-puzzles-r" + version;
   inherit buildInputs;

From 237629a0903276cf334bc8cfdbf0d79383297139 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:06:42 +0100
Subject: [PATCH 0467/1310] eudev: 3.2 -> 3.2.1

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

diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index 8ab4da2da8c..772e69ac390 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="eudev";
-    version = "3.2";
+    version = "3.2.1";
     name="${baseName}-${version}";
     url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz";
-    sha256 = "099w62ncq78nxpxizf910mx18hc8x4qvzw3azjd00fir89wmyjnq";
+    sha256 = "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp";
   };
   buildInputs = [
     glib pkgconfig gperf utillinux

From 37b8e22c728f5251205797f4b1491bf48e28a695 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:08:31 +0100
Subject: [PATCH 0468/1310] glusterfs: 3.8.4 -> 3.9.0

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

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 32c87667ee3..745d968cce1 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -6,11 +6,11 @@ let
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.8.4";
+    version="3.9.0";
     name="${baseName}-${version}";
-    hash="0f715r6bf12b37s1l3259qzfbz8l2g3mdsnnh2lflagzazn6jnap";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.8/3.8.4/glusterfs-3.8.4.tar.gz";
-    sha256="0f715r6bf12b37s1l3259qzfbz8l2g3mdsnnh2lflagzazn6jnap";
+    hash="057vq4f93f1g9sh1sfbqhccsprxrbhwwm898322x25sb8mscc5xl";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.9/3.9.0/glusterfs-3.9.0.tar.gz";
+    sha256="057vq4f93f1g9sh1sfbqhccsprxrbhwwm898322x25sb8mscc5xl";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python2 ncurses readline

From ca8d3de1d2ec5e8adb7319545385140506115ee0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:08:54 +0100
Subject: [PATCH 0469/1310] nginx: 1.11.7 -> 1.11.8

---
 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 c00cc3f4e5d..0e688b0c0c4 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.7";
-  sha256 = "03ihv5v8qasifh4wlql0ggbqkyvak29g0h5fqzka69i15fsvwm8d";
+  version = "1.11.8";
+  sha256 = "0d3bcrgj2ykky2yk06y0ihv6832s30mqzcfwq8a560brbmqz7bjk";
 })

From 5ce78bdd0318d42db306236b4b39395adf104681 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:09:23 +0100
Subject: [PATCH 0470/1310] dd_rescue: 1.99 -> 1.99.5

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

diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix
index d98ceb84bc3..69cd8da4aef 100644
--- a/pkgs/tools/system/dd_rescue/default.nix
+++ b/pkgs/tools/system/dd_rescue/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf }:
 
 stdenv.mkDerivation rec {
-  version = "1.99";
+  version = "1.99.5";
   name = "dd_rescue-${version}";
 
   src = fetchurl {
-    sha256 = "0gkbwssn134fjyyvjvylyvassw4fwv5mbis9gcb969xdc64dfhg1";
+    sha256 = "0db94piwcdyqhnlhgfs0bfp0gp2mqyrcr2l5nljapgni31qk4p8j";
     url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2";
   };
 

From d01cd11e596aaa79f6e9ea47c55716a63fae4f90 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:13:10 +0100
Subject: [PATCH 0471/1310] lrzip: 0.630 -> 0.631

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

diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix
index e3a01647afb..083a71f6a75 100644
--- a/pkgs/tools/compression/lrzip/default.nix
+++ b/pkgs/tools/compression/lrzip/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}:
 
 stdenv.mkDerivation rec {
-  version = "0.630";
+  version = "0.631";
   name = "lrzip-${version}";
 
   src = fetchurl {
     url = "http://ck.kolivas.org/apps/lrzip/${name}.tar.bz2";
-    sha256 = "01ykxliqw4cavx9f2gawxfa9wf52cjy1qx28cnkrh6i3lfzzcq94";
+    sha256 = "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d";
   };
 
   buildInputs = [ zlib lzo bzip2 nasm perl ];

From 6565d7f12e511a8157e49a2b0d84ccafe6cf3fa8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:13:35 +0100
Subject: [PATCH 0472/1310] angelscript: 2.31.1 -> 2.31.2

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

diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index 16042091a47..2608388e152 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="angelscript";
-    version = "2.31.1";
+    version = "2.31.2";
     name="${baseName}-${version}";
     url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "00z0x2w1dnfd2h8xvmq3qy2n8gqxyi9gxwnsz0q420by8vnrljmh";
+    sha256 = "1cl1yg36ad4wq0vks4xg0hv7iyvq6yzsd4y1jng5qdf8qybq02qc";
   };
   buildInputs = [
     unzip

From 9fb0d83c831dd59ea50bf2e73a6ff90c438833a3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:14:41 +0100
Subject: [PATCH 0473/1310] compiz: 0.9.13.0 -> 0.9.13.1

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

diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index e9f5d9bdbf2..240bc19dd45 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -18,11 +18,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="compiz";
-    version="0.9.13.0";
+    version="0.9.13.1";
     name="${baseName}-${version}";
-    hash="00m73im5kdpbfjg9ryzxnab5qvx5j51gxwr3wzimkrcbax6vb3ph";
-    url="https://launchpad.net/compiz/0.9.13/0.9.13.0/+download/compiz-0.9.13.0.tar.bz2";
-    sha256="00m73im5kdpbfjg9ryzxnab5qvx5j51gxwr3wzimkrcbax6vb3ph";
+    hash="1grc4a4gc662hjs5adzdd3zlgsg1rh1wqm9aanbs8wm0l8mq0m4q";
+    url="https://launchpad.net/compiz/0.9.13/0.9.13.1/+download/compiz-0.9.13.1.tar.bz2";
+    sha256="1grc4a4gc662hjs5adzdd3zlgsg1rh1wqm9aanbs8wm0l8mq0m4q";
   };
   buildInputs = [cmake pkgconfig
     libXrender renderproto gtk2 libwnck pango cairo

From 16ea6c74393dfd80059512f7aa67ab45b4d705c6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:16:42 +0100
Subject: [PATCH 0474/1310] luarocks: 2.4.0 -> 2.4.2

---
 pkgs/development/tools/misc/luarocks/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index 4da105f9303..03a686c125f 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="luarocks";
-    version="2.4.0";
+    version="2.4.2";
     name="${baseName}-${version}";
-    hash="1hwpjj4nvy8m7hfmhf52vbhmlh7r3wfjjcc589yj8dnh528iqf24";
-    url="http://luarocks.org/releases/luarocks-2.4.0.tar.gz";
-    sha256="1hwpjj4nvy8m7hfmhf52vbhmlh7r3wfjjcc589yj8dnh528iqf24";
+    hash="1rfjfjgnafjxs1zrd1gy0ga5lw28sf5lrdmgzgh6bcp1hd2w67hf";
+    url="http://luarocks.org/releases/luarocks-2.4.2.tar.gz";
+    sha256="1rfjfjgnafjxs1zrd1gy0ga5lw28sf5lrdmgzgh6bcp1hd2w67hf";
   };
   buildInputs = [
     lua curl makeWrapper which unzip

From 31106095e1eafcd2375dfec0bc7f3714a1eb74ba Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:18:35 +0100
Subject: [PATCH 0475/1310] scons: 2.5.0 -> 2.5.1

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

diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 550a59a887e..630dc4c751e 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -2,13 +2,13 @@
 
 let
   name = "scons";
-  version = "2.5.0";
+  version = "2.5.1";
 in python2Packages.buildPythonApplication {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
-    sha256 = "1sdcj8iapfzmlq7098yas40qwl6khsiwydbxv33sw81wy93nnagb";
+    sha256 = "1wji1z9jdkhnmm99apx6fhld9cs52rr56aigniyrcsmlwy52298b";
   };
   # No tests
   doCheck = false;

From e8584294f10c1b1e5b95d4dedd2707e8d4191e2f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:20:03 +0100
Subject: [PATCH 0476/1310] slimerjs: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index ff06e5d4159..cb6c4614a1a 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="slimerjs";
-    version="0.10.1";
+    version="0.10.2";
     name="${baseName}-${version}";
-    hash="14xfhn9v3mn4m7hfa36750vp7qgmnc5yfrdkjymzm8g9fz39ddx2";
-    url="http://download.slimerjs.org/releases/0.10.1/slimerjs-0.10.1.zip";
-    sha256="14xfhn9v3mn4m7hfa36750vp7qgmnc5yfrdkjymzm8g9fz39ddx2";
+    hash="16pg12bvfqls707nsdqi3bl1c833kncsvnd0qiq5692lrh93x529";
+    url="http://download.slimerjs.org/releases/0.10.2/slimerjs-0.10.2.zip";
+    sha256="16pg12bvfqls707nsdqi3bl1c833kncsvnd0qiq5692lrh93x529";
   };
   buildInputs = [
     unzip zip

From 38e50a3d774eb308e7da772bd353a639badd2724 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:21:37 +0100
Subject: [PATCH 0477/1310] sbcl: 1.3.12 -> 1.3.13

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 8fa4741a4a1..85c558c92e8 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.3.12";
+  version = "1.3.13";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "1hjr2xqazy4j0m58y4na6fz8ii3xflqairxy7vpd7ajbs00yqfc0";
+    sha256 = "1k3nij1pchkard02p51mbbsn4rrj116v1apjjpd3f9h2m7j3asac";
   };
 
   patchPhase = ''

From 29dfbca634165fc921a5c31b0c10b3e425c29b1b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 18:24:39 +0100
Subject: [PATCH 0478/1310] eigen3_3: init at 3.3.1; not compatible enough with
 3.2.5 to switch the default immediately

---
 pkgs/development/libraries/eigen/3.3.nix | 25 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/eigen/3.3.nix

diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
new file mode 100644
index 00000000000..ca3d4402206
--- /dev/null
+++ b/pkgs/development/libraries/eigen/3.3.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, cmake}:
+
+let
+  version = "3.3.1";
+in
+stdenv.mkDerivation {
+  name = "eigen-${version}";
+  
+  src = fetchurl {
+    url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
+    name = "eigen-${version}.tar.gz";
+    sha256 = "141axgv5kykq7125scisjvnfcdx7qcj8n8zlk7g09r7fhqgjr79w";
+  };
+  
+  nativeBuildInputs = [ cmake ];
+  
+  meta = with stdenv.lib; {
+    description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
+    license = licenses.lgpl3Plus;
+    homepage = http://eigen.tuxfamily.org ;
+    platforms = platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ];
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37fa0389543..e5773c94bdb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6969,6 +6969,7 @@ in
   eclib = callPackage ../development/libraries/eclib {};
 
   eigen = callPackage ../development/libraries/eigen {};
+  eigen3_3 = callPackage ../development/libraries/eigen/3.3.nix {};
 
   eigen2 = callPackage ../development/libraries/eigen/2.0.nix {};
 

From 50e20b566f707537a1cdafaf0b22d7666f8117d7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 20:18:33 +0100
Subject: [PATCH 0479/1310] libmwaw: 0.3.8 -> 0.3.9

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

diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix
index fc2ed6c6086..a52e25e7cf2 100644
--- a/pkgs/development/libraries/libmwaw/default.nix
+++ b/pkgs/development/libraries/libmwaw/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libmwaw";
-    version="0.3.8";
+    version="0.3.9";
     name="${baseName}-${version}";
-    hash="019vk8cj3lgbrpgj48zy25mpkgmllwxznkfd94hh9vbb1cjvpz3a";
-    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.8/libmwaw-0.3.8.tar.xz";
-    sha256="019vk8cj3lgbrpgj48zy25mpkgmllwxznkfd94hh9vbb1cjvpz3a";
+    hash="185jnp7b7s550xpz3bhaii275qw5yd3j29zijkd2rr8h2p9s9z7p";
+    url="https://heanet.dl.sourceforge.net/project/libmwaw/libmwaw/libmwaw-0.3.9/libmwaw-0.3.9.tar.xz";
+    sha256="185jnp7b7s550xpz3bhaii275qw5yd3j29zijkd2rr8h2p9s9z7p";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib libwpg libwpd librevenge

From 7c5784d1f066bc44d86b684947d236853944e96b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 2 Jan 2017 21:53:21 +0100
Subject: [PATCH 0480/1310] maxima: 5.38.1 -> 5.39.0

---
 pkgs/applications/science/math/maxima/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 55443f90c6f..85a13f7ac37 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -4,7 +4,7 @@ tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false
 
 let
   name    = "maxima";
-  version = "5.38.1";
+  version = "5.39.0";
 
   searchPath =
     stdenv.lib.makeBinPath
@@ -15,7 +15,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
-    sha256 = "1p6646rvq43hk09msyp0dk50cqpkh07mf4x0bc2fqisqmcv6b1hf";
+    sha256 = "1cvignn5y6qzrby6qb885yc8zdcdqdr1d50vcvc3gapw2f0gk3zm";
   };
 
   buildInputs = stdenv.lib.filter (x: x != null)

From c557466988fdb2ea0dec9d245aa92c57798ea199 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 2 Jan 2017 22:21:15 +0000
Subject: [PATCH 0481/1310] xfce4-windowck-plugin: init at 0.4.4

---
 pkgs/desktops/xfce/default.nix                |  1 +
 .../panel-plugins/xfce4-windowck-plugin.nix   | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 609ed57ab3c..ace5f289ab4 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -95,6 +95,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   xfce4_xkb_plugin              = callPackage ./panel-plugins/xfce4-xkb-plugin.nix              { };
   xfce4_weather_plugin          = callPackage ./panel-plugins/xfce4-weather-plugin.nix          { };
   xfce4_whiskermenu_plugin      = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix      { };
+  xfce4_windowck_plugin         = callPackage ./panel-plugins/xfce4-windowck-plugin.nix         { };
   xfce4_pulseaudio_plugin       = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix       { };
 
 }; # xfce_self
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
new file mode 100644
index 00000000000..523283b453a
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, pkgconfig, intltool, python3, imagemagick, libwnck, gtk2
+, exo, libxfce4ui, libxfce4util, xfce4panel, xfconf, xfce4_dev_tools }:
+
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-windowck-plugin";
+  version = "0.4.4";
+
+  src = fetchFromGitHub {
+    owner = "cedl38";
+    repo = "xfce4-windowck-plugin";
+    rev = "v${version}";
+    sha256 = "0c6a1ibh39dpq9x0dha5lsg0vzmgaf051fgwz0nlky0s94nwzvgv";
+  };
+  name = "${p_name}-${version}";
+
+  buildInputs = [ pkgconfig intltool python3 imagemagick libwnck gtk2
+    exo libxfce4ui libxfce4util xfce4panel xfconf xfce4_dev_tools ];
+
+  preConfigure = "./autogen.sh";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    description = "Set of two plugins which allows you to put the maximized window title and windows buttons on the panel";
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.volth ];
+  };
+}

From e90844269352fdd60e42f8d61dd3f7ab129d6806 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 3 Jan 2017 02:33:15 +0300
Subject: [PATCH 0482/1310] kdeWrapper: allow wrapping several packages

---
 pkgs/applications/editors/kile/frameworks.nix |  3 +-
 pkgs/applications/misc/yakuake/3.0.nix        |  4 +-
 .../networking/irc/konversation/1.6.nix       |  3 +-
 .../kde-5/applications/ark/default.nix        |  3 +-
 pkgs/desktops/kde-5/applications/dolphin.nix  |  3 +-
 .../desktops/kde-5/applications/filelight.nix |  5 +-
 pkgs/desktops/kde-5/applications/gwenview.nix |  3 +-
 pkgs/desktops/kde-5/applications/kate.nix     |  3 +-
 pkgs/desktops/kde-5/applications/kcalc.nix    |  5 +-
 .../kde-5/applications/kcolorchooser.nix      |  5 +-
 pkgs/desktops/kde-5/applications/kdenlive.nix |  3 +-
 pkgs/desktops/kde-5/applications/kdf.nix      |  5 +-
 .../kde-5/applications/khelpcenter.nix        |  5 +-
 pkgs/desktops/kde-5/applications/kompare.nix  |  5 +-
 pkgs/desktops/kde-5/applications/konsole.nix  |  5 +-
 .../kde-5/applications/kwalletmanager.nix     |  3 +-
 pkgs/desktops/kde-5/applications/marble.nix   |  3 +-
 pkgs/desktops/kde-5/applications/okular.nix   |  3 +-
 .../desktops/kde-5/applications/spectacle.nix |  3 +-
 pkgs/desktops/kde-5/plasma/oxygen.nix         |  3 +-
 .../libraries/kde-frameworks/kde-wrapper.nix  | 80 ++++++++++++-------
 pkgs/tools/misc/kronometer/default.nix        |  3 +-
 pkgs/tools/misc/peruse/default.nix            |  3 +-
 23 files changed, 108 insertions(+), 53 deletions(-)

diff --git a/pkgs/applications/editors/kile/frameworks.nix b/pkgs/applications/editors/kile/frameworks.nix
index 7a02c3d3f8c..34ea7647893 100644
--- a/pkgs/applications/editors/kile/frameworks.nix
+++ b/pkgs/applications/editors/kile/frameworks.nix
@@ -60,8 +60,9 @@ let
       };
     };
 in
-kdeWrapper unwrapped
+kdeWrapper
 {
+  inherit unwrapped;
   targets = [ "bin/kile" ];
   paths = [ konsole.unwrapped ];
 }
diff --git a/pkgs/applications/misc/yakuake/3.0.nix b/pkgs/applications/misc/yakuake/3.0.nix
index 4ccef7f435a..8bce26deefc 100644
--- a/pkgs/applications/misc/yakuake/3.0.nix
+++ b/pkgs/applications/misc/yakuake/3.0.nix
@@ -55,9 +55,9 @@ let
 
 
 in
-kdeWrapper unwrapped
+kdeWrapper
 {
+  inherit unwrapped;
   targets = [ "bin/yakuake" ];
   paths = [ konsole.unwrapped ];
 }
-
diff --git a/pkgs/applications/networking/irc/konversation/1.6.nix b/pkgs/applications/networking/irc/konversation/1.6.nix
index c6876405462..9724ae5f4bf 100644
--- a/pkgs/applications/networking/irc/konversation/1.6.nix
+++ b/pkgs/applications/networking/irc/konversation/1.6.nix
@@ -75,7 +75,8 @@ let
       homepage = https://konversation.kde.org;
     };
   };
-in kdeWrapper unwrapped {
+in kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/konversation" ];
 }
 
diff --git a/pkgs/desktops/kde-5/applications/ark/default.nix b/pkgs/desktops/kde-5/applications/ark/default.nix
index 24902757066..6b471614f5a 100644
--- a/pkgs/desktops/kde-5/applications/ark/default.nix
+++ b/pkgs/desktops/kde-5/applications/ark/default.nix
@@ -36,7 +36,8 @@ let
       };
     };
 in
-kdeWrapper unwrapped
+kdeWrapper
 {
+  inherit unwrapped;
   targets = [ "bin/ark" ];
 }
diff --git a/pkgs/desktops/kde-5/applications/dolphin.nix b/pkgs/desktops/kde-5/applications/dolphin.nix
index 4e636ae3186..9be40e9439b 100644
--- a/pkgs/desktops/kde-5/applications/dolphin.nix
+++ b/pkgs/desktops/kde-5/applications/dolphin.nix
@@ -24,8 +24,9 @@ let
       ];
     };
 in
-kdeWrapper unwrapped
+kdeWrapper
 {
+  inherit unwrapped;
   targets = [ "bin/dolphin" ];
   paths = [ dolphin-plugins konsole.unwrapped ];
 }
diff --git a/pkgs/desktops/kde-5/applications/filelight.nix b/pkgs/desktops/kde-5/applications/filelight.nix
index acc5808b4a3..e3d9172145c 100644
--- a/pkgs/desktops/kde-5/applications/filelight.nix
+++ b/pkgs/desktops/kde-5/applications/filelight.nix
@@ -18,4 +18,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/filelight" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/filelight" ];
+}
diff --git a/pkgs/desktops/kde-5/applications/gwenview.nix b/pkgs/desktops/kde-5/applications/gwenview.nix
index 18f5036127d..b97e4ce3bd6 100644
--- a/pkgs/desktops/kde-5/applications/gwenview.nix
+++ b/pkgs/desktops/kde-5/applications/gwenview.nix
@@ -20,7 +20,8 @@ let
       ];
     };
 in
-kdeWrapper unwrapped {
+kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/gwenview" ];
   paths = [ kipi-plugins ];
 }
diff --git a/pkgs/desktops/kde-5/applications/kate.nix b/pkgs/desktops/kde-5/applications/kate.nix
index ab0087930c0..03cc0e1fe33 100644
--- a/pkgs/desktops/kde-5/applications/kate.nix
+++ b/pkgs/desktops/kde-5/applications/kate.nix
@@ -24,8 +24,9 @@ let
       ];
     };
 in
-kdeWrapper unwrapped
+kdeWrapper
 {
+  inherit unwrapped;
   targets = [ "bin/kate" "bin/kwrite" ];
   paths = [ konsole.unwrapped ];
 }
diff --git a/pkgs/desktops/kde-5/applications/kcalc.nix b/pkgs/desktops/kde-5/applications/kcalc.nix
index f6d87e3e6e9..10164692f77 100644
--- a/pkgs/desktops/kde-5/applications/kcalc.nix
+++ b/pkgs/desktops/kde-5/applications/kcalc.nix
@@ -18,4 +18,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/kcalc" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/kcalc" ];
+}
diff --git a/pkgs/desktops/kde-5/applications/kcolorchooser.nix b/pkgs/desktops/kde-5/applications/kcolorchooser.nix
index 45a72a0bbc1..1dc6ccbc44c 100644
--- a/pkgs/desktops/kde-5/applications/kcolorchooser.nix
+++ b/pkgs/desktops/kde-5/applications/kcolorchooser.nix
@@ -15,4 +15,7 @@ let
       propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/kcolorchooser" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/kcolorchooser" ];
+}
diff --git a/pkgs/desktops/kde-5/applications/kdenlive.nix b/pkgs/desktops/kde-5/applications/kdenlive.nix
index 00826060b69..071ec21bbd0 100644
--- a/pkgs/desktops/kde-5/applications/kdenlive.nix
+++ b/pkgs/desktops/kde-5/applications/kdenlive.nix
@@ -74,8 +74,9 @@ unwrapped = kdeApp {
   };
 };
 in
-kdeWrapper unwrapped
+kdeWrapper
 {
+  inherit unwrapped;
   targets = [ "bin/kdenlive" ];
   paths = [ kinit ];
 }
diff --git a/pkgs/desktops/kde-5/applications/kdf.nix b/pkgs/desktops/kde-5/applications/kdf.nix
index 835f0344da7..c73eadc1df4 100644
--- a/pkgs/desktops/kde-5/applications/kdf.nix
+++ b/pkgs/desktops/kde-5/applications/kdf.nix
@@ -18,4 +18,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/kdf" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/kdf" ];
+}
diff --git a/pkgs/desktops/kde-5/applications/khelpcenter.nix b/pkgs/desktops/kde-5/applications/khelpcenter.nix
index 934f13425e8..3f13d131c77 100644
--- a/pkgs/desktops/kde-5/applications/khelpcenter.nix
+++ b/pkgs/desktops/kde-5/applications/khelpcenter.nix
@@ -16,4 +16,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/khelpcenter" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/khelpcenter" ];
+}
diff --git a/pkgs/desktops/kde-5/applications/kompare.nix b/pkgs/desktops/kde-5/applications/kompare.nix
index 3b2143af615..45789edbfcc 100644
--- a/pkgs/desktops/kde-5/applications/kompare.nix
+++ b/pkgs/desktops/kde-5/applications/kompare.nix
@@ -15,4 +15,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/kompare" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/kompare" ];
+}
diff --git a/pkgs/desktops/kde-5/applications/konsole.nix b/pkgs/desktops/kde-5/applications/konsole.nix
index bf3a497fefa..2dfd305b46b 100644
--- a/pkgs/desktops/kde-5/applications/konsole.nix
+++ b/pkgs/desktops/kde-5/applications/konsole.nix
@@ -24,4 +24,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/konsole" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/konsole" ];
+}
diff --git a/pkgs/desktops/kde-5/applications/kwalletmanager.nix b/pkgs/desktops/kde-5/applications/kwalletmanager.nix
index a7a7ba47f43..03c2ab3853a 100644
--- a/pkgs/desktops/kde-5/applications/kwalletmanager.nix
+++ b/pkgs/desktops/kde-5/applications/kwalletmanager.nix
@@ -30,6 +30,7 @@ let
       kxmlgui
     ];
   };
-in kdeWrapper unwrapped {
+in kdeWrapper {
+  inherit unwrapped;
   targets = ["bin/kwalletmanager5"];
 }
diff --git a/pkgs/desktops/kde-5/applications/marble.nix b/pkgs/desktops/kde-5/applications/marble.nix
index 8d6ee5a0f7c..5b8a82dbf09 100644
--- a/pkgs/desktops/kde-5/applications/marble.nix
+++ b/pkgs/desktops/kde-5/applications/marble.nix
@@ -18,7 +18,8 @@ let
       enableParallelBuilding = true;
     };
 in
-kdeWrapper unwrapped {
+kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/marble-qt" ];
   paths = [ unwrapped ];
 }
diff --git a/pkgs/desktops/kde-5/applications/okular.nix b/pkgs/desktops/kde-5/applications/okular.nix
index faebf3e679b..499e8cc9368 100644
--- a/pkgs/desktops/kde-5/applications/okular.nix
+++ b/pkgs/desktops/kde-5/applications/okular.nix
@@ -25,6 +25,7 @@ let
     };
   };
 in
-kdeWrapper unwrapped {
+kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/okular" ];
 }
diff --git a/pkgs/desktops/kde-5/applications/spectacle.nix b/pkgs/desktops/kde-5/applications/spectacle.nix
index aa618ffcde1..4c3a5246b2e 100644
--- a/pkgs/desktops/kde-5/applications/spectacle.nix
+++ b/pkgs/desktops/kde-5/applications/spectacle.nix
@@ -18,7 +18,8 @@ let
       ];
     };
 in
-kdeWrapper unwrapped {
+kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/spectacle" ];
   paths = [ kipi-plugins ];
 }
diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/kde-5/plasma/oxygen.nix
index f880f2e3ab2..ca63c8d7a37 100644
--- a/pkgs/desktops/kde-5/plasma/oxygen.nix
+++ b/pkgs/desktops/kde-5/plasma/oxygen.nix
@@ -15,6 +15,7 @@ let
     ];
   };
 in
-kdeWrapper unwrapped {
+kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/oxygen-demo5" "bin/oxygen-settings5" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
index 890ec1e4eec..9ab6f7a1089 100644
--- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
+++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
@@ -1,53 +1,73 @@
 { stdenv, lib, makeWrapper, buildEnv }:
 
-drv:
-
-{ targets, paths ? [] }:
+packages:
 
 let
+  packages_ = if builtins.isList packages then packages else [packages];
+
+  unwrapped = lib.concatMap (p: if builtins.isList p.unwrapped then p.unwrapped else [p.unwrapped]) packages_;
+  targets = lib.concatMap (p: p.targets) packages_;
+  paths = lib.concatMap (p: p.paths or []) packages_;
+
+  name =
+    if builtins.length unwrapped == 1
+    then (lib.head unwrapped).name
+    else "kde-application";
+  meta =
+    if builtins.length unwrapped == 1
+    then (lib.head unwrapped).meta
+    else {};
+
   env = buildEnv {
-    inherit (drv) name meta;
-    paths = builtins.map lib.getBin ([drv] ++ paths);
+    inherit name meta;
+    paths = builtins.map lib.getBin (unwrapped ++ paths);
     pathsToLink = [ "/bin" "/share" "/lib/qt5" "/etc/xdg" ];
   };
 in
 
 stdenv.mkDerivation {
-  inherit (drv) name meta;
+  inherit name meta;
   preferLocalBuild = true;
 
-  paths = builtins.map lib.getBin ([drv] ++ paths);
-  inherit drv env targets;
-  passthru = { unwrapped = drv; };
+  inherit unwrapped env targets;
+
+  passthru = {
+    inherit targets paths;
+    unwrapped = if builtins.length unwrapped == 1 then lib.head unwrapped else unwrapped;
+  };
 
   nativeBuildInputs = [ makeWrapper ];
 
-  builder = builtins.toFile "builder.sh" ''
-    . $stdenv/setup
-
+  buildCommand = ''
     for t in $targets; do
-        if [ -a "$drv/$t" ]; then
-            makeWrapper "$drv/$t" "$out/$t" \
-                --argv0 '"$0"' \
-                --suffix PATH : "$env/bin" \
-                --prefix XDG_CONFIG_DIRS : "$env/share" \
-                --prefix XDG_DATA_DIRS : "$env/etc/xdg" \
-                --set QML_IMPORT_PATH "$env/lib/qt5/imports" \
-                --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \
-                --set QT_PLUGIN_PATH "$env/lib/qt5/plugins"
-        else
-            echo "no such file or directory: $drv/$t"
+        good=""
+        for drv in $unwrapped; do
+            if [ -a "$drv/$t" ]; then
+                makeWrapper "$drv/$t" "$out/$t" \
+                    --argv0 '"$0"' \
+                    --suffix PATH : "$env/bin" \
+                    --prefix XDG_CONFIG_DIRS : "$env/share" \
+                    --prefix XDG_DATA_DIRS : "$env/etc/xdg" \
+                    --set QML_IMPORT_PATH "$env/lib/qt5/imports" \
+                    --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \
+                    --set QT_PLUGIN_PATH "$env/lib/qt5/plugins"
+                good="1"
+                break
+            fi
+        done
+        if [ -z "$good" ]; then
+            echo "file or directory not found in derivations: $t"
             exit 1
         fi
     done
 
-    if [ -a "$drv/share" ]; then
-        ln -s "$drv/share" "$out"
-    fi
+    ln -s "$env/share" "$out"
 
-    if [ -a "$drv/nix-support/propagated-user-env-packages" ]; then
-        mkdir -p "$out/nix-support"
-        ln -s "$drv/nix-support/propagated-user-env-packages" "$out/nix-support/"
-    fi
+    for drv in $unwrapped; do
+        if [ -a "$drv/nix-support/propagated-user-env-packages" ]; then
+            mkdir -p "$out/nix-support"
+            cat "$drv/nix-support/propagated-user-env-packages" >> "$out/nix-support/propagated-user-env-packages"
+        fi
+    done
   '';
 }
diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index 5a3da3788d5..37399a1a418 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -23,6 +23,7 @@ let
     propagatedBuildInputs = [ kconfig kinit ];
   };
 in
-kdeWrapper unwrapped {
+kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/kronometer" ];
 }
diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index 865c6b1e842..b6727f4e63b 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -37,6 +37,7 @@ let
 
   };
 
-in kdeWrapper unwrapped {
+in kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/peruse" ];
 }

From 1dceb2290cb95321e9d2c752702f7305cfef8cf8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 28 Dec 2016 16:53:19 +0300
Subject: [PATCH 0483/1310] kde5 service: use flattening kdeWrapper

---
 .../services/x11/desktop-managers/kde5.nix    | 389 +++++++++---------
 1 file changed, 204 insertions(+), 185 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 9b51b92faa4..de5bfe263d4 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -31,204 +31,223 @@ in
         '';
       };
 
+      extraPackages = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        description = ''
+          KDE packages that need to be installed system-wide.
+        '';
+      };
+
     };
 
   };
 
 
-  config = mkIf (xcfg.enable && cfg.enable) {
+  config = mkMerge [
+    (mkIf (cfg.extraPackages != []) {
+      environment.systemPackages = [ (kde5.kdeWrapper cfg.extraPackages) ];
+    })
 
-    warnings = optional config.services.xserver.desktopManager.kde4.enable
-      "KDE 4 should not be enabled at the same time as KDE 5";
+    (mkIf (xcfg.enable && cfg.enable) {
 
-    services.xserver.desktopManager.session = singleton {
-      name = "kde5";
-      bgSupport = true;
-      start = ''
-        # Load PulseAudio module for routing support.
-        # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
-        ${optionalString config.hardware.pulseaudio.enable ''
-          ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
-        ''}
+      warnings = optional config.services.xserver.desktopManager.kde4.enable
+        "KDE 4 should not be enabled at the same time as KDE 5";
 
-        exec "${kde5.startkde}"
+      services.xserver.desktopManager.session = singleton {
+        name = "kde5";
+        bgSupport = true;
+        start = ''
+          # Load PulseAudio module for routing support.
+          # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
+          ${optionalString config.hardware.pulseaudio.enable ''
+            ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
+          ''}
 
-      '';
-    };
+          exec "${kde5.startkde}"
 
-    security.setuidOwners = [
-      {
-        program = "kcheckpass";
-        source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass";
-        owner = "root";
-        setuid = true;
-      }
-      {
-        program = "start_kdeinit";
-        source = "${kde5.kinit.out}/lib/libexec/kf5/start_kdeinit";
-        owner = "root";
-        setuid = true;
-      }
-    ];
+        '';
+      };
 
-    environment.systemPackages =
-      [
-        kde5.frameworkintegration
-        kde5.kactivities
-        kde5.kauth
-        kde5.kcmutils
-        kde5.kconfig
-        kde5.kconfigwidgets
-        kde5.kcoreaddons
-        kde5.kdbusaddons
-        kde5.kdeclarative
-        kde5.kded
-        kde5.kdesu
-        kde5.kdnssd
-        kde5.kemoticons
-        kde5.kfilemetadata
-        kde5.kglobalaccel
-        kde5.kguiaddons
-        kde5.kiconthemes
-        kde5.kidletime
-        kde5.kimageformats
-        kde5.kinit
-        kde5.kio
-        kde5.kjobwidgets
-        kde5.knewstuff
-        kde5.knotifications
-        kde5.knotifyconfig
-        kde5.kpackage
-        kde5.kparts
-        kde5.kpeople
-        kde5.krunner
-        kde5.kservice
-        kde5.ktextwidgets
-        kde5.kwallet
-        kde5.kwayland
-        kde5.kwidgetsaddons
-        kde5.kxmlgui
-        kde5.kxmlrpcclient
-        kde5.plasma-framework
-        kde5.solid
-        kde5.sonnet
-        kde5.threadweaver
-
-        kde5.breeze-qt5
-        kde5.kactivitymanagerd
-        kde5.kde-cli-tools
-        kde5.kdecoration
-        kde5.kdeplasma-addons
-        kde5.kgamma5
-        kde5.khelpcenter
-        kde5.khotkeys
-        kde5.kinfocenter
-        kde5.kmenuedit
-        kde5.kscreen
-        kde5.kscreenlocker
-        kde5.ksysguard
-        kde5.kwayland
-        kde5.kwin
-        kde5.kwrited
-        kde5.libkscreen
-        kde5.libksysguard
-        kde5.milou
-        kde5.oxygen
-        kde5.plasma-integration
-        kde5.polkit-kde-agent
-        kde5.systemsettings
-
-        kde5.plasma-desktop
-        kde5.plasma-workspace
-        kde5.plasma-workspace-wallpapers
-
-        kde5.dolphin
-        kde5.dolphin-plugins
-        kde5.ffmpegthumbs
-        kde5.kdegraphics-thumbnailers
-        kde5.kio-extras
-        kde5.konsole
-        kde5.print-manager
-
-        # Install Breeze icons if available
-        (kde5.breeze-icons or kde5.oxygen-icons5 or kde5.oxygen-icons)
-        pkgs.hicolor_icon_theme
-
-        kde5.kde-gtk-config kde5.breeze-gtk
-
-        pkgs.qt5.phonon-backend-gstreamer
-      ]
-
-      # Plasma 5.5 and later has a Breeze GTK theme.
-      # If it is not available, Orion is very similar to Breeze.
-      ++ lib.optional (!(lib.hasAttr "breeze-gtk" kde5)) pkgs.orion
-
-      # Install activity manager if available
-      ++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd
-
-      # frameworkintegration was split with plasma-integration in Plasma 5.6
-      ++ lib.optional (lib.hasAttr "plasma-integration" kde5) kde5.plasma-integration
-
-      ++ lib.optionals cfg.enableQt4Support [ kde5.breeze-qt4 pkgs.phonon-backend-gstreamer ]
-
-      # Optional hardware support features
-      ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil
-      ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm
-      ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa
-      ++ lib.optional config.powerManagement.enable kde5.powerdevil
-      ++ lib.optional config.services.colord.enable pkgs.colord-kde
-      ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ];
-
-    environment.pathsToLink = [ "/share" ];
-
-    environment.etc = singleton {
-      source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-      target = "X11/xkb";
-    };
-
-    # Enable GTK applications to load SVG icons
-    environment.variables =
-      {
-        GST_PLUGIN_SYSTEM_PATH_1_0 =
-          lib.makeSearchPath "/lib/gstreamer-1.0"
-          (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [
-            gstreamer
-            gst-plugins-base
-            gst-plugins-good
-            gst-plugins-ugly
-            gst-plugins-bad
-            gst-libav # for mp3 playback
-          ]));
-      }
-      // (if (lib.hasAttr "breeze-icons" kde5)
-          then { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; }
-          else { });
-
-    fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ];
-
-    programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass";
-
-    # Enable helpful DBus services.
-    services.udisks2.enable = true;
-    services.upower.enable = config.powerManagement.enable;
-
-    # Extra UDEV rules used by Solid
-    services.udev.packages = [
-      pkgs.libmtp
-      pkgs.media-player-info
-    ];
-
-    services.xserver.displayManager.sddm = {
-      theme = "breeze";
-      themes = [
-        kde5.ecm # for the setup-hook
-        kde5.plasma-workspace
-        kde5.breeze-icons
+      security.setuidOwners = [
+        {
+          program = "kcheckpass";
+          source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass";
+          owner = "root";
+          setuid = true;
+        }
+        {
+          program = "start_kdeinit";
+          source = "${kde5.kinit.out}/lib/libexec/kf5/start_kdeinit";
+          owner = "root";
+          setuid = true;
+        }
       ];
-    };
 
-    security.pam.services.kde = { allowNullPassword = true; };
+      environment.systemPackages =
+        [
+          kde5.frameworkintegration
+          kde5.kactivities
+          kde5.kauth
+          kde5.kcmutils
+          kde5.kconfig
+          kde5.kconfigwidgets
+          kde5.kcoreaddons
+          kde5.kdbusaddons
+          kde5.kdeclarative
+          kde5.kded
+          kde5.kdesu
+          kde5.kdnssd
+          kde5.kemoticons
+          kde5.kfilemetadata
+          kde5.kglobalaccel
+          kde5.kguiaddons
+          kde5.kiconthemes
+          kde5.kidletime
+          kde5.kimageformats
+          kde5.kinit
+          kde5.kio
+          kde5.kjobwidgets
+          kde5.knewstuff
+          kde5.knotifications
+          kde5.knotifyconfig
+          kde5.kpackage
+          kde5.kparts
+          kde5.kpeople
+          kde5.krunner
+          kde5.kservice
+          kde5.ktextwidgets
+          kde5.kwallet
+          kde5.kwayland
+          kde5.kwidgetsaddons
+          kde5.kxmlgui
+          kde5.kxmlrpcclient
+          kde5.plasma-framework
+          kde5.solid
+          kde5.sonnet
+          kde5.threadweaver
 
-  };
+          kde5.breeze-qt5
+          kde5.kactivitymanagerd
+          kde5.kde-cli-tools
+          kde5.kdecoration
+          kde5.kdeplasma-addons
+          kde5.kgamma5
+          kde5.khotkeys
+          kde5.kinfocenter
+          kde5.kmenuedit
+          kde5.kscreen
+          kde5.kscreenlocker
+          kde5.ksysguard
+          kde5.kwayland
+          kde5.kwin
+          kde5.kwrited
+          kde5.libkscreen
+          kde5.libksysguard
+          kde5.milou
+          kde5.plasma-integration
+          kde5.polkit-kde-agent
+          kde5.systemsettings
+
+          kde5.plasma-desktop
+          kde5.plasma-workspace
+          kde5.plasma-workspace-wallpapers
+
+          kde5.dolphin-plugins
+          kde5.ffmpegthumbs
+          kde5.kdegraphics-thumbnailers
+          kde5.kio-extras
+          kde5.print-manager
+
+          # Install Breeze icons if available
+          (kde5.breeze-icons or kde5.oxygen-icons5 or kde5.oxygen-icons)
+          pkgs.hicolor_icon_theme
+
+          kde5.kde-gtk-config kde5.breeze-gtk
+
+          pkgs.qt5.phonon-backend-gstreamer
+        ]
+
+        # Plasma 5.5 and later has a Breeze GTK theme.
+        # If it is not available, Orion is very similar to Breeze.
+        ++ lib.optional (!(lib.hasAttr "breeze-gtk" kde5)) pkgs.orion
+
+        # Install activity manager if available
+        ++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd
+
+        # frameworkintegration was split with plasma-integration in Plasma 5.6
+        ++ lib.optional (lib.hasAttr "plasma-integration" kde5) kde5.plasma-integration
+
+        ++ lib.optionals cfg.enableQt4Support [ kde5.breeze-qt4 pkgs.phonon-backend-gstreamer ]
+
+        # Optional hardware support features
+        ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil
+        ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm
+        ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa
+        ++ lib.optional config.powerManagement.enable kde5.powerdevil
+        ++ lib.optional config.services.colord.enable pkgs.colord-kde
+        ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ];
+
+      services.xserver.desktopManager.kde5.extraPackages =
+        [
+          kde5.khelpcenter
+          kde5.oxygen
+
+          kde5.dolphin
+          kde5.konsole
+        ];
+
+      environment.pathsToLink = [ "/share" ];
+
+      environment.etc = singleton {
+        source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        target = "X11/xkb";
+      };
+
+      environment.variables =
+        {
+          # Enable GTK applications to load SVG icons
+          GST_PLUGIN_SYSTEM_PATH_1_0 =
+            lib.makeSearchPath "/lib/gstreamer-1.0"
+            (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [
+              gstreamer
+              gst-plugins-base
+              gst-plugins-good
+              gst-plugins-ugly
+              gst-plugins-bad
+              gst-libav # for mp3 playback
+            ]));
+        }
+        // (if (lib.hasAttr "breeze-icons" kde5)
+            then { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; }
+            else { });
+
+      fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ];
+
+      programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass";
+
+      # Enable helpful DBus services.
+      services.udisks2.enable = true;
+      services.upower.enable = config.powerManagement.enable;
+
+      # Extra UDEV rules used by Solid
+      services.udev.packages = [
+        pkgs.libmtp
+        pkgs.media-player-info
+      ];
+
+      services.xserver.displayManager.sddm = {
+        theme = "breeze";
+        themes = [
+          kde5.ecm # for the setup-hook
+          kde5.plasma-workspace
+          kde5.breeze-icons
+        ];
+      };
+
+      security.pam.services.kde = { allowNullPassword = true; };
+
+    })
+  ];
 
 }

From 76d37ce3b74dfa010f004afda0eb00a3d702421d Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Mon, 2 Jan 2017 17:43:07 -0500
Subject: [PATCH 0484/1310] rclone: 1.33 -> 1.35

---
 lib/maintainers.nix                           |   1 +
 .../networking/sync/rclone/default.nix        |  16 +-
 .../networking/sync/rclone/deps.nix           | 219 ------------------
 3 files changed, 8 insertions(+), 228 deletions(-)
 delete mode 100644 pkgs/applications/networking/sync/rclone/deps.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index a15800d177b..376191520ba 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -109,6 +109,7 @@
   cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
   DamienCassou = "Damien Cassou <damien@cassou.me>";
   danbst = "Danylo Hlynskyi <abcz2.uprola@gmail.com>";
+  danielfullmer = "Daniel Fullmer <danielrf12@gmail.com>";
   dasuxullebt = "Christoph-Simon Senjak <christoph.senjak@googlemail.com>";
   davidak = "David Kleuker <post@davidak.de>";
   davidrusu = "David Rusu <davidrusu.me@gmail.com>";
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index dc10b8d2ec8..adbadba411c 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "rclone-${version}";
-  version = "1.33";
+  version = "1.35";
 
   goPackagePath = "github.com/ncw/rclone";
 
@@ -10,16 +10,14 @@ buildGoPackage rec {
     owner = "ncw";
     repo = "rclone";
     rev = "v${version}";
-    sha256 = "00y48ww40x73xpdvkzfhllwvbh9a2ffmmkc6ri9343wvmb53laqk";
+    sha256 = "15dmppb7qgr3vg76dsv770l51lmsl8n8k3rvbnhhks5a2cz0kf2i";
   };
 
-  goDeps = ./deps.nix;
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "Command line program to sync files and directories to and from major cloud storage";
     homepage = "http://rclone.org";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.mit;
+    maintainers = with maintainers; [ danielfullmer ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/networking/sync/rclone/deps.nix b/pkgs/applications/networking/sync/rclone/deps.nix
deleted file mode 100644
index 4fd802f66c0..00000000000
--- a/pkgs/applications/networking/sync/rclone/deps.nix
+++ /dev/null
@@ -1,219 +0,0 @@
-# This file was generated by go2nix.
-[
-  {
-    goPackagePath = "bazil.org/fuse";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bazil/fuse";
-      rev = "371fbbdaa8987b715bdd21d6adc4c9b20155f748";
-      sha256 = "1x5p301py7mcxgwklfm6pqqkzssln0nfzllng49pnk60m03ilp4w";
-    };
-  }
-  {
-    goPackagePath = "cloud.google.com/go";
-    fetch = {
-      type = "git";
-      url = "https://code.googlesource.com/gocloud";
-      rev = "90296fd601ebfc594192e722a022663b0c3f8756";
-      sha256 = "0qg0d1afhqmpfaq2lh29c87d18s5148yshg0s295dhzdn1m9nhww";
-    };
-  }
-  {
-    goPackagePath = "github.com/Unknwon/goconfig";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Unknwon/goconfig";
-      rev = "5aa4f8cd5a472c2411c778b4680f59f2223f1966";
-      sha256 = "0r6na17sz762c1dyn6gb16v2zhvzg6krmz7pcjg1m0l5wxdf4n0d";
-    };
-  }
-  {
-    goPackagePath = "github.com/VividCortex/ewma";
-    fetch = {
-      type = "git";
-      url = "https://github.com/VividCortex/ewma";
-      rev = "c595cd886c223c6c28fc9ae2727a61b5e4693d85";
-      sha256 = "0f09886vm4rkhgqqh2b20r8rws4syvny3la107hh6qby027bpab2";
-    };
-  }
-  {
-    goPackagePath = "github.com/aws/aws-sdk-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/aws/aws-sdk-go";
-      rev = "13a12060f716145019378a10e2806c174356b857";
-      sha256 = "09yl85kk2y4ayk44af5rbnkq4vy82vbh2z5ac4vpl2vgv7zyh46h";
-    };
-  }
-  {
-    goPackagePath = "github.com/cpuguy83/go-md2man";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cpuguy83/go-md2man";
-      rev = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa";
-      sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6";
-    };
-  }
-  {
-    goPackagePath = "github.com/google/go-querystring";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-querystring";
-      rev = "9235644dd9e52eeae6fa48efd539fdc351a0af53";
-      sha256 = "0q398679fwp7vlnpd2rlzz452a7a4qvpcspak81psfl3xwimpzgq";
-    };
-  }
-  {
-    goPackagePath = "github.com/mreiferson/go-httpclient";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mreiferson/go-httpclient";
-      rev = "31f0106b4474f14bc441575c19d3a5fa21aa1f6c";
-      sha256 = "1iz95p7fl43smyh1lzjnwk6gq9y7q15m2qdkf0f4kxf3x5731v9i";
-    };
-  }
-  {
-    goPackagePath = "github.com/ncw/go-acd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ncw/go-acd";
-      rev = "56da839497f9854a91f99fe752c33c7977a6f48b";
-      sha256 = "1va6hpl73ps443r0s2icplcx113gkhmi2gbsgpaw2iii5lji5085";
-    };
-  }
-  {
-    goPackagePath = "github.com/ncw/swift";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ncw/swift";
-      rev = "b964f2ca856aac39885e258ad25aec08d5f64ee6";
-      sha256 = "0c86ap1zb56r6g96cnbn5j3i3r96c5l8rl98h3sxlqi5agwp3km4";
-    };
-  }
-  {
-    goPackagePath = "github.com/ogier/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ogier/pflag";
-      rev = "45c278ab3607870051a2ea9040bb85fcb8557481";
-      sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l";
-    };
-  }
-  {
-    goPackagePath = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
-      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
-    };
-  }
-  {
-    goPackagePath = "github.com/rfjakob/eme";
-    fetch = {
-      type = "git";
-      url = "https://github.com/rfjakob/eme";
-      rev = "601d0e278ceda9aa2085a61c9265f6e690ef5255";
-      sha256 = "1ryh5f2a42psrqcpjh73shk3p0mva2vcyyfav4nhxmfqall77k5z";
-    };
-  }
-  {
-    goPackagePath = "github.com/skratchdot/open-golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/skratchdot/open-golang";
-      rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c";
-      sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/cobra";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cobra";
-      rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744";
-      sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/pflag";
-      rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f";
-      sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l";
-    };
-  }
-  {
-    goPackagePath = "github.com/stacktic/dropbox";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stacktic/dropbox";
-      rev = "58f839b21094d5e0af7caf613599830589233d20";
-      sha256 = "1psmxpnn40ri9bgjvivljnd4p977f635mh3w7m5mglxxgc9392pi";
-    };
-  }
-  {
-    goPackagePath = "github.com/tsenart/tb";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tsenart/tb";
-      rev = "19f4c3d79d2bd67d0911b2e310b999eeea4454c1";
-      sha256 = "148vy4xij5qm8dq5plyczx2wbpi4gpg8ksr5r3b4m8j0z1kjws8y";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3";
-      sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "6acef71eb69611914f7a30939ea9f6e194c78172";
-      sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/oauth2";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/oauth2";
-      rev = "3c3a985cb79f52a3190fbc056984415ca6763d01";
-      sha256 = "0c7x8wkya56z03j2qfm61932npsddgqyggi75hkla9755d1inqlv";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34";
-      sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1";
-    };
-  }
-  {
-    goPackagePath = "google.golang.org/api";
-    fetch = {
-      type = "git";
-      url = "https://code.googlesource.com/google-api-go-client";
-      rev = "eb84d1a029af1654777e7ba65c979085305c3e38";
-      sha256 = "0ldmzcx5lxa81lcr39djcvyhd0ls11jlswj5877rinq3505ayf5l";
-    };
-  }
-  {
-    goPackagePath = "github.com/stretchr/testify/";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev = "1f4a1643a57e798696635ea4c126e9127adb7d3c";
-      sha256 = "0nam9d68rn8ha8ldif22kkgv6k6ph3y88fp26159wdrs63ca3bzl";
-    };
-  }
-]

From 1f896f4bdd5aa951c37c79f00cec5da057c331a6 Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Mon, 2 Jan 2017 14:12:37 -0500
Subject: [PATCH 0485/1310] libbitcoin: init at 2.11.0

---
 pkgs/tools/misc/libbitcoin/libbitcoin.nix | 35 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 +++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/tools/misc/libbitcoin/libbitcoin.nix

diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix
new file mode 100644
index 00000000000..61c462f7853
--- /dev/null
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, fetchurl, pkgconfig, autoreconfHook
+, boost, libsodium, czmqpp, secp256k1 }:
+
+let
+  pname = "libbitcoin";
+  version = "2.11.0";
+
+in stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/libbitcoin/libbitcoin/archive/v${version}.tar.gz";
+    sha256 = "1lpdjm13kgs4fbp579bwfvws8yf9mnr5dw3ph8zxg2gf110h85sy";
+  };
+
+  buildInputs = [ autoreconfHook pkgconfig ];
+
+  propagatedBuildInputs = [ secp256k1 ];
+
+  configureFlags = [
+    "--with-boost=${boost.dev}"
+    "--with-boost-libdir=${boost.out}/lib"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "C++ library for building bitcoin applications";
+    homepage = https://libbitcoin.org/;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ chris-martin ];
+
+    # https://wiki.unsystem.net/en/index.php/Libbitcoin/License
+    # AGPL with an additional clause
+    license = licenses.agpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63cce742d7b..f00631a652b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12321,6 +12321,10 @@ in
   bitcoin = altcoins.bitcoin;
   bitcoin-xt = altcoins.bitcoin-xt;
 
+  libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix {
+    secp256k1 = secp256k1.override { enableECDH = true; };
+  };
+
   go-ethereum = self.altcoins.go-ethereum;
   ethabi = self.altcoins.ethabi;
 

From cb7c3d9712c41eb5bdcc69831731b1417b5adedc Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Mon, 2 Jan 2017 14:13:09 -0500
Subject: [PATCH 0486/1310] libbitcoin-client: init at 2.2.0

---
 .../misc/libbitcoin/libbitcoin-client.nix     | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/misc/libbitcoin/libbitcoin-client.nix

diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
new file mode 100644
index 00000000000..1f45626855f
--- /dev/null
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchurl, pkgconfig, autoreconfHook
+, boost, libsodium, czmqpp, libbitcoin }:
+
+let
+  pname = "libbitcoin-client";
+  version = "2.2.0";
+
+in stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/libbitcoin/libbitcoin-client/archive/v${version}.tar.gz";
+    sha256 = "1g79hl6jmf5dam7vq19h4dgdj7gcn19fa7q78vn573mg2rdyal53";
+  };
+
+  buildInputs = [ autoreconfHook pkgconfig ];
+
+  propagatedBuildInputs = [ libsodium czmqpp libbitcoin ];
+
+  configureFlags = [
+    "--with-boost=${boost.dev}"
+    "--with-boost-libdir=${boost.out}/lib"
+    "--with-bash-completiondir=$out/share/bash-completion/completions"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Bitcoin client query library";
+    homepage = https://github.com/libbitcoin/libbitcoin-client;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ chris-martin ];
+
+    # https://wiki.unsystem.net/en/index.php/Libbitcoin/License
+    # AGPL with an additional clause
+    license = licenses.agpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f00631a652b..dd8fa82fbb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12325,6 +12325,8 @@ in
     secp256k1 = secp256k1.override { enableECDH = true; };
   };
 
+  libbitcoin-client = callPackage ../tools/misc/libbitcoin/libbitcoin-client.nix { };
+
   go-ethereum = self.altcoins.go-ethereum;
   ethabi = self.altcoins.ethabi;
 

From 1d278febd0530e6c76bda471ff26b10ea0a8dfd0 Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Mon, 2 Jan 2017 14:13:33 -0500
Subject: [PATCH 0487/1310] libbitcoin-explorer: init at 2.2.0

---
 .../misc/libbitcoin/libbitcoin-explorer.nix   | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix

diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
new file mode 100644
index 00000000000..fbfa385fc7f
--- /dev/null
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchurl, pkgconfig, autoreconfHook
+, boost, libbitcoin-client }:
+
+let
+  pname = "libbitcoin-explorer";
+  version = "2.2.0";
+
+in stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/libbitcoin/libbitcoin-explorer/archive/v${version}.tar.gz";
+    sha256 = "00123vw7rxk0ypdfzk0xwk8q55ll31000mkjqdzl915krsbkbfvp";
+  };
+
+  buildInputs = [ autoreconfHook pkgconfig ];
+
+  propagatedBuildInputs = [ libbitcoin-client ];
+
+  configureFlags = [
+    "--with-boost=${boost.dev}"
+    "--with-boost-libdir=${boost.out}/lib"
+    "--with-bash-completiondir=$out/share/bash-completion/completions"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Bitcoin command line tool";
+    homepage = https://github.com/libbitcoin/libbitcoin-explorer;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ chris-martin ];
+
+    # https://wiki.unsystem.net/en/index.php/Libbitcoin/License
+    # AGPL with an additional clause
+    license = licenses.agpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd8fa82fbb9..f33f1281a53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12327,6 +12327,8 @@ in
 
   libbitcoin-client = callPackage ../tools/misc/libbitcoin/libbitcoin-client.nix { };
 
+  libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { };
+
   go-ethereum = self.altcoins.go-ethereum;
   ethabi = self.altcoins.ethabi;
 

From b65e5d8c9674ca7ee0677e5f646fb9857e8e69f5 Mon Sep 17 00:00:00 2001
From: Matthew Daiter <mdaiter8121@gmail.com>
Date: Tue, 3 Jan 2017 01:31:48 +0100
Subject: [PATCH 0488/1310] erlang: explicitly link appropriate wxGTK versions
 for R18/R19

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5773c94bdb..0ddd03b729a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5488,32 +5488,40 @@ in
   };
   erlangR18 = callPackage ../development/interpreters/erlang/R18.nix {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    wxGTK = wxGTK30;
   };
   erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    wxGTK = wxGTK30;
     odbcSupport = true;
   };
   erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    wxGTK = wxGTK30;
     javacSupport = true;
   };
   erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    wxGTK = wxGTK30;
     javacSupport = true; odbcSupport = true;
   };
   erlangR19 = callPackage ../development/interpreters/erlang/R19.nix {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    wxGTK = wxGTK30;
   };
   erlangR19_odbc = callPackage ../development/interpreters/erlang/R19.nix {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    wxGTK = wxGTK30;
     odbcSupport = true;
   };
   erlangR19_javac = callPackage ../development/interpreters/erlang/R19.nix {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-      javacSupport = true;
+    wxGTK = wxGTK30;
+    javacSupport = true;
   };
   erlangR19_odbc_javac = callPackage ../development/interpreters/erlang/R19.nix {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    wxGTK = wxGTK30;
     javacSupport = true; odbcSupport = true;
   };
   erlang = erlangR18;

From ade7cc16eb285a02bb256e0d7eae570658c9bb8a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 3 Jan 2017 01:37:16 +0100
Subject: [PATCH 0489/1310] czmqpp: enable on darwin

---
 pkgs/development/libraries/czmqpp/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/czmqpp/default.nix b/pkgs/development/libraries/czmqpp/default.nix
index 672a89cc3c0..0c026b9f47a 100644
--- a/pkgs/development/libraries/czmqpp/default.nix
+++ b/pkgs/development/libraries/czmqpp/default.nix
@@ -11,18 +11,18 @@ stdenv.mkDerivation rec {
     sha256 = "0z8lwq53yk4h7pgibicx3q9idz15qb95r0pjpz0j5vql6qh46rja";
   };
 
-  meta = with stdenv.lib; {
-    inherit (src.meta) homepage;
-    description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent";
-    license = licenses.lgpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ chris-martin ];
-  };
-
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   propagatedBuildInputs = [ czmq ];
 
   # https://github.com/zeromq/czmqpp/issues/42
   patches = [ ./socket.patch ];
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent";
+    license = licenses.lgpl3;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ chris-martin ];
+  };
 }

From d997ea6a380fe2e8f7e336fd82b470b56c01d04b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 3 Jan 2017 13:15:29 +0800
Subject: [PATCH 0490/1310] syncthing: 0.14.17 -> 0.14.18

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 628e645ab60..8e568798df8 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, go, pkgs }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.17";
+  version = "0.14.18";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "0l220jnm8xwfc5jrznan15290al05bim5yyy4wngj9c55av6mlzq";
+    sha256 = "099r1n9awznv17ac1fm4ff6az40bvk6xxwaw8x8fx7ikqi1wv8vp";
   };
 
   buildInputs = [ go ];
@@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://www.syncthing.net/;
     description = "Open Source Continuous File Synchronization";
-    license = stdenv.lib.licenses.mpl20;
-    maintainers = with stdenv.lib.maintainers; [ pshendry joko peterhoeg ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ pshendry joko peterhoeg ];
+    platforms = platforms.unix;
   };
 }

From 9452abe684ae03a1074ef0cfaa056755a6fce416 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 3 Jan 2017 13:33:42 +0800
Subject: [PATCH 0491/1310] qscintilla: support qt5

---
 .../libraries/qscintilla/default.nix          | 19 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  6 +++++-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index d5f4389169b..b73e9ac79c9 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, fetchurl, qt4, qmake4Hook }:
+{ stdenv, fetchurl
+, qt4 ? null, qmake4Hook ? null
+, withQt5 ? false, qtbase ? null, qmakeHook ? null
+}:
 
 stdenv.mkDerivation rec {
   pname = "qscintilla";
   version = "2.9";
 
-  name = "${pname}-${version}";
+  name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz";
     sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417";
   };
 
-  buildInputs = [ qt4 ];
-  nativeBuildInputs = [ qmake4Hook ];
+  buildInputs = if withQt5 then [ qtbase ] else [ qt4 ];
+  nativeBuildInputs = if withQt5 then [ qmakeHook ] else [ qmake4Hook ];
+
+  enableParallelBuilding = true;
 
   preConfigure = ''
     cd Qt4Qt5
@@ -23,7 +28,7 @@ stdenv.mkDerivation rec {
            qscintilla.pro
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A Qt port of the Scintilla text editing library";
     longDescription = ''
       QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
@@ -40,7 +45,7 @@ stdenv.mkDerivation rec {
       background colours and multiple fonts.
     '';
     homepage = http://www.riverbankcomputing.com/software/qscintilla/intro;
-    license = stdenv.lib.licenses.gpl2; # and gpl3 and commercial
-    platforms = stdenv.lib.platforms.unix;
+    license = with licenses; [ gpl2 gpl3 ]; # and commercial
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63cce742d7b..9e66071095b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9125,6 +9125,10 @@ in
 
     qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
 
+    qscintilla = callPackage ../development/libraries/qscintilla {
+      withQt5 = true;
+    };
+
     qtkeychain = callPackage ../development/libraries/qtkeychain {
       withQt5 = true;
     };
@@ -14516,7 +14520,7 @@ in
   qscreenshot = callPackage ../applications/graphics/qscreenshot {
     qt = qt4;
   };
-  
+
   qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };

From 20c5aa5b7dc5f681b6dfd05c88b3287714beb481 Mon Sep 17 00:00:00 2001
From: Mike Sperber <sperber@deinprogramm.de>
Date: Mon, 26 Dec 2016 14:46:18 +0100
Subject: [PATCH 0492/1310] procmail: unbreak "make install"

procmail's Makefile lacks a ".PHONY: install" line, which turns "make
install" into a no-op, at least on macOS.  Insert one.
---
 pkgs/applications/misc/procmail/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix
index 0bdc771e2bd..b62c6b77cac 100644
--- a/pkgs/applications/misc/procmail/default.nix
+++ b/pkgs/applications/misc/procmail/default.nix
@@ -6,11 +6,15 @@ stdenv.mkDerivation {
   patches = [ ./CVE-2014-3618.patch ];
 
   # getline is defined differently in glibc now. So rename it.
+  # Without the .PHONY target "make install" won't install anything on Darwin.
   postPatch = ''
     sed -e "s%^RM.*$%#%" -i Makefile
     sed -e "s%^BASENAME.*%\BASENAME=$out%" -i Makefile
     sed -e "s%^LIBS=.*%LIBS=-lm%" -i Makefile
     sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h
+    sed -e "3i\
+.PHONY: install
+" -i Makefile
   '';
 
   src = fetchurl {

From 22dbb82129bf83c406777059e7586b79cba98254 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 3 Jan 2017 13:43:16 +0800
Subject: [PATCH 0493/1310] qscintilla: 2.9 -> 2.9.4

---
 pkgs/development/libraries/qscintilla/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index b73e9ac79c9..928ff5f788b 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, unzip
 , qt4 ? null, qmake4Hook ? null
 , withQt5 ? false, qtbase ? null, qmakeHook ? null
 }:
 
 stdenv.mkDerivation rec {
   pname = "qscintilla";
-  version = "2.9";
+  version = "2.9.4";
 
   name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz";
-    sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417";
+    url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip";
+    sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi";
   };
 
   buildInputs = if withQt5 then [ qtbase ] else [ qt4 ];
-  nativeBuildInputs = if withQt5 then [ qmakeHook ] else [ qmake4Hook ];
+  nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmakeHook ] else [ qmake4Hook ]);
 
   enableParallelBuilding = true;
 
@@ -47,5 +47,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.riverbankcomputing.com/software/qscintilla/intro;
     license = with licenses; [ gpl2 gpl3 ]; # and commercial
     platforms = platforms.unix;
+    maintainers = with maintainers; [ peterhoeg ];
   };
 }

From 711c23577749dea88514df778fd73e42c2f3eb45 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jan 2017 10:41:51 +0100
Subject: [PATCH 0494/1310] haskell: clean-up for the generic builder

Clean up the implementation from d0250ad884bf66f635f23fe38dc114bb6e822d25.
---
 pkgs/development/haskell-modules/generic-builder.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index dfe9f68ec61..b15b4ad0bec 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -86,7 +86,7 @@ let
   # We cannot enable -j<n> parallelism for libraries because GHC is far more
   # likely to generate a non-determistic library ID in that case. Further
   # details are at <https://github.com/peti/ghc-library-id-bug>.
-  enableParallelBuilding = versionOlder "7.8" ghc.version && !hasActiveLibrary;
+  enableParallelBuilding = (versionOlder "7.8" ghc.version && !hasActiveLibrary) || versionOlder "8.0.1" ghc.version;
 
   crossCabalFlags = [
     "--with-ghc=${ghc.cross.config}-ghc"
@@ -114,7 +114,6 @@ let
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla"))
     (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
-    (optionalString (versionOlder "8.0.1" ghc.version) "--ghc-option=-j$NIX_BUILD_CORES")
   ] ++ optionals isGhcjs [
     "--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
     "--ghcjs"

From c73780946566488d5667a7c3897870a23ee9c76f Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 3 Jan 2017 10:10:34 +0000
Subject: [PATCH 0495/1310] miredo-fix-kill-path

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

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

From 0108c31e22ea9500c8f81da436e8756cefec83ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 3 Jan 2017 11:14:16 +0100
Subject: [PATCH 0496/1310] nix: 1.11.4 -> 1.11.5

---
 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 747d9d2bcec..ddc624a77de 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/i4mwf2gpvar7dqvlpp5m86llbq3ahbvb-nix-1.11.4";
-  i686-linux = "/nix/store/a3gjrbspb0q4hs3sv5g1y2nza43i8nzv-nix-1.11.4";
-  x86_64-darwin = "/nix/store/7v21yd3qpv0nclcy5cqr5njj9bril12s-nix-1.11.4";
+  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";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 30c5fc6c4fd..5bfb0b45c1b 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.4";
+    name = "nix-1.11.5";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "937779ed2efaa3dec210250635401980acb99a6fea6d7374fbaea78231b36d34";
+      sha256 = "272361d091c735b0e80627fa23fb7c600957472301dd7e54d237069452f3addb";
     };
   };
 

From 2a4c8313e4b10fb52a4fa4798864640d3439c68d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 3 Jan 2017 13:51:23 +0200
Subject: [PATCH 0497/1310] linux_testing: 4.10-rc1 -> 4.10-rc2

---
 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 10bea69a3c4..b547240eaf2 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-rc1";
-  modDirVersion = "4.10.0-rc1";
+  version = "4.10-rc2";
+  modDirVersion = "4.10.0-rc2";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1s7axcii6jzm77ivmy26llf4z6dprfp3sb1v35fchl9bkzaivaly";
+    sha256 = "1r3w6mqvmjnsmqrk73xsrqybdvs1czjw5xl1x2wsi2w9nifb47zq";
   };
 
   features.iwlwifi = true;

From 586ceaf718e6ddced417cbcfddcba52039b4ef18 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Tue, 3 Jan 2017 07:29:46 -0500
Subject: [PATCH 0498/1310] terraform: 0.8.1 -> 0.8.2 (#21601)

---
 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 78e167cc0e9..d436aa99d4b 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.1";
+  version = "0.8.2";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/terraform";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "hashicorp";
     repo = "terraform";
-    sha256 = "1fgnivhn6hrxpwwajl80vj2w81lv6vypprlbgif8m0z0na7p8956";
+    sha256 = "1645la750lqx2m57sbl6xg1cnqgwrfk5dhcw08wm4z7zxdnqys7b";
   };
 
   postInstall = ''

From b4f401104d3f00d68a42475968854fc111eb0866 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 3 Jan 2017 13:54:07 +0100
Subject: [PATCH 0499/1310] Fix big-parallel usage

requiredSystemFeatures is not a meta attribute but a derivation
attribute. So "big-parallel" was being ignored on e.g. chromium,
causing it to be built (and timing out) on slow machines.

http://hydra.nixos.org/build/45819778#tabs-buildsteps
---
 pkgs/applications/networking/browsers/chromium/browser.nix | 3 ++-
 pkgs/applications/office/libreoffice/default.nix           | 3 ++-
 pkgs/applications/office/libreoffice/still.nix             | 3 ++-
 pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix      | 3 ++-
 pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix      | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 58e5ab98c16..75f2dcda6a6 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -42,6 +42,8 @@ mkChromiumDerivation (base: rec {
 
   passthru = { inherit sandboxExecutableName; };
 
+  requiredSystemFeatures = [ "big-parallel" ];
+
   meta = {
     description = "An open source web browser from Google";
     homepage = http://www.chromium.org/;
@@ -49,6 +51,5 @@ mkChromiumDerivation (base: rec {
     license = licenses.bsd3;
     platforms = platforms.linux;
     hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else [];
-    requiredSystemFeatures = [ "big-parallel" ];
   };
 })
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 39d4688b639..29cc1dc118f 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -251,6 +251,8 @@ in stdenv.mkDerivation rec {
     inherit srcs;
   };
 
+  requiredSystemFeatures = [ "big-parallel" ];
+
   meta = with lib; {
     description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
     homepage = http://libreoffice.org/;
@@ -258,6 +260,5 @@ in stdenv.mkDerivation rec {
     maintainers = with maintainers; [ viric raskin ];
     platforms = platforms.linux;
     hydraPlatforms = [];
-    requiredSystemFeatures = [ "big-parallel" ];
   };
 }
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index b3d69ef7f19..75d295887f6 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -254,12 +254,13 @@ in stdenv.mkDerivation rec {
     inherit srcs;
   };
 
+  requiredSystemFeatures = [ "big-parallel" ];
+
   meta = with lib; {
     description = "Comprehensive, professional-quality productivity suite (Still/stable release)";
     homepage = http://libreoffice.org/;
     license = licenses.lgpl3;
     maintainers = with maintainers; [ viric raskin ];
     platforms = platforms.linux;
-    requiredSystemFeatures = [ "big-parallel" ];
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix
index 0a52acbc30e..095c6e7814e 100644
--- a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix
@@ -35,12 +35,13 @@ in stdenv.mkDerivation rec {
 
   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;
-    requiredSystemFeatures = [ "big-parallel" ];
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
index 0b72bf5965e..87a014f8f74 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
@@ -35,12 +35,13 @@ in stdenv.mkDerivation rec {
 
   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;
-    requiredSystemFeatures = [ "big-parallel" ];
   };
 }

From 85ff5a2583a893b928e5471d5716658306ab9daf Mon Sep 17 00:00:00 2001
From: Stefan Goetz <goetzst@hotmail.de>
Date: Tue, 3 Jan 2017 14:13:35 +0100
Subject: [PATCH 0500/1310] youtube-dl: 2016.12.22 -> 2017.01.02 (#21607)

---
 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 a1ed2d9657f..2bca4b165fe 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 = "2016.12.20";
+  version = "2017.01.02";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "f80d47d5e2a236ea6c9d8b4636199aea01a041607ce7b544babedb0fe1ce59a5";
+    sha256 = "140de01ea879cdc50bc34240802d5c10231baf448d7a664e6efeb9d5efb74d5b";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From 9bd93ac6e0202391c3cf21a8f6896c5eab312dcf Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 3 Jan 2017 08:40:32 -0500
Subject: [PATCH 0501/1310] busybox: 1.25.1 -> 1.26.1

---
 .../linux/busybox/busybox-in-store.patch         | 16 ++++++++--------
 pkgs/os-specific/linux/busybox/default.nix       |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/busybox/busybox-in-store.patch b/pkgs/os-specific/linux/busybox/busybox-in-store.patch
index 3500f167a14..d3111efbdc4 100644
--- a/pkgs/os-specific/linux/busybox/busybox-in-store.patch
+++ b/pkgs/os-specific/linux/busybox/busybox-in-store.patch
@@ -1,14 +1,14 @@
 Allow BusyBox to be invoked as "<something>-busybox". This is
 necessary when it's run from the Nix store as <hash>-busybox during
 stdenv bootstrap.
---- busybox-1.25.1-orig/libbb/appletlib.orig	2016-10-26 19:54:20.510957575 -0400
-+++ busybox-1.25.1/libbb/appletlib.c	2016-10-26 19:48:31.590862853 -0400
-@@ -884,7 +884,7 @@
- 	int applet;
- 
- # if ENABLE_BUSYBOX
+--- busybox-1.26.1-orig/libbb/appletlib.orig	2016-10-26 19:54:20.510957575 -0400
++++ busybox-1.26.1/libbb/appletlib.c	2016-10-26 19:48:31.590862853 -0400
+@@ -887,7 +887,7 @@
+ static NORETURN void run_applet_and_exit(const char *name, char **argv)
+ {
+ #  if ENABLE_BUSYBOX
 -	if (is_prefixed_with(name, "busybox"))
 +	if (strstr(name, "busybox") != 0)
  		exit(busybox_main(argv));
- # endif
- 	/* find_applet_by_name() search is more expensive, so goes second */
+ #  endif
+ #  if NUM_APPLETS > 0
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 6f86529a265..b3502d269b0 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.25.1";
+  name = "busybox-1.26.1";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "0bm0l8xdjdz3kdyajp8wg27yamsw7r2y88nnrxwvvz984c7pwri7";
+    sha256 = "1wl1yy82am53srhgpi1w04hs5hbqjljrrxwwfic35k1mza3y9fqg";
   };
 
   hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];

From 125fa1520dd5bd3255badd472cd9ce70630dc67f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 3 Jan 2017 08:42:59 -0500
Subject: [PATCH 0502/1310] curl: 7.51.1 -> 7.52.1

---
 pkgs/tools/networking/curl/default.nix        |  6 +-
 .../curl/fix-http2-window-size.patch          | 88 -------------------
 2 files changed, 2 insertions(+), 92 deletions(-)
 delete mode 100644 pkgs/tools/networking/curl/fix-http2-window-size.patch

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 5dd523d6fa6..9ed56ee1ec5 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.51.0";
+  name = "curl-7.52.1";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "1pldg1d8606p4q83k8fcp61kfcsbphln22mycw7h7r87i42410kz";
+    sha256 = "16rqhyzlpnivifin8n7l2fr9ihay9v2nw2drsniinb6bcykqaqfi";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
@@ -42,8 +42,6 @@ stdenv.mkDerivation rec {
     optional sslSupport openssl ++
     optional scpSupport libssh2;
 
-  patches = stdenv.lib.optional http2Support ./fix-http2-window-size.patch;
-
   # for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html
   preConfigure = ''
     sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
diff --git a/pkgs/tools/networking/curl/fix-http2-window-size.patch b/pkgs/tools/networking/curl/fix-http2-window-size.patch
deleted file mode 100644
index 6fac3e1b42a..00000000000
--- a/pkgs/tools/networking/curl/fix-http2-window-size.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From a4d888857ede39a8e2aa5f961048c6362d3a5377 Mon Sep 17 00:00:00 2001
-From: Jay Satiro <raysatiro@yahoo.com>
-Date: Wed, 16 Nov 2016 02:55:30 -0500
-Subject: [PATCH] http2: Use huge HTTP/2 windows
-
-- Improve performance by using a huge HTTP/2 window size.
-
-Bug: https://github.com/curl/curl/issues/1102
-Reported-by: afrind@users.noreply.github.com
-Assisted-by: Tatsuhiro Tsujikawa
----
- docs/TODO   |  8 --------
- lib/http2.c | 15 +++++++++++++--
- 2 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/docs/TODO b/docs/TODO
-index c3bc4eb..99c610f 100644
---- a/docs/TODO
-+++ b/docs/TODO
-@@ -63,7 +63,6 @@
-  5.1 Better persistency for HTTP 1.0
-  5.2 support FF3 sqlite cookie files
-  5.3 Rearrange request header order
-- 5.4 Use huge HTTP/2 windows
-  5.5 auth= in URLs
-  5.6 Refuse "downgrade" redirects
-  5.7 Brotli compression
-@@ -528,13 +527,6 @@ This is not detailed in any FTP specification.
-  headers use a default value so only headers that need to be moved have to be
-  specified.
- 
--5.4 Use huge HTTP/2 windows
--
-- We're currently using nghttp2's default window size which is terribly small
-- (64K). This becomes a bottle neck over high bandwidth networks. We should
-- instead make the window size to be very big (512MB?) as we really don't do
-- much flow control anyway.
--
- 5.5 auth= in URLs
- 
-  Add the ability to specify the preferred authentication mechanism to use by
-diff --git a/lib/http2.c b/lib/http2.c
-index 6720984..202ab1b 100644
---- a/lib/http2.c
-+++ b/lib/http2.c
-@@ -59,6 +59,8 @@
- #define nghttp2_session_callbacks_set_error_callback(x,y)
- #endif
- 
-+#define HTTP2_HUGE_WINDOW_SIZE (1 << 30)
-+
- /*
-  * Curl_http2_init_state() is called when the easy handle is created and
-  * allows for HTTP/2 specific init of state.
-@@ -965,7 +967,7 @@ static ssize_t data_source_read_callback(nghttp2_session *session,
-  */
- static nghttp2_settings_entry settings[] = {
-   { NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100 },
--  { NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, NGHTTP2_INITIAL_WINDOW_SIZE },
-+  { NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, HTTP2_HUGE_WINDOW_SIZE },
- };
- 
- #define H2_BUFSIZE 32768
-@@ -2031,7 +2033,8 @@ CURLcode Curl_http2_switched(struct connectdata *conn,
-   else {
-     /* stream ID is unknown at this point */
-     stream->stream_id = -1;
--    rv = nghttp2_submit_settings(httpc->h2, NGHTTP2_FLAG_NONE, NULL, 0);
-+    rv = nghttp2_submit_settings(httpc->h2, NGHTTP2_FLAG_NONE, settings,
-+                                 sizeof(settings) / sizeof(settings[0]));
-     if(rv != 0) {
-       failf(data, "nghttp2_submit_settings() failed: %s(%d)",
-             nghttp2_strerror(rv), rv);
-@@ -2039,6 +2042,14 @@ CURLcode Curl_http2_switched(struct connectdata *conn,
-     }
-   }
- 
-+  rv = nghttp2_session_set_local_window_size(httpc->h2, NGHTTP2_FLAG_NONE, 0,
-+                                             HTTP2_HUGE_WINDOW_SIZE);
-+  if(rv != 0) {
-+    failf(data, "nghttp2_session_set_local_window_size() failed: %s(%d)",
-+          nghttp2_strerror(rv), rv);
-+    return CURLE_HTTP2;
-+  }
-+
-   /* we are going to copy mem to httpc->inbuf.  This is required since
-      mem is part of buffer pointed by stream->mem, and callbacks
-      called by nghttp2_session_mem_recv() will write stream specific

From 293551a16286f2e1134707babdb013a29bf778ce Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 2 Jan 2017 16:33:55 +0100
Subject: [PATCH 0503/1310] gnum4: 1.4.17 -> 1.4.18

See http://lists.gnu.org/archive/html/info-gnu/2016-12/msg00015.html
for release announcement.
---
 pkgs/development/tools/misc/gnum4/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 0696dc90644..fbbd6cc4d6f 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gnum4-1.4.17";
+  name = "gnum4-1.4.18";
 
   src = fetchurl {
-    url = "mirror://gnu/m4/m4-1.4.17.tar.bz2";
-    sha256 = "0w0da1chh12mczxa5lnwzjk9czi3dq6gnnndbpa6w4rj76b1yklf";
+    url = "mirror://gnu/m4/m4-1.4.18.tar.bz2";
+    sha256 = "1xkwwq0sgv05cla0g0a01yzhk0wpsn9y40w9kh9miiiv0imxfh36";
   };
 
   doCheck = false;

From 7e87be4055762c8e6cbabe5a399d4a8c0739d1da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@klandest.in>
Date: Tue, 3 Jan 2017 15:43:51 +0100
Subject: [PATCH 0504/1310] libdivecomputer: add subsurface version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Güntner <code@klandest.in>
---
 .../libraries/libdivecomputer/subsurface.nix  | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/libdivecomputer/subsurface.nix

diff --git a/pkgs/development/libraries/libdivecomputer/subsurface.nix b/pkgs/development/libraries/libdivecomputer/subsurface.nix
new file mode 100644
index 00000000000..5840ea2ef85
--- /dev/null
+++ b/pkgs/development/libraries/libdivecomputer/subsurface.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "libdivecomputer-${version}";
+  version = "ssrf-0.5.0";
+
+  src = fetchgit {
+    url = "git://subsurface-divelog.org/libdc";
+    rev = "534dd2f34b8271b2a1cac0e3151bfdc81da40e47";
+    branchName = "Subsurface-branch";
+    sha256 = "0iw9pczmwqlfjlgrik79b2pd4lmipxhjzj60ysk8qzl3axadjycp";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://www.libdivecomputer.org;
+    description = "A cross-platform and open source library for communication with dive computers from various manufacturers";
+    maintainers = [ maintainers.mguentner ];
+    license = licenses.lgpl21;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74b87a0d96f..c63086983dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7844,6 +7844,8 @@ in
 
   libdivecomputer = callPackage ../development/libraries/libdivecomputer { };
 
+  libdivecomputer_ssrf = callPackage ../development/libraries/libdivecomputer/subsurface.nix { };
+
   libdivsufsort = callPackage ../development/libraries/libdivsufsort { };
 
   libdmtx = callPackage ../development/libraries/libdmtx { };

From b00516ca316f1a16993ec695c0aab302acb0eae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@klandest.in>
Date: Mon, 2 Jan 2017 02:45:24 +0100
Subject: [PATCH 0505/1310] subsurface: 4.5.6 -> 4.5.97 (beta 2)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Güntner <code@klandest.in>
---
 pkgs/applications/misc/subsurface/default.nix | 12 +++++-------
 pkgs/top-level/all-packages.nix               |  7 +++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index be4a004fb8b..a1b03f48b22 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -20,15 +20,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "4.5.6";
+  version = "4.5.97";
   name = "subsurface-${version}";
 
-  # use fetchgit instead of the official tgz is not complete
   src = fetchgit {
-    sha256 = "156rqcszy0c4plk2mv7wdd4h7s7mygpq5sdc64pjfs4qvvsdj10f";
+    sha256 = "0mbf8m5sbimbyvlh65sjlydrycr4ssfyfzdlqyl0wcpzw7h0qfp8";
     url = "git://git.subsurface-divelog.org/subsurface";
-    rev = "4d8d7c2a0fa1b4b0e6953d92287c75b6f97472d0";
-    branchName = "v4.5-branch";
+    rev = "5f15ad5a86ada3c5e574041a5f9d85235322dabb";
+    branchName = "master";
   };
 
   buildInputs = [ qtbase libdivecomputer libmarble-ssrf libxslt
@@ -43,8 +42,7 @@ stdenv.mkDerivation rec {
     marble_libs=$(echo $(echo $CMAKE_LIBRARY_PATH | grep -o "/nix/store/[[:alnum:]]*-libmarble-ssrf-[a-zA-Z0-9\-]*/lib")/libssrfmarblewidget.so)
     cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Debug \
                             -DMARBLE_LIBRARIES=$marble_libs \
-                            -DNO_PRINTING=OFF \
-                            -DUSE_LIBGIT23_API=1"
+                            -DNO_PRINTING=OFF"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c63086983dc..2d0675116ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3821,10 +3821,9 @@ in
 
   su-exec = callPackage ../tools/security/su-exec {};
 
-  subsurface =
-    qt55.callPackage ../applications/misc/subsurface {
-        libgit2 = pkgs.libgit2_0_23;
-    };
+  subsurface = qt55.callPackage ../applications/misc/subsurface {
+    libdivecomputer = libdivecomputer_ssrf;
+  };
 
   sudo = callPackage ../tools/security/sudo { };
 

From 67d73657a95b3cc7da7d3361bb5ab17be00b6bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@klandest.in>
Date: Mon, 2 Jan 2017 02:45:57 +0100
Subject: [PATCH 0506/1310] Revert "libgit2: reinit at 0.23.2"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2e15a8f2dde53484082d48b14d3557b8009f61ac.
libgit2 v0.23.2 is no longer necessary due to
edbe73dc13e6090269f0d8b2bb759c7957a83ec1

Signed-off-by: Maximilian Güntner <code@klandest.in>
---
 pkgs/development/libraries/git2/0.23.nix | 27 ------------------------
 pkgs/top-level/all-packages.nix          |  1 -
 2 files changed, 28 deletions(-)
 delete mode 100644 pkgs/development/libraries/git2/0.23.nix

diff --git a/pkgs/development/libraries/git2/0.23.nix b/pkgs/development/libraries/git2/0.23.nix
deleted file mode 100644
index 3cf429ab1d7..00000000000
--- a/pkgs/development/libraries/git2/0.23.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }:
-
-stdenv.mkDerivation (rec {
-  version = "0.23.2";
-  name = "libgit2-${version}";
-
-  src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://github.com/libgit2/libgit2/tarball/v${version}";
-    sha256 = "1d3901bmgvdnmzrx21afi1d0llsqmca3ckj942p0i2wpdpr1kbcp";
-  };
-
-  cmakeFlags = "-DTHREADSAFE=ON";
-
-  nativeBuildInputs = [ cmake python pkgconfig ];
-  buildInputs = [ zlib libssh2 openssl http-parser ];
-
-  meta = {
-    description = "the Git linkable library";
-    homepage = http://libgit2.github.com/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; all;
-  };
-} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
-  NIX_LDFLAGS = "-liconv";
-  propagatedBuildInputs = [ libiconv ];
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d0675116ab..de561fa6391 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7202,7 +7202,6 @@ in
   );
 
   libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { };
-  libgit2_0_23 = callPackage ../development/libraries/git2/0.23.nix { };
 
   gle = callPackage ../development/libraries/gle { };
 

From fd152db8f792dd4818ba4746d15aa74b50be2df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 3 Jan 2017 16:50:56 +0100
Subject: [PATCH 0507/1310] rustNightlyBin: 2016-12-05 -> 2016-12-29 (#21618)

- add cargo (hence the renaming)
- also allow to built nix packages
---
 .../development/compilers/rust/nightlyBin.nix | 36 +++++++++++++++++--
 pkgs/top-level/all-packages.nix               |  7 +++-
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix
index a60d17fb7cb..0671a88d2c4 100644
--- a/pkgs/development/compilers/rust/nightlyBin.nix
+++ b/pkgs/development/compilers/rust/nightlyBin.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, makeWrapper, cacert, zlib }:
+{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage }:
 
 let
   inherit (stdenv.lib) optionalString;
 
-  platform = if stdenv.system == "x86_64-linux" 
+  platform = if stdenv.system == "x86_64-linux"
     then "x86_64-unknown-linux-gnu"
     else abort "missing boostrap url for platform ${stdenv.system}";
 
@@ -19,10 +19,12 @@ let
      sha256 = bootstrapHash;
   };
 
-  version = "2016-12-05";
+  version = "2016-12-29";
 in
 
 rec {
+  inherit buildRustPackage;
+
   rustc = stdenv.mkDerivation rec {
     name = "rustc-nightly-${version}";
 
@@ -49,5 +51,33 @@ rec {
           "$out/bin/rustc"
       ''}
     '';
+
+  };
+  cargo = stdenv.mkDerivation rec {
+    name = "cargo-nightly-${version}";
+
+    inherit version;
+    inherit src;
+
+    meta = with stdenv.lib; {
+      homepage = http://www.rust-lang.org/;
+      description = "A safe, concurrent, practical language";
+      maintainers = with maintainers; [ qknight ];
+      license = [ licenses.mit licenses.asl20 ];
+    };
+
+    buildInputs = [ makeWrapper ];
+    phases = ["unpackPhase" "installPhase"];
+
+    installPhase = ''
+      ./install.sh --prefix=$out \
+        --components=cargo
+
+      ${optionalString needsPatchelf ''
+        patchelf \
+          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+          "$out/bin/cargo"
+      ''}
+    '';
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93909059d61..c1008e9595d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5290,12 +5290,17 @@ in
   };
 
   rust = rustStable;
-  rustcNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix {});
   rustStable = callPackage ../development/compilers/rust {};
   rustBeta = callPackage ../development/compilers/rust/beta.nix {};
   rustNightly = callPackage ../development/compilers/rust/nightly.nix {
     rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta);
   };
+  rustNightlyBin = 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 b297af42d257426bdce617f510381f19365bc69d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 3 Jan 2017 17:28:55 +0100
Subject: [PATCH 0508/1310] Fix using ephemeral disks for /tmp etc. in EC2
 instances

This code in amazon-image.nix:

  if mountFS "$device" "$mp" "" auto; then
    if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi
  fi

relies on mountFS to return a zero exit status if mounting
succeeds. But the lustrateRoot check in mountFS was causing a non-zero
exit status. As a result /disk0 would be mounted, but not used for
/tmp.

(cherry picked from commit d082ed8c35dec48aee2afd1303b3c8b2a1b242b0)
---
 nixos/modules/system/boot/stage-1-init.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 7803f1bd1aa..f0699ad9832 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -318,6 +318,8 @@ mountFS() {
     [ "$mountPoint" == "/" ] &&
         [ -f "/mnt-root/etc/NIXOS_LUSTRATE" ] &&
         lustrateRoot "/mnt-root"
+
+    true
 }
 
 lustrateRoot () {

From d496f23df0f9573873221887bcc87b668d31353f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 3 Jan 2017 17:31:51 +0100
Subject: [PATCH 0509/1310] amazon-image.nix: Remove redundant log message

(cherry picked from commit c4b5ed5db74cde94b19d519a8d875e3f7df48a76)
---
 nixos/modules/virtualisation/amazon-image.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 17e69b311b4..80e481d79b9 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -94,7 +94,6 @@ let cfg = config.ec2; in
             elif [ "$fsType" = ext3 ]; then
                 mp="/disk$diskNr"
                 diskNr=$((diskNr + 1))
-                echo "mounting $device on $mp..."
                 if mountFS "$device" "$mp" "" ext3; then
                     if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi
                 fi

From 538d1b688afb433cd3b23f8e7d8a31b928cb6619 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 29 Dec 2016 19:06:50 +0100
Subject: [PATCH 0510/1310] stdenv: bootstrap cmake and python on darwin

---
 .../compilers/llvm/3.7/default.nix            |  4 +-
 .../interpreters/python/cpython/2.7/boot.nix  | 94 +++++++++++++++++++
 .../tools/build-managers/cmake/default.nix    | 58 ++++++------
 pkgs/os-specific/darwin/cctools/port.nix      |  4 +-
 pkgs/top-level/all-packages.nix               |  9 +-
 5 files changed, 134 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/development/interpreters/python/cpython/2.7/boot.nix

diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
index 3df20086f79..b7155defb43 100644
--- a/pkgs/development/compilers/llvm/3.7/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -1,6 +1,6 @@
-{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }:
+{ newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }:
 let
-  callPackage = newScope (self // { inherit stdenv isl version fetch; });
+  callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl version fetch; });
 
   version = "3.7.1";
 
diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
new file mode 100644
index 00000000000..1fecdfdf560
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
@@ -0,0 +1,94 @@
+{ stdenv, fetchurl, CF, configd, coreutils }:
+
+with stdenv.lib;
+
+let
+
+  mkPaths = paths: {
+    C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
+    LIBRARY_PATH = makeLibraryPath paths;
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "python-boot-${version}";
+  version = "2.7.12";
+  libPrefix = "python2.7";
+
+  src = fetchurl {
+    url = "https://www.python.org/ftp/python/2.7.12/Python-${version}.tar.xz";
+    sha256 = "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp";
+  };
+
+  inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
+
+  LDFLAGS = optionalString (!stdenv.isDarwin) "-lgcc_s";
+  NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
+
+  buildInputs = optionals stdenv.isDarwin [ CF configd ];
+
+  patches =
+    [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
+      ./search-path.patch
+
+      # Python recompiles a Python if the mtime stored *in* the
+      # pyc/pyo file differs from the mtime of the source file.  This
+      # doesn't work in Nix because Nix changes the mtime of files in
+      # the Nix store to 1.  So treat that as a special case.
+      ./nix-store-mtime.patch
+
+      # patch python to put zero timestamp into pyc
+      # if DETERMINISTIC_BUILD env var is set
+      ./deterministic-build.patch
+    ];
+
+  DETERMINISTIC_BUILD = 1;
+
+  preConfigure = ''
+      # Purity.
+      for i in /usr /sw /opt /pkg; do
+        substituteInPlace ./setup.py --replace $i /no-such-path
+      done
+    '' + optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
+      for i in Lib/plat-*/regen; do
+        substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
+      done
+    '' + optionalString stdenv.isDarwin ''
+      substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
+      substituteInPlace Lib/multiprocessing/__init__.py \
+        --replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")'
+    '';
+
+  configureFlags = [ "--enable-shared" "--with-threads" "--enable-unicode=ucs4" ]
+    ++ optionals stdenv.isCygwin [ "ac_cv_func_bind_textdomain_codeset=yes" ]
+    ++ optionals stdenv.isDarwin [ "--disable-toolbox-glue" ];
+
+  postInstall =
+    ''
+      ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz}
+
+      paxmark E $out/bin/python2.7
+
+      rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev
+    '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = "http://python.org";
+    description = "A high-level dynamically-typed programming language";
+    longDescription = ''
+      Python is a remarkably powerful dynamic programming language that
+      is used in a wide variety of application domains. Some of its key
+      distinguishing features include: clear, readable syntax; strong
+      introspection capabilities; intuitive object orientation; natural
+      expression of procedural code; full modularity, supporting
+      hierarchical packages; exception-based error handling; and very
+      high level dynamic data types.
+    '';
+    license = stdenv.lib.licenses.psfl;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ lnl7 chaoflow domenkozar ];
+  };
+}
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index fbc6f5be5ca..31870fdaf20 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pkgconfig
 , bzip2, curl, expat, libarchive, xz, zlib, libuv
-, useNcurses ? false, ncurses, useQt4 ? false, qt4
-, wantPS ? false, ps ? null
+# darwin attributes
+, ps
+, isBootstrap ? false
+, useSharedLibraries ? !stdenv.isCygwin
+, useNcurses ? false, ncurses
+, useQt4 ? false, qt4
 }:
 
 with stdenv.lib;
 
-assert wantPS -> (ps != null);
-assert stdenv ? cc;
-assert stdenv.cc ? libc;
-
 let
   os = stdenv.lib.optionalString;
   majorVersion = "3.7";
@@ -18,7 +18,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
+  name = "cmake-${os isBootstrap "boot-"}${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
 
   inherit majorVersion;
 
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
     sha256 = "449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1";
   };
 
+  prePatch = optionalString (!useSharedLibraries) ''
+    substituteInPlace Utilities/cmlibarchive/CMakeLists.txt \
+      --replace '"-framework CoreServices"' '""'
+  '';
+
   # Don't search in non-Nix locations such as /usr, but do search in our libc.
   patches = [ ./search-path-3.2.patch ]
     ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
@@ -38,39 +43,36 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   buildInputs =
-    [ setupHook pkgconfig bzip2 curl expat libarchive xz zlib libuv ]
+    [ setupHook pkgconfig ]
+    ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv ]
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
-  propagatedBuildInputs = optional wantPS ps;
+  propagatedBuildInputs = optional stdenv.isDarwin ps;
 
-  preConfigure = with stdenv; ''
-      fixCmakeFiles .
-      substituteInPlace Modules/Platform/UnixPaths.cmake \
-        --subst-var-by libc_bin ${getBin cc.libc} \
-        --subst-var-by libc_dev ${getDev cc.libc} \
-        --subst-var-by libc_lib ${getLib cc.libc}
-      substituteInPlace Modules/FindCxxTest.cmake \
-        --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell}
-      configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags"
-    '';
-  configureFlags =
-    [ "--docdir=share/doc/${name}"
-      "--no-system-jsoncpp"
-    ]
-    ++ optional (!stdenv.isCygwin) "--system-libs"
+  preConfigure = ''
+    fixCmakeFiles .
+    substituteInPlace Modules/Platform/UnixPaths.cmake \
+      --subst-var-by libc_bin ${getBin stdenv.cc.libc} \
+      --subst-var-by libc_dev ${getDev stdenv.cc.libc} \
+      --subst-var-by libc_lib ${getLib stdenv.cc.libc}
+    substituteInPlace Modules/FindCxxTest.cmake \
+      --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell}
+    configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags"
+  '';
+
+  configureFlags = [ "--docdir=share/doc/${name}" ]
+    ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup
     ++ optional useQt4 "--qt-gui"
-    ++ ["--"]
-    ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF";
+    ++ optionals (!useNcurses) [ "--" "-DBUILD_CursesDialog=OFF" ];
 
   dontUseCmakeConfigure = true;
-
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";
     platforms = if useQt4 then qt4.meta.platforms else platforms.all;
-    maintainers = with maintainers; [ urkud mornfall ttuegel ];
+    maintainers = with maintainers; [ urkud mornfall ttuegel lnl7 ];
   };
 }
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 41fb090710c..202426e7872 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool_2
-, llvm, libcxx, libcxxabi, clang, openssl, libuuid
+, llvm, libcxx, libcxxabi, clang, libuuid
 , libobjc ? null
 }:
 
@@ -15,7 +15,7 @@ let
       sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1";
     };
 
-    buildInputs = [ autoconf automake libtool_2 openssl libuuid ] ++
+    buildInputs = [ autoconf automake libtool_2 libuuid ] ++
       # Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang)
       stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++
       stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de455514f39..8dc8b1f9799 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5186,9 +5186,13 @@ in
     inherit (stdenvAdapters) overrideCC;
   };
 
-  llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 {
+  llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({
     inherit (stdenvAdapters) overrideCC;
-  };
+  } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+    cmake = cmake.override { isBootstrap = true; useSharedLibraries = false; };
+    libxml2 = libxml2.override { pythonSupport = false; };
+    python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
+  });
 
   llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 {
     inherit (stdenvAdapters) overrideCC;
@@ -6110,7 +6114,6 @@ in
   };
 
   cmake = callPackage ../development/tools/build-managers/cmake {
-    wantPS = stdenv.isDarwin;
     inherit (darwin) ps;
   };
 

From 7c29295deb1ff7c704ef901e1b1a47677859268b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 3 Jan 2017 18:01:02 +0100
Subject: [PATCH 0511/1310] gcl_2_6_13_pre: init at 2.6.13pre50. GCL hasn't had
 releases for a long time, but there are relatively regular prereleases

---
 pkgs/development/compilers/gcl/2.6.13-pre.nix | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/compilers/gcl/2.6.13-pre.nix

diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix
new file mode 100644
index 00000000000..2a80eccfb40
--- /dev/null
+++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchgit, mpfr, m4, binutils, fetchcvs, emacs, zlib, which
+, texinfo, libX11, xproto, inputproto, libXi, gmp, readline, strace
+, libXext, xextproto, libXt, libXaw, libXmu } :
+
+assert stdenv ? cc ;
+assert stdenv.cc.isGNU ;
+assert stdenv.cc ? libc ;
+assert stdenv.cc.libc != null ;
+
+stdenv.mkDerivation rec {
+  name = "gcl-${version}";
+  version = "2.6.13pre50";
+
+  src = fetchgit {
+    sha256 = "0vpxb6z5g9fjavrgx8gz8fsjvskfz64f63qibh5s00fvvndlwi88";
+    url = "http://git.savannah.gnu.org/r/gcl.git";
+    rev = "refs/tags/Version_2_6_13pre50";
+  };
+
+  postPatch = ''
+    sed -e 's/<= obj-date/<= (if (= 0 obj-date) 1 obj-date)/' -i lsp/make.lisp
+  '';
+
+  sourceRoot = "gcl/gcl";
+
+  patches = [];
+
+  buildInputs = [
+    mpfr m4 binutils emacs gmp
+    libX11 xproto inputproto libXi
+    libXext xextproto libXt libXaw libXmu
+    zlib which texinfo readline strace
+  ];
+
+  configureFlags = [
+    "--enable-ansi"
+  ];
+
+  hardeningDisable = [ "pic" "bindnow" ];
+
+  meta = {
+    description = "GNU Common Lisp compiler working via GCC";
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8dc8b1f9799..1ca58e7ca6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4931,6 +4931,8 @@ in
     gmp = gmp4;
   };
 
+  gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { };
+
   gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
     version = "4.7-2013q3-20130916";
     releaseType = "update";

From 95f3473e1849f03044b05be3ffaf86cb65e08238 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 3 Jan 2017 18:02:39 +0100
Subject: [PATCH 0512/1310] ecl_16_1_2: init at 16.1.2; reinstating for Maxima

---
 pkgs/development/compilers/ecl/16.1.2.nix | 59 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/compilers/ecl/16.1.2.nix

diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix
new file mode 100644
index 00000000000..30fee77321f
--- /dev/null
+++ b/pkgs/development/compilers/ecl/16.1.2.nix
@@ -0,0 +1,59 @@
+{stdenv, fetchurl
+, libtool, autoconf, automake
+, gmp, mpfr, libffi, makeWrapper
+, noUnicode ? false
+, gcc
+, threadSupport ? true
+}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="ecl";
+    version="16.1.2";
+    name="${baseName}-${version}";
+    url="https://common-lisp.net/project/ecl/static/files/release/ecl-16.1.2.tgz";
+    sha256="16ab8qs3awvdxy8xs8jy82v8r04x4wr70l9l2j45vgag18d2nj1d";
+  };
+  buildInputs = [
+    libtool autoconf automake makeWrapper
+  ];
+  propagatedBuildInputs = [
+    libffi gmp mpfr gcc
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs propagatedBuildInputs;
+
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+
+  configureFlags = [
+    (if threadSupport then "--enable-threads" else "--disable-threads")
+    "--with-gmp-prefix=${gmp.dev}"
+    "--with-libffi-prefix=${libffi.dev}"
+    ]
+    ++
+    (stdenv.lib.optional (! noUnicode)
+      "--enable-unicode")
+    ;
+
+  hardeningDisable = [ "format" ];
+
+  postInstall = ''
+    sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config
+    wrapProgram "$out/bin/ecl" \
+      --prefix PATH ':' "${gcc}/bin" \
+      --prefix NIX_LDFLAGS ' ' "-L${gmp.lib or gmp.out or gmp}/lib" \
+      --prefix NIX_LDFLAGS ' ' "-L${libffi.lib or libffi.out or libffi}/lib"
+  '';
+
+  meta = {
+    inherit (s) version;
+    description = "Lisp implementation aiming to be small, fast and easy to embed";
+    license = stdenv.lib.licenses.mit ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ca58e7ca6a..ef93fea2497 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4683,6 +4683,7 @@ in
   drumstick = callPackage ../development/libraries/drumstick { };
 
   ecl = callPackage ../development/compilers/ecl { };
+  ecl_16_1_2 = callPackage ../development/compilers/ecl/16.1.2.nix { };
 
   eql = callPackage ../development/compilers/eql {};
 

From efd2b279f3a9d8a86fa04bfa965c12efb48e8c65 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 3 Jan 2017 18:06:02 +0100
Subject: [PATCH 0513/1310] sbcl_1_3_12: init at 1.3.12; reinstating the
 previous version for Maxima

---
 pkgs/development/compilers/sbcl/1.3.12.nix | 104 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |   2 +
 2 files changed, 106 insertions(+)
 create mode 100644 pkgs/development/compilers/sbcl/1.3.12.nix

diff --git a/pkgs/development/compilers/sbcl/1.3.12.nix b/pkgs/development/compilers/sbcl/1.3.12.nix
new file mode 100644
index 00000000000..8fa4741a4a1
--- /dev/null
+++ b/pkgs/development/compilers/sbcl/1.3.12.nix
@@ -0,0 +1,104 @@
+{ stdenv, fetchurl, writeText, sbclBootstrap
+, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
+, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
+  # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
+  # Note that the created binaries still need `patchelf --set-interpreter ...`
+  # to get rid of ${glibc} dependency.
+, purgeNixReferences ? false
+}:
+
+stdenv.mkDerivation rec {
+  name    = "sbcl-${version}";
+  version = "1.3.12";
+
+  src = fetchurl {
+    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
+    sha256 = "1hjr2xqazy4j0m58y4na6fz8ii3xflqairxy7vpd7ajbs00yqfc0";
+  };
+
+  patchPhase = ''
+    echo '"${version}.nixos"' > version.lisp-expr
+    echo "
+    (lambda (features)
+      (flet ((enable (x)
+               (pushnew x features))
+             (disable (x)
+               (setf features (remove x features))))
+    ''
+    + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)")
+    + stdenv.lib.optionalString stdenv.isArm "(enable :arm)"
+    + ''
+      )) " > customize-target-features.lisp
+
+    pwd
+
+    # SBCL checks whether files are up-to-date in many places..
+    # Unfortunately, same timestamp is not good enough
+    sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
+    sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
+    sed -i src/cold/slam.lisp -e \
+      '/file-write-date input/a)'
+    sed -i src/cold/slam.lisp -e \
+      '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))'
+    sed -i src/code/target-load.lisp -e \
+      '/date defaulted-fasl/a)'
+    sed -i src/code/target-load.lisp -e \
+      '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
+
+    # Fix the tests
+    sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
+    sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp
+    sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp
+    sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp
+
+    sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
+    sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
+
+    # Use whatever `cc` the stdenv provides
+    substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc
+
+    substituteInPlace src/runtime/Config.x86-64-darwin \
+      --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5
+  ''
+  + (if purgeNixReferences
+    then
+      # This is the default location to look for the core; by default in $out/lib/sbcl
+      ''
+        sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \
+          -i src/runtime/runtime.c
+      ''
+    else
+      # Fix software version retrieval
+      ''
+        sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp
+      ''
+    );
+
+
+  preBuild = ''
+    export INSTALL_ROOT=$out
+    mkdir -p test-home
+    export HOME=$PWD/test-home
+  '';
+
+  buildPhase = ''
+    sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}"
+  '';
+
+  installPhase = ''
+    INSTALL_ROOT=$out sh install.sh
+  '';
+
+  # Specifying $SBCL_HOME is only truly needed with `purgeNixReferences = true`.
+  setupHook = writeText "setupHook.sh" ''
+    envHooks+=(_setSbclHome)
+    _setSbclHome() {
+      export SBCL_HOME='@out@/lib/sbcl/'
+    }
+  '';
+
+  meta = sbclBootstrap.meta // {
+    inherit version;
+    updateWalker = true;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef93fea2497..e3a0ed67236 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5334,6 +5334,8 @@ in
 
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
   sbcl = callPackage ../development/compilers/sbcl {};
+  # For Maxima
+  sbcl_1_3_12 = callPackage ../development/compilers/sbcl/1.3.12.nix { };
   # For StumpWM
   sbcl_1_2_5 = callPackage ../development/compilers/sbcl/1.2.5.nix {
     clisp = clisp;

From 30f509437c84cc052dc7dd5dbe2c693c1909c7a7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 3 Jan 2017 18:06:34 +0100
Subject: [PATCH 0514/1310] maxima: use previous versions of ECL and SBCL; the
 tests fail with the latest versions

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3a0ed67236..3ddf6df2369 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17097,8 +17097,14 @@ in
 
   geogebra = callPackage ../applications/science/math/geogebra { };
 
-  maxima = callPackage ../applications/science/math/maxima { ecl = null; };
-  maxima-ecl = callPackage ../applications/science/math/maxima { sbcl = null; };
+  maxima = callPackage ../applications/science/math/maxima {
+    sbcl = sbcl_1_3_12;
+    ecl = null;
+  };
+  maxima-ecl = callPackage ../applications/science/math/maxima {
+    ecl = ecl_16_1_2;
+    sbcl = null;
+  };
 
   wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; };
 

From 1fe136ea8a3d142e4e71d0277bab4e26320aa7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 20 Nov 2016 18:05:18 +0100
Subject: [PATCH 0515/1310] Make all meta.maintainers attributes lists

(cherry picked from commit b714f552392310cd23b8e71402dfa64b629d2190)
The two new changes were really missing on master.
---
 pkgs/applications/misc/synapse/default.nix | 2 +-
 pkgs/tools/system/iops/default.nix         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
index 21c0c0f5ea3..e7d2a595684 100644
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       '';
       homepage = https://launchpad.net/synapse-project;
       license = stdenv.lib.licenses.gpl3;
-      maintainers = with stdenv.lib.maintainers; mahe;
+      maintainers = with stdenv.lib.maintainers; [ mahe ];
       platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix
index 24332516870..34a48bd3053 100644
--- a/pkgs/tools/system/iops/default.nix
+++ b/pkgs/tools/system/iops/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.vanheusden.com/iops/;
     license = licenses.gpl2;
-    maintainers = with maintainers; davidak;
+    maintainers = with maintainers; [ davidak ];
     platforms = platforms.linux; # build problems on Darwin
   };
 }

From d05656a9ca7b31df0170656f9ba0a23659361d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 3 Jan 2017 17:37:55 +0000
Subject: [PATCH 0516/1310] rustNightlyBin: fix build hash

---
 pkgs/development/compilers/rust/nightlyBin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix
index 0671a88d2c4..6f7cca9aff2 100644
--- a/pkgs/development/compilers/rust/nightlyBin.nix
+++ b/pkgs/development/compilers/rust/nightlyBin.nix
@@ -9,7 +9,7 @@ let
 
   bootstrapHash =
     if stdenv.system == "x86_64-linux"
-    then "1afsqaavhwiaxm38zr08cbq0985c7lrb1jzdcmq0jh6y8rb8ikff"
+    then "05bppmc6hqgv2g4x76rj95xf40x2aikqmcnql5li27rqwliyxznj"
     else throw "missing boostrap hash for platform ${stdenv.system}";
 
   needsPatchelf = stdenv.isLinux;

From f3e2feb057e4f1c98276b4392536facca7d2f0c1 Mon Sep 17 00:00:00 2001
From: Ruslan Babayev <ruslan@babayev.com>
Date: Mon, 2 Jan 2017 21:56:47 -0800
Subject: [PATCH 0517/1310] ofp: init at 2.0.0

---
 pkgs/os-specific/linux/ofp/default.nix | 40 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/os-specific/linux/ofp/default.nix

diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix
new file mode 100644
index 00000000000..e083c0f0457
--- /dev/null
+++ b/pkgs/os-specific/linux/ofp/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
+, openssl, libpcap, odp-dpdk, dpdk
+}:
+
+stdenv.mkDerivation rec {
+  name = "ofp-${version}";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "OpenFastPath";
+    repo = "ofp";
+    rev = "${version}";
+    sha256 = "05902593fycgkwzk5g7wzgk0k40nrrgybplkdka3rqnlj6aydhqf";
+  };
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ openssl libpcap odp-dpdk dpdk ];
+
+  dontDisableStatic = true;
+
+  postPatch = ''
+    substituteInPlace configure.ac --replace m4_esyscmd m4_esyscmd_s
+    substituteInPlace scripts/git_hash.sh --replace /bin/bash /bin/sh
+    echo ${version} > .scmversion
+  '';
+
+  configureFlags = [
+    "--with-odp=${odp-dpdk}"
+    "--with-odp-lib=odp-dpdk"
+    "--disable-shared"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "High performance TCP/IP stack";
+    homepage = http://www.openfastpath.org;
+    license = licenses.bsd3;
+    platforms =  [ "x86_64-linux" ];
+    maintainers = [ maintainers.abuibrahim ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74b87a0d96f..ac8fcd66d29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11197,6 +11197,8 @@ in
 
     odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };
 
+    ofp = callPackage ../os-specific/linux/ofp { };
+
     e1000e = callPackage ../os-specific/linux/e1000e {};
 
     ixgbevf = callPackage ../os-specific/linux/ixgbevf {};

From 428daee5bc3af7c256374277134153c2f7ba9368 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 3 Jan 2017 19:23:24 +0000
Subject: [PATCH 0518/1310] fix broken link to synaptics config

---
 nixos/modules/services/x11/hardware/synaptics.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index 5c068e89dd7..2a7f4e5cbcd 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -19,7 +19,7 @@ let cfg = config.services.xserver.synaptics;
       Option "TapButton3" "0"
     '';
   pkg = pkgs.xorg.xf86inputsynaptics;
-  etcFile = "X11/xorg.conf.d/50-synaptics.conf";
+  etcFile = "X11/xorg.conf.d/70-synaptics.conf";
 in {
 
   options = {
@@ -172,7 +172,7 @@ in {
     services.xserver.modules = [ pkg.out ];
 
     environment.etc."${etcFile}".source =
-      "${pkg.out}/share/X11/xorg.conf.d/50-synaptics.conf";
+      "${pkg.out}/share/X11/xorg.conf.d/70-synaptics.conf";
 
     environment.systemPackages = [ pkg ];
 

From 6a7664e6cd723f7f31c863ca09def5d75531930c Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Tue, 3 Jan 2017 14:17:15 -0500
Subject: [PATCH 0519/1310] Add some more details about useSandbox

---
 nixos/modules/services/misc/nix-daemon.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index e2bbd4b01aa..7101cadfeed 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -105,7 +105,9 @@ in
           If set, Nix will perform builds in a sandboxed environment that it
           will set up automatically for each build.  This prevents
           impurities in builds by disallowing access to dependencies
-          outside of the Nix store.
+          outside of the Nix store. This isn't enabled by default for
+          performance. It doesn't affect derivation hashes, so changing
+          this option will not trigger a rebuild of packages.
         ";
       };
 

From 26dc6dab4cc31f3b96f4df0a32d153c31e7f72ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 3 Jan 2017 18:41:21 +0100
Subject: [PATCH 0520/1310] avidemux: 2.6.15 -> 2.6.16

---
 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 01687b58867..44b9dca90b6 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -14,11 +14,11 @@
 }:
 
 let
-  version = "2.6.15";
+  version = "2.6.16";
 
   src = fetchurl {
     url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
-    sha256 = "0mr2nll81ki9d1s68klhm19jmr15450wjaws1p0b0y2qqwyrprdh";
+    sha256 = "0jipvpvw871qhhkyykrrrqc9vfbw24v243vzmm8lqifj73h6qvgc";
   };
 
   common = {

From 8b6b0aea726f6abca0ee4b90a1f280a6c1eac108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 28 Dec 2016 19:55:36 +0100
Subject: [PATCH 0521/1310] Revert "rocksdb-haskell: just compile rocksdb
 statically to fix #21215"

This reverts commit 5e5df0fea29323a1a75b8a16911e22955525ed82.
---
 pkgs/development/libraries/rocksdb/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 9a481c0b20f..a8f8ab31d1c 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -36,10 +36,13 @@ stdenv.mkDerivation rec {
   JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc";
 
   buildFlags = [
+    "shared_lib"
     "static_lib"
   ];
 
   installFlags = [
+    "install-shared"
+    "install-static"
     "INSTALL_PATH=\${out}"
   ];
 

From 4ce88d8674de8f8345737786f60dce62c5017fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 29 Dec 2016 14:38:51 +0100
Subject: [PATCH 0522/1310] rocksdb: build without debug

---
 pkgs/development/libraries/rocksdb/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index a8f8ab31d1c..6eb9bc033a4 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -36,14 +36,16 @@ stdenv.mkDerivation rec {
   JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc";
 
   buildFlags = [
+    "DEBUG_LEVEL=0"
     "shared_lib"
     "static_lib"
   ];
 
   installFlags = [
+    "INSTALL_PATH=\${out}"
+    "DEBUG_LEVEL=0"
     "install-shared"
     "install-static"
-    "INSTALL_PATH=\${out}"
   ];
 
   postInstall = ''

From 4bba954e13e0d60269a4d4947884308cd175d5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 3 Jan 2017 23:07:02 +0100
Subject: [PATCH 0523/1310] rocksdb: properly fix #21215

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

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 6eb9bc033a4..10d77c9988c 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, fixDarwinDylibNames
 
 # Optional Arguments
 , snappy ? null, google-gflags ? null, zlib ? null, bzip2 ? null, lz4 ? null
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     sha256 = "1bxyykj13mw48yk108bkmxlfrp6bd95f27bysayax4lqxkgx0zzw";
   };
 
-  buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc ];
+  buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc fixDarwinDylibNames ];
 
   postPatch = ''
     # Hack to fix typos

From af2cfc076f8dd9c3583a8df1682a6d4602f7a9b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 3 Jan 2017 23:08:14 +0100
Subject: [PATCH 0524/1310] haskellPackages.z3: fix #16357

---
 pkgs/applications/science/logic/z3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index fa5c9ba175e..9683579af47 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python2 }:
+{ stdenv, fetchFromGitHub, python2, fixDarwinDylibNames }:
 
 let
   python = python2;
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
     sha256 = "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp";
   };
 
-  buildInputs = [ python ];
+  buildInputs = [ python fixDarwinDylibNames ];
   enableParallelBuilding = true;
 
   configurePhase = ''

From 663048f37849667f84bb1d941132369eff6e630f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 3 Jan 2017 23:09:14 +0100
Subject: [PATCH 0525/1310] Revert "haskell: workaround for bug with dynamic
 libraries on darwin"

This reverts commit 19e2e7290a25819bd66a94db389e7e0d268f7fc0.

See the correct fix in aa64994b48a29ea8d12323942f1743fa4133527a

General purpose solution will be once we implement
https://github.com/NixOS/nixpkgs/issues/21624
---
 .../haskell-modules/generic-builder.nix       | 32 -------------------
 1 file changed, 32 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index b15b4ad0bec..092d4ae4524 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -244,41 +244,9 @@ stdenv.mkDerivation ({
     runHook postConfigure
   '';
 
-  # The darwin pre/post build sections are a workaround https://github.com/haskell/cabal/issues/4183
-  # It seems like --extra-lib-dirs from the previous steps is not detected properly,
-  # to work around this we build using a DYLD_LIBRARY_PATH and fixup the build afterwards.
   buildPhase = ''
     runHook preBuild
-    ${optionalString stdenv.isDarwin ''
-      local inputClosure=""
-      for i in $propagatedNativeBuildInputs $nativeBuildInputs; do
-        findInputs $i inputClosure propagated-native-build-inputs
-      done
-      local -a inputLibs=()
-      for p in $inputClosure; do
-        if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then
-          continue
-        fi
-        if [ -d "$p/lib" ]; then
-          inputLibs+="$p/lib"
-        fi
-      done
-
-      for lib in $inputLibs; do
-        export DYLD_LIBRARY_PATH="$lib:''${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}"
-      done
-    ''}
     ${setupCommand} build ${buildTarget}${crossCabalFlagsString}
-    ${optionalString stdenv.isDarwin ''
-      unset DYLD_LIBRARY_PATH
-
-      local outputLib=dist/build/*-ghc${ghc.version}.dylib
-      for lib in $inputLib/*.dylib; do
-        for name in $(otool -L $outputLib | awk '$1 ~ /^'$(basename lib)'/ {print $1}' | cat); do
-          install_name_tool -change $name $lib $outputLib
-        done
-      done
-    ''}
     runHook postBuild
   '';
 

From b5703eaa802d3775d86cdaaf0057fcd7acc798f9 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 3 Jan 2017 22:58:37 +0100
Subject: [PATCH 0526/1310] smokeping: Allow full override of imgurl + cgiurl

---
 nixos/modules/services/networking/smokeping.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index 005655f111a..9c8dfa7bac4 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -16,11 +16,11 @@ let
           ${lib.optionalString (cfg.mailHost != "") "mailhost = ${cfg.mailHost}"}
           ${lib.optionalString (cfg.sendmail != null) "sendmail = ${cfg.sendmail}"}
           imgcache = ${smokepingHome}/cache
-          imgurl   = http://${cfg.hostName}:${builtins.toString cfg.port}/cache
+          imgurl   = ${cfg.imgUrl}
           datadir  = ${smokepingHome}/data
           pagedir = ${smokepingHome}/cache
           piddir  = ${smokepingPidDir}
-          cgiurl   = http://${cfg.hostName}:${builtins.toString cfg.port}/smokeping.cgi
+          cgiurl   = ${cfg.cgiUrl}
           linkstyle = ${cfg.linkStyle}
           smokemail = ${cfg.smokeMailTemplate}
           *** Presentation ***
@@ -101,6 +101,18 @@ in
         example = "somewhere.example.com";
         description = "DNS name for the urls generated in the cgi.";
       };
+      cgiUrl = mkOption {
+        type = types.string;
+        default = "http://${cfg.hostName}:${builtins.toString cfg.port}/smokeping.cgi";
+        example = "https://somewhere.example.com/smokeping.cgi";
+        description = "URL to the smokeping cgi.";
+      };
+      imgUrl = mkOption {
+        type = types.string;
+        default = "http://${cfg.hostName}:${builtins.toString cfg.port}/cache";
+        example = "https://somewhere.example.com/cache";
+        description = "Base url for images generated in the cgi.";
+      };
       linkStyle = mkOption {
         type = types.enum ["original" "absolute" "relative"];
         default = "relative";

From f808502aba1efe6e2e40ed10955ca6f974da9b17 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 3 Jan 2017 23:08:26 +0100
Subject: [PATCH 0527/1310] smokeping: cleanup (option ordering)

---
 .../modules/services/networking/smokeping.nix | 207 +++++++++---------
 1 file changed, 101 insertions(+), 106 deletions(-)

diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index 9c8dfa7bac4..04312c39062 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -11,17 +11,17 @@ let
       then
         ''
           *** General ***
-          owner = ${cfg.owner}
+          cgiurl   = ${cfg.cgiUrl}
           contact = ${cfg.ownerEmail}
-          ${lib.optionalString (cfg.mailHost != "") "mailhost = ${cfg.mailHost}"}
-          ${lib.optionalString (cfg.sendmail != null) "sendmail = ${cfg.sendmail}"}
+          datadir  = ${smokepingHome}/data
           imgcache = ${smokepingHome}/cache
           imgurl   = ${cfg.imgUrl}
-          datadir  = ${smokepingHome}/data
+          linkstyle = ${cfg.linkStyle}
+          ${lib.optionalString (cfg.mailHost != "") "mailhost = ${cfg.mailHost}"}
+          owner = ${cfg.owner}
           pagedir = ${smokepingHome}/cache
           piddir  = ${smokepingPidDir}
-          cgiurl   = ${cfg.cgiUrl}
-          linkstyle = ${cfg.linkStyle}
+          ${lib.optionalString (cfg.sendmail != null) "sendmail = ${cfg.sendmail}"}
           smokemail = ${cfg.smokeMailTemplate}
           *** Presentation ***
           template = ${cfg.presentationTemplate}
@@ -54,52 +54,23 @@ in
         default = false;
         description = "Enable the smokeping service";
       };
-      webService = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Enable a smokeping web interface";
-      };
+      alertConfig = mkOption {
+        type = types.string;
+        default = ''
+          to = root@localhost
+          from = smokeping@localhost
+        '';
+        example = literalExample ''
+          to = alertee@address.somewhere
+          from = smokealert@company.xy
 
-      user = mkOption {
-        type = types.string;
-        default = "smokeping";
-        description = "User that runs smokeping and (optionally) thttpd";
-      };
-      mailHost = mkOption {
-        type = types.string;
-        default = "";
-        example = "localhost";
-        description = "Use this SMTP server to send alerts";
-      };
-      sendmail = mkOption {
-        type = types.nullOr types.path;
-        default = null;
-        example = "/var/setuid-wrappers/sendmail";
-        description = "Use this sendmail compatible script to deliver alerts";
-      };
-      smokeMailTemplate = mkOption {
-        type = types.string;
-        default = "${cfg.package}/etc/smokemail.dist";
-        description = "Specify the smokemail template for alerts.";
-      };
-
-      package = mkOption {
-        type = types.package;
-        default = pkgs.smokeping;
-        defaultText = "pkgs.smokeping";
-        description = "Specify a custom smokeping package";
-      };
-      owner = mkOption {
-        type = types.string;
-        default = "nobody";
-        example = "Joe Admin";
-        description = "Real name of the owner of the instance";
-      };
-      hostName = mkOption {
-        type = types.string;
-        default = config.networking.hostName;
-        example = "somewhere.example.com";
-        description = "DNS name for the urls generated in the cgi.";
+          +someloss
+          type = loss
+          # in percent
+          pattern = >0%,*12*,>0%,*12*,>0%
+          comment = loss 3 times  in a row;
+        '';
+        description = "Configuration for alerts.";
       };
       cgiUrl = mkOption {
         type = types.string;
@@ -107,31 +78,12 @@ in
         example = "https://somewhere.example.com/smokeping.cgi";
         description = "URL to the smokeping cgi.";
       };
-      imgUrl = mkOption {
-        type = types.string;
-        default = "http://${cfg.hostName}:${builtins.toString cfg.port}/cache";
-        example = "https://somewhere.example.com/cache";
-        description = "Base url for images generated in the cgi.";
+      config = mkOption {
+        type = types.nullOr types.string;
+        default = null;
+        description = "Full smokeping config supplied by the user. Overrides " +
+          "and replaces any other configuration supplied.";
       };
-      linkStyle = mkOption {
-        type = types.enum ["original" "absolute" "relative"];
-        default = "relative";
-        example = "absolute";
-        description = "DNS name for the urls generated in the cgi.";
-      };
-      port = mkOption {
-        type = types.int;
-        default = 8081;
-        example = 8081;
-        description = "TCP port to use for the web server.";
-      };
-      ownerEmail = mkOption {
-        type = types.string;
-        default = "no-reply@${cfg.hostName}";
-        example = "no-reply@yourdomain.com";
-        description = "Email contact for owner";
-      };
-
       databaseConfig = mkOption {
         type = types.string;
         default = ''
@@ -164,30 +116,59 @@ in
           Once set, changing the interval will require deletion or migration of all
           the collected data.'';
       };
-      alertConfig = mkOption {
-        type = types.string;
-        default = ''
-          to = root@localhost
-          from = smokeping@localhost
-        '';
-        example = literalExample ''
-          to = alertee@address.somewhere
-          from = smokealert@company.xy
-
-          +someloss
-          type = loss
-          # in percent
-          pattern = >0%,*12*,>0%,*12*,>0%
-          comment = loss 3 times  in a row;
-        '';
-        description = "Configuration for alerts.";
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Any additional customization not already included.";
       };
-      presentationTemplate = mkOption {
+      hostName = mkOption {
         type = types.string;
-        default = "${pkgs.smokeping}/etc/basepage.html.dist";
-        description = "Default page layout for the web UI.";
+        default = config.networking.hostName;
+        example = "somewhere.example.com";
+        description = "DNS name for the urls generated in the cgi.";
+      };
+      imgUrl = mkOption {
+        type = types.string;
+        default = "http://${cfg.hostName}:${builtins.toString cfg.port}/cache";
+        example = "https://somewhere.example.com/cache";
+        description = "Base url for images generated in the cgi.";
+      };
+      linkStyle = mkOption {
+        type = types.enum ["original" "absolute" "relative"];
+        default = "relative";
+        example = "absolute";
+        description = "DNS name for the urls generated in the cgi.";
+      };
+      mailHost = mkOption {
+        type = types.string;
+        default = "";
+        example = "localhost";
+        description = "Use this SMTP server to send alerts";
+      };
+      owner = mkOption {
+        type = types.string;
+        default = "nobody";
+        example = "Joe Admin";
+        description = "Real name of the owner of the instance";
+      };
+      ownerEmail = mkOption {
+        type = types.string;
+        default = "no-reply@${cfg.hostName}";
+        example = "no-reply@yourdomain.com";
+        description = "Email contact for owner";
+      };
+      package = mkOption {
+        type = types.package;
+        default = pkgs.smokeping;
+        defaultText = "pkgs.smokeping";
+        description = "Specify a custom smokeping package";
+      };
+      port = mkOption {
+        type = types.int;
+        default = 8081;
+        example = 8081;
+        description = "TCP port to use for the web server.";
       };
-
       presentationConfig = mkOption {
         type = types.string;
         default = ''
@@ -229,6 +210,11 @@ in
         '';
         description = "presentation graph style";
       };
+      presentationTemplate = mkOption {
+        type = types.string;
+        default = "${pkgs.smokeping}/etc/basepage.html.dist";
+        description = "Default page layout for the web UI.";
+      };
       probeConfig = mkOption {
         type = types.string;
         default = ''
@@ -237,6 +223,17 @@ in
         '';
         description = "Probe configuration";
       };
+      sendmail = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/var/setuid-wrappers/sendmail";
+        description = "Use this sendmail compatible script to deliver alerts";
+      };
+      smokeMailTemplate = mkOption {
+        type = types.string;
+        default = "${cfg.package}/etc/smokemail.dist";
+        description = "Specify the smokemail template for alerts.";
+      };
       targetConfig = mkOption {
         type = types.string;
         default = ''
@@ -255,18 +252,16 @@ in
         '';
         description = "Target configuration";
       };
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Any additional customization not already included.";
+      user = mkOption {
+        type = types.string;
+        default = "smokeping";
+        description = "User that runs smokeping and (optionally) thttpd";
       };
-      config = mkOption {
-        type = types.nullOr types.string;
-        default = null;
-        description = "Full smokeping config supplied by the user. Overrides " +
-          "and replaces any other configuration supplied.";
+      webService = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Enable a smokeping web interface";
       };
-
     };
 
   };

From 17b7eb22c3e9f00764b7cc0ea17a931cb53da4fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 3 Jan 2017 23:28:58 +0100
Subject: [PATCH 0528/1310] haskellPackages.wai-app-file-cgi: fix #21498

---
 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 9b03d4633bc..da95981c5e3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1095,7 +1095,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_3_2;
+    http-client = self.http-client_0_5_5;
     http-client-tls = self.http-client-tls_0_3_3;
     http-conduit = self.http-conduit_2_2_3;
   });

From 02efac3f9fe9ee0c658b0fe294420f1c5ba7e50e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 3 Jan 2017 17:38:01 -0500
Subject: [PATCH 0529/1310] gradle: 3.2.1 -> 3.3

---
 pkgs/development/tools/build-managers/gradle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index c129d4448a9..dbdcb6ba8ef 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -52,12 +52,12 @@ rec {
   };
 
   gradle_latest = gradleGen rec {
-    name = "gradle-3.2.1";
-    nativeVersion = "0.11";
+    name = "gradle-3.3";
+    nativeVersion = "0.12";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "1286wqycc7xnrkn6n37r5g19ajv6igqhavdh9pjxqmry9mjs6hwq";
+      sha256 = "14m2m5f5s2cpp6w0x3lkq6lyx5cd7jp0hldnrab0dkyqg31511n5";
     };
   };
 

From 40a9c37ff3ad179b18aae2d0309523312525de5b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 4 Jan 2017 02:51:01 +0300
Subject: [PATCH 0530/1310] node-env: use upstream version

---
 pkgs/development/node-packages/node-env.nix | 109 +++++++++++---------
 1 file changed, 61 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 414f60420af..389ccae2fe5 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -8,19 +8,19 @@ let
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
   tarWrapper = runCommand "tarWrapper" {} ''
     mkdir -p $out/bin
-    
+
     cat > $out/bin/tar <<EOF
     #! ${stdenv.shell} -e
     $(type -p tar) "\$@" --warning=no-unknown-keyword
     EOF
-    
+
     chmod +x $out/bin/tar
   '';
-  
+
   # Function that generates a TGZ file from a NPM project
   buildNodeSourceDist =
     { name, version, src, ... }:
-    
+
     stdenv.mkDerivation {
       name = "node-tarball-${name}-${version}";
       inherit src;
@@ -44,13 +44,13 @@ let
           # Bundle the dependencies of the package
           mkdir -p node_modules
           cd node_modules
-          
+
           # Only include dependencies if they don't exist. They may also be bundled in the package.
           if [ ! -e "${dependency.name}" ]
           then
               ${composePackage dependency}
           fi
-          
+
           cd ..
         ''
       ) dependencies);
@@ -63,13 +63,13 @@ let
         text = ''
           var fs = require('fs');
           var url = require('url');
-          
+
           /*
            * Replaces an impure version specification by *
            */
           function replaceImpureVersionSpec(versionSpec) {
               var parsedUrl = url.parse(versionSpec);
-              
+
               if(versionSpec == "latest" || versionSpec == "unstable" ||
                   versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/')
                   return '*';
@@ -79,9 +79,9 @@ let
               else
                   return versionSpec;
           }
-      
+
           var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-      
+
           /* Replace dependencies */
           if(packageObj.dependencies !== undefined) {
               for(var dependency in packageObj.dependencies) {
@@ -89,7 +89,7 @@ let
                   packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec);
               }
           }
-          
+
           /* Replace development dependencies */
           if(packageObj.devDependencies !== undefined) {
               for(var dependency in packageObj.devDependencies) {
@@ -97,7 +97,7 @@ let
                   packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
               }
           }
-          
+
           /* Replace optional dependencies */
           if(packageObj.optionalDependencies !== undefined) {
               for(var dependency in packageObj.optionalDependencies) {
@@ -105,7 +105,7 @@ let
                   packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
               }
           }
-          
+
           /* Write the fixed JSON file */
           fs.writeFileSync("package.json", JSON.stringify(packageObj));
         '';
@@ -114,40 +114,47 @@ let
     ''
       DIR=$(pwd)
       cd $TMPDIR
-      
+
       unpackFile ${src}
-      
+
       # Make the base dir in which the target dependency resides first
       mkdir -p "$(dirname "$DIR/${packageName}")"
 
       if [ -f "${src}" ]
       then
           # Figure out what directory has been unpacked
-          packageDir=$(find . -type d -maxdepth 1 | tail -1)
-          
+          packageDir="$(find . -maxdepth 1 -type d | tail -1)"
+
           # Restore write permissions to make building work
           find "$packageDir" -type d -print0 | xargs -0 chmod u+x
           chmod -R u+w "$packageDir"
-          
+
           # Move the extracted tarball into the output folder
           mv "$packageDir" "$DIR/${packageName}"
       elif [ -d "${src}" ]
       then
+          # Get a stripped name (without hash) of the source directory.
+          # On old nixpkgs it's already set internally.
+          if [ -z "$strippedName" ]
+          then
+              strippedName="$(stripHash ${src})"
+          fi
+
           # Restore write permissions to make building work
-          chmod -R u+w $strippedName
-          
+          chmod -R u+w "$strippedName"
+
           # Move the extracted directory into the output folder
-          mv $strippedName "$DIR/${packageName}"
+          mv "$strippedName" "$DIR/${packageName}"
       fi
 
       # Unset the stripped name to not confuse the next unpack step
       unset strippedName
-      
+
       # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
       # The following JavaScript replaces these by * to prevent that
       cd "$DIR/${packageName}"
       node ${fixImpureDependencies}
-      
+
       # Include the dependencies of the package
       ${includeDependencies { inherit dependencies; }}
       cd ..
@@ -160,36 +167,36 @@ let
     tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
     mv node-* $out
   '';
-  
+
   # Builds and composes an NPM package including all its dependencies
   buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, preRebuild ? "", ... }@args:
-    
+
     stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // {
       name = "node-${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
       dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments
-      
+
       inherit dontNpmInstall preRebuild;
-      
+
       unpackPhase = args.unpackPhase or "true";
-      
+
       buildPhase = args.buildPhase or "true";
-      
+
       compositionScript = composePackage args;
       passAsFile = [ "compositionScript" ];
-      
+
       installPhase = args.installPhase or ''
         # Create and enter a root node_modules/ folder
         mkdir -p $out/lib/node_modules
         cd $out/lib/node_modules
-          
+
         # Compose the package and all its dependencies
         source $compositionScriptPath
-        
+
         # Patch the shebangs of the bundled modules to prevent them from
         # calling executables outside the Nix store as much as possible
         patchShebangs .
-        
+
         # Deploy the Node.js package by running npm install. Since the
         # dependencies have been provided already by ourselves, it should not
         # attempt to install them again, which is good, because we want to make
@@ -199,23 +206,26 @@ let
         #
         # The other responsibilities of NPM are kept -- version checks, build
         # steps, postprocessing etc.
-        
+
         export HOME=$TMPDIR
         cd "${packageName}"
         runHook preRebuild
         npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
-        
+
         if [ "$dontNpmInstall" != "1" ]
         then
+            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+            rm -f npm-shrinkwrap.json
+
             npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
         fi
-        
+
         # Create symlink to the deployed executable folder, if applicable
         if [ -d "$out/lib/node_modules/.bin" ]
         then
             ln -s $out/lib/node_modules/.bin $out/bin
         fi
-        
+
         # Create symlinks to the deployed manual page folders, if applicable
         if [ -d "$out/lib/node_modules/${packageName}/man" ]
         then
@@ -229,7 +239,7 @@ let
                 done
             done
         fi
-        
+
         # Run post install hook, if provided
         runHook postInstall
       '';
@@ -240,17 +250,17 @@ let
     let
       nodeDependencies = stdenv.mkDerivation {
         name = "node-dependencies-${name}-${version}";
-        
+
         buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
-        
+
         includeScript = includeDependencies { inherit dependencies; };
         passAsFile = [ "includeScript" ];
-        
+
         buildCommand = ''
           mkdir -p $out/lib
           cd $out/lib
           source $includeScriptPath
-          
+
           # Create fake package.json to make the npm commands work properly
           cat > package.json <<EOF
           {
@@ -258,15 +268,18 @@ let
               "version": "${version}"
           }
           EOF
-          
+
           # Patch the shebangs of the bundled modules to prevent them from
           # calling executables outside the Nix store as much as possible
           patchShebangs .
-          
-          export HOME=$TMPDIR
+
+          export HOME=$PWD
           npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
-          
+
           ${stdenv.lib.optionalString (!dontNpmInstall) ''
+            # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+            rm -f npm-shrinkwrap.json
+
             npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
           ''}
 
@@ -276,7 +289,7 @@ let
     in
     stdenv.lib.makeOverridable stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
-      
+
       buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
       buildCommand = ''
         mkdir -p $out/bin
@@ -287,7 +300,7 @@ let
         EOF
         chmod +x $out/bin/shell
       '';
-      
+
       # Provide the dependencies in a development shell through the NODE_PATH environment variable
       inherit nodeDependencies;
       shellHook = stdenv.lib.optionalString (dependencies != []) ''

From 61d125b8425da501f07765197186ed7351a55f48 Mon Sep 17 00:00:00 2001
From: Alexander Kahl <ak@sodosopa.io>
Date: Thu, 14 Apr 2016 11:18:09 -0700
Subject: [PATCH 0531/1310] sssd: init at 1.14.2

perlPackages.TextWrapI18N: init at 0.06
perlPackages.Po4a: init at 0.47
jade: init at 1.2.1
ding-libs: init at 0.6.0

Switch nscd to no-caching mode if SSSD is enabled.

abbradar: disable jade parallel building.

Closes #21150
---
 nixos/modules/config/nsswitch.nix          |  8 +-
 nixos/modules/module-list.nix              |  1 +
 nixos/modules/security/pam.nix             | 21 ++++-
 nixos/modules/services/misc/nscd-sssd.conf | 36 ++++++++
 nixos/modules/services/misc/sssd.nix       | 97 ++++++++++++++++++++++
 nixos/modules/services/system/nscd.nix     | 13 +--
 pkgs/os-specific/linux/autofs/default.nix  |  9 +-
 pkgs/os-specific/linux/sssd/default.nix    | 87 +++++++++++++++++++
 pkgs/tools/misc/ding-libs/default.nix      | 27 ++++++
 pkgs/tools/text/sgml/jade/default.nix      | 38 +++++++++
 pkgs/top-level/all-packages.nix            |  9 ++
 pkgs/top-level/perl-packages.nix           | 44 ++++++++++
 12 files changed, 380 insertions(+), 10 deletions(-)
 create mode 100644 nixos/modules/services/misc/nscd-sssd.conf
 create mode 100644 nixos/modules/services/misc/sssd.nix
 create mode 100644 pkgs/os-specific/linux/sssd/default.nix
 create mode 100644 pkgs/tools/misc/ding-libs/default.nix
 create mode 100644 pkgs/tools/text/sgml/jade/default.nix

diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index 3f96cea2270..4e5de421d8a 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -9,6 +9,7 @@ let
   inherit (config.services.avahi) nssmdns;
   inherit (config.services.samba) nsswins;
   ldap = (config.users.ldap.enable && config.users.ldap.nsswitch);
+  sssd = config.services.sssd.enable;
 
   hostArray = [ "files" "mymachines" ]
     ++ optionals nssmdns [ "mdns_minimal [!UNAVAIL=return]" ]
@@ -18,12 +19,17 @@ let
     ++ ["myhostname" ];
 
   passwdArray = [ "files" ]
+    ++ optional sssd "sss"
     ++ optionals ldap [ "ldap" ]
     ++ [ "mymachines" ];
 
   shadowArray = [ "files" ]
+    ++ optional sssd "sss"
     ++ optionals ldap [ "ldap" ];
 
+  servicesArray = [ "files" ]
+    ++ optional sssd "sss";
+
 in {
   options = {
 
@@ -60,7 +66,7 @@ in {
       networks:  files
 
       ethers:    files
-      services:  files
+      services:  ${concatStringsSep " " servicesArray}
       protocols: files
       rpc:       files
     '';
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index be09fb80e0a..2171809e51b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -285,6 +285,7 @@
   ./services/misc/siproxd.nix
   ./services/misc/sonarr.nix
   ./services/misc/spice-vdagentd.nix
+  ./services/misc/sssd.nix
   ./services/misc/subsonic.nix
   ./services/misc/sundtek.nix
   ./services/misc/svnserve.nix
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index f9aa4136c8d..96e7c45d496 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -233,6 +233,8 @@ let
           account sufficient pam_unix.so
           ${optionalString use_ldap
               "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
+          ${optionalString config.services.sssd.enable
+              "account sufficient ${pkgs.sssd}/lib/security/pam_sss.so"}
           ${optionalString config.krb5.enable
               "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"}
 
@@ -273,6 +275,8 @@ let
               "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"}
           ${optionalString use_ldap
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"}
+          ${optionalString config.services.sssd.enable
+              "auth sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_first_pass"}
           ${optionalString config.krb5.enable ''
             auth [default=ignore success=1 service_err=reset] ${pam_krb5}/lib/security/pam_krb5.so use_first_pass
             auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass
@@ -288,6 +292,8 @@ let
               "password optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
           ${optionalString use_ldap
               "password sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
+          ${optionalString config.services.sssd.enable
+              "password sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_authtok"}
           ${optionalString config.krb5.enable
               "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"}
           ${optionalString config.services.samba.syncPasswordsByPam
@@ -303,13 +309,15 @@ let
                 if config.boot.isContainer then "optional" else "required"
               } pam_loginuid.so"}
           ${optionalString cfg.makeHomeDir
-              "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=/etc/skel umask=0022"}
+              "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0022"}
           ${optionalString cfg.updateWtmp
               "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"}
           ${optionalString config.security.pam.enableEcryptfs
               "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
           ${optionalString use_ldap
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
+          ${optionalString config.services.sssd.enable
+              "session optional ${pkgs.sssd}/lib/security/pam_sss.so"}
           ${optionalString config.krb5.enable
               "session optional ${pam_krb5}/lib/security/pam_krb5.so"}
           ${optionalString cfg.otpwAuth
@@ -397,6 +405,16 @@ in
         '';
     };
 
+    security.pam.makeHomeDir.skelDirectory = mkOption {
+      type = types.str;
+      default = "/var/empty";
+      example =  "/etc/skel";
+      description = ''
+        Path to skeleton directory whose contents are copied to home
+        directories newly created by <literal>pam_mkhomedir</literal>.
+      '';
+    };
+
     security.pam.enableSSHAgentAuth = mkOption {
       default = false;
       description =
@@ -447,6 +465,7 @@ in
       # Include the PAM modules in the system path mostly for the manpages.
       [ pkgs.pam ]
       ++ optional config.users.ldap.enable pam_ldap
+      ++ optional config.services.sssd.enable pkgs.sssd
       ++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
       ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]
       ++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ]
diff --git a/nixos/modules/services/misc/nscd-sssd.conf b/nixos/modules/services/misc/nscd-sssd.conf
new file mode 100644
index 00000000000..92380f3e4ba
--- /dev/null
+++ b/nixos/modules/services/misc/nscd-sssd.conf
@@ -0,0 +1,36 @@
+server-user             nscd
+threads                 1
+paranoia                no
+debug-level             0
+
+enable-cache            passwd          yes
+positive-time-to-live   passwd          0
+negative-time-to-live   passwd          0
+suggested-size          passwd          211
+check-files             passwd          yes
+persistent              passwd          no
+shared                  passwd          yes
+
+enable-cache            group           yes
+positive-time-to-live   group           0
+negative-time-to-live   group           0
+suggested-size          group           211
+check-files             group           yes
+persistent              group           no
+shared                  group           yes
+
+enable-cache            hosts           yes
+positive-time-to-live   hosts           600
+negative-time-to-live   hosts           5
+suggested-size          hosts           211
+check-files             hosts           yes
+persistent              hosts           no
+shared                  hosts           yes
+
+enable-cache            services        yes
+positive-time-to-live   services        0
+negative-time-to-live   services        0
+suggested-size          services        211
+check-files             services        yes
+persistent              services        no
+shared                  services        yes
diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix
new file mode 100644
index 00000000000..e818f4a4804
--- /dev/null
+++ b/nixos/modules/services/misc/sssd.nix
@@ -0,0 +1,97 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+  cfg = config.services.sssd;
+  nscd = config.services.nscd;
+in {
+  options = {
+    services.sssd = {
+      enable = mkEnableOption "the System Security Services Daemon.";
+
+      config = mkOption {
+        type = types.lines;
+        description = "Contents of <filename>sssd.conf</filename>.";
+        default = ''
+          [sssd]
+          config_file_version = 2
+          services = nss, pam
+          domains = shadowutils
+
+          [nss]
+
+          [pam]
+
+          [domain/shadowutils]
+          id_provider = proxy
+          proxy_lib_name = files
+          auth_provider = proxy
+          proxy_pam_target = sssd-shadowutils
+          proxy_fast_alias = True
+        '';
+      };
+
+      sshAuthorizedKeysIntegration = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to make sshd look up authorized keys from SSS.
+          For this to work, the <literal>ssh</literal> SSS service must be enabled in the sssd configuration.
+        '';
+      };
+    };
+  };
+  config = mkMerge [
+    (mkIf cfg.enable {
+      assertions = singleton {
+        assertion = nscd.enable;
+        message = "nscd must be enabled through `services.nscd.enable` for SSSD to work.";
+      };
+
+      systemd.services.sssd = {
+        description = "System Security Services Daemon";
+        wantedBy    = [ "multi-user.target" ];
+        before = [ "systemd-user-sessions.service" "nss-user-lookup.target" ];
+        after = [ "network-online.target" "nscd.service" ];
+        requires = [ "network-online.target" "nscd.service" ];
+        wants = [ "nss-user-lookup.target" ];
+        restartTriggers = [
+          config.environment.etc."nscd.conf".source
+          config.environment.etc."sssd/sssd.conf".source
+        ];
+        script = ''
+          export LDB_MODULES_PATH+="''${LDB_MODULES_PATH+:}${pkgs.ldb}/modules/ldb:${pkgs.sssd}/modules/ldb"
+          mkdir -p /var/lib/sss/{pubconf,db,mc,pipes,gpo_cache,secrets} /var/lib/sss/pipes/private /var/lib/sss/pubconf/krb5.include.d
+          ${pkgs.sssd}/bin/sssd -D
+        '';
+        serviceConfig = {
+          Type = "forking";
+          PIDFile = "/run/sssd.pid";
+        };
+      };
+
+      environment.etc."sssd/sssd.conf" = {
+        text = cfg.config;
+        mode = "0400";
+      };
+
+      system.nssModules = optional cfg.enable pkgs.sssd;
+      services.nscd.config = builtins.readFile ./nscd-sssd.conf;
+      services.dbus.packages = [ pkgs.sssd ];
+    })
+
+    (mkIf cfg.sshAuthorizedKeysIntegration {
+    # Ugly: sshd refuses to start if a store path is given because /nix/store is group-writable.
+    # So indirect by a symlink.
+    environment.etc."ssh/authorized_keys_command" = {
+      mode = "0755";
+      text = ''
+        #!/bin/sh
+        exec ${pkgs.sssd}/bin/sss_ssh_authorizedkeys "$@"
+      '';
+    };
+    services.openssh.extraConfig = ''
+      AuthorizedKeysCommand /etc/ssh/authorized_keys_command
+      AuthorizedKeysCommandUser nobody
+    '';
+  })];
+}
diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index d98ef8a306d..eb4b5281c7c 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -9,8 +9,6 @@ let
 
   inherit (lib) singleton;
 
-  cfgFile = pkgs.writeText "nscd.conf" cfg.config;
-
 in
 
 {
@@ -41,6 +39,7 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
+    environment.etc."nscd.conf".text = cfg.config;
 
     users.extraUsers.nscd =
       { isSystemUser = true;
@@ -61,10 +60,14 @@ in
             mkdir -m 0755 -p /var/db/nscd
           '';
 
-        restartTriggers = [ config.environment.etc.hosts.source config.environment.etc."nsswitch.conf".source ];
+        restartTriggers = [
+          config.environment.etc.hosts.source
+          config.environment.etc."nsswitch.conf".source
+          config.environment.etc."nscd.conf".source
+        ];
 
         serviceConfig =
-          { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd -f ${cfgFile}";
+          { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd";
             Type = "forking";
             PIDFile = "/run/nscd/nscd.pid";
             Restart = "always";
@@ -79,7 +82,7 @@ in
         # its pid. So wait until it's ready.
         postStart =
           ''
-            while ! ${pkgs.glibc.bin}/sbin/nscd -g -f ${cfgFile} > /dev/null; do
+            while ! ${pkgs.glibc.bin}/sbin/nscd -g > /dev/null; do
               sleep 0.2
             done
           '';
diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index 4401eb24cb4..d2d2c4a3988 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, utillinux, nfs-utils, e2fsprogs
-, libxml2 }:
+, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
 
 let
   version = "5.1.2";
@@ -13,7 +13,9 @@ in stdenv.mkDerivation {
   };
 
   preConfigure = ''
-    configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH"
+    configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH --with-openldap=${openldap} --with-sasl=${cyrus_sasl}"
+    export sssldir="${sssd}/lib/sssd/modules"
+    export HAVE_SSS_AUTOFS=1
 
     export MOUNT=${lib.getBin utillinux}/bin/mount
     export MOUNT_NFS=${lib.getBin nfs-utils}/bin/mount.nfs
@@ -29,7 +31,8 @@ in stdenv.mkDerivation {
     #make install SUBDIRS="samples" # impure!
   '';
 
-  buildInputs = [ linuxHeaders libtirpc libxml2 ];
+  buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd
+                  openssl cyrus_sasl ];
 
   nativeBuildInputs = [ flex bison ];
 
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
new file mode 100644
index 00000000000..d50848af3dc
--- /dev/null
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchurl, pkgs, lib, glibc, augeas, bind, c-ares,
+  cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, libnfsidmap, doxygen,
+  python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap,
+  pcre, kerberos, cifs_utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
+  docbook_xml_xslt, ldap, systemd, nspr, check, cmocka, uid_wrapper,
+  nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson }:
+
+let
+  name = "sssd-${version}";
+  version = "1.14.2";
+
+  docbookFiles = "${pkgs.docbook_xml_xslt}/share/xml/docbook-xsl/catalog.xml:${pkgs.docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml";
+in
+stdenv.mkDerivation {
+  inherit name;
+  inherit version;
+
+  src = fetchurl {
+    url = "https://fedorahosted.org/released/sssd/${name}.tar.gz";
+    sha1 = "167b2216c536035175ff041d0449e0a874c68601";
+  };
+
+  preConfigure = ''
+    export SGML_CATALOG_FILES="${docbookFiles}"
+    export PYTHONPATH=${ldap}/lib/python2.7/site-packages
+    export PATH=$PATH:${pkgs.openldap}/libexec
+    export CPATH=${pkgs.libxml2.dev}/include/libxml2
+
+    configureFlagsArray=(
+      --prefix=$out
+      --sysconfdir=/etc
+      --localstatedir=/var
+      --enable-pammoddir=$out/lib/security
+      --with-os=fedora
+      --with-pid-path=/run
+      --with-python2-bindings
+      --with-python3-bindings
+      --with-syslog=journald
+      --without-selinux
+      --without-semanage
+      --with-xml-catalog-path=''${SGML_CATALOG_FILES%%:*}
+      --with-ldb-lib-dir=$out/modules/ldb
+      --with-nscd=${glibc.bin}/sbin/nscd
+    )
+  '';
+
+  enableParallelBuilding = true;
+  buildInputs = [ augeas bind c-ares cyrus_sasl ding-libs libnl libunistring nss
+                  samba libnfsidmap doxygen python python3 popt
+                  talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos
+                  cifs_utils glib keyutils dbus fakeroot libxslt libxml2
+                  ldap systemd nspr check cmocka uid_wrapper
+                  nss_wrapper ncurses Po4a http-parser jansson ];
+
+  makeFlags = [
+    "SGML_CATALOG_FILES=${docbookFiles}"
+  ];
+
+  installFlags = [
+     "sysconfdir=$(out)/etc"
+     "localstatedir=$(out)/var"
+     "pidpath=$(out)/run"
+     "sss_statedir=$(out)/var/lib/sss"
+     "logpath=$(out)/var/log/sssd"
+     "pubconfpath=$(out)/var/lib/sss/pubconf"
+     "dbpath=$(out)/var/lib/sss/db"
+     "mcpath=$(out)/var/lib/sss/mc"
+     "pipepath=$(out)/var/lib/sss/pipes"
+     "gpocachepath=$(out)/var/lib/sss/gpo_cache"
+     "secdbpath=$(out)/var/lib/sss/secrets"
+     "initdir=$(out)/rc.d/init"
+  ];
+
+  postInstall = ''
+    rm -rf "$out"/run
+    rm -rf "$out"/rc.d
+    rm -f "$out"/modules/ldb/memberof.la
+    find "$out" -depth -type d -exec rmdir --ignore-fail-on-non-empty {} \;
+  '';
+
+  meta = with stdenv.lib; {
+    description = "System Security Services Daemon";
+    homepage = https://fedorahosted.org/sssd/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.e-user ];
+  };
+}
diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix
new file mode 100644
index 00000000000..547e3fb49eb
--- /dev/null
+++ b/pkgs/tools/misc/ding-libs/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, glibc, doxygen, check }:
+
+let
+  name = "ding-libs";
+  version = "0.6.0";
+in stdenv.mkDerivation {
+  inherit name;
+  inherit version;
+
+  src = fetchurl {
+    url = "https://fedorahosted.org/released/${name}/${name}-${version}.tar.gz";
+    sha1 = "c8ec86cb93a26e013a13b12a7b0b3fbc1bca16c1";
+  };
+
+  enableParallelBuilding = true;
+  buildInputs = [ glibc doxygen check ];
+
+  buildFlags = "docs";
+  doCheck = true;
+
+  meta = {
+    description = "'D is not GLib' utility libraries";
+    homepage = https://fedorahosted.org/sssd/;
+    maintainers = with stdenv.lib.maintainers; [ e-user ];
+    license = [ stdenv.lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ];
+  };
+}
diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix
new file mode 100644
index 00000000000..ffbf9784f80
--- /dev/null
+++ b/pkgs/tools/text/sgml/jade/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgs, gcc, gzip, gnum4 }:
+
+stdenv.mkDerivation (rec {
+  name = "jade";
+  version = "1.2.1";
+  debpatch = "47.3";
+
+  src = fetchurl {
+    url = "ftp://ftp.jclark.com/pub/${name}/${name}-${version}.tar.gz";
+    sha256 = "84e2f8a2a87aab44f86a46b71405d4f919b219e4c73e03a83ab6c746a674b187";
+  };
+
+  patchsrc =  fetchurl {
+    url = "http://ftp.debian.org/debian/pool/main/j/jade/jade_${version}-${debpatch}.diff.gz";
+    sha256 = "8e94486898e3503308805f856a65ba5b499a6f21994151270aa743de48305464";
+  };
+
+  patches = [ patchsrc ];
+
+  buildInputs = [ gcc gzip gnum4 ];
+
+  NIX_CFLAGS_COMPILE = [ "-Wno-deprecated" ];
+
+  preInstall = ''
+    install -d -m755 "$out"/lib
+  '';
+  
+  postInstall = ''
+    mv "$out/bin/sx" "$out/bin/sgml2xml"
+  '';
+
+  meta = {
+    description = "James Clark's DSSSL Engine";
+    license = "custom";
+    homepage = http://www.jclark.com/jade/;
+    maintainers = with stdenv.lib.maintainers; [ e-user ];
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfb2551e5a8..2bdabdff4dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2320,6 +2320,8 @@ in
 
   jaaa = callPackage ../applications/audio/jaaa { };
 
+  jade = callPackage ../tools/text/sgml/jade { };
+
   jd-gui = callPackage_i686 ../tools/security/jd-gui { };
 
   jdiskreport = callPackage ../tools/misc/jdiskreport { };
@@ -4171,6 +4173,13 @@ in
     openssl = null;
   };
 
+  ding-libs = callPackage ../tools/misc/ding-libs { };
+
+  sssd = callPackage ../os-specific/linux/sssd {
+    inherit (perlPackages) Po4a;
+    inherit (python27Packages) ldap;
+  };
+
   vtun = callPackage ../tools/networking/vtun { };
 
   wakatime = callPackage ../tools/misc/wakatime { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5bc0e81106b..b8c5e637870 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10394,6 +10394,34 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Po4a = buildPerlPackage rec {
+    name = "po4a-0.47";
+    src = fetchurl {
+      url = "https://alioth.debian.org/frs/download.php/file/4142/po4a-0.47.tar.gz";
+      sha256 = "5010e1b7df1115cbd475f46587fc05fefc97301f9bba0c2f15106005ca017507";
+    };
+    propagatedBuildInputs = [ pkgs.docbook_xml_xslt TextWrapI18N LocaleGettext TermReadKey SGMLSpm ModuleBuild UnicodeLineBreak ModuleBuild ];
+    buildInputs = [ pkgs.gettext pkgs.libxslt pkgs.glibcLocales pkgs.docbook_xml_dtd_412 pkgs.docbook_sgml_dtd_41 pkgs.texlive.combined.scheme-basic pkgs.jade ];
+    LC_ALL="en_US.UTF-8";
+    SGML_CATALOG_FILES = "${pkgs.docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml";
+    preConfigure = ''
+      touch Makefile.PL
+      export PERL_MB_OPT="--install_base=$out --prefix=$out"
+      substituteInPlace Po4aBuilder.pm --replace "\$self->install_sets(\$self->installdirs)->{'bindoc'}" "'$out/share/man/man1'"
+    '';
+    buildPhase = "perl Build.PL --install_base=$out; ./Build build";
+    installPhase = "./Build install";
+    checkPhase = ''
+      export SGML_CATALOG_FILES=${pkgs.docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat
+      ./Build test
+    '';
+    meta = {
+      homepage = https://po4a.alioth.debian.org/;
+      description = "tools for helping translation of documentation";
+      license = with stdenv.lib.licenses; [ gpl2 ];
+    };
+  };
+
   PPI = buildPerlPackage {
     name = "PPI-1.220";
     src = fetchurl {
@@ -13722,6 +13750,22 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TextWrapI18N = buildPerlPackage {
+    name = "Text-WrapI18N-0.06";
+    src = fetchurl {
+      url = http://search.cpan.org/CPAN/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz;
+      sha256 = "4bd29a17f0c2c792d12c1005b3c276f2ab0fae39c00859ae1741d7941846a488";
+    };
+    propagatedBuildInputs = [ pkgs.glibc TextCharWidth ];
+    preConfigure = ''
+      substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${pkgs.glibc}/bin/locale'
+    '';
+    meta = {
+      description = "Line wrapping module with support for multibyte, fullwidth, and combining characters and languages without whitespaces between words";
+      license = with stdenv.lib.licenses; [ artistic1 gpl2 ];
+    };
+  };
+
   TextWrapper = buildPerlPackage {
     name = "Text-Wrapper-1.05";
     src = fetchurl {

From 19f3e8cecc9a22639ffd32d60547886138a032ff Mon Sep 17 00:00:00 2001
From: "Andrew R. M" <andrewmiller237@gmail.com>
Date: Tue, 3 Jan 2017 19:45:11 -0500
Subject: [PATCH 0532/1310] pythonPackages.nose-cprof: 0.1-0 -> 0.1.4

Updated nose-cprof and enabled python 3 package
---
 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 dee76b8bf29..a0141729e30 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15857,12 +15857,12 @@ in {
   };
 
   nose-cprof = buildPythonPackage rec {
-    name = "nose-cprof-0.1-0";
-    disabled = isPy3k;
+    name = "nose-cprof-${version}";
+    version = "0.1.4";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/nose-cprof/${name}.tar.gz";
-      sha256 = "d1edd5cb3139e897752294d2968bfb066abdd754743fa416e024e5c688893344";
+      sha256 = "0ayy5mbjly9aa9dkgpz0l06flspnxmnj6wxdl6zr59byrrr8fqhw";
     };
 
     meta = {

From e0878ce3163272f097b14f36dd61adca18257799 Mon Sep 17 00:00:00 2001
From: Maurizio Di Pietro <dc1mdp@gmail.com>
Date: Mon, 2 Jan 2017 17:22:01 +0100
Subject: [PATCH 0533/1310] chase: init at 0.5.2

---
 lib/maintainers.nix                 |  1 +
 pkgs/tools/system/chase/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/system/chase/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9fc127bf526..843ebb0f872 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -286,6 +286,7 @@
   mboes = "Mathieu Boespflug <mboes@tweag.net>";
   mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>";
   mdaiter = "Matthew S. Daiter <mdaiter8121@gmail.com>";
+  mdipietro = "Maurizio Di Pietro <dc1mdp@gmail.com>";
   meditans = "Carlo Nucera <meditans@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
   mguentner = "Maximilian Güntner <code@klandest.in>";
diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix
new file mode 100644
index 00000000000..ddaf872fe9f
--- /dev/null
+++ b/pkgs/tools/system/chase/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }:
+
+stdenv.mkDerivation rec {
+  name = "chase-0.5.2";
+
+  buildInputs = [ pkgconfig libatomic_ops boehmgc ] ;
+  src = fetchurl {
+    url = "mirror://debian/pool/main/c/chase/${name}.orig.tar.gz";
+    sha256 = "68d95c2d4dc45553b75790fcea4413b7204a2618dff148116ca9bdb0310d737f";
+  };
+
+  doCheck = true;
+  makeFlags = [ "-e" ];
+  makeFlagsArray="LIBS=-lgc";
+
+  meta = {
+    description = "Follow a symlink and print out its target file";
+    longDescription = ''
+    A commandline program that chases symbolic filesystems links to the original file
+    '';
+    homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org";
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.mdipietro ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bdabdff4dd..bac3a556b6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4378,6 +4378,8 @@ in
 
   which = callPackage ../tools/system/which { };
 
+  chase = callPackage ../tools/system/chase { };
+
   wicd = callPackage ../tools/networking/wicd { };
 
   wipe = callPackage ../tools/security/wipe { };

From fa89f84c546b2f7e669cacb4e457e2460a487e0a Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 3 Jan 2017 20:39:20 -0500
Subject: [PATCH 0534/1310] maintainers: rename mdipietro to polyrod to match
 their github name

---
 lib/maintainers.nix                 | 2 +-
 pkgs/tools/system/chase/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 843ebb0f872..4cbedd7be03 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -286,7 +286,6 @@
   mboes = "Mathieu Boespflug <mboes@tweag.net>";
   mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>";
   mdaiter = "Matthew S. Daiter <mdaiter8121@gmail.com>";
-  mdipietro = "Maurizio Di Pietro <dc1mdp@gmail.com>";
   meditans = "Carlo Nucera <meditans@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
   mguentner = "Maximilian Güntner <code@klandest.in>";
@@ -369,6 +368,7 @@
   plcplc = "Philip Lykke Carlsen <plcplc@gmail.com>";
   pmahoney = "Patrick Mahoney <pat@polycrystal.org>";
   pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>";
+  polyrod = "Maurizio Di Pietro <dc1mdp@gmail.com>";
   prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>";
   primeos = "Michael Weiss <dev.primeos@gmail.com>";
   profpatsch = "Profpatsch <mail@profpatsch.de>";
diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix
index ddaf872fe9f..8a435170716 100644
--- a/pkgs/tools/system/chase/default.nix
+++ b/pkgs/tools/system/chase/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.mdipietro ];
+    maintainers = [ stdenv.lib.maintainers.polyrod ];
     platforms = stdenv.lib.platforms.all;
   };
 }

From c7ba4643a963999cb63e6d7835fdabf71d3e95a1 Mon Sep 17 00:00:00 2001
From: Connor Clark <connor@awakenetworks.com>
Date: Tue, 3 Jan 2017 18:54:13 -0800
Subject: [PATCH 0535/1310] nix-prefetch-git: remove call to non-existent
 print_metadata command; improve hash mismatch error message.

---
 pkgs/build-support/fetchgit/nix-prefetch-git | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index f71d9ac55bc..3d656eba5ff 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -406,8 +406,7 @@ else
         finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpFile")
 
         if test -n "$expHash" -a "$expHash" != "$hash"; then
-            print_metadata
-            echo "hash mismatch for URL \`$url'" >&2
+            echo "hash mismatch for URL \`$url'. Got \`$hash'; expected \`$expHash'." >&2
             exit 1
         fi
     fi

From 1dc199d9cf48a1c1295021bc8b127a982dd2174e Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Tue, 3 Jan 2017 01:41:23 -0500
Subject: [PATCH 0536/1310] stellar-core: init at 0.5.1

---
 pkgs/applications/altcoins/default.nix        |  2 +
 .../altcoins/stellar-core-dirty-version.patch | 15 ++++++
 pkgs/applications/altcoins/stellar-core.nix   | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 65 insertions(+)
 create mode 100644 pkgs/applications/altcoins/stellar-core-dirty-version.patch
 create mode 100644 pkgs/applications/altcoins/stellar-core.nix

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 0d2e656bae2..1d9b897188d 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -32,4 +32,6 @@ rec {
   primecoin  = callPackage ./primecoin.nix { withGui = true; };
   primecoind = callPackage ./primecoin.nix { withGui = false; };
 
+  stellar-core = callPackage ./stellar-core.nix { };
+
 }
diff --git a/pkgs/applications/altcoins/stellar-core-dirty-version.patch b/pkgs/applications/altcoins/stellar-core-dirty-version.patch
new file mode 100644
index 00000000000..57d66ce5919
--- /dev/null
+++ b/pkgs/applications/altcoins/stellar-core-dirty-version.patch
@@ -0,0 +1,15 @@
+Subject: Prevent "-dirty" from being erroneously added to the version
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d36d1a3..00048fc 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -28,7 +28,7 @@ always:
+ # Always rebuild because .git/HEAD is a symbolic ref one can't depend on
+ StellarCoreVersion.h: always
+ 	@vers=$$(cd "$(srcdir)" \
+-		&& git describe --always --dirty --tags 2>/dev/null \
++		&& git describe --always --tags 2>/dev/null \
+ 		|| echo "$(PACKAGE) $(VERSION)"); \
+ 	    echo "#define STELLAR_CORE_VERSION \"$$vers\"" > $@~
+ 	@if cmp -s $@~ $@; then rm -f $@~; else \
diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix
new file mode 100644
index 00000000000..8d365590147
--- /dev/null
+++ b/pkgs/applications/altcoins/stellar-core.nix
@@ -0,0 +1,46 @@
+{ stdenv, lib, fetchgit, autoconf, libtool, automake, pkgconfig, git
+, bison, flex, postgresql }:
+
+let
+  pname = "stellar-core";
+  version = "0.5.1";
+
+in stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/stellar/stellar-core.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "0ldw3qr0sajgam38z2w2iym0214ial6iahbzx3b965cw92n8n88z";
+    fetchSubmodules = true;
+    leaveDotGit = true;
+  };
+
+  buildInputs = [ autoconf automake libtool pkgconfig git ];
+
+  propagatedBuildInputs = [ bison flex postgresql ];
+
+  patches = [ ./stellar-core-dirty-version.patch ];
+
+  preConfigure = ''
+    # Everything needs to be staged in git because the build uses
+    # `git ls-files` to search for source files to compile.
+    git add .
+
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Implements the Stellar Consensus Protocol, a federated consensus protocol";
+    longDescription = ''
+      Stellar-core is the backbone of the Stellar network. It maintains a
+      local copy of the ledger, communicating and staying in sync with other
+      instances of stellar-core on the network. Optionally, stellar-core can
+      store historical records of the ledger and participate in consensus.
+    '';
+    homepage = https://www.stellar.org/;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ chris-martin ];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63cce742d7b..5c0cfd760ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12324,6 +12324,8 @@ in
   go-ethereum = self.altcoins.go-ethereum;
   ethabi = self.altcoins.ethabi;
 
+  stellar-core = self.altcoins.stellar-core;
+
   aumix = callPackage ../applications/audio/aumix {
     gtkGUI = false;
   };

From 2f23d603232834dbe6d15bd8e897477d62ded25e Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 4 Jan 2017 04:59:06 +0000
Subject: [PATCH 0537/1310] sherpa: fix sqlite dependency

---
 pkgs/applications/science/physics/sherpa/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix
index d863964ad90..c674c0cbb2f 100644
--- a/pkgs/applications/science/physics/sherpa/default.nix
+++ b/pkgs/applications/science/physics/sherpa/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  configureFlags = "--with-sqlite3=${sqlite.dev}";
+
   meta = {
     description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions";
     license     = stdenv.lib.licenses.gpl2;

From 6afd5fbbb7abe40033d9f89ae5f912d45b6e3e85 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Wed, 4 Jan 2017 03:28:14 -0500
Subject: [PATCH 0538/1310] insync: init at 1.3.13.36129

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

diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
new file mode 100644
index 00000000000..a0b727a97f8
--- /dev/null
+++ b/pkgs/applications/networking/insync/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "insync-${version}";
+  version = "1.3.13.36129";
+  src = fetchurl {
+    url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2";
+    sha256 = "18d8ww529nvhwcl5k31qmkzb83k9753ics0dw64w202r8vwbm3cd";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  postPatch = ''
+    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" client/insync-portable
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a client $out/client
+    makeWrapper $out/client/insync-portable $out/bin/insync --set LC_TIME C
+  '';
+
+  meta = {
+    platforms = ["x86_64-linux"];
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [ stdenv.lib.maintainers.benley ];
+    homepage = https://www.insynchq.com;
+    description = "Google Drive sync and backup with multiple account support";
+    longDescription = ''
+     Insync is a commercial application that syncs your Drive files to your
+     computer.  It has more advanced features than Google's official client
+     such as multiple account support, Google Doc conversion, symlink support,
+     and built in sharing.
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c247b5dddf..ae53b9a2844 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14892,6 +14892,8 @@ in
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
 
+  insync = callPackage ../applications/networking/insync { };
+
   lightdm = qt5.callPackage ../applications/display-managers/lightdm {
     qt4 = null;
     withQt5 = false;

From 2c8841427403382863e011e2cadfa31b84e7c9fa Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 4 Jan 2017 05:19:04 +0100
Subject: [PATCH 0539/1310] vimPlugins: update to latest

---
 pkgs/misc/vim-plugins/default.nix | 468 +++++++++++++++---------------
 1 file changed, 235 insertions(+), 233 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index b277f9268bc..2f792767ccb 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -145,11 +145,11 @@ rec {
   };
 
   Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Hoogle-2015-12-24";
+    name = "Hoogle-2016-11-29";
     src = fetchgit {
       url = "git://github.com/Twinside/vim-hoogle";
-      rev = "a5db36f048ac16ab9774fc86f36cd4ae9a444932";
-      sha256 = "1855n6dsimbc0brfbmmkx1gszhmgfghm1h1mpi95mq9qzbwkgjri";
+      rev = "9f00214ece60b9514ef2911fb62e7d53c52d3b4c";
+      sha256 = "1yh732s9k3lhsdqz8qfqijvl0za7cl9mndbzqh4dg2g14f5f5qqw";
     };
     dependencies = [];
 
@@ -167,22 +167,22 @@ rec {
   };
 
   Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Supertab-2016-01-03";
+    name = "Supertab-2016-11-27";
     src = fetchgit {
       url = "git://github.com/ervandew/supertab";
-      rev = "66511772a430a5eaad7f7d03dbb02e8f33c4a641";
-      sha256 = "1kxxgplsc40wyl7yj3dpcjjgysd41cd32ppcpnj5knphpjw7abp4";
+      rev = "cdaa5c27c5a7f8b08a43d0b2e65929512299e33a";
+      sha256 = "0hym28chljfglqdrxajbh92r35cppxl5wyxdrgqwpa0am9d2xdvg";
     };
     dependencies = [];
 
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2016-10-30";
+    name = "Syntastic-2016-12-23";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "734fde7f0b84ff3f670ab5772ed1b8b0c8c16770";
-      sha256 = "18nw0zw8h537d189n0z244fllbyyb9fw47brnmsw82w90b771723";
+      rev = "78c0d21a9b0329766732ca2743a848af1c49e791";
+      sha256 = "1n744grp4ajn4zfra5kfg97sj8rjkqcw1sgx2jbj5qq8l3p5ghad";
     };
     dependencies = [];
 
@@ -200,44 +200,44 @@ rec {
   };
 
   Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2016-11-07";
+    name = "Tagbar-2017-01-03";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "01f57ac5643b0365021ab891f78519d849867a5e";
-      sha256 = "0k0006r895m19kpwqy1ibiia5qm47v4h3mgrlr349wlzqibhmws1";
+      rev = "18b536ce43f1be88be380e5f3b7cd0fd930b4908";
+      sha256 = "0k4c5f3qvszn3a9ndkcl984w832vk2g4hfwl4nkvy9bwqg7q89ya";
     };
     dependencies = [];
 
   };
 
   The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2016-10-10";
+    name = "The_NERD_Commenter-2016-12-15";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "97cb982f1f0d0631b34b71b065e162916bee4036";
-      sha256 = "136nirs1zi0pjz06yyw2q72ypwmmj25fkl9fjaqgc5q472d77d0v";
+      rev = "18cfe815501c8264844223a944eb388285b48caa";
+      sha256 = "05dg5v1pal5ly8shc4rlnqip5zsdx9901h4336a2k81lss269wd4";
     };
     dependencies = [];
 
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2016-10-21";
+    name = "The_NERD_tree-2017-01-02";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "eee431dbd44111c858c6d33ffd366cae1f17f8b3";
-      sha256 = "1fyz3fp2v77piydadcg47pbb7dds9b015kj1baqaxr4gn2gfwq7f";
+      rev = "281701021c5001332a862da80175bf585d24e2e8";
+      sha256 = "0fp2rfz6rmaj01w5kifqzdyi934j20pa8bpgw13ks1s0s4x7xkck";
     };
     dependencies = [];
 
   };
 
   UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2016-10-24";
+    name = "UltiSnips-2016-12-16";
     src = fetchgit {
       url = "git://github.com/SirVer/ultisnips";
-      rev = "71c39721de9cb2d67478e8b8c1a543e006fb67df";
-      sha256 = "13lm1fb007ny70pxsvc5wf9s0n90lvimya1n2nn2pyxsnwm416fw";
+      rev = "f974e0317f549c7cf54fa231ee0501206aed6882";
+      sha256 = "0kvpgdkfc70phj2zf6lcblxb25hliiaz2cwg61bq7ip06sbk0fq0";
     };
     dependencies = [];
 
@@ -292,17 +292,6 @@ rec {
 
   };
 
-  ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-py-matcher-2016-09-02";
-    src = fetchgit {
-      url = "git://github.com/FelikZ/ctrlp-py-matcher";
-      rev = "3624f3a085681f787f1f9b7a8a24d4bed395acf1";
-      sha256 = "1126gphnhfvba5xzvqj4s582k61xsvi5hn86zag42v14v5csgw9d";
-    };
-    dependencies = [];
-
-  };
-
   ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "ctrlp-cmatcher-2015-10-15";
     src = fetchgit {
@@ -318,6 +307,17 @@ rec {
     '';
   };
 
+  ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ctrlp-py-matcher-2016-09-02";
+    src = fetchgit {
+      url = "git://github.com/FelikZ/ctrlp-py-matcher";
+      rev = "3624f3a085681f787f1f9b7a8a24d4bed395acf1";
+      sha256 = "1126gphnhfvba5xzvqj4s582k61xsvi5hn86zag42v14v5csgw9d";
+    };
+    dependencies = [];
+
+  };
+
   ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "ctrlp-z-2015-10-17";
     src = fetchgit {
@@ -341,11 +341,11 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2016-11-05";
+    name = "fugitive-2016-11-13";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "b3a8be6975dcc27b523b030bf5d35d9c737aef18";
-      sha256 = "1qizj0xmpaj32b9f8p2d76s5rsvm8cxv0rh5yiczlgfvflbi587r";
+      rev = "b754bc2031f21a532c083dd0d072ba373bbe3a37";
+      sha256 = "1sig8dl3m1dw5zjxdsp00n1cacmcwdvas3iz04zk88v6xsm8rj22";
     };
     dependencies = [];
 
@@ -374,11 +374,11 @@ rec {
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2016-11-02";
+    name = "vim-autoformat-2016-12-13";
     src = fetchgit {
       url = "git://github.com/Chiel92/vim-autoformat";
-      rev = "15ee797ad37093e9841b41c121c8d93cf1dedf93";
-      sha256 = "10alg9a8mhasqp26mg7xlran1x474ip3k03s2sjhlvizy6mv5rba";
+      rev = "3715e166a5aa006353ca5bfad2386767676fe848";
+      sha256 = "0ki41pdrl5y4fry3xqn4sdx48zvvd3gc59qzs1nssvn9zp0k9il5";
     };
     dependencies = [];
 
@@ -396,11 +396,11 @@ rec {
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2016-11-04";
+    name = "deoplete-nvim-2017-01-04";
     src = fetchgit {
       url = "git://github.com/Shougo/deoplete.nvim";
-      rev = "5fc5ed772de138439322d728b103a7cb225cbf82";
-      sha256 = "1nn9k9rk6m3x48mm6mlji374vkrgwz1rf3pp8smd1hj30dy0njfk";
+      rev = "90569837af21ad0438448582b34d8418b745ffeb";
+      sha256 = "1qkzvgvjg397zaj1i56ld9i0gf2w9y5x2if5gbmag56nhxcwfw32";
     };
     dependencies = [];
 
@@ -440,11 +440,11 @@ rec {
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2016-11-08";
+    name = "clighter8-2017-01-03";
     src = fetchgit {
       url = "git://github.com/bbchung/clighter8";
-      rev = "a264494b6dd3e7636fa31b8aee9b3a42a635a69f";
-      sha256 = "1dg22yfr0za7milqzm7xywa6j9dfs2kvkjlwa046jjkjaqzlfx48";
+      rev = "89d70129ab5437c749041094fa71da97c95bda3f";
+      sha256 = "147i6rhz6ri86k6p0sim72vpsc5f6y8dvwxn7am6vyi21avy4zrz";
     };
     dependencies = [];
     preFixup = ''
@@ -454,11 +454,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2016-11-04";
+    name = "neomake-2017-01-04";
     src = fetchgit {
       url = "git://github.com/benekastah/neomake";
-      rev = "0c8795de4519600c204227fdf86c83ca499db783";
-      sha256 = "0vif3jxrxpq8imnhbkl82fb7vvfi4illxxm6drl6wd5wijfwq39k";
+      rev = "9794f6caef063ba1283bb728ac3befda477935f3";
+      sha256 = "11rpc98nv9viyv82j5y4l29jc62bmd2rddp90a6740p8dx5gvx5q";
     };
     dependencies = [];
 
@@ -487,22 +487,22 @@ rec {
   };
 
   spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "spacevim-2016-10-25";
+    name = "spacevim-2016-12-02";
     src = fetchgit {
       url = "git://github.com/ctjhoa/spacevim";
-      rev = "51d936482ce0710f6211aefca45cd33ab59d8444";
-      sha256 = "156sc8ynj1mg75i7n3dpm5nqlwcw727m41jw32fm3pahr3yq3ydq";
+      rev = "9bb2a04b14964a7db1d4131e1af1ed8bd31e910b";
+      sha256 = "0hq6g8czi73hgpkpigi177kp49dslh8xny3j7wjl03bjxsq9fkmk";
     };
     dependencies = [];
 
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2016-11-07";
+    name = "ctrlp-vim-2016-11-29";
     src = fetchgit {
       url = "git://github.com/ctrlpvim/ctrlp.vim";
-      rev = "88b61e77a285d10d0163bd383d3bb2909ea2ddca";
-      sha256 = "0zb5hcsbgvbsp5h0alkqyqbikzicl29mraw787p2chbps10n1qjw";
+      rev = "2868678a987834563bbc384763135462c2423eb8";
+      sha256 = "0s98nqj22i4x79mqspjkz6b6rpg8hf79iblv4md2ivzlj7ffccx3";
     };
     dependencies = [];
 
@@ -519,16 +519,6 @@ rec {
 
   };
 
-  dracula = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "dracula-2016-09-21";
-    src = fetchgit {
-      url = "git://github.com/dracula/vim";
-      rev = "926dfbab01128322f6326bdd10de2856b1fa3232";
-      sha256 = "1kqd367qa2dnz3qf10lyw7hacahylc94axc6f6f5nw4cklm1g8yv";
-    };
-    dependencies = [];
-  };
-
   vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jade-2016-10-31";
     src = fetchgit {
@@ -540,6 +530,17 @@ rec {
 
   };
 
+  dracula = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "dracula-2016-09-21";
+    src = fetchgit {
+      url = "git://github.com/dracula/vim";
+      rev = "926dfbab01128322f6326bdd10de2856b1fa3232";
+      sha256 = "1kqd367qa2dnz3qf10lyw7hacahylc94axc6f6f5nw4cklm1g8yv";
+    };
+    dependencies = [];
+
+  };
+
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neco-ghc-2016-07-01";
     src = fetchgit {
@@ -574,22 +575,22 @@ rec {
   };
 
   elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "elm-vim-2016-10-02";
+    name = "elm-vim-2016-11-26";
     src = fetchgit {
       url = "git://github.com/elmcast/elm-vim";
-      rev = "7760aed9f258cf6a7d2c56d547dd3ea45f832025";
-      sha256 = "1f1z2929aka2shkwb8z2ky26cvw2cgx7wdcikw9mljpgc1s7nl5d";
+      rev = "16a9a380a514e23c02d4bd7374112aa2dac1f3a4";
+      sha256 = "1mjccw7yx8hrn4vriickzag9z5g3xzqd6qh6w3xkw0nfh8mx2sgn";
     };
     dependencies = [];
 
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2016-10-07";
+    name = "vim-localvimrc-2016-11-08";
     src = fetchgit {
       url = "git://github.com/embear/vim-localvimrc";
-      rev = "f0c9b8d0b6f0d4c83d9dba5137772bd6c97afb4e";
-      sha256 = "02dzh8gckbpdifh7nmfzwn6qs3swjm783ld4h7dl1ky6xq4f06mv";
+      rev = "9f6de2ddfea2a397bc3e5335779bc93a8260ff99";
+      sha256 = "0ks8x7zjqnbm06y3niidj9h0ccqky29b2vpdkvs1vwnli10bg6sh";
     };
     dependencies = [];
 
@@ -618,11 +619,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2016-10-23";
+    name = "vim-go-2017-01-01";
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
-      rev = "10c805b83f160eb9e7f9cbe00d26c1b6d06ba636";
-      sha256 = "0316kzmwb2p91rwz31ddr7r5bd52aa7jxzkb3vdhdb7f3bmcwx3q";
+      rev = "d7c628ff228c2e6a4d4d5808f198471a775cf8b5";
+      sha256 = "1375qz8id08d10p6i7ppvk3khq778996bx1n7qarz6vx6kb19zcn";
     };
     dependencies = [];
 
@@ -651,22 +652,33 @@ rec {
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2016-11-05";
+    name = "psc-ide-vim-2016-11-29";
     src = fetchgit {
       url = "git://github.com/frigoeu/psc-ide-vim";
-      rev = "bb7f0ef6620899cb6256e3ee5956d3b30769488b";
-      sha256 = "1x47phq0shap338as120vf0srl69fas11kggzsxjg1dxblg69iww";
+      rev = "640842ac8786098fc74fce4737734c97a7629591";
+      sha256 = "0mwqkgqlglcnv1k7k5lmibc7piwkd79j96vgv52ya31hg50vkrin";
     };
     dependencies = [];
 
   };
 
   vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsonnet-2016-10-11";
+    name = "vim-jsonnet-2016-12-16";
     src = fetchgit {
       url = "git://github.com/google/vim-jsonnet";
-      rev = "bf1997a5607912cc121fe617a6fef76d3d872aa4";
-      sha256 = "04vgbzknz7x6r8gwvlajjqd653fvv1x4szib00bnzw87vsagdiiy";
+      rev = "ff255a3ac45dcd8bcda04728a8140243adde9c57";
+      sha256 = "16ica7n8dcb3kq40dx3sd8lwvdrz7bzks1cranw2vxh4riv1i251";
+    };
+    dependencies = [];
+
+  };
+
+  vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-jsdoc-2016-10-30";
+    src = fetchgit {
+      url = "git://github.com/heavenshell/vim-jsdoc";
+      rev = "45c7c7cef440a29f7bf24436640413e3d5d578ff";
+      sha256 = "0kr4p01pyrz9w7yfh50gsz6n60qvnqxsr1055hvsyx36nzw6l3za";
     };
     dependencies = [];
 
@@ -695,33 +707,33 @@ rec {
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2016-11-06";
+    name = "calendar-vim-2016-12-06";
     src = fetchgit {
       url = "git://github.com/itchyny/calendar.vim";
-      rev = "ca4b4b2ed364831ba27d50f17b44d1e9506715ef";
-      sha256 = "1i2ywg0h3rb6f05k7ahng9bvjg7hxqdg1nzcijs5m6kxkn8kjj2k";
+      rev = "6cf60f08a42c8b22ea3ae191a89e1faa4fdd3dae";
+      sha256 = "172xgsmzwpy890bg813d89wz210lfdhckvispdl45l15armdy99y";
     };
     dependencies = [];
 
   };
 
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2016-11-06";
+    name = "lightline-vim-2016-12-03";
     src = fetchgit {
       url = "git://github.com/itchyny/lightline.vim";
-      rev = "836d4c84f76e7066bcfa4c6c60449714cf2b2c45";
-      sha256 = "0qdhpwr4iyifmk0l463s4k5nm8k744ycvxmxgz3s38vkn8q5y06w";
+      rev = "059888ab650fa192dd441e52bd9f41f08b247529";
+      sha256 = "1pa627jjmrhlfbd8yms8lvfgnm0gj9xkr29jkq122icfl6hv3fwx";
     };
     dependencies = [];
 
   };
 
   thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "thumbnail-vim-2016-09-06";
+    name = "thumbnail-vim-2016-12-25";
     src = fetchgit {
       url = "git://github.com/itchyny/thumbnail.vim";
-      rev = "d697fb7a73a53275390c20040faab87b54f12f84";
-      sha256 = "112hkblw30ym7bpv8454fylalv9kn0l3268gpkh9a5qdr2kf99b1";
+      rev = "f911ebd0dfe08dd83a55dd0d0e4804195079b13c";
+      sha256 = "1pa0c34v2mah97i41hg1vyppf44sfmvdpji30bq54yv7gza36plz";
     };
     dependencies = [];
 
@@ -750,11 +762,11 @@ rec {
   };
 
   vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-orgmode-2016-11-03";
+    name = "vim-orgmode-2016-11-12";
     src = fetchgit {
       url = "git://github.com/jceb/vim-orgmode";
-      rev = "304fd3ced3b929a8507e460b99b0bf4e6a9b3c7d";
-      sha256 = "13r4mnqng5hsiarqdrr3vqa4frf6jlwlaxpl72czvpyrvd4mvc2m";
+      rev = "67a693c37bac75ba163d35b9972efd0c7e0deb71";
+      sha256 = "1rdcyfdyq4lbfh9ya63kf05aqcr9g6q7r4ngzn1fgy7pmqdpk7vf";
     };
     dependencies = [];
 
@@ -783,11 +795,11 @@ rec {
   };
 
   auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "auto-pairs-2016-07-17";
+    name = "auto-pairs-2016-11-21";
     src = fetchgit {
       url = "git://github.com/jiangmiao/auto-pairs";
-      rev = "1b3a1efb078fdf74d4013308b63de57dfda0cc8e";
-      sha256 = "1g5gb9xvc9xw3rxg8p4w3qcsdl3xfpi5ax380916aq237kmrnzdk";
+      rev = "84518168107c34fb540ee4f8cde743ceaf682bae";
+      sha256 = "104mahfn956vb98psfml0b4x1yhwn8w6af3hkym3fdxy4ksh4fj4";
     };
     dependencies = [];
 
@@ -838,11 +850,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2016-10-29";
+    name = "fzf-vim-2016-12-25";
     src = fetchgit {
       url = "git://github.com/junegunn/fzf.vim";
-      rev = "0bc9b231fbab6749f18f2f34cc21c649b9a7d3ed";
-      sha256 = "1gpy744qd7hch1ab7kfzz1njg74hasvh53w7kbm7ni5sw7pn5w64";
+      rev = "2066643243eddf2ed1f5d3a1a5485d6ff71851a4";
+      sha256 = "0svw41n4x1j7s9l7qh5s0mk2s5ibdfq4pzdiknvfb342na6xi2b5";
     };
     dependencies = [];
 
@@ -871,11 +883,11 @@ rec {
   };
 
   vim-eighties = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-eighties-2015-11-02";
+    name = "vim-eighties-2016-12-15";
     src = fetchgit {
       url = "git://github.com/justincampbell/vim-eighties";
-      rev = "62a9719df45fddd0456bf47420fc4768f9c8f5a5";
-      sha256 = "1ada7f2lhdwjqmy5kxma69s215z4phi4khh8hsy5qd6k3a4bvyrs";
+      rev = "1a6ea42ead1e31524ec94cfefb6afc1d8dacd170";
+      sha256 = "1yh1kny28c7f5qm52y7xd5aj4mycksfb0x1zvcb37c73ycdxc1v2";
     };
     dependencies = [];
 
@@ -893,33 +905,33 @@ rec {
   };
 
   vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jinja-2016-05-20";
+    name = "vim-jinja-2016-11-16";
     src = fetchgit {
       url = "git://github.com/lepture/vim-jinja";
-      rev = "0bcc2993ef13bacd4bf1a0d91eb17652f7aedb86";
-      sha256 = "1wypg9rf7q65g6l3ajp75gdb4cd7spckzd4b7ccg8c47vd937dcj";
+      rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6";
+      sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q";
     };
     dependencies = [];
 
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2016-11-04";
+    name = "vimtex-2017-01-03";
     src = fetchgit {
       url = "git://github.com/lervag/vimtex";
-      rev = "fa1adca64aea62d512bbc9e0b0f4b88ac8667ed4";
-      sha256 = "0gnz4jh5gagnk06jndmxqmjhymbnpjz18wx5i071q7imkv0420s4";
+      rev = "4c76e8f74025c6c753167f23a6be0bcfc1e39af7";
+      sha256 = "1syl4wyffn59i43q6kcy3hz5kzwmp0wj4xmwsahg81fxq4wzdz3n";
     };
     dependencies = [];
 
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2016-10-19";
+    name = "vim-easymotion-2016-12-25";
     src = fetchgit {
       url = "git://github.com/lokaltog/vim-easymotion";
-      rev = "11632455de8caa40f264501df8f0a3e249cf0595";
-      sha256 = "1lmmahpsghfqnri7wi2i9370q4dfzpdbafabi97vfxyyclxj4bz9";
+      rev = "af9786ee5780bf0cbafbd7b341c2b5234d18c1c0";
+      sha256 = "0f9xc6wz53msq03qivbmqfcfjncba0mrcl4x8vdkzr4chi0yxvbd";
     };
     dependencies = [];
 
@@ -952,11 +964,11 @@ rec {
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2016-10-31";
+    name = "vim-startify-2017-01-02";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-startify";
-      rev = "9732427469c6933cbedeb7e662c70a2aaf4e63d2";
-      sha256 = "022ibyqq140130x8c2901sskh03q516ghnc25i41qv6b2hcsq1ad";
+      rev = "c26fcfcd17cfa64e051c8aa97f78894d91a21604";
+      sha256 = "0rcvh612qvcsbf0bagq44dk2hbarhcc2v9a8n7lc5f7rsgdhxp7w";
     };
     dependencies = [];
 
@@ -1007,16 +1019,38 @@ rec {
   };
 
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2016-11-05";
+    name = "haskell-vim-2016-12-29";
     src = fetchgit {
       url = "git://github.com/neovimhaskell/haskell-vim";
-      rev = "cf2f339d2b551547d4f5a365db17f0f12b99a0c0";
-      sha256 = "1zdq7rc7bklz88df2cwgw7n43z0mn4fylx7gyfmi8sfm1bx5avnj";
+      rev = "434f5903556e2bea99d433d48adb681cb4967d27";
+      sha256 = "0lwclld3yqh4mf0bqqaxvqsfqsjq8q5pl27q1byqrr9x3ngjx5zz";
     };
     dependencies = [];
 
   };
 
+  cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "cpsm-2016-09-21";
+    src = fetchgit {
+      url = "git://github.com/nixprime/cpsm";
+      rev = "565ab53a66fa52c46d80adf6981b07f4bdffcb1d";
+      sha256 = "125gcnqrg2276sp715q924cxwjxwsv3j4m0n1zj17w9srnpn4r1k";
+    };
+    dependencies = [];
+    buildInputs = [
+      python3
+      stdenv
+      cmake
+      boost
+      icu
+    ];
+    buildPhase = ''
+      patchShebangs .
+      export PY3=ON
+      ./install.sh
+    '';
+  };
+
   shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "shabadou-vim-2016-07-19";
     src = fetchgit {
@@ -1029,11 +1063,11 @@ rec {
   };
 
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-watchdogs-2016-09-05";
+    name = "vim-watchdogs-2016-11-14";
     src = fetchgit {
       url = "git://github.com/osyo-manga/vim-watchdogs";
-      rev = "96ee0ce968da8da8ace48457665c7d5c942dd49d";
-      sha256 = "16dk0wsikqmcywgm04vwv76p2sc6jw0krq4cg02zdpgyb4xxgp3n";
+      rev = "455a61a34e6f2f82fda7e6de0fc14fc740a11764";
+      sha256 = "05mqphn2l3f0sa86xq5iw1gmm8l1x8ri26kiw6w40hvdc22xkak5";
     };
     dependencies = [];
 
@@ -1051,11 +1085,11 @@ rec {
   };
 
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-racer-2016-10-18";
+    name = "vim-racer-2017-01-04";
     src = fetchgit {
       url = "git://github.com/racer-rust/vim-racer";
-      rev = "6c87080bdb145595e37c304fd8b570b349eda381";
-      sha256 = "1hjf8j7jnf2vb62w6zv3xm0hdhjmm0hxqq18symxfqpkii1kwx6c";
+      rev = "3bd56cc87518c1bf02b681d586447366ae8e815a";
+      sha256 = "0wq2iwgb7wpg62r68f9j5g3kycyap8sks735p9mcsq63rrqmw6l4";
     };
     dependencies = [];
 
@@ -1073,55 +1107,55 @@ rec {
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2016-10-07";
+    name = "vim-grammarous-2017-01-03";
     src = fetchgit {
       url = "git://github.com/rhysd/vim-grammarous";
-      rev = "81ff81d1ac5e2ea059600588165ba9b2ecb854eb";
-      sha256 = "1xpm1j64f5c62d7dnpkc9lfg6qh0nwjbnk3a5gqmz3iy4z1hsdwb";
+      rev = "33f9b3a0f8d6fb01e3c565948bd6185f5079d732";
+      sha256 = "0l4qbd5phqqxdz1g7xz20p2fql1x2ccsv6v7sgal8bvk6b5f8dk0";
     };
     dependencies = [];
 
   };
 
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2016-10-28";
+    name = "rust-vim-2017-01-01";
     src = fetchgit {
       url = "git://github.com/rust-lang/rust.vim";
-      rev = "59e5e2f8b7df21eb438124b95c7295da9c53e1d7";
-      sha256 = "1zdx29l6lhini9562j75g3d41yvjf78pi8cady16i7644hw11r0m";
+      rev = "732b5fcb3652f81726d5f0f5b97c9027c01f057a";
+      sha256 = "0yrg0wlpc9nj5zf25vgr9zd1kwapds3f10njr0dw0wgxr7g204dz";
     };
     dependencies = [];
 
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2016-11-05";
+    name = "neoformat-2016-12-24";
     src = fetchgit {
       url = "git://github.com/sbdchd/neoformat";
-      rev = "8a4d9783879e404bd0a9e185dfec2cd6cd529c31";
-      sha256 = "076cm2cg4kyps7n5d3kp2vjcwvkay20f1pl26yvdsjac14w6x9l9";
+      rev = "a0460e8ef4e48d8d1ee9c377546820a6164fee16";
+      sha256 = "0jlvvc1ijpkadjqix6gr17y8gnfc0rhjqzbg08biw8jpks4fh44p";
     };
     dependencies = [];
 
   };
 
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-polyglot-2016-09-11";
+    name = "vim-polyglot-2016-12-20";
     src = fetchgit {
       url = "git://github.com/sheerun/vim-polyglot";
-      rev = "74652b465d7eff97070001317a4ea5557717378d";
-      sha256 = "18bw8fdpq5riqfy656kw4a9hmrk8s967qx36lq0s16sbyqxm15ag";
+      rev = "e404a658b1647fad396a954776eda0bdabf8353c";
+      sha256 = "11q4k3yj1spxzhxjcwnild4njqmafznm179scvcw8lci8sm8w3hm";
     };
     dependencies = [];
 
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2016-10-19";
+    name = "neocomplete-vim-2017-01-01";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "4bf7526a1c8cca9f8614e8a09178f334eaca0481";
-      sha256 = "1qpxqvdiglisl8bnh1wli957lwr56mq96pm266qmwj6d38h8yby7";
+      rev = "7904f0ff33ce667dfb203e812b783bf443c983cf";
+      sha256 = "1gxvmzmlk8ga45vs8c24in92k6i9z3vxpmcpqpjjc40f4l8hqyds";
     };
     dependencies = [];
 
@@ -1139,22 +1173,22 @@ rec {
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2016-11-04";
+    name = "neosnippet-vim-2017-01-02";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "22bf9611263fcc9fd2c4bd61031053624ff82714";
-      sha256 = "0f0j0spw8zkvrfhbdlk020y19fh4awhhqwc3ylnxday3q5avxa16";
+      rev = "65af2b9bcad50ba1543b38a8dd30df1aee2142ce";
+      sha256 = "107xb0pvqc4ivqpz5i7z8xfk26577y3jsxzvm86bizbxc2wi92m9";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2016-11-04";
+    name = "unite-vim-2016-12-14";
     src = fetchgit {
       url = "git://github.com/shougo/unite.vim";
-      rev = "f3f6df24c04faf29ae4d716aa776f85e88e7ea38";
-      sha256 = "1yyw1blg82g6d8dbl6f4kgfka3d5lh0vgjmp310aysqdhnfag2az";
+      rev = "be09b0e5784c4c4c13aefae4f16313696c6f51de";
+      sha256 = "1nd09llf9v09acyizdmwgjkkdg1b14f8d02b5h3bgidv753dbx64";
     };
     dependencies = [];
 
@@ -1180,32 +1214,32 @@ rec {
   };
 
   vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimshell-vim-2016-10-20";
+    name = "vimshell-vim-2016-12-14";
     src = fetchgit {
       url = "git://github.com/shougo/vimshell.vim";
-      rev = "b42ba02a491d6a4b6daa3178a747e59e7b1800c7";
-      sha256 = "1vpxyfyc9p8h5pwmkdqfvvyxgddbzbmycnzpn9kbyxz89r8k94kj";
+      rev = "d0c5bef010237855b4de25863bc54895effe5d7a";
+      sha256 = "13szswi1n04w66c4h701y47xblrba8ysxjwvmnfxb0pyd1x3gzgz";
     };
     dependencies = [ "vimproc-vim" ];
   };
 
   gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "gundo-vim-2016-01-19";
+    name = "gundo-vim-2016-12-16";
     src = fetchgit {
       url = "git://github.com/sjl/gundo.vim";
-      rev = "e7fe41024ace9047eee610f23311d44fd9d917c0";
-      sha256 = "14mx617mxh7q6rhjfcnv080hpr965vhqzfwhlizpmzc16lsf7ni1";
+      rev = "b4f3624d01ffdfd7bdcd2e19128fffe768fe6262";
+      sha256 = "0a18z3yc2fmpaymzlyjkjblxxkjvn83yh64rvidr3nzg262applz";
     };
     dependencies = [];
 
   };
 
   vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-hardtime-2016-07-05";
+    name = "vim-hardtime-2016-12-19";
     src = fetchgit {
       url = "git://github.com/takac/vim-hardtime";
-      rev = "93ed99803df721648a9b93f0ccd4afe3d8d95a4e";
-      sha256 = "0as6kbdg2jqkxphxyv6ik6qxyp245hl52aqmx5gjd4vi3pryg0gl";
+      rev = "0551f0836d311fae408fb1dc73e0c09cdfa3661b";
+      sha256 = "1izyx3dnds1hdhjk16578cdda72mnhbsrdz2klm0dygfvfq9h7x4";
     };
     dependencies = [];
 
@@ -1234,11 +1268,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2016-10-16";
+    name = "vim-quickrun-2016-12-14";
     src = fetchgit {
       url = "git://github.com/thinca/vim-quickrun";
-      rev = "c4c368c835b91c012b011dde613a914c0e167fd0";
-      sha256 = "0hk7y7gkcxkzgp102x2b3igx7pq194h6ixahmv8s9qv5ndv2km4s";
+      rev = "f968a467781f0f3c788768b95487d80efa6ceb28";
+      sha256 = "0kd6qi7zqahrgr3y773x3q885ww41ladgl10lx0r1x2yjr5y8nv4";
     };
     dependencies = [];
 
@@ -1300,11 +1334,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2016-11-04";
+    name = "youcompleteme-2017-01-04";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "4f2494e87ebd5a6e9b5dc10a436d4d943f137fe6";
-      sha256 = "03fl5ccql6v6da27wns0fiqcyhn0rmwx5vz7l3xqq1xg3x44m5n2";
+      rev = "3fde57b029f760baedeaf7c0c880326e32f5c4d9";
+      sha256 = "1bilzzv02ksqv6m44alp32s61scxqqj5cxx1klr70mhm81k2ksb9";
     };
     dependencies = [];
     buildInputs = [
@@ -1345,22 +1379,22 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2016-10-26";
+    name = "vim-airline-themes-2016-12-09";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline-themes";
-      rev = "e03e9f62d25f9afb04c88ec6ca66cf2098242016";
-      sha256 = "0c6qnh7xjp7qiw5hdz4a3n9v4fk7vynm592aqs4cmhhgjfv1s845";
+      rev = "2a97d9ee410d7b9980a7741fc6e705d53eea23c2";
+      sha256 = "1crqpryfvamjqw8wqn6nlfqbflgwcfxqf4jk3j58rjxssl0vrfbc";
     };
     dependencies = [];
 
   };
 
   vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2016-11-05";
+    name = "vim-pandoc-2016-12-16";
     src = fetchgit {
       url = "git://github.com/vim-pandoc/vim-pandoc";
-      rev = "a92155e8d3a5d8d4e4636783bdebb72ab465b89a";
-      sha256 = "0f4mf40h9h55nishgml833mj1n99wpxbahzgmmx3avfvhxcr97hm";
+      rev = "56b0940954c98c9a089948e1cbbafd2e6e7369e7";
+      sha256 = "0yn4cc3i71vxickvwz4g94fc39pgg9phqdz7sc6kf6xran6p0jdy";
     };
     dependencies = [];
 
@@ -1516,11 +1550,11 @@ rec {
   };
 
   deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2016-11-12";
+    name = "deoplete-go-2016-12-22";
     src = fetchgit {
       url = "git://github.com/zchee/deoplete-go";
-      rev = "807b5536e7cebd06d0ce7b7d54c021a82774aee2";
-      sha256 = "1ragxnlzpf17f1wdy512hkz6bd673gzl16f14v78873rcyxpiw53";
+      rev = "3762a44995559277ea6b0bbcd3242dc5250d438e";
+      sha256 = "16hdp7gq3mxddwbi4qbpqknc67yfr8xr52v198189jgnwajs3c6x";
     };
     dependencies = [];
     buildInputs = [ python3 ]; 
@@ -1533,22 +1567,22 @@ rec {
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2016-10-22";
+    name = "deoplete-jedi-2016-12-01";
     src = fetchgit {
       url = "git://github.com/zchee/deoplete-jedi";
-      rev = "57e5b61578d4d0a27fa75fd5f8dc21d110d60989";
-      sha256 = "050ck7k37lbvw44z7hdk530cswcqywrdfvw5v1bs37mjnh3l9dnj";
+      rev = "13c69a4baefdcf3be4288d82b9a75405fff06838";
+      sha256 = "15w53k5mxrpj6qaybxgyvmbxizkk6r06hsmw9hff8aig4xd3dw74";
     };
     dependencies = [];
 
   };
 
   goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "goyo-2016-04-03";
+    name = "goyo-2017-01-03";
     src = fetchgit {
       url = "git://github.com/junegunn/goyo.vim";
-      rev = "8e8f1d45b61e1fce7f84ee061c38f9e033e86ff9";
-      sha256 = "120farhbfyzd7k1s1i68drwa5zzzm9yrcwzw45gwa2j7kqbv4hnx";
+      rev = "ebdd67fd6160b7f95ac8fe50b382694c9961d6b8";
+      sha256 = "08kx7dsa00amwgjdq1grhapjsa8mk2z11pwgn6xc342zkvrlf0fn";
     };
     dependencies = [];
 
@@ -1632,11 +1666,11 @@ rec {
   };
 
   snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "snipmate-2016-09-01";
+    name = "snipmate-2016-11-14";
     src = fetchgit {
       url = "git://github.com/garbas/vim-snipmate";
-      rev = "31986191ac9923afcd53bf6425c9b6c35fdbb214";
-      sha256 = "1l48h5xmkx412bm29mvl6kz11n7xbkk37ph8v5vgdws380d0fiag";
+      rev = "2d70860ba49afc83cb5902acb99174e3cf08538d";
+      sha256 = "015h8narda721svapf17963r3r48cz63477pmb3fhy2rp8lvvif4";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -1807,11 +1841,11 @@ rec {
   };
 
   vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-manager-2016-02-07";
+    name = "vim-addon-manager-2016-12-20";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-manager";
-      rev = "872f9302cf0eb8e9cb6259ea4f329d2265f9e32d";
-      sha256 = "14aixpj9p8b568mdh4pl7bmpw1rsc4d7axqr09g1m0a8q6rxipc7";
+      rev = "20f75ea1cfa119c61656d71701875c06493180fd";
+      sha256 = "04q1rim08l1ccl7w2764nahhhampvkzzbwnjnnvpb1zgi71ixivy";
     };
     dependencies = [];
     buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
@@ -1928,22 +1962,22 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2016-11-04";
+    name = "vim-airline-2016-12-29";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "258430db82329c1298750af91391c1b21a5a5b58";
-      sha256 = "16m884mfrhmnn12nclmdngkcknkhy1kcn4dhpkk7fs5i89yik1rj";
+      rev = "a2431f2adb23a003abdfe5294861bbd69de52e52";
+      sha256 = "1qd5f133rg3pqdm889zg0hxhrmgzd71maz6jif4a4hjbghi61wjs";
     };
     dependencies = [];
 
   };
 
   vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-coffee-script-2016-09-19";
+    name = "vim-coffee-script-2016-12-27";
     src = fetchgit {
       url = "git://github.com/kchmck/vim-coffee-script";
-      rev = "b91dbe92ad794a85a03b089f384fa324ff4e0c3d";
-      sha256 = "0rkv0n9r3rczx1269i9nf4xs3q934n7iqnrykhnlqbl255s5agd4";
+      rev = "72f48c3f9bb6ba4f9ba1e6e4933c2c25686a1b62";
+      sha256 = "07qamx2jv5418ya1c1hca3qvnfvw78r15iakgh0kljajzdq3yy0b";
     };
     dependencies = [];
 
@@ -1972,11 +2006,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2016-10-27";
+    name = "vim-gitgutter-2016-12-23";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "1742a8f568df549f4daeda90174b54d0c371501f";
-      sha256 = "1d4d4lpf43dd5fpn3cqb3lrfr4k6ilmanmk9cymwf9byri3s4xdv";
+      rev = "7b81a8a22607f073b76b106e2d5e63cc936b0d25";
+      sha256 = "19v2akrhhfb9zy7mvljjwvi7lqrnviw88gxh4xmpy82vghiwdrfs";
     };
     dependencies = [];
 
@@ -2027,44 +2061,44 @@ rec {
   };
 
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2016-10-17";
+    name = "vim-signature-2016-11-20";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
-      rev = "f1f7108aacac5dc3a7e3b697c489f8271fa054b8";
-      sha256 = "0y9ls3m9l2f5jwkbfn26xhw1brp03c9ylmzxfnw28z2bfh5778iy";
+      rev = "7e13913188809c45e14988270213744d1c3bb485";
+      sha256 = "0lcmv8fxj50r1r51379sxdy0ra3s0i1cgyqi4wp2zmpz06c1c2nx";
     };
     dependencies = [];
 
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2016-10-07";
+    name = "vim-signify-2016-12-31";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "a7e3219de8f603aaec35b30027778aa417fcb691";
-      sha256 = "1dq369s2bavwkv59cklbjz2zr6vk5ahqs53x1pj0l1xx3rg9h3aq";
+      rev = "32d8797d887b0980514cdf7f11c9c1379d597e57";
+      sha256 = "1jhb6pljqbz8mlcc4zfjqzhyyp4yz5b6h7s0224m7vm4xvsphq8y";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2016-11-05";
+    name = "vim-snippets-2016-12-27";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "93c3241c79886d027c802c93804e597f5b9d742f";
-      sha256 = "0m0k2czyhf9lwla4pyzf6jrb0h1xclcww1pqwnmbf1g10ns7n2zh";
+      rev = "e24d33f96a95332dde0edaa7e7e3e7a64244de56";
+      sha256 = "1clba2x05klqab5ifkg19cxm22ibx6ycdfdn71clglk96wli1h0f";
     };
     dependencies = [];
 
   };
 
   vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-webdevicons-2016-11-06";
+    name = "vim-webdevicons-2016-12-10";
     src = fetchgit {
       url = "git://github.com/ryanoasis/vim-devicons";
-      rev = "4fbf39a8984ed9a450b5cd078d65955de472bace";
-      sha256 = "0m549vm5qzk1hiixf4p740fkqw58y46pdimb5jhpm484sqyggvj5";
+      rev = "93387d7fba06f8ba7ee52dc00d08919f8a35341d";
+      sha256 = "1zxw0mbb5a54kc31qfwi1d9gylagsa9jnbsfghnsminx32ch8jcd";
     };
     dependencies = [];
 
@@ -2082,11 +2116,11 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2016-05-18";
+    name = "vimwiki-2016-12-18";
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
-      rev = "4831384ab9f1c40c9e433857d958c4d9a7beb8ec";
-      sha256 = "1wjbsd37h5fxkkia90h708mmqisdj0kxzm9k97jm2zq36zngmd86";
+      rev = "3a8743700581923c6fd2684510dad48a8b2b8c64";
+      sha256 = "19b27h0zsmi1xphzf1qhmry11gca4j1mh0mli12yvkr9v61rnj6b";
     };
     dependencies = [];
 
@@ -2114,36 +2148,4 @@ rec {
 
   };
 
-  vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsdoc-2016-11-05";
-    src = fetchgit {
-      url = "git://github.com/heavenshell/vim-jsdoc";
-      rev = "45c7c7cef440a29f7bf24436640413e3d5d578ff";
-      sha256 = "0kr4p01pyrz9w7yfh50gsz6n60qvnqxsr1055hvsyx36nzw6l3za";
-    };
-    dependencies = [];
-
-  };
-
-  cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "cpsm-2016-09-21";
-    src = fetchgit {
-      url = "git://github.com/nixprime/cpsm";
-      rev = "565ab53a66fa52c46d80adf6981b07f4bdffcb1d";
-      sha256 = "125gcnqrg2276sp715q924cxwjxwsv3j4m0n1zj17w9srnpn4r1k";
-    };
-    dependencies = [];
-    buildInputs = [
-      python3
-      stdenv
-      cmake
-      boost
-      icu
-    ];
-    buildPhase = ''
-      patchShebangs .
-      export PY3=ON
-      ./install.sh
-    '';
-  };
 }

From e17b483669535d60d802cc979cad5e463e8ea114 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 4 Jan 2017 12:56:26 +0300
Subject: [PATCH 0540/1310] glslang, spirv-tools, vulkan-loader: add
 metainformation

---
 pkgs/development/compilers/glslang/default.nix       | 2 ++
 pkgs/development/libraries/vulkan-loader/default.nix | 3 ++-
 pkgs/development/tools/spirv-tools/default.nix       | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index 63b4b4c2c4f..cd03c246624 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -21,5 +21,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "Khronos reference front-end for GLSL and ESSL";
+    license = licenses.asl20;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 622d027c60b..731bd81cb6f 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -63,7 +63,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "LunarG Vulkan loader";
-    homepage    = http://www.lunarg.com;
+    homepage    = "http://www.lunarg.com";
     platforms   = platforms.linux;
+    license     = licenses.asl20;
   };
 }
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
index b0c15a6df4b..4693e547716 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
-    description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules.";
+    description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules";
+    license = licenses.asl20;
+    platforms = platforms.linux;
   };
 }

From 6a68b9526680c249491fc8ed9f96ed33b89b73f5 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 4 Jan 2017 06:43:06 -0500
Subject: [PATCH 0541/1310] chase: correct download URL

I broke the change after changing the name from chase_ to chase-. Sorry!
---
 pkgs/tools/system/chase/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix
index 8a435170716..15d2b16faee 100644
--- a/pkgs/tools/system/chase/default.nix
+++ b/pkgs/tools/system/chase/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }:
 
 stdenv.mkDerivation rec {
-  name = "chase-0.5.2";
+  name = "chase-${version}";
+  version = "0.5.2";
 
   buildInputs = [ pkgconfig libatomic_ops boehmgc ] ;
   src = fetchurl {
-    url = "mirror://debian/pool/main/c/chase/${name}.orig.tar.gz";
+    url = "mirror://debian/pool/main/c/chase/chase_${version}.orig.tar.gz";
     sha256 = "68d95c2d4dc45553b75790fcea4413b7204a2618dff148116ca9bdb0310d737f";
   };
 

From e9ab1a614f31e4eb61dc864fcfb404eabc28084b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@klandest.in>
Date: Wed, 4 Jan 2017 10:42:13 +0100
Subject: [PATCH 0542/1310] cpp-ipfs-api: 2016-11-09 -> 2017-01-04
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Güntner <code@klandest.in>
---
 pkgs/development/libraries/cpp-ipfs-api/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix
index 2c9d36154a2..c13b32a67b0 100644
--- a/pkgs/development/libraries/cpp-ipfs-api/default.nix
+++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cpp-ipfs-api-${version}";
-  version = "2016-11-09";
+  version = "2017-01-04";
 
   src = fetchFromGitHub {
     owner = "vasild";
     repo = "cpp-ipfs-api";
-    rev = "46e473e49ede4fd829235f1d4930754d5356a747";
-    sha256 = "10c5hmg9857zb0fp262ca4a42gq9iqdyqz7f975cp3qs70x12q08";
+    rev = "96a890f4518665a56581a2a52311eaa65928eac8";
+    sha256 = "1z6gbd7npg4pd9wmdyzcp9h12sg84d7a43c69pp4lzqkyqg8pz1g";
   };
 
   buildInputs = [ cmake curl ];

From 1b5f9394edb63c249e6691f447c72b0284c02f75 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 4 Jan 2017 08:27:55 -0500
Subject: [PATCH 0543/1310] elpa-packages: 2017-01-03

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

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 7cdf9fff5d9..7c56b1ab6e5 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -619,10 +619,10 @@
     el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
     elpaBuild {
         pname = "el-search";
-        version = "1.2.1";
+        version = "1.2.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.2.1.tar";
-          sha256 = "1a5gqcl9v0ppizz0c61rcpahym3vr52f8azp2pjvrxvkmx4sj8c1";
+          url = "https://elpa.gnu.org/packages/el-search-1.2.3.tar";
+          sha256 = "1d7iqr4fr0kr171fnjcm2n0bgcwzdh6jl585mwjf2zqnqszv13h0";
         };
         packageRequires = [ emacs stream ];
         meta = {

From 29472c62e127038cf09e150eaf2613f02fe975a4 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 4 Jan 2017 08:28:44 -0500
Subject: [PATCH 0544/1310] melpa-stable-packages: 2017-01-03

---
 .../emacs-modes/melpa-stable-generated.nix    | 256 ++++++++++--------
 1 file changed, 149 insertions(+), 107 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 689995f2e77..dc15c9e056a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -485,12 +485,12 @@
     ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "1.7.5";
+        version = "1.7.6";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "f66d13c98543032d2773c83441f49d4b6e109e97";
-          sha256 = "0zi16x56jmas70srphd07ycxfdw4ny1y8vsdcvfvmgvg1mgys8f6";
+          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
+          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -506,12 +506,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "1.7.5";
+        version = "1.7.6";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "f66d13c98543032d2773c83441f49d4b6e109e97";
-          sha256 = "0zi16x56jmas70srphd07ycxfdw4ny1y8vsdcvfvmgvg1mgys8f6";
+          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
+          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -3334,12 +3334,12 @@
     cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cfengine-code-style";
-        version = "3.9.1";
+        version = "3.10.0";
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "843fb337d8fe849860ca2f2aeb55c7f549f75a52";
-          sha256 = "0mw7xif23949d2hg4pgg2b1sj4afjc19522zqk4dmv2cz7qdmqi2";
+          rev = "dc823da05d6790e9f95e3cb75618b51d6273e303";
+          sha256 = "0xfdlzdcccz80qp3jbzv7wr1kwkh8797j9d3lfkh8apl4wkgvwpq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -3541,6 +3541,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "choice-program";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "plandes";
+          repo = "choice-program";
+          rev = "154c12ed7e2afc2d5dae031698be4787d7d647b0";
+          sha256 = "1695pmz0j93pz3pkcyqk0ngajcf8cyzxihmpp2zfspya3ihxj4ia";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/894357125db5035999a39514516852d7e957453e/recipes/choice-program";
+          sha256 = "0hhp6qhrshqrw4978xq6biwddm7gv7yf4avbb64xvz66i3a2kgy1";
+          name = "choice-program";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/choice-program";
+          license = lib.licenses.free;
+        };
+      }) {};
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
@@ -3933,12 +3954,12 @@
     closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "closql";
-        version = "0.3.2";
+        version = "0.3.3";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "closql";
-          rev = "5e9d64288863d6d33fac73ccf356427215daa9fb";
-          sha256 = "0snhwix51bfs6gsg2knklkg791k2mvn3ydyk388k3k9xmn5sr7xj";
+          rev = "0bb0fa3dd1e545cbf025d42e253ddb00107156a3";
+          sha256 = "1mpycmj88gi62rhzxdv4933l318j3llphbc00b7rvzms55sgpcz5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@@ -4437,12 +4458,12 @@
     company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-emoji";
-        version = "2.4.1";
+        version = "2.5.0";
         src = fetchFromGitHub {
           owner = "dunn";
           repo = "company-emoji";
-          rev = "b971ab0a66126f0d1410254ba1e21f17c2270101";
-          sha256 = "1c9r1j7xpq6c27y6akfarrcg87idww3c10rkhm26m1vprqk73vr3";
+          rev = "8dc88ffe0773ef44321f245d39430c14a1bc2b82";
+          sha256 = "1y8l9wnc13g79znyw2qsbm33da2bhkj270ppikkg9h4x2qpmxilq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji";
@@ -4584,12 +4605,12 @@
     company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-ngram";
-        version = "0.7.8";
+        version = "0.7.9";
         src = fetchFromGitHub {
           owner = "kshramt";
           repo = "company-ngram";
-          rev = "1d43d7df4c5d7a58e1176c7c57a8dce60dba2e8a";
-          sha256 = "1isfyzjik8a5fr8sfy7462hpv5zh5bgbm8zc7d0lk50ggrazz7l5";
+          rev = "98491c830d0867c211b773818610ace51f243640";
+          sha256 = "196c870n7d46n4yhppq5np8mn9i0i74aykkbfk33kr4mgilss4cw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
@@ -4626,12 +4647,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "1.7.5";
+        version = "1.7.6";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "f66d13c98543032d2773c83441f49d4b6e109e97";
-          sha256 = "0zi16x56jmas70srphd07ycxfdw4ny1y8vsdcvfvmgvg1mgys8f6";
+          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
+          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -4947,12 +4968,12 @@
     copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copy-as-format";
-        version = "0.0.1";
+        version = "0.0.2";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "e3e130a34d70deaa1ff81fe1e3b3898c1121c107";
-          sha256 = "1llkzvbw7ci4x20pqaacri82qplsfzxb20xw7v373i5jc83wjv9z";
+          rev = "6c47295597c69b3b08dd8f137f6a5973a5588674";
+          sha256 = "1d4x8rvmzqi3cby01ahgr3fqcsq4kpd6sglr9slxcw7hp7rlih0i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -5178,12 +5199,12 @@
     creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "creamsody-theme";
-        version = "0.3.0";
+        version = "0.3.4";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-creamsody";
-          rev = "c897adf63cfd928779d90a54366ca5bdb24d4d35";
-          sha256 = "0bw1p0l52fgvw2bapq9anwxzfwpwr6d2ddskzp2r2whyy0w3jc9b";
+          rev = "c1b2de723d1047ffa199a2cfb14131218962a07d";
+          sha256 = "0kncywrxpb8yn8i0wqspx9igljzlv57zc9r32s1mwgqfz0p2z823";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
@@ -5646,8 +5667,8 @@
           sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b047625aebdbf7b5d644b55afbdccfc6c4ac14a8/recipes/dashboard";
-          sha256 = "04lp8ylfnbdj65s8z0m5kyj4rwxcsdwinlkpj00j1my0m74y5i0p";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
+          sha256 = "08pdpjfrg8v80gljy146cwpz624dshhbz8843zl1zszwp2p00kqy";
           name = "dashboard";
         };
         packageRequires = [ emacs page-break-lines ];
@@ -6822,8 +6843,8 @@
         version = "0.7";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "20a2166c8210";
-          sha256 = "0gz0aiks3f53lqvnrnb33a1clq52ipd3i3miymvkkgspnz3vl12p";
+          rev = "4004050a9771";
+          sha256 = "0p7g7sfkdr473gpj2xdgg5fb5d336w2ddvx44i1d6575p6rcs5w6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -8665,12 +8686,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "2.0.0";
+        version = "2.1.0";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "de33177656d8f48b65abbb71ab4d25b7bd799dee";
-          sha256 = "0lhb8b4i8r8a6pagwa0p3iqb1bk25as4nd4pjwbdjn0800ncv9nh";
+          rev = "6e1d989fbfa357a7c268ea30fe8b3e3cefafc36d";
+          sha256 = "0avlmqcbm07692ir5z04gy4klhyan3h25ni4l4k4p0dszjsqmdi0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -8725,22 +8746,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    erc-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-crypt";
-        version = "1.0";
+        version = "1.6";
         src = fetchFromGitHub {
           owner = "atomontage";
           repo = "erc-crypt";
-          rev = "1573189240d8b58e65385414d9a9514238c77805";
-          sha256 = "1xw56sir6gkr0p9g4s6p4qc0rajnl6ifbzrky07j28y9vsa59nsz";
+          rev = "731f9264a5bf08a8fc0b5ce69e72058c86f873a5";
+          sha256 = "13jpq5ws5dm8fyjrskk4icxwz8k5wgh396cc8f8wxrjna4wb843w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
           name = "erc-crypt";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/erc-crypt";
           license = lib.licenses.free;
@@ -10979,12 +11000,12 @@
     flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-objc-clang";
-        version = "1.0.5";
+        version = "1.0.6";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-objc-clang";
-          rev = "9dbfad340090523db0b936517d8543d8aa2f2e2c";
-          sha256 = "0cky0zxlfajhq5kh868yh17d0pr5pqjgj8v8xhj14sbch5jvd3bz";
+          rev = "11805f1d420e297db0346a6657f144b08e2ca556";
+          sha256 = "1s9bk3k7ys79m2iww4yf1abfy01d08z9x9pfq8l045q0snsh64il";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -11147,12 +11168,12 @@
     flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-swift3";
-        version = "1.0.6";
+        version = "1.0.8";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-swift3";
-          rev = "6e1079576d30397eefea0300bf31a248a26cf98c";
-          sha256 = "0c8a5bgrirf3ms6v75w4jaiwfxf1acv2isf7x02jms7m8h36bzxz";
+          rev = "ae7b29111cb160774c317997902d7ef29cedd7d9";
+          sha256 = "17s34rqxkirb88y8jzl3ybs7j3ylp9ckdfx3sqwfn0cyspnj5f1d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -12725,22 +12746,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-messenger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    git-messenger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "git-messenger";
-        version = "0.17";
+        version = "0.18";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-messenger";
-          rev = "9412a975f4723e9bc9c9feb4ec064b2e8c0c659d";
-          sha256 = "1hh99ippc1bpqpnchvhbh7yzcsjx9v7bbpy5r9hx82kx0xqih0sc";
+          rev = "9297464c010dd8a2d584ac8e012876856655a8b5";
+          sha256 = "04fnby2nblk8l70gv09asxkmnn53fh1pdfs77ix44npp99fyw8ix";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e791293133f30e5d96c4b29e972f9016c06c476d/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
           name = "git-messenger";
         };
-        packageRequires = [ cl-lib popup ];
+        packageRequires = [ emacs popup ];
         meta = {
           homepage = "https://melpa.org/#/git-messenger";
           license = lib.licenses.free;
@@ -13973,22 +13994,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "0.18.0";
+        version = "1.12.0";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "fa9cafdaf2b126a06a0196a668c14821ceba44fa";
-          sha256 = "1fn0dgnharn18xs6aq202y0jyldvg12sbf67jxmxjdn20w44g1d3";
+          rev = "e57f494fd94e49321a6396f530b8a13bae8b57df";
+          sha256 = "16f9vszl0f1dkjvqk5hxi570gf4l8p6fk27p0d7j11grsck0yzly";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
           sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32";
           name = "gruvbox-theme";
         };
-        packageRequires = [];
+        packageRequires = [ autothemer ];
         meta = {
           homepage = "https://melpa.org/#/gruvbox-theme";
           license = lib.licenses.free;
@@ -14413,22 +14434,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    hcl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    hcl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hcl-mode";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-hcl-mode";
-          rev = "cc13180e3af748d53c4a1d433ce2edf99bf68a7d";
-          sha256 = "0hiw226gv73jh7s3jg4p1c15p4km4rs7i9ab4wgpkl5lg4vrz5i6";
+          rev = "6a6daf37522188a2f2fcdebc60949fc3bdabbc06";
+          sha256 = "0jqrgq15jz6pvx38pnwkizzfiih0d3nxqphyrc92nqpcyimg8b6g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
           name = "hcl-mode";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/hcl-mode";
           license = lib.licenses.free;
@@ -14437,12 +14458,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.3.3";
+        version = "2.3.4";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "2fca3400574e5f2666c942c674ce0f8e6ca6b232";
-          sha256 = "1qbvgp2pca0n5ahpc1gss8ldn07mgs96xxgb5dg62b08ch8ry2jf";
+          rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624";
+          sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -14689,12 +14710,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.3.3";
+        version = "2.3.4";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "2fca3400574e5f2666c942c674ce0f8e6ca6b232";
-          sha256 = "1qbvgp2pca0n5ahpc1gss8ldn07mgs96xxgb5dg62b08ch8ry2jf";
+          rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624";
+          sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -18403,12 +18424,12 @@
     keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keymap-utils";
-        version = "2.0.0";
+        version = "2.1.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "keymap-utils";
-          rev = "14c86914b708081299cf6a290570ff8e11853cab";
-          sha256 = "15zsx296cqzmwivrkkknr8lmdsr6dkggxbwp2yggr20278vsvbhv";
+          rev = "a4f6ff724eeade5612c01c6f6bf401f264687793";
+          sha256 = "0jgmw8798g3ikhwnic3fbbjld0hj8fvg50q6x78pngf78ws92mkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils";
@@ -20241,22 +20262,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
+    mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }:
     melpaBuild {
         pname = "mentor";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "skangas";
           repo = "mentor";
-          rev = "256c59ab8562300c8de027afaec989239ad89395";
-          sha256 = "0xlaanyv6k8ski6c45mrha8n4yinqvjgn6kn64mwy4n64fvlrvv5";
+          rev = "074bd57a1e19d7807d682552fee63f326d1ad05c";
+          sha256 = "1p2wlwl8771w8m0i8f6qx11n1f13kkf681v0v4zcd161jgmklp5q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
           name = "mentor";
         };
-        packageRequires = [ xml-rpc ];
+        packageRequires = [ cl-lib seq xml-rpc ];
         meta = {
           homepage = "https://melpa.org/#/mentor";
           license = lib.licenses.free;
@@ -21566,12 +21587,12 @@
     nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "1.11.4";
+        version = "1.11.5";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "fb577a431f5ef1a29fdf3b818dceb4f6b4e8fa52";
-          sha256 = "1vzs5y0ib9bqvcyap7f6v75pf8z0xpdwgq554zxci4dlwp68fp2p";
+          rev = "d39f51fa3472ccc30f1b2896f5538d0b2dbce916";
+          sha256 = "0ms42pmnmzhn0b74s3b441m0nqbckgm64bc00qdlvb1s644j32i6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -21608,12 +21629,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "0.5.0";
+        version = "0.5.2";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "12a4cc1155b938da947cce5b3dff7ffb91f2203c";
-          sha256 = "1x7xmqvmna5h5dg352v6pzm9ijdivaz7wcc2nhnshxc5pywpc1cg";
+          rev = "e7d3ebbd12f176707e63766a7a19bcaa08e01331";
+          sha256 = "0y8wvagn4yf7fwvwzqcrx46wigmvyl25fa94kzvkanjl04zid3i1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -21937,6 +21958,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-prolog";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "ljos";
+          repo = "ob-prolog";
+          rev = "7e94309d3a21d7e265f3a85b41801397f286af00";
+          sha256 = "0qxpgnjrx04dl43i949vcwv70sc7i23ivyvfk82hdvl8c2lwfd7w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog";
+          sha256 = "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s";
+          name = "ob-prolog";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ob-prolog";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }:
     melpaBuild {
         pname = "ob-sagemath";
@@ -24041,12 +24083,12 @@
     parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parinfer";
-        version = "0.4.5";
+        version = "0.4.6";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "a1a5bce179fe694f07d28a75339bf8e4f5b285db";
-          sha256 = "0m0k4lb79qy61j0n2a9amx6zz36vgxhadlvyjg9kqg9xwlks5yxc";
+          rev = "3d5b8d4a3f7e73f15f816f7555abed09c5516338";
+          sha256 = "1w3j0dzi19h1k94gnj1zxx4s1aji91wq4sjwkf813zs7q769mfsp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -26262,12 +26304,12 @@
     ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ranger";
-        version = "0.9.8.4";
+        version = "0.9.8.5";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ranger.el";
-          rev = "cbde94a417d9d93fcee74de119aae867cbe772d7";
-          sha256 = "0v3y77z8l5lg1ppl4szp9k80wjjnmlyxqjmmakc5l2vkq98gzcpq";
+          rev = "584e4ae8cce1c54a44b40dd4c77fbb2f06d73ecb";
+          sha256 = "01rphv92g1r0cw5bwkbrh02s0na7fjrddxx1dckk2y7qr97s7l8j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger";
@@ -28423,12 +28465,12 @@
     slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
     melpaBuild {
         pname = "slime-company";
-        version = "0.9.1";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "anwyn";
           repo = "slime-company";
-          rev = "b4a770b1c1e9638f13e339e7debbdb3b25217e39";
-          sha256 = "0rdhd6kymbzhkc96dxy3nr21ajrkc7iy6zvq1va22r90f96jj9x4";
+          rev = "6c244690c80387a32b0cb984843e00c8b75ad6bb";
+          sha256 = "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company";
@@ -30456,12 +30498,12 @@
     tern-context-coloring = callPackage ({ context-coloring, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
     melpaBuild {
         pname = "tern-context-coloring";
-        version = "1.0.0";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "jacksonrayhamilton";
           repo = "tern-context-coloring";
-          rev = "42e2f0177e8d3017c07826361cc981b2883d34dc";
-          sha256 = "0jdm1s8pqs40xligbhmqgk4vaxkqyb2i5wkx1zgjazq8fhcql9jv";
+          rev = "3a8e979d6cc83aabcb3dda3f5f31a6422532efba";
+          sha256 = "1rq5aqmsd7jqvwypafad9gmfcwjqjah00j7cws46k5f0dirjaa1y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db2119d2c2d167d771ee02c2735b435d59991b93/recipes/tern-context-coloring";
@@ -30495,22 +30537,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    terraform-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }:
+    terraform-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "terraform-mode";
-        version = "0.5";
+        version = "0.6";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-terraform-mode";
-          rev = "3458515359c1f3c82b40e72317b7dd49c05ea873";
-          sha256 = "1k0v56v7mwpb5p228c0g252szpxvpqswrmjfpk75kh32v56wp5xi";
+          rev = "6286aa42132a7fcad49271d63be33deeeb8d4efc";
+          sha256 = "05hn8kskx9lcgn7bzgam99c629zlryir2pickwrqndacjrqpdykx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
           name = "terraform-mode";
         };
-        packageRequires = [ cl-lib hcl-mode ];
+        packageRequires = [ emacs hcl-mode ];
         meta = {
           homepage = "https://melpa.org/#/terraform-mode";
           license = lib.licenses.free;
@@ -32480,8 +32522,8 @@
         version = "0.9.1";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "a67adbf5fc75";
-          sha256 = "1av071s0s6x0idbklfnps8j7vgjqxapk9y23prk6jrdbbwhfzb8n";
+          rev = "ab6afca9ee2e";
+          sha256 = "19yy6z12pqaz9l0gj4hm73m7z2gcyivwymf6732vk8im77i8agyl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -32518,12 +32560,12 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "2.5.8";
+        version = "2.5.9";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "ab73c028e8dbe088d7545406efc5c5c7b8fd503a";
-          sha256 = "1hf2py6dby3wnvzv027x0555532aapn20bkhb7x8k020c6yr59s9";
+          rev = "2248a63f6eb6e7720881b508639d9a00d2db9ea0";
+          sha256 = "0g5ch1a5myrmazxcbbak01q4k3x8yp3kbn73d2h26j2jmsqvdy1n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -32914,22 +32956,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    xterm-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xterm-color";
-        version = "1.0";
+        version = "1.6";
         src = fetchFromGitHub {
           owner = "atomontage";
           repo = "xterm-color";
-          rev = "380cc8c6c6969f8a262ad4ddc61117691db7f4d1";
-          sha256 = "1zdj4664gvwc4kyx7fx5232l3c5anm0xyrrnrw596q604q6xxj2x";
+          rev = "ed3d0f4ccb2b28ff034192c50f244a97197d3911";
+          sha256 = "0djh18lm3xn9h4fa5ra0jrlzdzwhvhcalipj73j5gmmfaif4ya9q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color";
           sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
           name = "xterm-color";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/xterm-color";
           license = lib.licenses.free;

From 080926b479fe61141eb81a3a2788fb7365c24f6d Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 4 Jan 2017 08:28:10 -0500
Subject: [PATCH 0545/1310] melpa-packages: 2017-01-03

---
 .../editors/emacs-modes/melpa-generated.nix   | 1336 +++++++++--------
 1 file changed, 690 insertions(+), 646 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index f2e9e89e9f1..eebc140d2eb 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 = "b67a8fed3bbd0af8a69e4359c27fe4646cb92989";
-          sha256 = "1fmr3r83w2vbdh6hrxjad83vnhr2sshlwvmi71zc3rg8vqwc6vdk";
+          rev = "03d9cb7b6c3ac60fd796a2ba8fdfe13552720d3b";
+          sha256 = "1dzy463jpfjz7qhr1zwx8n3xrba6zj87j6naf7xx4j704i03f9h8";
         };
         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 = "20160910.1747";
+        version = "20161229.1930";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "fa4a79892e1097db28dce7ba4058e68998228ddd";
-          sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508";
+          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
+          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
         };
         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 = "fa4a79892e1097db28dce7ba4058e68998228ddd";
-          sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508";
+          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
+          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -1048,12 +1048,12 @@
     ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-popup-menu";
-        version = "20160522.519";
+        version = "20161231.1553";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ace-popup-menu";
-          rev = "8c97cf2cd9decae3acaf6c858a986bdbc9d7ccff";
-          sha256 = "1afw9nxxd0shlg62w9ifc1wlf8vsw5ss8r52h5a5s8m3pnswlx2h";
+          rev = "423c59ac11899c66741aca3cad5dda46a167dfe4";
+          sha256 = "01gh26marr3h61lvqw0mdc7r3s6cr2s6g5vqxf84ip43fzhi9zc3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu";
@@ -1257,12 +1257,12 @@
     ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ag";
-        version = "20161027.1758";
+        version = "20161228.1641";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ag.el";
-          rev = "7b7c2d03e10968c6726f8a59ab25fcac0c147fba";
-          sha256 = "06nglpfz4xvjgkfxx1g1vhcm846kfb56pqxv3a8l0rd0fqyaziyi";
+          rev = "754d0fea35059c583b9613c7924cebba74fe1319";
+          sha256 = "0s9idrnzvd8sdx266s3p4jgpx0zd7s0cb7f48wp319xmqh448p84";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -3756,17 +3756,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    avandu = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+    avandu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "avandu";
-        version = "20161226.1540";
-        src = fetchgit {
-          url = "git://ryuslash.org/avandu.git";
-          rev = "0001e7cfab183f283c18b85bee25b94995beee63";
-          sha256 = "0r92clh3x4w2i717nk9p36wxikdy6vzj0a2nmwbwsswqhzjhdjqg";
+        version = "20170101.1103";
+        src = fetchFromGitHub {
+          owner = "ryuslash";
+          repo = "avandu";
+          rev = "f44588d8e747fa880411cb4542cc39962252b90a";
+          sha256 = "097wls9k6qrf12nn8mpszfbqsaqc81956yqxns1sjs6dmjqi0c7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a67d2cd2d62c5deb4b9bbbe8efcd014c151f58e/recipes/avandu";
-          sha256 = "1pyjpdyk8s4zandz8n1wgyvn0mpvrqn7g34ljnpjr8xciv6qsfpq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1344e49e6a41ce390a047cb8d48090160b37b50/recipes/avandu";
+          sha256 = "174bd3vbvh0l9282bg8575nqc71zkg90bwbxbv1b7dz8qaaczhcy";
           name = "avandu";
         };
         packageRequires = [];
@@ -3778,12 +3780,12 @@
     avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avk-emacs-themes";
-        version = "20161029.504";
+        version = "20161228.1236";
         src = fetchFromGitHub {
           owner = "avkoval";
           repo = "avk-emacs-themes";
-          rev = "d8c91d67c78d90d04f2cda01ded019c6931250d6";
-          sha256 = "1lyxx55yd1fd52r588j9g0vrx6nl5nl8msc5si8qfh7naprr4hh9";
+          rev = "a0ea17a380bebe28e00bb6855168a72aa28e8afc";
+          sha256 = "1n8ms7mxc4gr3mb1x6rd1k8wzfk0y6ix9q11p01ahaa9zizbkyfp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes";
@@ -3841,12 +3843,12 @@
     avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy-menu";
-        version = "20160126.425";
+        version = "20161231.1554";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "avy-menu";
-          rev = "bd32dde9b8d5695f28b87a198e683cf7c94a043b";
-          sha256 = "0bjx6fsrnx373fzndhwq4k6nbrvq4q2pxrmgd9lpi4fpdwxq635c";
+          rev = "75f4025ca53b9700ca5b478d85f5e53e887a6023";
+          sha256 = "05smmmf8hc8ksgq711gn7hd8a7z6zw6l2i86zbx5fb79s11sqjg0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu";
@@ -3862,12 +3864,12 @@
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
-        version = "20161215.709";
+        version = "20161229.605";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "18decb64d1663cae909499e346663bfc1906a937";
-          sha256 = "089lx3fic9blxb1m2jvhg27cg67q1b39ncxnm7r8hajmaq7h0aw9";
+          rev = "26e87aa7905a252b797e0bf592c9ff9eede165c1";
+          sha256 = "1bfrc7wxnzhjn07psa5z1cflxxr1k8qc4jgsz5w7ds3sn48aji48";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -4069,6 +4071,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    backward-forward = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "backward-forward";
+        version = "20161228.2150";
+        src = fetchFromGitLab {
+          owner = "vancan1ty";
+          repo = "emacs-backward-forward";
+          rev = "58489957a62a0da25dfb5df902624d2548d800b4";
+          sha256 = "14v9q58vd0iggs8x8hjh24cv58g2pbwnr6zghd2anaygbj74ij24";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/cb44d7b604c50d4e07404c0dff071fbc66ea903d/recipes/backward-forward";
+          sha256 = "0kpy761xdk2s21s92cw03fgw5xq9glybrhnjv2v89xrg16vdvamf";
+          name = "backward-forward";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/backward-forward";
+          license = lib.licenses.free;
+        };
+      }) {};
     badger-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "badger-theme";
@@ -5299,7 +5322,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20161221.940";
+        version = "20170102.909";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "05jf7rbaxfxrlmk2vq09p10mj80p529raqfy3ajsk8adgqsxw1lr";
@@ -5570,10 +5593,10 @@
     browse-kill-ring-plus = callPackage ({ browse-kill-ring, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "browse-kill-ring-plus";
-        version = "20151231.1221";
+        version = "20170102.910";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/browse-kill-ring+.el";
-          sha256 = "1z6pix1ml3s97jh34fwjj008ihlrz4hkipdh5yzcvc6nhrimjw2f";
+          sha256 = "0qps93fx9x7iy9m2061fkizw90y0d6y4q9wk0c8krpbny73a18v2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e700f4066e67991dd67f6476c783e0a5134723db/recipes/browse-kill-ring+";
@@ -6942,12 +6965,12 @@
     char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "char-menu";
-        version = "20160203.2215";
+        version = "20161231.1609";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "char-menu";
-          rev = "da1524f37453086d2c5178b62c5173fb66b2ca8e";
-          sha256 = "00jf4nv7i1ppsag5p91ldqa47i92ikxkfr7fzzp5kkp9swx1zvyb";
+          rev = "d0f87d8077e8516f562ae71d037839e164c987b1";
+          sha256 = "0nxpm9bq8003wyjb8sg741nn7fcgvmsd0lhi0i907xpmii7bbjp6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu";
@@ -6963,10 +6986,10 @@
     character-fold-plus = callPackage ({ fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "character-fold-plus";
-        version = "20160227.1503";
+        version = "20170102.916";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/character-fold+.el";
-          sha256 = "0xvgxjyl6s6hds7m9brzly6vxj06m47hxkw5h2riscq6l4nwc9vz";
+          sha256 = "0z6fc46sqdhnkpfichq9cnnnjmlcni0rxaj30rabpzkzmpsza79h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0bb32513eaaafded547058e3de84fc87710d2cf0/recipes/character-fold+";
@@ -7070,8 +7093,8 @@
         src = fetchFromGitHub {
           owner = "eikek";
           repo = "chee";
-          rev = "979279d9b15a1885b0e0c3143a9e422f98c11b9c";
-          sha256 = "0jp4ivzbdpk4wzhj4qy4fr7zn45plnfmirl0ylrb4hiwqd7kwbd8";
+          rev = "48b1770e069a99eef10215f1ed268f852982fdd2";
+          sha256 = "0r9wg77vag8m4k23whcss9p65v2jq9ypmjm74y6r2qpb9l68pnlg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee";
@@ -7417,6 +7440,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "choice-program";
+        version = "20161230.1721";
+        src = fetchFromGitHub {
+          owner = "plandes";
+          repo = "choice-program";
+          rev = "691ced104adc6dbb3ddf8c28563c1cd36eb165b1";
+          sha256 = "1jd0zj8g9nnzdfy76z9565sz6sd6690nbbi4zg71pxssmsqgkc3w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/894357125db5035999a39514516852d7e957453e/recipes/choice-program";
+          sha256 = "0hhp6qhrshqrw4978xq6biwddm7gv7yf4avbb64xvz66i3a2kgy1";
+          name = "choice-program";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/choice-program";
+          license = lib.licenses.free;
+        };
+      }) {};
     chronos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chronos";
@@ -7466,8 +7510,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "bf80bd4f736dc3323cc8b7f66a8ce2f1485f1db7";
-          sha256 = "080sg0srj576sibbv06rqbxpq60r65yazhq0rl0fgfacsvgllly5";
+          rev = "0fcc4c98c91802417cadea90972a641a91baaf70";
+          sha256 = "0np2hv3x620lvdm1lznc9mjhi0jh06agkb475cbqvj9jw922zrqf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7588,12 +7632,12 @@
     ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ciel";
-        version = "20161213.2141";
+        version = "20161230.2212";
         src = fetchFromGitHub {
           owner = "cs14095";
           repo = "ciel.el";
-          rev = "bf0c83ff06e229a15aabfa132237b7d4a05abcbe";
-          sha256 = "1967vgfmi0asa7zwhzwpp63hhckp4wcmdxwbpi7rixhqp521cp7k";
+          rev = "ea047b6c097255ea3709b56007d0d1a3b3d5c9bc";
+          sha256 = "1f0f2l3na49964wlyv8w99q2qqv5dsr880i6n1xin0q6yqms61yw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel";
@@ -7738,7 +7782,7 @@
         version = "20161004.253";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "290645";
+          rev = "290889";
           sha256 = "1vbngm8xf7i8f3140y0dk704vagcws6is9waj9qsy6yg0vxmqp0y";
         };
         recipeFile = fetchurl {
@@ -8233,8 +8277,8 @@
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "closql";
-          rev = "8b063e70808049210b749164b8f22f56924b9949";
-          sha256 = "1qhm8zmidinr35lk0pff6nla3d05cqf81hjb55yrwvdvyr5gyl1k";
+          rev = "0bb0fa3dd1e545cbf025d42e253ddb00107156a3";
+          sha256 = "1mpycmj88gi62rhzxdv4933l318j3llphbc00b7rvzms55sgpcz5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@@ -8355,12 +8399,12 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20161221.455";
+        version = "20161229.138";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "e6ebde34374378b6dc751c6fa5cd3bc195390784";
-          sha256 = "186djm9wr0gjpmzn1940i2fnrzbcc57gb76yzznwfxbd4k8x90j9";
+          rev = "393d6e9affa6f9978600b6c0ef8a4fe8bf73d813";
+          sha256 = "0lg6ky9h4a96w8mma668kxfv9dffw97h1swjq33cvhv5pp3p9rrr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8380,8 +8424,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "65fb0fa63279b96035a144fd2f6413d1b2def47f";
-          sha256 = "0syap84yayvqvyv0pc7l2w5db0r9mmz2ix6drsr4jcdfhcjkqgg7";
+          rev = "bd9b53ab33bb2185d526e8897cbd8f95c680b2c7";
+          sha256 = "0r6dqiaz8mj5xzhgwzlbn8lqxkg9kv65qwd8x1c8rqnjs3r86c9x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8438,10 +8482,10 @@
       }) {};
     cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "cmds-menu";
-        version = "20160830.1130";
+        version = "20170102.917";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/cmds-menu.el";
-          sha256 = "00wl9qqqqznd3hk0zxc6l5zsnmkmqikzpirm5gj2lp1wqdkrbmi4";
+          sha256 = "0zkqpv7n4idzqkayildxkgaqsy1rjkmsf5ppkjld3jk1j53kacfc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu";
@@ -8667,10 +8711,10 @@
     col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }:
     melpaBuild {
         pname = "col-highlight";
-        version = "20151231.1233";
+        version = "20170102.918";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/col-highlight.el";
-          sha256 = "1fpkymmgv58b734d2rr7cfj2j2if1qkwgrpk3yp2ibw2n2567y0s";
+          sha256 = "0ayr0psmfjy8iqq779v12ccgzclwakzlcfsl7g98qvxxmkh1vm8j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a16dca0068d9d4f25ad6b699ec8cb8da6ba17e5/recipes/col-highlight";
@@ -9102,12 +9146,12 @@
     common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "common-lisp-snippets";
-        version = "20160531.903";
+        version = "20161231.1557";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "common-lisp-snippets";
-          rev = "442ec783ee0e691a7b5554b13a317abd090ba080";
-          sha256 = "0iz5fgcp542hx26q6vmycfrfxyn58yjkdjr6zfn3mzhmxssaf1rc";
+          rev = "bb8d22994592a7e69ef8e613e8638882e4e0e404";
+          sha256 = "0i4w5jkz0yxnnapyijvjd5z1rcp0g3r3abj6hchb5yd26h1jcz8a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets";
@@ -9123,12 +9167,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20161211.1850";
+        version = "20161231.837";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "21357f6d6274420d0f4fda07841daf0853b4749c";
-          sha256 = "0nywpm89vw2qsplwndijxzl8bga7i69j3aspf9qbypnhlbmkvm0z";
+          rev = "906deabef91c217658635e55f726a7de379e9560";
+          sha256 = "148q9wazdjzvd8lm810zknp12wfbqn3c4lbaf0v83kx0b4bkglyf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9411,12 +9455,12 @@
     company-emacs-eclim = callPackage ({ cl-lib ? null, company, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-emacs-eclim";
-        version = "20160813.1754";
+        version = "20170101.1312";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "b67a8fed3bbd0af8a69e4359c27fe4646cb92989";
-          sha256 = "1fmr3r83w2vbdh6hrxjad83vnhr2sshlwvmi71zc3rg8vqwc6vdk";
+          rev = "03d9cb7b6c3ac60fd796a2ba8fdfe13552720d3b";
+          sha256 = "1dzy463jpfjz7qhr1zwx8n3xrba6zj87j6naf7xx4j704i03f9h8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9432,12 +9476,12 @@
     company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-emoji";
-        version = "20161108.1800";
+        version = "20161230.1937";
         src = fetchFromGitHub {
           owner = "dunn";
           repo = "company-emoji";
-          rev = "b971ab0a66126f0d1410254ba1e21f17c2270101";
-          sha256 = "1c9r1j7xpq6c27y6akfarrcg87idww3c10rkhm26m1vprqk73vr3";
+          rev = "8dc88ffe0773ef44321f245d39430c14a1bc2b82";
+          sha256 = "1y8l9wnc13g79znyw2qsbm33da2bhkj270ppikkg9h4x2qpmxilq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji";
@@ -9495,12 +9539,12 @@
     company-flx = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
     melpaBuild {
         pname = "company-flx";
-        version = "20160423.1713";
+        version = "20161228.1736";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "company-flx";
-          rev = "bd2035390c285769c39a2bd2fdd0f24da0cd7ec9";
-          sha256 = "1di3nndif2gkzwvs8bvqg994z422ql308lh47hbjdjnqm182mwy7";
+          rev = "0c9fddf7c11c918ed42bd6a5108f8969b37704d5";
+          sha256 = "1nv2hlmjdd7y9d25n22gwl0qzrsc0qpfwyhf44g0xq6dg5lgbpkj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f27d718ee67f8c91b208a35adbbcdac67bbb89ce/recipes/company-flx";
@@ -9730,8 +9774,8 @@
         src = fetchFromGitHub {
           owner = "kshramt";
           repo = "company-ngram";
-          rev = "6a39e9c22d6f1e5d5a725c6a1c276f9ecfacdad4";
-          sha256 = "1cjrw0g8hjbk8d2vmgy8brfvamswf24iylgwvqpz90x4si22xrzc";
+          rev = "98491c830d0867c211b773818610ace51f243640";
+          sha256 = "196c870n7d46n4yhppq5np8mn9i0i74aykkbfk33kr4mgilss4cw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
@@ -9772,8 +9816,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "fa4a79892e1097db28dce7ba4058e68998228ddd";
-          sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508";
+          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
+          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10107,22 +10151,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    concurrent = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    concurrent = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "concurrent";
-        version = "20160109.2046";
+        version = "20161228.1930";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "9b46dedcb89923de417f7557743c4c22421f5787";
-          sha256 = "0bq00qc0hyjczqjm8nawbyqlm67azi501v7q3bhapi4rhyn0lp7i";
+          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;
@@ -10298,12 +10342,12 @@
     copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copy-as-format";
-        version = "20161216.1810";
+        version = "20161231.1628";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "ba99e97da0ebc85f82e8cbb14fa245aca242e36b";
-          sha256 = "1dsv5vkg4kiqybffrld7idz95y3504b2fan0vsy021jv9j5k75gq";
+          rev = "f10105bb5a6a9ccc557649a56f46546b25a5460b";
+          sha256 = "0p27jdwp580x6namdklk7472ajj72h2zka4q70yccszh52c44iyq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -10407,8 +10451,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "482c3e9842e545db352237d448109154de87aa7d";
-          sha256 = "0znj9s67ir5xmrmifqql4mp433hnas8hz15mbvf1rl4mcn06z3q1";
+          rev = "dc693c37dae89e9a4302a5cce42f5321f83946c8";
+          sha256 = "0bg4ki0zzqr0pir4b3p0bpv747bfb5a8if0pydjcwrwb05b37rmp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10697,12 +10741,12 @@
     creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "creamsody-theme";
-        version = "20161221.120";
+        version = "20161231.2153";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-creamsody";
-          rev = "70d6bd750aee1435913f7e9019451ca0a7e27b3e";
-          sha256 = "0bh7b020dnl7ci8lzyj2570vzxp60i5zp6r8h79xhd8pbv638rmg";
+          rev = "c1b2de723d1047ffa199a2cfb14131218962a07d";
+          sha256 = "0kncywrxpb8yn8i0wqspx9igljzlv57zc9r32s1mwgqfz0p2z823";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
@@ -11235,10 +11279,10 @@
       }) {};
     cursor-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "cursor-chg";
-        version = "20151231.1240";
+        version = "20170102.922";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/cursor-chg.el";
-          sha256 = "1w0msh4mfhwglkwgb8ksqfdzbd1bvspllydnjzhc0yl3s7qrifbd";
+          sha256 = "04as4z0sbirdi68swcia783caz7hlbk5qicnpq0d4ihmnbagy3fd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/871d02540951a217ea3d4aed9ce6b66a77223fbf/recipes/cursor-chg";
@@ -11274,10 +11318,10 @@
       }) {};
     cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "cus-edit-plus";
-        version = "20160529.1437";
+        version = "20170102.923";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/cus-edit+.el";
-          sha256 = "0d62nv8i208ysi5cg906p9ribpnrn2jvzdcwm35km4i0q0bp6yg7";
+          sha256 = "1mmcnx0i9jz1xzxgl9wqlfk4yl8y3bz88jf8078b80y34489lky9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57370fc617f4f10cc67e9d3c6dc113ff0a18cace/recipes/cus-edit+";
@@ -11395,12 +11439,12 @@
     cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cyphejor";
-        version = "20160531.905";
+        version = "20161231.1558";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "cyphejor";
-          rev = "9e1cdaaaf86f3acae074e40d96de008115d81ef9";
-          sha256 = "04add8i0g4x5kzi1yd49i5viq9i2f5r5gzq33k05q6rimsp2ga02";
+          rev = "2c65c3f111573e1919e0a35e0ef84b9e861572b7";
+          sha256 = "1lclz4k4xh535ilxqxpaqzdzn4j6zml9a0vrzxn6ffgd378dxn31";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor";
@@ -11441,8 +11485,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "cbbcdbb32be2de5a6284f5caf888ab582d4a3dfc";
-          sha256 = "1h5k46qk8m7za6x2j7cydq4sg105g3izm97vfr3b9r92gbcj9iqr";
+          rev = "2031c5340eb9ce0e304b59f8dd89bc9049900d4e";
+          sha256 = "19bvvk3nd6hhy4rzczs1jfiy3jvrsl28xsw84wn2sslm247svd7g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11563,12 +11607,12 @@
     dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dante";
-        version = "20161221.701";
+        version = "20170103.420";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "19b644824eb29cf3f796db8178544221f6973d37";
-          sha256 = "1qhgj2zxzgw75d0lkswg61pf48aqw7pym79qra7jgsy9ir7xlgli";
+          rev = "04da558e4d693ab320c1aea62160c2a4e2152326";
+          sha256 = "1rmai7ysacaaqw7s56s18zg2aqiv0iys9m0z584ymczvszgvjl6v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -11857,16 +11901,16 @@
     dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
     melpaBuild {
         pname = "dashboard";
-        version = "20161204.1138";
+        version = "20161229.1711";
         src = fetchFromGitHub {
           owner = "rakanalh";
           repo = "emacs-dashboard";
-          rev = "cd9899342bc94e59aa42275554810e50d045aaa4";
-          sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as";
+          rev = "89875ba44ef9f69dd561591ea8ec6d39a0b4aa6d";
+          sha256 = "0qx2kb30s1z0mlr2sk1jx538v768g7df7v5ymmnvipl8xkr2ams3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b047625aebdbf7b5d644b55afbdccfc6c4ac14a8/recipes/dashboard";
-          sha256 = "04lp8ylfnbdj65s8z0m5kyj4rwxcsdwinlkpj00j1my0m74y5i0p";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
+          sha256 = "08pdpjfrg8v80gljy146cwpz624dshhbz8843zl1zszwp2p00kqy";
           name = "dashboard";
         };
         packageRequires = [ emacs page-break-lines ];
@@ -12211,22 +12255,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    deferred = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "deferred";
-        version = "20160109.2046";
+        version = "20161228.1930";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "9b46dedcb89923de417f7557743c4c22421f5787";
-          sha256 = "0bq00qc0hyjczqjm8nawbyqlm67azi501v7q3bhapi4rhyn0lp7i";
+          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;
@@ -12795,10 +12839,10 @@
     dired-details-plus = callPackage ({ dired-details, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-details-plus";
-        version = "20151231.1250";
+        version = "20170101.918";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired-details+.el";
-          sha256 = "07z4h5l8763ks6b6m8dcmq78jiyq4xvan1mb0z8fbasmi1bsrya4";
+          sha256 = "1bm4q66wi476ppf8xiz9p0x491rqdxx9gpmn6sl9izjfg2xck4wb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b6a13a5dfd977979d3185139000e7a639d32ec4/recipes/dired-details+";
@@ -13086,10 +13130,10 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20161120.1849";
+        version = "20170101.840";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "1pidj3658rrj4sn9kmjay9bb90a8p67n6gfw8gk90pqb1nxfx1v2";
+          sha256 = "1vblbkflszci8x415am68fy9if02gnnphz2sz3h3c0368kixf6w7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -13225,10 +13269,10 @@
     dired-sort-menu-plus = callPackage ({ dired-sort-menu, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-sort-menu-plus";
-        version = "20151231.1251";
+        version = "20170101.923";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired-sort-menu+.el";
-          sha256 = "1hjci4zfzig04ji1jravxg9n67rdr4wyhmxmahbrzq9kjnql510i";
+          sha256 = "1ajx4nd14pzbj2629psc3aqmsfb7wsdggcrwyxy94mnvg553m5q9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu+";
@@ -14190,10 +14234,10 @@
       }) {};
     doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "doremi";
-        version = "20151231.1255";
+        version = "20170101.922";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/doremi.el";
-          sha256 = "0201clwq9nbl8336lddcbwah8d6xipr7q8135yq79szfxq2bdg6v";
+          sha256 = "11cxhfps8d0b0nsqq4mvwxpppmwagzxmlzy70icf85iv83xa74kv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi";
@@ -14209,10 +14253,10 @@
     doremi-cmd = callPackage ({ doremi, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doremi-cmd";
-        version = "20160512.1712";
+        version = "20170101.919";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/doremi-cmd.el";
-          sha256 = "1ay8rkcyydjqi1081vphb8iw3w2zc73m5bg1dz2mkxhksqwchqvj";
+          sha256 = "01x19bsdmz2z18s5a30mnbsgk1xjmff9rsd6dd2phaj750j6aiyb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-cmd";
@@ -14228,10 +14272,10 @@
     doremi-frm = callPackage ({ doremi, faces-plus, fetchurl, frame-fns, hexrgb, lib, melpaBuild }:
     melpaBuild {
         pname = "doremi-frm";
-        version = "20151231.1253";
+        version = "20170101.920";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/doremi-frm.el";
-          sha256 = "0v7ycmddh1ds64m1y5yai5nh34bd32q3wcm5y2pdzhj6jk7nj5wz";
+          sha256 = "1gbm3iyfg96fafnydha5zyj3sip1i7bk2qhr3hpa2g895mjfv6kd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-frm";
@@ -14246,10 +14290,10 @@
       }) {};
     doremi-mac = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "doremi-mac";
-        version = "20151231.1254";
+        version = "20170101.921";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/doremi-mac.el";
-          sha256 = "157kvlb4dqiyk1h7b4p0dhrr6crdakwnrxydyl6yh51w2hdnnigw";
+          sha256 = "1ilsnyzh4kka0kncd8w4fc5v9nm7q05i3g25z3m49zqifxp1vlfa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-mac";
@@ -14618,7 +14662,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1776221";
+          rev = "1777121";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -14782,11 +14826,11 @@
     dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dyalog-mode";
-        version = "20161213.651";
+        version = "20161231.1437";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "20a2166c8210";
-          sha256 = "0gz0aiks3f53lqvnrnb33a1clq52ipd3i3miymvkkgspnz3vl12p";
+          rev = "4004050a9771";
+          sha256 = "0p7g7sfkdr473gpj2xdgg5fb5d336w2ddvx44i1d6575p6rcs5w6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -15180,12 +15224,12 @@
     ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ebal";
-        version = "20160531.906";
+        version = "20161231.1559";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ebal";
-          rev = "1155c70b8dbb2f2caed2958782afe3d8018ab0b2";
-          sha256 = "0fbfdhz1fmxiy9hg038qqw7r3gvhvzyk68qaww0saja9zywx8hal";
+          rev = "c0df139972c52200db417cc18e65f8748969fb79";
+          sha256 = "19yxfc6lbd4311w291lxsw1v3hp0ha4inlp5fcakszd76bc69c4w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
@@ -15268,8 +15312,8 @@
         src = fetchFromGitHub {
           owner = "ecb-home";
           repo = "ecb";
-          rev = "7df501f5e9bc38f8fdd0d0ecc1e60d2b32914afa";
-          sha256 = "0h50amhz0yzp9zz9nviaimmh9i0rgrr10pdf5fjxc8nc669b35z5";
+          rev = "661edbfcddcdb75331cf28870e6a5fb4ba9ca27f";
+          sha256 = "1ac9b6k10kniqkiadzfa7mjhy1nf6ypd3fl6yvmr8yigc2phszny";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4db5183f35bedbc459843ad9f442f9cb6608c5fc/recipes/ecb";
@@ -15284,10 +15328,10 @@
       }) {};
     echo-bell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "echo-bell";
-        version = "20151231.1256";
+        version = "20170101.925";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/echo-bell.el";
-          sha256 = "0jk7pb2sr4qbxwcn4ipcjc9phl9zjmgg8sf91qj113112xx7vvxa";
+          sha256 = "1q1z151cfw1775gcfzpnm4afp62skqlnj5z2miizbnraincqy24b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a81e339e9c7cf1ae5fe91ab4442164336a6fbf13/recipes/echo-bell";
@@ -15303,12 +15347,12 @@
     eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
     melpaBuild {
         pname = "eclim";
-        version = "20161206.908";
+        version = "20170101.1436";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "b67a8fed3bbd0af8a69e4359c27fe4646cb92989";
-          sha256 = "1fmr3r83w2vbdh6hrxjad83vnhr2sshlwvmi71zc3rg8vqwc6vdk";
+          rev = "03d9cb7b6c3ac60fd796a2ba8fdfe13552720d3b";
+          sha256 = "1dzy463jpfjz7qhr1zwx8n3xrba6zj87j6naf7xx4j704i03f9h8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -15685,8 +15729,8 @@
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "0e89a891eeffe942d71b93f7792958b38ea1ecf3";
-          sha256 = "09k3rqlwwssmqgynaww3ddfvgvarbsaspgr2c2xzbp9l5gg3rr4h";
+          rev = "95594ff4a88d94f79b092b2eced1e87fa9ad5ee8";
+          sha256 = "11d9d9qgfdid47pk9vi1ca3wjp02b3bylzbz23hpcrl7zjypr4ar";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -15702,12 +15746,12 @@
     editorconfig-custom-majormode = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-custom-majormode";
-        version = "20160729.24";
+        version = "20170102.751";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "editorconfig-custom-majormode-el";
-          rev = "601ce5a04634003075396a8ff74d0b09cfa7c11a";
-          sha256 = "0jdvg1a76r8vg2d0n8hl2kczg8hybk2hcbd732g3vhzl8i4izfi2";
+          rev = "8216ce7d20703a8ce923b4c0284c098ae85621f9";
+          sha256 = "02qkvdgn78asz1i7gh8198z0as4yhax3yans96c8lxwmbac125kz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd47bf4630442ad1a941ad432cef64c7746aa71/recipes/editorconfig-custom-majormode";
@@ -15919,12 +15963,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20161223.1433";
+        version = "20161228.741";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "cfd0e8a3d7edd0f82324568bc80ac92c4bdccf91";
-          sha256 = "0fvicmdv6w7jg24fz524c21r239iiqj4xg25i51sp3l242hc74w1";
+          rev = "481d8a879f821e8cbbf074175672295356f43ba5";
+          sha256 = "0ip60d4k466y3gd16na58398ilzrzrk84dbl5lsh330khi65136a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16333,12 +16377,12 @@
     electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
     melpaBuild {
         pname = "electric-operator";
-        version = "20161211.1122";
+        version = "20170102.307";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "86d5ae04c35642cbccfa75a12008f7b65d63312b";
-          sha256 = "189vxvhp018bs42qb6z9nfw51nsmjfb5q66w3hr5zgkapxwgjpsv";
+          rev = "1670a0d8e4a09b48da312afc57d35e0cf7033b5f";
+          sha256 = "0cm1zg2hgwzwwkri0wsb6x9jhgma6vm9jga81jjiasih33nd0zy4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -16417,12 +16461,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20161226.1829";
+        version = "20161231.735";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "cb33398b05e2f2d7e1ce8136b2cbcb920f9cee66";
-          sha256 = "1sl59wniwrsqxwhlhsqcagx5hdlyciw5qykfrp0mmw8f2akccrb5";
+          rev = "03040c762901ff3f77942b9cf2a78aa127ded1d4";
+          sha256 = "1vik0vs85dny7kkaf6cwqahly8l5llkgzs6f2jcfrc90xdg6j3dz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16491,8 +16535,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "cb33398b05e2f2d7e1ce8136b2cbcb920f9cee66";
-          sha256 = "1sl59wniwrsqxwhlhsqcagx5hdlyciw5qykfrp0mmw8f2akccrb5";
+          rev = "03040c762901ff3f77942b9cf2a78aa127ded1d4";
+          sha256 = "1vik0vs85dny7kkaf6cwqahly8l5llkgzs6f2jcfrc90xdg6j3dz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -16529,16 +16573,16 @@
     elisp-depend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elisp-depend";
-        version = "20120428.1304";
+        version = "20161230.750";
         src = fetchFromGitHub {
-          owner = "tehom";
+          owner = "emacsorphanage";
           repo = "elisp-depend";
-          rev = "817ab94db56e3c23da6d7d4ae0422c48f260a7e3";
-          sha256 = "1a73zdh4jkx8f74cq802b5j4bx8k1z7cbsp10lz40lmwwxbl3czq";
+          rev = "e4b201ac7dcee4489d58800c299fd04aaa61d07a";
+          sha256 = "0i1wpz6hr934x3lcr0y9x82dm7c1j477j14jqccn8q7d4cb1lfaj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/elisp-depend";
-          sha256 = "1x3acgkpd9a8xxjg5zjw0d4nv4q9xx30ipr6v3544mn16sv4ab7c";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7ea159f0cc8c6e4b8483401a6e6687ab4ed73b7f/recipes/elisp-depend";
+          sha256 = "0zpafwnm52g6v867f1ghfb492nnmm66imcwlhm5v9hhgwy3z17jm";
           name = "elisp-depend";
         };
         packageRequires = [];
@@ -16655,12 +16699,12 @@
     elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "elixir-mode";
-        version = "20161015.1200";
+        version = "20170102.942";
         src = fetchFromGitHub {
           owner = "elixir-lang";
           repo = "emacs-elixir";
-          rev = "b71145e1f23f1222220549bd28bce3557711717e";
-          sha256 = "06m937mkd4hiqi28drqnkk8pr089ijkbcacgbxf86d5iy8qwyhw4";
+          rev = "384d8daf8ad563ebf2cb3437c71d30241adbe099";
+          sha256 = "0idgfjwd6116zaag0lmq2i9by2mr054nrqmpnsvyhk26hw71k3vn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode";
@@ -16928,12 +16972,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20161221.717";
+        version = "20161229.1103";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "7899993ef4326be427ee18556d08f43d1b169c81";
-          sha256 = "15ww6p95600wgl1smxw47m8bh9pc6ap575laplv69qi6qmrivp91";
+          rev = "d93ad53fb55c1ff2cbbafcc8c85bddc30484bc80";
+          sha256 = "1ii3p81hn84f155mywz906pnjkp5qca501qrplh96c5d0xkzz14l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17439,12 +17483,12 @@
     embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "embrace";
-        version = "20160513.1913";
+        version = "20161228.1948";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "embrace.el";
-          rev = "875601a077795e036b470bdacd292a97b075d8e7";
-          sha256 = "07phgsc7lv9326gdjg23q0lzw45vcpx4biw93r10v0ln6bg21mz8";
+          rev = "7e0cc702bc15915f4e4be4c334faa37dca94e749";
+          sha256 = "0w746jbyfjd8z8ga5nlsipw02pcbi98wxfdw51zv088ml0647v6j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
@@ -18108,12 +18152,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "20161201.1358";
+        version = "20161231.850";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "846c5ee182e6572af3034c5b43d439a6c915d243";
-          sha256 = "17i68vsl1grffs7j5n7lzkwi870fci7y84q5i7qwvip3vhpxlczr";
+          rev = "6e1d989fbfa357a7c268ea30fe8b3e3cefafc36d";
+          sha256 = "0avlmqcbm07692ir5z04gy4klhyan3h25ni4l4k4p0dszjsqmdi0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -18255,12 +18299,12 @@
     erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-crypt";
-        version = "20161105.623";
+        version = "20161228.739";
         src = fetchFromGitHub {
           owner = "atomontage";
           repo = "erc-crypt";
-          rev = "d30f426b4cae10efcb91ea57afa9cc51feb4c39f";
-          sha256 = "0r9n9jhd0sbf1mf3mzizaal5kqd20msm20vl73z589ph2q5vxnii";
+          rev = "731f9264a5bf08a8fc0b5ce69e72058c86f873a5";
+          sha256 = "13jpq5ws5dm8fyjrskk4icxwz8k5wgh396cc8f8wxrjna4wb843w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt";
@@ -18636,8 +18680,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "691a6d0f68c5a2ef64315dd4d7759aa7aa8e2e99";
-          sha256 = "0j3xg5gv77czaldhqk1h53d0wn694xbcs2ybzpigvh51gmpsp0w2";
+          rev = "9cb4770469218f65dbaec6c71d12b4aa722ac791";
+          sha256 = "1jnaabp5zrvm6qymy4fg3rxbd78xy44x1qnxcdvmqk0dliaqlzn3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19734,12 +19778,12 @@
     evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-easymotion";
-        version = "20161023.2356";
+        version = "20161231.1310";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "evil-easymotion";
-          rev = "6d5cb5825ce3a266cc3e10c5ad40a1e038f068f3";
-          sha256 = "1qgmpvwbay7s1b9gsll06nf5hygrb1ixw155538ckhcaxra48719";
+          rev = "88c0bf01b9e7199c98a6054a425a226790ad96df";
+          sha256 = "1akbg5qhq64nbb3iqhpi0ffyc8sffqszjgglvhclbdwkxcbq3f12";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e67955ead0b9d69acab40d66d4e0b821229d635c/recipes/evil-easymotion";
@@ -20091,12 +20135,12 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20161219.1810";
+        version = "20161229.1224";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "1c87e3a510780d9cccaade613d550ce98c828e58";
-          sha256 = "1s0cmp4vg2a6fbrgjkzjflj2jhzjh3v1p70q976awibzb1vnzg6a";
+          rev = "c1b886acffa804c39b85909bbcb699fc1dbd03fe";
+          sha256 = "0jj45m6s2hm36h5v2bwlxhnayrfwbs99zc1xvfd0kxkx9jz10fz6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -20784,12 +20828,12 @@
     exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exec-path-from-shell";
-        version = "20160812.159";
+        version = "20161229.1338";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "5836fb1656493be4152e8f20b5b0ec3d49ca2787";
-          sha256 = "1laii7pvw18pp71r0fssw67lgw7wb5wqbjrpdrg5xr7smx8fxccc";
+          rev = "0f53502d463eeeaefe48dfeb0c2fbaac1e6302e3";
+          sha256 = "12mkh5sna8j0ijxc6fd8sr2zlk3p6w9q3fv5l3n16sjmnlj3cf0r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell";
@@ -20952,10 +20996,10 @@
     eyedropper = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }:
     melpaBuild {
         pname = "eyedropper";
-        version = "20151231.1301";
+        version = "20170101.930";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/eyedropper.el";
-          sha256 = "1fg3j0jlww2rqc6k2nq95hcg6i26nqdp043h7kyjcwrgqbjfsigl";
+          sha256 = "1132mc9c79k07gh51i50qaykilnxwzb58rf18pja9fdqc9vzcs7y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/eyedropper";
@@ -21075,10 +21119,10 @@
       }) {};
     face-remap-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "face-remap-plus";
-        version = "20151231.1302";
+        version = "20170101.931";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/face-remap+.el";
-          sha256 = "0yr3fqpn9pj6y8bsb6g7hkg75sl703pzngn8gp0sgs3v90c180l5";
+          sha256 = "1mjh7hjpfxy476nwn0kbcq1zyaklrxd3l8482y5dlbcziwg85s1f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/face-remap+";
@@ -21093,10 +21137,10 @@
       }) {};
     facemenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "facemenu-plus";
-        version = "20151231.1305";
+        version = "20170101.934";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/facemenu+.el";
-          sha256 = "1kayc4hsalvqnn577y3f97w9kz94c53vcxwx01s0k34ffav919c2";
+          sha256 = "0xdrmmygyynk0rinfhikw5zjbh8kf8xbcs5a79irhm5mv88jiikf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/facemenu+";
@@ -21111,10 +21155,10 @@
       }) {};
     faces-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "faces-plus";
-        version = "20151231.1305";
+        version = "20170101.934";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/faces+.el";
-          sha256 = "0sqrymmr583cgqmv4bs6rjms5ij5cm8vvxjrfc9alacwyz5f7w8m";
+          sha256 = "1cvwna544xk5jlmimsszvvqcf2h8xmx6f9ripbpvkldgqalb91mn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/faces+";
@@ -21526,10 +21570,10 @@
       }) {};
     files-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "files-plus";
-        version = "20151231.1307";
+        version = "20170101.936";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/files+.el";
-          sha256 = "0s79b5jj3jfl3aih6r3fa0zix40arysk6mz4fijapd8ybaflz25n";
+          sha256 = "01391gkkzciahi2azad5gd260i9s48c5k73m2w3qinv7clqwxc32";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/files+";
@@ -21544,10 +21588,10 @@
       }) {};
     filesets-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "filesets-plus";
-        version = "20151231.1308";
+        version = "20170101.937";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/filesets+.el";
-          sha256 = "020rpjrjp2gh4w6mrphrvk27kdizfqbjsw2sxraf8jz0dibg9gfg";
+          sha256 = "0d30i1vnmja1vjhqs25vdph2gcvrsrrxvzgnm5hp8pscf8wz1igf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets+";
@@ -21646,10 +21690,10 @@
       }) {};
     find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "find-dired-plus";
-        version = "20161128.1426";
+        version = "20170101.938";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/find-dired+.el";
-          sha256 = "1h4q2v88wvfmzdmaqnp9fywna7n9a94kziz6hjdf1xhc5a7lxqsc";
+          sha256 = "1ll1qr9kkx3fy0j7s5zz95gwsfj0j925cgkcs5ic5rds474881q0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+";
@@ -21748,10 +21792,10 @@
       }) {};
     finder-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "finder-plus";
-        version = "20151231.1313";
+        version = "20170101.945";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/finder+.el";
-          sha256 = "0x3f9qygp26c4yw32cgyy35bb4f1fq0fg7q8s9vs777skyl3rvp4";
+          sha256 = "1ip8y3qhswfhshh61c7b8iajdnlsyg2cpypbv87825mzy8vbgp6z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/finder+";
@@ -21952,10 +21996,10 @@
       }) {};
     fit-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "fit-frame";
-        version = "20161002.912";
+        version = "20170101.946";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/fit-frame.el";
-          sha256 = "1v4c3l2lcglrvcqk27amrpg29rnn6009w968sf6kdab8k2yz5f4b";
+          sha256 = "0l48zayzmlpzvqx02g1d2ilwijakwl2ql5svk78w3vx4nj41xxj7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e13c77f822db3c9eaeb3fd5fa95cc2dbe5133f2c/recipes/fit-frame";
@@ -21971,12 +22015,12 @@
     fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fix-input";
-        version = "20160122.2119";
+        version = "20161231.1554";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "fix-input";
-          rev = "7c3f4770fd068fc789f80ec33934dc3aceb47ddf";
-          sha256 = "1hw3fvj2xq96di4xfs852vy1268hi3a4n10pzrnwnrn0mqy0hn30";
+          rev = "483365fb3c4ba5e08f5df07436294e7f8714dbd2";
+          sha256 = "09c6ynmsypjpiwwn29npsbf4lq20i5cks41maxifnpvqxmkk6a4c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input";
@@ -22013,12 +22057,12 @@
     fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fix-word";
-        version = "20150716.602";
+        version = "20161231.1555";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "fix-word";
-          rev = "36a513e401e850ecf884ef43290ad4ea3cec9af5";
-          sha256 = "02ixv7ckf419sy0r596fkc7f81bfwk410jl23z6cvdh3j64q12l6";
+          rev = "bcc22ef05b5cdd43632121bfc9d77b27df7c34e7";
+          sha256 = "066wif5p96yrcb944ic84jxxps80qxl17igagw3cdfj868y7nfik";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word";
@@ -22373,12 +22417,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20161216.1227";
+        version = "20170101.1502";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "319ba94a8165c886184a233986c4be138db0b523";
-          sha256 = "01xb7iks6804x8is0w3j9k8kbsd53f7i246xnv1davk8sa3w7s9f";
+          rev = "09c1e98fd020f9edee7c0c90e59b4da636f4af70";
+          sha256 = "0w9ma5nzahjirhg3scb9j9kbgzr2fznp9sdjvrfgcaqak28hm40h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -22520,12 +22564,12 @@
     flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-clojure";
-        version = "20160704.1221";
+        version = "20161231.836";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "squiggly-clojure";
-          rev = "7d5e714339509108f9dd3f32ded4b678744a809a";
-          sha256 = "0nxw62mn03jhcx71rg5xlp2s0kwcppahjl8drh9jvhqw3lfx9yjr";
+          rev = "254bd6a65a262896a4cc4f2061a6bbce51a5b73f";
+          sha256 = "0315x1j55wkff0fizqvalfmxjiy1rl9fjk6hl7xziiw3rdvb943a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure";
@@ -23066,12 +23110,12 @@
     flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-objc-clang";
-        version = "20161227.815";
+        version = "20161229.205";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-objc-clang";
-          rev = "9dbfad340090523db0b936517d8543d8aa2f2e2c";
-          sha256 = "0cky0zxlfajhq5kh868yh17d0pr5pqjgj8v8xhj14sbch5jvd3bz";
+          rev = "11805f1d420e297db0346a6657f144b08e2ca556";
+          sha256 = "1s9bk3k7ys79m2iww4yf1abfy01d08z9x9pfq8l045q0snsh64il";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -23402,12 +23446,12 @@
     flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-swift3";
-        version = "20161218.457";
+        version = "20161229.331";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-swift3";
-          rev = "6e1079576d30397eefea0300bf31a248a26cf98c";
-          sha256 = "0c8a5bgrirf3ms6v75w4jaiwfxf1acv2isf7x02jms7m8h36bzxz";
+          rev = "ae7b29111cb160774c317997902d7ef29cedd7d9";
+          sha256 = "17s34rqxkirb88y8jzl3ybs7j3ylp9ckdfx3sqwfn0cyspnj5f1d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -24451,10 +24495,10 @@
       }) {};
     font-lock-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "font-lock-plus";
-        version = "20151231.1319";
+        version = "20170101.947";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/font-lock+.el";
-          sha256 = "04j9xybn9an3bm2p2aqmqnswxxg3gwq2mc96brkgxkr88h316d4q";
+          sha256 = "0ffs2c7gyhfa2mskdh7a1yp0na99kk282zm4zn56ljp55rrnnnh0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";
@@ -24659,12 +24703,12 @@
     forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forth-mode";
-        version = "20161218.249";
+        version = "20170101.1245";
         src = fetchFromGitHub {
           owner = "larsbrinkhoff";
           repo = "forth-mode";
-          rev = "a7a5d4ba05d86152da7c1e90111271ce57de5d08";
-          sha256 = "1j1hx3xssw7iwxvlxxr28vql12f278fwl3nghr1dbmv2cmi8fb5v";
+          rev = "05e8a027960c77ac5a09bda959889de57ecbb486";
+          sha256 = "1s0543dc69ciz6ll7m62kaac92jmpk9yqaa37jrv5lscrp6sgamz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode";
@@ -24764,10 +24808,10 @@
     frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }:
     melpaBuild {
         pname = "frame-cmds";
-        version = "20160124.826";
+        version = "20170101.950";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/frame-cmds.el";
-          sha256 = "1867zmm3pyqz8p9ig44jf598z9jkyvbp04mfg6j6ys3hyqfkw942";
+          sha256 = "0yscijwwm31551ysagysdrryr1w33kg34j3bnrq92mxsmb6i19ad";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-cmds";
@@ -24782,10 +24826,10 @@
       }) {};
     frame-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "frame-fns";
-        version = "20151231.1322";
+        version = "20170101.951";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/frame-fns.el";
-          sha256 = "0lvlyxb62sgrm37hc21dn7qzlrq2yagiwpspa926q6dpzcsbam15";
+          sha256 = "00b2bb3rfraps47mcv0vb51ygjx0f311i95g0b7dh1jqi6nxdfb1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-fns";
@@ -24998,8 +25042,8 @@
         version = "20161123.2000";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "fa090a22929a971dc9667612ab0aff0eb8b245fa";
-          sha256 = "1ijrvhiz0m8vky2zc32c42gv4zjxwi8sq7grj66bra0x8cwyhlir";
+          rev = "350de8f1718144bd42f445e7fd460854f851470a";
+          sha256 = "144nb62ha4m171k2vh061d24q05p435947zqnrx59xp3agj5ymvv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25137,10 +25181,10 @@
       }) {};
     fuzzy-match = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "fuzzy-match";
-        version = "20151231.1323";
+        version = "20170101.952";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/fuzzy-match.el";
-          sha256 = "1q3gbv9xp2jxrf9vfarjqk9k805xc9z72zbaw7aqdxrj1bafxwnz";
+          sha256 = "130rx8x0d64pb5sz9xq3qvgq698xlkvlb76fk9xfq7n895kxf1bp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e00737be152e9082d0f0c9076cac7fcd08bd4e7b/recipes/fuzzy-match";
@@ -25343,12 +25387,12 @@
     geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geben";
-        version = "20161215.1231";
+        version = "20170103.448";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "geben";
-          rev = "ef154269e7275a5ececa7205b125093eea3d6887";
-          sha256 = "058qsaxv1f9qqi3ala391h6zdin8v8kxhag166mbvc5vwnsg3xik";
+          rev = "b6379dd479f28b2ace418e2cc57d30559f634036";
+          sha256 = "0x97xqk9xs6h1h3jqwkwi7q32j4pzw0rygsqmgb3n80l7zja6114";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben";
@@ -25826,12 +25870,12 @@
     git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-auto-commit-mode";
-        version = "20150404.751";
+        version = "20161229.817";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "git-auto-commit-mode";
-          rev = "075e5f9ded66c2035581a7b216896556cc586814";
-          sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
+          rev = "2c8197e5d7813734d6a49f9b9c0b227b7ae022a8";
+          sha256 = "0h8kma09r5fw4b2fbbia5z42x8gg72w6zk39pxnsw876kwa8798f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5660fb76ce93e5fe56227698d079c6994ef3305f/recipes/git-auto-commit-mode";
@@ -25893,8 +25937,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "991aa241795b8df0ed0b0b41acb1879f2b6fee04";
-          sha256 = "1qqrvxw7nmjvcnj0kjc7zgfv728gc5inn3igpcrz35qrz6x9xpi7";
+          rev = "d75529458b09998a68779d348527aa5a19045bed";
+          sha256 = "1si1xxn3pqd4p7vanyhq2zs4cbdkgwb908afl1dx3mih3wf1v1fr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26075,22 +26119,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-messenger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    git-messenger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "git-messenger";
-        version = "20160815.1952";
+        version = "20170101.2040";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-messenger";
-          rev = "199601fe9a71473e9c015fb2ae13f6e1ca1764e0";
-          sha256 = "1k66j0fi7101icn5a0v0km0jdckhwagmi5p6rf1fv9r90pkln1k0";
+          rev = "83815915eb8c1cb47443ff34bca3fecf7d2edf3a";
+          sha256 = "1jkfzcn8gl3s5y2hwqkac7lm88q80hgcp66zvy7vnylka1scb6lz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e791293133f30e5d96c4b29e972f9016c06c476d/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
           name = "git-messenger";
         };
-        packageRequires = [ cl-lib popup ];
+        packageRequires = [ emacs popup ];
         meta = {
           homepage = "https://melpa.org/#/git-messenger";
           license = lib.licenses.free;
@@ -26099,12 +26143,12 @@
     git-ps1-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-ps1-mode";
-        version = "20151228.102";
+        version = "20170102.1944";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "git-ps1-mode-el";
-          rev = "bb177a87a06ec928a008fc50b06ed1967b68867a";
-          sha256 = "1v0jk35ynfg9hivw9gdz2snk73pac67xlfx7av8argdcss1bmyb0";
+          rev = "e41c630f5d04cb1a4d38a4b500d7a154a96a4655";
+          sha256 = "11bg953nk5x501vkr0jrz710pz3qxla27bgrd4gp503fbygnixkz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea177b5ea168828881bd8dcd29ef6b4cb81317f0/recipes/git-ps1-mode";
@@ -26603,12 +26647,12 @@
     gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gnu-apl-mode";
-        version = "20161129.303";
+        version = "20170102.1952";
         src = fetchFromGitHub {
           owner = "lokedhs";
           repo = "gnu-apl-mode";
-          rev = "8a2bdfe945ff2d1a78f6159528f6ad3420701046";
-          sha256 = "0spn4lkvilmy48xvkpma4l30i7rzxknp56nr2kcvpdlb0mk3svzz";
+          rev = "c2ceb4c59c9ed5f17a9ed274007185ad62037134";
+          sha256 = "0gn7wjq93fq824rs2r82mygy0b3ncn3wfki1xh12b5crvdibg3q7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode";
@@ -26957,12 +27001,12 @@
     go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-guru";
-        version = "20161103.1316";
+        version = "20161117.331";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "259110bfd7acb62196b09487d0883429b444bf1b";
-          sha256 = "02ikkx044l5iqzz1hxyjjlxvk58liddmgapx39g7yj976rp6844f";
+          rev = "d9647672717bb5d507de42975a337c738a0461a3";
+          sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
@@ -26999,12 +27043,12 @@
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "20161110.1750";
+        version = "20161231.1134";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "259110bfd7acb62196b09487d0883429b444bf1b";
-          sha256 = "02ikkx044l5iqzz1hxyjjlxvk58liddmgapx39g7yj976rp6844f";
+          rev = "d9647672717bb5d507de42975a337c738a0461a3";
+          sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
@@ -27083,12 +27127,12 @@
     go-rename = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-rename";
-        version = "20161019.1204";
+        version = "20161117.331";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "259110bfd7acb62196b09487d0883429b444bf1b";
-          sha256 = "02ikkx044l5iqzz1hxyjjlxvk58liddmgapx39g7yj976rp6844f";
+          rev = "d9647672717bb5d507de42975a337c738a0461a3";
+          sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
@@ -27993,10 +28037,10 @@
       }) {};
     grep-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "grep-plus";
-        version = "20160923.1514";
+        version = "20170101.953";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/grep+.el";
-          sha256 = "17ly744dcnir98mk48prgmia7v7dpvp73l9kkni9vdz4lw5mapxj";
+          sha256 = "13ivcicjdg3ig1jfgl2n39acmrwif5h7hwvb5677i7p8i69w3nds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/grep+";
@@ -28157,12 +28201,12 @@
     gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "20161227.744";
+        version = "20161229.1817";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "de5eef8af9ceb7adbf9d0076df8c8ff0932bfaa1";
-          sha256 = "10dvyw9icvzhdspr0mj0m9pcshmgmjgcm530f7593vx75bc91bjw";
+          rev = "9a9f384a19742eb07b03b1975478c2e71a09b2e3";
+          sha256 = "1pbb8ihvldpbcvr4bwqjmlyc6wv51h49fn522vxzl9kjmhs9fqi1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -28703,12 +28747,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20161212.116";
+        version = "20170101.1257";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "319020de4a79a005eb0fe651222430ceedcd332d";
-          sha256 = "1slagi6f0mkzsjhy0cldlp5g1aqgiazkdb1mrzafw5cr12pdi9zw";
+          rev = "e5340a565fa379814472de10a330a85b08350e37";
+          sha256 = "03wcglphbnm7brrx46xliq3h6jkz6kq29z2a2vl5223hz1gwlq1n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -28765,12 +28809,12 @@
     hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hasky-extensions";
-        version = "20160813.609";
+        version = "20170101.347";
         src = fetchFromGitHub {
           owner = "hasky-mode";
           repo = "hasky-extensions";
-          rev = "3f1862989a2ca3b79761dccfa352a1b6d518ee77";
-          sha256 = "10214654gvnyqimh4950jsw1r42p0y79pfl8h0x44mzll62bvz87";
+          rev = "cd655d0d25a5ed7e9da4ebb824fff04993ab8306";
+          sha256 = "16rc5fmz4pgkd6phvzqji5lgwxzidhxkl1aa76w32lk7m8qm3yxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
@@ -28908,22 +28952,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    hcl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    hcl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hcl-mode";
-        version = "20161006.950";
+        version = "20170101.305";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-hcl-mode";
-          rev = "4ce807c57c755b1eb15e17e35f2680c86595c171";
-          sha256 = "0mb0knl84wzgyizxf2p82wwslla7s13bvxb7yd05xlnskr0yrnk8";
+          rev = "6a6daf37522188a2f2fcdebc60949fc3bdabbc06";
+          sha256 = "0jqrgq15jz6pvx38pnwkizzfiih0d3nxqphyrc92nqpcyimg8b6g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
           name = "hcl-mode";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/hcl-mode";
           license = lib.licenses.free;
@@ -28931,10 +28975,10 @@
       }) {};
     header2 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "header2";
-        version = "20160810.1234";
+        version = "20170101.954";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/header2.el";
-          sha256 = "1fiqmbmnq07v70ak6jvvdb27val420zvq5xlwyrqdj5qjri8z83r";
+          sha256 = "124cqzhhkaplq3nxlmy2dizpbllcazqbpv9k2yjxj5zk50s8dzxr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d16829cb4dea98908735be13aa632bc13d308acb/recipes/header2";
@@ -28971,12 +29015,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20161225.455";
+        version = "20170103.444";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "6487e756cd19750790c0fea6ae33ce0f2c62a670";
-          sha256 = "01gyk0m3wlnasfr3x27wkyhayy9jgk050gfm8a5yfmg5kdnzxrwm";
+          rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624";
+          sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -29185,8 +29229,8 @@
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "58dc08b8b8e6ea0c809052e082c867e05acef16a";
-          sha256 = "0cf3h0lkya6rsmg60qzbiz63vp8lm7nd4xlxym44hpp75nw06mgb";
+          rev = "1e11998cc45a12a1b1bd19b8fe9ed8a9f0c50774";
+          sha256 = "1q7vqi1g2rbkh6lxlma7rb8vpsx5vxl2iadxzbzy21d4knjpnj96";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -29538,12 +29582,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20161225.559";
+        version = "20170103.444";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "6487e756cd19750790c0fea6ae33ce0f2c62a670";
-          sha256 = "01gyk0m3wlnasfr3x27wkyhayy9jgk050gfm8a5yfmg5kdnzxrwm";
+          rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624";
+          sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -29853,12 +29897,12 @@
     helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-flx";
-        version = "20160227.1652";
+        version = "20161229.1056";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "helm-flx";
-          rev = "3cb3587297c3b6e863d79b7d4d7564043c888b61";
-          sha256 = "0mrck7qbqjqz5kpih3zb1yn2chjgv5ghrqc5cp80kmsmxasvk8zw";
+          rev = "7754ed3e0f7536487624dda2d4001f7eeb92d86d";
+          sha256 = "1z0rbx5iix0mq2ai94ip8wnwgxh6sd6qsynaayrgj2hmzsbvv12d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx";
@@ -30336,12 +30380,12 @@
     helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-hunks";
-        version = "20161227.633";
+        version = "20161229.657";
         src = fetchFromGitHub {
           owner = "torgeir";
           repo = "helm-hunks.el";
-          rev = "798b727a710b31330d498d24c13c109f9bcb0624";
-          sha256 = "1z0rqsdqa8czp7hhd2l4g3ayils36cnjl0m51hn9lf5xsf0l5gj1";
+          rev = "aa266c87d5ac08f8a4021627d104972679bba21c";
+          sha256 = "1g7mr04mhf0cx68ww28zfppigjp9m4b11sc037gn770n1vm0xvcm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks";
@@ -31636,10 +31680,10 @@
       }) {};
     help-fns-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "help-fns-plus";
-        version = "20160917.1126";
+        version = "20170101.959";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/help-fns+.el";
-          sha256 = "12hjki054sm7gaky7q3b3sp8y4lxpnaq1vphjg85pfvad72rz71p";
+          sha256 = "14i48b139m7kp2qmmm8vfv359i74zmbjw1mck2n67xdxrh8bsk0k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-fns+";
@@ -31654,10 +31698,10 @@
       }) {};
     help-mode-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "help-mode-plus";
-        version = "20151231.1331";
+        version = "20170101.1004";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/help-mode+.el";
-          sha256 = "0qmf81maq6yvs68b8vlbxwkjk72qldamq75znrma9mhvlv8igrgx";
+          sha256 = "1aj53ihdhrxsncw14v4npgfsbpjnzmz481nx8xmzlcxs16xayyqv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-mode+";
@@ -31672,10 +31716,10 @@
       }) {};
     help-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "help-plus";
-        version = "20151231.1328";
+        version = "20170101.956";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/help+.el";
-          sha256 = "1r7kf9plnsjx87bhflsdh47wybvhis7gb10izqa1p6w0aqsg178s";
+          sha256 = "1k772rdakq2br8ahlk5l84s534wnb8jarlfhv4nbfaip6hidfqgk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help+";
@@ -31774,10 +31818,10 @@
       }) {};
     hexrgb = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hexrgb";
-        version = "20161223.1205";
+        version = "20170101.1007";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hexrgb.el";
-          sha256 = "0n09sf15mfvxlxzd1rqq8wlkhd5q2wdbn83zahw81r4qzdz2wdcq";
+          sha256 = "1cpf5kj49iam5bfw2mddv4c5vr8d4j0sipbzjry3s8jvcxw2lzbi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9d7811584920508184a84ee4049e159cce3bb4/recipes/hexrgb";
@@ -31876,10 +31920,10 @@
       }) {};
     hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hide-comnt";
-        version = "20161227.1008";
+        version = "20170101.1008";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hide-comnt.el";
-          sha256 = "1g5dflma5hzpr6b2xjraiw4rgh8kgrr3k36dpw2b299jdfk01322";
+          sha256 = "1gjca7796bg6skyqry90l5ywpw72zl6zkhzbq9fy8bi8q7a76g06";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05a695ab2bc358690c54611d21ef80cb51812739/recipes/hide-comnt";
@@ -31969,10 +32013,10 @@
       }) {};
     highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "highlight";
-        version = "20161223.1550";
+        version = "20170101.1010";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/highlight.el";
-          sha256 = "1hpsfnwnhmxcvwijib410pmy2kzn8c3qym0i5ppcp5chii46wihw";
+          sha256 = "19mj1fw9hwqz5kybjbmac6l4gh8g52s1lgd01x34452zy69qdcnp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight";
@@ -32008,10 +32052,10 @@
       }) {};
     highlight-chars = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "highlight-chars";
-        version = "20160729.2320";
+        version = "20170101.1008";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/highlight-chars.el";
-          sha256 = "1qpx5bpb2iyhdv2d6lnk3vmdxwsvf8ylriarr0hw79zli0l167kp";
+          sha256 = "0hkspc6skyra2lhrlg8wm008llmp4asxvxxkk6xbvlx3p0ajihjv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/highlight-chars";
@@ -32106,12 +32150,12 @@
     highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-indent-guides";
-        version = "20161214.1619";
+        version = "20161230.1538";
         src = fetchFromGitHub {
           owner = "DarthFennec";
           repo = "highlight-indent-guides";
-          rev = "a1eeb2e50ca51b5b2e3a5cd190d2f1d79cf6ad28";
-          sha256 = "0bm5lqdvy0g2q7hd621vdc78430rk4fjbd94a6dj5wjh8vpcw7vd";
+          rev = "6fa450df12393fa659dfd5ec71fdda37fb7ee821";
+          sha256 = "0m4h71fb95mcfpbf78r5ird6pabs0sikrkh8w0hy1rimiz9g2mm1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides";
@@ -32379,8 +32423,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "c0ec47aff00ec9061d020edffc25616c4316baf2";
-          sha256 = "1kjf6lay8njq3krkwjk4glfkj17l6a9nzbi1r7x938vvgjpvyg0z";
+          rev = "967c8a0017694c8057c90a3b22f9d2ef4f060617";
+          sha256 = "15d5as40s073f5611xm08w5cy6h4bzcj31pbnr384acla0i81lh1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -32563,10 +32607,10 @@
       }) {};
     hl-defined = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hl-defined";
-        version = "20151231.1338";
+        version = "20170101.1011";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hl-defined.el";
-          sha256 = "170sz6hjd85cw1x0y2g81ks3x3niib4f7y2xz6k8x0dpw357ggv3";
+          sha256 = "1m21l7hlk46pkpbzmglpkpigynsf8121dx8swslpbn0lck9wrg21";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hl-defined";
@@ -32602,10 +32646,10 @@
       }) {};
     hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hl-line-plus";
-        version = "20151231.1339";
+        version = "20170101.1012";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hl-line+.el";
-          sha256 = "1kxq79pfs83gp12p2g093m6shsf25q88mi29bvhapxx77ahmxpkn";
+          sha256 = "16mv6h2mx1z47nds4q2crym8idj9i6y9jbdsqbafxmzwp54hfl3p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d5d1cf2f29d46e8abd821095da86f137650a2ff/recipes/hl-line+";
@@ -32662,10 +32706,10 @@
       }) {};
     hl-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hl-spotlight";
-        version = "20151231.1340";
+        version = "20170101.1013";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hl-spotlight.el";
-          sha256 = "0m84d1rdsp9r5ip79jlrp69pf1daw0ch8c378q3kc328606i3p2d";
+          sha256 = "0f16nalmz7pdrxmmxznqgbb8m7kkwfpf8a31r0b98wqrw8n5nnwg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/adb008d2da35dbd3fca63555f04dd8a0009380c6/recipes/hl-spotlight";
@@ -32702,12 +32746,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20161121.848";
+        version = "20170101.650";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "413e34e748b3bbd168dec8d38f673c41232c51e2";
-          sha256 = "0hniidrs8dzaq11micc0l4sdp2zrv6ry0r34c5b3w32cnb33xp47";
+          rev = "a9d6377b15999718462e96c079503594940507ef";
+          sha256 = "163k8crlyvgzag9mwb8q5cx40jlislxz533yr7nkh3ks6ricsj31";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -32935,8 +32979,8 @@
         version = "20160928.439";
         src = fetchgit {
           url = "git://git.osdn.jp/gitroot/howm/howm.git";
-          rev = "364c5be487539b16f4e879b95e27964580c59d36";
-          sha256 = "05x7q4gchjj3pyq309w4lh7m27436qk53kh5glk9404ysnk3kqya";
+          rev = "e0237b07f60011a1926b36848c73340ae46cdb3e";
+          sha256 = "0ljsvrpbj7y690pq6llnqqkvm9mlrhksxihv9jpx06d1g4ghknpq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4f66d7b6835d06b8e7451aec9e32bb9288a6020/recipes/howm";
@@ -33473,10 +33517,10 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20161223.1556";
+        version = "20170101.1027";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el";
-          sha256 = "1337x84fq514khzbvpw94132syba9jqfqymy1cagxqalpsfyql40";
+          sha256 = "072pxihvwpj6zkzrgw8bq9z71mcx5f6xsjr95bm42xqh4ag2qq0x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles";
@@ -33491,10 +33535,10 @@
       }) {};
     icomplete-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icomplete-plus";
-        version = "20160704.1959";
+        version = "20170101.1028";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icomplete+.el";
-          sha256 = "1rncxvai45akrg1qp0rzf3f821r52bp47mf2bpfnba86bnsl396c";
+          sha256 = "0r2s3vwqs31pj7jfya8l46ij1jc894bar4pk4i9zk2l69d7pwllr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fade28733f33e52a8622479de201f451c9a31c11/recipes/icomplete+";
@@ -34098,12 +34142,12 @@
     iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "iedit";
-        version = "20161030.1920";
+        version = "20161228.2111";
         src = fetchFromGitHub {
           owner = "victorhge";
           repo = "iedit";
-          rev = "abcc27a9f07a7f855b0a8314f18640fd5cd7a0b6";
-          sha256 = "152vxkwndv7ffggsnb1jhizf8p2fd5mbplwiln6ig2lzn21drdpa";
+          rev = "03b647be8bd35ca82916f2ace27a95d5b85e8ecf";
+          sha256 = "1pbbkizaa2f8lazpsc1j7qs3snvwkmw7schzhminzxrvdx15yids";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aa2b2745bd1f1778070954c834158c19d4cfb788/recipes/iedit";
@@ -34365,10 +34409,10 @@
       }) {};
     imenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "imenu-plus";
-        version = "20151231.1401";
+        version = "20170101.1029";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/imenu+.el";
-          sha256 = "00w88d37mg2hdrzpw5cxrgqz5jbf7rylmir95hs8j1cm8fk787bb";
+          sha256 = "039s81faqg5y3vhl9hlwn5qffdghshn6867pp8nf93f6zhj9mxr0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/imenu+";
@@ -34551,12 +34595,12 @@
     importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "importmagic";
-        version = "20161208.108";
+        version = "20170101.1603";
         src = fetchFromGitHub {
           owner = "anachronic";
           repo = "importmagic.el";
-          rev = "22c6681f8ebc7e14540640e4d1c94037c7d820b1";
-          sha256 = "1m2a2nxsp3kxq47c99z9rkfjgkh22makb8v8gdvdyjbgnha7lajx";
+          rev = "c75afbb93b024307c4cf67e6dd44cda80bbea697";
+          sha256 = "1xz99g9j8gfd6qrdsmrf98mq61168divw8lrwl3zylfw04x20b4b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/695534126f0caa52f66bb90b0277d08d524daa21/recipes/importmagic";
@@ -34781,10 +34825,10 @@
       }) {};
     info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "info-plus";
-        version = "20161213.646";
+        version = "20170101.1030";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/info+.el";
-          sha256 = "0d3qf6vlz8qbxm8i2f3qqj005mmkr35k2xr9jr1hwvwm30jrwy4z";
+          sha256 = "05s8wjv0nvdbdmc30kjbvipk2yvnvivhvjr0jrpkhq4s043135xq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+";
@@ -35114,12 +35158,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20161218.917";
+        version = "20170103.425";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "59ad0002b16a77c2de0cc18862e8e1842c00d6c4";
-          sha256 = "1678zjrdawks59l95x6qsp01man8k7r3si6qk1bb6dz261dh9adl";
+          rev = "cb18c88db105f0be39f201010833e248d073d76c";
+          sha256 = "0y0598phgz4plwb72j5yic4kww4jjw1giv8pf4m3i6angvnv3zhz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -35446,10 +35490,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20161224.1252";
+        version = "20170101.2341";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "0zbp6g2wqcdxyqjis180l3nml0bb06q7d31394k0jv7ajy5lhixz";
+          sha256 = "0iagsqqsxjxz0j30ljynwjpjn6i5klaxka4ygrsbxh0ys6cv5yfh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+";
@@ -35464,10 +35508,10 @@
       }) {};
     isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-prop";
-        version = "20161127.1755";
+        version = "20170101.1034";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch-prop.el";
-          sha256 = "1nni8lbmh215icv2n5kzq59vbnjq2z3h021drk6szdxm5hcsgmg4";
+          sha256 = "0n83qikh3mlnd3f9qwcsflg5x10sxvs9fkidyyv79jr673x4ljpv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop";
@@ -35672,12 +35716,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20161216.630";
+        version = "20161228.1838";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "482c3e9842e545db352237d448109154de87aa7d";
-          sha256 = "0znj9s67ir5xmrmifqql4mp433hnas8hz15mbvf1rl4mcn06z3q1";
+          rev = "dc693c37dae89e9a4302a5cce42f5321f83946c8";
+          sha256 = "0bg4ki0zzqr0pir4b3p0bpv747bfb5a8if0pydjcwrwb05b37rmp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -35693,12 +35737,12 @@
     ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
     melpaBuild {
         pname = "ivy-bibtex";
-        version = "20161213.2242";
+        version = "20170103.227";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "58dc08b8b8e6ea0c809052e082c867e05acef16a";
-          sha256 = "0cf3h0lkya6rsmg60qzbiz63vp8lm7nd4xlxym44hpp75nw06mgb";
+          rev = "1e11998cc45a12a1b1bd19b8fe9ed8a9f0c50774";
+          sha256 = "1q7vqi1g2rbkh6lxlma7rb8vpsx5vxl2iadxzbzy21d4knjpnj96";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -35760,8 +35804,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "482c3e9842e545db352237d448109154de87aa7d";
-          sha256 = "0znj9s67ir5xmrmifqql4mp433hnas8hz15mbvf1rl4mcn06z3q1";
+          rev = "dc693c37dae89e9a4302a5cce42f5321f83946c8";
+          sha256 = "0bg4ki0zzqr0pir4b3p0bpv747bfb5a8if0pydjcwrwb05b37rmp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -35819,12 +35863,12 @@
     ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-rich";
-        version = "20161221.559";
+        version = "20170102.1820";
         src = fetchFromGitHub {
           owner = "yevgnen";
           repo = "ivy-rich";
-          rev = "08da98870a3038f97f75b84606fed9d72abdbe6c";
-          sha256 = "126s3fzv280b0qlsv67bnfl3a0fvvkprldk1d6q9vl57cd4x8rp3";
+          rev = "7ff0b3e43b27353fabcb01d2252236e266916e50";
+          sha256 = "1gy45rm8pznrkqh7d7wrppd2z2bd654yzi9ddav1ibzaip52g5m3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
@@ -36342,12 +36386,12 @@
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20161225.440";
+        version = "20170102.757";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "a1c2a7a1b723cbe0cb48164f7e31875d874746a1";
-          sha256 = "0vrwdhhg2qgmskqfiz6i10x5yrw4d2866c26hgjacm3l9d1w5v33";
+          rev = "5e41bd8ad9b172cc980ae5a9c7b50bcfc18ebacb";
+          sha256 = "1xp515kjc18ryd5imb3r64nkinzqx1wxkzalgw672i6p7ydw529s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -36567,22 +36611,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    jist = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, magit, melpaBuild, pkg-info, request }:
+    jist = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, magit, melpaBuild, request, seq }:
     melpaBuild {
         pname = "jist";
-        version = "20160803.1758";
+        version = "20161229.921";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "jist.el";
-          rev = "1a0252e47b4ae5be6f8a16680752f6c69b1291a8";
-          sha256 = "0wa7gbm1nn5q97bkz1zsrzwhga4m028bsiixzf14qml8pfq6q5ml";
+          rev = "da0692452e312a99bb27d8708504b521798aca48";
+          sha256 = "13dic7bmj7a8vvjz47s1fnz8p5m22d2m2h2vlkmlq7322qwxxw6p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/898bfa0b315240ef9335fde24ff0386a4c6c6595/recipes/jist";
           sha256 = "11m9li1016cfkm4931h69d7g1dc59lwjl83wy3yipswdg3zlw0ar";
           name = "jist";
         };
-        packageRequires = [ dash emacs let-alist magit pkg-info request ];
+        packageRequires = [ dash emacs let-alist magit request seq ];
         meta = {
           homepage = "https://melpa.org/#/jist";
           license = lib.licenses.free;
@@ -36843,12 +36887,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20161212.1716";
+        version = "20161230.1612";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "90e37cdfdec06c7127cbb35f03a341c9d39cc2d5";
-          sha256 = "1m40hsfybqkplhwcn5b2kgm6czgdfiv7bp155fng7j045nmc8jgw";
+          rev = "8569ba6734184b869b4ac42e79231d195ea4dba2";
+          sha256 = "14j9qaqls403i5w5046w6qhw23gva7yfhmbw9mrdmwffl53nxfng";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -37781,12 +37825,12 @@
     kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kill-or-bury-alive";
-        version = "20160531.908";
+        version = "20161231.1559";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "kill-or-bury-alive";
-          rev = "62557d5d45a27773cc4f079549e98ca8aad203d0";
-          sha256 = "1d1kygn2l675rigz29hjmqkh0x7061ax0a60v5mjn9q87y4jd760";
+          rev = "beadb20a0f436b5f3413a0dee215a20f614f070e";
+          sha256 = "1ck9v01xih9ik85q46ijhl1m3ppazkr6f9fjcamxgxcwxrniwj4j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive";
@@ -37890,8 +37934,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "28d9e0708018c09fb4daa995b7c370b0d1e8bd47";
-          sha256 = "0pj093cvmfwq0zp5akh8hw0zh63q0jjfq6sx556i2lc2fkxy4403";
+          rev = "082c4544415ab6bd976d9dda9c342bae109e7cbb";
+          sha256 = "0b3dikix9mr5zch1m6dyf51y2fp48iqvpjwflqfn3x4j7k6pscgb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -37907,12 +37951,12 @@
     kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kiwix";
-        version = "20161219.1811";
+        version = "20161230.2008";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "kiwix.el";
-          rev = "7b8a799fb2b2c9c1653cc46f04eb517ccc8a576d";
-          sha256 = "0pb3bp8c0is5awhy6zj5r05h3zpbnjgcmqd14v0x7y953fz5cf7h";
+          rev = "d43238ffbbf9863c36a0064f3291dac2013a46c8";
+          sha256 = "1mbw82w0l1lazm6k9hchvcdqrrs2q9zpj7fxb0kyvfd5nkk99p0m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix";
@@ -38221,10 +38265,10 @@
       }) {};
     lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "lacarte";
-        version = "20161127.1758";
+        version = "20170101.1036";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/lacarte.el";
-          sha256 = "0bpjrnxfxfmrjj07hf5sgxjm4v8i6hr7ssq235jbh4r29vgf9qlc";
+          sha256 = "0xlbv4hhmg85x8i2zzbma29r5674cbmjrqwda9bjxf00wfid0a76";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85457b78a0fcc4ac0e0910d09594397b21cb1aa8/recipes/lacarte";
@@ -38575,12 +38619,12 @@
     ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20161204.758";
+        version = "20161231.914";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "187851c47cd5a2ab397fbbdb09d2cf9ce6d50cae";
-          sha256 = "1xhc5cvw7j6ninfw5knxqsjyxwg7p7ccf24gx72ik4gmddlki1x9";
+          rev = "a2ce924c4447daa92228d5904e5c31555d27fbf7";
+          sha256 = "0j9ppsxn9q3h4lh9ak3r1n8jpg5x0zs2az016jiw2q3h6n6sw564";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode";
@@ -38828,8 +38872,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "c05fa59ecf51e345069787476b9e699e42be8cf6";
-          sha256 = "0s8k4m1w61fz8kx66z3pbzdlyak8yb1v18fjgnak9185sh84mxhq";
+          rev = "aef45adb5178998e6e406c89bb058a92fd0f6863";
+          sha256 = "16qs6wc0vh4k6hnr0jkjdgi3rq4a0v5w9yynpccw3c8ws24i7n6j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -38844,10 +38888,10 @@
       }) {};
     lib-requires = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "lib-requires";
-        version = "20151231.1410";
+        version = "20170101.1038";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/lib-requires.el";
-          sha256 = "077cy2clllrvabw44wb1pzcqz97r3y92j7cb9lnhd9pix0wpcq6g";
+          sha256 = "03y99c1cg368c3647w8jypf2nlx26qkygrijw2vxcp4ha5v9f44z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3f0d443964f98bb65f2fe8f57048fbee844f2ba/recipes/lib-requires";
@@ -39141,12 +39185,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20161225.448";
+        version = "20170102.254";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "b9d7f752e215798c23caa08252ade35a9e767c24";
-          sha256 = "1ncvxxfkb606hhggkmxyrkg33wwlrkg6d5z16797pb3iciym8nc4";
+          rev = "74e9f0c2e4f3b64e2553449cb7346996ffef96f0";
+          sha256 = "1zhaqvzb78f775n3ba4a0qsjgszmayidsgkahqy2bv392ckq6mzl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -39454,12 +39498,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20161212.1937";
+        version = "20161229.1546";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "20de882a23b292bf25a28edf70f87d5a979f75bb";
-          sha256 = "1kx0nb35x00xgmzw1q737x1kdvzh0hjhnprpmq1d4mjsfp1l9q1h";
+          rev = "e33dedc107e6a1d15fc40e78ebbebe3bc83571d0";
+          sha256 = "1s53l83059skv15dc0bn1d9s572jnb26a2af5057p364l4qz5cng";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -39541,8 +39585,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "66dc5d6fe74901d105aa28559cc12597f9e50bc3";
-          sha256 = "02wmc553gcw7d334pby4r43ipk35czznhrk97jv7imwfcg4iwgpw";
+          rev = "a3bfbbd5a2c5b7d9b2f4203369d05f4bda7df1a6";
+          sha256 = "1dyr09dxz7sg9cb0hpa81nyviz7wyv16xs7wmipqqznl5f59kzzd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -39911,12 +39955,12 @@
     lsp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20161221.2242";
+        version = "20161231.108";
         src = fetchFromGitHub {
           owner = "vibhavp";
           repo = "emacs-lsp";
-          rev = "585029cca6f6221c6846344ee3291b3a0ccb584d";
-          sha256 = "1rq89m2npmrml2cldpi2lkzal2d920b1vxnian7wlsjn28ap84jd";
+          rev = "ed97c84fb3e730eecc90451257a09b085dccab33";
+          sha256 = "1h6d3l8id2zwikry4k9m2ybg6jxc9ww5wnn9rc9v16jbw08yi17l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode";
@@ -40160,12 +40204,12 @@
     magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magic-latex-buffer";
-        version = "20161214.1726";
+        version = "20161231.2300";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "magic-latex-buffer";
-          rev = "572bc5d9054ba5a7e78abd333141722be9013a1f";
-          sha256 = "0hmmsn1i2izasfpgmz2p0zi1fhj96yym2vz6m7yb0gxd2ijhk1jw";
+          rev = "49a9ac6aff0a45aa6630dc0044533b7b3d3be7ad";
+          sha256 = "1r9zq16n546xd9i27kiifdl7mwld8jk88rll2h0lbd77ir6wdlfm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/07e240ebe71d389d314c4a27bbcfe1f88b215c3b/recipes/magic-latex-buffer";
@@ -40181,12 +40225,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20161227.1853";
+        version = "20161231.757";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "991aa241795b8df0ed0b0b41acb1879f2b6fee04";
-          sha256 = "1qqrvxw7nmjvcnj0kjc7zgfv728gc5inn3igpcrz35qrz6x9xpi7";
+          rev = "d75529458b09998a68779d348527aa5a19045bed";
+          sha256 = "1si1xxn3pqd4p7vanyhq2zs4cbdkgwb908afl1dx3mih3wf1v1fr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -40360,8 +40404,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "991aa241795b8df0ed0b0b41acb1879f2b6fee04";
-          sha256 = "1qqrvxw7nmjvcnj0kjc7zgfv728gc5inn3igpcrz35qrz6x9xpi7";
+          rev = "d75529458b09998a68779d348527aa5a19045bed";
+          sha256 = "1si1xxn3pqd4p7vanyhq2zs4cbdkgwb908afl1dx3mih3wf1v1fr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -40797,12 +40841,12 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20161224.2223";
+        version = "20161228.39";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "5deef4b677c293e1acef373f705d41c6e25068ab";
-          sha256 = "08qc8ybmziv2wdfdln7z26xb50sjiykmg3hj2gb9fa4fy3sbcz67";
+          rev = "3880559c38060232e90a29adc11af41373ca7989";
+          sha256 = "1m8m8ajcqyxb0rj4ink0vdxq23sl8q578hz4kj4ynsgiq70zwcab";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -41326,10 +41370,10 @@
       }) {};
     mb-depth-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "mb-depth-plus";
-        version = "20151231.1421";
+        version = "20170101.1046";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/mb-depth+.el";
-          sha256 = "0w8clp96jblsc9v87404zpc280ms0d644in34jdgjc5r33f4i0g3";
+          sha256 = "1sk8x91gxwk17kv7whwfh9szxmgyy9ys1h4hx17hyzlvhz9smncg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mb-depth+";
@@ -41513,12 +41557,12 @@
     melancholy-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "melancholy-theme";
-        version = "20161110.120";
+        version = "20161228.1643";
         src = fetchFromGitHub {
           owner = "techquila";
           repo = "melancholy-theme";
-          rev = "bf15e39ed0579fa1cf1ceb5fb91876c2be115bfb";
-          sha256 = "0wphlp2vq8clv0q9c5lrpbajzhn7pr4z6x661q6vd51z9azh3qp2";
+          rev = "033cb2690c3f4deb6188dabeb811d42debd78a5a";
+          sha256 = "0qv1dv0l7q6j0r1s9mvw40h4wj44g0lsd1nmcpg2pv48mk6dhdjk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8f708d1300d401697c099709718fcb70d5db1f/recipes/melancholy-theme";
@@ -41636,22 +41680,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
+    mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }:
     melpaBuild {
         pname = "mentor";
-        version = "20161221.1521";
+        version = "20170102.28";
         src = fetchFromGitHub {
           owner = "skangas";
           repo = "mentor";
-          rev = "0d8afabca60931c62874c8d5f0c2b8abde2782d9";
-          sha256 = "0iciis2fzlb19rc6jvkich3hyg5aqgla9zicmwrl1v4rbd16zg6l";
+          rev = "074bd57a1e19d7807d682552fee63f326d1ad05c";
+          sha256 = "1p2wlwl8771w8m0i8f6qx11n1f13kkf681v0v4zcd161jgmklp5q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
           name = "mentor";
         };
-        packageRequires = [ xml-rpc ];
+        packageRequires = [ cl-lib seq xml-rpc ];
         meta = {
           homepage = "https://melpa.org/#/mentor";
           license = lib.licenses.free;
@@ -41659,10 +41703,10 @@
       }) {};
     menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "menu-bar-plus";
-        version = "20161209.734";
+        version = "20170101.1047";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/menu-bar+.el";
-          sha256 = "18i4isl86ldmbxkyiqiawby1izhdhpa8x7zyvzbfhzrny15dp32p";
+          sha256 = "0s460zm9k8b76vih5wgyrg8a7w5alwd43ia00mp110ipq2sy9pd2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+";
@@ -42279,10 +42323,10 @@
       }) {};
     misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "misc-cmds";
-        version = "20161102.1111";
+        version = "20170101.1049";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/misc-cmds.el";
-          sha256 = "1d55k9x2x29s0n2pkvp9lv8lbbha46f349dayniirspi55r89z02";
+          sha256 = "191362k5mx0phzq4sc0x7n341dswgq9hkani6icwjhj5dsgvr6wy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds";
@@ -42297,10 +42341,10 @@
       }) {};
     misc-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "misc-fns";
-        version = "20161016.1519";
+        version = "20170101.1050";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/misc-fns.el";
-          sha256 = "13m2j1ixfgx2m61yxznvk38jp6xfalq6vsmhxsc3klsal8mrkrhn";
+          sha256 = "0q5if5p0yy2b3h93lsrhy7z8f5mjmm3kkh1ql94jng4a0hl64jqr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2cbbe5a718ec961982a7f65de8f6ec1c9513696/recipes/misc-fns";
@@ -42378,12 +42422,12 @@
     mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mmt";
-        version = "20150906.959";
+        version = "20161231.1556";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "mmt";
-          rev = "3420eb014f86327ac68638e841ab7860aead5087";
-          sha256 = "0l5lpyiygikm9rwgk6jgx23wmc26hvhnqn9964d60l5a4b9fam74";
+          rev = "66adeeeccc52121fae7350698c11583b31cbb5c3";
+          sha256 = "01s1i7cc653yzxdmnlamz177sjlgjbknmz717kvrwd6wixgn2p08";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt";
@@ -42525,12 +42569,12 @@
     modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "modalka";
-        version = "20160531.912";
+        version = "20161231.1639";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "modalka";
-          rev = "95627e660768c7ab7af4d8ad35c2bc0c4fa7195b";
-          sha256 = "0yf5lwd95j55dkrkplsgnynq37ww0g97vw517j9q7spn7dqnq5f6";
+          rev = "1831129c063fbef5f5378389281ecccca095b9e8";
+          sha256 = "0jyczwam7xipw2qrk27wph3j4jd9gbkawvnsiad5xr1h9d019a41";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka";
@@ -42587,10 +42631,10 @@
       }) {};
     modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "modeline-char";
-        version = "20161210.852";
+        version = "20170101.1054";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/modeline-char.el";
-          sha256 = "06n97a196rqc88py7jnydv8a4q1vd0bb2ich2mx25sl3pylmd6lq";
+          sha256 = "0y5bjny8j9lvf94rfk3nrwdfmbp24i1b96909xpifn3l1r1xl6qr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9655505f56fc90ea8ef61e7595af0de7427b273b/recipes/modeline-char";
@@ -42605,10 +42649,10 @@
       }) {};
     modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "modeline-posn";
-        version = "20160112.649";
+        version = "20170101.1055";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/modeline-posn.el";
-          sha256 = "1r4zq355h570hk7qq0ik121bwsr4hjnhacal4d4h119d11gq2p8d";
+          sha256 = "0bzrcfhyp9gr850yr1db80zqqdxi688alhpix45xb6xg0kjndmck";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn";
@@ -42938,10 +42982,10 @@
       }) {};
     mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "mouse-plus";
-        version = "20161209.737";
+        version = "20170101.1057";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/mouse+.el";
-          sha256 = "1jr6m5cm6j6bfdk2f2n632aybjna4pcpyqm6j9flcr537fciwvap";
+          sha256 = "0drv4r30jj1bsgd9jv6znicc9jgxd0hzjd3xlsp7l2ynjbg86n4g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01cbe9b5bb88f8c02fab67a269ac53c8aa4d8326/recipes/mouse+";
@@ -42977,10 +43021,10 @@
       }) {};
     mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "mouse3";
-        version = "20161221.1025";
+        version = "20170101.1058";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/mouse3.el";
-          sha256 = "0fy3xrm58shpg977hwrrgjl95v1g2jgf9rhrgg7s0lf7cbs3zhp5";
+          sha256 = "1d6192r5iqyvs21ip78wcsvwc4lpx2jiv6pljcm9blxr1bpsk3gl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3";
@@ -43017,12 +43061,12 @@
     move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "move-text";
-        version = "20161002.2035";
+        version = "20170101.125";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "move-text";
-          rev = "3d9fe18c4015d82cdb85f7af3bb22e54ee907555";
-          sha256 = "14mykiz7q93xjz0lhr17vk1hna64apsplkk424q7hv28fpahzfbp";
+          rev = "df534f345b960cd3315caa9dca9e4893c38e48fd";
+          sha256 = "0svrdyij17nasdsj3fnj31p92ff7byzrwvbr49mifsqh2isibs54";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text";
@@ -43930,10 +43974,10 @@
       }) {};
     naked = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "naked";
-        version = "20151231.1527";
+        version = "20170101.1100";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/naked.el";
-          sha256 = "0zq13qjqfpxjba1bhdqqxkvgxq1dxyb7hd1bpnk6cbhsxr6mr50i";
+          sha256 = "06j2kijshd6ywx0rfvl4d08r0rh0b0rj69zypz63p418liymzcn6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/naked";
@@ -44178,10 +44222,10 @@
       }) {};
     narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "narrow-indirect";
-        version = "20151231.1539";
+        version = "20170101.1101";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el";
-          sha256 = "1lyszm94pd3jxs73v7k0aaazm0sd2rpz2pphcdag7lk7k6vppd9n";
+          sha256 = "0rlj647azpj5v7lzap88992f7mf2y94708f4aw2cvnzj6hf1rsvy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/narrow-indirect";
@@ -44432,8 +44476,8 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "6bfcf05762c38485780f819419e689d3b51db1eb";
-          sha256 = "0xwm7al5nqwkii6y5vr71qv8fp70m3pyzdzwcp0clj2pi0zrsmvq";
+          rev = "f3a11808a888e35d101fdd67b2474289bec4eeec";
+          sha256 = "04k20s7pldngsr63azb0abgdm8qr7a4pm81c8v23n3hiwikx0zfg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
@@ -44470,12 +44514,12 @@
     neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20161226.1807";
+        version = "20161228.1739";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "fa8c4fb32efd2e21683154cb503af37f153d138e";
-          sha256 = "09nvzp51dfjcwzhln44s70rawb3m65ad86fr0j1pa2vmb6czmf4b";
+          rev = "f4c13c3a8805d12f13f68ae4e651ff24f1ae9957";
+          sha256 = "19gaddm5xh6mbl2zfmd5v9xgnyfg9pzxpah7x921r251pzlrwiip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -44768,8 +44812,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "d0a2db17d91931cfd8d60e93d30cee20d39762c8";
-          sha256 = "0kilga3rxvmqx1mmmlkhhrfslx6q6p02qmjs5k33flymwk6nh3ax";
+          rev = "5d377ace2d74475ef696bce4ac0e61946d5b3769";
+          sha256 = "1b0mzkiw66qz8c2mx8sify9gnq0hycl3qy0v640xbva0gkvxj1fz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -45037,8 +45081,8 @@
         version = "20161215.457";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "f2a038825b73d4b9fa6cfd3ecbe661f1e6a49840";
-          sha256 = "10qp2x6v9a610mx2khlfh1swl1wlhc0adisz0x92y4xhs9d39s7j";
+          rev = "11064124732961f6fcfd78226ebaba0abed2c8fe";
+          sha256 = "0gs26jlg32mb84k6y9hm420jlw73ibrq791jq9faa6n42ws9ifdd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -45074,10 +45118,10 @@
       }) {};
     novice-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "novice-plus";
-        version = "20151231.1540";
+        version = "20170101.1103";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/novice+.el";
-          sha256 = "0mmdf3z9299hbs3wr8hqgpmg74sb2xm0rxyh38sjcqmk8f310rqh";
+          sha256 = "04lsjzj0a0z7wn7jzlpzjdv9d2w591gs2mwvsh1j8hmgl4x5p9vp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/novice+";
@@ -45743,12 +45787,12 @@
     ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-prolog";
-        version = "20161219.623";
+        version = "20170102.953";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "ob-prolog";
-          rev = "92dc5af269bd37c3349075c624adb8d03823b43a";
-          sha256 = "00fkm44vri1jminf55m35f8viq8sq4r4s1lsc5hr4vi85c1vjy9p";
+          rev = "7e94309d3a21d7e265f3a85b41801397f286af00";
+          sha256 = "0qxpgnjrx04dl43i949vcwv70sc7i23ivyvfk82hdvl8c2lwfd7w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog";
@@ -46528,10 +46572,10 @@
       }) {};
     oneonone = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild {
         pname = "oneonone";
-        version = "20151231.1541";
+        version = "20170101.1104";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/oneonone.el";
-          sha256 = "05njigqi9061d34530d76kwsdzqgk9qxnwhn9xis64w59f5nzf1h";
+          sha256 = "04jjdfbn8ah3gk4fpc56il8j4q52l9raxkbkxivqn440as7nkrn4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/oneonone";
@@ -46881,12 +46925,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "20161209.614";
+        version = "20170103.239";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "0fbc67e7675d1780a13e64e01c3665290e7fad7c";
-          sha256 = "1lsk2012fchvcl3i6jgzidn1hxnhwys745qnzy8rysb5yvszcycq";
+          rev = "55c52745f6f156062a7187795b6b0c6aaa1f1e2b";
+          sha256 = "0ca8lbm5gzcmpzwnghs0f8klxrz5sy1brw78h7rhpv4rdwfw1ji5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -47217,12 +47261,12 @@
     org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-download";
-        version = "20161119.315";
+        version = "20161228.633";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "org-download";
-          rev = "37d323034b09fe17029985aa556999acb2f9a0e5";
-          sha256 = "0g77grkhy76nlxq4fblw3biiik5mpq7r444dmvwi8fslkyshfkgs";
+          rev = "f99f884c47586ac8689b11c20eb95b2976c74d7c";
+          sha256 = "0w43bf9q6fhrakzlvncr8nwj6sar4cp022mfcim24jjhxk383vl3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -47618,8 +47662,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "5b8ebe657607964822b61da2cc8c61c74af191af";
-          sha256 = "09l0pdgazf72drz98101y49lh4iv2naavnk95nnww9q7vcw7fpkr";
+          rev = "d0d05e5df122b27148545f2d7c92e2c8345b9c83";
+          sha256 = "0x34f34myhgldp0cn6grp54jx91lw4cd574blfqiv609c14lw5qq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -47638,8 +47682,8 @@
         version = "20161126.239";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "5b8ebe657607964822b61da2cc8c61c74af191af";
-          sha256 = "09l0pdgazf72drz98101y49lh4iv2naavnk95nnww9q7vcw7fpkr";
+          rev = "d0d05e5df122b27148545f2d7c92e2c8345b9c83";
+          sha256 = "0x34f34myhgldp0cn6grp54jx91lw4cd574blfqiv609c14lw5qq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -47984,12 +48028,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20161222.654";
+        version = "20170101.904";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "81f80575bd32cb94fda841f09b5df3037bc53c66";
-          sha256 = "0f3ymmqcb3ln8ikplw4yc0yfv2q0hyv9ian105p5vpjxis6ss5r6";
+          rev = "7e69316cb029d46ffb505d78e8b7a5c0ee48d918";
+          sha256 = "03n5c5921b142g9an0bfjlymq878mh2ahs0ygaslpsm4n450s4gs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -49097,8 +49141,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "e6d4920cd688b81fb11eab6e289b1e99d69517ed";
-          sha256 = "0qpp3kzpmj7qk7hvimlyn0njd98k1gzl0a8zi2h5kj6inq78y158";
+          rev = "9dcaf341ef574ecc09585a6eb1bf3846e6fb318b";
+          sha256 = "0lznc82nrmx1s7k5xacd6vpx3zv6y11975mspi1adg995ww7b74s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -49240,12 +49284,12 @@
     ox-mediawiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ox-mediawiki";
-        version = "20161115.541";
+        version = "20161228.850";
         src = fetchFromGitHub {
           owner = "tomalexander";
           repo = "orgmode-mediawiki";
-          rev = "9017740cbe5866e21d81838e540dec310cc0dec0";
-          sha256 = "00c7l8skxjkphqpviwkgl28gqsj5cm63h64ffg09gkvp42mwjshz";
+          rev = "9e13392fe88817564f46a7a9f1eadebf54a2c346";
+          sha256 = "1x584gbwr1jhbxgzmjr6z801lqzqcaqzypkz25zz2spmh4n8fz9f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/24244d146306ce965df382c8958c7574c74313f2/recipes/ox-mediawiki";
@@ -49806,10 +49850,10 @@
       }) {};
     palette = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild {
         pname = "palette";
-        version = "20161224.1325";
+        version = "20170101.1109";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/palette.el";
-          sha256 = "0836gn7x8dcsgn6plfbmgbb0lbbzsz5hm2p09ynr84vwsfl07ma4";
+          sha256 = "0kx41b6axq9ba1mhp7icjq165aklskiq9ddmcn8yrcx480v4gf11";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/palette";
@@ -50096,12 +50140,12 @@
     parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parinfer";
-        version = "20161119.2133";
+        version = "20161231.924";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "9e1ce1dfb5e0958d5fbff62ed09357db14082a38";
-          sha256 = "1nq99i2piyd06yc0vsxkrfxsnj0yza3i9rdglvfaic9vnpf5riz3";
+          rev = "3d5b8d4a3f7e73f15f816f7555abed09c5516338";
+          sha256 = "1w3j0dzi19h1k94gnj1zxx4s1aji91wq4sjwkf813zs7q769mfsp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -50246,8 +50290,8 @@
         version = "20151027.1449";
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
-          rev = "bb717d68c5ba07516a6d0a156851792984367b53";
-          sha256 = "1b62vdwqz32icjrxpddbv490nzb9ka1x0kig8h442jchidsbcqf0";
+          rev = "77f1384a6321eef06265ea5e5b11eabdc53ab720";
+          sha256 = "0b4qlbrz6g39x1p89lx3xk4h7159jj14rf6mgsyv1fasc7yyxxiz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
@@ -52085,8 +52129,8 @@
         version = "20160827.857";
         src = fetchgit {
           url = "git://git.savannah.gnu.org/gettext.git";
-          rev = "3e1b7955c1f95428a974b6f335c62e20dcbca84b";
-          sha256 = "1mzkl025vq3nj5qxbi99fr116mxr2glncz16w4zxd9spfjlaw2z4";
+          rev = "1afbcb06fded2a427b761dd1615b1e48e1e853cc";
+          sha256 = "14f150w0zyzfpi7cidrf251q6c5fp3kwxv0hd54bvpmh99f829zc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
@@ -52644,10 +52688,10 @@
       }) {};
     pp-c-l = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "pp-c-l";
-        version = "20151231.1547";
+        version = "20170101.1116";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/pp-c-l.el";
-          sha256 = "10gsdjdr8qngimqh57qxcljjnypbf38asxqb3zlfwc2ls52fc19q";
+          sha256 = "07favccg34khq0rnkdmbmhagpn6sg0vrmxcql35vh1p0jalp208s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp-c-l";
@@ -52662,10 +52706,10 @@
       }) {};
     pp-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "pp-plus";
-        version = "20161114.1346";
+        version = "20170101.1114";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/pp+.el";
-          sha256 = "1fc2ii689f92255817cv0aiz0h83z1iyrgxmywpayiv58r8j3k4f";
+          sha256 = "0v8gm9z9dqxmqqvgz4dwmh79ssmir0zf4p3c6wbwrbak16b2ad6m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp+";
@@ -52764,10 +52808,10 @@
       }) {};
     pretty-lambdada = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "pretty-lambdada";
-        version = "20151231.1548";
+        version = "20170101.1117";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/pretty-lambdada.el";
-          sha256 = "1fn24399wsn12453py0hw2vbbkrkakiwi06cjvjzsdk7g3326ma4";
+          sha256 = "17vji7y92ahmhff6ax7znhi7dbfhi8zpghhnl408n5hzcvmqmf06";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pretty-lambdada";
@@ -53137,12 +53181,12 @@
     projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20161218.148";
+        version = "20161229.44";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "08d2551260ed17594d02e5e5f6a7f261a5f118b5";
-          sha256 = "195ygas8yy0z3kdm485hjp0rv1q73czq9sv45s4daa74bkr6dq1v";
+          rev = "72a8be50b9e6d4c23a178f777043e67794fc9728";
+          sha256 = "06rbl0vjsk98xqknrckh695qq1yrdi13ms8gwbk1l34j6qhcnwl1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -53309,8 +53353,8 @@
         src = fetchFromGitHub {
           owner = "anshulverma";
           repo = "projectile-speedbar";
-          rev = "93561bbe264b23958b72f951d2f0701450ad01e9";
-          sha256 = "1cn5wvagbgn4snrv8f6y6sgq7l51bd0l5z0ns3vs4753wx2y5dxw";
+          rev = "a00c6c0e52acd2223997b1a7a996cd786e68f6f2";
+          sha256 = "0bsk1336ak5bq9v26m2ql61yvhv15gyh8wrc6j4c655lxysbq9gs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8cb5a175258404c347ffa30fca002504467a0/recipes/projectile-speedbar";
@@ -53519,8 +53563,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "5f65ee6ac7e1c60dc4bdffa3c4247b3f0042e4fd";
-          sha256 = "1bka9sb0hlxqf8q1k47ddnwc4jy6r4qp0rvwgpangrkwm70qkpjm";
+          rev = "4cb113a91b180559f0eedbca0244ef1181a7204c";
+          sha256 = "1xhlc285ydjs1l4ans485ij09f3v54i2mllcik8l255gmm65aqh6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -54253,8 +54297,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "654d64b2390be1b7e67384dce6e72c6b52a03e7f";
-          sha256 = "0qny9ks411l408pc66d2gwnk3hk7jn9xkj949gxdv2n08rnylzp9";
+          rev = "4bb474dfad2d2dd8ea357f6b8e6a1c708246ac4a";
+          sha256 = "0xhgq2ylkkrj0pf9gj7niahwy243s9714x720w88mbz6v04bcj3p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -54396,12 +54440,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20161227.29";
+        version = "20170102.523";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "0a5a7a755c6106d619d939bcaa12a969bc4a2d00";
-          sha256 = "1hksj76xh8zvfqwgc8hilglhgc281lp658pp9fwp3624fd2ccmzl";
+          rev = "695fe533a9a59e43f75d69cf005b69526bafc99d";
+          sha256 = "1bh907dmnrcc31n7zjb3lnr98mck1vjzsyr6vzy5lqygymgxjdri";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -54417,12 +54461,12 @@
     python-switch-quotes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-switch-quotes";
-        version = "20161227.829";
+        version = "20161228.9";
         src = fetchFromGitHub {
           owner = "werehuman";
           repo = "python-switch-quotes";
-          rev = "1d5d233c5da9d7668d15b45ae872fb641bfb0b0e";
-          sha256 = "0giqpfwiwjz2d4dksxlp4pgra27a4fnzlc3sinrs514l1xx80lnf";
+          rev = "93f1e9b40e061a6cea480139e8b1362b6404abd0";
+          sha256 = "1x04hnf3m8cgqp0i566q4n7kh59cayzfxka3g07kv0h543xbys4n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d99fbd3d0c486bf89c9c0937e2ebf378be39293f/recipes/python-switch-quotes";
@@ -54774,12 +54818,12 @@
     racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
     melpaBuild {
         pname = "racer";
-        version = "20161226.1715";
+        version = "20161230.1422";
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "94637305de53c88bf9b6d4769bdb3918dc0c5654";
-          sha256 = "1s8j49p00hgqgshlvqvc2qc1fnfkik0vsaspv7bh4v55gbqjny0d";
+          rev = "a3c106e12c538cb6900e0940848557400bfa8313";
+          sha256 = "13b0dpmc2ckp158rvnbc7alf4kswvl5wvddmr1vm76ahr0i5xwv1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
@@ -55578,12 +55622,12 @@
     rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rebecca-theme";
-        version = "20161227.1206";
+        version = "20161227.2131";
         src = fetchFromGitHub {
           owner = "vic";
           repo = "rebecca-theme";
-          rev = "c72c72a1510af32c2ce6207df6e1b402901998df";
-          sha256 = "1jnyyzmy5hrsjr4fia1cb3bdviysflvaczf9k1n3wrbclp7i9j49";
+          rev = "ae1463a7118f5e50ca82267824c86a77e35e9697";
+          sha256 = "1k6f90kjsx1mjihy6l7h7f1ld66g0qxkzbbq203010fjdlsmlhk6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
@@ -56220,10 +56264,10 @@
       }) {};
     replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "replace-plus";
-        version = "20161224.1248";
+        version = "20170101.1119";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/replace+.el";
-          sha256 = "1l2xssvy51rp3hfnn5ik943yk1z5wj67wpznjig90g9aqlyx88v8";
+          sha256 = "0cbm5g5d1d4bdfmx3nkldpq8k5ah0cz5ddq7cn4278rjx1h9ml5f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+";
@@ -56306,8 +56350,8 @@
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "ab0a1af532636bfcb797160a1e39512ee26a3932";
-          sha256 = "1vs7aggcqql9spwyrl1mri4blrqrkqhxmwkyiz5kw2534nvmj2hy";
+          rev = "8c90b24905a66a915790a9b723f28808a40eecf4";
+          sha256 = "0w6x7hiaiyabpkyysv76pz27951nxlpaf6z9wvcrzafz37msv5ir";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request";
@@ -56327,8 +56371,8 @@
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-request";
-          rev = "ab0a1af532636bfcb797160a1e39512ee26a3932";
-          sha256 = "1vs7aggcqql9spwyrl1mri4blrqrkqhxmwkyiz5kw2534nvmj2hy";
+          rev = "8c90b24905a66a915790a9b723f28808a40eecf4";
+          sha256 = "0w6x7hiaiyabpkyysv76pz27951nxlpaf6z9wvcrzafz37msv5ir";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred";
@@ -56511,10 +56555,10 @@
       }) {};
     reveal-next = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "reveal-next";
-        version = "20151231.1550";
+        version = "20170101.1120";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/reveal-next.el";
-          sha256 = "1h27kg2k8f6smbqxandmvg859qk66jydbbbiwwjmk7316k66w8qa";
+          sha256 = "0vqacr3q9n772qmyyj35dxkqp79yqrpfhlf8zj70jzg04xzy6f0m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/reveal-next";
@@ -57035,8 +57079,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "a12c3424ed3d0fad2122215483fac86452afc5c0";
-          sha256 = "0ri9jj6klgzd3j8dd1lz1frzisjffawk21kq0d8x6zrdz2z3q9b0";
+          rev = "9234dc6c884d208bf878825dcfc49397df175b1f";
+          sha256 = "1451rf6i5wafyrnax0ql4z450ax6i9r03hwzhh5xkxiijxwlw7rx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -57097,7 +57141,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57226";
+          rev = "57259";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -57177,7 +57221,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57226";
+          rev = "57259";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -57429,8 +57473,8 @@
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "rust-playground";
-          rev = "6a23f8956bce1deaa38f52c01f5571c5cff77445";
-          sha256 = "1aqcpmzzww4fd63l65rfyj0f8skdqh7j1vznwqnj71x65xlda0ys";
+          rev = "122db4a5a85565bc5939c90e19ae232eae729d3a";
+          sha256 = "0ki1iwzmm9ir7f6l591dn1a8byyr9xg7gapa7d3fagsm3mnx0ak1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground";
@@ -57572,12 +57616,12 @@
     sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "20161227.1814";
+        version = "20161228.2248";
         src = fetchFromGitHub {
           owner = "sagemath";
           repo = "sage-shell-mode";
-          rev = "e8bc089e8dfd76f688160e2ac77aee985afeade7";
-          sha256 = "166plwg9ggivr3im0yfxw8k6m9ral37jzznnb06kb6g0zycb4aps";
+          rev = "5c1651b3b754e645d64ac5cc6831b0f12cab52e9";
+          sha256 = "00ygigs78md650yap4gz5y5n0v2n08771df4kqnpklycc3csrlbh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
@@ -59171,12 +59215,12 @@
     shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shm";
-        version = "20160615.31";
+        version = "20170102.531";
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "structured-haskell-mode";
-          rev = "39b1070cf52b3f134f386b40cc7dfc2d0d30d5b8";
-          sha256 = "067s1zwgr5kzxshcnyh96y8jz2j93bqp2fr0a5460fi27pnhyyl0";
+          rev = "993ff90454389401e606ee3d4ad1548c5e6508f1";
+          sha256 = "1bvzi12z2rlc7p4n731dbmw68719yfy585f8g6xr0dsj5x20gh11";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm";
@@ -59254,10 +59298,10 @@
       }) {};
     showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "showkey";
-        version = "20161027.653";
+        version = "20170101.1132";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/showkey.el";
-          sha256 = "0nqf2pdphc820faijnarg4mq3zblsl2dj3scralhxnqwl68ky7ch";
+          sha256 = "1mx48ly135wmqrr0srwnxby46b0mcnyw4vyd0jykih9ygd8kk4dj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2b5576d501aee95c8f62d721a69077a1f3df424/recipes/showkey";
@@ -59585,10 +59629,10 @@
     simple-plus = callPackage ({ fetchurl, lib, melpaBuild, strings }:
     melpaBuild {
         pname = "simple-plus";
-        version = "20151231.1600";
+        version = "20170101.1133";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/simple+.el";
-          sha256 = "01fdk790jlpxy95y67yv6944ws4zjh7gs6ymnj1yflf19ccsdsnn";
+          sha256 = "1z1l1lsddd865ma1q714hj4y9p89z1m3hr7z9fir53ipsa31cnl1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/simple+";
@@ -59982,12 +60026,12 @@
     slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
     melpaBuild {
         pname = "slime-company";
-        version = "20151210.614";
+        version = "20161229.743";
         src = fetchFromGitHub {
           owner = "anwyn";
           repo = "slime-company";
-          rev = "a50e8f02df03f37bee3cbaafae1a6891f02c847b";
-          sha256 = "0cc8xb2p1j2vs00h4sq6x0mwwrxkidqj4l7kg3n3150bj37v55rs";
+          rev = "6c244690c80387a32b0cb984843e00c8b75ad6bb";
+          sha256 = "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company";
@@ -60608,12 +60652,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20161216.140";
+        version = "20170101.605";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "22292c6b9e6f9bff207978908cdc0a6aacbad799";
-          sha256 = "13788rxvj16nk8wi92asi5binnhqwz2dlzmnypkg2h972nvmpbrh";
+          rev = "f661b7ffe5addfbf80355230d1c9a837d3a19ecb";
+          sha256 = "11yfp91pi1gpphgbcy6h5xkyapy7j6p11xab4rjc9gbckl3al9kf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -61454,12 +61498,12 @@
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
-        version = "20161209.1140";
+        version = "20170102.59";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "d40f4b972e307a043963f2262e66d43b6eaf7803";
-          sha256 = "0k51sm7qrhvda3gbj35gx3svvlvdvpcch76d20lnvh6y035ymmkg";
+          rev = "75cc751c3da252bd84f33b12daf11655a9f98fa6";
+          sha256 = "1jn3qjxjhbgjixxny1n68ha80c2zqmfrj24ws7ni4zia264phxs0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
@@ -61639,12 +61683,12 @@
     speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "speed-type";
-        version = "20161218.650";
+        version = "20161230.815";
         src = fetchFromGitHub {
           owner = "parkouss";
           repo = "speed-type";
-          rev = "0785ded41c1145804e31fa35187cd5be67c6bb97";
-          sha256 = "1g253axm6x822ap0my7f8v70xcppl5cd4rdlg8lxarjmhnxa5m0z";
+          rev = "5d691f57743304db63b6afdc5bd79dabd282d390";
+          sha256 = "08qp2b80rh9k8h5vv141lfsg73rqqikhh7ygal789rr278ai1rjf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type";
@@ -62204,8 +62248,8 @@
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "3569e5ea6892d6d7f4ef36bf41462af011e1a114";
-          sha256 = "0l3h6w13xc81i6vavfsg617ly8m2y8yjzbwa6zwwkfqi301kgpij";
+          rev = "f36ffce4a2222c8a2b00881da3bdd114a2f7c628";
+          sha256 = "1lb24avcysc2s4iwd1ivrfsmi0pqya648zb9znlnm01k71ifp26c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy";
@@ -62635,10 +62679,10 @@
       }) {};
     strings = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "strings";
-        version = "20151231.1607";
+        version = "20170101.1137";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/strings.el";
-          sha256 = "1sa6wd2z2qkcnjprkkm9b945qz8d0l702sv9w15wl0lngbhw84na";
+          sha256 = "0gvj39cjc50ks31dzridskync3dnaxsr28wmyky781l87cgna4hq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/strings";
@@ -62861,10 +62905,10 @@
       }) {};
     subr-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "subr-plus";
-        version = "20151231.1607";
+        version = "20170101.1138";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/subr+.el";
-          sha256 = "1xxf8kgxzcwwjm96isj4zg31vw63ahivr6xch5dw8wsvk0mjks9y";
+          sha256 = "057h7hshdvzm3qcwdnbyw0qb7ijw3jz38cff0n9ln4xgsma6cgm1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/400c7aede8fee84660b5010eacb93536f1c0b0a4/recipes/subr+";
@@ -63361,8 +63405,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "482c3e9842e545db352237d448109154de87aa7d";
-          sha256 = "0znj9s67ir5xmrmifqql4mp433hnas8hz15mbvf1rl4mcn06z3q1";
+          rev = "dc693c37dae89e9a4302a5cce42f5321f83946c8";
+          sha256 = "0bg4ki0zzqr0pir4b3p0bpv747bfb5a8if0pydjcwrwb05b37rmp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -63608,10 +63652,10 @@
       }) {};
     synonyms = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "synonyms";
-        version = "20160328.654";
+        version = "20170101.1140";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/synonyms.el";
-          sha256 = "1zkrh1krhjmhb924dlihfnmjf4gigk9lqkai8aal67h90g2q2dsz";
+          sha256 = "0f1krqbmbdkpll6ggryblcr7gw0wqm3d9hvq145sdwhwi5jw8b4v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd538439982dd7bd281bf78e96373b93f4d4a6b8/recipes/synonyms";
@@ -63794,12 +63838,12 @@
     systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "systemd";
-        version = "20161201.2217";
+        version = "20161231.2103";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "systemd-mode";
-          rev = "fa1277d1cd955b031a943d52d370e97aec3f2cac";
-          sha256 = "1j1q60hjfx6ma82j6dil0a16jrablzskh76l0gcdq0c8rjdqb4i4";
+          rev = "b561c6bce9828e67c986903c24fb524451a02e64";
+          sha256 = "19jkiiyaxqyxqzmgg2n0hcp7az23jhkajsr5n7ha48mh690n2ga1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
@@ -64087,12 +64131,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20161213.739";
+        version = "20161228.743";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "2e66c3045e46621d4e01959628c398283b423c72";
-          sha256 = "0abs0h9xhjv1bnpdv4r3ki4cgwak56v92c8lzcj879rqwskpvssy";
+          rev = "c3ae08db2984c68a73468bc66c6517d286c74b48";
+          sha256 = "1r868ywxl62pih1pwjh6rzq2cwlic6358j8ji56p6hx08pbx932m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -64570,12 +64614,12 @@
     tern-context-coloring = callPackage ({ context-coloring, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
     melpaBuild {
         pname = "tern-context-coloring";
-        version = "20160709.837";
+        version = "20161217.2347";
         src = fetchFromGitHub {
           owner = "jacksonrayhamilton";
           repo = "tern-context-coloring";
-          rev = "d191b65ed258da1cd0bfc85a78a5f6717a543a31";
-          sha256 = "1pp1xhp5il7mwpgvkwnw2f4w8v3928bx49ipxikf5jka5akm2gp9";
+          rev = "3a8e979d6cc83aabcb3dda3f5f31a6422532efba";
+          sha256 = "1rq5aqmsd7jqvwypafad9gmfcwjqjah00j7cws46k5f0dirjaa1y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db2119d2c2d167d771ee02c2735b435d59991b93/recipes/tern-context-coloring";
@@ -64609,22 +64653,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    terraform-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }:
+    terraform-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "terraform-mode";
-        version = "20160823.31";
+        version = "20170101.456";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-terraform-mode";
-          rev = "6337c5eda0abacc5b38e241dae0fadd8cecc81e5";
-          sha256 = "0cyijxjxdhkc555hwgdv0jxnsqp22b12ys35v2hai3p9w5x22jxc";
+          rev = "51ecf5858b910ddd373de4c6fbc0c12c202e8613";
+          sha256 = "0dfjdwpyy1kp6j7flkxnfng74vkx93glq3idhzc6hq8a4wh2j64n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
           name = "terraform-mode";
         };
-        packageRequires = [ cl-lib hcl-mode ];
+        packageRequires = [ emacs hcl-mode ];
         meta = {
           homepage = "https://melpa.org/#/terraform-mode";
           license = lib.licenses.free;
@@ -64900,10 +64944,10 @@
     thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }:
     melpaBuild {
         pname = "thing-cmds";
-        version = "20151231.1609";
+        version = "20170101.1143";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/thing-cmds.el";
-          sha256 = "1nclwxb63ffbc4wsga9ngkfcxsw88za0c4663fh9x64rl4db4hn8";
+          sha256 = "1qpszba6ajwqphhk39y6j4wlg7s5lch63lwfa9y28qipwkbn6zlq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thing-cmds";
@@ -64918,10 +64962,10 @@
       }) {};
     thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "thingatpt-plus";
-        version = "20161121.1523";
+        version = "20170101.1144";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/thingatpt+.el";
-          sha256 = "0xxd6qi6xw9zn0yykyl1ys8ckpfngxkbswy00s6hf7gd9jbknkm3";
+          sha256 = "0hb3fyqzq0312isid5vji0j74dmkh08p41sss32f4w60yhd8p19x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+";
@@ -65004,8 +65048,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "476cf694ee80f6d2d6aaa5e46bbda8f915863a49";
-          sha256 = "1516xqlrib1s7jd43p8m3yy0mix0y0x07j7akh9k42q3gjl5x29q";
+          rev = "d8bb0e3b9ff7e6cecfc85c01a81280dc3d046430";
+          sha256 = "0n2dy6l9wv08z5f67qlayw1ik3mfcblaflh0dl3ji1f6ygfm6y8h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -65021,10 +65065,10 @@
     thumb-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }:
     melpaBuild {
         pname = "thumb-frm";
-        version = "20151231.1612";
+        version = "20170101.1145";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/thumb-frm.el";
-          sha256 = "0nyp1sp55l3mlhlxw8kyp6hxan3rbgwc4fmfs174n6hlj3zr5vg8";
+          sha256 = "19fiafq5nl29wr35l7nkzjs70fvnw0g27424x7xnm425gwaags8s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thumb-frm";
@@ -65642,10 +65686,10 @@
       }) {};
     tool-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "tool-bar-plus";
-        version = "20151231.1615";
+        version = "20170101.1147";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/tool-bar+.el";
-          sha256 = "1sqflxj3hzxdlwn5qmpqm4dwik5vsyp7lypkvshcghdplxymb38a";
+          sha256 = "19ayc57vnv9348nfc10392kr4xd6wg0b6v2ya3x2zlpfsq3a6w2n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/tool-bar+";
@@ -65894,12 +65938,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20161103.1632";
+        version = "20161231.2101";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8";
-          sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89";
+          rev = "39b1fdb924727698e5b85c588bc6fd83200e4b90";
+          sha256 = "08wgqx48b3kbggxmkjjxwyinfl1j6b8wi4xvg0hwbkyw0zka0cii";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -66201,12 +66245,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20161226.1413";
+        version = "20161229.438";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "94ea7028ed96927efcb8f3ba0a89adcf150bd804";
-          sha256 = "0plaji79nl8z9637k2vqz3hcfyszdkiwqxsibv1mnps5as04vrj0";
+          rev = "d4c82791b2a4e2c38c09a5afc61dab958b107428";
+          sha256 = "13f4rj45m6qb1m21x9qnyb1xhfpb4pi8aifya0lb8xplav131bsk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -66513,12 +66557,12 @@
     typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }:
     melpaBuild {
         pname = "typit";
-        version = "20161125.1205";
+        version = "20170101.318";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "typit";
-          rev = "0ec57775db48d3a2d73998d569626cc720618786";
-          sha256 = "15wl6vymbdc3fzsk4fn12j7nzdg9iqzfi3lnw68bl0p00s3i37pg";
+          rev = "eb2d9a73851c64e21c211136c36b9de34812dc0f";
+          sha256 = "0r8cr4h3pkc23zxv01kkqv7bn34vppw6wgm7npzc9c04l40hs7iq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit";
@@ -66596,10 +66640,10 @@
       }) {};
     ucs-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "ucs-cmds";
-        version = "20161118.1423";
+        version = "20170101.1149";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el";
-          sha256 = "08yfz2mhhfqmx2icwpwizcaqkzngddhgp4ya3ga77fziyb6xjrdv";
+          sha256 = "0ql6qyzcj067vx2amwfh2m4vi056zf7qra4pkyskv829nxqg9mk8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/ucs-cmds";
@@ -67900,12 +67944,12 @@
     vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vimish-fold";
-        version = "20160718.126";
+        version = "20161231.1600";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "vimish-fold";
-          rev = "2ba97302f76d83df3ec8dd1a2d76b02e1a0aadd6";
-          sha256 = "0mfrydhndr4a77231kwnh1zljsfpn6sczw51li1kbdbkg8xbps33";
+          rev = "1eb00dc2d803df411d7b2eae1c775eecc6512728";
+          sha256 = "1shxvnlpb3hw3pa7883nmpzjy2q6cyww3r8x4yx3h315nvxwxfkq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold";
@@ -68253,10 +68297,10 @@
       }) {};
     w32-browser = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "w32-browser";
-        version = "20160814.1433";
+        version = "20170101.1154";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/w32-browser.el";
-          sha256 = "0cb42vmvjhgjg34klxfrqx8fc39awv0gcr2i2n3ma2xdknzb9z7b";
+          sha256 = "0x30ldv2wbv3vhj85jss7hwf672m61f5r4z9l1sg3v0ibalqry45";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32-browser";
@@ -68272,10 +68316,10 @@
     w32browser-dlgopen = callPackage ({ fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "w32browser-dlgopen";
-        version = "20151231.1621";
+        version = "20170101.1155";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/w32browser-dlgopen.el";
-          sha256 = "0nyara81bnd0rvgyljqrrbvjvndkngdc7qzf6scl5iz3vlglfgy7";
+          sha256 = "1dv4l7rcm34p78cvyjv7b1lcc1d28pia18vj3swgnan9g1mi7zdf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32browser-dlgopen";
@@ -68396,12 +68440,12 @@
     wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
     melpaBuild {
         pname = "wanderlust";
-        version = "20161212.1531";
+        version = "20161227.2220";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "dda6c57fa58ef19cfd1be199a791a3e35096b5cf";
-          sha256 = "0cdplbyglzfd62j12dmjsxywsx5w22v6x05rvqrvjljm2n9jpz95";
+          rev = "59a4d97286251a0c0871c085aea01fa1abc1e192";
+          sha256 = "1k7kkdr2kr7qivvbifqgw9hx111bscbh376q1f44p825flxnzyn8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -68627,12 +68671,12 @@
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20161227.1153";
+        version = "20161230.1026";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "3cb73f72086ae81aed2a13afca40df738a644598";
-          sha256 = "141nd5995p6jh7g9jyp8s1gg8hjf05kd3p1ylx65s3fhrc2c2qhd";
+          rev = "abd9c738feb0d6069cf8de07fa7d109441a5ca54";
+          sha256 = "049q9n3881f27lpsmjsxdfw6zkizqhrh3wwyxfibnzsq9c1631hi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -69109,10 +69153,10 @@
       }) {};
     wid-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "wid-edit-plus";
-        version = "20151231.1622";
+        version = "20170101.1156";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/wid-edit+.el";
-          sha256 = "18bnwwjk8jj4ns08sxhnznj0d8n1bxm2kj43r06nwyibh6ajpl7f";
+          sha256 = "0pzxarpwabbg67ajg340yrp1gqly8y71qrd5gcv9vjzgvvh9anws";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wid-edit+";
@@ -69415,10 +69459,10 @@
       }) {};
     window-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "window-plus";
-        version = "20151231.1624";
+        version = "20170101.1158";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/window+.el";
-          sha256 = "0mqdcgk6mdxgl9if7jzgg16zqdwnsp8icrdhnygphw5m9h2dqcnm";
+          sha256 = "06igqiwvnwm68k6gf9h85p4ppqab20sxl6qnxb57z8lpczpsssqa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/window+";
@@ -69521,13 +69565,13 @@
         version = "20161226.1051";
         src = fetchFromGitHub {
           owner = "deb0ch";
-          repo = "winum.el";
+          repo = "emacs-winum";
           rev = "430d24dd29cf5a96eb31ea4bc6af150e4d530331";
           sha256 = "0ayj466md5xz6gflwl5sa81grpiydy5i2lkdpz7m8wlc81q3ng9j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b6b0219b7855e4137d3980d732c93df1bf46d15c/recipes/winum";
-          sha256 = "0fa3gjyapajaagwkkw3sgmn500bc6jg818663if3f1q1220m7jkc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
+          sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw";
           name = "winum";
         };
         packageRequires = [ cl-lib ];
@@ -69542,8 +69586,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "a67adbf5fc75";
-          sha256 = "1av071s0s6x0idbklfnps8j7vgjqxapk9y23prk6jrdbbwhfzb8n";
+          rev = "ab6afca9ee2e";
+          sha256 = "19yy6z12pqaz9l0gj4hm73m7z2gcyivwymf6732vk8im77i8agyl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -69580,12 +69624,12 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "20161201.925";
+        version = "20161231.826";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "fb1e10a7ee237b60b758f72b7db246eacf45c705";
-          sha256 = "03knvy4hh0q6kvnzxvx477hdzzd5kqy86g27gbzhyj6535mhwckj";
+          rev = "2248a63f6eb6e7720881b508639d9a00d2db9ea0";
+          sha256 = "0g5ch1a5myrmazxcbbak01q4k3x8yp3kbn73d2h26j2jmsqvdy1n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -69769,12 +69813,12 @@
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "worf";
-        version = "20161206.201";
+        version = "20161231.217";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "c1a5e644320b98467a31b0c363edc8229927ed78";
-          sha256 = "11pb3sd1jn5jfhx0q4pwpiszaadbyag9zjb6iy6sl1nhs2z22acn";
+          rev = "ca9a42b64938f43d757c6e0c41f21610bea87dba";
+          sha256 = "0nwsryj7xiizvrcnwb1an8siihqjbdvcwg6mjc36cyr6cv3icqmw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -70105,12 +70149,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20161218.2229";
+        version = "20170102.722";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "c8debd687c0418669eaa0329d6d77df28057d2f2";
-          sha256 = "0ya54pki1yvj6h1bkf3l9zpzpyxrl3z5lgkbjs62pqhjg4yc4q5y";
+          rev = "0f4d6f3239ced83d4f71660feca896ebe594e749";
+          sha256 = "19ps3b60pzr8p8yii49kcsnvy0l0mpsfh231bfjsynrdzaz3zbd6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -70147,12 +70191,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20161227.443";
+        version = "20170103.616";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "1012ccaa2db07a072486dc22cc2c871f7e0e2b5a";
-          sha256 = "0lfwk8avlhcjarj49w3whka05mp8hlpc2lp528ygjcx3cf6xdyf5";
+          rev = "05d97718a519edae9acb4f729cc7b997d3016e21";
+          sha256 = "0b83rn7b5ssqhwj1lgz8na1dlaj8k0900rci1ggyylrdxzbbssnz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -70588,12 +70632,12 @@
     xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xterm-color";
-        version = "20161128.1657";
+        version = "20170102.1525";
         src = fetchFromGitHub {
           owner = "atomontage";
           repo = "xterm-color";
-          rev = "67860d31c4a4e8e8781bf2c8888f40001614f54a";
-          sha256 = "01if8ggkpli7md0yg4c3gv8nn0di3drs2frcfm9cd4d4jc7wc7l5";
+          rev = "5873477fd7bd6e54142ab35fbc623ea9b55200aa";
+          sha256 = "1328avc28barirwipasnhq81sn4nw6w6x6fffgqcxayv2r5bl1d8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color";
@@ -71327,12 +71371,12 @@
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "20161213.324";
+        version = "20170102.1359";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "f63e357ee845d95a26f48b1001c9168a0e3fefa1";
-          sha256 = "1jhl9bi9qvkrdfvnrcfjims2gf11jlhp0pnxb3l9xxn2ys344lj8";
+          rev = "0d3a01b564cf0c64a83c3bf0652aff47f13dfaf0";
+          sha256 = "0qazdp1x3mwpi20ilraqsb350rgp9vsk4qhby4qgrxqq1iv3n1nb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -71577,10 +71621,10 @@
       }) {};
     zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "zones";
-        version = "20161127.1801";
+        version = "20170101.1159";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/zones.el";
-          sha256 = "09lwqkfcz97jpzfr4q5ir6m8zxligkkf70b2ppnnchhmdghs0yx8";
+          sha256 = "1m88lqfmfayx2pj5ws14cfysf4pv8rm9v768x6xvsknjb4sl0q8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f768556f3fbe2537d6ebb08a5285d040e851e85d/recipes/zones";
@@ -71617,10 +71661,10 @@
     zoom-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }:
     melpaBuild {
         pname = "zoom-frm";
-        version = "20160809.716";
+        version = "20170101.1201";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/zoom-frm.el";
-          sha256 = "0k165zzqc65sl1glhh6qnlfrjx5qx1gcv5a0l445z7ny12r69xwb";
+          sha256 = "1n16qx3ag9cdds04l4s2a79ijqg4k5gg1144vyn5p6ih10casw32";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/zoom-frm";
@@ -71720,12 +71764,12 @@
     zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }:
     melpaBuild {
         pname = "zotxt";
-        version = "20160427.1922";
+        version = "20170102.1009";
         src = fetchFromGitLab {
           owner = "egh";
           repo = "zotxt-emacs";
-          rev = "43c0c6d23b31126bac6b14bb85608180fd9c866f";
-          sha256 = "0qksa67aazs9vx7v14nlakr34z6l0h6mhfzi2c0vhrr0c210r6hp";
+          rev = "ac3946f45c6e9f61fdd23c517d78b1844b231c90";
+          sha256 = "02kr2qladcm82dsq2fii1k6ks21ywk216v2rhffqkxyq6xpanvpj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt";
@@ -71804,12 +71848,12 @@
     zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zzz-to-char";
-        version = "20160122.440";
+        version = "20161231.1557";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "zzz-to-char";
-          rev = "25272ccdb8ef5b943037e161bc7d2561f899e23a";
-          sha256 = "1wphpxnh7sisqfx7ngil3ixnjkfgwy3j2bvv33bxcwslvfggimi6";
+          rev = "aaa854efb6b9e4451e97dfe90d37f368ff868b9e";
+          sha256 = "1k66wsbgb7fqb5mbani0lzffy3yf0801rlgxwbkj34ciblz6a197";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char";

From a4868509923aebd66b2aa9aa1d260d882e159b5e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 4 Jan 2017 15:01:35 +0100
Subject: [PATCH 0546/1310] xdg_utils: mimiSupport: update to the latest master

---
 pkgs/tools/X11/xdg-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index e7233d0f714..16e339b41c2 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -10,8 +10,8 @@ let
   mimisrc = fetchFromGitHub {
     owner = "march-linux";
     repo = "mimi";
-    rev = "d85ea8256ed627e93b387cd42e4ab39bfab9504c";
-    sha256 = "1h9mb3glfvc6pa2f9g07xgmf8lrwxiyjxvl906xlysy4klybxvhg";
+    rev = "8e0070f17bcd3612ee83cb84e663e7c7fabcca3d";
+    sha256 = "15gw2nyrqmdsdin8gzxihpn77grhk9l97jp7s7pr7sl4n9ya2rpj";
   };
 in
 

From 9ba56e0dbf091b9d4ea95adfde5e02114988486b Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Tue, 27 Dec 2016 16:18:27 +0100
Subject: [PATCH 0547/1310] hugo: 0.17 -> 0.18.1

---
 pkgs/applications/misc/hugo/default.nix |  4 ++--
 pkgs/applications/misc/hugo/deps.nix    | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index cc4f0d2e773..05a4db7a250 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.17";
+  version = "0.18.1";
 
   goPackagePath = "github.com/spf13/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "spf13";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "1h5d7m019r4zhk7xlcdbn4z3w6x7jq2lcdgq7w377688rk58wbgp";
+    sha256 = "1nmabcrq96b339in2yr2zwcd41nadr4bha3rlpyaxlzbyyhz2f81";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 70781708f6e..0a95b083c0b 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -229,8 +229,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/fsync";
-      rev = "eefee59ad7de621617d4ff085cf768aab4b919b1";
-      sha256 = "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p";
+      rev = "cb2da332d00cbc04e4f3f677520dc3e7cc11874b";
+      sha256 = "03ib2xj80cbz77hx2baanyi50qr40akrybg49fzdvdm3lv9x100z";
     };
   }
   {
@@ -341,4 +341,13 @@
       sha256 = "0jwn2g4jfdb3wvpqisd8h055099pwx6c5i3bb4zxk5l9vybg1c5f";
     };
   }
+  {
+    goPackagePath = "github.com/bep/gitmap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bep/gitmap";
+      rev = "a1a71abe12823e27ae7507189fe2e914ba9626ac";
+      sha256 = "0qfhb72y6wbypaqv6dkl42syifnhps3qcy1karpd6ziw4pxak18g";
+    };
+  }
 ]

From 95af71e4eff3522d2d838958b5a19c94e0600c22 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 17 Dec 2016 16:14:41 +0100
Subject: [PATCH 0548/1310] pythonPackages.parsedatetime: 1.5 -> 2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0141729e30..ab7aaed729c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17989,11 +17989,19 @@ in {
 
   parsedatetime = buildPythonPackage rec {
     name = "parsedatetime-${version}";
-    version = "1.5";
+    version = "2.1";
+
+    meta = {
+      description = "Parse human-readable date/time text";
+      homepage = "https://github.com/bear/parsedatetime";
+      license = licenses.asl20;
+    };
+
+    buildInputs = with self; [ PyICU nose ];
 
     src = pkgs.fetchurl {
         url = "mirror://pypi/p/parsedatetime/${name}.tar.gz";
-        sha256 = "1as0mm4ql3z0324nc9bys2s1ngh507i317p16b79rx86wlmvx9ix";
+        sha256 = "0bdgyw6y3v7bcxlx0p50s8drxsh5bb5cy2afccqr3j90amvpii8p";
     };
   };
 

From 08fd548dfd825a6202595925dd738f0142ddb013 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Wed, 4 Jan 2017 15:30:26 +0100
Subject: [PATCH 0549/1310] nox: 0.0.4 -> 0.0.5

---
 pkgs/tools/package-management/nox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix
index 2dffcef48fb..1184c0194bc 100644
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/pkgs/tools/package-management/nox/default.nix
@@ -2,12 +2,12 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "nox-${version}";
-  version = "0.0.4";
+  version = "0.0.5";
   namePrefix = "";
 
   src = fetchurl {
     url = "mirror://pypi/n/nix-nox/nix-nox-${version}.tar.gz";
-    sha256 = "11f6css8rnh7qz55z7i81cnb5h9ys98fqxq3fps3hsh64zlydj52";
+    sha256 = "1kwrkp7njxn2sqmmzy5d33d07gawbw2ab2bmfjz0y1r23z9iadf2";
   };
 
   buildInputs = [ pythonPackages.pbr git ];

From 87ef971478ec8814370cc59f75301e7dc38869cd Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 25 Dec 2016 20:35:51 +0100
Subject: [PATCH 0550/1310] tk: add private headers to /include

those are necessary to build some extensions like tix
---
 pkgs/development/libraries/tk/generic.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix
index 87a2edee3ca..2258f28b9c4 100644
--- a/pkgs/development/libraries/tk/generic.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation {
 
   postInstall = ''
     ln -s $out/bin/wish* $out/bin/wish
+    cp ../{unix,generic}/*.h $out/include
   '';
 
   configureFlags = [

From d43479badbca6c3df82b0f52905275f3c0da7b47 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:23:41 +0100
Subject: [PATCH 0551/1310] mdp: 1.0.7 -> 1.0.9

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

diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index a44f4bff83e..5206feb215c 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.7";
+  version = "1.0.9";
   name = "mdp-${version}";
 
   src = fetchFromGitHub {
     owner = "visit1985";
     repo = "mdp";
     rev = version;
-    sha256 = "10jkv8g04vvhik42y0qqcbn05hlnfsgbljhx69hx1sfn7js2d8g4";
+    sha256 = "183flp52zfady4f8f3vgapr5f5k6cvanmj2hw293v6pw71qnafmd";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

From 95d64801995e9e1806d1dff3cc8283698df7912f Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:29:43 +0100
Subject: [PATCH 0552/1310] haxor-news: 0.3.1 -> 0.4.1

---
 pkgs/applications/misc/haxor-news/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index e4074547d78..e925885f05f 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.3.1";
+  version = "0.4.1";
   name = "haxor-news-${version}";
 
   src = fetchurl {
-    url = "https://github.com/donnemartin/haxor-news/archive/0.3.1.tar.gz";
-    sha256 = "0jglx8fy38sjyszvvg7mvmyk66l53kyq4i09hmgdz7hb1hrm9m2m";
+    url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz";
+    sha256 = "0d3an7by33hjl8zg48y7ig6r258ghgbdkpp1psa9jr6n2nk2w9mr";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 9680f12fbe8db49d34deaf5cfdeeb69b368b5214 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:31:55 +0100
Subject: [PATCH 0553/1310] cortex: 2014-08-01 -> 2015-08-23

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

diff --git a/pkgs/applications/misc/cortex/default.nix b/pkgs/applications/misc/cortex/default.nix
index 777a759177c..42565ae7fa8 100644
--- a/pkgs/applications/misc/cortex/default.nix
+++ b/pkgs/applications/misc/cortex/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, python3 }:
 
 stdenv.mkDerivation {
-  name = "cortex-2014-08-01";
+  name = "cortex-2015-08-23";
 
   src = fetchgit {
     url = "https://github.com/gglucas/cortex";
-    rev = "e749de6c21aae02386f006fd0401d22b9dcca424";
-    sha256 = "d5d59c5257107344122c701eb370f3740f9957b6b898ac798d797a4f152f614c";
+    rev = "ff10ff860479fe2f50590c0f8fcfc6dc34446639";
+    sha256 = "0pa2kkkcnmf56d5d5kknv0gfahddym75xripd4kgszaj6hsib3zg";
   };
 
   buildInputs = [ stdenv python3 ];

From eb07e355549e9851d810b03ff2237a2a3ca4cf07 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:33:03 +0100
Subject: [PATCH 0554/1310] pipes: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix
index 8ff4a1074e6..9393a978b07 100644
--- a/pkgs/misc/screensavers/pipes/default.nix
+++ b/pkgs/misc/screensavers/pipes/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pipes-${version}";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "https://github.com/pipeseroni/pipes.sh/archive/v${version}.tar.gz";
-    sha256 = "1225llbm0zfnkqykfi7qz7z5p102pwldmj22761m653jy0ahi7w2";
+    sha256 = "1v0xhgq30zkfjk9l5g8swpivh7rxfjbzhbjpr2c5c836wgn026fb";
   };
 
   buildInputs = with pkgs; [ bash ];

From be4caf3ef75158aadf85dfe2ac4fb3d498ee5c7f Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:34:23 +0100
Subject: [PATCH 0555/1310] sc-im: 0.2.1 -> 0.4.0

---
 pkgs/applications/misc/sc-im/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index cb18278d1ed..75d08ec8188 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2 }:
+{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, pkgconfig }:
 
-let
-  version = "0.2.1";
-in
 stdenv.mkDerivation rec {
-
+  version = "0.4.0";
   name = "sc-im-${version}";
 
   src = fetchFromGitHub {
     owner = "andmarti1424";
     repo = "sc-im";
     rev = "v${version}";
-    sha256 = "0v6b8xksvd12vmz198vik2ranyr5mhnp85hl9yxh9svibs7jxsbb";
+    sha256 = "1v1cfmfqs5997bqlirp6p7smc3qrinq8dvsi33sk09r33zkzyar0";
   };
 
-  buildInputs = [ yacc ncurses libxml2 ];
+  buildInputs = [ yacc ncurses libxml2 pkgconfig ];
 
   buildPhase = ''
     cd src
 
-    sed "s,prefix=/usr,prefix=$out," Makefile
-    sed "s,-I/usr/include/libxml2,-I$libxml2," Makefile
+    sed -i "s,prefix=/usr,prefix=$out," Makefile
+    sed -i "s,-I/usr/include/libxml2,-I$libxml2," Makefile
 
     make
     export DESTDIR=$out

From 8c2e6df52d8006c457764bc076ee216399f96f34 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:37:17 +0100
Subject: [PATCH 0556/1310] cli-visualizer: 2016-06-02 -> 1.5

---
 pkgs/applications/misc/cli-visualizer/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index 1c7fd62f8ec..cdde212275d 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, fftw, ncurses, libpulseaudio }:
+{ stdenv, fetchFromGitHub, fftw, ncurses, libpulseaudio }:
 
 stdenv.mkDerivation rec {
-  version = "2016-06-02";
+  version = "1.5";
   name = "cli-visualizer-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/dpayne/cli-visualizer.git";
-    rev = "bc0104eb57e7a0b3821510bc8f93cf5d1154fa8e";
-    sha256 = "16768gyi85mkizfn874q2q9xf32knw08z27si3k5bk99492dxwzw";
+  src = fetchFromGitHub {
+    owner = "dpayne";
+    repo = "cli-visualizer";
+    rev = version;
+    sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs";
   };
 
   postPatch = ''

From 71c247b3ad27f982312de7f858ffc31ec8593e26 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 4 Jan 2017 16:25:59 +0100
Subject: [PATCH 0557/1310] mailcap-fix: init at 1.0.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0141729e30..85226883193 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30047,6 +30047,24 @@ EOF
     };
   };
 
+  mailcap-fix = buildPythonPackage rec {
+    name = "mailcap-fix-${version}";
+    version = "1.0.1";
+
+    disabled = isPy36; # this fix is merged into python 3.6
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/m/mailcap-fix/${name}.tar.gz";
+      sha256 = "02lijkq6v379r8zkqg9q2srin3i80m4wvwik3hcbih0s14v0ng0i";
+    };
+
+    meta = with stdenv.lib; {
+      description = "A patched mailcap module that conforms to RFC 1524";
+      homepage = "https://github.com/michael-lazar/mailcap_fix";
+      license = licenses.unlicense;
+    };
+  };
+
   maildir-deduplicate = buildPythonPackage rec {
     name = "maildir-deduplicate-${version}";
     version = "1.0.2";

From a52ac0a5c6f5a1eba62a1bc01d92f7bcf672089c Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:38:45 +0100
Subject: [PATCH 0558/1310] rtv: 1.10.0 -> 1.13.0

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

diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 8488a8e6842..e2af415e60a 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,17 +1,19 @@
 { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "1.10.0";
+  version = "1.13.0";
   name = "rtv-${version}";
 
   src = fetchFromGitHub {
     owner = "michael-lazar";
     repo = "rtv";
     rev = "v${version}";
-    sha256 = "1gm5jyqqssf69lfx0svhzsb9m0dffm6zsf9jqnwh6gjihfz25a45";
+    sha256 = "0rxncbzb4a7zlfxmnn5jm6yvwviaaj0v220vwv82hkjiwcdjj8jf";
   };
 
   propagatedBuildInputs = with pythonPackages; [
+    beautifulsoup4
+    mailcap-fix
     tornado
     requests2
     six

From 6587d6bf1d9bcbbcbc5c27ac2082ff8980b55392 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:39:33 +0100
Subject: [PATCH 0559/1310] buku: 2.5 -> 2.7

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

diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index 85d3c4e49f9..a0414786ba4 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -2,14 +2,14 @@
 }:
 
 with pythonPackages; buildPythonApplication rec {
-  version = "2.5";
+  version = "2.7";
   name = "buku-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
     rev = "v${version}";
-    sha256 = "0m6km37zylinsblwm2p8pm760xlsf9m82xyws3762xs8zxbnfmsd";
+    sha256 = "1hb5283xaz1ll3iv5542i6f9qshrdgg33dg7gvghz0fwdh8i0jbk";
   };
 
   buildInputs = [

From 91a248009c1f76b8569368476cfe5f1318342425 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:40:48 +0100
Subject: [PATCH 0560/1310] gotty: 0.0.10 -> 0.0.13

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

diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index 28ca858440b..ccab31ce225 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "gotty-${version}";
-  version = "0.0.10";
+  version = "0.0.13";
   rev = "v${version}";
 
   goPackagePath = "github.com/yudai/gotty";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "yudai";
     repo = "gotty";
-    sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09";
+    sha256 = "1hsfjyjjzr1zc9m8bnhid1ag6ipcbx59111y9p7k8az8jiyr112g";
   };
 
   goDeps = ./deps.nix;

From b5c7ce015f61547721c8bbf6e03a4a5944fcfe76 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:41:51 +0100
Subject: [PATCH 0561/1310] http-prompt: 0.2.0 -> 0.8.0

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

diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index ba9b8b2d771..55ba6b9db55 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pythonPackages, httpie }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.2.0";
+  version = "0.8.0";
   name = "http-prompt";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     repo = "http-prompt";
     owner = "eliangcs";
-    sha256 = "0hgw3kx9rfdg394darms3vqcjm6xw6qrm8gnz54nahmyxnhrxnpp";
+    sha256 = "0zvkmdc6mhc5kk7cbrgzxsl8n2d02gnxy1sppm83mhwx6s1dkz30";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 52d95487dd389edf88a260a8a2cfa14ff45de5c0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:44:52 +0100
Subject: [PATCH 0562/1310] fava: Fix github source (owner)

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

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 5ed7d25667e..76c4b047cea 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec {
   name = "fava-${version}";
 
   src = fetchFromGitHub {
-    owner = "aumayr";
+    owner = "beancount";
     repo = "fava";
     rev = "v${version}";
     sha256 = "0dm4x6z80m04r9qa55psvz7f41qnh13hnj2qhvxkrk22yqmkqrka";

From cc0a5d589ddf1f6a4fb72a5b4daed8852b65e34a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 14:43:04 +0100
Subject: [PATCH 0563/1310] fava: 1.0 -> 1.2

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

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 76c4b047cea..a246c7290a5 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -1,19 +1,17 @@
 { stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.0";
+  version = "1.2";
   name = "fava-${version}";
 
-  src = fetchFromGitHub {
-    owner = "beancount";
-    repo = "fava";
-    rev = "v${version}";
-    sha256 = "0dm4x6z80m04r9qa55psvz7f41qnh13hnj2qhvxkrk22yqmkqrka";
+  src = fetchurl {
+    url = "https://github.com/beancount/fava/archive/v${version}.tar.gz";
+    sha256 = "0sykx054w4cvr0pgbqph0lmkxffafl83k5ir252gl5znxgcvg6yw";
   };
 
   assets = fetchzip {
-    url = "https://github.com/aumayr/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz";
-    sha256 = "1vvidwfn5882dslz6qqkkd84m7w52kd34x10qph8yhipyjv1dimc";
+    url = "https://github.com/beancount/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz";
+    sha256 = "1lk6s3s6xvvwbcbkr1qpr9bqdgwspk3vms25zjd6xcs21s3hchmp";
   };
 
   buildInputs = with python3Packages; [ pytest_30 ];

From b1f4c1dffe7090014ebfcda76a6b78f655e5f7ed Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 14:46:06 +0100
Subject: [PATCH 0564/1310] beancount: 2.0b12 -> 2.0b13

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

diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix
index 2034c832294..72f6c5de8a1 100644
--- a/pkgs/applications/office/beancount/default.nix
+++ b/pkgs/applications/office/beancount/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchhg, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "2.0b12";
+  version = "2.0b13";
   name = "beancount-${version}";
   namePrefix = "";
 
   src = pkgs.fetchurl {
     url = "mirror://pypi/b/beancount/${name}.tar.gz";
-    sha256 = "0n0wyi2yhmf8l46l5z68psk4rrzqkgqaqn93l0wnxsmp1nmqly9z";
+    sha256 = "16gkcq28bwd015b1qhdr5d7vhxid8xfn6ia4n9n8dnl5n448yqkm";
   };
 
   buildInputs = with pythonPackages; [ nose ];

From d359101891708c3ce3ffaa645c30666fa7d0b521 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 14:47:13 +0100
Subject: [PATCH 0565/1310] bean-add: 2016-10-03 -> 2016-12-02

---
 pkgs/applications/office/beancount/bean-add.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index 3afb7ce4b10..4e73a305ea4 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "bean-add-2016-10-03";
+  name = "bean-add-2016-12-02";
 
   src = fetchFromGitHub {
     owner = "simon-v";
     repo = "bean-add";
-    rev = "41deacc09b992db5eede34fefbfb2c0faeba1652";
-    sha256 = "09xdsskk5rc3xsf1v1vq7nkdxrxy8w2fixx2vdv8c97ak6a4hrca";
+    rev = "8038dabf5838c880c8e750c0e65cf0da4faf40b9";
+    sha256 = "016ybq570xicj90x4kxrbxhzdvkjh0d6v3r6s3k3qfzz2c5vwh09";
   };
 
   propagatedBuildInputs = with python3Packages; [ python ];

From a3d42f3999da04246d4d25bcc2dd16df53847c93 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 14:49:29 +0100
Subject: [PATCH 0566/1310] weather: 2.0 -> 2.3

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

diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix
index 192e4406b6d..a184d31233c 100644
--- a/pkgs/applications/misc/weather/default.nix
+++ b/pkgs/applications/misc/weather/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 stdenv.mkDerivation rec {
-    version = "2.0";
+    version = "2.3";
     name = "weather-${version}";
 
     src = fetchurl {
         url = "http://fungi.yuggoth.org/weather/src/${name}.tar.xz";
-        sha256 = "0yil363y9iyr4mkd7xxq0p2260wh50f9i5p0map83k9i5l0gyyl0";
+        sha256 = "0inij30prqqcmzjwcmfzjjn0ya5klv18qmajgxipz1jr3lpqs546";
     };
 
     nativeBuildInputs = [ pythonPackages.wrapPython ];

From f10dfd692f51400e9661c461b49b36ac83f0228c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 4 Jan 2017 16:41:30 +0100
Subject: [PATCH 0567/1310] haskellPackages.mysql: fix #19593

---
 pkgs/development/haskell-modules/configuration-common.nix      | 3 ++-
 .../development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index da95981c5e3..4c0cb349860 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -42,7 +42,8 @@ self: super: {
   Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
 
   # Use the default version of mysql to build this package (which is actually mariadb).
-  mysql = super.mysql.override { mysql = pkgs.mysql.lib; };
+  # test phase requires networking
+  mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; });
 
   # Link the proper version.
   zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 06480f59f28..66b0a7f3db7 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5741,7 +5741,6 @@ dont-distribute-packages:
   mysql-simple-quasi:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-simple-typed:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mystem:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   myTestlll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mywatch:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]

From 3f499d3fb9d4ad9aac71925a813f2bbefa167ae0 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 25 Dec 2016 20:37:06 +0100
Subject: [PATCH 0568/1310] tix: init at 8.4.1

---
 pkgs/development/libraries/tix/default.nix | 55 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/libraries/tix/default.nix

diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix
new file mode 100644
index 00000000000..7e18e740227
--- /dev/null
+++ b/pkgs/development/libraries/tix/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, tcl, tk, fetchpatch } :
+
+stdenv.mkDerivation rec {
+  version = "8.4.3";
+  name = "tix-${version}";
+  src = fetchurl {
+     url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz";
+     sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn";
+  };
+  patches = [ 
+  (fetchpatch {
+    name = "tix-8.4.3-tcl8.5.patch";
+    url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
+    sha256 = "0wzqmcxxq0rqpnjgxz10spw92yhfygnlwv0h8pcx2ycnqiljz6vj";
+    })
+  ] ++ stdenv.lib.optional (tcl.release == "8.6")
+  (fetchpatch {
+    name = "tix-8.4.3-tcl8.6.patch";
+    url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
+    sha256 = "1jaz0l22xj7x1k4rb9ia6i1psnbwk4pblgq4gfvya7gg7fbb7r36";
+    })
+  ;
+  buildInputs = [ tcl tk ];
+  # the configure script expects to find the location of the sources of
+  # tcl and tk in {tcl,tk}Config.sh
+  # In fact, it only needs some private headers. We copy them in 
+  # the private_headers folders and trick the configure script into believing
+  # the sources are here.
+  preConfigure = ''
+    mkdir -p private_headers/generic
+    < ${tcl}/lib/tclConfig.sh sed "s@TCL_SRC_DIR=.*@TCL_SRC_DIR=private_headers@" > tclConfig.sh
+    < ${tk}/lib/tkConfig.sh sed "s@TK_SRC_DIR=.*@TK_SRC_DIR=private_headers@" > tkConfig.sh
+    for i in ${tcl}/include/* ${tk.dev}/include/*; do
+      ln -s $i private_headers/generic;
+    done;
+    '';
+  configureFlags = ''
+      --with-tclinclude=${tcl}/include
+      --with-tclconfig=.
+      --with-tkinclude=${tk.dev}/include
+      --with-tkconfig=.
+      --libdir=''${prefix}/lib
+    '';
+
+  meta = with stdenv.lib; {
+    description = "A widget library for Tcl/Tk";
+    homepage    = http://tix.sourceforge.net/;
+    platforms   = platforms.all;
+    license     = with licenses; [
+      bsd2 # tix
+      gpl2 # patches from portage
+    ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9842aaede3..50d6f5abcbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9477,6 +9477,8 @@ in
 
   tivodecode = callPackage ../applications/video/tivodecode { };
 
+  tix = callPackage ../development/libraries/tix { };
+
   tk = tk-8_6;
 
   tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { };

From 6edb3793d3c71ffce23ffaf2b6929bb5aba2f715 Mon Sep 17 00:00:00 2001
From: Dhananjay Balan <dhananjay@cliqz.com>
Date: Wed, 4 Jan 2017 17:43:05 +0100
Subject: [PATCH 0569/1310] ldns 1.6.17 -> 1.7.0 Release notes:
 http://git.nlnetlabs.nl/ldns/tree/Changelog?id=release-1.7.0

Openssl-1.1.0 is used to enable offline DANE verification (Needed for the DANE-TA usage type)

```
configure: error: OpenSSL does not support offline DANE verification (Needed for the DANE-TA usage type).  Please upgrade OpenSSL to version >= 1.1.0 or rerun with --disable-dane-verify or --disable-dane-ta-usage
builder /nix/store/m6n021fbk5h4iywzi3n26j95ksps9mwc-ldns-1.7.0. failed with exit code 1
error: build /nix/store/m6n021fbk5h4iywzi3n26j95ksps9mwc-ldns-1.7.0. failed
drvof drvfor
```
---
 pkgs/development/libraries/ldns/default.nix   | 19 ++++++++++---------
 .../libraries/ldns/perl-5.22-compat.patch     | 12 ------------
 pkgs/top-level/all-packages.nix               |  4 +++-
 3 files changed, 13 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/ldns/perl-5.22-compat.patch

diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 883625e551a..c35cc588314 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -1,25 +1,26 @@
 {stdenv, fetchurl, openssl, perl}:
 
 stdenv.mkDerivation rec {
-  name = "ldns-1.6.17";
+  pname = "ldns";
+  version = "1.7.0";
+
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz";
-    sha256 = "1kf8pkwhcssvgzhh6ha1pjjiziwvwmfaali7kaafh6118mcy124b";
+    url = "https://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz";
+    sha1 = "ceeeccf8a27e61a854762737f6ee02f44662c1b8";
   };
 
-  outputs = [ "out" "dev" ];
-
-  patches = [ ./perl-5.22-compat.patch ];
-
-  postPatch = ''
+  patchPhase = ''
     patchShebangs doc/doxyparse.pl
   '';
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ perl ];
   buildInputs = [ openssl ];
 
-  configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill" ];
+  configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill"];
 
   postInstall = ''
     moveToOutput "bin/ldns-config" "$dev"
diff --git a/pkgs/development/libraries/ldns/perl-5.22-compat.patch b/pkgs/development/libraries/ldns/perl-5.22-compat.patch
deleted file mode 100644
index ddf711cef5d..00000000000
--- a/pkgs/development/libraries/ldns/perl-5.22-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur old/doc/doxyparse.pl new/doc/doxyparse.pl
---- old/doc/doxyparse.pl	2014-01-11 06:04:41.000000000 +0900
-+++ new/doc/doxyparse.pl	2015-08-08 22:29:34.216889652 +0900
-@@ -273,7 +273,7 @@
- 
- 	print MAN $MAN_MIDDLE;
- 
--	if (defined(@$also)) {
-+	if (@$also) {
- 		print MAN "\n.SH SEE ALSO\n\\fI";
- 		print MAN join "\\fR, \\fI", @$also;
- 		print MAN "\\fR.\nAnd ";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c247b5dddf..987da00bfce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2579,7 +2579,9 @@ in
 
   ldapvi = callPackage ../tools/misc/ldapvi { };
 
-  ldns = callPackage ../development/libraries/ldns { };
+  ldns = callPackage ../development/libraries/ldns {
+    openssl = openssl_1_1_0;
+  };
 
   leafpad = callPackage ../applications/editors/leafpad { };
 

From b578bbbe68c3439ffcaea903fbafdaaccaff67c1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 4 Jan 2017 17:19:57 +0100
Subject: [PATCH 0570/1310] mysql55: 5.5.53 -> 5.5.54

---
 pkgs/servers/sql/mysql/5.5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index faee8415f4b..820c3fc9605 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.5.53";
+  version = "5.5.54";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
-    sha256 = "1snnyz8s7dd3ypm73vbpw36pflz7wqh2bawdvp4riri44pa6va57";
+    sha256 = "1f0sg72vbhavj1cbay0gyyrrw0mjcf2k0nf30zmn2h68ik7wnfr7";
   };
 
   patches = if stdenv.isCygwin then [

From 8ec3b1fd5fe276edbeec2ca010a86c98f7805399 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 4 Jan 2017 17:25:45 +0100
Subject: [PATCH 0571/1310] mysql55: 5.7.16 -> 5.7.17

---
 pkgs/servers/sql/mysql/5.7.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index 5823cc57fba..71867a94ef2 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.7.16";
+  version = "5.7.17";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
-    sha256 = "198qhd9bdm0fnpp307mgby2aar92yzya0937kxi7bcpdfjcvada9";
+    sha256 = "0lcn9cm36n14g22bcppq5vf4nxbrl3khvlsp9hsixqdfb3l27gyf";
   };
 
   preConfigure = stdenv.lib.optional stdenv.isDarwin ''

From 71c1e2ffbf52ac057d93531df8690d27e750ef42 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 4 Jan 2017 17:45:34 +0100
Subject: [PATCH 0572/1310] irssi_otr: 1.0.1 -> 1.0.2

---
 .../networking/irc/irssi/otr/default.nix      | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix
index 4d73648edf7..1141f563918 100644
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@@ -1,35 +1,23 @@
 { stdenv, fetchurl, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
 
-let
-  versionFix = fetchurl {
-    url = https://patch-diff.githubusercontent.com/raw/cryptodotis/irssi-otr/pull/60.patch;
-    sha256 = "18fk9nbzf3fvhvvvkrxv5l004hhimapqb6ra09m83268kbl4q3jy";
-  };
-in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "irssi-otr-${version}";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "cryptodotis";
     repo = "irssi-otr";
-    rev = "4ad3b7b6c85be0154ab3694fe9831796db20c4fe";
-    sha256 = "1hm1whx1wzlx4fh4xf2y68rx9x6whi8bsbrhd6hqjhskg5msssrg";
+    rev = "v${version}";
+    sha256 = "0c5wb2lg9q0i1jdhpyb5vpvxaa2xx00gvp3gdk93ix9v68gq1ppp";
   };
 
-  prePatch = ''
-    sed -i 's,/usr/include/irssi,${irssi}/include/irssi,' src/Makefile.am
-    sed -i "s,/usr/lib/irssi,$out/lib/irssi," configure.ac
-    sed -i "s,/usr/share/irssi,$out/share/irssi," help/Makefile.am
-  '';
-
-  patches = [ versionFix ];
-
   preConfigure = "sh ./bootstrap";
 
   buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ];
 
+  NIX_CFLAGS_COMPILE="-I ${irssi}/include/irssi -I ${irssi}/include/irssi/src/core -I ${irssi}/include/irssi/src/";
+
   meta = {
     homepage = https://github.com/cryptodotis/irssi-otr;
     license = stdenv.lib.licenses.gpl2Plus;

From 9e97c0b937b8ce73f11da3a6bfa7f8317b863af6 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 4 Jan 2017 16:24:56 +0000
Subject: [PATCH 0573/1310] packer: 0.10.1 -> 0.12.1

---
 pkgs/development/tools/packer/default.nix |  51 +-
 pkgs/development/tools/packer/deps.nix    | 560 ----------------------
 pkgs/top-level/all-packages.nix           |  12 +-
 3 files changed, 12 insertions(+), 611 deletions(-)
 delete mode 100644 pkgs/development/tools/packer/deps.nix

diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 7e8e2092ceb..d7e6bbd0351 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,47 +1,18 @@
-{ stdenv, lib, gox, gotools, buildGoPackage, fetchFromGitHub
-, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-stdenv.mkDerivation rec {
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+buildGoPackage rec {
   name = "packer-${version}";
-  version = "0.10.1";
+  version = "0.12.1";
 
-  src = (import ./deps.nix {
-    inherit stdenv lib gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn;
-  }).out;
+  goPackagePath = "github.com/mitchellh/packer";
 
-  buildInputs = [ src.go gox gotools ];
+  subPackages = [ "." ];
 
-  configurePhase = ''
-    export GOPATH=$PWD/share/go
-    export XC_ARCH=$(go env GOARCH)
-    export XC_OS=$(go env GOOS)
-
-    mkdir $GOPATH/bin
-
-    cd $GOPATH/src/github.com/mitchellh/packer
-
-    # Don't fetch the deps
-    substituteInPlace "Makefile" --replace ': deps' ':'
-
-    # Avoid using git
-    sed \
-      -e "s|GITBRANCH:=.*||" \
-      -e "s|GITSHA:=.*|GITSHA=${src.rev}|" \
-      -i Makefile
-    sed \
-      -e "s|GIT_COMMIT=.*|GIT_COMMIT=${src.rev}|" \
-      -e "s|GIT_DIRTY=.*|GIT_DIRTY=|" \
-      -i "scripts/build.sh"
-  '';
-
-  buildPhase = ''
-    make generate releasebin
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mv bin/* $out/bin
-  '';
+  src = fetchFromGitHub {
+    owner = "mitchellh";
+    repo = "packer";
+    rev = "v${version}";
+    sha256 = "05wd8xf4nahpg96wzligk5av10p0xd2msnb3imk67qgbffrlvmvi";
+  };
 
   meta = with stdenv.lib; {
     description = "A tool for creating identical machine images for multiple platforms from a single source configuration";
diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix
deleted file mode 100644
index 25098219ea2..00000000000
--- a/pkgs/development/tools/packer/deps.nix
+++ /dev/null
@@ -1,560 +0,0 @@
-{ stdenv, lib, gox, gotools, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-buildGoPackage rec {
-  name = "packer-${version}";
-  version = "20160507-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0";
-
-  buildInputs = [ gox gotools ];
-  
-  goPackagePath = "github.com/mitchellh/packer";
-
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/mitchellh/packer";
-    sha256 = "1a61f022h4ygnkp1lyr7vhq5w32a3f061dymgkqmz4c3b8fzcc10";
-  };
-
-  extraSrcs = [
-    {
-      goPackagePath = "github.com/ActiveState/tail";
-
-      src = fetchgit {
-        url = "https://github.com/ActiveState/tail";
-        rev = "1a0242e795eeefe54261ff308dc685f7d29cc58c";
-        sha256 = "0hhr2962xmbqzbf2p79xfrzbmjm33h61fj5zlazj7a55bwxn688d";
-      };
-    }
-    {
-      goPackagePath = "github.com/Azure/azure-sdk-for-go";
-
-      src = fetchgit {
-        url = "https://github.com/Azure/azure-sdk-for-go";
-        rev = "a1883f7b98346e4908a6c25230c95a8a3026a10c";
-        sha256 = "0pxqi0b8qwcc687si3zh6w1d594rxd6kn2wzx23clbp2nc5w3wf4";
-      };
-    }
-    {
-      goPackagePath = "github.com/Azure/go-autorest";
-
-      src = fetchgit {
-        url = "https://github.com/Azure/go-autorest";
-        rev = "b01ec2b60f95678fa759f796bac3c6b9bceaead4";
-        sha256 = "1vqwy4m26ps5lmp066zgiz04s7r2dwa832zjlfmpgha7id16pa0c";
-      };
-    }
-    {
-      goPackagePath = "github.com/Azure/go-ntlmssp";
-
-      src = fetchgit {
-        url = "https://github.com/Azure/go-ntlmssp";
-        rev = "e0b63eb299a769ea4b04dadfe530f6074b277afb";
-        sha256 = "19bn9ds12cyf8y3w5brnxwg8lwdkg16ww9hmnq14y2kmli42l14m";
-      };
-    }
-    {
-      goPackagePath = "github.com/armon/go-radix";
-
-      src = fetchgit {
-        url = "https://github.com/armon/go-radix";
-        rev = "4239b77079c7b5d1243b7b4736304ce8ddb6f0f2";
-        sha256 = "0md8li1gv4ji4vr63cfa2bcmslba94dzw6awzn5ndnpmdb7np6vh";
-      };
-    }
-    {
-      goPackagePath = "github.com/aws/aws-sdk-go";
-
-      src = fetchgit {
-        url = "https://github.com/aws/aws-sdk-go";
-        rev = "8041be5461786460d86b4358305fbdf32d37cfb2";
-        sha256 = "06ilyl1z5mn6i0afd8ila4lr2vwqdgq5zby8v4v2g3dd39qi6jq2";
-      };
-    }
-    {
-      goPackagePath = "github.com/bgentry/speakeasy";
-
-      src = fetchgit {
-        url = "https://github.com/bgentry/speakeasy";
-        rev = "36e9cfdd690967f4f690c6edcc9ffacd006014a0";
-        sha256 = "0grr82p10dk51l082xaqkpq3izj5bhby3l15gj866kngybfb4nzr";
-      };
-    }
-    {
-      goPackagePath = "github.com/dgrijalva/jwt-go";
-
-      src = fetchgit {
-        url = "https://github.com/dgrijalva/jwt-go";
-        rev = "f2193411bd642f7db03249fd79d5292c9b34916a";
-        sha256 = "0nkzn8i5f7x3wyi7mhhj9vpdbkdjvrb9hhrw0fqy6vcghia6dhrj";
-      };
-    }
-    {
-      goPackagePath = "github.com/digitalocean/godo";
-
-      src = fetchgit {
-        url = "https://github.com/digitalocean/godo";
-        rev = "6ca5b770f203b82a0fca68d0941736458efa8a4f";
-        sha256 = "00di15gdv47jfdr1l8cqphmlv5bzalxk7dk53g3mif7vwhs8749j";
-      };
-    }
-    {
-      goPackagePath = "github.com/dylanmei/iso8601";
-
-      src = fetchgit {
-        url = "https://github.com/dylanmei/iso8601";
-        rev = "2075bf119b58e5576c6ed9f867b8f3d17f2e54d4";
-        sha256 = "0px5aq4w96yyjii586h3049xm7rvw5r8w7ph3axhyismrqddqgx1";
-      };
-    }
-    {
-      goPackagePath = "github.com/dylanmei/winrmtest";
-
-      src = fetchgit {
-        url = "https://github.com/dylanmei/winrmtest";
-        rev = "025617847eb2cf9bd1d851bc3b22ed28e6245ce5";
-        sha256 = "1i0wq6r1vm3nhnia3ycm5l590gyia7cwh6971ppnn4rrdmvsw2qh";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-ini/ini";
-
-      src = fetchgit {
-        url = "https://github.com/go-ini/ini";
-        rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3";
-        sha256 = "0dl5ibrrq2i887i0bf8a9m887rhnpgv6wmwyc1sj8a75c0yd02da";
-      };
-    }
-    {
-      goPackagePath = "github.com/google/go-querystring";
-
-      src = fetchgit {
-        url = "https://github.com/google/go-querystring";
-        rev = "2a60fc2ba6c19de80291203597d752e9ba58e4c0";
-        sha256 = "117211606pv0p3p4cblpnirrrassprrvvcq2svwpplsq5vff1rka";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/atlas-go";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/atlas-go";
-        rev = "95fa852edca41c06c4ce526af4bb7dec4eaad434";
-        sha256 = "002lpvxi6my8dk4d4ks091ad66bj6rnz4xchbzpqwvp7n8097aqz";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/errwrap";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/errwrap";
-        rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55";
-        sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/go-checkpoint";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/go-checkpoint";
-        rev = "e4b2dc34c0f698ee04750bf2035d8b9384233e1b";
-        sha256 = "0qjfk1fh5zmn04yzxn98zam8j4ay5mzd5kryazqj01hh7szd0sh5";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/go-cleanhttp";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/go-cleanhttp";
-        rev = "875fb671b3ddc66f8e2f0acc33829c8cb989a38d";
-        sha256 = "0ammv6gn9cmh6padaaw76wa6xvg22a9b3sw078v9chcvfk2bggha";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/go-multierror";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/go-multierror";
-        rev = "d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5";
-        sha256 = "0dc02mvv11hvanh12nhw8jsislnxf6i4gkh6vcil0x23kj00z3iz";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/go-rootcerts";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/go-rootcerts";
-        rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00";
-        sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/go-version";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/go-version";
-        rev = "7e3c02b30806fa5779d3bdfc152ce4c6f40e7b38";
-        sha256 = "0ibqaq6z02himzci4krbfhqdi8fw2gzj9a8z375nl3qbzdgzqnm7";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/yamux";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/yamux";
-        rev = "df949784da9ed028ee76df44652e42d37a09d7e4";
-        sha256 = "080bmbdaq88ri2pn63mcjc4kq2y2sy1742ypqfgrvwssa1ynvnhy";
-      };
-    }
-    {
-      goPackagePath = "github.com/hpcloud/tail";
-
-      src = fetchgit {
-        url = "https://github.com/hpcloud/tail";
-        rev = "1a0242e795eeefe54261ff308dc685f7d29cc58c";
-        sha256 = "0hhr2962xmbqzbf2p79xfrzbmjm33h61fj5zlazj7a55bwxn688d";
-      };
-    }
-    {
-      goPackagePath = "github.com/jmespath/go-jmespath";
-
-      src = fetchgit {
-        url = "https://github.com/jmespath/go-jmespath";
-        rev = "c01cf91b011868172fdcd9f41838e80c9d716264";
-        sha256 = "0lp2m33a6x2pjbv5xlbbcr48qri32s84hcgm3xmgvmrx6zyi74zg";
-      };
-    }
-    {
-      goPackagePath = "github.com/kardianos/osext";
-
-      src = fetchgit {
-        url = "https://github.com/kardianos/osext";
-        rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc";
-        sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/compress";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/compress";
-        rev = "f86d2e6d8a77c6a2c4e42a87ded21c6422f7557e";
-        sha256 = "17f9zxrs2k8q5kghppjnbn0xzl3i4fgl4852kj8cg94b51s5ll9f";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/cpuid";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/cpuid";
-        rev = "349c675778172472f5e8f3a3e0fe187e302e5a10";
-        sha256 = "1y7gqpcpcb29ws77328vfm30s8nsrbxyylfpb8ksb8wwg062yv6v";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/crc32";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/crc32";
-        rev = "999f3125931f6557b991b2f8472172bdfa578d38";
-        sha256 = "1sxnq3i7wvcdqx0l91jc04nf5584ym8dxzkz3xvivm8p7kz2xjns";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/pgzip";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/pgzip";
-        rev = "47f36e165cecae5382ecf1ec28ebf7d4679e307d";
-        sha256 = "00jcx3pdwxi4r2l3m4b8jb17b2srckz488cmjvd1vqkr85a0jp2x";
-      };
-    }
-    {
-      goPackagePath = "github.com/kr/fs";
-
-      src = fetchgit {
-        url = "https://github.com/kr/fs";
-        rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b";
-        sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
-      };
-    }
-    {
-      goPackagePath = "github.com/masterzen/simplexml";
-
-      src = fetchgit {
-        url = "https://github.com/masterzen/simplexml";
-        rev = "95ba30457eb1121fa27753627c774c7cd4e90083";
-        sha256 = "0pwsis1f5n4is0nmn6dnggymj32mldhbvihv8ikn3nglgxclz4kz";
-      };
-    }
-    {
-      goPackagePath = "github.com/masterzen/winrm";
-
-      src = fetchgit {
-        url = "https://github.com/masterzen/winrm";
-        rev = "54ea5d01478cfc2afccec1504bd0dfcd8c260cfa";
-        sha256 = "1d4khg7c4vw645id0x301zkgidm4ah6nkmiq52j8wsivi85yhn66";
-      };
-    }
-    {
-      goPackagePath = "github.com/masterzen/xmlpath";
-
-      src = fetchgit {
-        url = "https://github.com/masterzen/xmlpath";
-        rev = "13f4951698adc0fa9c1dda3e275d489a24201161";
-        sha256 = "1y81h7ymk3dp3w3a2iy6qd1dkm323rkxa27dzxw8vwy888j5z8bk";
-      };
-    }
-    {
-      goPackagePath = "github.com/mattn/go-isatty";
-
-      src = fetchgit {
-        url = "https://github.com/mattn/go-isatty";
-        rev = "56b76bdf51f7708750eac80fa38b952bb9f32639";
-        sha256 = "0l8lcp8gcqgy0g1cd89r8vk96nami6sp9cnkx60ms1dn6cqwf5n3";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/cli";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/cli";
-        rev = "5c87c51cedf76a1737bf5ca3979e8644871598a6";
-        sha256 = "1ajxzh3winjnmqhd4yn6b6f155vfzi0dszhzl4a00zb5pdppp1rd";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/go-fs";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/go-fs";
-        rev = "a34c1b9334e86165685a9449b782f20465eb8c69";
-        sha256 = "11sy85p77ffmavpiichzybrfvjm1ilsi4clx98n3363arksavs5i";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/go-homedir";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/go-homedir";
-        rev = "d682a8f0cf139663a984ff12528da460ca963de9";
-        sha256 = "0vsiby9fbkaz7q067wmc6s5pzgpq4gdfx66cj2a1lbdarf7j1kbs";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/go-vnc";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/go-vnc";
-        rev = "723ed9867aed0f3209a81151e52ddc61681f0b01";
-        sha256 = "0nlya2rbmwb3jycqsyah1pn4386712mfrfiprprkbzcna9q7lp1h";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/iochan";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/iochan";
-        rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7";
-        sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/mapstructure";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/mapstructure";
-        rev = "281073eb9eb092240d33ef253c404f1cca550309";
-        sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/multistep";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/multistep";
-        rev = "162146fc57112954184d90266f4733e900ed05a5";
-        sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/panicwrap";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/panicwrap";
-        rev = "a1e50bc201f387747a45ffff020f1af2d8759e88";
-        sha256 = "0w5y21psgrl1afsap613c3qw84ik7zhnalnv3bf6r51hyv187y69";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/prefixedio";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/prefixedio";
-        rev = "6e6954073784f7ee67b28f2d22749d6479151ed7";
-        sha256 = "0an2pnnda33ns94v7x0sv9kmsnk62r8xm0cj4d69f2p63r85fdp6";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/reflectwalk";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/reflectwalk";
-        rev = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6";
-        sha256 = "1nm2ig7gwlmf04w7dbqd8d7p64z2030fnnfbgnd56nmd7dz8gpxq";
-      };
-    }
-    {
-      goPackagePath = "github.com/nu7hatch/gouuid";
-
-      src = fetchgit {
-        url = "https://github.com/nu7hatch/gouuid";
-        rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3";
-        sha256 = "175alsrjb2a1qzwp1l323vwwpirzaj95yfqqfi780698myhpb52k";
-      };
-    }
-    {
-      goPackagePath = "github.com/packer-community/winrmcp";
-
-      src = fetchgit {
-        url = "https://github.com/packer-community/winrmcp";
-        rev = "f1bcf36a69fa2945e65dd099eee11b560fbd3346";
-        sha256 = "0pj5gfbmx507lp1w3gfn23x0rn0x5rih9nqij9g8d9c4m1sx3275";
-      };
-    }
-    {
-      goPackagePath = "github.com/pierrec/lz4";
-
-      src = fetchgit {
-        url = "https://github.com/pierrec/lz4";
-        rev = "383c0d87b5dd7c090d3cddefe6ff0c2ffbb88470";
-        sha256 = "0l23bmzqfvgh61zlikj6iakg0kz7lybs8zf0nscylskl2hlr09rp";
-      };
-    }
-    {
-      goPackagePath = "github.com/pierrec/xxHash";
-
-      src = fetchgit {
-        url = "https://github.com/pierrec/xxHash";
-        rev = "5a004441f897722c627870a981d02b29924215fa";
-        sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja";
-      };
-    }
-    {
-      goPackagePath = "github.com/pkg/sftp";
-
-      src = fetchgit {
-        url = "https://github.com/pkg/sftp";
-        rev = "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5";
-        sha256 = "0v6g9j9pnkqz72x5409y8gd8ycniziydvsjb4298dkd21d3b94dg";
-      };
-    }
-    {
-      goPackagePath = "github.com/rackspace/gophercloud";
-
-      src = fetchgit {
-        url = "https://github.com/rackspace/gophercloud";
-        rev = "53d1dc4400e1ebcd37a0e01d8c1fe2f4db3b99d2";
-        sha256 = "0rdyljj395k1w7xnxw1i76w29fgl517mvs7bsqll35lss2gbhan2";
-      };
-    }
-    {
-      goPackagePath = "github.com/satori/go.uuid";
-
-      src = fetchgit {
-        url = "https://github.com/satori/go.uuid";
-        rev = "d41af8bb6a7704f00bc3b7cba9355ae6a5a80048";
-        sha256 = "0lw8k39s7hab737rn4nngpbsganrniiv7px6g41l6f6vci1skyn2";
-      };
-    }
-    {
-      goPackagePath = "github.com/tent/http-link-go";
-
-      src = fetchgit {
-        url = "https://github.com/tent/http-link-go";
-        rev = "ac974c61c2f990f4115b119354b5e0b47550e888";
-        sha256 = "0iwq842pvp5y77cr25yanj1cgqzmkz1aw6jzgjrrmlqqkdad5z8c";
-      };
-    }
-    {
-      goPackagePath = "github.com/ugorji/go";
-
-      src = fetchgit {
-        url = "https://github.com/ugorji/go";
-        rev = "646ae4a518c1c3be0739df898118d9bccf993858";
-        sha256 = "0njncpdbh115l5mxyks08jh91kdmy0mvbmxj9mr1psv5k97gf0pn";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/crypto";
-
-      src = fetchgit {
-        url = "https://go.googlesource.com/crypto";
-        rev = "1f22c0103821b9390939b6776727195525381532";
-        sha256 = "05ahvn9g9cj7797n8ryfxv2g26v3lx1pza9d9pg97iw0rvar9i1h";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/net";
-
-      src = fetchgit {
-        url = "https://go.googlesource.com/net";
-        rev = "6ccd6698c634f5d835c40c1c31848729e0cecda1";
-        sha256 = "05c7kdjkvf7hrdiv1k12nyss6s8chhakqn1adxbrrahr6rl1nhpj";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/oauth2";
-
-      src = fetchgit {
-        url = "https://go.googlesource.com/oauth2";
-        rev = "8a57ed94ffd43444c0879fe75701732a38afc985";
-        sha256 = "10pxnbsy1lnx7a1x6g3cna5gdm11aal1r446dpmpgj94xiw96mxv";
-      };
-    }
-    {
-      goPackagePath = "google.golang.org/api";
-
-      src = fetchgit {
-        url = "https://code.googlesource.com/google-api-go-client";
-        rev = "ddff2aff599105a55549cf173852507dfa094b7f";
-        sha256 = "03058zh0v997fxmlvd8r4m63r3z0fzg6fval6wnxw3wq22m7h3yx";
-      };
-    }
-    {
-      goPackagePath = "google.golang.org/cloud";
-
-      src = fetchgit {
-        url = "https://code.googlesource.com/gocloud";
-        rev = "5a3b06f8b5da3b7c3a93da43163b872c86c509ef";
-        sha256 = "03zrw3mgh82gvfgz17k97n8hivnvvplc42c7vyr76i90n1mv29g7";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/fsnotify.v1";
-
-      src = fetchgit {
-        url = "https://gopkg.in/fsnotify.v1";
-        rev = "8611c35ab31c1c28aa903d33cf8b6e44a399b09e";
-        sha256 = "17a7z88860hhmbgmpc2si1n67s8zk3vzwv5r4wyhrsljcq0bcv9q";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/tomb.v1";
-
-      src = fetchgit {
-        url = "https://gopkg.in/tomb.v1";
-        rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8";
-        sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/xmlpath.v2";
-
-      src = fetchgit {
-        url = "https://gopkg.in/xmlpath.v2";
-        rev = "860cbeca3ebcc600db0b213c0e83ad6ce91f5739";
-        sha256 = "0jgvd0y78fir4vkcj8acs0pdvlc0xr7i7cspbkm2yjm8wv23p63h";
-      };
-    }
-  ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ddf6df2369..07759b0a416 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -161,17 +161,7 @@ in
 
   fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { };
 
-  packer = callPackage ../development/tools/packer {
-    # Go 1.7 changed the linker flag format
-    buildGoPackage = buildGo16Package;
-    gotools = self.gotools.override {
-      buildGoPackage = buildGo16Package;
-      go = self.go_1_6;
-    };
-    gox = self.gox.override {
-      buildGoPackage = buildGo16Package;
-    };
-  };
+  packer = callPackage ../development/tools/packer { };
 
   fetchpatch = callPackage ../build-support/fetchpatch { };
 

From d4b960550bc8a8e177c161864306bb8cba7d3515 Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Wed, 4 Jan 2017 11:59:27 -0500
Subject: [PATCH 0574/1310] neovim: Inherit meta into neovim-configured
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When adding neovim's configure option to config.nix, builds fail with

  error: attribute ‘platforms’ missing, at
  /nix/store/*/nixos/pkgs/applications/editors/neovim/qt.nix:41:28

Inheriting meta into neovim-configured fixes this, and seems reasonable.
---
 pkgs/applications/editors/neovim/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 354aaf6db54..a9a9b6952bd 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -167,7 +167,7 @@ let
 
 in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation {
   name = "neovim-${neovim.version}-configured";
-  inherit (neovim) version;
+  inherit (neovim) version meta;
 
   nativeBuildInputs = [ makeWrapper ];
 

From 3956435d0a2197709e475c6fd3adab4a4217dc2d Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Thu, 29 Dec 2016 16:23:51 -0500
Subject: [PATCH 0575/1310] eval-config.nix: configuration->configuration.nix

`configuration` seems to be a reference to an argument that was
removed seven years ago in commit 2892aed7.

`configuration.nix` makes it a big more clear what we're referring to.
---
 nixos/lib/eval-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index a87b285c5b7..2e7971cca81 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -1,4 +1,4 @@
-# From an end-user configuration file (`configuration'), build a NixOS
+# From an end-user configuration file (`configuration.nix'), build a NixOS
 # configuration object (`config') from which we can retrieve option
 # values.
 

From 567c1a360f1f3b531847432e734e6f7e6eec41a5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 4 Jan 2017 19:36:33 +0100
Subject: [PATCH 0576/1310] openfire: mark as broken; its unfriendlyness
 towards read-only installation directory and friendliness towards manual
 installation by just unpacking only grow with time

---
 pkgs/servers/xmpp/openfire/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix
index 9ae159a453d..0e6fcd5e989 100644
--- a/pkgs/servers/xmpp/openfire/default.nix
+++ b/pkgs/servers/xmpp/openfire/default.nix
@@ -23,5 +23,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "XMPP server in Java";
     platforms = stdenv.lib.platforms.unix;
+    # Some security advisories seem to apply, and each next version wants to
+    # write into larger parts of installation directory; installation is just
+    # unpacking, though
+    broken = true;
   };
 }

From a6e3d713614da30bc75c0b9579a379e82eb3411c Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 1 Jan 2017 19:37:02 +0100
Subject: [PATCH 0577/1310] python: support the tkinter.tix module

---
 .../development/interpreters/python/cpython/2.7/default.nix | 6 +++++-
 .../development/interpreters/python/cpython/3.3/default.nix | 6 +++++-
 .../development/interpreters/python/cpython/3.4/default.nix | 6 +++++-
 .../development/interpreters/python/cpython/3.5/default.nix | 6 +++++-
 .../development/interpreters/python/cpython/3.6/default.nix | 6 +++++-
 pkgs/development/interpreters/python/pypy/2.7/default.nix   | 3 ++-
 6 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 5842f6fb309..15b21b5bed9 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -6,7 +6,7 @@
 , openssl
 , readline
 , sqlite
-, tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? false
+, tcl ? null, tk ? null, tix ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? false
 , zlib
 , callPackage
 , self
@@ -150,6 +150,10 @@ in stdenv.mkDerivation {
 
     setupHook = ./setup-hook.sh;
 
+    postPatch = optionalString (x11Support && (tix != null)) ''
+          substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
+    '';
+
     postInstall =
       ''
         # needed for some packages, especially packages that backport
diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix
index 6a543a8a0ee..3ab0de96704 100644
--- a/pkgs/development/interpreters/python/cpython/3.3/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix
@@ -6,7 +6,7 @@
 , openssl
 , readline
 , sqlite
-, tcl ? null, tk ? null, libX11 ? null, xproto ? null, x11Support ? false
+, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
 , zlib
 , callPackage
 , self
@@ -50,6 +50,10 @@ in stdenv.mkDerivation {
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
+  postPatch = optionalString (x11Support && (tix != null)) ''
+    substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
+  '';
+
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
       substituteInPlace ./setup.py --replace $i /no-such-path
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 623fa5d74f6..e081a60c6bc 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -6,7 +6,7 @@
 , openssl
 , readline
 , sqlite
-, tcl ? null, tk ? null, libX11 ? null, xproto ? null, x11Support ? false
+, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
 , zlib
 , callPackage
 , self
@@ -55,6 +55,10 @@ in stdenv.mkDerivation {
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
+  postPatch = optionalString (x11Support && (tix != null)) ''
+    substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
+  '';
+
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
       substituteInPlace ./setup.py --replace $i /no-such-path
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 7172e429f23..92f9d66ea52 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -6,7 +6,7 @@
 , openssl
 , readline
 , sqlite
-, tcl ? null, tk ? null, libX11 ? null, xproto ? null, x11Support ? false
+, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
 , zlib
 , callPackage
 , self
@@ -55,6 +55,10 @@ in stdenv.mkDerivation {
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
+  postPatch = optionalString (x11Support && (tix != null)) ''
+    substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
+  '';
+
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
       substituteInPlace ./setup.py --replace $i /no-such-path
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 8892b0f5c71..795bd746725 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -7,7 +7,7 @@
 , openssl
 , readline
 , sqlite
-, tcl ? null, tk ? null, libX11 ? null, xproto ? null, x11Support ? false
+, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
 , zlib
 , callPackage
 , self
@@ -55,6 +55,10 @@ in stdenv.mkDerivation {
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
+  postPatch = optionalString (x11Support && (tix != null)) ''
+    substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
+  '';
+
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
       substituteInPlace ./setup.py --replace $i /no-such-path
diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index 1fd9eaee430..1cc2f95791f 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
-, sqlite, openssl, ncurses, python, expat, tcl, tk, xlibsWrapper, libX11
+, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
 , makeWrapper, callPackage, self, gdbm, db
 # For the Python package set
 , pkgs, packageOverrides ? (self: super: {})
@@ -35,6 +35,7 @@ let
       };
       in ''
       patch lib-python/2.7/test/test_pyexpat.py < '${expatch}'
+      substituteInPlace "lib-python/2.7/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
     '';
 
     buildInputs = [ bzip2 openssl pkgconfig python libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ]

From e276f590200e03b6e733c4e680ba2d835e37cd56 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 4 Jan 2017 20:39:01 +0100
Subject: [PATCH 0578/1310] pythonPackages.tkinter: patch rpath to use only one
 interpreter

The `tkinter` module is copied from a build of `python` with
`x11Support=true;` but has a reference to that build of `python`. We
however want to use the module in combination with a build of `python`
with `x11Support=false;` (the default). Therefore we patch the rpath to
refer to that `python` instead.
---
 pkgs/top-level/python-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0141729e30..e7ad930e16e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25512,9 +25512,13 @@ in {
     disabled = isPy26 || isPyPy;
 
     installPhase = ''
+      # Move the tkinter module
       mkdir -p $out/${py.sitePackages}
-      ls -Al lib/${py.libPrefix}/lib-dynload/ | grep tkinter
       mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/
+      # Update the rpath to point to python without x11Support
+      old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*)
+      new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" )
+      patchelf --set-rpath $new_rpath $out/${py.sitePackages}/_tkinter*
     '';
 
     inherit (py) meta;

From 86a251ee2f720ac7f90d608951fff26ce0564c4a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:07:38 +0100
Subject: [PATCH 0579/1310] libbrotli: 20160120 -> 1.0

---
 pkgs/development/libraries/libbrotli/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libbrotli/default.nix b/pkgs/development/libraries/libbrotli/default.nix
index 1e28b57dadf..03604e3a93e 100644
--- a/pkgs/development/libraries/libbrotli/default.nix
+++ b/pkgs/development/libraries/libbrotli/default.nix
@@ -1,17 +1,18 @@
-{stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable}:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable }:
 
 stdenv.mkDerivation rec {
-  name = "libbrotli-20160120";
-  version = "53d53e8";
+  name = "libbrotli-${version}";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "bagder";
     repo = "libbrotli";
-    rev = "53d53e8d9c0d37398d37bac2e7a7aa20b0025e9e";
-    sha256 = "10r4nx6n1r54f5cjck5mmmsj7bkasnmmz7m84imhil45q73kzd4m";
+    rev = name;
+    sha256 = "0apd3hpy3vaa7brkv8v0xwz05zbd5xv86rcbkwns4x39klba3m3y";
   };
 
-  buildInputs = [autoconf automake libtool];
+  nativeBuildInputs = [ autoconf automake libtool ];
+
   preConfigure = ''
     cp -r ${brotliUnstable.src}/* brotli/
     chmod -R +700 brotli

From 4f957a9fdb5a2d33287f3e38cd8a3e6c7f49bed5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 21:28:05 +0100
Subject: [PATCH 0580/1310] pythonPackages.sqlalchemy_imageattach: fix
 evaluation

Broken since 762d847d47d5cd43a809ebc86d3b17555f873aa8 where the package
name case was changed but not the reverse dependencies.
---
 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 e7ad930e16e..87f529d36a1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24753,7 +24753,7 @@ in {
     };
 
     buildInputs = with self; [ pytest webob pkgs.imagemagick nose ];
-    propagatedBuildInputs = with self; [ sqlalchemy8 wand ];
+    propagatedBuildInputs = with self; [ sqlalchemy8 Wand ];
 
     checkPhase = ''
       cd tests

From 05fe17ea3c6cdf395a5fde6787a8faad46bd2aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 4 Jan 2017 22:27:08 +0100
Subject: [PATCH 0581/1310] libvncserver: enable libgcrypt

This allows encrypted vnc sessions for remmina
---
 pkgs/development/libraries/libvncserver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix
index 581673af64d..93f62376ac6 100644
--- a/pkgs/development/libraries/libvncserver/default.nix
+++ b/pkgs/development/libraries/libvncserver/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl,
   libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto, 
   xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama, 
-  libXrandr, randrproto, libXtst, zlib
+  libXrandr, randrproto, libXtst, zlib, libgcrypt
 }:
 
 assert stdenv.isLinux;
@@ -19,7 +19,7 @@ let
   buildInputs = [
     libtool libjpeg openssl libX11 libXdamage xproto damageproto
     xextproto libXext fixesproto libXfixes xineramaproto libXinerama
-    libXrandr randrproto libXtst zlib
+    libXrandr randrproto libXtst zlib libgcrypt
   ];
 in
 stdenv.mkDerivation {

From 26dce1924e324756964c5739c63c2bb7961a8fac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 4 Jan 2017 19:39:48 +0100
Subject: [PATCH 0582/1310] kpcli: 3.0 -> 3.1

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

diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix
index 7303db34649..bc5b7c0e3f4 100644
--- a/pkgs/tools/security/kpcli/default.nix
+++ b/pkgs/tools/security/kpcli/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  version = "3.0";
+  version = "3.1";
   name = "kpcli-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/kpcli/${name}.pl";
-    sha256 = "1704b412f8h9cls85xcpqm9k4n5vga26r4xq9ghp4pr1hl27nywl";
+    sha256 = "06m276if13w6gd54wi8nqd1yvk2csbhdmm8pcw9aw3hdlc27gw7i";
   };
 
   buildInputs = [ makeWrapper perl ];

From 08d1f28818cd4518f96f838bd0d99df9d0b8c9e9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 22:20:53 +0100
Subject: [PATCH 0583/1310] Revert "iproute: remove broken fan patch"

This reverts commit 0d5a5307bee0c9fd303b1cda9473808797d84eeb because it
breaks evaluation. See #21561.
---
 .../iproute/1000-ubuntu-poc-fan-driver.patch  |  65 +++++++
 .../1001-ubuntu-poc-fan-driver-v3.patch       | 133 +++++++++++++
 .../1002-ubuntu-poc-fan-driver-vxlan.patch    | 177 ++++++++++++++++++
 pkgs/os-specific/linux/iproute/default.nix    |  12 +-
 4 files changed, 386 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch
 create mode 100644 pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch
 create mode 100644 pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch

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
new file mode 100644
index 00000000000..e0c8278d488
--- /dev/null
+++ b/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch
@@ -0,0 +1,65 @@
+Description: POC fan driver support
+ POC Fan driver support
+Author: Jay Vosburgh <jay.vosburgh@canonical.com>
+
+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,
+ 	IFLA_IPTUN_ENCAP_SPORT,
+ 	IFLA_IPTUN_ENCAP_DPORT,
++
++	IFLA_IPTUN_FAN_UNDERLAY = 32,
++
+ 	__IFLA_IPTUN_MAX,
+ };
+ #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
+Index: iproute2-4.1.1/ip/link_iptnl.c
+===================================================================
+--- iproute2-4.1.1.orig/ip/link_iptnl.c
++++ iproute2-4.1.1/ip/link_iptnl.c
+@@ -66,6 +66,7 @@ static int iptunnel_parse_opt(struct lin
+ 	__u32 link = 0;
+ 	__u32 laddr = 0;
+ 	__u32 raddr = 0;
++	__u32 underlay = 0;
+ 	__u8 ttl = 0;
+ 	__u8 tos = 0;
+ 	__u8 pmtudisc = 1;
+@@ -174,6 +175,9 @@ get_failed:
+ 				raddr = get_addr32(*argv);
+ 			else
+ 				raddr = 0;
++		} else if (strcmp(*argv, "underlay") == 0) {
++			NEXT_ARG();
++			underlay = get_addr32(*argv);
+ 		} else if (strcmp(*argv, "local") == 0) {
+ 			NEXT_ARG();
+ 			if (strcmp(*argv, "any"))
+@@ -318,6 +322,9 @@ get_failed:
+ 		}
+ 	}
+ 
++	if (underlay)
++		addattr32(n, 1024, IFLA_IPTUN_FAN_UNDERLAY, underlay);
++
+ 	return 0;
+ }
+ 
+@@ -349,6 +356,14 @@ static void iptunnel_print_opt(struct li
+ 
+ 	fprintf(f, "local %s ", local);
+ 
++	if (tb[IFLA_IPTUN_FAN_UNDERLAY]) {
++		unsigned addr = rta_getattr_u32(tb[IFLA_IPTUN_FAN_UNDERLAY]);
++
++		if (addr)
++			fprintf(f, "underlay %s ",
++				format_host_r(AF_INET, 4, &addr, s1, sizeof(s1)));
++	}
++
+ 	if (tb[IFLA_IPTUN_LINK] && rta_getattr_u32(tb[IFLA_IPTUN_LINK])) {
+ 		unsigned link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);
+ 		const char *n = if_indextoname(link, s2);
diff --git a/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch b/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch
new file mode 100644
index 00000000000..634daa0de29
--- /dev/null
+++ b/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch
@@ -0,0 +1,133 @@
+Description: Fan driver support v3
+ Fan driver support v3
+Author: Jay Vosburgh <jay.vosburgh@canonical.com>
+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
+@@ -59,6 +59,7 @@ enum {
+ 	IFLA_IPTUN_ENCAP_DPORT,
+ 
+ 	IFLA_IPTUN_FAN_UNDERLAY = 32,
++	IFLA_IPTUN_FAN_MAP = 33,
+ 
+ 	__IFLA_IPTUN_MAX,
+ };
+@@ -134,4 +135,20 @@ enum {
+ };
+ 
+ #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)
++
++enum {
++	IFLA_FAN_UNSPEC,
++	IFLA_FAN_MAPPING,
++	__IFLA_FAN_MAX,
++};
++
++#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
++
++struct ip_tunnel_fan_map {
++	__be32		underlay;
++	__be32		overlay;
++	__u16		underlay_prefix;
++	__u16		overlay_prefix;
++};
++
+ #endif /* _IF_TUNNEL_H_ */
+Index: iproute2-4.1.1/ip/link_iptnl.c
+===================================================================
+--- iproute2-4.1.1.orig/ip/link_iptnl.c
++++ iproute2-4.1.1/ip/link_iptnl.c
+@@ -49,6 +49,42 @@ static void usage(int sit)
+ 	print_usage(stderr, sit);
+ 	exit(-1);
+ }
++static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
++{
++	inet_prefix underlay, overlay;
++	struct ip_tunnel_fan_map map;
++	struct rtattr *nest;
++	char **argv = *argvp;
++	int argc = *argcp;
++
++	nest = addattr_nest(n, 1024, IFLA_IPTUN_FAN_MAP);
++	while (argc > 0) {
++		char *colon = strchr(*argv, ':');
++
++		if (!colon)
++			break;
++		*colon = '\0';
++
++		if (get_prefix(&overlay, *argv, AF_INET))
++			invarg("invalid fan-map overlay", *argv);
++		if (get_prefix(&underlay, colon + 1, AF_INET))
++			invarg("invalid fan-map underlay", colon + 1);
++		
++		memcpy(&map.underlay, underlay.data, 4);
++		map.underlay_prefix = underlay.bitlen;
++		memcpy(&map.overlay, overlay.data, 4);
++		map.overlay_prefix = overlay.bitlen;
++
++		argc--, argv++;
++
++		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));
++	}
++	addattr_nest_end(n, nest);
++
++	*argcp = argc;
++	*argvp = argv;
++	return 0;
++}
+ 
+ static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
+ 			      struct nlmsghdr *n)
+@@ -178,6 +214,10 @@ get_failed:
+ 		} else if (strcmp(*argv, "underlay") == 0) {
+ 			NEXT_ARG();
+ 			underlay = get_addr32(*argv);
++		} else if (strcmp(*argv, "fan-map") == 0) {
++			NEXT_ARG();
++			if (fan_parse_map(&argc, &argv, n))
++				invarg("invalid fan-map", *argv);
+ 		} else if (strcmp(*argv, "local") == 0) {
+ 			NEXT_ARG();
+ 			if (strcmp(*argv, "any"))
+@@ -328,6 +368,28 @@ get_failed:
+ 	return 0;
+ }
+ 
++static void fan_print_map(FILE *f, struct rtattr *attr)
++{
++	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
++	struct ip_tunnel_fan_map *m;
++	struct rtattr *i;
++	int rem;
++	int p;
++
++	fprintf(f, "fan-map ");
++
++	rem = RTA_PAYLOAD(attr);
++	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
++		p = RTA_PAYLOAD(i);
++		m = RTA_DATA(i);
++		fprintf(f, "%s/%d:%s/%d ",
++			rt_addr_n2a_r(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN),
++			m->overlay_prefix,
++			rt_addr_n2a_r(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN),
++			m->underlay_prefix);
++	}
++}
++
+ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
+ {
+ 	char s1[1024];
+@@ -364,6 +426,9 @@ static void iptunnel_print_opt(struct li
+ 				format_host(AF_INET, 4, &addr, s1, sizeof(s1)));
+ 	}
+ 
++	if (tb[IFLA_IPTUN_FAN_MAP])
++		fan_print_map(f, tb[IFLA_IPTUN_FAN_MAP]);
++
+ 	if (tb[IFLA_IPTUN_LINK] && rta_getattr_u32(tb[IFLA_IPTUN_LINK])) {
+ 		unsigned link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);
+ 		const char *n = if_indextoname(link, s2);
diff --git a/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch b/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch
new file mode 100644
index 00000000000..070023d0b92
--- /dev/null
+++ b/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch
@@ -0,0 +1,177 @@
+Description: Fan driver support VXLAN (p4)
+ Fan driver setup support for vxlan interfaces.
+
+Index: iproute2-4.3.0/include/linux/if_link.h
+===================================================================
+--- iproute2-4.3.0.orig/include/linux/if_link.h
++++ iproute2-4.3.0/include/linux/if_link.h
+@@ -392,6 +392,7 @@ enum {
+ 	IFLA_VXLAN_COLLECT_METADATA,
+ 	IFLA_VXLAN_LABEL,
+ 	IFLA_VXLAN_GPE,
++	IFLA_VXLAN_FAN_MAP = 33,
+ 	__IFLA_VXLAN_MAX
+ };
+ #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)
+Index: iproute2-4.3.0/include/linux/if_tunnel.h
+===================================================================
+--- iproute2-4.3.0.orig/include/linux/if_tunnel.h
++++ iproute2-4.3.0/include/linux/if_tunnel.h
+@@ -145,7 +145,7 @@ enum {
+ 
+ #define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
+ 
+-struct ip_tunnel_fan_map {
++struct ifla_fan_map {
+ 	__be32		underlay;
+ 	__be32		overlay;
+ 	__u16		underlay_prefix;
+Index: iproute2-4.3.0/ip/iplink_vxlan.c
+===================================================================
+--- iproute2-4.3.0.orig/ip/iplink_vxlan.c
++++ iproute2-4.3.0/ip/iplink_vxlan.c
+@@ -15,7 +15,10 @@
+ #include <net/if.h>
+ #include <linux/ip.h>
+ #include <linux/if_link.h>
++#include <linux/types.h>
+ #include <arpa/inet.h>
++#include <linux/in6.h>
++#include <linux/if_tunnel.h>
+ 
+ #include "rt_names.h"
+ #include "utils.h"
+@@ -43,6 +46,45 @@ static void explain(void)
+ 	print_explain(stderr);
+ }
+ 
++static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
++{
++	inet_prefix underlay, overlay;
++	struct ifla_fan_map map;
++	struct rtattr *nest;
++	char **argv = *argvp;
++	int argc = *argcp;
++
++	nest = addattr_nest(n, 1024, IFLA_VXLAN_FAN_MAP);
++	while (argc > 0) {
++		char *colon = strchr(*argv, ':');
++
++		if (!colon) {
++			PREV_ARG();
++			break;
++		}
++		*colon = '\0';
++
++		if (get_prefix(&overlay, *argv, AF_INET))
++			invarg("invalid fan-map overlay", *argv);
++		if (get_prefix(&underlay, colon + 1, AF_INET))
++			invarg("invalid fan-map underlay", colon + 1);
++
++		memcpy(&map.underlay, underlay.data, 4);
++		map.underlay_prefix = underlay.bitlen;
++		memcpy(&map.overlay, overlay.data, 4);
++		map.overlay_prefix = overlay.bitlen;
++
++		argc--, argv++;
++
++		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));
++	}
++	addattr_nest_end(n, nest);
++
++	*argcp = argc;
++	*argvp = argv;
++	return 0;
++}
++
+ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
+ 			  struct nlmsghdr *n)
+ {
+@@ -201,6 +243,10 @@ static int vxlan_parse_opt(struct link_u
+ 			gbp = 1;
+ 		} else if (!matches(*argv, "gpe")) {
+ 			gpe = 1;
++		} else if (!matches(*argv, "fan-map")) {
++			NEXT_ARG();
++			if (fan_parse_map(&argc, &argv, n))
++				invarg("invalid fan-map", *argv);
+ 		} else if (matches(*argv, "help") == 0) {
+ 			explain();
+ 			return -1;
+@@ -279,6 +325,28 @@ static int vxlan_parse_opt(struct link_u
+ 	return 0;
+ }
+ 
++static void fan_print_map(FILE *f, struct rtattr *attr)
++{
++	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
++	struct ifla_fan_map *m;
++	struct rtattr *i;
++	int rem;
++	int p;
++
++	fprintf(f, "fan-map ");
++
++	rem = RTA_PAYLOAD(attr);
++	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
++		p = RTA_PAYLOAD(i);
++		m = RTA_DATA(i);
++		fprintf(f, "%s/%d:%s/%d ",
++			rt_addr_n2a_r(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN),
++			m->overlay_prefix,
++			rt_addr_n2a_r(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN),
++			m->underlay_prefix);
++	}
++}
++
+ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
+ {
+ 	__u32 vni;
+@@ -321,6 +389,9 @@ static void vxlan_print_opt(struct link_
+ 		}
+ 	}
+ 
++	if (tb[IFLA_VXLAN_FAN_MAP])
++		fan_print_map(f, tb[IFLA_VXLAN_FAN_MAP]);
++
+ 	if (tb[IFLA_VXLAN_LOCAL]) {
+ 		__be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_LOCAL]);
+ 		if (addr)
+Index: iproute2-4.3.0/ip/link_iptnl.c
+===================================================================
+--- iproute2-4.3.0.orig/ip/link_iptnl.c
++++ iproute2-4.3.0/ip/link_iptnl.c
+@@ -49,10 +49,11 @@ static void usage(int sit)
+ 	print_usage(stderr, sit);
+ 	exit(-1);
+ }
++
+ static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
+ {
+ 	inet_prefix underlay, overlay;
+-	struct ip_tunnel_fan_map map;
++	struct ifla_fan_map map;
+ 	struct rtattr *nest;
+ 	char **argv = *argvp;
+ 	int argc = *argcp;
+@@ -61,8 +62,10 @@ static int fan_parse_map(int *argcp, cha
+ 	while (argc > 0) {
+ 		char *colon = strchr(*argv, ':');
+ 
+-		if (!colon)
++		if (!colon) {
++			PREV_ARG();
+ 			break;
++		}
+ 		*colon = '\0';
+ 
+ 		if (get_prefix(&overlay, *argv, AF_INET))
+@@ -371,7 +374,7 @@ get_failed:
+ static void fan_print_map(FILE *f, struct rtattr *attr)
+ {
+ 	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
+-	struct ip_tunnel_fan_map *m;
++	struct ifla_fan_map *m;
+ 	struct rtattr *i;
+ 	int rem;
+ 	int p;
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index aab2ecbcab9..1ff68fc0408 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,4 +1,6 @@
-{ fetchurl, stdenv, lib, flex, bison, db, iptables, pkgconfig }:
+{ fetchurl, stdenv, lib, flex, bison, db, iptables, pkgconfig
+, enableFan ? false
+}:
 
 stdenv.mkDerivation rec {
   name = "iproute2-${version}";
@@ -9,6 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "1i0n071hiqxw1gisngw2jln3kcp9sh47n6fj5hdwqrvp7w20zwy0";
   };
 
+  patches = lib.optionals enableFan [
+    # These patches were pulled from:
+    # https://launchpad.net/ubuntu/xenial/+source/iproute2
+    ./1000-ubuntu-poc-fan-driver.patch
+    ./1001-ubuntu-poc-fan-driver-v3.patch
+    ./1002-ubuntu-poc-fan-driver-vxlan.patch
+  ];
+
   preConfigure = ''
     patchShebangs ./configure
     sed -e '/ARPDDIR/d' -i Makefile

From f04783876c74e2c4d6ee8a5a44303c49c5cb2fe9 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 4 Jan 2017 22:35:30 +0100
Subject: [PATCH 0584/1310] bash-4.3-p46 -> bash-4.3-p48

---
 pkgs/shells/bash/bash-4.3-patches.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/shells/bash/bash-4.3-patches.nix b/pkgs/shells/bash/bash-4.3-patches.nix
index 83743938de3..a09e56e4699 100644
--- a/pkgs/shells/bash/bash-4.3-patches.nix
+++ b/pkgs/shells/bash/bash-4.3-patches.nix
@@ -47,4 +47,6 @@ patch: [
 (patch "044" "16bzaq9fs2kaw2n2k6vvljkjw5k5kx06isnq8hxkfrxz60384f4k")
 (patch "045" "08q02mj9imp2njpgm6f5q5m61i7qzp33rbxxzarixalyisbw6vms")
 (patch "046" "13v8dymwj83wcvrfayjqrs5kqar05bcj4zpiacrjkkchnsk5dd5k")
+(patch "047" "0jkwqviwkqdc13wv3q0g0kapjr68ggs1xzhqy696pfkqgvg4i4n6")
+(patch "048" "18nzlk1idwkq0xd54s83lx8kam8kcvz7yc0mw6hnq2ax3i2ib0jv")
 ]

From 48a5a47784ce13d8ead00655f1b702034102a137 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 22:42:03 +0100
Subject: [PATCH 0585/1310] pythonPackages.configshell_fb: disable failing
 tests on python3

---
 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 87f529d36a1..eb797b90cf8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4113,6 +4113,9 @@ in {
       urwid
     ];
 
+    # Fails on python 3 due to a None value where a string is expected
+    doCheck = !isPy3k;
+
     meta = {
       description = "A Python library for building configuration shells";
       homepage = "https://github.com/agrover/configshell-fb";

From 000fb9be33528f867e2355ddedde0836ba7f7a3a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 22:49:05 +0100
Subject: [PATCH 0586/1310] pythonPackages.pudb: 2013.3.6 -> 2016.2, disable
 tests on python 3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb797b90cf8..5528def1ae5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8799,14 +8799,17 @@ in {
   };
 
   pudb = buildPythonPackage rec {
-    name = "pudb-2013.3.6";
+    name = "pudb-2016.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pudb/${name}.tar.gz";
-      sha256 = "81b20a995803c4be513e6d36c8ec9a531d3ccb24670b2416abc20f3933ddb8be";
+      sha256 = "0njhi49d9fxbwh5p8yjx8m3jlfyzfm00b5aff6bz473pn7vxfn79";
     };
 
-    propagatedBuildInputs = with self; [ self.pygments self.urwid ];
+    propagatedBuildInputs = with self; [ pygments urwid ];
+
+    # Tests fail on python 3 due to writes to the read-only home directory
+    doCheck = !isPy3k;
 
     meta = {
       description = "A full-screen, console-based Python debugger";

From d222761121544aabe44edd9c518b9f22aa02cf3b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 4 Jan 2017 17:20:00 -0500
Subject: [PATCH 0587/1310] atom: 1.12.7 -> 1.12.8

---
 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 58eb2e568c1..366233d451f 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.7";
+  version = "1.12.8";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1kkw6wixri8iddnmscza1d4riq4m9yr78y0d9y76vdnxarma0bfq";
+    sha256 = "1kxydw8pzz2c55vl2fzn6dnfkqcr1hkx55k10g7z86afmc7g9vxv";
     name = "${name}.deb";
   };
 

From bde863210687e6afa43d12a04e7119fb490acc52 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 5 Jan 2017 00:46:34 +0200
Subject: [PATCH 0588/1310] coreutils: Build with libattr to support xattrs

Fixes #21649
---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 3 ++-
 pkgs/stdenv/linux/make-bootstrap-tools.nix       | 3 ++-
 pkgs/tools/misc/coreutils/default.nix            | 5 +++--
 pkgs/top-level/all-packages.nix                  | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index af82788d3fa..9f4a4517627 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -87,8 +87,9 @@ rec {
 
 
   coreutilsMinimal = (pkgs.coreutils.override (args: {
-    # We want coreutils without ACL support.
+    # 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;
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index e13fb88eff0..d31253075c9 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -6,8 +6,9 @@ rec {
 
 
   coreutilsMinimal = coreutils.override (args: {
-    # We want coreutils without ACL support.
+    # 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";
   });
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 8b39e3711e1..9e66c6ba918 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv, fetchurl, perl, xz, gmp ? null
 , aclSupport ? false, acl ? null
+, attrSupport ? false, attr ? null
 , selinuxSupport? false, libselinux ? null, libsepol ? null
 , autoconf, automake114x, texinfo
 , withPrefix ? false
@@ -44,12 +45,14 @@ let
 
     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;
@@ -90,8 +93,6 @@ let
 
     makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0";
 
-    postFixup = ""; # FIXME: remove on next mass rebuild
-
     meta = {
       homepage = http://www.gnu.org/software/coreutils/;
       description = "The basic file, shell and text manipulation utilities of the GNU operating system";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f36466af2bb..d69d494d85b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1287,6 +1287,7 @@ in
 
   coreutils = callPackage ../tools/misc/coreutils {
     aclSupport = stdenv.isLinux;
+    attrSupport = stdenv.isLinux;
   };
 
   coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; };

From 22796f0d4f47a7942dd443ca125ade898032022b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 4 Jan 2017 23:59:25 +0100
Subject: [PATCH 0589/1310] bash-4.3: fix security problems via a Gentoo patch

---
 pkgs/shells/bash/4.3.nix | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/shells/bash/4.3.nix b/pkgs/shells/bash/4.3.nix
index 76c24323fca..f47b2da6b95 100644
--- a/pkgs/shells/bash/4.3.nix
+++ b/pkgs/shells/bash/4.3.nix
@@ -10,11 +10,21 @@ let
   baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
   sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg";
 
+  upstreamPatches =
+    let
+      patch = nr: sha256:
+        fetchurl {
+          url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
+          inherit sha256;
+        };
+    in
+      import ./bash-4.3-patches.nix patch;
+
   inherit (stdenv.lib) optional optionalString;
 in
 
 stdenv.mkDerivation rec {
-  name = "${realName}-p${toString (builtins.length patches)}";
+  name = "${realName}-p${toString (builtins.length upstreamPatches)}";
 
   src = fetchurl {
     url = "mirror://gnu/bash/${realName}.tar.gz";
@@ -39,15 +49,14 @@ stdenv.mkDerivation rec {
 
   patchFlags = "-p0";
 
-  patches =
-    (let
-      patch = nr: sha256:
-        fetchurl {
-          url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
-          inherit sha256;
-        };
-    in
-      import ./bash-4.3-patches.nix patch)
+  patches = upstreamPatches
+      ++ [ (fetchurl {
+              # https://security.gentoo.org/glsa/201701-02
+              url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-shells"
+                  + "/bash/files/bash-4.4-popd-offset-overflow.patch"
+                  + "?id=1bf1ceeb04a2f57e1e5e1636a8c288c4d0db6682";
+              sha256 = "02n08lw5spvsc2b1bll0gr6mg4qxcg7pzfjkw7ji5w7bjcikccbm";
+          }) ]
       ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
 
   crossAttrs = {

From be489cf48ca25a2e8349ff2dcce82a2738e17290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 5 Jan 2017 00:17:27 +0100
Subject: [PATCH 0590/1310] gnused: 4.2.2 -> 4.3

Real replacement of #21646.
---
 pkgs/tools/text/gnused/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 037c2f17a63..aa25101636e 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -1,15 +1,19 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, perl }:
 
-stdenv.mkDerivation {
-  name = "gnused-4.2.2";
+stdenv.mkDerivation rec {
+  name = "gnused-${version}";
+  version = "4.3";
 
   src = fetchurl {
-    url = mirror://gnu/sed/sed-4.2.2.tar.bz2;
-    sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7";
+    url = "mirror://gnu/sed/sed-${version}.tar.xz";
+    sha256 = "1anhdgah8h423hlmn9hwzxzr7hjbqjm6hxq3z1p7p7nf8640vhj7";
   };
 
   outputs = [ "out" "info" ];
 
+  nativeBuildInputs = [ perl ];
+  preConfigure = "patchShebangs ./build-aux/help2man";
+
   meta = {
     homepage = http://www.gnu.org/software/sed/;
     description = "GNU sed, a batch stream editor";

From 57fc4d21b717410d0c044609e3182a0df96acfa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 5 Jan 2017 01:00:13 +0100
Subject: [PATCH 0591/1310] bash-4.4: p0 -> p5 + a security patch from Gentoo

---
 pkgs/shells/bash/4.4.nix              | 29 ++++++++++++++++++---------
 pkgs/shells/bash/bash-4.4-patches.nix |  5 +++++
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index 406ca4d08fd..7dbb1832497 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -12,11 +12,21 @@ let
   baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
   sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq";
 
+  upstreamPatches =
+    let
+      patch = nr: sha256:
+        fetchurl {
+          url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
+          inherit sha256;
+        };
+    in
+      import ./bash-4.4-patches.nix patch;
+
   inherit (stdenv.lib) optional optionalString;
 in
 
 stdenv.mkDerivation rec {
-  name = "${realName}-p${toString (builtins.length patches)}";
+  name = "${realName}-p${toString (builtins.length upstreamPatches)}";
 
   src = fetchurl {
     url = "mirror://gnu/bash/${realName}.tar.gz";
@@ -41,15 +51,14 @@ stdenv.mkDerivation rec {
 
   patchFlags = "-p0";
 
-  patches =
-    (let
-      patch = nr: sha256:
-        fetchurl {
-          url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
-          inherit sha256;
-        };
-    in
-      import ./bash-4.4-patches.nix patch)
+  patches = upstreamPatches
+      ++ [ (fetchurl {
+              # https://security.gentoo.org/glsa/201701-02
+              url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-shells"
+                  + "/bash/files/bash-4.4-popd-offset-overflow.patch"
+                  + "?id=1bf1ceeb04a2f57e1e5e1636a8c288c4d0db6682";
+              sha256 = "02n08lw5spvsc2b1bll0gr6mg4qxcg7pzfjkw7ji5w7bjcikccbm";
+          }) ]
       ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
 
   crossAttrs = {
diff --git a/pkgs/shells/bash/bash-4.4-patches.nix b/pkgs/shells/bash/bash-4.4-patches.nix
index b8019fb3350..c3ef5470aeb 100644
--- a/pkgs/shells/bash/bash-4.4-patches.nix
+++ b/pkgs/shells/bash/bash-4.4-patches.nix
@@ -1,4 +1,9 @@
 # Automatically generated by `update-patch-set.sh'; do not edit.
 
 patch: [
+(patch "001" "03vzy7qwjdd5qvl3ydg99naazas2qmyd0yhnrflgjbbm64axja1y")
+(patch "002" "0lrwq6vyqism3yqv9s7kzaf3dsl4q5w9r5svcqz279qp7qca083h")
+(patch "003" "1chqww2rj6g42b8s60q5zlzy0jzp684jkpsbrbfy1vzxja8mmpsi")
+(patch "004" "1cy8abf96hkrjhw921ndr0shlcnc52bg45rn6xri4v5clhq0l25d")
+(patch "005" "0a8515kyk4zsgmvlqvlganjfr7pq0j6kzpr4d6xx02kpbdr4n7i2")
 ]

From f803270b7e00fa7124282809838d5652083b6aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 5 Jan 2017 01:07:36 +0100
Subject: [PATCH 0592/1310] bash: switch the default 4.3 -> 4.4

... and remove the now-unused 4.3 expression.
---
 pkgs/shells/bash/4.3.nix        | 127 --------------------------------
 pkgs/top-level/all-packages.nix |   2 +-
 2 files changed, 1 insertion(+), 128 deletions(-)
 delete mode 100644 pkgs/shells/bash/4.3.nix

diff --git a/pkgs/shells/bash/4.3.nix b/pkgs/shells/bash/4.3.nix
deleted file mode 100644
index f47b2da6b95..00000000000
--- a/pkgs/shells/bash/4.3.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, binutils ? null, bison }:
-
-assert interactive -> readline != null;
-assert stdenv.isDarwin -> binutils != null;
-
-let
-  version = "4.3";
-  realName = "bash-${version}";
-  shortName = "bash43";
-  baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
-  sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg";
-
-  upstreamPatches =
-    let
-      patch = nr: sha256:
-        fetchurl {
-          url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
-          inherit sha256;
-        };
-    in
-      import ./bash-4.3-patches.nix patch;
-
-  inherit (stdenv.lib) optional optionalString;
-in
-
-stdenv.mkDerivation rec {
-  name = "${realName}-p${toString (builtins.length upstreamPatches)}";
-
-  src = fetchurl {
-    url = "mirror://gnu/bash/${realName}.tar.gz";
-    inherit sha256;
-  };
-
-  hardeningDisable = [ "format" ];
-
-  outputs = [ "out" "doc" "info" ];
-
-  # the man pages are small and useful enough
-  outputMan = if interactive then "out" else null;
-
-  NIX_CFLAGS_COMPILE = ''
-    -DSYS_BASHRC="/etc/bashrc"
-    -DSYS_BASH_LOGOUT="/etc/bash_logout"
-    -DDEFAULT_PATH_VALUE="/no-such-path"
-    -DSTANDARD_UTILS_PATH="/no-such-path"
-    -DNON_INTERACTIVE_LOGIN_SHELLS
-    -DSSH_SOURCE_BASHRC
-  '';
-
-  patchFlags = "-p0";
-
-  patches = upstreamPatches
-      ++ [ (fetchurl {
-              # https://security.gentoo.org/glsa/201701-02
-              url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-shells"
-                  + "/bash/files/bash-4.4-popd-offset-overflow.patch"
-                  + "?id=1bf1ceeb04a2f57e1e5e1636a8c288c4d0db6682";
-              sha256 = "02n08lw5spvsc2b1bll0gr6mg4qxcg7pzfjkw7ji5w7bjcikccbm";
-          }) ]
-      ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
-
-  crossAttrs = {
-    configureFlags = baseConfigureFlags +
-      " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing" +
-      optionalString stdenv.isCygwin ''
-        --without-libintl-prefix --without-libiconv-prefix
-        --with-installed-readline
-        bash_cv_dev_stdin=present
-        bash_cv_dev_fd=standard
-        bash_cv_termcap_lib=libncurses
-      '';
-  };
-
-  configureFlags = baseConfigureFlags;
-
-  # Note: Bison is needed because the patches above modify parse.y.
-  nativeBuildInputs = [bison]
-    ++ optional (texinfo != null) texinfo
-    ++ optional interactive readline
-    ++ optional stdenv.isDarwin binutils;
-
-  # Bash randomly fails to build because of a recursive invocation to
-  # build `version.h'.
-  enableParallelBuilding = false;
-
-  postInstall = ''
-    ln -s bash "$out/bin/sh"
-  '';
-
-  postFixup = if interactive
-    then ''
-      substituteInPlace "$out/bin/bashbug" \
-        --replace '${stdenv.shell}' "$out/bin/bash"
-    ''
-    # most space is taken by locale data
-    else ''
-      rm -r "$out/share" "$out/bin/bashbug"
-    '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/bash/;
-    description =
-      "GNU Bourne-Again Shell, the de facto standard shell on Linux" +
-        (if interactive then " (for interactive use)" else "");
-
-    longDescription = ''
-      Bash is the shell, or command language interpreter, that will
-      appear in the GNU operating system.  Bash is an sh-compatible
-      shell that incorporates useful features from the Korn shell
-      (ksh) and C shell (csh).  It is intended to conform to the IEEE
-      POSIX P1003.2/ISO 9945.2 Shell and Tools standard.  It offers
-      functional improvements over sh for both programming and
-      interactive use.  In addition, most sh scripts can be run by
-      Bash without modification.
-    '';
-
-    license = licenses.gpl3Plus;
-
-    platforms = platforms.all;
-
-    maintainers = [ maintainers.peti ];
-  };
-
-  passthru = {
-    shellPath = "/bin/bash";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d69d494d85b..2cd0d6d1adf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4544,7 +4544,7 @@ in
 
   ### SHELLS
 
-  bash = lowPrio (callPackage ../shells/bash/4.3.nix {
+  bash = lowPrio (callPackage ../shells/bash/4.4.nix {
     texinfo = null;
     interactive = stdenv.isCygwin; # patch for cygwin requires readline support
   });

From fcdb6db0417db0bbd3fe0964950d4c9df2e90122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 5 Jan 2017 01:57:22 +0100
Subject: [PATCH 0593/1310] fontconfig-ultimate: fixup after bash update

I've got no idea why it was trying to override the phase list and in
such a way.  Still, it's slightly discomforting that the expansion
semantics was changed in bash.
---
 pkgs/development/libraries/fontconfig-ultimate/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix
index efef59cad3b..a2e5f69202c 100644
--- a/pkgs/development/libraries/fontconfig-ultimate/default.nix
+++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation {
     owner = "bohoomil";
   };
 
-  phases = "$prePhases unpackPhase installPhase $postPhases";
-
   installPhase = ''
     mkdir -p $out/etc/fonts/conf.d
     cp conf.d.infinality/*.conf $out/etc/fonts/conf.d

From 31ac32a9659fa1fbdefebc38c0fb42b34ed2ad8f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:08:06 +0100
Subject: [PATCH 0594/1310] pythonPackages.blinker: 1.3 -> 1.4

---
 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 949cb86d2c2..eca41433a5a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2865,11 +2865,11 @@ in {
 
   blinker = buildPythonPackage rec {
     name = "blinker-${version}";
-    version = "1.3";
+    version = "1.4";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/blinker/${name}.tar.gz";
-      sha256 = "6811010809262261e41ab7b92f3f6d23f35cf816fbec2bc05077992eebec6e2f";
+      sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7";
     };
 
     meta = {

From fa696a3e7097bf56f5e6069f20b2979de6d49a0b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:08:36 +0100
Subject: [PATCH 0595/1310] pythonPackages.construct: 2.5.2 -> 2.8.10

---
 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 eca41433a5a..f5205e68574 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4125,15 +4125,22 @@ in {
 
 
   construct = buildPythonPackage rec {
-    name = "construct-2.5.2";
+    name = "construct-${version}";
+    version = "2.8.10";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/construct/${name}.tar.gz";
-      sha256 = "084h02p0m8lhmlywlwjdg0kd0hd6sz481c96qwcm5wddxrqn4nv6";
+    src = pkgs.fetchFromGitHub {
+      owner = "construct";
+      repo = "construct";
+      rev = "v${version}";
+      sha256 = "1xfmmc5pihn3ql9f7blrciy06y2bwczqvkbcpvh96dmgqwc3wys3";
     };
 
     propagatedBuildInputs = with self; [ six ];
 
+    # Tests fail with the following error on Python 3.5+
+    # TypeError: not all arguments converted during string formatting
+    doCheck = pythonOlder "3.5";
+
     meta = {
       description = "Powerful declarative parser (and builder) for binary data";
       homepage = http://construct.readthedocs.org/;

From da8023b8c376f78207504113577cd4950a77057c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:08:53 +0100
Subject: [PATCH 0596/1310] pythonPackages.cssutils: 0.9.9 -> 1.0.1

---
 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 f5205e68574..c3aa172022b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5413,11 +5413,11 @@ in {
   };
 
   cssutils = buildPythonPackage (rec {
-    name = "cssutils-0.9.9";
+    name = "cssutils-1.0.1";
 
     src = pkgs.fetchurl {
-      url = mirror://pypi/c/cssutils/cssutils-0.9.9.zip;
-      sha256 = "139yfm9yz9k33kgqw4khsljs10rkhhxyywbq9i82bh2r31cil1pp";
+      url = mirror://pypi/c/cssutils/cssutils-1.0.1.tar.gz;
+      sha256 = "0qwha9x1wml2qmipbcz03gndnlwhzrjdvw9i09si247a90l8p8fq";
     };
 
     buildInputs = with self; [ self.mock ];

From 46fe0fe8ae8b70e60aa79d9db38c9b98e4c0ee1a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:09:36 +0100
Subject: [PATCH 0597/1310] pythonPackages.pyperclip: 1.5.11 -> 1.5.27

---
 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 c3aa172022b..9f857ba4105 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21508,12 +21508,12 @@ in {
   };
 
   pyperclip = buildPythonPackage rec {
-    version = "1.5.11";
+    version = "1.5.27";
     name = "pyperclip-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pyperclip/${name}.zip";
-      sha256 = "07q8krmi7phizzp192x3j7xbk1gzhc1kc3jp4mxrm32dn84sp1vh";
+      sha256 = "1i9zxm7qc49n9yxfb41c0jbmmp2hpzx98kaizjl7qmgiv3snvjx3";
     };
 
     doCheck = false;

From 838862cb42e979188d01ddbbf3a78cc11112c728 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:10:26 +0100
Subject: [PATCH 0598/1310] pythonPackages.urwid: 1.3.0 -> 1.3.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 9f857ba4105..8608f33ffab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26195,14 +26195,14 @@ in {
 
 
   urwid = buildPythonPackage (rec {
-    name = "urwid-1.3.0";
+    name = "urwid-1.3.1";
 
     # multiple:  NameError: name 'evl' is not defined
     doCheck = false;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/u/urwid/${name}.tar.gz";
-      sha256 = "29f04fad3bf0a79c5491f7ebec2d50fa086e9d16359896c9204c6a92bc07aba2";
+      sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng";
     };
 
     meta = {

From 956a400b81434800f9d0138e3e0a45c552e65f9c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:13:46 +0100
Subject: [PATCH 0599/1310] pythonPackages.brotlipy: init at 0.6.0

---
 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 8608f33ffab..d913cca3e10 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14640,6 +14640,23 @@ in {
     };
   };
 
+  brotlipy = buildPythonPackage rec {
+    name = "brotlipy-${version}";
+    version = "0.6.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/b/brotlipy/${name}.tar.gz";
+      sha256 = "10s2y19zywfkf3sksrw81czhva759aki0clld2pnnlgf64sz7016";
+    };
+
+    propagatedBuildInputs = with self; [ cffi enum34 construct ];
+
+    meta = {
+      description = "Python bindings for the reference Brotli encoder/decoder";
+      homepage = "https://github.com/python-hyper/brotlipy/";
+      license = licenses.mit;
+    };
+  };
 
   mitmproxy = buildPythonPackage rec {
     baseName = "mitmproxy";

From f594ee195b486eed9072aed90bdb65f3b57e29aa Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:14:18 +0100
Subject: [PATCH 0600/1310] pythonPackages.sortedcontainers: init at 1.5.7

---
 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 d913cca3e10..87ceb25392c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14658,6 +14658,26 @@ in {
     };
   };
 
+  sortedcontainers = buildPythonPackage rec {
+    name = "sortedcontainers-${version}";
+    version = "1.5.7";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/s/sortedcontainers/${name}.tar.gz";
+      sha256 = "1sjh8lccbmvwna91mlhl5m3z4320p07h063b8x8br4p4cll49w0g";
+    };
+
+    # tries to run tests for all python versions and uses virtualenv weirdly
+    doCheck = false;
+    #buildInputs = with self; [ tox nose ];
+
+    meta = {
+      description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet";
+      homepage = "http://www.grantjenks.com/docs/sortedcontainers/";
+      license = licenses.asl20;
+    };
+  };
+
   mitmproxy = buildPythonPackage rec {
     baseName = "mitmproxy";
     name = "${baseName}-${version}";

From cde1874b15b3daed7c810d76bc06ead7e3786906 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:14:58 +0100
Subject: [PATCH 0601/1310] pythonPackages.hyperframe: init at 4.0.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 87ceb25392c..c7f68105af9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14678,6 +14678,22 @@ in {
     };
   };
 
+  hyperframe = buildPythonPackage rec {
+    name = "hyperframe-${version}";
+    version = "4.0.1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/h/hyperframe/${name}.tar.gz";
+      sha256 = "0hsfq0jigwa0i58z7vbnp62l7za49gmlg75vnygq2ijhkidkcmwa";
+    };
+
+    meta = {
+      description = "HTTP/2 framing layer for Python";
+      homepage = "http://hyper.rtfd.org/";
+      license = licenses.mit;
+    };
+  };
+
   mitmproxy = buildPythonPackage rec {
     baseName = "mitmproxy";
     name = "${baseName}-${version}";

From e7ee0264f9124e7c7c6cd299a680a139b40332f7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:15:27 +0100
Subject: [PATCH 0602/1310] pythonPackages.h2: init at 2.5.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c7f68105af9..97bf79ee283 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14694,6 +14694,24 @@ in {
     };
   };
 
+  h2 = buildPythonPackage rec {
+    name = "h2-${version}";
+    version = "2.5.1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/h/h2/${name}.tar.gz";
+      sha256 = "0xhzm5vcfhdq3mihynwh4ljwi0r06lvzk3ypr0gmmbcp1x43ffb7";
+    };
+
+    propagatedBuildInputs = with self; [ enum34 hpack hyperframe ];
+
+    meta = {
+      description = "HTTP/2 State-Machine based protocol implementation";
+      homepage = "http://hyper.rtfd.org/";
+      license = licenses.mit;
+    };
+  };
+
   mitmproxy = buildPythonPackage rec {
     baseName = "mitmproxy";
     name = "${baseName}-${version}";

From 85d3e82f4b8a1b02676879eb702e7a4384cc35b9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:15:57 +0100
Subject: [PATCH 0603/1310] pythonPackages.editorconfig: init at 0.12.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 97bf79ee283..2840376e763 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14712,6 +14712,22 @@ in {
     };
   };
 
+  editorconfig = buildPythonPackage rec {
+    name = "EditorConfig-${version}";
+    version = "0.12.1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/e/editorconfig/${name}.tar.gz";
+      sha256 = "1qxqy9wfrpb2ldrk5nzidkpymc55lpf9lg3m8c8a5531jmbwhlwb";
+    };
+
+    meta = {
+      description = "EditorConfig File Locator and Interpreter for Python";
+      homepage = "http://editorconfig.org/";
+      license = licenses.psfl;
+    };
+  };
+
   mitmproxy = buildPythonPackage rec {
     baseName = "mitmproxy";
     name = "${baseName}-${version}";

From e373c3f332fec52a1e60ec0738b510d3edb7f825 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:25:20 +0100
Subject: [PATCH 0604/1310] pythonPackages.typing: init at 3.5.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2840376e763..bac15ab33e7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23008,6 +23008,22 @@ in {
     };
   };
 
+  typing = buildPythonPackage rec {
+    name = "typing-${version}";
+    version = "3.5.3.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/t/typing/${name}.tar.gz";
+      sha256 = "08gz3grrh3vph5ib1w5x1ssnpzvj077x030lx63fxs4kwg3slbfa";
+    };
+
+    meta = {
+      description = "Backport of typing module to Python versions older than 3.5";
+      homepage = "https://docs.python.org/3.5/library/typing.html";
+      license = licenses.psfl;
+    };
+  };
+
   ruamel_yaml = buildPythonPackage rec {
     name = "ruamel.yaml-${version}";
     version = "0.10.13";

From 8f146f96dbb52ba1cdfbbcffe4f9e22f7f4cd9ee Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:16:25 +0100
Subject: [PATCH 0605/1310] pythonPackages.hpack: 2.0.1 -> 2.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bac15ab33e7..1d2a5089cae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15634,20 +15634,13 @@ in {
 
   hpack = buildPythonPackage rec {
     name = "hpack-${version}";
-    version = "2.0.1";
+    version = "2.3.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/h/hpack/hpack-${version}.tar.gz";
-      sha256 = "1k4wa8c52bd6x109bn6hc945595w6aqgzj6ipy6c2q7vxkzalzhd";
+      sha256 = "1ad0fx4d7a52zf441qzhjc7vwy9v3qdrk1zyf06ikz8y2nl9mgai";
     };
 
-    propagatedBuildInputs = with self; [
-
-    ];
-    buildInputs = with self; [
-
-    ];
-
     meta = with stdenv.lib; {
       description = "========================================";
       homepage = "http://hyper.rtfd.org";

From 71725619a86184b8496eca42436ecb372c3fa163 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:16:58 +0100
Subject: [PATCH 0606/1310] pythonPackages.ruamel_yaml: 0.10.13 -> 0.13.7

---
 pkgs/top-level/python-packages.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1d2a5089cae..3a4218c1f21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23019,14 +23019,20 @@ in {
 
   ruamel_yaml = buildPythonPackage rec {
     name = "ruamel.yaml-${version}";
-    version = "0.10.13";
+    version = "0.13.7";
+
+    # needs ruamel_ordereddict for python2 support
+    disabled = !isPy3k;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/r/ruamel.yaml/${name}.tar.gz";
-      sha256 = "0r9mn5lm9dcxpy0wpn18cp7i5hkvjvknv3dxg8d9ca6km39m4asn";
+      sha256 = "1vca2552k0kmhr9msg1bbfdvp3p9im17x1a6npaw221vlgg15z7h";
     };
 
-    propagatedBuildInputs = with self; [ ruamel_base ruamel_ordereddict ];
+    # Tests cannot load the module to test
+    doCheck = false;
+
+    propagatedBuildInputs = with self; [ ruamel_base typing ];
 
     meta = {
       description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";

From e94bfe55c4804d861cf1b226ed18b045cea68eb3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:18:04 +0100
Subject: [PATCH 0607/1310] mitmproxy: 0.17.1 -> 1.0.2, move to
 all-packages.nix

---
 pkgs/tools/networking/mitmproxy/default.nix | 31 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 pkgs/top-level/python-packages.nix          | 27 ------------------
 3 files changed, 33 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/tools/networking/mitmproxy/default.nix

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
new file mode 100644
index 00000000000..8e82023d50a
--- /dev/null
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+  baseName = "mitmproxy";
+  name = "${baseName}-${version}";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = baseName;
+    repo = baseName;
+    rev = "v${version}";
+    sha256 = "19nqg7s1034fal8sb2rjssgcpvxh50yidyjhnbfmmi8v3fbvpbwl";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    pyopenssl pyasn1 urwid pillow flask click pyperclip blinker
+    construct pyparsing html2text tornado brotlipy requests2
+    sortedcontainers passlib cssutils h2 ruamel_yaml jsbeautifier
+    watchdog editorconfig
+  ];
+
+  # Tests fail due to an error with a decorator
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Man-in-the-middle proxy";
+    homepage = "http://mitmproxy.org/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c247b5dddf..9ca802571cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2818,6 +2818,8 @@ in
 
   miredo = callPackage ../tools/networking/miredo { };
 
+  mitmproxy = callPackage ../tools/networking/mitmproxy { };
+
   mjpegtoolsFull = callPackage ../tools/video/mjpegtools { };
 
   mjpegtools = self.mjpegtoolsFull.override {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3a4218c1f21..e99e70ec379 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14728,33 +14728,6 @@ in {
     };
   };
 
-  mitmproxy = buildPythonPackage rec {
-    baseName = "mitmproxy";
-    name = "${baseName}-${version}";
-    version = "0.17.1";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "mitmproxy";
-      repo = "mitmproxy";
-      rev = "v${version}";
-      sha256 = "0a50mkvm3zf9cbs0pf6bwy00bhmy4d1l9as8c9m0bgrk6hq7h53p";
-    };
-
-    propagatedBuildInputs = with self; [
-      pyopenssl pyasn1 urwid pillow lxml flask protobuf click
-      ConfigArgParse pyperclip blinker construct pyparsing html2text tornado
-    ];
-
-    doCheck = false;
-
-    meta = {
-      description = ''Man-in-the-middle proxy'';
-      homepage = "http://mitmproxy.org/";
-      license = licenses.mit;
-      broken = true;
-    };
-  };
-
   mock = buildPythonPackage (rec {
     name = "mock-2.0.0";
 

From fe9373460c08c83449657b22c026c806bec92d21 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 5 Jan 2017 06:40:43 +0100
Subject: [PATCH 0608/1310] pythonPackages.pycrypto: add patch to fix
 CVE-2013-7459

cc #21642
---
 pkgs/development/python-modules/pycrypto/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index 0cbe4491d67..182a8c6f7fa 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
+{ stdenv, fetchurl, fetchpatch, python, buildPythonPackage, gmp }:
 
 buildPythonPackage rec {
   name = "pycrypto-2.6.1";
@@ -9,6 +9,14 @@ buildPythonPackage rec {
     sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2013-7459.patch";
+      url = "https://anonscm.debian.org/cgit/collab-maint/python-crypto.git/plain/debian/patches/CVE-2013-7459.patch?h=debian/2.6.1-7";
+      sha256 = "01r7aghnchc1bpxgdv58qyi2085gh34bxini973xhy3ks7fq3ir9";
+    })
+  ];
+
   preConfigure = ''
     sed -i 's,/usr/include,/no-such-dir,' configure
     sed -i "s!,'/usr/include/'!!" setup.py

From 4029470a6fa3c181b457debbf8f96e84de3f39e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Mon, 2 Jan 2017 07:46:46 +0100
Subject: [PATCH 0609/1310] zfs: add unstable variant

Until now nixos only delivered the latest zfs release. This release is often not
compatible with the latest mainline kernel. Therefor an unstable variant is
added, which might be based on testing releases or git revisions.

fixes #21359
---
 nixos/modules/tasks/filesystems/zfs.nix    |  50 +++--
 pkgs/os-specific/linux/spl/default.nix     |  96 +++++----
 pkgs/os-specific/linux/zfs/default.nix     | 240 ++++++++++++---------
 pkgs/os-specific/linux/zfs/nix-build.patch | 134 ------------
 pkgs/top-level/all-packages.nix            |  26 ++-
 5 files changed, 245 insertions(+), 301 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/zfs/nix-build.patch

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index c5f41cc338c..045cbeb7cff 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -22,12 +22,18 @@ let
 
   kernel = config.boot.kernelPackages;
 
-  splKernelPkg = kernel.spl;
-  zfsKernelPkg = kernel.zfs;
-  zfsUserPkg = pkgs.zfs;
+  packages = if config.boot.zfs.enableUnstable then {
+    spl = kernel.splUnstable;
+    zfs = kernel.zfsUnstable;
+    zfsUser = pkgs.zfsUnstable;
+  } else {
+    spl = kernel.spl;
+    zfs = kernel.zfs;
+    zfsUser = pkgs.zfs;
+  };
 
   autosnapPkg = pkgs.zfstools.override {
-    zfs = zfsUserPkg;
+    zfs = packages.zfsUser;
   };
 
   zfsAutoSnap = "${autosnapPkg}/bin/zfs-auto-snapshot";
@@ -54,6 +60,18 @@ in
 
   options = {
     boot.zfs = {
+      enableUnstable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Use the unstable zfs package. This might be an option, if the latest
+          kernel is not yet supported by a published release of ZFS. Enabling
+          this option will install a development version of ZFS on Linux. The
+          version will have already passed an extensive test suite, but it is
+          more likely to hit an undiscovered bug compared to running a released
+          version of ZFS on Linux.
+        '';
+      };
 
       extraPools = mkOption {
         type = types.listOf types.str;
@@ -218,16 +236,16 @@ in
 
       boot = {
         kernelModules = [ "spl" "zfs" ] ;
-        extraModulePackages = [ splKernelPkg zfsKernelPkg ];
+        extraModulePackages = with packages; [ spl zfs ];
       };
 
       boot.initrd = mkIf inInitrd {
         kernelModules = [ "spl" "zfs" ];
         extraUtilsCommands =
           ''
-            copy_bin_and_libs ${zfsUserPkg}/sbin/zfs
-            copy_bin_and_libs ${zfsUserPkg}/sbin/zdb
-            copy_bin_and_libs ${zfsUserPkg}/sbin/zpool
+            copy_bin_and_libs ${packages.zfsUser}/sbin/zfs
+            copy_bin_and_libs ${packages.zfsUser}/sbin/zdb
+            copy_bin_and_libs ${packages.zfsUser}/sbin/zpool
           '';
         extraUtilsCommandsTest = mkIf inInitrd
           ''
@@ -264,14 +282,14 @@ in
         zfsSupport = true;
       };
 
-      environment.etc."zfs/zed.d".source = "${zfsUserPkg}/etc/zfs/zed.d/*";
+      environment.etc."zfs/zed.d".source = "${packages.zfsUser}/etc/zfs/zed.d/*";
 
-      system.fsPackages = [ zfsUserPkg ];                  # XXX: needed? zfs doesn't have (need) a fsck
-      environment.systemPackages = [ zfsUserPkg ]
-        ++ optional enableAutoSnapshots autosnapPkg;       # so the user can run the command to see flags
+      system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck
+      environment.systemPackages = [ packages.zfsUser ]
+        ++ optional enableAutoSnapshots autosnapPkg; # so the user can run the command to see flags
 
-      services.udev.packages = [ zfsUserPkg ];             # to hook zvol naming, etc.
-      systemd.packages = [ zfsUserPkg ];
+      services.udev.packages = [ packages.zfsUser ]; # to hook zvol naming, etc.
+      systemd.packages = [ packages.zfsUser ];
 
       systemd.services = let
         getPoolFilesystems = pool:
@@ -298,7 +316,7 @@ in
               RemainAfterExit = true;
             };
             script = ''
-              zpool_cmd="${zfsUserPkg}/sbin/zpool"
+              zpool_cmd="${packages.zfsUser}/sbin/zpool"
               ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d ${cfgZfs.devNodes} -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}"
             '';
           };
@@ -314,7 +332,7 @@ in
               RemainAfterExit = true;
             };
             script = ''
-              ${zfsUserPkg}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}"
+              ${packages.zfsUser}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}"
             '';
           };
 
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index e84c964d675..06ad440c775 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -9,56 +9,64 @@ with stdenv.lib;
 let
   buildKernel = any (n: n == configFile) [ "kernel" "all" ];
   buildUser = any (n: n == configFile) [ "user" "all" ];
-in
 
-assert any (n: n == configFile) [ "kernel" "user" "all" ];
-assert buildKernel -> kernel != null;
+  common = { version, sha256 } @ args : stdenv.mkDerivation rec {
+    name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
 
-stdenv.mkDerivation rec {
-  name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
+    src = fetchFromGitHub {
+      owner = "zfsonlinux";
+      repo = "spl";
+      rev = "spl-${version}";
+      inherit sha256;
+    };
 
-  version = "0.6.5.8";
+    patches = [ ./const.patch ./install_prefix.patch ];
 
-  src = fetchFromGitHub {
-    owner = "zfsonlinux";
-    repo = "spl";
-    rev = "spl-${version}";
-    sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s";
-  };
+    nativeBuildInputs = [ autoreconfHook ];
 
-  patches = [ ./const.patch ./install_prefix.patch ];
+    hardeningDisable = [ "pic" ];
 
-  nativeBuildInputs = [ autoreconfHook ];
-
-  hardeningDisable = [ "pic" ];
-
-  preConfigure = ''
-    substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
-    substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
-    substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
-    substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
-  '';
-
-  configureFlags = [
-    "--with-config=${configFile}"
-  ] ++ optionals buildKernel [
-    "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
-    "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
-
-    longDescription = ''
-      This kernel module is a porting layer for ZFS to work inside the linux
-      kernel.
+    preConfigure = ''
+      substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
+      substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
+      substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
+      substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
     '';
 
-    homepage = http://zfsonlinux.org/;
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
+    configureFlags = [
+      "--with-config=${configFile}"
+    ] ++ optionals buildKernel [
+      "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
+      "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    ];
+
+    enableParallelBuilding = true;
+
+    meta = {
+      description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
+
+      longDescription = ''
+          This kernel module is a porting layer for ZFS to work inside the linux
+          kernel.
+      '';
+
+      homepage = http://zfsonlinux.org/;
+      platforms = platforms.linux;
+      license = licenses.gpl2Plus;
+      maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
+    };
   };
-}
+
+in
+  assert any (n: n == configFile) [ "kernel" "user" "all" ];
+  assert buildKernel -> kernel != null;
+  {
+    splStable = common {
+      version = "0.6.5.8";
+      sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s";
+    };
+    splUnstable = common {
+      version = "0.7.0-rc2";
+      sha256 = "1y7jlyj8jwgrgnd6hiabms5h9430b6wjbnr3pwb16mv40wns1i65";
+    };
+  }
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index d7e406107b1..bd2767a66b4 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,117 +1,161 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils
+{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils, fetchpatch
 , configFile ? "all"
 
 # Userspace dependencies
-, zlib, libuuid, python
+, zlib, libuuid, python, attr
 
 # Kernel dependencies
-, kernel ? null, spl ? null
+, kernel ? null, spl ? null, splUnstable ? null
 }:
 
 with stdenv.lib;
 let
   buildKernel = any (n: n == configFile) [ "kernel" "all" ];
   buildUser = any (n: n == configFile) [ "user" "all" ];
-in
 
-assert any (n: n == configFile) [ "kernel" "user" "all" ];
-assert buildKernel -> kernel != null && spl != null;
+  common = { version, sha256, extraPatches, spl, inkompatibleKernelVersion ? null } @ args:
+    if buildKernel &&
+       (inkompatibleKernelVersion != null) &&
+       versionAtLeast kernel.version inkompatibleKernelVersion then
+      throw "linux v${kernel.version} is not yet supported by zfsonlinux v${version}"
+    else stdenv.mkDerivation rec {
+      name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
 
-stdenv.mkDerivation rec {
-  name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
+      src = fetchFromGitHub {
+        owner = "zfsonlinux";
+        repo = "zfs";
+        rev = "zfs-${version}";
+        inherit sha256;
+      };
 
-  version = "0.6.5.8";
+      patches = extraPatches;
 
-  src = fetchFromGitHub {
-    owner = "zfsonlinux";
-    repo = "zfs";
-    rev = "zfs-${version}";
-    sha256 = "0qccz1832p3i80qlrrrypypspb9sy9hmpgcfx9vmhnqmkf0yri4a";
-  };
+      buildInputs = [ autoreconfHook nukeReferences ]
+      ++ optionals buildKernel [ spl ]
+      ++ optionals buildUser [ zlib libuuid python attr ];
 
-  patches = [ ./nix-build.patch ];
+      # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
+      NIX_CFLAGS_LINK = "-lgcc_s";
 
-  buildInputs = [ autoreconfHook nukeReferences ]
-    ++ optionals buildKernel [ spl ]
-    ++ optionals buildUser [ zlib libuuid python ];
+      hardeningDisable = [ "pic" ];
 
-  # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
-  NIX_CFLAGS_LINK = "-lgcc_s";
-
-  hardeningDisable = [ "pic" ];
-
-  preConfigure = ''
-    substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "umount -t zfs"           "${utillinux}/bin/umount -t zfs"
-    substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "mount -t zfs"            "${utillinux}/bin/mount -t zfs"
-    substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount"             "${utillinux}/bin/umount"
-    substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount"              "${utillinux}/bin/mount"
-    substituteInPlace ./udev/rules.d/*            --replace "/lib/udev/vdev_id"       "$out/lib/udev/vdev_id"
-    substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/ztest"         "$out/sbin/ztest"
-    substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/zdb"           "$out/sbin/zdb"
-    substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
-    substituteInPlace ./config/zfs-build.m4       --replace "\$sysconfdir/init.d"     "$out/etc/init.d"
-    substituteInPlace ./etc/zfs/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
-    substituteInPlace ./cmd/zed/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
-    substituteInPlace ./module/Makefile.in        --replace "/bin/cp"                 "cp"
-    substituteInPlace ./etc/systemd/system/zfs-share.service.in \
-        --replace "@bindir@/rm " "${coreutils}/bin/rm "
-    ./autogen.sh
-  '';
-
-  configureFlags = [
-    "--with-config=${configFile}"
-  ] ++ optionals buildUser [
-    "--with-dracutdir=$(out)/lib/dracut"
-    "--with-udevdir=$(out)/lib/udev"
-    "--with-systemdunitdir=$(out)/etc/systemd/system"
-    "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
-    "--with-mounthelperdir=$(out)/bin"
-    "--sysconfdir=/etc"
-    "--localstatedir=/var"
-    "--enable-systemd"
-  ] ++ optionals buildKernel [
-    "--with-spl=${spl}/libexec/spl"
-    "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
-    "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-  ];
-
-  enableParallelBuilding = true;
-
-  installFlags = [
-    "sysconfdir=\${out}/etc"
-    "DEFAULT_INITCONF_DIR=\${out}/default"
-  ];
-
-  postInstall = ''
-    # Prevent kernel modules from depending on the Linux -dev output.
-    nuke-refs $(find $out -name "*.ko")
-  '' + optionalString buildUser ''
-    # Remove provided services as they are buggy
-    rm $out/etc/systemd/system/zfs-import-*.service
-
-    sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*
-
-    for i in $out/etc/systemd/system/*; do
-      substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
-    done
-
-    # Fix pkgconfig.
-    ln -s ../share/pkgconfig $out/lib/pkgconfig
-
-    # Remove tests because they add a runtime dependency on gcc
-    rm -rf $out/share/zfs/zfs-tests
-  '';
-
-  meta = {
-    description = "ZFS Filesystem Linux Kernel module";
-    longDescription = ''
-      ZFS is a filesystem that combines a logical volume manager with a
-      Copy-On-Write filesystem with data integrity detection and repair,
-      snapshotting, cloning, block devices, deduplication, and more.
+      preConfigure = ''
+        substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "umount -t zfs"           "${utillinux}/bin/umount -t zfs"
+        substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "mount -t zfs"            "${utillinux}/bin/mount -t zfs"
+        substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount"             "${utillinux}/bin/umount"
+        substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount"              "${utillinux}/bin/mount"
+        substituteInPlace ./udev/rules.d/*            --replace "/lib/udev/vdev_id"       "$out/lib/udev/vdev_id"
+        substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/ztest"         "$out/sbin/ztest"
+        substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/zdb"           "$out/sbin/zdb"
+        substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
+        substituteInPlace ./config/zfs-build.m4       --replace "\$sysconfdir/init.d"     "$out/etc/init.d"
+        substituteInPlace ./etc/zfs/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
+        substituteInPlace ./cmd/zed/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
+        substituteInPlace ./module/Makefile.in        --replace "/bin/cp"                 "cp"
+        substituteInPlace ./etc/systemd/system/zfs-share.service.in \
+          --replace "@bindir@/rm " "${coreutils}/bin/rm "
+        ./autogen.sh
       '';
-    homepage = http://zfsonlinux.org/;
-    license = licenses.cddl;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
-  };
-}
+
+      configureFlags = [
+        "--with-config=${configFile}"
+        ] ++ optionals buildUser [
+        "--with-dracutdir=$(out)/lib/dracut"
+        "--with-udevdir=$(out)/lib/udev"
+        "--with-systemdunitdir=$(out)/etc/systemd/system"
+        "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
+        "--with-mounthelperdir=$(out)/bin"
+        "--sysconfdir=/etc"
+        "--localstatedir=/var"
+        "--enable-systemd"
+        ] ++ optionals buildKernel [
+        "--with-spl=${spl}/libexec/spl"
+        "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
+        "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+      ];
+
+      enableParallelBuilding = true;
+
+      installFlags = [
+        "sysconfdir=\${out}/etc"
+        "DEFAULT_INITCONF_DIR=\${out}/default"
+      ];
+
+      postInstall = ''
+        # Prevent kernel modules from depending on the Linux -dev output.
+        nuke-refs $(find $out -name "*.ko")
+      '' + optionalString buildUser ''
+        # Remove provided services as they are buggy
+        rm $out/etc/systemd/system/zfs-import-*.service
+
+        sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*
+
+        for i in $out/etc/systemd/system/*; do
+        substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
+        done
+
+        # Fix pkgconfig.
+        ln -s ../share/pkgconfig $out/lib/pkgconfig
+
+        # Remove tests because they add a runtime dependency on gcc
+        rm -rf $out/share/zfs/zfs-tests
+      '';
+
+      meta = {
+        description = "ZFS Filesystem Linux Kernel module";
+        longDescription = ''
+          ZFS is a filesystem that combines a logical volume manager with a
+          Copy-On-Write filesystem with data integrity detection and repair,
+          snapshotting, cloning, block devices, deduplication, and more.
+        '';
+        homepage = http://zfsonlinux.org/;
+        license = licenses.cddl;
+        platforms = platforms.linux;
+        maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
+      };
+    };
+in
+  assert any (n: n == configFile) [ "kernel" "user" "all" ];
+  assert buildKernel -> kernel != null && spl != null;
+  {
+    # also check if kernel version constraints in
+    # ./nixos/modules/tasks/filesystems/zfs.nix needs
+    # to be adapted
+    zfsStable = common {
+      # comment/uncomment if breaking kernel versions are known
+      inkompatibleKernelVersion = "4.9";
+
+      version = "0.6.5.8";
+
+      # this package should point to the latest release.
+      sha256 = "0qccz1832p3i80qlrrrypypspb9sy9hmpgcfx9vmhnqmkf0yri4a";
+      extraPatches = [
+        (fetchpatch {
+          url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch";
+          sha256 = "14kqqphzg02m9a7qncdhff8958cfzdrvsid3vsrm9k75lqv1w08z";
+        })
+      ];
+      inherit spl;
+    };
+    zfsUnstable = common {
+      # comment/uncomment if breaking kernel versions are known
+      inkompatibleKernelVersion = "4.10";
+
+      version = "0.7.0-rc2";
+
+      # this package should point to a version / git revision compatible with the latest kernel release
+      sha256 = "197y2jyav9h1ksri9kzqvrwmzpb58mlgw27vfvgd4bvxpwfxq53s";
+      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";
+        })
+      ];
+      spl = splUnstable;
+    };
+  }
diff --git a/pkgs/os-specific/linux/zfs/nix-build.patch b/pkgs/os-specific/linux/zfs/nix-build.patch
deleted file mode 100644
index cc9e36838c7..00000000000
--- a/pkgs/os-specific/linux/zfs/nix-build.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index f8abb5f..82e8fb6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,10 +11,10 @@ endif
- if CONFIG_KERNEL
- SUBDIRS += module
- 
--extradir = @prefix@/src/zfs-$(VERSION)
-+extradir = @prefix@/libexec/zfs-$(VERSION)
- extra_HEADERS = zfs.release.in zfs_config.h.in
- 
--kerneldir = @prefix@/src/zfs-$(VERSION)/$(LINUX_VERSION)
-+kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION)
- nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
- endif
- 
-diff --git a/include/Makefile.am b/include/Makefile.am
-index a94cad5..a160fe2 100644
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -29,6 +29,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
- endif
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/zfs-$(VERSION)/include
-+kerneldir = @prefix@/include
- kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
- endif
-diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
-index 595d1db..d41375d 100644
---- a/include/linux/Makefile.am
-+++ b/include/linux/Makefile.am
-@@ -18,6 +18,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
- endif
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux
-+kerneldir = @prefix@/include/linux
- kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
- endif
-diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
-index 77ecfb2..52b3612 100644
---- a/include/sys/Makefile.am
-+++ b/include/sys/Makefile.am
-@@ -114,6 +114,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
- endif
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
-+kerneldir = @prefix@/include/sys
- kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
- endif
-diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
-index 8bca5d8..a5eafcd 100644
---- a/include/sys/fm/Makefile.am
-+++ b/include/sys/fm/Makefile.am
-@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
- endif
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm
-+kerneldir = @prefix@/include/sys/fm
- kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
- endif
-diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am
-index fdc9eb5..807c47c 100644
---- a/include/sys/fm/fs/Makefile.am
-+++ b/include/sys/fm/fs/Makefile.am
-@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
- endif
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs
-+kerneldir = @prefix@/include/sys/fm/fs
- kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
- endif
-diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
-index 0859b9f..b0c6eec 100644
---- a/include/sys/fs/Makefile.am
-+++ b/include/sys/fs/Makefile.am
-@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
- endif
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fs
-+kerneldir = @prefix@/include/sys/fs
- kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
- endif
-diff --git a/module/Makefile.in b/module/Makefile.in
-index d4ddee2..876c811 100644
---- a/module/Makefile.in
-+++ b/module/Makefile.in
-@@ -18,9 +18,9 @@ modules:
- 	@# installed devel headers, or they may be in the module
- 	@# subdirectory when building against the spl source tree.
- 	@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
--		/bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
-+		cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
- 	elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
--		/bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
-+		cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
- 	else \
- 		echo -e "\n" \
- 		"*** Missing spl symbols ensure you have built the spl:\n" \
-@@ -28,6 +28,8 @@ modules:
- 		"*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
- 		exit 1; \
- 	fi
-+	@# when copying a file out of the nix store, we need to make it writable again.
-+	chmod +w @SPL_SYMBOLS@
- 	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
- 
- clean:
-@@ -42,15 +44,15 @@ clean:
- modules_install:
- 	@# Install the kernel modules
- 	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
--		INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
-+		INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
- 		INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
- 		KERNELRELEASE=@LINUX_VERSION@
- 	@# Remove extraneous build products when packaging
--	kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
--	if [ -n "$(DESTDIR)" ]; then \
-+	kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
-+	if [ -n "@prefix@" ]; then \
- 		find $$kmoddir -name 'modules.*' | xargs $(RM); \
- 	fi
--	sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
-+	sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
- 	if [ -f $$sysmap ]; then \
- 		depmod -ae -F $$sysmap @LINUX_VERSION@; \
- 	fi
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac48186d58f..d401d841260 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11252,10 +11252,12 @@ in
 
     seturgent = callPackage ../os-specific/linux/seturgent { };
 
-    spl = callPackage ../os-specific/linux/spl {
+    inherit (callPackage ../os-specific/linux/spl {
       configFile = "kernel";
       inherit kernel;
-    };
+    }) splStable splUnstable;
+
+    spl = splStable;
 
     sysdig = callPackage ../os-specific/linux/sysdig {};
 
@@ -11279,10 +11281,12 @@ in
 
     x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };
 
-    zfs = callPackage ../os-specific/linux/zfs {
+    inherit (callPackage ../os-specific/linux/zfs {
       configFile = "kernel";
       inherit kernel spl;
-    };
+    }) zfsStable zfsUnstable;
+
+    zfs = zfsStable;
   });
 
   # The current default kernel / kernel modules.
@@ -11591,9 +11595,11 @@ in
 
   statifier = callPackage ../os-specific/linux/statifier { };
 
-  spl = callPackage ../os-specific/linux/spl {
+  inherit (callPackage ../os-specific/linux/spl {
     configFile = "user";
-  };
+  }) splStable splUnstable;
+
+  spl = splStable;
 
   sysdig = callPackage ../os-specific/linux/sysdig {
     kernel = null;
@@ -11797,9 +11803,11 @@ in
 
   zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
 
-  zfs = callPackage ../os-specific/linux/zfs {
+  inherit (callPackage ../os-specific/linux/zfs {
     configFile = "user";
-  };
+  }) zfsStable zfsUnstable;
+
+  zfs = zfsStable;
 
   ### DATA
 
@@ -14533,7 +14541,7 @@ in
   qscreenshot = callPackage ../applications/graphics/qscreenshot {
     qt = qt4;
   };
-  
+
   qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };

From 744cd7b12bffb2d1df7603d9134b065d83e64fbb Mon Sep 17 00:00:00 2001
From: Dario Bertini <berdario@gmail.com>
Date: Thu, 5 Jan 2017 09:57:41 +0100
Subject: [PATCH 0610/1310] xdis: 2.3.1 -> 3.2.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0141729e30..8faff132e19 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12677,12 +12677,13 @@ in {
 
   xdis = buildPythonPackage rec {
     name = "xdis-${version}";
-    version = "2.3.1";
+    version = "3.2.4";
     src = pkgs.fetchurl {
       url = "mirror://pypi/x/xdis/${name}.tar.gz";
-      sha256 = "1bi53n9fifjz2ja5inm546vzhjpgwx6n0qrhp106fss7bdm44a4v";
+      sha256 = "0g2lh70837vigcbc1i58349wp2xzrhlsg2ahc92sn8d3jwxja4dk";
     };
-    propagatedBuildInputs = with self; [ nose ];
+    propagatedBuildInputs = with self; [ nose six ];
+
     meta = {
       description = "Python cross-version byte-code disassembler and marshal routines";
       homepage = https://github.com/rocky/python-xdis/;

From aeb311f6c0e57aae8c1c1488d9502368c92469b5 Mon Sep 17 00:00:00 2001
From: Dario Bertini <berdario@gmail.com>
Date: Thu, 5 Jan 2017 09:58:32 +0100
Subject: [PATCH 0611/1310] zope.testing: 4.5.0 -> 4.6.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 8faff132e19..2f0b5e10896 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27529,11 +27529,11 @@ EOF
 
   zope_testing = buildPythonPackage rec {
     name = "zope.testing-${version}";
-    version = "4.5.0";
+    version = "4.6.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/z/zope.testing/${name}.tar.gz";
-      sha256 = "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s";
+      sha256 = "1vvxhjmzl7vw2i1akfj1xbggwn36270ym7f2ic9xwbaswfw1ap56";
     };
 
     doCheck = !isPyPy;

From 06e16f00c489fe34d03baa9fadf393d5174243bb Mon Sep 17 00:00:00 2001
From: Florian Duraffourg <f.duraffourg@gmail.com>
Date: Thu, 5 Jan 2017 10:02:33 +0100
Subject: [PATCH 0612/1310] Fix mount.glusterfs installation

---
 pkgs/tools/filesystems/glusterfs/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 3defa6ab123..6fd46a48639 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline,
  autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite
- , liburcu, attr
+ , liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which
 }:
 let 
   s = # Generated upstream information 
@@ -15,7 +15,7 @@ let
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline
     autoconf automake libtool pkgconfig zlib libaio libxml2
-    acl sqlite liburcu attr
+    acl sqlite liburcu attr makeWrapper
   ];
   # Some of the headers reference acl
   propagatedBuildInputs = [
@@ -32,7 +32,7 @@ rec {
     '';
 
   configureFlags = [
-    ''--with-mountutildir="$out/sbin" --localstatedir=/var''
+    ''--localstatedir=/var''
     ];
 
   makeFlags = "DESTDIR=$(out)";
@@ -48,6 +48,7 @@ rec {
   postInstall = ''
     cp -r $out/$out/* $out
     rm -r $out/nix
+    wrapProgram $out/sbin/mount.glusterfs --set PATH "${stdenv.lib.makeBinPath [ coreutils gnused attr gnugrep which]}"
     '';
 
   src = fetchurl {

From 28c06567f8d91528c4f9feca5a7afe7a269b0f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 5 Jan 2017 10:23:58 +0100
Subject: [PATCH 0613/1310] haskellPackages.hakyll: fix build

---
 pkgs/development/haskell-modules/configuration-common.nix      | 3 ++-
 .../development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4c0cb349860..2d39e68c9a1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -192,7 +192,8 @@ self: super: {
     then dontCheck (overrideCabal super.hakyll (drv: {
       testToolDepends = [];
     }))
-    else super.hakyll;
+    # https://github.com/jaspervdj/hakyll/issues/491
+    else dontCheck super.hakyll;
 
   # Heist's test suite requires system pandoc
   heist = overrideCabal super.heist (drv: {
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 66b0a7f3db7..434e7f51a2c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4075,7 +4075,6 @@ dont-distribute-packages:
   hakyll-sass:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-series:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-shakespeare:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]

From 60c88c48d1c91cd5e82e2072a0e9558a96dc2995 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Thu, 5 Jan 2017 11:33:20 +0200
Subject: [PATCH 0614/1310] dvdplusrwtools: apply multiple fixes

Upstream version of dvd+rw-tools is quite old and many Linux
distributions apply multiple patches to keep it working on newer
systems. This commit includes those patches.

This closes #21024.
---
 pkgs/tools/cd-dvd/dvd+rw-tools/default.nix    | 14 ++-
 .../dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch | 13 +++
 .../dvd+rw-tools-7.0-glibc2.6.90.patch        | 11 +++
 .../dvd+rw-tools-7.0-wctomb.patch             | 11 +++
 .../dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch | 11 +++
 .../dvd+rw-tools-7.1-layerbreaksetup.patch    | 93 +++++++++++++++++++
 6 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch
 create mode 100644 pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch
 create mode 100644 pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch
 create mode 100644 pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch
 create mode 100644 pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.1-layerbreaksetup.patch

diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
index ecadcc2b001..40ca08c9260 100644
--- a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
+++ b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
@@ -8,12 +8,24 @@ stdenv.mkDerivation {
     sha256 = "1jkjvvnjcyxpql97xjjx0kwvy70kxpiznr2zpjy2hhci5s10zmpq";
   };
 
+  # Patches from Gentoo / Fedora
+  # https://bugs.gentoo.org/257360
+  # https://bugzilla.redhat.com/show_bug.cgi?id=426068
+  # https://bugzilla.redhat.com/show_bug.cgi?id=243036
+  patches = [
+    ./dvd+rw-tools-7.0-dvddl.patch
+    ./dvd+rw-tools-7.0-glibc2.6.90.patch
+    ./dvd+rw-tools-7.0-wctomb.patch
+    ./dvd+rw-tools-7.0-wexit.patch
+    ./dvd+rw-tools-7.1-layerbreaksetup.patch
+  ];
+
   buildInputs = [cdrkit m4];
 
   preBuild = ''
     makeFlags="prefix=$out"
   '';
-  
+
   # Incompatibility with Linux 2.6.23 headers, see
   # http://www.mail-archive.com/cdwrite@other.debian.org/msg11464.html
   NIX_CFLAGS_COMPILE = "-DINT_MAX=__INT_MAX__";
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch
new file mode 100644
index 00000000000..c1c6fb3332a
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch
@@ -0,0 +1,13 @@
+--- ./growisofs_mmc.cpp.joe	2006-04-27 20:45:00.788446635 +0200
++++ ./growisofs_mmc.cpp	2006-04-27 20:46:01.666824300 +0200
+@@ -1412,9 +1412,7 @@
+     blocks += 15, blocks &= ~15;
+ 
+     if (blocks <= split)
+-	fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
+-			"    use single layer media for this recording\n"),
+-	exit (FATAL_START(EMEDIUMTYPE));
++	fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
+ 
+     blocks /= 16;
+     blocks += 1;
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch
new file mode 100644
index 00000000000..49742d3c4db
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch
@@ -0,0 +1,11 @@
+diff -up dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 dvd+rw-tools-7.0/transport.hxx
+--- dvd+rw-tools-7.0/transport.hxx.glibc2.6.90	2007-08-15 12:56:17.000000000 +0200
++++ dvd+rw-tools-7.0/transport.hxx	2007-08-15 12:56:42.000000000 +0200
+@@ -11,6 +11,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include <limits.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch
new file mode 100644
index 00000000000..3d13fc8d273
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch
@@ -0,0 +1,11 @@
+--- ./transport.hxx~	2008-03-25 21:24:47.000000000 -0400
++++ ./transport.hxx	2008-03-25 21:25:36.000000000 -0400
+@@ -116,7 +116,7 @@
+ extern "C" char *plusminus_locale()
+ { static class __plusminus {
+     private:
+-	char str[4];
++	char str[MB_LEN_MAX];
+     public:
+ 	__plusminus()	{   setlocale(LC_CTYPE,ENV_LOCALE);
+ 			    int l = wctomb(str,(wchar_t)(unsigned char)'�');
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch
new file mode 100644
index 00000000000..e7910cbdd7b
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch
@@ -0,0 +1,11 @@
+--- dvd+rw-tools-7.0/dvd+rw-format.cpp.wexit	2007-06-21 12:42:30.000000000 +0200
++++ dvd+rw-tools-7.0/dvd+rw-format.cpp	2007-06-21 12:44:13.000000000 +0200
+@@ -245,7 +245,7 @@ int main (int argc, char *argv[])
+ 	alarm(1);
+ 	while ((waitpid(pid,&i,0) != pid) && !WIFEXITED(i)) ;
+ 	if (WEXITSTATUS(i) == 0) fprintf (stderr,"\n");
+-	exit (0);
++	exit (WEXITSTATUS(i));
+     }
+ #endif
+ 
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.1-layerbreaksetup.patch b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.1-layerbreaksetup.patch
new file mode 100644
index 00000000000..7636f8393df
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.1-layerbreaksetup.patch
@@ -0,0 +1,93 @@
+diff -ur dvd+rw-tools-7.1-orig/growisofs.c dvd+rw-tools-7.1/growisofs.c
+--- dvd+rw-tools-7.1-orig/growisofs.c	2008-03-04 10:15:03.000000000 +0100
++++ dvd+rw-tools-7.1/growisofs.c	2009-09-06 22:39:33.000000000 +0200
+@@ -535,7 +535,7 @@
+  */
+ int        get_mmc_profile	(void *fd);
+ int        plusminus_r_C_parm	(void *fd,char *C_parm);
+-pwrite64_t poor_mans_setup	(void *fd,off64_t leadout);
++pwrite64_t poor_mans_setup	(void *fd,off64_t leadout,unsigned int lbreak);
+ char      *plusminus_locale	();
+ int        __1x			();
+ /*
+@@ -2447,7 +2447,7 @@
+ 			    goto out;
+ 			}
+ 			if (!progress.final) progress.final = tracksize;
+-			tracksize = layer_break*CD_BLOCK*2;
++			//tracksize = layer_break*CD_BLOCK*2;
+ 		    }
+ 		}
+ 		else if (capacity > outoff)
+@@ -2648,7 +2648,7 @@
+ 	 * further details on poor_mans_setup
+ 	 */
+ 	pwrite64_method = poor_mans_setup (ioctl_handle,
+-					   outoff+tracksize);
++					   outoff+tracksize, (unsigned int)layer_break);
+     }
+ 
+     if (!progress.final)
+diff -ur dvd+rw-tools-7.1-orig/growisofs_mmc.cpp dvd+rw-tools-7.1/growisofs_mmc.cpp
+--- dvd+rw-tools-7.1-orig/growisofs_mmc.cpp	2008-03-04 18:47:49.000000000 +0100
++++ dvd+rw-tools-7.1/growisofs_mmc.cpp	2009-09-06 20:52:46.000000000 +0200
+@@ -1612,7 +1612,7 @@
+   return 0;
+ }
+ 
+-static void plus_r_dl_split (Scsi_Command &cmd,off64_t size)
++static void plus_r_dl_split (Scsi_Command &cmd,off64_t size,unsigned int lbreak)
+ { int           err;
+   unsigned int  blocks,split;
+   unsigned char dvd_20[4+8];
+@@ -1644,10 +1644,17 @@
+ 			"    use single layer media for this recording\n"),
+ 	exit (FATAL_START(EMEDIUMTYPE));
+ 
+-    blocks /= 16;
+-    blocks += 1;
+-    blocks /= 2;
+-    blocks *= 16;
++    if (lbreak)
++      {
++	blocks=lbreak;
++      }
++    else
++      {
++	blocks /= 16;
++	blocks += 1;
++	blocks /= 2;
++	blocks *= 16;
++      }
+ 
+     fprintf (stderr,"%s: splitting layers at %u blocks\n",
+ 		    ioctl_device,blocks);
+@@ -2010,7 +2017,7 @@
+ typedef ssize_t (*pwrite64_t)(int,const void *,size_t,off64_t);
+ 
+ extern "C"
+-pwrite64_t poor_mans_setup (void *fd,off64_t leadout)
++pwrite64_t poor_mans_setup (void *fd,off64_t leadout,unsigned int lbreak)
+ { Scsi_Command cmd(ioctl_handle=fd);
+   int err,profile=mmc_profile&0xFFFF;
+ 
+@@ -2059,7 +2066,7 @@
+ 	case 0x2B:	// DVD+R Double Layer
+ 	    plusminus_pages_setup(cmd,profile);
+ 	    if (profile==0x2B && next_track==1 && dvd_compat && leadout)
+-		plus_r_dl_split (cmd,leadout);
++	      plus_r_dl_split (cmd,leadout,lbreak);
+ 	    atexit (plus_r_finalize);
+ 	    if (next_wr_addr)
+ 	    {	atsignals (no_r_finalize);
+diff -ur dvd+rw-tools-7.1-orig/transport.hxx dvd+rw-tools-7.1/transport.hxx
+--- dvd+rw-tools-7.1-orig/transport.hxx	2008-03-01 11:34:43.000000000 +0100
++++ dvd+rw-tools-7.1/transport.hxx	2009-09-06 20:53:53.000000000 +0200
+@@ -9,6 +9,7 @@
+ #if defined(__unix) || defined(__unix__)
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/types.h>

From 0be446fbfac7503a5b5cdbe871c6e086b1f9bcae Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 5 Jan 2017 10:58:37 +0100
Subject: [PATCH 0615/1310] pythonPackages.credstash: 1.11.0 -> 1.13.2

---
 pkgs/top-level/python-packages.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9705a4b165e..7855ab2670d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4279,15 +4279,25 @@ in {
   };
 
   credstash = buildPythonPackage rec {
-    name    = "credstash-${version}";
-    version = "1.11.0";
+    pname    = "credstash";
+    version = "1.13.2";
+    name = "${pname}-${version}";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/e2/64/6abae87b8da07c262d50b51eed540096ed1f6e01539bf2f2d4c3f718c8c6/credstash-1.11.0.tar.gz";
-      sha256 = "03qm8bjfskzkkmgcy5dr70x9pxabjb3fi0v0nxicg1kryy64k0dz";
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "b6283e565e3e441e8f74efcca54ece9697db16ce2e930fb5b6f7c0ab929c377e";
     };
 
-    propagatedBuildInputs = with self; [ pycrypto boto3 docutils ];
+    propagatedBuildInputs = with self; [ cryptography boto3 pyyaml docutils ];
+
+    # No tests in archive
+    doCheck = false;
+
+    meta = {
+      description = "A utility for managing secrets in the cloud using AWS KMS and DynamoDB";
+      homepage = https://github.com/LuminalOSS/credstash;
+      license = licenses.asl20;
+    };
   };
 
   cython = buildPythonPackage rec {

From 3b7193604f8b05dcb08afab8801203825bd966c1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 5 Jan 2017 10:59:25 +0100
Subject: [PATCH 0616/1310] pythonPackages.pycrypto: dummy depending on
 pycryptodome, closes #21671

---
 .../python-modules/pycrypto/default.nix       | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index 182a8c6f7fa..e3bd8e2b371 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -1,34 +1,30 @@
-{ stdenv, fetchurl, fetchpatch, python, buildPythonPackage, gmp }:
+{ stdenv, fetchurl, buildPythonPackage, pycryptodome }:
 
-buildPythonPackage rec {
-  name = "pycrypto-2.6.1";
-  namePrefix = "";
+# This is a dummy package providing the drop-in replacement pycryptodome.
+# https://github.com/NixOS/nixpkgs/issues/21671
 
-  src = fetchurl {
-    url = "mirror://pypi/p/pycrypto/${name}.tar.gz";
-    sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
-  };
+let
+  version = pycryptodome.version;
+  pname = "pycrypto";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2013-7459.patch";
-      url = "https://anonscm.debian.org/cgit/collab-maint/python-crypto.git/plain/debian/patches/CVE-2013-7459.patch?h=debian/2.6.1-7";
-      sha256 = "01r7aghnchc1bpxgdv58qyi2085gh34bxini973xhy3ks7fq3ir9";
-    })
-  ];
+  # Cannot build wheel otherwise (zip 1980 issue)
+  SOURCE_DATE_EPOCH=315532800;
 
-  preConfigure = ''
-    sed -i 's,/usr/include,/no-such-dir,' configure
-    sed -i "s!,'/usr/include/'!!" setup.py
+  # We need to have a dist-info folder, so let's create one with setuptools
+  unpackPhase = ''
+    echo "from setuptools import setup; setup(name='${pname}', version='${version}', install_requires=['pycryptodome'])" > setup.py
   '';
 
-  buildInputs = stdenv.lib.optional (!python.isPypy or false) gmp; # optional for pypy
+  propagatedBuildInputs = [ pycryptodome ];
 
-  doCheck = !(python.isPypy or stdenv.isDarwin); # error: AF_UNIX path too long
+  # Our dummy has no tests
+  doCheck = false;
 
   meta = {
     homepage = "http://www.pycrypto.org/";
     description = "Python Cryptography Toolkit";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = pycryptodome.meta.platforms;
   };
 }

From 5d3563f80cbc24da6d903a7604a29b9831db2322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 5 Jan 2017 11:05:46 +0100
Subject: [PATCH 0617/1310] treewide: more fixes of phases after bash 4.3 ->
 4.4

I'm surprised that the packages ever worked.
---
 pkgs/development/libraries/soundtouch/default.nix | 2 +-
 pkgs/development/libraries/zimlib/default.nix     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix
index 14eb5a24056..729967ea1b7 100644
--- a/pkgs/development/libraries/soundtouch/default.nix
+++ b/pkgs/development/libraries/soundtouch/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ autoconf automake libtool ];
 
-  preConfigurePhases = "./bootstrap";
+  preConfigure = "./bootstrap";
 
   meta = {
       description = "A program and library for changing the tempo, pitch and playback rate of audio";
diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix
index 24cbc818cdd..77a7989baab 100644
--- a/pkgs/development/libraries/zimlib/default.nix
+++ b/pkgs/development/libraries/zimlib/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
   buildInputs = [ automake autoconf libtool lzma ];
   setSourceRoot = "cd openzim-*/zimlib; export sourceRoot=`pwd`";
-  preConfigurePhases = [ "./autogen.sh" ];
+  preConfigure = "./autogen.sh";
 
   meta = {
     description = "Library for reading and writing ZIM files (file format for storing Web content offline)";

From bd0d567d47d3b739906f43b42259967e8273f87e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 5 Jan 2017 11:11:13 +0100
Subject: [PATCH 0618/1310] pythonPackages.django_1_10: 1.10.4 -> 1.10.5

See https://docs.djangoproject.com/en/1.10/releases/1.10.5/ for release
notes.
---
 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 9705a4b165e..a84351e2c66 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10094,12 +10094,12 @@ in {
 
   django_1_10 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.10.4";
+    version = "1.10.5";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
-      sha256 = "0asw60i4r5cdxb2jp6r09pdrwxxp8mvwbkz7vnx15n0hwmig1xzz";
+      sha256 = "12szjsmnfhh2yr54sfynyjr8vl0q9gb6qak3ayqcifcinrs97f0d";
     };
 
     patches = [

From 52a7b6549f1afef7c20cf1dfdb113d26b7fd2d6f Mon Sep 17 00:00:00 2001
From: jgertm <jger.tm@gmail.com>
Date: Thu, 5 Jan 2017 11:21:06 +0100
Subject: [PATCH 0619/1310] bitbucket-server-cli: init at 0.7.0 (#21616)

---
 lib/maintainers.nix                           |  1 +
 .../bitbucket-server-cli/Gemfile              |  2 +
 .../bitbucket-server-cli/Gemfile.lock         | 27 ++++++++
 .../bitbucket-server-cli/default.nix          | 21 ++++++
 .../bitbucket-server-cli/gemset.nix           | 66 +++++++++++++++++++
 .../git-and-tools/default.nix                 |  2 +
 6 files changed, 119 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile
 create mode 100644 pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock
 create mode 100644 pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
 create mode 100644 pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4cbedd7be03..721e63cd6a7 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -214,6 +214,7 @@
   jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>";
   jfb = "James Felix Black <james@yamtime.com>";
   jgeerds = "Jascha Geerds <jascha@jgeerds.name>";
+  jgertm = "Tim Jaeger <jger.tm@gmail.com>";
   jgillich = "Jakob Gillich <jakob@gillich.me>";
   jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>";
   joachifm = "Joachim Fasting <joachifm@fastmail.fm>";
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile
new file mode 100644
index 00000000000..8ed32515471
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'atlassian-stash'
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock
new file mode 100644
index 00000000000..61159eb3ee9
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock
@@ -0,0 +1,27 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    atlassian-stash (0.7.0)
+      commander (~> 4.1.2)
+      git (>= 1.2.5)
+      json (>= 1.7.5)
+      launchy (~> 2.4.2)
+    commander (4.1.6)
+      highline (~> 1.6.11)
+    git (1.3.0)
+    highline (1.6.21)
+    json (2.0.2)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    public_suffix (2.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  atlassian-stash
+
+BUNDLED WITH
+   1.13.6
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
new file mode 100644
index 00000000000..a3cf434360b
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
@@ -0,0 +1,21 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv rec {
+  name = "bitbucket-server-cli-${version}";
+
+  version = (import gemset).atlassian-stash.version;
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  pname = "atlassian-stash";
+
+  meta = with lib; {
+    description = "A command line interface to interact with BitBucket Server (formerly Atlassian Stash)";
+    homepage    = https://bitbucket.org/atlassian/bitbucket-server-cli;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ jgertm ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix
new file mode 100644
index 00000000000..a7c1406665e
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix
@@ -0,0 +1,66 @@
+{
+  addressable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw";
+      type = "gem";
+    };
+    version = "2.5.0";
+  };
+  atlassian-stash = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rsf9h5w5wiglwv0fqwp45fq06fxbg68cqkc3bpqvps1i1qm0p6i";
+      type = "gem";
+    };
+    version = "0.7.0";
+  };
+  commander = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x9i8hf083wjlgj09nl1p9j8sr5g7amq0fdmxjqs4cxdbg3wpmsb";
+      type = "gem";
+    };
+    version = "4.1.6";
+  };
+  git = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  highline = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
+      type = "gem";
+    };
+    version = "1.6.21";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lhinj9vj7mw59jqid0bjn2hlfcnq02bnvsx9iv81nl2han603s0";
+      type = "gem";
+    };
+    version = "2.0.2";
+  };
+  launchy = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
+      type = "gem";
+    };
+    version = "2.4.3";
+  };
+  public_suffix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
+      type = "gem";
+    };
+    version = "2.0.5";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 92d41b2b31a..e8c7c3bfbfd 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -22,6 +22,8 @@ in
 rec {
   # Try to keep this generally alphabetized
 
+  bitbucket-server-cli = callPackage ./bitbucket-server-cli { };
+
   darcsToGit = callPackage ./darcs-to-git { };
 
   diff-so-fancy = callPackage ./diff-so-fancy { };

From 1ba9a3cd9bc745f76ea79928e02687105cb38dd0 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 5 Jan 2017 03:59:24 +0100
Subject: [PATCH 0620/1310] wireguard: 0.0.20161230 -> 0.0.20170105

Version bump that contains some new tools.

fixes #21666
---
 pkgs/os-specific/linux/wireguard/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index c8169c52e80..489d6ac8bc6 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, libmnl, kernel ? null }:
 
-# module requires Linux >= 4.1 https://www.wireguard.io/install/#kernel-requirements
-assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1";
+# module requires Linux >= 3.18 https://www.wireguard.io/install/#kernel-requirements
+assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
 
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20161230";
+  version = "0.0.20170105";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "15p3k8msk3agr0i96k12y5h4fxv0gc8zqjk15mizd3wwmw6pgjb9";
+    sha256 = "15iqb1a85aygbf3myw6r79i5h3vpjam1rs6xrnf5kgvgmvp91n8v";
   };
 
   meta = with stdenv.lib; {
@@ -46,6 +46,9 @@ let
     buildInputs = [ libmnl ];
 
     makeFlags = [
+      "WITH_BASHCOMPLETION=yes"
+      "WITH_WGQUICK=yes"
+      "WITH_SYSTEMDUNITS=yes"
       "DESTDIR=$(out)"
       "PREFIX=/"
       "-C" "tools"

From be2a2db0f157118a7578a26f17b6eae4aa0ba28b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 5 Jan 2017 12:53:43 +0200
Subject: [PATCH 0621/1310] grub2: Workaround flex bug

I think the flex update in 6bded45883eb7f6ead12494917e1ecd92c3b4458
causes this failure, presumably due to upstream breakage:

````
gcc -DHAVE_CONFIG_H -I.  -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub_script.yy.c\" -I. -I. -I. -I. -I./include -I./include -I./grub-core/lib/libgcrypt-grub/src/  -I./grub-core/lib/minilzo -I./grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -Wcast-align  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -Werror  -fno-builtin -Wno-undef  -c -o libgrubmods_a-grub_script.yy.o `test -f 'grub_script.yy.c' || echo './'`grub_script.yy.c
./grub-core/script/yylex.l:34:0: error: "yyalloc" redefined [-Werror]
 #define yyalloc(size, scanner)   (grub_malloc((size)))
 ^
grub_script.yy.c:104:0: note: this is the location of the previous definition

 ^
./grub-core/script/yylex.l:35:0: error: "yyfree" redefined [-Werror]
 #define yyfree(ptr, scanner)   (grub_free((ptr)))
 ^
grub_script.yy.c:108:0: note: this is the location of the previous definition

 ^
./grub-core/script/yylex.l:36:0: error: "yyrealloc" redefined [-Werror]
 #define yyrealloc(ptr, size, scanner) (grub_realloc((ptr), (size)))
 ^
grub_script.yy.c:106:0: note: this is the location of the previous definition

 ^
cc1: all warnings being treated as errors
make[2]: *** [Makefile:7540: libgrubmods_a-grub_script.yy.o] Error 1
````

Work around it for now.
---
 pkgs/tools/misc/grub/2.0x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 15b1740638e..eef1ac47228 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -54,6 +54,9 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "all" ];
 
+  # Work around a bug in the generated flex lexer (upstream flex bug?)
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
   preConfigure =
     '' for i in "tests/util/"*.in
        do

From 0b22e6254b11833dcd96370ee020940011921d42 Mon Sep 17 00:00:00 2001
From: nzupec <zupec.nejc@gmail.com>
Date: Thu, 5 Jan 2017 15:48:49 +0100
Subject: [PATCH 0622/1310] libmemcached: update sha256 hash

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

diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix
index 2570c645f26..a0e3bb52dfe 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/pkgs/development/libraries/libmemcached/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch
     ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
       url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb";
-      sha256 = "1nvxwdkxj2a2g39z0g8byxjwnw4pa5xlvsmdk081q63vmfywh7zb";
+      sha256 = "1gjf3vd7hiyzxjvlg2zfc3y2j0lyr6nhbws4xb5dmin3csyp8qb8";
     });
 
   buildInputs = [ libevent ];

From 2102fa0d6d8a4e79498c8ad9b5a97fb2015c68b7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 5 Jan 2017 07:25:29 +0100
Subject: [PATCH 0623/1310] smack: 3.4.1 -> 4.1.9, fixe CVE-2016-10027

cc #21642
---
 pkgs/development/libraries/java/smack/builder.sh  | 2 +-
 pkgs/development/libraries/java/smack/default.nix | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/java/smack/builder.sh b/pkgs/development/libraries/java/smack/builder.sh
index 83edfe04a65..c97259e6a17 100644
--- a/pkgs/development/libraries/java/smack/builder.sh
+++ b/pkgs/development/libraries/java/smack/builder.sh
@@ -4,4 +4,4 @@ mkdir smack
 cd smack
 tar xfvz $src
 mkdir -p $out/share/java
-cp smack-*.jar $out/share/java
+cp libs/smack-*.jar $out/share/java
diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix
index 081bcccdd7d..c39478e590d 100644
--- a/pkgs/development/libraries/java/smack/default.nix
+++ b/pkgs/development/libraries/java/smack/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "smack-3.4.1";
+  name = "smack-4.1.9";
   builder = ./builder.sh;
-  
+
   src = fetchurl {
-    url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_4_1.tar.gz;
-    sha256 = "13jm93b0dsfxr62brq1hagi9fqk7ip3pi80svq10zh5kcpk77jf4";
+    url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_4_1_9.tar.gz;
+    sha256 = "009x0qcxd4dkvwcjz2nla470pwbabwvg37wc21pslpw42ldi0bzp";
   };
 
   meta = {

From c58ac7e4d6f82e968bcb3bc05ca8af107294d3a5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 5 Jan 2017 17:23:25 +0100
Subject: [PATCH 0624/1310] irssi: 0.8.20 -> 0.8.21 (security)

Fixes four security vulnerabilities:

  https://irssi.org/security/irssi_sa_2017_01.txt

No CVEs were assigned yet at the time of this commit.

cc #21642
---
 pkgs/applications/networking/irc/irssi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 5fd45368536..0d2dcd3b45a 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
 
-  version = "0.8.20";
+  version = "0.8.21";
   name = "irssi-${version}";
 
   src = fetchurl {
     urls = [ "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz" ];
-    sha256 = "0riz2wsdcs5hx5rwynm99fi01973lfrss21y8qy30dw2m9v0zqpm";
+    sha256 = "0fxacadhdzl3n0231mqjv2gcmj1fj85azhbbsk0fq7xmf1da7ha2";
   };
 
   buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ];

From c3f3e566972fa28fe04e14d79b724279ebf21acf Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 5 Jan 2017 18:07:22 +0100
Subject: [PATCH 0625/1310] dictd-db: Add deu2eng / eng2deu

---
 pkgs/servers/dict/dictd-db.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix
index 500ac6fd47b..70cd362c5ea 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/pkgs/servers/dict/dictd-db.nix
@@ -28,6 +28,14 @@ let
      };
    };
 in rec {
+  deu2eng = makeDictdDBFreedict (fetchurl {
+    url = http://prdownloads.sourceforge.net/freedict/deu-eng.tar.gz;
+    sha256 = "0dqrhv04g4f5s84nbgisgcfwk5x0rpincif0yfhfh4sc1bsvzsrb";
+  }) "deu-eng" "de_DE";
+  eng2deu = makeDictdDBFreedict (fetchurl {
+    url = http://prdownloads.sourceforge.net/freedict/eng-deu.tar.gz;
+    sha256 = "01x12p72sa3071iff3jhzga8588440f07zr56r3x98bspvdlz73r";
+  }) "eng-deu" "en_EN";
   nld2eng = makeDictdDBFreedict (fetchurl {
     url = http://prdownloads.sourceforge.net/freedict/nld-eng.tar.gz;
     sha256 = "1vhw81pphb64fzsjvpzsnnyr34ka2fxizfwilnxyjcmpn9360h07";

From 9bb6d91c73b33d466a7da3aed7767eca12f227c6 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 5 Jan 2017 17:37:33 +0000
Subject: [PATCH 0626/1310] httpd: setuptools is not top-level

---
 nixos/modules/services/web-servers/apache-httpd/trac.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix
index 87ed36e3530..35b9ab56087 100644
--- a/nixos/modules/services/web-servers/apache-httpd/trac.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix
@@ -99,7 +99,7 @@ in
         makeSearchPathOutput "lib" "lib/${pkgs.python.libPrefix}/site-packages"
           [ pkgs.mod_python
             pkgs.pythonPackages.trac
-            pkgs.setuptools
+            pkgs.pythonPackages.setuptools
             pkgs.pythonPackages.genshi
             pkgs.pythonPackages.psycopg2
             subversion

From 1181bdd7175a5e2e137dd5f33336a6826b91a468 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 5 Jan 2017 16:46:37 +0000
Subject: [PATCH 0627/1310] chromium, google-chrome: add commandLineArgs

---
 pkgs/applications/networking/browsers/chromium/default.nix   | 2 ++
 .../networking/browsers/google-chrome/default.nix            | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 1556603db2c..d014999a667 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -12,6 +12,7 @@
 , enableWideVine ? false
 , cupsSupport ? true
 , pulseSupport ? false
+, commandLineArgs ? ""
 }:
 
 let
@@ -76,6 +77,7 @@ in stdenv.mkDerivation {
     mkdir -p "$out/bin"
 
     eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
+      ${commandLineArgs} \
       ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
 
     ed -v -s "$out/bin/chromium" << EOF
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 938dbe09ebe..abc314f8569 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -6,6 +6,9 @@
 , alsaLib, libXdamage, libXtst, libXrandr, expat, cups
 , dbus_libs, gtk2, gdk_pixbuf, gcc
 
+# command line arguments which are always set e.g "--disable-gpu"
+, commandLineArgs ? ""
+
 # Will crash without.
 , systemd
 
@@ -106,7 +109,7 @@ in stdenv.mkDerivation rec {
     #!${bash}/bin/sh
     export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
     export PATH=$binpath\''${PATH:+:\$PATH}
-    $out/share/google/$appname/google-$appname "\$@"
+    $out/share/google/$appname/google-$appname ${commandLineArgs} "\$@"
     EOF
     chmod +x $exe
 

From bae778e86c7a946870844c644def9e0f89b2f68d Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 5 Jan 2017 13:33:49 -0800
Subject: [PATCH 0628/1310] pythonPackages.pyev: Fix expression to work on
 Darwin

---
 pkgs/top-level/python-packages.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7855ab2670d..e407a27d990 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20067,11 +20067,18 @@ in {
 
     buildInputs = [ pkgs.libev ];
 
-    postPatch = ''
-      libev_so=${pkgs.libev}/lib/libev.so.4
-      test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; }
-      sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py
-    '';
+    postPatch =
+      if !stdenv.isDarwin 
+      then ''
+        libev_so=${pkgs.libev}/lib/libev.so.4
+        test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; }
+        sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py
+      ''
+      else ''
+        libev_so=${pkgs.libev}/lib/libev.4.dylib
+        test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; }
+        sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py
+      '';
 
     meta = {
       description = "Python bindings for libev";

From 52e74ddc628877ac06f653a5d81905392a3a805f Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 5 Jan 2017 13:36:29 -0800
Subject: [PATCH 0629/1310] pythonPackages.pyev: Remove duplication from last
 commit

---
 pkgs/top-level/python-packages.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e407a27d990..cfff12c79ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20067,18 +20067,15 @@ in {
 
     buildInputs = [ pkgs.libev ];
 
-    postPatch =
-      if !stdenv.isDarwin 
-      then ''
-        libev_so=${pkgs.libev}/lib/libev.so.4
-        test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; }
-        sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py
-      ''
-      else ''
-        libev_so=${pkgs.libev}/lib/libev.4.dylib
-        test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; }
-        sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py
-      '';
+    libEvSharedLibrary = 
+      if !stdenv.isDarwin  
+      then "${pkgs.libev}/lib/libev.so.4"
+      else "${pkgs.libev}/lib/libev.4.dylib";
+
+    postPatch = ''
+      test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; }
+      sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py
+    '';
 
     meta = {
       description = "Python bindings for libev";

From 789b811e7d6558fa2b711ca6f57d7fc38a632d72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 5 Jan 2017 22:39:47 +0100
Subject: [PATCH 0630/1310] thunderbird: fixup build after updating sed

---
 .../networking/mailreaders/thunderbird/default.nix         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 2ea0f6127de..5f1483672b2 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -25,6 +25,13 @@ stdenv.mkDerivation rec {
     sha512 = "1f4579ac37b8ab98c91fe2e3e6742ba1b005ca9346d23f467d19e6af45eb457cab749bf91ed2a79f2058bd66f54da661da3ea5d5786f8c4b472d8a2a6c34db4b";
   };
 
+  # New sed no longer tolerates this mistake.
+  postPatch = ''
+    for f in mozilla/{js/src,}/configure; do
+      substituteInPlace "$f" --replace '[:space:]*' '[[:space:]]*'
+    done
+  '';
+
   buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx
     [ pkgconfig which libpng gtk2 perl zip libIDL libjpeg zlib bzip2
       python2 dbus dbus_glib pango freetype fontconfig xorg.libXi

From 92be17aef4712e453ad86dd756707ce21bc13936 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 5 Jan 2017 15:52:34 -0600
Subject: [PATCH 0631/1310] discord: paxmark to fix execution

---
 .../networking/instant-messengers/discord/default.nix           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 8387d2f7c38..57ef7250f46 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
                  --set-rpath "$out:$libPath"                                   \
                  $out/DiscordCanary
 
+        paxmark m $out/DiscordCanary
+
         ln -s $out/DiscordCanary $out/bin/
         ln -s $out/discord.png $out/share/pixmaps
 

From 4e847427983e3980e8d1819ae611c103836f1387 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 5 Jan 2017 16:13:31 -0600
Subject: [PATCH 0632/1310] discord: 0.0.11 -> 0.0.13

---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 57ef7250f46..1d1ae151caa 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {
 
     pname = "discord";
-    version = "0.0.11";
+    version = "0.0.13";
     name = "${pname}-${version}";
 
     src = fetchurl {
         url = "https://cdn-canary.discordapp.com/apps/linux/${version}/${pname}-canary-${version}.tar.gz";
-        sha256 = "1lk53vm14vr5pb8xxcx6hinpc2mkdns2xxv0bfzxvlmhfr6d6y18";
+        sha256 = "1pwb8y80z1bmfln5wd1vrhras0xygd1j15sib0g9vaig4mc55cs6";
     };
 
     libPath = stdenv.lib.makeLibraryPath [

From 8d029efdfde39dae8456fe20e25c77ac80ba53ce Mon Sep 17 00:00:00 2001
From: Yannis Koutras <ioannis.koutras@gmail.com>
Date: Fri, 6 Jan 2017 00:20:36 +0200
Subject: [PATCH 0633/1310] skrooge: 2.5.0 -> 2.6.0 (#21690)

---
 pkgs/applications/office/skrooge/2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/skrooge/2.nix b/pkgs/applications/office/skrooge/2.nix
index 6751e7d6d11..98c1c4c8b79 100644
--- a/pkgs/applications/office/skrooge/2.nix
+++ b/pkgs/applications/office/skrooge/2.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "skrooge-${version}";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "03ayrrr7rrj1jl1qh3sgn56hbi44wn4ldgcj08b93mqw7wdvpglp";
+    sha256 = "13sd669rx66fpk9pm72nr2y69k2h4mcs4b904i9xm41i0fiy6szp";
   };
 
   nativeBuildInputs = [ cmake ecm makeQtWrapper ];

From 3f9cb55dce4b1e006c13f5423b368b9282d65db9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 5 Jan 2017 16:26:35 -0600
Subject: [PATCH 0634/1310] skype: paxmark to fix execution on PaX-enabled
 kernels

---
 .../networking/instant-messengers/skype/default.nix            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix
index 5bb2121b1fd..a84b9cbf31c 100644
--- a/pkgs/applications/networking/instant-messengers/skype/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skype/default.nix
@@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{libexec/skype/,bin}
     cp -r * $out/libexec/skype/
 
+    # Fix execution on PaX-enabled kernels
+    paxmark m $out/libexec/skype/skype
+
     patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --set-rpath "${lib.makeLibraryPath buildInputs}" $out/libexec/skype/skype
 

From 1a80edba7d3500af4eadc2eacac56b84bd4e1a1f Mon Sep 17 00:00:00 2001
From: Nahum Shalman <nshalman@omniti.com>
Date: Thu, 5 Jan 2017 17:34:25 -0500
Subject: [PATCH 0635/1310] shfmt: 0.2.0 -> 1.1.0

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

diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index cac9bbb168b..7328cd3878a 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "shfmt-${version}";
-  version = "0.2.0";
+  version = "1.1.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/mvdan/sh";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "mvdan";
     repo = "sh";
     inherit rev;
-    sha256 = "07jf9v6583vvmk07fp7xdlnh7rvgl6f06ib2588g3xf1wk9vrq3d";
+    sha256 = "0h1qy27z6j1cgkk3hkvl7w3wjqc5flgn92r3j6frn8k2wzwj7zhz";
   };
 
   meta = with stdenv.lib; {

From 8ca70e358d8836c66153e85db2aee4a0fd44fd21 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Wed, 4 Jan 2017 16:25:59 -0500
Subject: [PATCH 0636/1310] mu: allow gtk-free builds

The gtk components are enabled by default when stdenv.isLinux is true.
---
 pkgs/tools/networking/mu/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 0cd3e15e762..c82588559df 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -1,6 +1,7 @@
 { fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook
 , xapian, glib, gmime, texinfo , emacs, guile
-, gtk3, webkitgtk24x, libsoup, icu }:
+, gtk3, webkitgtk24x, libsoup, icu
+, withMug ? stdenv.isLinux }:
 
 stdenv.mkDerivation rec {
   version = "0.9.18";
@@ -13,8 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu
-    autoreconfHook
-    gtk3 webkitgtk24x ];
+    autoreconfHook ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ];
 
   preBuild = ''
     # Fix mu4e-builddir (set it to $out)
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   # Install mug and msg2pdf
-  postInstall = ''
+  postInstall = stdenv.lib.optionalString withMug ''
     cp -v toys/msg2pdf/msg2pdf $out/bin/
     cp -v toys/mug/mug $out/bin/
   '';

From 196eb75b88b79718b84b8a936eb7313bc7d4a495 Mon Sep 17 00:00:00 2001
From: Aaron Bull Schaefer <aaron@elasticdog.com>
Date: Thu, 5 Jan 2017 16:20:45 -0800
Subject: [PATCH 0637/1310] transcrypt: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index 44a00238a5c..36d81ae9c44 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "transcrypt-${version}";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "elasticdog";
     repo = "transcrypt";
     rev = "v${version}";
-    sha256 = "195hi8lq1i9rfcwj3raw4pa7fhvv3ghznxp4crmbjm7c0sqilcpd";
+    sha256 = "12n8714my9i93lysqa3dj1z5xgi10iv5y1mnsqki9zn5av3lgqkq";
   };
 
   buildInputs = [ git makeWrapper openssl ];

From f2502c9d869524bf76eb58b6e68573bf45b45e66 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Jan 2017 19:48:25 -0500
Subject: [PATCH 0638/1310] atom: 1.12.8 -> 1.12.9

---
 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 366233d451f..51d2f26eb0d 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.8";
+  version = "1.12.9";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1kxydw8pzz2c55vl2fzn6dnfkqcr1hkx55k10g7z86afmc7g9vxv";
+    sha256 = "1yp4wwv0vxsad7jqkn2rj4n7k2ccgqscs89p3j6z8vpm6as0i6sg";
     name = "${name}.deb";
   };
 

From df7b4f4f6f12ff090f48108838353531aff92507 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkingod@gmail.com>
Date: Thu, 5 Jan 2017 21:19:07 -0500
Subject: [PATCH 0639/1310] httpd module: don't create documentRoot directory
 if it doesn't exist

It hides bugs and do you ever actually want to serve up an empty directory?
It was pretty confusing to me when it tried to write into a read-only store
path because I accidentally pointed it to the wrong store path.
---
 .../modules/services/web-servers/apache-httpd/default.nix  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 84c608ca2ab..dc0ca501a48 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -709,13 +709,6 @@ in
             ''}
             mkdir -m 0700 -p ${mainCfg.logDir}
 
-            ${optionalString (mainCfg.documentRoot != null)
-            ''
-              # Create the document root directory if does not exists yet
-              mkdir -p ${mainCfg.documentRoot}
-            ''
-            }
-
             # Get rid of old semaphores.  These tend to accumulate across
             # server restarts, eventually preventing it from restarting
             # successfully.

From 7115ed67837cdcc1fa98f0e34c066f5392c16007 Mon Sep 17 00:00:00 2001
From: spy-tech <spy-tech@users.noreply.github.com>
Date: Tue, 3 Jan 2017 14:12:45 +0100
Subject: [PATCH 0640/1310] awscli: 1.11.30 -> 1.11.35

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cfff12c79ea..49a1e91e278 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1509,13 +1509,11 @@ in {
 
   awscli = buildPythonPackage rec {
     name = "awscli-${version}";
-    version = "1.11.30";
-
-    namePrefix = "";
-
-    src = pkgs.fetchurl {
+    version = "1.11.35";
+      namePrefix = "";
+      src = pkgs.fetchurl {
       url = "mirror://pypi/a/awscli/${name}.tar.gz";
-      sha256 = "07km02wnjbaf745cs8j6zlwk9c2561l82zvr23a6d3qzs8wwxicf";
+      sha256 = "0k6y8cg311bqak5x9pilg80w6f76dcbzm6xcdrw6rjnk6v4xwy70";
     };
 
     # No tests included
@@ -3074,12 +3072,11 @@ in {
   };
 
   botocore = buildPythonPackage rec {
-    version = "1.4.87"; # This version is required by awscli
+    version = "1.4.92"; # This version is required by awscli
     name = "botocore-${version}";
-
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/botocore/${name}.tar.gz";
-      sha256 = "0fga1zjffsn2h50hbw7s4lcv6zwz5dcjgvjncl5y392mhivlrika";
+      sha256 = "08rpsfqd2g4iqvi1id8yhmyz2mc299dnr4aikkwjm24rih75p9aj";
     };
 
     propagatedBuildInputs =

From 5fad2a943bb4f4f35474fb8bbabd3c40374061d4 Mon Sep 17 00:00:00 2001
From: Alex Ivanov <gnidorah@users.noreply.github.com>
Date: Fri, 6 Jan 2017 06:18:26 +0300
Subject: [PATCH 0641/1310] kde-gtk-config: follow symlinks for cursors

---
 .../kde-gtk-config/0001-follow-symlinks.patch       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch
index 759eda4cc13..d610d19eedd 100644
--- a/pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch
+++ b/pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch
@@ -37,3 +37,16 @@ index 07c7ad7..b04d978 100644
 -- 
 2.6.2
 
+diff --git a/src/cursorthemesmodel.cpp b/src/cursorthemesmodel.cpp
+index 926a666..85b10f8 100644
+--- a/src/cursorthemesmodel.cpp
++++ b/src/cursorthemesmodel.cpp
+@@ -47,7 +47,7 @@ QList<QDir> CursorThemesModel::installedThemesPaths()
+ 
+     foreach(const QString& dir, dirs) {
+         QDir userIconsDir(dir);
+-        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
++        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
+         while(it.hasNext()) {
+             QString currentPath = it.next();
+             QDir dir(currentPath);

From 62e4cfa88783cffb384838a52a41d7b7c7cbbde3 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Thu, 5 Jan 2017 19:53:47 -0800
Subject: [PATCH 0642/1310] matrix-synapse: 0.18.6-rc2 -> 0.18.6-rc3

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

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 7eac25afd78..ddbf35be83c 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -24,13 +24,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.18.6-rc2";
+  version = "0.18.6-rc3";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "0alsby8hghhzgpzism2f9v5pmz91v20bd18nflfka79f3ss03h0q";
+    sha256 = "1a2yj22s84sd3nm9lx4rcdjbpbfclz6cp0ljpilw6n7spmj1nhcd";
   };
 
   patches = [ ./matrix-synapse.patch ];

From f133475370d9f1e258b5cfd2602185e5213c3027 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Mon, 14 Sep 2015 08:44:00 +1000
Subject: [PATCH 0643/1310] natron: init at 2.1.9

---
 pkgs/applications/video/natron/config.pri  |  20 ++++
 pkgs/applications/video/natron/default.nix | 126 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |   2 +
 3 files changed, 148 insertions(+)
 create mode 100644 pkgs/applications/video/natron/config.pri
 create mode 100644 pkgs/applications/video/natron/default.nix

diff --git a/pkgs/applications/video/natron/config.pri b/pkgs/applications/video/natron/config.pri
new file mode 100644
index 00000000000..c0d236c6b97
--- /dev/null
+++ b/pkgs/applications/video/natron/config.pri
@@ -0,0 +1,20 @@
+boost: LIBS += -lboost_serialization
+expat: LIBS += -lexpat
+expat: PKGCONFIG -= expat
+cairo {
+        PKGCONFIG += cairo
+        LIBS -=  $$system(pkg-config --variable=libdir cairo)/libcairo.a
+}
+pyside {
+        PKGCONFIG -= pyside
+        INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)
+        INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)/QtCore
+        INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)/QtGui
+        INCLUDEPATH += $$system(pkg-config --variable=includedir QtGui)
+        LIBS += -lpyside-python2.7
+}
+shiboken {
+        PKGCONFIG -= shiboken
+        INCLUDEPATH += $$system(pkg-config --variable=includedir shiboken)
+        LIBS += -lshiboken-python2.7
+}
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
new file mode 100644
index 00000000000..75dccbafd3f
--- /dev/null
+++ b/pkgs/applications/video/natron/default.nix
@@ -0,0 +1,126 @@
+{ lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages,
+  cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
+  poppler, imagemagick, glew, openexr, ffmpeg, opencolorio, openimageio,
+  qmake4Hook, libpng, mesa_noglu, lndir }:
+
+let
+  minorVersion = "2.1";
+  version = "${minorVersion}.9";
+  OpenColorIO-Configs = fetchurl {
+    url = "https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v${minorVersion}.tar.gz";
+    sha256 = "9eec5a02ca80c9cd8e751013cb347ea982fdddd592a4a9215cce462e332dac51";
+  };
+  seexpr = stdenv.mkDerivation rec {
+    version = "1.0.1";
+    name = "seexpr-${version}";
+    src = fetchurl {
+      url = "https://github.com/wdas/SeExpr/archive/rel-${version}.tar.gz";
+      sha256 = "1ackh0xs4ip7mk34bam8zd4qdymkdk0dgv8x0f2mf6gbyzzyh7lp";
+    };
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ libpng flex bison ];
+  };
+  buildPlugin = { pluginName, sha256, buildInputs, preConfigure ? "" }:
+    stdenv.mkDerivation {
+      name = "openfx-${pluginName}-${version}";
+      src = fetchurl {
+        url = "https://github.com/MrKepzie/Natron/releases/download/${version}/openfx-${pluginName}-${version}.tar.xz";
+        inherit sha256;
+      };
+      inherit buildInputs;
+      preConfigure = ''
+        makeFlagsArray+=("CONFIG=release")
+        makeFlagsArray+=("PLUGINPATH=$out/Plugins/OFX/Natron")
+        ${preConfigure}
+      '';
+    };
+  lodepngcpp = fetchurl {
+    url = https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.cpp;
+    sha256 = "1dxkkr4jbmvlwfr7m16i1mgcj1pqxg9s1a7y3aavs9rrk0ki8ys2";
+  };
+  lodepngh = fetchurl {
+    url = https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.h;
+    sha256 = "14drdikd0vws3wwpyqq7zzm5z3kg98svv4q4w0hr45q6zh6hs0bq";
+  };
+  CImgh = fetchurl {
+    url = https://raw.githubusercontent.com/dtschump/CImg/572c12d82b2f59ece21be8f52645c38f1dd407e6/CImg.h;
+    sha256 = "0n4qfxj8j6rmj4svf68gg2pzg8d1pb74bnphidnf8i2paj6lwniz";
+  };
+  plugins = map buildPlugin [
+    ({
+      pluginName = "arena";
+      sha256 = "0qba13vn9qdfax7nqlz1ps27zspr5kh795jp1xvbmwjzjzjpkqkf";
+      buildInputs = [
+        pkgconfig pango librsvg librevenge libcdr opencolorio libxml2 libzip
+        poppler imagemagick
+      ];
+      preConfigure = ''
+        sed -i 's|pkg-config poppler-glib|pkg-config poppler poppler-glib|g' Makefile.master
+        for i in Extra Bundle; do
+          cp ${lodepngcpp} $i/lodepng.cpp
+          cp ${lodepngh} $i/lodepng.h
+        done
+      '';
+    })
+    ({
+      pluginName = "io";
+      sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7";
+      buildInputs = [
+        pkgconfig libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu
+        seexpr
+      ];
+    })
+    ({
+      pluginName = "misc";
+      sha256 = "02h79jrll0c17azxj16as1mks3lmypm4m3da4mms9sg31l3n82qi";
+      buildInputs = [
+        mesa_noglu
+      ];
+      preConfigure = ''
+        cp ${CImgh} CImg/CImg.h
+      '';
+    })
+  ];
+in
+stdenv.mkDerivation {
+  inherit version;
+  name = "natron-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/MrKepzie/Natron/releases/download/${version}/Natron-${version}.tar.xz";
+    sha256 = "1wdc0zqriw2jhlrhzs6af3kagrv22cm086ffnbr1x43mgc9hfhjp";
+  };
+
+  buildInputs = [
+    pkgconfig qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken
+  ];
+
+  nativeBuildInputs = [ qmake4Hook python2Packages.wrapPython ];
+
+  preConfigure = ''
+    export MAKEFLAGS=-j$NIX_BUILD_CORES
+    cp ${./config.pri} config.pri
+    mkdir OpenColorIO-Configs
+    tar -xf ${OpenColorIO-Configs} --strip-components=1 -C OpenColorIO-Configs
+  '';
+
+  postFixup = ''
+    for i in ${lib.escapeShellArgs plugins}; do
+      ${lndir}/bin/lndir $i $out
+    done
+    wrapProgram $out/bin/Natron \
+      --set PYTHONPATH "$PYTHONPATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Node-graph based, open-source compositing software";
+    longDescription = ''
+      Node-graph based, open-source compositing software. Similar in
+      functionalities to Adobe After Effects and Nuke by The Foundry.
+    '';
+    homepage = https://natron.inria.fr/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ maintainers.puffnfresh ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95b8baf7be2..9c932a27266 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14073,6 +14073,8 @@ in
 
   neomutt = callPackage ../applications/networking/mailreaders/neomutt { };
 
+  natron = callPackage ../applications/video/natron { };
+
   notion = callPackage ../applications/window-managers/notion { };
 
   openshift = callPackage ../applications/networking/cluster/openshift { };

From 8f22697c624b06410471c562450dbc873077964c Mon Sep 17 00:00:00 2001
From: Mica Semrick <mica@silentumbrella.com>
Date: Thu, 5 Jan 2017 21:46:33 -0800
Subject: [PATCH 0644/1310] darktable 2.2.0 -> 2.2.1

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

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index ea5113246ba..7213ddcc366 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -11,12 +11,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "2.2.0";
+  version = "2.2.1";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "3eca193831faae58200bb1cb6ef29e658bce43a81706b54420953a7c33d79377";
+    sha256 = "da843190f08e02df19ccbc02b9d1bef6bd242b81499494c7da2cccdc520e24fc";
   };
 
   buildInputs =
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable"
     )
   '';
-  
+
   meta = with stdenv.lib; {
     description = "Virtual lighttable and darkroom for photographers";
     homepage = https://www.darktable.org;

From ad507954fa0401b12131fe7f0461791fdd0e688e Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 6 Jan 2017 09:43:52 +0100
Subject: [PATCH 0645/1310] emscriptenfastcomp-wrapped: disable hardening

The hardening flags break webassembly generation, at least in some
cases.
---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f07b69fb81..86f5abc7fb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1546,7 +1546,10 @@ in
   emscripten = callPackage ../development/compilers/emscripten { };
 
   emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { };
-  emscriptenfastcomp-wrapped = wrapCC emscriptenfastcomp-unwrapped;
+  emscriptenfastcomp-wrapped = wrapCCWith ccWrapperFun stdenv.cc.libc ''
+    # hardening flags break WASM support
+    cat > $out/nix-support/add-hardening.sh
+  '' emscriptenfastcomp-unwrapped;
   emscriptenfastcomp = symlinkJoin {
     name = "emscriptenfastcomp";
     paths = [ emscriptenfastcomp-wrapped emscriptenfastcomp-unwrapped ];

From d65be2eb12f3f890ac6b615da3b12522da00fa66 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@aubble.com>
Date: Fri, 6 Jan 2017 04:27:35 -0500
Subject: [PATCH 0646/1310] fzf: install manpage

Closes #21706
---
 pkgs/tools/misc/fzf/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 24c10c241f2..da5817c8850 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -14,6 +14,8 @@ buildGoPackage rec {
     sha256 = "0r099mk9r6f52qqhx0ifb1xa8f2isqvyza80z9mcpi5zkd96174l";
   };
 
+  outputs = [ "bin" "out" "man" ];
+
   buildInputs = [ ncurses ];
 
   goDeps = ./deps.nix;
@@ -25,6 +27,8 @@ buildGoPackage rec {
 
   postInstall = ''
     cp $src/bin/fzf-tmux $bin/bin
+    mkdir -p $man/share/man
+    cp -r $src/man/man1 $man/share/man
     mkdir -p $out/share/vim-plugins
     ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}
   '';

From cb70a594cbf6cc097d9ac57d3b036d2418452006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Jan 2017 10:53:25 +0100
Subject: [PATCH 0647/1310] sed: bring back 4.2.2 temporarily

It will be useful to fixup compatibility problems with [:space:].
---
 pkgs/tools/text/gnused/422.nix  | 31 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/text/gnused/422.nix

diff --git a/pkgs/tools/text/gnused/422.nix b/pkgs/tools/text/gnused/422.nix
new file mode 100644
index 00000000000..037c2f17a63
--- /dev/null
+++ b/pkgs/tools/text/gnused/422.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "gnused-4.2.2";
+
+  src = fetchurl {
+    url = mirror://gnu/sed/sed-4.2.2.tar.bz2;
+    sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7";
+  };
+
+  outputs = [ "out" "info" ];
+
+  meta = {
+    homepage = http://www.gnu.org/software/sed/;
+    description = "GNU sed, a batch stream editor";
+
+    longDescription = ''
+      Sed (stream editor) isn't really a true text editor or text
+      processor.  Instead, it is used to filter text, i.e., it takes
+      text input and performs some operation (or set of operations) on
+      it and outputs the modified text.  Sed is typically used for
+      extracting part of a file using pattern matching or substituting
+      multiple occurrences of a string within a file.
+    '';
+
+    license = stdenv.lib.licenses.gpl3Plus;
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cd0d6d1adf..6827e1c164a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1940,6 +1940,8 @@ in
   gnuplot_aquaterm = gnuplot.override { aquaterm = true; };
 
   gnused = callPackage ../tools/text/gnused { };
+  # This is an easy work-around for [:space:] problems.
+  gnused_422 = callPackage ../tools/text/gnused/422.nix { };
 
   gnutar = callPackage ../tools/archivers/gnutar { };
 

From ba9803079c93799f66b0f0ac6800f883e2fb479e Mon Sep 17 00:00:00 2001
From: Maurizio Di Pietro <dc1mdp@gmail.com>
Date: Fri, 6 Jan 2017 11:00:43 +0100
Subject: [PATCH 0648/1310] chase: avoided using fq attribute names

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

diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix
index 15d2b16faee..ebad6933936 100644
--- a/pkgs/tools/system/chase/default.nix
+++ b/pkgs/tools/system/chase/default.nix
@@ -14,14 +14,14 @@ stdenv.mkDerivation rec {
   makeFlags = [ "-e" ];
   makeFlagsArray="LIBS=-lgc";
 
-  meta = {
+  meta = with stdenv.lib ; {
     description = "Follow a symlink and print out its target file";
     longDescription = ''
     A commandline program that chases symbolic filesystems links to the original file
     '';
     homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.polyrod ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.polyrod ];
+    platforms = platforms.all;
   };
 }

From ac9b3d64cefae3cff8e90fa0dc6016211a011408 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Wed, 14 Dec 2016 11:18:53 -0800
Subject: [PATCH 0649/1310] configuration-hackage2nix.yaml: update jb55's
 packages

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 434e7f51a2c..2c387712592 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3416,8 +3416,6 @@ dont-distribute-packages:
   electrum-mnemonic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   elevator:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   elision:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  elm-export-persistent:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  elm-export:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   elocrypt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   emacs-keys:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-postmark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]

From a0c197102e7e3dde5d03ce2678db63c8fddf1831 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Jan 2017 02:08:54 +0100
Subject: [PATCH 0650/1310] configuration-hackage2nix.yaml: keep aeson 1.0.x
 around for 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 2c387712592..4b24f4f5312 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2010,6 +2010,7 @@ default-package-overrides:
 
 extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 6.12.3
+  - aeson < 1.1                         # required by stack
   - aeson-pretty < 0.8                  # required by elm compiler
   - binary > 0.7 && < 0.8               # binary 0.8.x is the latest, but it's largely unsupported so far
   - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions

From 0761b0bc5b8d8c579fa929a698c584a2e67431f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jan 2017 09:38:14 +0100
Subject: [PATCH 0651/1310] configuration-hackage2nix.yaml: don't follow LTS
 Haskell's version constraints on hledger-*

---
 .../development/haskell-modules/configuration-hackage2nix.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4b24f4f5312..97d6bc5695e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -855,9 +855,6 @@ default-package-overrides:
   - hjsmin ==0.2.0.2
   - hjsonpointer ==1.0.0.2
   - hjsonschema ==1.1.0.1
-  - hledger ==1.0.1
-  - hledger-interest ==1.5.1
-  - hledger-lib ==1.0.1
   - hlibgit2 ==0.18.0.15
   - hlibsass ==0.1.5.0
   - hlint ==1.9.35

From d2e344616c46260cada31b22508004b798e96d22 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Dec 2016 17:34:49 +0100
Subject: [PATCH 0652/1310] 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/c6ccb9817117572abc2711b4208b507ff75bde8b.
---
 .../haskell-modules/hackage-packages.nix      | 2633 ++++++++++++++---
 1 file changed, 2143 insertions(+), 490 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 641968a4d39..2528b8a8bef 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1393,13 +1393,13 @@ self: {
      }:
      mkDerivation {
        pname = "BioHMM";
-       version = "1.0.1";
-       sha256 = "b20fbbd9e38b9f764a9152aa123bbf7296b4be361bddfc7e1bbe833d439f9c20";
+       version = "1.0.3";
+       sha256 = "88963139ccce5e5ab1125bf590847d403d08a9b9f17f91a4fcb704a6881f6335";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
        ];
-       description = "Libary containing parsing and visualisation functions and datastructures for Hidden Markov Models in HMMER3 format";
+       description = "Libary for Hidden Markov Models in HMMER3 format";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -6199,6 +6199,30 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "Glob";
+       version = "0.7.14";
+       sha256 = "2837b88916e8ba4314fdbb556de8b0e7f577b848d3e80a08959b6ef47e1c842b";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GlomeTrace" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -8125,6 +8149,30 @@ self: {
        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
+     , test-framework-hunit, time, wai, warp
+     }:
+     mkDerivation {
+       pname = "HTTP";
+       version = "4000.3.4";
+       sha256 = "a4066d6fe45fa41d1c3e262e1100c740dc35cddec34c576723bdc35a8dcfc322";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HTTP-Simple" = callPackage
     ({ mkDerivation, base, HTTP, network }:
      mkDerivation {
@@ -10712,8 +10760,8 @@ self: {
      }:
      mkDerivation {
        pname = "Lazy-Pbkdf2";
-       version = "2.1.1";
-       sha256 = "a79a0282997dfc4905314bded417f7631c6665802c9fa5103aad999e1832daa9";
+       version = "2.1.2";
+       sha256 = "8a39397ba2756a1a3a7a7802e5d4cb824377289acb8c21aec37a76494daba1a3";
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [
          base base16-bytestring binary bytestring cryptonite memory
@@ -11734,6 +11782,22 @@ self: {
        license = "unknown";
      }) {};
 
+  "MonadRandom_0_5" = callPackage
+    ({ mkDerivation, base, fail, mtl, primitive, random, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "MonadRandom";
+       version = "0.5";
+       sha256 = "e239800faed1142b348d1125232ee1266209865ff6aa09516d4d516bec88c3dc";
+       libraryHaskellDepends = [
+         base fail mtl primitive random transformers transformers-compat
+       ];
+       description = "Random-number generation monad";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "MonadRandomLazy" = callPackage
     ({ mkDerivation, base, MonadRandom, mtl, random }:
      mkDerivation {
@@ -14278,22 +14342,22 @@ self: {
     ({ mkDerivation, aeson, base, biocore, biofasta, BlastHTTP
      , blastxml, bytestring, cassava, ClustalParser, cmdargs, containers
      , directory, edit-distance, either-unwrap, EntrezHTTP, filepath
-     , hierarchical-clustering, HTTP, http-conduit, hxt, matrix, network
-     , parsec, process, pureMD5, random, split, Taxonomy, text, time
-     , transformers, vector, ViennaRNAParser
+     , hierarchical-clustering, HTTP, http-conduit, http-types, hxt
+     , matrix, network, parsec, process, pureMD5, random, split
+     , Taxonomy, text, time, transformers, vector, ViennaRNAParser
      }:
      mkDerivation {
        pname = "RNAlien";
-       version = "1.2.6";
-       sha256 = "a3a0de2cde3813f9e7f87f27f8ebf306bcb6da8da6b818624a335c329e051874";
+       version = "1.2.8";
+       sha256 = "f4d754abee29eebb424ffb6d498de24544de1895a5ace4e47863870f62d2b94a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base biocore biofasta BlastHTTP blastxml bytestring cassava
          ClustalParser cmdargs containers directory edit-distance
          either-unwrap EntrezHTTP filepath hierarchical-clustering HTTP
-         http-conduit hxt matrix network parsec process pureMD5 random
-         Taxonomy text transformers vector ViennaRNAParser
+         http-conduit http-types hxt matrix network parsec process pureMD5
+         random Taxonomy text transformers vector ViennaRNAParser
        ];
        executableHaskellDepends = [
          base biocore biofasta bytestring cassava cmdargs containers
@@ -20114,6 +20178,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson_1_1_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat, base-orphans
+     , base16-bytestring, bytestring, containers, deepseq, directory
+     , dlist, filepath, generic-deriving, ghc-prim, hashable
+     , hashable-time, HUnit, QuickCheck, quickcheck-instances
+     , scientific, tagged, template-haskell, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , time-locale-compat, unordered-containers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "aeson";
+       version = "1.1.0.0";
+       sha256 = "5810fc5f664855ba6457d119fffd176ee93e60a27e88f5eedc349d7d75f18880";
+       libraryHaskellDepends = [
+         attoparsec base base-compat bytestring containers deepseq dlist
+         ghc-prim hashable scientific tagged template-haskell text time
+         time-locale-compat unordered-containers uuid-types vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base-compat base-orphans base16-bytestring
+         bytestring containers directory dlist filepath generic-deriving
+         ghc-prim hashable hashable-time HUnit QuickCheck
+         quickcheck-instances scientific tagged template-haskell
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time time-locale-compat unordered-containers uuid-types vector
+       ];
+       homepage = "https://github.com/bos/aeson";
+       description = "Fast JSON parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-applicative" = callPackage
     ({ mkDerivation, aeson, base, text, unordered-containers }:
      mkDerivation {
@@ -20201,8 +20297,8 @@ self: {
        pname = "aeson-compat";
        version = "0.3.6";
        sha256 = "7aa365d9f44f708f25c939489528836aa10b411e0a3e630c8c2888670874d142";
-       revision = "1";
-       editedCabalFile = "8e6a7142358e3189e10f906f5a0d2ae2306a2191f9ebf8a7ad85a6c70e15e6d9";
+       revision = "2";
+       editedCabalFile = "1000ae33d38d919e685b31f6f4de79bab9298318ced3ded0ff7e4a24c10258c3";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring containers exceptions
          hashable nats scientific semigroups tagged text time
@@ -20259,6 +20355,8 @@ self: {
        pname = "aeson-extra";
        version = "0.4.0.0";
        sha256 = "78ecedf65f8b68c09223912878e2a055aa38536489eddc9b47911cbc05aba594";
+       revision = "1";
+       editedCabalFile = "2a114863b515ec4b326bd31e4493ce2bcf7598b03361f76b44637e62d334b621";
        libraryHaskellDepends = [
          aeson aeson-compat attoparsec base base-compat bytestring
          containers exceptions hashable parsec recursion-schemes scientific
@@ -20515,6 +20613,8 @@ self: {
        pname = "aeson-schema";
        version = "0.4.1.1";
        sha256 = "30e95de2018a74ba0883f681723a0797d08c52b73433e5f70e86c71ad64abcc5";
+       revision = "1";
+       editedCabalFile = "8eaab2581d0f6108befe4112cd0749876e14670ebebcff228f07985c508589e6";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
          regex-base regex-compat regex-pcre scientific syb template-haskell
@@ -20659,6 +20759,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "affection" = callPackage
+    ({ mkDerivation, babl, base, clock, containers, gegl, glib, linear
+     , monad-loops, mtl, sdl2, text
+     }:
+     mkDerivation {
+       pname = "affection";
+       version = "0.0.0.1";
+       sha256 = "4d66b2b478888db84d13cd3557cc938902a97958e87bb9ea70dce9cd60e41f51";
+       libraryHaskellDepends = [
+         babl base clock containers gegl glib linear monad-loops mtl sdl2
+         text
+       ];
+       homepage = "https://github.com/nek0/affection#readme";
+       description = "A simple Game Engine using SDL";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "affine-invariant-ensemble-mcmc" = callPackage
     ({ mkDerivation, base, containers, mwc-random, primitive, split
      , vector
@@ -21383,6 +21500,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "algebraic-prelude" = callPackage
+    ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }:
+     mkDerivation {
+       pname = "algebraic-prelude";
+       version = "0.1.0.1";
+       sha256 = "8bb052b29571d4c07c03d14eb17f9d302f18e619bbe743509b9ec6e4fde2192d";
+       libraryHaskellDepends = [
+         algebra base basic-prelude lens semigroups
+       ];
+       homepage = "https://github.com/konn/algebraic-prelude#readme";
+       description = "Algebraically structured Prelude";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "algo-s" = callPackage
     ({ mkDerivation, base, bytestring, errors, foldl, hspec, mwc-random
      , optparse-applicative, primitive, QuickCheck, smallcheck
@@ -25009,17 +25140,20 @@ self: {
 
   "amqp-worker" = callPackage
     ({ mkDerivation, aeson, amqp, base, bytestring, data-default
-     , exceptions, monad-control, mtl, resource-pool, split, tasty
-     , tasty-hunit, text, transformers-base
+     , exceptions, monad-control, monad-loops, mtl, resource-pool, split
+     , tasty, tasty-hunit, text, transformers-base
      }:
      mkDerivation {
        pname = "amqp-worker";
-       version = "0.2.3";
-       sha256 = "41e7ed6f745cde27d451057958e5d017a6e6558ed5083f0cd0a10ee3bc757a09";
+       version = "0.2.4";
+       sha256 = "cc46b8d7f02c02dacc3e7a7c7d5e6c0d2338aec9afc4ca8e4f8c0d4f616a405f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson amqp base bytestring data-default exceptions monad-control
-         mtl resource-pool split text transformers-base
+         monad-loops mtl resource-pool split text transformers-base
        ];
+       executableHaskellDepends = [ aeson base exceptions text ];
        testHaskellDepends = [
          aeson amqp base bytestring tasty tasty-hunit text
        ];
@@ -25366,6 +25500,8 @@ self: {
        pname = "ansi-pretty";
        version = "0.1.2.1";
        sha256 = "708819f93f1759919a19dcfccddf3ddc8d9fba930cb73fab3ec9f6f5691394c6";
+       revision = "1";
+       editedCabalFile = "266eb754d15de06de1d488c82564bbf6c359e4e94e5210a58f2c18917a19d78d";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base bytestring containers generics-sop
          nats scientific semigroups tagged text time unordered-containers
@@ -26172,6 +26308,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "app-settings_0_2_0_10" = callPackage
+    ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl
+     , parsec, text
+     }:
+     mkDerivation {
+       pname = "app-settings";
+       version = "0.2.0.10";
+       sha256 = "88dd9df76930467c14b764108cda92676a6702f68ad38a09c26e740bce29ac28";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "appar" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -26534,6 +26690,36 @@ self: {
        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
+     , tasty-golden, tasty-hunit, terminal-progress-bar, time
+     , transformers, unix, utf8-string, X11
+     }:
+     mkDerivation {
+       pname = "arbtt";
+       version = "0.9.0.12";
+       sha256 = "3bdd4171a6d68ff3604eb752d04fdc6e819ab90f021e65ff12f5f6c7e62e87cf";
+       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;};
+
   "archive" = callPackage
     ({ mkDerivation, base, bytestring, debian, debian-mirror, directory
      , Extra, filepath, help, HUnit, mtl, network, old-locale, pretty
@@ -28533,6 +28719,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "autoexporter_1_0_0" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "autoexporter";
+       version = "1.0.0";
+       sha256 = "459baf1bbb143a92a25f1de7b9ec416a5ee214bb763bfb5f5e49e10678aba0f3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/tfausak/autoexporter#readme";
+       description = "Automatically re-export modules";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "autom" = callPackage
     ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss
      , JuicyPixels, random, vector
@@ -28694,10 +28896,10 @@ self: {
      }:
      mkDerivation {
        pname = "avers";
-       version = "0.0.17.0";
-       sha256 = "3e6b4a39ccb99373a1a574625b86d4948f4ba4a747652e3c5ddd8d8b09fe212d";
-       revision = "3";
-       editedCabalFile = "dd1745f57f0636a5932c361e931feec895221ae612acc37eaf2d819f349c75ae";
+       version = "0.0.17.1";
+       sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5";
+       revision = "4";
+       editedCabalFile = "00eb4a4386d3ed82d29c7f33c3c813074d33e25ce0c60872ca0a0cb78c3bd76c";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -29574,6 +29776,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "babl" = callPackage
+    ({ mkDerivation, babl, base }:
+     mkDerivation {
+       pname = "babl";
+       version = "0.0.0.2";
+       sha256 = "c06c27e50875ab4fca4322112648006c49dc06158457fdb405df50eac9223245";
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ babl ];
+       libraryPkgconfigDepends = [ babl ];
+       homepage = "http://github.com/nek0/babl#readme";
+       description = "Haskell bindings to BABL library";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {inherit (pkgs) babl;};
+
   "babylon" = callPackage
     ({ mkDerivation, array, base, containers, random, wx, wxcore }:
      mkDerivation {
@@ -31405,6 +31621,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binary-ext" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
+     , directory, filepath, HUnit, QuickCheck, random, test-framework
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "binary-ext";
+       version = "1.0";
+       sha256 = "0b7b4c7d4d2e5a08cf046eabbc66269aa187cfed4fcaeefcc5d95b4305a04837";
+       libraryHaskellDepends = [
+         array base binary bytestring containers
+       ];
+       testHaskellDepends = [
+         array base binary bytestring Cabal containers directory filepath
+         HUnit QuickCheck random test-framework test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/A1-Triard/binary-ext";
+       description = "An alternate with typed errors for Data.Binary.Get monad from 'binary' library.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "binary-file" = callPackage
     ({ mkDerivation, base, bytestring, monads-tf, peggy
      , template-haskell
@@ -31517,6 +31754,32 @@ self: {
        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
+     , vector, vector-binary-instances
+     }:
+     mkDerivation {
+       pname = "binary-orphans";
+       version = "0.1.5.2";
+       sha256 = "7c644fb1d1657719c04c0f115a36efaeba7287c953de826b55c28fae87aca33d";
+       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
@@ -31689,6 +31952,8 @@ self: {
        pname = "binary-tagged";
        version = "0.1.4.2";
        sha256 = "311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784";
+       revision = "1";
+       editedCabalFile = "51f87f18bfe7ba8a3edc318cfb95f4aae9c2bb3feb54277553ac895b09ce0cf1";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          generics-sop hashable nats scientific semigroups SHA tagged text
@@ -31876,32 +32141,32 @@ self: {
      }) {K8055D = null;};
 
   "bindings-apr" = callPackage
-    ({ mkDerivation, apr-1, base, bindings-DSL }:
+    ({ mkDerivation, apr, base, bindings-DSL }:
      mkDerivation {
        pname = "bindings-apr";
        version = "0.1";
        sha256 = "d324f6517ad3615aa7065e5f2a247f146655a7315ac70006ef0ded4bce0f873b";
        libraryHaskellDepends = [ base bindings-DSL ];
-       libraryPkgconfigDepends = [ apr-1 ];
+       libraryPkgconfigDepends = [ apr ];
        homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime (APR)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {apr-1 = null;};
+     }) {inherit (pkgs) apr;};
 
   "bindings-apr-util" = callPackage
-    ({ mkDerivation, apr-util-1, base, bindings-apr, bindings-DSL }:
+    ({ mkDerivation, apr-util, base, bindings-apr, bindings-DSL }:
      mkDerivation {
        pname = "bindings-apr-util";
        version = "0.1";
        sha256 = "9d93dae4cb05d24a2fe50778bdf972df23ca0be5e8f85a85bb744e757720206b";
        libraryHaskellDepends = [ base bindings-apr bindings-DSL ];
-       libraryPkgconfigDepends = [ apr-util-1 ];
+       libraryPkgconfigDepends = [ apr-util ];
        homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {apr-util-1 = null;};
+     }) {apr-util = null;};
 
   "bindings-audiofile" = callPackage
     ({ mkDerivation, audiofile, base, bindings-DSL }:
@@ -32357,12 +32622,12 @@ self: {
      }) {};
 
   "bindings-portaudio" = callPackage
-    ({ mkDerivation, base, bindings-DSL, portaudio }:
+    ({ mkDerivation, base, bindings-DSL, portaudio, vector }:
      mkDerivation {
        pname = "bindings-portaudio";
-       version = "0.1";
-       sha256 = "22aa0157723500351d014ef609b4a6167e9e9ae69ddcc33e71d3c908c0c09d71";
-       libraryHaskellDepends = [ base bindings-DSL ];
+       version = "0.2";
+       sha256 = "362cfad6f1527d887224564682a7ff8f40c73ceed8ee803c78609bc523bab74b";
+       libraryHaskellDepends = [ base bindings-DSL vector ];
        libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
        license = stdenv.lib.licenses.bsd3;
@@ -33597,8 +33862,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6";
        sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3";
-       revision = "7";
-       editedCabalFile = "b965b55168cd3f25ee55944fb39f9509c847bb48f69e8ec443614fc8ff4960dd";
+       revision = "8";
+       editedCabalFile = "b39980789d8a226fb984088b3ab9e63c96bd81f2ee7806bf124d420c4479fedc";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
          containers data-default-class http-types kansas-comet mime-types
@@ -34397,6 +34662,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bogocopy" = callPackage
+    ({ mkDerivation, base, directory, filemanip, filepath
+     , optparse-applicative, shelly, text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "bogocopy";
+       version = "0.1.0.2";
+       sha256 = "4b2d4e376b8908805a09404fac4a7b73efd3f4549a515eb8e180fe46221de834";
+       revision = "1";
+       editedCabalFile = "9b68ad2f64094297c4631e652ab247e8d83c64b64b7f40528232b8c474a4dee4";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory filemanip filepath optparse-applicative shelly text
+         transformers unix
+       ];
+       homepage = "https://github.com/phlummox/bogocopy";
+       description = "Simple project template from stack";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "bogre-banana" = callPackage
     ({ mkDerivation, base, hogre, hois, monad-control, random
      , reactive-banana
@@ -35008,13 +35294,13 @@ self: {
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "brainfuck-tut";
-       version = "0.7.0.1";
-       sha256 = "761ef393826ecc54b9a5ab2d37b0c1af9db169bf6edb02282df67a71e02a1855";
+       version = "0.7.0.2";
+       sha256 = "fd5ebdd26c1bcee0e064288e71f92bc8f458768058bfbbaa368f562f44090939";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
        executableHaskellDepends = [ array base ];
-       homepage = "https://gitlab.com/cpp.cabrera/brainfuck-tut";
+       homepage = "https://gitlab.com/queertypes/brainfuck-tut";
        description = "A simple BF interpreter";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35233,6 +35519,7 @@ self: {
        homepage = "https://github.com/jb55/bson-lens";
        description = "BSON lenses";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
   "bson-mapping" = callPackage
@@ -37428,17 +37715,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cacophony_0_9_0" = callPackage
+  "cacophony_0_9_1" = callPackage
     ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring
-     , cryptonite, deepseq, directory, exceptions, free, hlint, lens
-     , memory, monad-coroutine, mtl, safe-exceptions, text, transformers
+     , cryptonite, directory, exceptions, free, hlint, lens, memory
+     , monad-coroutine, mtl, safe-exceptions, text, transformers
      }:
      mkDerivation {
        pname = "cacophony";
-       version = "0.9.0";
-       sha256 = "7394383af54b84ff5efdb491cafa6ffc569266c522c7395ee099a45bbd0588cb";
+       version = "0.9.1";
+       sha256 = "cb60834c8b0571f2b2b54b6f9847960c71ffe5350c60791c439de6ba54c67c02";
        libraryHaskellDepends = [
-         base bytestring cryptonite deepseq exceptions free lens memory
+         base bytestring cryptonite exceptions free lens memory
          monad-coroutine mtl safe-exceptions transformers
        ];
        testHaskellDepends = [
@@ -39012,17 +39299,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cayley-client_0_3_0" = callPackage
+  "cayley-client_0_3_1" = 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.0";
-       sha256 = "6c2d35f5c70df4744c3cac4a3cda952bd6a36f0f40cbdcf79ec54670ab1c5e1a";
-       revision = "1";
-       editedCabalFile = "7bc68d5b02fa41ebd7652a4e0d080417f4a66e179f24e6cc70845dac0fbb9f63";
+       version = "0.3.1";
+       sha256 = "c2d8eeeebf3814a10abfadb032132c8f1deff393909312d17755a9547463ebf7";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring exceptions http-client
          http-conduit lens lens-aeson mtl text transformers
@@ -39056,8 +39341,8 @@ self: {
      }:
      mkDerivation {
        pname = "cblrepo";
-       version = "0.23.0";
-       sha256 = "bbb17315e0618e121f8c339a4758d41a0a4b9d7b594168978fdc13d7fff93281";
+       version = "0.24.0";
+       sha256 = "03c1728d5f5ac702e334d3b7ccf0ceb42c00f93dba6cce2cdd655f5d74f4af7a";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
@@ -40124,8 +40409,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "choice";
-       version = "0.1.1.0";
-       sha256 = "96245c66c3e2dd48aec6b9bba3198b336d4d111b10781e53c544b43b98c1a989";
+       version = "0.2.0";
+       sha256 = "89a70894e54acc8e1a178e6110f46b0efed6e8389c7fec9060048d154aa1f72e";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mboes/choice#readme";
        description = "A solution to boolean blindness";
@@ -41858,20 +42143,18 @@ self: {
 
   "clit" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
-     , http-client, http-client-tls, http-types, optparse-applicative
-     , split
+     , data-default, http-client, http-client-tls, http-types, lens
+     , optparse-applicative, split
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.1.1.2";
-       sha256 = "5daac994e7e122d6e009cfbb8e87c9a6134c7157256d2c64dfb87d8b83503367";
-       revision = "1";
-       editedCabalFile = "a00ced1d7dcc50bae6eae37b415f304271ee08bec06b3d15f7ec60fe927bdad8";
+       version = "0.2.0.1";
+       sha256 = "64e698fb189b3ab06c52d43aa0a5da99104b46e8024687d13664610d795fe504";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson authenticate-oauth base bytestring http-client
-         http-client-tls http-types optparse-applicative split
+         aeson authenticate-oauth base bytestring data-default http-client
+         http-client-tls http-types lens optparse-applicative split
        ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
@@ -43825,17 +44108,35 @@ self: {
      }) {};
 
   "computational-algebra" = callPackage
-    ({ mkDerivation, algebra, base, containers, equational-reasoning
-     , heaps, lens, monad-loops, monomorphic, peggy, singletons
-     , sized-vector, tagged, type-natural
+    ({ mkDerivation, algebra, algebraic-prelude, arithmoi, base
+     , constraints, containers, control-monad-loop, convertible, deepseq
+     , dlist, entropy, equational-reasoning, hashable, heaps, hmatrix
+     , hspec, HUnit, hybrid-vectors, lens, matrix, monad-loops
+     , MonadRandom, mono-traversable, monomorphic, mtl, parallel, primes
+     , process, QuickCheck, quickcheck-instances, reflection, semigroups
+     , singletons, sized, smallcheck, tagged, template-haskell
+     , test-framework, test-framework-hunit, text, type-natural, unamb
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "computational-algebra";
-       version = "0.3.0.0";
-       sha256 = "9dd0b12afcdf642cfed686820d2523291cb62a064122c51c78e45dfeae5e9226";
+       version = "0.4.0.0";
+       sha256 = "cb9fd9a9115a911f43837fedfdc96f91c07a3240eccbd64b111b73844562e9f6";
        libraryHaskellDepends = [
-         algebra base containers equational-reasoning heaps lens monad-loops
-         monomorphic peggy singletons sized-vector tagged type-natural
+         algebra algebraic-prelude arithmoi base constraints containers
+         control-monad-loop convertible deepseq dlist entropy
+         equational-reasoning hashable heaps hmatrix hybrid-vectors lens
+         matrix monad-loops MonadRandom mono-traversable monomorphic mtl
+         parallel primes reflection semigroups singletons sized tagged
+         template-haskell text type-natural unamb unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         algebra base constraints containers convertible deepseq
+         equational-reasoning hspec HUnit lens matrix MonadRandom
+         monomorphic process QuickCheck quickcheck-instances reflection
+         singletons sized smallcheck tagged test-framework
+         test-framework-hunit text type-natural vector
        ];
        homepage = "https://github.com/konn/computational-algebra";
        description = "Well-kinded computational algebra library, currently supporting Groebner basis";
@@ -46996,8 +47297,8 @@ self: {
      }:
      mkDerivation {
        pname = "crawlchain";
-       version = "0.1.1.4";
-       sha256 = "0754ba3c874648e6c6e84c17d2d729cc3427f3cad2f1d0f37fbbcb4841020917";
+       version = "0.1.1.7";
+       sha256 = "93c39d63111fd8bdc4222a763ff1cb289b4e1e9b5342a3f0273fa6180a6062f1";
        libraryHaskellDepends = [
          base bytestring directory HTTP network-uri split tagsoup time
        ];
@@ -47418,6 +47719,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cron_0_5_0" = callPackage
+    ({ mkDerivation, attoparsec, base, data-default-class, generics-sop
+     , mtl, mtl-compat, old-locale, quickcheck-instances, semigroups
+     , tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "cron";
+       version = "0.5.0";
+       sha256 = "ebffcf17d4ce054b50e97034ca94e73c82803494e0a507b49844740a968535b7";
+       libraryHaskellDepends = [
+         attoparsec base data-default-class mtl mtl-compat old-locale
+         semigroups text time
+       ];
+       testHaskellDepends = [
+         attoparsec base generics-sop quickcheck-instances semigroups tasty
+         tasty-hunit tasty-quickcheck text time transformers-compat
+       ];
+       homepage = "http://github.com/michaelxavier/cron";
+       description = "Cron datatypes and Attoparsec parser";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cron-compat" = callPackage
     ({ mkDerivation, attoparsec, base, cron, derive, hspec
      , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text
@@ -47611,10 +47936,10 @@ self: {
      }:
      mkDerivation {
        pname = "crypto-enigma";
-       version = "0.0.2.6";
-       sha256 = "eb162e2b4ea2d73bb3594e12438f02988e338ae58c602e817a31970163533142";
-       revision = "3";
-       editedCabalFile = "c94ac05824b4eb891ee0351c533f6b7a12586437b58c4615538903bfd807317c";
+       version = "0.0.2.8";
+       sha256 = "7868ad36d39243fef45e1f76be73709778442ad69dc18ad8066650a748c6e837";
+       revision = "1";
+       editedCabalFile = "7a7c682466a7ea07d0a755cb3f3c696083921734a90bcad745226b45b605a97e";
        libraryHaskellDepends = [ base containers MissingH mtl split ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        homepage = "https://github.com/orome/crypto-enigma-hs";
@@ -48058,8 +48383,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptonite-openssl";
-       version = "0.4";
-       sha256 = "a8307454de4f85456660686815169d925cb90345f7ac016d0c5562c2755667ea";
+       version = "0.5";
+       sha256 = "a10bc2030bd3696c190562853a794c392ff1e5ab9b4adc6c05697526dc9ce25c";
        libraryHaskellDepends = [ base bytestring cryptonite memory ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [
@@ -48572,8 +48897,10 @@ self: {
      }:
      mkDerivation {
        pname = "cuda";
-       version = "0.7.5.1";
-       sha256 = "0910d9e4f0b3a46d9bda2de495ae9024799c21764bc543b99edea64e65180385";
+       version = "0.7.5.2";
+       sha256 = "749b2411255f699289d2989c8720b751940678bfbb621ccd8bb98eaf0a7b94d6";
+       revision = "1";
+       editedCabalFile = "dd05fcdff465dcbe7252532e3b9ba481d76548611e02bc28fce734378c093dee";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -49790,7 +50117,7 @@ self: {
 
   "data-default-extra" = callPackage
     ({ mkDerivation, base, data-default-class
-     , data-default-instances-base, data-default-instances-bytestring
+     , data-default-instances-bytestring
      , data-default-instances-case-insensitive
      , data-default-instances-containers
      , data-default-instances-new-base
@@ -49800,11 +50127,10 @@ self: {
      }:
      mkDerivation {
        pname = "data-default-extra";
-       version = "0.0.1";
-       sha256 = "ddd73777101f49566654bae02203424bc7f4dd55ba5b839b5d2d8d4fa6d0812e";
+       version = "0.1.0";
+       sha256 = "7feaac7ae76fae615736d9a1577cb26ebd11a9cae48c88235821497fd5dee5f9";
        libraryHaskellDepends = [
-         base data-default-class data-default-instances-base
-         data-default-instances-bytestring
+         base data-default-class data-default-instances-bytestring
          data-default-instances-case-insensitive
          data-default-instances-containers data-default-instances-new-base
          data-default-instances-old-locale data-default-instances-text
@@ -49855,6 +50181,8 @@ self: {
        pname = "data-default-instances-bytestring";
        version = "0.0.1";
        sha256 = "4c431278d0dc1054fd531281db70d8615f88d9b2a29924aba2567fb3cf647220";
+       revision = "1";
+       editedCabalFile = "592075c7d9f5bde9fe98d31dd2b7412cdb4bb29158b49bee04379fe0895aed3e";
        libraryHaskellDepends = [ base bytestring data-default-class ];
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString";
@@ -49868,6 +50196,8 @@ self: {
        pname = "data-default-instances-case-insensitive";
        version = "0.0.1";
        sha256 = "430135708ad9d0730a4c3a3d1eb574bdc6f07547a5a9c5f30202e1e786070ab4";
+       revision = "1";
+       editedCabalFile = "45a89ccc5e4e6dbca37c7c0826c1f1c75d774d49afa9ce94f0412edee53f1371";
        libraryHaskellDepends = [ case-insensitive data-default-class ];
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instance for CI type from case-insensitive package";
@@ -49898,16 +50228,12 @@ self: {
      }) {};
 
   "data-default-instances-new-base" = callPackage
-    ({ mkDerivation, base, data-default-class
-     , data-default-instances-base
-     }:
+    ({ mkDerivation, base, data-default-class }:
      mkDerivation {
        pname = "data-default-instances-new-base";
-       version = "0.0.1";
-       sha256 = "d923d291a26817f2bc54ba110efc8cb1cefcdb17c7a5af8e2d12506c594b7edc";
-       libraryHaskellDepends = [
-         base data-default-class data-default-instances-base
-       ];
+       version = "0.0.2";
+       sha256 = "831df35c14859b066767b56c746611aa9268e6352d2a45f6704d3859bf3ef143";
+       libraryHaskellDepends = [ base data-default-class ];
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for types in newer versions of base package";
        license = stdenv.lib.licenses.bsd3;
@@ -49931,6 +50257,8 @@ self: {
        pname = "data-default-instances-text";
        version = "0.0.1";
        sha256 = "db5d4c46cf36ce5956ffd0affe0f2c48e1c000b9bd61821d3e6c1b0171060cdf";
+       revision = "1";
+       editedCabalFile = "5a8acbe0d420430c2cc2dc7865fa69d179c9ad43dda47aefcc6560fed72e2204";
        libraryHaskellDepends = [ base data-default-class text ];
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for (lazy and strict) Text and Text Builder";
@@ -49944,6 +50272,8 @@ self: {
        pname = "data-default-instances-unordered-containers";
        version = "0.0.1";
        sha256 = "b382a7ea90fd61127782e95fa5e7ee3a17969b762bf0aac4efd15fa7c2552fc0";
+       revision = "1";
+       editedCabalFile = "fc2e79e605ef4fd67f222d11f43aaed40fbc08e3ca421cd29f5982a391f90ebe";
        libraryHaskellDepends = [
          data-default-class unordered-containers
        ];
@@ -49959,6 +50289,8 @@ self: {
        pname = "data-default-instances-vector";
        version = "0.0.1";
        sha256 = "9ac84473a3af8b0c5e795ea5f84a34a0c18c3b2d5e17ce428206203f9d794666";
+       revision = "1";
+       editedCabalFile = "8a78beb491235231802c98fb1a58fea519359be1c9374b9f08d37feed34a385e";
        libraryHaskellDepends = [ data-default-class vector ];
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for types defined in vector package";
@@ -50497,8 +50829,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-msgpack";
-       version = "0.0.8";
-       sha256 = "069552052ce2f62b64621513df5e4eec4a9dc9aa02f28e8095373724fc696ae0";
+       version = "0.0.9";
+       sha256 = "432b1e3f1cfbfe7cb165b139cb7379906b0f3126c381a64160aeb1f393b04b5c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52807,12 +53139,12 @@ self: {
      }) {};
 
   "deque" = callPackage
-    ({ mkDerivation, base-prelude }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "deque";
-       version = "0.1";
-       sha256 = "881f1118d18e1868a04443e2826aede8316a266ad93ce1e00a999834fa028e2d";
-       libraryHaskellDepends = [ base-prelude ];
+       version = "0.2";
+       sha256 = "86768d22492c58b35688c28592b222cb16cc996ca6576b35add9c54a470d3e56";
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nikita-volkov/deque";
        description = "Double-ended queue";
        license = stdenv.lib.licenses.mit;
@@ -53503,6 +53835,8 @@ self: {
        pname = "diagrams-contrib";
        version = "1.4.0.1";
        sha256 = "1194be9ab13c8660ef1c56c35b3a6578953db51e173de96eb8d49603e855750c";
+       revision = "1";
+       editedCabalFile = "58ebbd4d2285416111e8582c133d68ced6ecb5a2a94d5dc07cca899a971b02f8";
        libraryHaskellDepends = [
          base circle-packing colour containers cubicbezier data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -55702,6 +56036,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "distributive_0_5_1" = callPackage
+    ({ mkDerivation, base, base-orphans, directory, doctest, filepath
+     , tagged, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "distributive";
+       version = "0.5.1";
+       sha256 = "8fd0968c19b00b64c8219b81903c72841494460fcf1c10e84fa44f321bb3ae92";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diversity" = callPackage
     ({ mkDerivation, base, containers, data-ordlist, fasta
      , math-functions, MonadRandom, optparse-applicative, parsec, pipes
@@ -57764,8 +58116,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamodb-simple";
-       version = "0.3.0.0";
-       sha256 = "5a1693cacc9d15727b4d0f71cf6015a71e2e5269b8872c9e50016ff6d0f7265b";
+       version = "0.4.0.0";
+       sha256 = "62a0361b19d0929a95d1821f8214aa44a87b7ffe1e0405abd84b4f81fc16ca79";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-dynamodb base bytestring
          conduit containers double-conversion exceptions generics-sop
@@ -58674,6 +59026,8 @@ self: {
        pname = "either";
        version = "4.4.1.1";
        sha256 = "b087cb0fb63fec2fbdcac05fef0d03751daef5deb86cda3c732b9a6a31e634d3";
+       revision = "1";
+       editedCabalFile = "3276aff42f5ede169a424cdfbb69ae3ca7d9d4f95996e679c2d9ea1dae939db1";
        libraryHaskellDepends = [
          base bifunctors exceptions free mmorph monad-control MonadRandom
          mtl profunctors semigroupoids semigroups transformers
@@ -58726,6 +59080,25 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "ekg";
+       version = "0.4.0.12";
+       sha256 = "f30e8c1e76410c3c76ec8cf59f0e1a381a83d302c02b5a95049238aa50eb9844";
+       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-bosun" = callPackage
     ({ mkDerivation, aeson, base, ekg-core, http-client, lens, network
      , network-uri, old-locale, text, time, unordered-containers, vector
@@ -58831,6 +59204,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ekg-json_0_1_0_4" = callPackage
+    ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ekg-json";
+       version = "0.1.0.4";
+       sha256 = "6afc7c146e4891824bb672af94ef3cade56ebf17cc51a3ca9ffdd2ce4345e479";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ekg-log" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, ekg-core
      , fast-logger, filepath, text, time, unix, unordered-containers
@@ -59141,7 +59530,6 @@ self: {
        homepage = "http://github.com/krisajenkins/elm-export";
        description = "A library to generate Elm types from Haskell source";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-export-persistent" = callPackage
@@ -59159,7 +59547,7 @@ self: {
        homepage = "https://github.com/jb55/elm-export-persistent";
        description = "elm-export persistent entities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
   "elm-get" = callPackage
@@ -61143,6 +61531,78 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "eventsource-api" = callPackage
+    ({ mkDerivation, aeson, base, containers, mtl, protolude
+     , unordered-containers, uuid
+     }:
+     mkDerivation {
+       pname = "eventsource-api";
+       version = "1.0.0";
+       sha256 = "3d72797d5d9b81f2f5f1e613d6681983d9fd541a6b5dd773d92b1982ced422e8";
+       libraryHaskellDepends = [
+         aeson base containers mtl protolude unordered-containers uuid
+       ];
+       homepage = "https://github.com/YoEight/eventsource-api#readme";
+       description = "Provides a eventsourcing high level API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "eventsource-geteventstore-store" = callPackage
+    ({ mkDerivation, aeson, base, eventsource-api
+     , eventsource-store-specs, eventstore, mtl, protolude, tasty
+     , tasty-hspec
+     }:
+     mkDerivation {
+       pname = "eventsource-geteventstore-store";
+       version = "1.0.0";
+       sha256 = "d14e33e0f73d2c6344d251253cd9f29551dd08ed627fa9b68845ac8e236dbafb";
+       libraryHaskellDepends = [
+         aeson base eventsource-api eventstore mtl protolude
+       ];
+       testHaskellDepends = [
+         base eventsource-api eventsource-store-specs eventstore protolude
+         tasty tasty-hspec
+       ];
+       homepage = "https://github.com/YoEight/eventsource-api#readme";
+       description = "GetEventStore store implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "eventsource-store-specs" = callPackage
+    ({ mkDerivation, aeson, base, eventsource-api, mtl, protolude
+     , tasty, tasty-hspec, uuid
+     }:
+     mkDerivation {
+       pname = "eventsource-store-specs";
+       version = "1.0.0";
+       sha256 = "11aa3453084571533ae6c7367b2f4e41de7af78f99b4d79e6b9b935dd3399047";
+       libraryHaskellDepends = [
+         aeson base eventsource-api mtl protolude tasty tasty-hspec uuid
+       ];
+       homepage = "https://github.com/YoEight/eventsource-api#readme";
+       description = "Provides common test specification for Store implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "eventsource-stub-store" = callPackage
+    ({ mkDerivation, base, containers, eventsource-api
+     , eventsource-store-specs, mtl, protolude, stm, tasty, tasty-hspec
+     }:
+     mkDerivation {
+       pname = "eventsource-stub-store";
+       version = "1.0.0";
+       sha256 = "6c50fd40a886098fb95f129d4769b68ffe3ffdb9135234d4db921ff6f5d17fef";
+       libraryHaskellDepends = [
+         base containers eventsource-api mtl protolude stm
+       ];
+       testHaskellDepends = [
+         base eventsource-store-specs protolude tasty tasty-hspec
+       ];
+       homepage = "https://github.com/YoEight/eventsource-api#readme";
+       description = "An in-memory stub store implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "eventsourced" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, HUnit, wai
      , wai-extra, warp
@@ -61473,6 +61933,32 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "executable-hash";
+       version = "0.2.0.4";
+       sha256 = "34eaf5662d90d3b7841f66b322ac5bc54900b0e3cb06792852b08b3c05a42ba4";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [
+         base bytestring Cabal cryptohash directory file-embed filepath
+         template-haskell
+       ];
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "executable-path" = callPackage
     ({ mkDerivation, base, directory, filepath, unix }:
      mkDerivation {
@@ -62516,20 +63002,21 @@ self: {
      }) {};
 
   "fast-tags" = callPackage
-    ({ mkDerivation, array, async, base, bytestring, containers, cpphs
-     , deepseq, directory, filepath, mtl, tasty, tasty-hunit, text
-     , utf8-string
+    ({ mkDerivation, alex, array, async, base, bytestring, containers
+     , cpphs, deepseq, directory, filepath, mtl, tasty, tasty-hunit
+     , text, utf8-string
      }:
      mkDerivation {
        pname = "fast-tags";
-       version = "1.2";
-       sha256 = "59033dc40770e9f96207b2ba6b458c68a3138f0102787e4858b71a4299d90eef";
+       version = "1.2.1";
+       sha256 = "6802c0275d28695c475d2cb41c4e2644b04d6f43befff0b6ac950081eb4cc0d3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array async base bytestring containers cpphs deepseq directory
          filepath mtl text utf8-string
        ];
+       libraryToolDepends = [ alex ];
        executableHaskellDepends = [
          async base bytestring containers directory filepath text
        ];
@@ -62746,6 +63233,8 @@ self: {
        pname = "fay";
        version = "0.23.1.16";
        sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64";
+       revision = "2";
+       editedCabalFile = "c164132b3489ae1511bda64e9fb8fde6d05fdc4a1fcc0ff327efd9ce3b1d81ce";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64081,6 +64570,8 @@ self: {
        pname = "find-clumpiness";
        version = "0.2.0.1";
        sha256 = "87db2a011a2662481f59ac03f64e95ef6692519386aee51417c3894c2174da22";
+       revision = "1";
+       editedCabalFile = "8a86eb5b9161789d9cd65fb4d555442e1b1eb89e46ce7f4db928f700f6ee05ef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64726,6 +65217,47 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "flac" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , directory, exceptions, filepath, FLAC, hspec, mtl, temporary
+     , text, transformers, vector, wave
+     }:
+     mkDerivation {
+       pname = "flac";
+       version = "0.1.1";
+       sha256 = "58b7287cb39bdfc39cf7aab95b87d81111234fed502a8d1743ecfbcef001873e";
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class directory exceptions
+         filepath mtl text transformers vector wave
+       ];
+       librarySystemDepends = [ FLAC ];
+       testHaskellDepends = [
+         base bytestring data-default-class directory filepath hspec
+         temporary transformers vector wave
+       ];
+       homepage = "https://github.com/mrkkrp/flac";
+       description = "Complete high-level binding to libFLAC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {FLAC = null;};
+
+  "flac-picture" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, directory
+     , flac, hspec, JuicyPixels, temporary
+     }:
+     mkDerivation {
+       pname = "flac-picture";
+       version = "0.1.0";
+       sha256 = "3c36dff9cebb44502a69e300f233e792900d051bd7eadc2c7390feb53efb3293";
+       libraryHaskellDepends = [ base bytestring flac JuicyPixels ];
+       testHaskellDepends = [
+         base bytestring data-default-class directory flac hspec JuicyPixels
+         temporary
+       ];
+       homepage = "https://github.com/mrkkrp/flac-picture";
+       description = "Support for writing picture to FLAC metadata blocks with JuicyPixels";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "flaccuraterip" = callPackage
     ({ mkDerivation, base, binary, deepseq, HTTP, optparse-applicative
      , process
@@ -65507,6 +66039,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "foldl_1_2_2" = 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foldl-incremental" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, foldl
      , histogram-fill, mwc-random, pipes, QuickCheck, tasty
@@ -65536,14 +66086,14 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-statistics";
-       version = "0.1.4.0";
-       sha256 = "0d800d6202b6411207154f1c7d1be8f77fef7e332ccaf3c486db972c935cf414";
+       version = "0.1.4.1";
+       sha256 = "7abd5ed3ee0295de589484b0973f2531ae1956bf4ec1f237956c046bca106b28";
        libraryHaskellDepends = [
          base foldl math-functions profunctors semigroups
        ];
        testHaskellDepends = [
-         base foldl profunctors quickcheck-instances statistics tasty
-         tasty-quickcheck vector
+         base foldl profunctors quickcheck-instances semigroups statistics
+         tasty tasty-quickcheck vector
        ];
        homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
@@ -66175,10 +66725,8 @@ self: {
      }:
      mkDerivation {
        pname = "foundation";
-       version = "0.0.2";
-       sha256 = "d879240154104273197249b4fbd2bd6d6ad9739166a8a75e9484bf87b6d9388f";
-       revision = "1";
-       editedCabalFile = "171bd233fb790408501779243fdcbc2659911e55e39067efb80254bbcc3781e4";
+       version = "0.0.3";
+       sha256 = "72d7f2af963d42cb7e1164b854978ad3f351175449ba2d27c6b639ffca0b75fa";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -68268,6 +68816,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gegl" = callPackage
+    ({ mkDerivation, babl, base, containers, gegl, glib, inline-c
+     , monad-loops, random, split, template-haskell
+     }:
+     mkDerivation {
+       pname = "gegl";
+       version = "0.0.0.2";
+       sha256 = "475adb9ff07a1e8cc314e441c76e76e46919e842c77ec092b9ed8d7847549e95";
+       libraryHaskellDepends = [
+         babl base containers glib inline-c monad-loops random split
+         template-haskell
+       ];
+       librarySystemDepends = [ gegl ];
+       libraryPkgconfigDepends = [ gegl ];
+       homepage = "https://github.com/nek0/gegl#readme";
+       description = "Haskell bindings to GEGL library";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {inherit (pkgs) gegl;};
+
   "gelatin" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , file-embed, FontyFruity, gl, GLFW-b, JuicyPixels, lens, linear
@@ -69729,11 +70296,14 @@ self: {
      }) {};
 
   "ghc-paths" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, Cabal, directory }:
      mkDerivation {
        pname = "ghc-paths";
        version = "0.1.0.9";
        sha256 = "afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945";
+       revision = "1";
+       editedCabalFile = "b47858cf533ae8d72bd422106bcb9e075ae477ab2e537f59ffe437277840bcef";
+       setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
        description = "Knowledge of GHC's installation directories";
        license = stdenv.lib.licenses.bsd3;
@@ -69791,8 +70361,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-prof";
-       version = "1.2.0";
-       sha256 = "fcc0d06e75b6b753b9edec96cda46a4b67138a7ddd489da55dd351f475c08810";
+       version = "1.3.0.1";
+       sha256 = "8bb866a2389005d91f15a1546ef92e1055b854c9a14dda97d0d92fb0fa598b82";
        libraryHaskellDepends = [
          attoparsec base containers scientific text time
        ];
@@ -70306,6 +70876,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghcjs-vdom" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, ghcjs-base
+     , ghcjs-ffiqq, ghcjs-prim, split, template-haskell
+     }:
+     mkDerivation {
+       pname = "ghcjs-vdom";
+       version = "0.2.0.0";
+       sha256 = "4a53dba09fc79b495f172584d0fa4e60d14453466098d9e221c8f3d0dc5d68c5";
+       libraryHaskellDepends = [
+         base containers ghc-prim ghcjs-base ghcjs-ffiqq ghcjs-prim split
+         template-haskell
+       ];
+       description = "Virtual-dom bindings for GHCJS";
+       license = stdenv.lib.licenses.mit;
+       broken = true;
+     }) {ghcjs-ffiqq = null; ghcjs-prim = null;};
+
   "ghcjs-websockets" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary, bytestring
      , ghcjs-base, text
@@ -70324,6 +70911,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ghcjs-xhr" = callPackage
+    ({ mkDerivation, base, ghcjs-base, text }:
+     mkDerivation {
+       pname = "ghcjs-xhr";
+       version = "0.1.0.0";
+       sha256 = "14e8a6342d2ef912e14cd5a4bdc9f8712a6a92e43b2acc87d8e030085a51d91e";
+       libraryHaskellDepends = [ base ghcjs-base text ];
+       homepage = "https://github.com/tdammers/ghcjs-xhr";
+       description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghclive" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, diagrams-lib, diagrams-svg, directory, file-embed
@@ -71391,6 +71990,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gipeda_0_3_3_0" = 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "giphy-api" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , directory, hspec, http-api-data, http-client, http-client-tls
@@ -71512,25 +72135,24 @@ self: {
      , clientsession, concurrent-output, conduit, conduit-extra
      , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus
      , directory, disk-free-space, dlist, dns, edit-distance, esqueleto
-     , exceptions, fdo-notify, feed, filepath, free, git, gnupg, gnutls
+     , exceptions, fdo-notify, feed, filepath, free, git, gnupg
      , hinotify, hslogger, http-client, http-conduit, http-types, IfElse
      , lsof, magic, MissingH, monad-control, monad-logger, mountpoints
-     , mtl, network, network-info, network-multicast
-     , network-protocol-xmpp, network-uri, old-locale, openssh
-     , optparse-applicative, path-pieces, perl, persistent
-     , persistent-sqlite, persistent-template, process, QuickCheck
-     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
-     , securemem, shakespeare, socks, stm, stm-chans, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-rerun, template-haskell, text, time
-     , torrent, transformers, unix, unix-compat, unordered-containers
-     , utf8-string, uuid, wai, wai-extra, warp, warp-tls, wget, which
-     , xml-types, yesod, yesod-core, yesod-default, yesod-form
-     , yesod-static
+     , mtl, network, network-info, network-multicast, network-uri
+     , old-locale, openssh, optparse-applicative, path-pieces, perl
+     , persistent, persistent-sqlite, persistent-template, process
+     , QuickCheck, random, regex-tdfa, resourcet, rsync, SafeSemaphore
+     , sandi, securemem, shakespeare, socks, stm, stm-chans, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-rerun, template-haskell
+     , text, time, torrent, transformers, unix, unix-compat
+     , unordered-containers, utf8-string, uuid, wai, wai-extra, warp
+     , warp-tls, wget, which, yesod, yesod-core, yesod-default
+     , yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20161210";
-       sha256 = "b568cceda32908e7cd66b34181811d4da3d3197d71009eac20c1c4c4379f6381";
+       version = "6.20170101";
+       sha256 = "5fbf88652a84278275d9d4bec083189f590b045e23a73bfe8d395c3e356e3f53";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -71548,17 +72170,17 @@ self: {
          case-insensitive clientsession concurrent-output conduit
          conduit-extra containers crypto-api cryptonite data-default DAV
          dbus directory disk-free-space dlist dns edit-distance esqueleto
-         exceptions fdo-notify feed filepath free gnutls hinotify hslogger
+         exceptions fdo-notify feed filepath free hinotify hslogger
          http-client http-conduit http-types IfElse magic MissingH
          monad-control monad-logger mountpoints mtl network network-info
-         network-multicast network-protocol-xmpp network-uri old-locale
-         optparse-applicative path-pieces persistent persistent-sqlite
-         persistent-template process QuickCheck random regex-tdfa resourcet
-         SafeSemaphore sandi securemem shakespeare socks stm stm-chans tasty
-         tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time
-         torrent transformers unix unix-compat unordered-containers
-         utf8-string uuid wai wai-extra warp warp-tls xml-types yesod
-         yesod-core yesod-default yesod-form yesod-static
+         network-multicast network-uri old-locale optparse-applicative
+         path-pieces persistent persistent-sqlite persistent-template
+         process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi
+         securemem shakespeare socks stm stm-chans tasty tasty-hunit
+         tasty-quickcheck tasty-rerun template-haskell text time torrent
+         transformers unix unix-compat unordered-containers utf8-string uuid
+         wai wai-extra warp warp-tls yesod yesod-core yesod-default
+         yesod-form yesod-static
        ];
        executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which
@@ -71931,6 +72553,8 @@ self: {
        pname = "github";
        version = "0.15.0";
        sha256 = "f091c35c446619bace51bd4d3831563cccfbda896954ed98d2aed818feead609";
+       revision = "1";
+       editedCabalFile = "d56da89ceea0c330c54b4820d397e3cea2bba43978ca4dfa42bb153459d29f7d";
        libraryHaskellDepends = [
          aeson aeson-compat base base-compat base16-bytestring binary
          binary-orphans byteable bytestring containers cryptohash deepseq
@@ -72003,8 +72627,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-release";
-       version = "0.2.0";
-       sha256 = "847d33683b290360fdaa1a42dcbe5767920392e86abc357973d1e1afd2fac6c8";
+       version = "1.0.1";
+       sha256 = "a0e58b9e855cdf8617ba42436c974776800573951dcf680ec3072651fc10c5b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72463,15 +73087,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "glabrous_0_2_1" = callPackage
+  "glabrous_0_2_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , cereal, cereal-text, directory, either, hspec, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "glabrous";
-       version = "0.2.1";
-       sha256 = "79793394c25a1f7bdb0c57e634a8ad37824a2a108272d521cf9fe78bdf9a70a4";
+       version = "0.2.3";
+       sha256 = "f9e1c11f1702a1710cd172c972d618dcecc62197b7b37f66aa31a2aad45e4bad";
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring cereal cereal-text
          either text unordered-containers
@@ -72570,6 +73194,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gli" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , friendly-time, http-client, http-client-tls, http-conduit
+     , network-uri, optparse-applicative, process, text, time, yaml
+     }:
+     mkDerivation {
+       pname = "gli";
+       version = "0.0.1.1";
+       sha256 = "0f328a32ec9d700fc89d4e517917f5d47053ff822ad3eb29129100cc43f6943b";
+       revision = "1";
+       editedCabalFile = "209b399769c48d612e034f597367705b1cea6a3eccabaf35213af7429e1d273f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring containers friendly-time
+         http-client http-client-tls http-conduit network-uri
+         optparse-applicative process text time yaml
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/goromlagche/gli#readme";
+       description = "Tiny cli to fetch PR info from gitlab";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "glib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , gtk2hs-buildtools, text, utf8-string
@@ -72644,6 +73293,8 @@ self: {
        pname = "glirc";
        version = "2.20.2";
        sha256 = "acefc316a6075dbeb2fa95bf1ee99a8e4c3097eaf5be9273d676719d07a94b00";
+       revision = "1";
+       editedCabalFile = "4eb4ef433d48ddf947ede4423212b39ea82b665e50b17d2a0cf6ac3154cc33dd";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -72821,6 +73472,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gloss_1_10_2_5" = callPackage
+    ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
+     , gloss-rendering, GLUT, OpenGL
+     }:
+     mkDerivation {
+       pname = "gloss";
+       version = "1.10.2.5";
+       sha256 = "e5c7c345892829f72966b5ade73b98702fe3a0c325e27c7b92e24c1a5ddc42c5";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gloss-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, gloss, gloss-rendering }:
      mkDerivation {
@@ -76252,6 +76920,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gopher-proxy" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory, errors
+     , http-types, lucid, mime-types, network, optparse-applicative
+     , text, wai, warp
+     }:
+     mkDerivation {
+       pname = "gopher-proxy";
+       version = "0.1.0.2";
+       sha256 = "6f06b79fb6edf8df020e104feba3db960fc9e6ca4198d860de1702d752053fdd";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base bytestring directory errors http-types lucid
+         mime-types network optparse-applicative text wai warp
+       ];
+       homepage = "https://github.com/sternenseemann/gopher-proxy";
+       description = "proxy gopher over http";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "gopherbot" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-postgresql, MissingH, network
      , parsec, unix
@@ -79363,20 +80051,19 @@ self: {
      }) {};
 
   "hack2-interface-wai" = callPackage
-    ({ mkDerivation, air, base, bytestring, case-insensitive
-     , containers, data-default, hack2, http-types, mtl, network, safe
-     , wai
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , data-default, hack2, http-types, network, safe, wai
      }:
      mkDerivation {
        pname = "hack2-interface-wai";
-       version = "2012.5.25";
-       sha256 = "bcd41cc56d8c21b778083b3efdb34f6d34892b0ee3272c9842e17785c6dadea3";
+       version = "2017.1.4";
+       sha256 = "db7e508b87c8bb0a0b0eb4a00558ca5feadd4ddbf290da5cc5bb3511a37352ea";
        libraryHaskellDepends = [
-         air base bytestring case-insensitive containers data-default hack2
-         http-types mtl network safe wai
+         base bytestring case-insensitive containers data-default hack2
+         http-types network safe wai
        ];
        homepage = "https://github.com/nfjinjing/hack2-interface-wai";
-       description = "Hack2 interface of WAI";
+       description = "Hack2 interface to WAI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -80645,8 +81332,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-sass";
-       version = "0.2.2";
-       sha256 = "14e3076b7921f37ecd0edf736be931536705461b66755387ec7813aa5e3e8302";
+       version = "0.2.3";
+       sha256 = "ebc3abf417733f776e0235573b9b36113c130d0b1e7748361ff0d649bad67422";
        libraryHaskellDepends = [
          aeson-pretty base data-default-class filepath hakyll hsass
        ];
@@ -80767,26 +81454,32 @@ self: {
      }) {};
 
   "halive" = callPackage
-    ({ mkDerivation, base, bin-package-db, containers, directory
-     , filepath, foreign-store, fsnotify, ghc, ghc-paths, process
-     , transformers
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, linear
+     , mtl, process, random, sdl2, signal, stm, text, time, transformers
      }:
      mkDerivation {
        pname = "halive";
-       version = "0.1.0.7";
-       sha256 = "1c0e073e4769fedec470f7518fb1e20eff8d5b7a56fe8a03ec186aaf5ae71398";
+       version = "0.1.2";
+       sha256 = "465255836639653f42763d8b04a39840af35bde77b3cdfc53a419a44a96f902d";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers foreign-store ];
+       libraryHaskellDepends = [
+         base containers directory filepath foreign-store fsnotify ghc
+         ghc-boot ghc-paths mtl process signal stm time transformers
+       ];
        executableHaskellDepends = [
-         base bin-package-db directory filepath fsnotify ghc ghc-paths
-         process transformers
+         base directory filepath fsnotify ghc ghc-paths process stm
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers filepath foreign-store gl linear mtl
+         random sdl2 stm text time
        ];
        homepage = "https://github.com/lukexi/halive";
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
-       broken = true;
-     }) {bin-package-db = null;};
+     }) {};
 
   "halma" = callPackage
     ({ mkDerivation, async, base, containers, data-default
@@ -81242,8 +81935,8 @@ self: {
      }) {};
 
   "happindicator" = callPackage
-    ({ mkDerivation, appindicator, array, base, bytestring, containers
-     , glib, gtk, gtk2hs-buildtools, mtl
+    ({ mkDerivation, array, base, bytestring, containers, glib, gtk
+     , gtk2hs-buildtools, libappindicator-gtk2, mtl
      }:
      mkDerivation {
        pname = "happindicator";
@@ -81252,26 +81945,26 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers glib gtk mtl
        ];
-       libraryPkgconfigDepends = [ appindicator ];
+       libraryPkgconfigDepends = [ libappindicator-gtk2 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {appindicator = null;};
+     }) {inherit (pkgs) libappindicator-gtk2;};
 
   "happindicator3" = callPackage
-    ({ mkDerivation, appindicator, base, glib, gtk3 }:
+    ({ mkDerivation, base, glib, gtk3, libappindicator-gtk3 }:
      mkDerivation {
        pname = "happindicator3";
        version = "0.2.1";
        sha256 = "225156270dc7cb2bb399aee76c9273a62683d8835c7045027a7906a3cf010326";
        libraryHaskellDepends = [ base glib gtk3 ];
-       libraryPkgconfigDepends = [ appindicator ];
+       libraryPkgconfigDepends = [ libappindicator-gtk3 ];
        homepage = "https://github.com/mlacorte/happindicator3";
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {appindicator = null;};
+     }) {inherit (pkgs) libappindicator-gtk3;};
 
   "happraise" = callPackage
     ({ mkDerivation, base, directory, filepath }:
@@ -82437,6 +83130,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hashable_1_2_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
+     , QuickCheck, random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, unix
+     }:
+     mkDerivation {
+       pname = "hashable";
+       version = "1.2.5.0";
+       sha256 = "153eb1614a739f3ccf8c5fcd4230a17b8b24862ab727c46dd4acd22bc15fb2bc";
+       libraryHaskellDepends = [
+         base bytestring ghc-prim integer-gmp text
+       ];
+       testHaskellDepends = [
+         base bytestring ghc-prim HUnit QuickCheck random test-framework
+         test-framework-hunit test-framework-quickcheck2 text unix
+       ];
+       homepage = "http://github.com/tibbe/hashable";
+       description = "A class for types that can be converted to a hash value";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hashable-extras" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, directory, doctest
      , filepath, hashable, transformers, transformers-compat
@@ -82445,6 +83160,8 @@ self: {
        pname = "hashable-extras";
        version = "0.2.3";
        sha256 = "03e0303a50e265d8682402152c90e199d0f4685a1e553bf20a380652d6f06b6a";
+       revision = "1";
+       editedCabalFile = "8d70988312a39286abbbbbcae27964def38ed93ae680fad6c2900d5a962948c7";
        libraryHaskellDepends = [
          base bifunctors bytestring hashable transformers
          transformers-compat
@@ -83947,8 +84664,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-ast";
-       version = "0.4.0.0";
-       sha256 = "467845d216b9f4799c0ab681b2046df5cd410a170b9e6b78cf351b047f5bb70b";
+       version = "0.4.1.0";
+       sha256 = "00aed2236a37a582ff761b0a83946e3bdfa9027098c18d75ad7e34577a775ac5";
        libraryHaskellDepends = [
          base ghc mtl references template-haskell uniplate
        ];
@@ -84019,8 +84736,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-backend-ghc";
-       version = "0.4.0.0";
-       sha256 = "72755148f8866075be70a3b244d451b3f0755e53cc14b94401d7cd3c80dfd279";
+       version = "0.4.1.0";
+       sha256 = "5607c50d38a26db49abd936fee9aac96bf332496bc7cbb9fe20e10bf929e63f6";
        libraryHaskellDepends = [
          base bytestring containers ghc haskell-tools-ast mtl references
          safe split template-haskell transformers uniplate
@@ -84039,8 +84756,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
-       version = "0.4.0.0";
-       sha256 = "0bc38f0d805b3d7bb0f643a83e217d7ff6139bc561c15ad4d8b45e208da9de37";
+       version = "0.4.1.0";
+       sha256 = "43ec482527444bd15382c93a866d50cdde39ecd53968eabc041dcbbc3a55872a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84066,8 +84783,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-daemon";
-       version = "0.4.0.0";
-       sha256 = "a339059dcdcaf2af3d622d61c64c3467e849748d27525d6d66c8e135ed5b5aeb";
+       version = "0.4.1.0";
+       sha256 = "b028a4c3e9a0701e563d1c12b45fe7bfdad1705232f4170cc23632967437de2c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84086,6 +84803,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-debug" = callPackage
+    ({ mkDerivation, base, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-backend-ghc, haskell-tools-prettyprint
+     , haskell-tools-refactor, references
+     }:
+     mkDerivation {
+       pname = "haskell-tools-debug";
+       version = "0.4.1.0";
+       sha256 = "aae428cb78d3923eecdc2a183ed397578b3dc38c29af77bba44dadaf50dd66ef";
+       libraryHaskellDepends = [
+         base ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-refactor references
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Debugging Tools for Haskell-tools";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-tools-demo" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
@@ -84096,8 +84831,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-demo";
-       version = "0.4.0.0";
-       sha256 = "1e52d8e1408323d75fd8f15344328c1f7ea194f7662d632cbb28e384fca05451";
+       version = "0.4.1.0";
+       sha256 = "9a65654bd6d95a6a5ea2ec2ed46a64d2d6aebd74fad864deeda0980b2a50f0e6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84123,8 +84858,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-prettyprint";
-       version = "0.4.0.0";
-       sha256 = "408fca758679e050c8a984e635853d356b9f1c5141add998e3fbf67e24fafbaf";
+       version = "0.4.1.0";
+       sha256 = "9ca7aecc1e36ea004e2017cf5a7afcc9b6ad4300a9efdffcc68275498bb254a7";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast mtl references split uniplate
        ];
@@ -84144,8 +84879,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "0.4.0.0";
-       sha256 = "066cc62a3d553ff7510f64acd4627baa154e65e4d941ac74402aa7b978394c93";
+       version = "0.4.1.0";
+       sha256 = "743e02a1485686df0e6fe6fef2fee473b099cda89323a7b5e35bb9bf17481366";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -84172,8 +84907,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-rewrite";
-       version = "0.4.0.0";
-       sha256 = "a47604c77b77a5ca1ca5ce0c5c517a68d7cdc33d9b056f7fd5f98d3756af61a2";
+       version = "0.4.1.0";
+       sha256 = "bfa733c82af102a594c7c8ce3d044465f02874a685e0b39e8cc48d3659758282";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
          references
@@ -86409,18 +87144,22 @@ self: {
      }) {};
 
   "hburg" = callPackage
-    ({ mkDerivation, array, base, containers, filepath, haskell98, mtl
+    ({ mkDerivation, alex, array, base, containers, filepath, happy
+     , mtl, pretty, utf8-string
      }:
      mkDerivation {
        pname = "hburg";
-       version = "1.1.2";
-       sha256 = "db311af08ba1a90fdb5b8bd66d02ac073e004f19631419da9615165d1f04ed0d";
+       version = "1.1.3";
+       sha256 = "fe1ce07466f899d4149f68fdef21f1969228f8cc7db26f5c23b058c7a4d651ba";
+       revision = "2";
+       editedCabalFile = "c60173c9ea5804ed889632498f121be17ad755fef0486bedf6009bee9538b7ce";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base containers filepath haskell98 mtl
+         array base containers filepath mtl pretty utf8-string
        ];
-       homepage = "http://www.bytelabs.org/hburg.html";
+       executableToolDepends = [ alex happy ];
+       homepage = "https://www.bytelabs.org/project/haskell-bottom-up-rewrite-generator/";
        description = "Haskell Bottom Up Rewrite Generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87342,8 +88081,8 @@ self: {
        pname = "heist";
        version = "1.0.1.0";
        sha256 = "fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb";
-       revision = "1";
-       editedCabalFile = "35cc7972ed625260f5f5885852551b9151cea0fad1c9855af09c5d82e20ae830";
+       revision = "2";
+       editedCabalFile = "17d5d80fc0a124f4e7159d50458067418ee6578484fb71b64f128aecc45cb663";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist filepath hashable
@@ -88096,8 +88835,8 @@ self: {
      }:
      mkDerivation {
        pname = "heterocephalus";
-       version = "1.0.2.0";
-       sha256 = "d0ec193259c06ae95d5e05c17cd42087465e876d04248212d58dc4ccd72004f3";
+       version = "1.0.2.3";
+       sha256 = "653de3568644936d8e011bb329efd763d3b9d9f03101b9cf6486c45532453046";
        libraryHaskellDepends = [
          base blaze-html blaze-markup containers dlist parsec shakespeare
          template-haskell text
@@ -88401,8 +89140,8 @@ self: {
      }:
      mkDerivation {
        pname = "heyefi";
-       version = "1.0.0.0";
-       sha256 = "76faae3d15478468c5c77021e8de886143da550e11e540fbd0e4abf8e1f24886";
+       version = "1.1.0.0";
+       sha256 = "ddbb1e25fd3b46ce1fc867563215392d2a5c0d85f1f7f864d3a3dce36954cc13";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88773,6 +89512,8 @@ self: {
        pname = "hgettext";
        version = "0.1.30";
        sha256 = "26453a4d359c99c41d462db9f8c9144d172523b3fa7076117a877e6c43f3ffdd";
+       revision = "2";
+       editedCabalFile = "b2aff15e79fb791bf70c0d12182e79b7e686b356f0637d9355c4c823c1a9c5c8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90297,8 +91038,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.0.1";
-       sha256 = "835de42bebfbf55a53714c24ea4df31b625ee12f0766aa83aa552ba6c39b7104";
+       version = "1.1";
+       sha256 = "b254b2a3918e047ca031f6dfafc42dd5fcb4b859157fae2d019dcd95262408e5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90337,8 +91078,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-api";
-       version = "1.0";
-       sha256 = "80f4f4eef2c1df68e8013e78a1c5165a0f7c5150f7c4249353698afa078056fd";
+       version = "1.1";
+       sha256 = "182b8bdaf2b4b7d621a8570f0fa81a34de4f34f1a41f8dca6d60c05dd5701b1c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90395,10 +91136,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.1.1";
-       sha256 = "89a1d0846caccdd7a7272821cef105ec6fb405d4b3390b0e335fc036e25c8386";
-       revision = "1";
-       editedCabalFile = "518e975bfd1de87c7cfbbaaa0f710d450e3f5e344725510377cb64abcf11baee";
+       version = "1.1.2";
+       sha256 = "2a224047975e11f7c443c21a8f67bd0b58a058de370a9103ae020d3968450e17";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90444,8 +91183,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-irr";
-       version = "0.1.1.9";
-       sha256 = "76266868cb7a1a82483f1f622b3a5f88bc1d2eec8691f264c12761df74147016";
+       version = "0.1.1.10";
+       sha256 = "98106ff70769503a8056da205dcca59bc8b1fd6b2a9e1e47c56c90a4f373add4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90459,27 +91198,30 @@ self: {
   "hledger-lib" = callPackage
     ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring
      , cmdargs, containers, csv, data-default, Decimal, deepseq
-     , directory, doctest, filepath, Glob, HUnit, megaparsec, mtl
-     , mtl-compat, old-time, parsec, pretty-show, regex-tdfa, safe
-     , semigroups, split, test-framework, test-framework-hunit, text
-     , time, transformers, uglymemo, utf8-string
+     , directory, doctest, filepath, Glob, hashtables, HUnit, megaparsec
+     , mtl, mtl-compat, old-time, parsec, parsers, pretty-show
+     , regex-tdfa, safe, semigroups, split, system-filepath
+     , test-framework, test-framework-hunit, text, time, transformers
+     , trifecta, uglymemo, utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.0.1";
-       sha256 = "9a30c51859a4e75a9d3fdd123cb1d13e250f345911ce2b3acefbd921e4248ac6";
+       version = "1.1";
+       sha256 = "4142142fb92e6c1affc1420e3478449cf0d9d696ab05cc801338a562a5560556";
        libraryHaskellDepends = [
          array base base-compat blaze-markup bytestring cmdargs containers
-         csv data-default Decimal deepseq directory filepath HUnit
-         megaparsec mtl mtl-compat old-time parsec pretty-show regex-tdfa
-         safe semigroups split text time transformers uglymemo utf8-string
+         csv data-default Decimal deepseq directory filepath hashtables
+         HUnit megaparsec mtl mtl-compat old-time parsec parsers pretty-show
+         regex-tdfa safe semigroups split system-filepath text time
+         transformers trifecta uglymemo utf8-string
        ];
        testHaskellDepends = [
          array base base-compat blaze-markup bytestring cmdargs containers
          csv data-default Decimal deepseq directory doctest filepath Glob
-         HUnit megaparsec mtl mtl-compat old-time pretty-show regex-tdfa
-         safe split test-framework test-framework-hunit text time
-         transformers uglymemo utf8-string
+         hashtables HUnit megaparsec mtl mtl-compat old-time parsec parsers
+         pretty-show regex-tdfa safe split system-filepath test-framework
+         test-framework-hunit text time transformers trifecta uglymemo
+         utf8-string
        ];
        homepage = "http://hledger.org";
        description = "Core data types, parsers and functionality for the hledger accounting tools";
@@ -90487,24 +91229,23 @@ self: {
      }) {};
 
   "hledger-ui" = callPackage
-    ({ mkDerivation, ansi-terminal, base, base-compat, brick, cmdargs
-     , containers, data-default, filepath, hledger, hledger-lib, HUnit
-     , megaparsec, microlens, microlens-platform, pretty-show, process
-     , safe, split, text, text-zipper, time, transformers, vector, vty
+    ({ mkDerivation, ansi-terminal, async, base, base-compat, brick
+     , cmdargs, containers, data-default, directory, filepath, fsnotify
+     , hledger, hledger-lib, HUnit, megaparsec, microlens
+     , microlens-platform, pretty-show, process, safe, split, text
+     , text-zipper, time, transformers, vector, vty
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.0.5";
-       sha256 = "ba859b4c1f8199413c30ddc0db2a7e11206d79ae235e6d9005de6d6cc1b98875";
-       revision = "2";
-       editedCabalFile = "6ef7d005fa20fd8c0001944f37f618305af941d1a8bdb91c6a4f2422fa23b69f";
+       version = "1.1";
+       sha256 = "2a059c50a02a360b5fa501fcb4a29ad5197b763a5e38572405a3c3a380cf6ea3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal base base-compat brick cmdargs containers
-         data-default filepath hledger hledger-lib HUnit megaparsec
-         microlens microlens-platform pretty-show process safe split text
-         text-zipper time transformers vector vty
+         ansi-terminal async base base-compat brick cmdargs containers
+         data-default directory filepath fsnotify hledger hledger-lib HUnit
+         megaparsec microlens microlens-platform pretty-show process safe
+         split text text-zipper time transformers vector vty
        ];
        homepage = "http://hledger.org";
        description = "Curses-style user interface for the hledger accounting tool";
@@ -90542,8 +91283,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.0.1";
-       sha256 = "e552af5e781ecc8e46bc7ff5a17333c739b18b9cbdcdca08840703b0b7cc59f8";
+       version = "1.1";
+       sha256 = "da0c0c1096497737540efdc85cbb95cd01cbd48410491d8b2c26529b4151a2ca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90976,8 +91717,8 @@ self: {
     ({ mkDerivation, base, hmatrix, QuadProgpp, vector }:
      mkDerivation {
        pname = "hmatrix-quadprogpp";
-       version = "0.3.0.0";
-       sha256 = "fd11ea7d5dca8e703a5b0b80832883f27d2dd3941d19171b0f05a163d68b31fb";
+       version = "0.3.0.1";
+       sha256 = "b4a9284ad7af2a6f3e4bb57fa38160b2f4131959ff82f7e2ef74a7bdc753d1d4";
        libraryHaskellDepends = [ base hmatrix vector ];
        librarySystemDepends = [ QuadProgpp ];
        description = "Bindings to the QuadProg++ quadratic programming library";
@@ -91246,6 +91987,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mpfr;};
 
+  "hmpfr_0_4_2_1" = callPackage
+    ({ mkDerivation, base, integer-gmp, mpfr }:
+     mkDerivation {
+       pname = "hmpfr";
+       version = "0.4.2.1";
+       sha256 = "ccb27dec6053e05b58ba6c1b27373ed78fb91ee0792c08158c59eec409ac0a11";
+       libraryHaskellDepends = [ base integer-gmp ];
+       librarySystemDepends = [ mpfr ];
+       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
     ({ mkDerivation, array, base, bytestring, colour, containers
      , data-ordlist, directory, filepath, lazy-csv, logict
@@ -92154,23 +92909,23 @@ self: {
      , conduit-extra, connection, containers, deepseq, directory, extra
      , filepath, haskell-src-exts, http-conduit, http-types, js-flot
      , js-jquery, mmap, network, network-uri, old-locale, process
-     , QuickCheck, resourcet, tar, template-haskell, text, time
-     , transformers, uniplate, utf8-string, vector, wai, wai-logger
-     , warp, warp-tls, zlib
+     , process-extras, QuickCheck, resourcet, tar, template-haskell
+     , text, time, transformers, uniplate, utf8-string, vector, wai
+     , wai-logger, warp, warp-tls, zlib
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.7";
-       sha256 = "a6ef18db8d3e10707771c216af33e166130ba664eae380b060a1669e44454409";
+       version = "5.0.8";
+       sha256 = "a5096f5a5786a654a7fd7eb8b019899056c70f51c3fe207df67ecd1c83400dd5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base binary bytestring cmdargs conduit conduit-extra
          connection containers deepseq directory extra filepath
          haskell-src-exts http-conduit http-types js-flot js-jquery mmap
-         network network-uri old-locale process QuickCheck resourcet tar
-         template-haskell text time transformers uniplate utf8-string vector
-         wai wai-logger warp warp-tls zlib
+         network network-uri old-locale process process-extras QuickCheck
+         resourcet tar template-haskell text time transformers uniplate
+         utf8-string vector wai wai-logger warp warp-tls zlib
        ];
        executableHaskellDepends = [ base ];
        testTarget = "--test-option=--no-net";
@@ -97971,6 +98726,8 @@ self: {
        pname = "http-api-data";
        version = "0.3.3";
        sha256 = "cb3d7ef8a924a6b03481b7c5e26a580df72cbf89f2e8247e825f43f4b3ba8449";
+       revision = "1";
+       editedCabalFile = "1b9b0887231d162187782afe3fa8e5483b896fafd8772bc22203027ae87bc48c";
        libraryHaskellDepends = [
          base bytestring containers hashable text time time-locale-compat
          unordered-containers uri-bytestring uuid-types
@@ -99343,6 +100100,37 @@ self: {
        broken = true;
      }) {hunt-client = null;};
 
+  "hup" = callPackage
+    ({ mkDerivation, base, bytestring, cmdargs, directory, doctest
+     , filepath, Glob, hspec, hspec-wai, http-client, http-client-tls
+     , http-types, mtl, QuickCheck, shelly, simple, split, tagsoup, tar
+     , temporary, text, transformers, wai, wai-extra, zlib
+     }:
+     mkDerivation {
+       pname = "hup";
+       version = "0.2.0.0";
+       sha256 = "add1d919aa2a1fd1ea914cd92c4ac3a5b24f9291a336393fd44f5b53052898ae";
+       revision = "1";
+       editedCabalFile = "a9563b96beaf19663d3878e50ae4f2b3ad37b3ebf154f32366da2e4f34f8d091";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring directory filepath http-client http-client-tls
+         http-types mtl split tar zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs directory mtl shelly tagsoup text
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring doctest filepath Glob hspec hspec-wai http-client
+         http-types QuickCheck simple temporary transformers wai wai-extra
+       ];
+       homepage = "https://github.com/phlummox/hup";
+       description = "Upload packages or documentation to a hackage server";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "hurdle" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, kangaroo }:
      mkDerivation {
@@ -100015,6 +100803,8 @@ self: {
        pname = "hworker";
        version = "0.1.0.1";
        sha256 = "34cbcc4db8f190ab0dc02a072adcf1fc75b7beab7e545982872bf265a1223f1d";
+       revision = "1";
+       editedCabalFile = "c5f32a8283ca858e67b2a49a51c41b36aa661228eca1bc6fc4c22293ddbe4b70";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hedis text time uuid
        ];
@@ -100036,6 +100826,8 @@ self: {
        pname = "hworker-ses";
        version = "0.1.1.0";
        sha256 = "dd5330691585b39ff0ddba8eb7edd2129a5610bae8a0493c2855f2786a3581c7";
+       revision = "1";
+       editedCabalFile = "884c06fd223afeaf51e216d500ad6350c7c8a4fe11e826b6a6191e5c10927f6d";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-ses base hworker lens text
          time unordered-containers
@@ -103415,8 +104207,8 @@ self: {
        pname = "insert-ordered-containers";
        version = "0.2.0.0";
        sha256 = "0353fcf5c58e9ed3fe33ddc3f57bfb2faccaa4d61fbf832f7fc2bfbe2c30d02e";
-       revision = "3";
-       editedCabalFile = "66f19e15a4787bbad6c85303e5ae7ba0912d2db8b18b500e5e6e437156e53d2a";
+       revision = "4";
+       editedCabalFile = "b4b8544fe733ff569ff0f726a632c9c10831f3c7bff804ec5d75f62225363fa5";
        libraryHaskellDepends = [
          aeson base base-compat hashable lens semigroupoids semigroups text
          transformers unordered-containers
@@ -103646,6 +104438,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "integer-logarithms" = callPackage
+    ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
+     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "integer-logarithms";
+       version = "1";
+       sha256 = "9a34b7a9ea6cf0e760159913f41305f786fd027efce3c4e4fe700c2a46cf103c";
+       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";
+       description = "Integer logarithms";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "integer-pure" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -104025,8 +104836,8 @@ self: {
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.0.2.0";
-       sha256 = "21cab2d2d744ace03a892f06970db52f9f12294b9e04aa8dfca1c91d3ccef1c4";
+       version = "0.0.2.2";
+       sha256 = "9dc34d967b510b6022f55a4a653a13fcf36513ba753d5b3f8a156d88060e5611";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
          hashable mtl safe string-conversions tagged text transformers
@@ -104037,6 +104848,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "intro-prelude" = callPackage
+    ({ mkDerivation, intro }:
+     mkDerivation {
+       pname = "intro-prelude";
+       version = "0.1.0.0";
+       sha256 = "602df3463f556cfff5b3784b7b49f0548768f11e7651175fae1028f4565faaba";
+       libraryHaskellDepends = [ intro ];
+       testHaskellDepends = [ intro ];
+       doHaddock = false;
+       homepage = "https://github.com/minad/intro-prelude#readme";
+       description = "Intro reexported as Prelude";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "introduction" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , exceptions, filepath, ghc-prim, lifted-base, monad-control, mtl
@@ -104481,6 +105306,8 @@ self: {
        pname = "ip6addr";
        version = "0.5.2";
        sha256 = "ad460bf7d2765aa050968154188ba51a1b8483b6a27b179042528058b0e9549f";
+       revision = "1";
+       editedCabalFile = "f59669c0e8198ef3c56ecff75b7304d379fc1bbd5485114e3be6774d0d07037c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs IPv6Addr text ];
@@ -104732,6 +105559,26 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "irc-conduit";
+       version = "0.2.2.0";
+       sha256 = "b66e058a66e9cd782f065be6b100bb80157c55d733db6691112a70e9aab13065";
+       libraryHaskellDepends = [
+         async base bytestring conduit conduit-extra connection irc irc-ctcp
+         network-conduit-tls profunctors 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-core" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
      , hashable, HUnit, primitive, text, time, vector
@@ -105674,6 +106521,8 @@ self: {
        pname = "ixmonad";
        version = "0.57";
        sha256 = "f354ef7938e3e5d91dd0af3d422081ca78c396f0063f2dc97a864b73537718cd";
+       revision = "1";
+       editedCabalFile = "589fe683da9065a906b2f156d8335050fc9de4c1514a6582c88a0d12c3c68b18";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
@@ -106263,8 +107112,8 @@ self: {
      }:
      mkDerivation {
        pname = "jni";
-       version = "0.2.2";
-       sha256 = "67c1dc21d8f8a3d85e7b4ced2834d1bac4857e9102bb39f3c9d78618c1e72ea4";
+       version = "0.2.3";
+       sha256 = "ba48cfc823de07255421301a02248043bccaf8201d1bc6a7956b86f6c972c904";
        libraryHaskellDepends = [
          base bytestring containers inline-c singletons thread-local-storage
        ];
@@ -106577,8 +107426,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-warp";
-       version = "0.8.0.0";
-       sha256 = "468f4748bdbeb8cf86054ef61260152ce0ef41c23cd2f10d9bb50dbe8732ba50";
+       version = "0.8.2.0";
+       sha256 = "e9616e7bedb12c1b37ab1e82c065d7b6de6f341ec4cb01748e623a583c834f11";
        libraryHaskellDepends = [
          aeson base containers http-types jsaddle stm text time transformers
          wai wai-websockets warp websockets
@@ -106599,8 +107448,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-webkit2gtk";
-       version = "0.8.1.0";
-       sha256 = "f21e613da36ad510fce1d609eef6a966e11da97a35bdf81ce7924bca56729da6";
+       version = "0.8.2.1";
+       sha256 = "01cf836ba8aa03d4d2cba539156ac0051c651fc7ec77b53eb20a41b3b445a606";
        libraryHaskellDepends = [
          aeson base bytestring directory gi-gio gi-glib gi-gtk
          gi-javascriptcore gi-webkit2 haskell-gi-base jsaddle text unix
@@ -106618,8 +107467,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-webkitgtk";
-       version = "0.8.1.0";
-       sha256 = "baa5ecd99c21046cbe5fe2126d4b072a12419aaf03eb1adf8b97b620c7760437";
+       version = "0.8.2.1";
+       sha256 = "e4cfcdf07d34f5b8fb00c747097830c9338e9f0c43c9a69bad10511e72ff2132";
        libraryHaskellDepends = [
          aeson base bytestring directory gi-glib gi-gtk gi-javascriptcore
          gi-webkit haskell-gi-base jsaddle text unix
@@ -106634,8 +107483,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, jsaddle }:
      mkDerivation {
        pname = "jsaddle-wkwebview";
-       version = "0.8.1.0";
-       sha256 = "10371cdff510c0229a34def4038e9d8e9e796d0a891b2a424b0e8a05b481d3a0";
+       version = "0.8.2.0";
+       sha256 = "aa7968119b68ed7166482f2bfb217e942fbd2ead932fc2f349894fa149d2dfb6";
        libraryHaskellDepends = [ aeson base bytestring jsaddle ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
@@ -107943,8 +108792,8 @@ self: {
        pname = "kansas-comet";
        version = "0.4";
        sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1";
-       revision = "8";
-       editedCabalFile = "d35522fe047447685a0028216de02d88ddd4706fe025bb1266ffda61df31a988";
+       revision = "9";
+       editedCabalFile = "6b788670bd0b22096693d6fca5770c5522bc3c89c9ca12123034f7957172a38a";
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
          transformers unordered-containers
@@ -109597,18 +110446,20 @@ self: {
      }) {};
 
   "lambda-calculator" = callPackage
-    ({ mkDerivation, base, hspec, HUnit, parsec, Shellac
-     , Shellac-readline
+    ({ mkDerivation, base, hlint, hspec, HUnit, optparse-applicative
+     , parsec, Shellac, Shellac-readline
      }:
      mkDerivation {
        pname = "lambda-calculator";
-       version = "1.0.0";
-       sha256 = "c0010570a3f90cd6eb74b36e6787eb19a01f49005fe24de72ca957406909dc86";
+       version = "1.1.1";
+       sha256 = "9dec187ddefcf7276e845a50f3dc74a61ab4347c196d8f8165b1ddfa2f2dcc84";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec ];
-       executableHaskellDepends = [ base Shellac Shellac-readline ];
-       testHaskellDepends = [ base hspec HUnit ];
+       executableHaskellDepends = [
+         base optparse-applicative Shellac Shellac-readline
+       ];
+       testHaskellDepends = [ base hlint hspec HUnit ];
        homepage = "https://github.com/sgillespie/lambda-calculus#readme";
        description = "A lambda calculus interpreter";
        license = stdenv.lib.licenses.mit;
@@ -109658,8 +110509,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, read-bounded }:
      mkDerivation {
        pname = "lambda-options";
-       version = "0.9.0.0";
-       sha256 = "440852153cc682a7eb056b71713ea299329acbaeab8ecd5a422b89ebc831e976";
+       version = "0.9.0.1";
+       sha256 = "50684829a88a83492caa34eeddce64bb33fed56dad683f8454ddb03afbd4049b";
        libraryHaskellDepends = [ base containers mtl read-bounded ];
        homepage = "https://github.com/thomaseding/lambda-options";
        description = "A modern command-line parser for Haskell";
@@ -111974,8 +112825,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion";
-       version = "0.8.0.1";
-       sha256 = "5756a0ca948e17db7d6d5a904e2e444c9f0e74108e2a5ed139453a650e84f7f7";
+       version = "0.8.0.3";
+       sha256 = "eaa865b6ded7ecb0110298a61a5768fce49e3ef270e5a45db6a0cc2d2a7ba166";
        libraryHaskellDepends = [
          aeson attoparsec base binary binary-conduit bytestring
          canteven-http conduit conduit-extra containers data-default-class
@@ -111992,26 +112843,27 @@ self: {
   "legion-discovery" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, Cabal
      , canteven-http, canteven-log, conduit, containers
-     , data-default-class, graphviz, http-types, legion, legion-extra
-     , monad-logger, scotty, scotty-format, scotty-resource, SHA, text
-     , time, transformers, wai, wai-extra, warp
+     , data-default-class, ekg, graphviz, http-types, legion
+     , legion-extra, monad-logger, scotty, scotty-format
+     , scotty-resource, SHA, text, time, transformers, wai, wai-extra
+     , warp
      }:
      mkDerivation {
        pname = "legion-discovery";
-       version = "0.2.2.1";
-       sha256 = "5338e9ffb14ced8f1ec8bde7c9138e769ef643da8930937fc79cdbac970d6096";
+       version = "0.3.0.0";
+       sha256 = "a5bcbbcaec065c4f833b51c05e0379bce3e1f22ca70585b63878ef57dbabfc61";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring Cabal canteven-http
-         canteven-log conduit containers data-default-class graphviz
+         canteven-log conduit containers data-default-class ekg graphviz
          http-types legion legion-extra monad-logger scotty scotty-format
          scotty-resource SHA text time transformers wai wai-extra warp
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/owensmurray/legion-discovery#readme";
-       description = "Initial project template from stack";
+       description = "A discovery service based on Legion";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -112019,15 +112871,16 @@ self: {
   "legion-discovery-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , data-default-class, http-client, http-types, load-balancing
-     , network, text
+     , network, resourcet, text, transformers
      }:
      mkDerivation {
        pname = "legion-discovery-client";
-       version = "0.1.0.2";
-       sha256 = "d9f8b1f24d90b3711ec81555c21e722280bcb59914c2341bb89e21f9b699dd5d";
+       version = "0.1.0.3";
+       sha256 = "4fd1c98dcade6f1251418f14537df3cffb4af814eca8074f7a06e0efdd67189b";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers data-default-class
-         http-client http-types load-balancing network text
+         http-client http-types load-balancing network resourcet text
+         transformers
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/owensmurray/legion-discovery-client#readme";
@@ -112501,8 +113354,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.0.6.0";
-       sha256 = "9a55ddd34f6e41ba274fa1b303262dc883868ffcb0e24810b432441e5ebe220a";
+       version = "1.0.7.0";
+       sha256 = "582a1191b8ac60a4a50fa9361a48f0fe58686ab94db7dbc13bee07e57a20e615";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -117163,6 +118016,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lz4-conduit" = callPackage
+    ({ mkDerivation, base, binary, bytestring, bytestring-arbitrary
+     , conduit, conduit-extra, mtl, QuickCheck, resourcet
+     }:
+     mkDerivation {
+       pname = "lz4-conduit";
+       version = "0.2";
+       sha256 = "7586c2a0c1a4355ea44c069eb19a5c23cdb9c94034fd182e31d638a43a1bf4a3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring conduit mtl resourcet
+       ];
+       executableHaskellDepends = [
+         base conduit conduit-extra resourcet
+       ];
+       testHaskellDepends = [
+         base bytestring bytestring-arbitrary conduit QuickCheck resourcet
+       ];
+       homepage = "https://github.com/bigmac2k/lz4-conduit";
+       description = "LZ4 compression for conduits";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lzma" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, lzma, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
@@ -117261,6 +118138,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mDNSResponder-client" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, ctrie, data-endian
+     , network, network-msg, transformers
+     }:
+     mkDerivation {
+       pname = "mDNSResponder-client";
+       version = "1.0.1";
+       sha256 = "205820b45d91f0459fa3a810bfdb5691249d3275e95abf9d75aec69e2285e1c8";
+       libraryHaskellDepends = [
+         base bytestring ctrie data-endian network network-msg transformers
+       ];
+       testHaskellDepends = [ base bytestring Cabal ];
+       homepage = "https://github.com/obsidiansystems/mDNSResponder-client";
+       description = "Library for talking to the mDNSResponder daemon";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "maam" = callPackage
     ({ mkDerivation, base, containers, template-haskell, text, vector
      }:
@@ -118227,7 +119121,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "mandrill_0_5_3_0" = callPackage
+  "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
@@ -118236,8 +119130,8 @@ self: {
      }:
      mkDerivation {
        pname = "mandrill";
-       version = "0.5.3.0";
-       sha256 = "b022383dfbae3b6281a216924f508d9651849250a6dcadcedc9c30465fc5160d";
+       version = "0.5.3.1";
+       sha256 = "a559a166232461520f4fbb0637db9f922a82fdff819e9e35ee7b0941a7c0c315";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
          email-validate http-client http-client-tls http-types lens mtl
@@ -118740,6 +119634,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "marvin-interpolate" = callPackage
+    ({ mkDerivation, base, haskell-src-meta, hspec, mtl, parsec
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "marvin-interpolate";
+       version = "0.3.0";
+       sha256 = "053a9fa6ada9b29a18d8e6d7da51b9ee4bc440cd53c6882eb6dc05f425022d85";
+       libraryHaskellDepends = [
+         base haskell-src-meta mtl parsec template-haskell text
+       ];
+       testHaskellDepends = [ base hspec text ];
+       homepage = "http://marvin.readthedocs.io/en/latest/interpolation.html";
+       description = "Compile time string interpolation a la Scala and CoffeeScript";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "marxup" = callPackage
     ({ mkDerivation, base, configurator, containers, directory, dlist
      , filepath, haskell-src-exts, labeled-tree, lens, lp-diagrams, mtl
@@ -120156,6 +121067,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "metrics_0_4_0_1" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
+     , HUnit, lens, mwc-random, primitive, QuickCheck, text, time
+     , transformers, transformers-base, unix-compat
+     , unordered-containers, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "metrics";
+       version = "0.4.0.1";
+       sha256 = "db18eddaa43b81c33c925bf467010e5b9088d55fe5d7b364466a3459543cc7e7";
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring containers lens mwc-random primitive
+         text time transformers transformers-base unix-compat
+         unordered-containers vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         async base HUnit lens mwc-random primitive QuickCheck
+       ];
+       description = "High-performance application metric tracking";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "metricsd-client" = callPackage
     ({ mkDerivation, base, network }:
      mkDerivation {
@@ -120343,6 +121277,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "microlens-aeson_2_1_1_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
+     , scientific, tasty, tasty-hunit, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "microlens-aeson";
+       version = "2.1.1.2";
+       sha256 = "f1295f2b6b4db3118b445551ae585650e9ddb2d40bd50194514e478710840f79";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring microlens scientific text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring microlens tasty tasty-hunit text
+         unordered-containers vector
+       ];
+       homepage = "http://github.com/fosskers/microlens-aeson/";
+       description = "Law-abiding lenses for Aeson, using microlens";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-contra" = callPackage
     ({ mkDerivation, base, contravariant, microlens }:
      mkDerivation {
@@ -120431,6 +121388,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-th_0_4_1_1" = callPackage
+    ({ mkDerivation, base, containers, microlens, template-haskell }:
+     mkDerivation {
+       pname = "microlens-th";
+       version = "0.4.1.1";
+       sha256 = "5b1a400db8577805d80fb83963ef2a41cf43023b38300fdeaacb01a4fb526a7b";
+       libraryHaskellDepends = [
+         base containers microlens template-haskell
+       ];
+       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
     ({ mkDerivation, aeson, base, containers, hspec, text, text-format
      , time, transformers
@@ -125428,7 +126400,6 @@ self: {
        homepage = "https://github.com/paul-rouse/mysql";
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mysql;};
 
   "mysql-effect" = callPackage
@@ -125938,8 +126909,8 @@ self: {
      }:
      mkDerivation {
        pname = "nanovg";
-       version = "0.5.1.0";
-       sha256 = "2e76eaf2b3814d5651a6c13bea84c561d416d0138303cd3826ed89a399c6e437";
+       version = "0.5.2.0";
+       sha256 = "22e31d227770e55123aadb2750c35895f4d635327c7be1ef1ea2655d86180f5d";
        libraryHaskellDepends = [ base bytestring containers text vector ];
        librarySystemDepends = [ freeglut GLEW mesa ];
        libraryToolDepends = [ c2hs ];
@@ -126049,8 +127020,8 @@ self: {
      }:
      mkDerivation {
        pname = "nats-queue";
-       version = "0.1.2.1";
-       sha256 = "278abe19802ac26b2a720ad9bab84c9ce74f348eabff55ee96e67286f5453ca3";
+       version = "0.1.2.2";
+       sha256 = "f2b59d789feb12d0192a63227b5a114a353c21214276f3478474c561a0b9f5ed";
        libraryHaskellDepends = [
          aeson async base bytestring containers dequeue network network-uri
          random text
@@ -126610,6 +127581,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "netease-fm" = callPackage
+    ({ mkDerivation, aeson, async, base, base64-bytestring, brick
+     , bytestring, containers, cryptonite, data-default-class, directory
+     , exceptions, http-client, http-client-tls, http-types, memory, mtl
+     , parsec, process, random, stm, text, time, transformers, vector
+     , vty
+     }:
+     mkDerivation {
+       pname = "netease-fm";
+       version = "1.2.2";
+       sha256 = "a9052877b00ae471603960e2043302ceb9dfc4ca0f64550966de0ab10053aab6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base base64-bytestring bytestring cryptonite
+         data-default-class directory exceptions http-client http-client-tls
+         http-types memory mtl parsec process random stm text time
+         transformers vector
+       ];
+       executableHaskellDepends = [
+         base brick containers data-default-class directory mtl process
+         random stm transformers vty
+       ];
+       homepage = "http://github.com/foreverbell/netease-fm#readme";
+       description = "NetEase Cloud Music FM client in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "netlines" = callPackage
     ({ mkDerivation, base, bytestring, contstuff, enumerator, HTF
      , random, text, time
@@ -127862,6 +128861,55 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "neural-network-base" = callPackage
+    ({ mkDerivation, base, constraints }:
+     mkDerivation {
+       pname = "neural-network-base";
+       version = "0.1.0.0";
+       sha256 = "6dd5e69d4e1c74f4df8a541f58051c14338b7fe7e95d41ca1b7cca58f1f0afde";
+       libraryHaskellDepends = [ base constraints ];
+       homepage = "https://github.com/pierric/neural-network";
+       description = "Yet Another High Performance and Extendable Neural Network in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "neural-network-blashs" = callPackage
+    ({ mkDerivation, base, blas-hs, constraints, ghc-prim, hmatrix
+     , hspec, mtl, mwc-random, neural-network-base, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "neural-network-blashs";
+       version = "0.1.0.0";
+       sha256 = "a597ce92cbae408fbe1154da0d98b515108c4c6d8973900697b242323691d40a";
+       libraryHaskellDepends = [
+         base blas-hs constraints ghc-prim mtl mwc-random
+         neural-network-base vector
+       ];
+       testHaskellDepends = [
+         base blas-hs hmatrix hspec neural-network-base QuickCheck vector
+       ];
+       homepage = "https://github.com/pierric/neural-network";
+       description = "Yet Another High Performance and Extendable Neural Network in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "neural-network-hmatrix" = callPackage
+    ({ mkDerivation, base, blas, deepseq, hmatrix, hmatrix-gsl, mtl
+     , mwc-random, neural-network-base, parallel, vector
+     }:
+     mkDerivation {
+       pname = "neural-network-hmatrix";
+       version = "0.1.0.0";
+       sha256 = "b4db8f621dcabd8aa6dbd4828b7a682fb2af0856c8669b3bd1f8db8214944861";
+       libraryHaskellDepends = [
+         base deepseq hmatrix hmatrix-gsl mtl mwc-random neural-network-base
+         parallel vector
+       ];
+       librarySystemDepends = [ blas ];
+       description = "Yet Another High Performance and Extendable Neural Network in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) blas;};
+
   "newports" = callPackage
     ({ mkDerivation, base, directory, old-time }:
      mkDerivation {
@@ -129503,15 +130551,17 @@ self: {
      }) {};
 
   "obdd" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, process, random }:
+    ({ mkDerivation, array, base, containers, ersatz, mtl
+     , process-extras, random, text
+     }:
      mkDerivation {
        pname = "obdd";
-       version = "0.6.1";
-       sha256 = "0db47df8588a5ffd6a925cf4d21c3e313aac9ec8ced2461dfddbfafb38ba1053";
+       version = "0.8.1";
+       sha256 = "424ea2a11af22e0fe640b66af177b355024acabf99a1ee63d27b16e3355e8e11";
        libraryHaskellDepends = [
-         array base containers mtl process random
+         array base containers ersatz mtl process-extras random text
        ];
-       testHaskellDepends = [ array base containers ];
+       testHaskellDepends = [ array base containers text ];
        homepage = "https://github.com/jwaldmann/haskell-obdd";
        description = "Ordered Reduced Binary Decision Diagrams";
        license = "GPL";
@@ -129640,15 +130690,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "octane_0_18_1" = callPackage
+  "octane_0_18_2" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
      , data-default-class, file-embed, http-client, http-client-tls
      , overloaded-records, rattletrap, text
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.18.1";
-       sha256 = "0531b90b093b4e89f183801cdf7c4220adf7c118d90aba00db2968d3e0b7604b";
+       version = "0.18.2";
+       sha256 = "4fcd5e5f2b01eee2e382bdf701617129500cce1d4302fa265d52c15edcfa34a0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130114,13 +131164,15 @@ self: {
      }) {};
 
   "one-liner" = callPackage
-    ({ mkDerivation, base, contravariant, ghc-prim, transformers }:
+    ({ mkDerivation, base, contravariant, ghc-prim, profunctors
+     , transformers
+     }:
      mkDerivation {
        pname = "one-liner";
-       version = "0.5.2";
-       sha256 = "9b2332118fd4e8ce127b11989b73af2a9812c98bbf1e2dfa762c718561b6df79";
+       version = "0.6";
+       sha256 = "40b4ed5de04d7f32a1297c33eedc971abd0652c156cfb89172fbeccdeda1e17f";
        libraryHaskellDepends = [
-         base contravariant ghc-prim transformers
+         base contravariant ghc-prim profunctors transformers
        ];
        homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
@@ -131505,13 +132557,13 @@ self: {
      }:
      mkDerivation {
        pname = "order-maintenance";
-       version = "0.1.1.1";
-       sha256 = "9b00674ed6902afcc455a1a2fce9c1b919a4c3b5ef5ec299726447137a25934c";
+       version = "0.2.1.0";
+       sha256 = "c959d8aa67f1cf47e15adfe650ba864f590deef451485e2048ebbe64a77a4b39";
        libraryHaskellDepends = [ base containers transformers ];
        testHaskellDepends = [
          base Cabal cabal-test-quickcheck containers QuickCheck transformers
        ];
-       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/order-maintenance";
+       homepage = "http://hackage.haskell.org/package/order-maintenance";
        description = "Algorithms for the order maintenance problem with a safe interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131861,6 +132913,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "overload" = callPackage
+    ({ mkDerivation, base, simple-effects, template-haskell }:
+     mkDerivation {
+       pname = "overload";
+       version = "0.1.0.0";
+       sha256 = "ed48aa71ec612bb280529f26e94f0babe5ca346be3bf0a2cbd34a22d25308322";
+       libraryHaskellDepends = [ base simple-effects template-haskell ];
+       homepage = "https://gitlab.com/LukaHorvat/overload";
+       description = "Finite overloading";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "overloaded-records" = callPackage
     ({ mkDerivation, base, data-default-class, HUnit, template-haskell
      , test-framework, test-framework-hunit
@@ -132355,8 +133419,8 @@ self: {
        pname = "pandoc";
        version = "1.19.1";
        sha256 = "9d22db0a1536de0984f4a605f1a28649e68d540e6d892947d9644987ecc4172a";
-       revision = "1";
-       editedCabalFile = "6db38c75bdb36377e1424b91b2662205dbe54152995a08ab83127bfb17ee027b";
+       revision = "2";
+       editedCabalFile = "6282ee80ee941d2c5582eb81a0c269df6e0d9267912fc85f00b40b5ec35a472c";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -132400,6 +133464,8 @@ self: {
        pname = "pandoc-citeproc";
        version = "0.10.3";
        sha256 = "2f6233ff91a9fb08edfb0ac2b4ec40729d87590a7c557d0452674dd3c7df4d58";
+       revision = "1";
+       editedCabalFile = "aacaeb9d3fbf64d0bf21ff2f7cd6becc58160c9bcf2923431fe78d19eaf1aeb3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132623,6 +133689,8 @@ self: {
        pname = "pandoc-types";
        version = "1.17.0.4";
        sha256 = "531996e547714e34a2e4134e9e80dad9929bbc6814ebb5515f95538fa76c3f74";
+       revision = "1";
+       editedCabalFile = "9ede2044ebbf4fbb7e8244d7f458988178d7bad81e566e8c8a2bc1793ee3d27d";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
        ];
@@ -132847,6 +133915,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "paphragen" = callPackage
+    ({ mkDerivation, base, bytestring, containers }:
+     mkDerivation {
+       pname = "paphragen";
+       version = "0.2.0.0";
+       sha256 = "b892b2e8cbeafe41b8c7dcdfd39c46c5049c99f02ccd3ff6dfb09d623a58fc7e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base bytestring containers ];
+       description = "A passphrase generator";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "papillon" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, monads-tf
      , template-haskell, transformers
@@ -133862,6 +134943,8 @@ self: {
        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
@@ -133872,6 +134955,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path-io_1_2_1" = callPackage
+    ({ mkDerivation, base, containers, directory, exceptions, filepath
+     , hspec, path, temporary, time, transformers, unix-compat
+     }:
+     mkDerivation {
+       pname = "path-io";
+       version = "1.2.1";
+       sha256 = "41582c65c6ceb05522bbacb0fc242f542d1e42e61bc5c9858b9153e8c334339f";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "path-pieces" = callPackage
     ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }:
      mkDerivation {
@@ -134055,6 +135157,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "paypal-rest-client" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, country-codes
+     , Decimal, http-client, http-types, lens, safe, text, time, wreq
+     }:
+     mkDerivation {
+       pname = "paypal-rest-client";
+       version = "0.1.0";
+       sha256 = "a39bac4d5929b4fa26f41698d252edd2ae584d1191746dafa65a84cf15ef01d9";
+       libraryHaskellDepends = [
+         aeson base bytestring containers country-codes Decimal http-client
+         http-types lens safe text time wreq
+       ];
+       homepage = "https://github.com/meoblast001/paypal-rest-client";
+       description = "A client to connect to PayPal's REST API (v1)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pb" = callPackage
     ({ mkDerivation, base, containers, HTTP, network, process }:
      mkDerivation {
@@ -134277,15 +135396,13 @@ self: {
   "pdf-slave" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , containers, exceptions, haskintex, HaTeX, optparse-applicative
-     , pdf-slave-template, shelly, system-filepath, text
+     , pdf-slave-template, shelly, system-filepath, text, transformers
      , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "pdf-slave";
-       version = "1.2.0.0";
-       sha256 = "bf45cd593271427ab6f72dffaa1e355a33b59ab20d18a34590a3a1c50d5fe029";
-       revision = "1";
-       editedCabalFile = "cf72f50463292710ceb929edc7cb9e61c41c5da36676e5d0cc7e7cc5d0dd23a4";
+       version = "1.2.3.0";
+       sha256 = "46700a44e9f6ee7fbfecfd23201211a9c99d3a74c9fa9d8a467980b7390a5ae4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134295,7 +135412,7 @@ self: {
        ];
        executableHaskellDepends = [
          aeson base bytestring optparse-applicative pdf-slave-template
-         shelly system-filepath text yaml
+         shelly system-filepath text transformers yaml
        ];
        homepage = "https://github.com/NCrashed/pdf-slave#readme";
        description = "Tool to generate PDF from haskintex templates and YAML input";
@@ -134577,8 +135694,8 @@ self: {
      }:
      mkDerivation {
        pname = "pell";
-       version = "0.1.0.0";
-       sha256 = "addb0a4330e748f2d7fe4305acf7af5344f437208a90d6c7a637820679a4af6b";
+       version = "0.1.1.0";
+       sha256 = "5e2002920c97bddbe3047dbc2eba3ddadd3823c4ca137c4a1d3314cb12dc4ad4";
        libraryHaskellDepends = [ arithmoi base containers ];
        testHaskellDepends = [
          arithmoi base Cabal cabal-test-quickcheck containers primes
@@ -135377,8 +136494,8 @@ self: {
        pname = "persistent-template";
        version = "2.5.1.6";
        sha256 = "f88a8735173ba197f8d698a9c1fd5c649234fd60efe493f401432926a55e7b44";
-       revision = "1";
-       editedCabalFile = "85aabe4c402cc78cc71100fd9dc51b84c9e3cd6370c73983ee31a93dc73482ce";
+       revision = "2";
+       editedCabalFile = "18eae1801d9742facf54aada319dfde737a1cc758b39bb2f237a4d15c98b65c6";
        libraryHaskellDepends = [
          aeson aeson-compat base bytestring containers ghc-prim
          http-api-data monad-control monad-logger path-pieces persistent
@@ -135611,19 +136728,17 @@ self: {
      }) {};
 
   "pg-store" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, hspec, mtl
-     , postgresql-libpq, QuickCheck, template-haskell, text, time
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+     , haskell-src-meta, mtl, postgresql-libpq, scientific
+     , template-haskell, text, time
      }:
      mkDerivation {
        pname = "pg-store";
-       version = "0.1.1";
-       sha256 = "5f8d688811e4e59accce33f43fe2168adb9a4809b794d6e27db028af605298af";
+       version = "0.2";
+       sha256 = "4824fbff41eb4dce8944afca1c3fac8716d77c4425ca04c1d8546876b51c83b6";
        libraryHaskellDepends = [
-         attoparsec base bytestring mtl postgresql-libpq template-haskell
-         text time
-       ];
-       testHaskellDepends = [
-         base bytestring hspec mtl postgresql-libpq QuickCheck text
+         aeson attoparsec base blaze-builder bytestring haskell-src-meta mtl
+         postgresql-libpq scientific template-haskell text time
        ];
        homepage = "https://github.com/vapourismo/pg-store";
        description = "Simple storage interface to PostgreSQL";
@@ -136110,8 +137225,10 @@ self: {
      }:
      mkDerivation {
        pname = "picologic";
-       version = "0.2.0";
-       sha256 = "eb831c0e385a43966849d75194418ac2823d2fad54cefc0eb29771e04d6c4e03";
+       version = "0.3.0";
+       sha256 = "130f67f8d018b4f988d434d37fa46d908d4d144ccbd005cfd2773a720ba25e4b";
+       revision = "1";
+       editedCabalFile = "e89ef8a03720c391eefc8a47c6f947a1b7f4a37762393f45923854e696fcb59b";
        libraryHaskellDepends = [
          base containers mtl parsec picosat pretty
        ];
@@ -136149,12 +137266,13 @@ self: {
      }) {};
 
   "picosat" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, containers, random, rdtsc, transformers }:
      mkDerivation {
        pname = "picosat";
-       version = "0.1.3";
-       sha256 = "374d64964bbb35d24bbc3908d9de38f0087d425b6f7ab90c88f870b865564fd2";
-       libraryHaskellDepends = [ base ];
+       version = "0.1.4";
+       sha256 = "5a6d9fae04a77a95a8c92ec6dd76302010b726d8c934dc8d8bbabc82851e9039";
+       libraryHaskellDepends = [ base containers transformers ];
+       testHaskellDepends = [ base containers random rdtsc transformers ];
        homepage = "https://github.com/sdiehl/haskell-picosat";
        description = "Bindings to the PicoSAT solver";
        license = stdenv.lib.licenses.mit;
@@ -136386,8 +137504,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-async";
-       version = "0.1.1";
-       sha256 = "e22358175e3c2c8f16bf17842e63e891931e792c3aafd2167bfc39baac1b14ac";
+       version = "0.1.2";
+       sha256 = "ec0ee9cfb5b958acd40f5fd7ba2073853eccc7c2701a14fc011118f3ee95d83d";
        libraryHaskellDepends = [
          base lifted-async lifted-base monad-control pipes pipes-safe stm
          transformers-base
@@ -137550,8 +138668,8 @@ self: {
      }:
      mkDerivation {
        pname = "plan-applicative";
-       version = "1.0.0.0";
-       sha256 = "911a0d6f69d2dd4c7642abc855c153d90f799035a722324965506ecb2f954dd7";
+       version = "2.0.0.1";
+       sha256 = "f350d72c315617d57f0747a108ab99f20daf6c960f80b7025687bf9fd5a9d758";
        libraryHaskellDepends = [
          base bifunctors comonad containers profunctors streaming
          transformers
@@ -139745,8 +140863,8 @@ self: {
      }:
      mkDerivation {
        pname = "praglude";
-       version = "0.3.0.0";
-       sha256 = "8c5c2cdbff18b89b61b28680d92ad9c8204abcf9ef264b5b4622f1ee21f744da";
+       version = "0.4.0.1";
+       sha256 = "70996dbad7defd09b26ad792150205f878c6158a372cc2544ea1bfd7d2a74dec";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring casing containers
          data-default deepseq directory filepath hashable lens mtl random
@@ -139766,8 +140884,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.13";
-       sha256 = "12d47c88d2ea714d58cd4527fb2826d49e2b5d49bc3d8dda8f6fd52bd4dd830a";
+       version = "0.0.14";
+       sha256 = "6b01da606303e72bad6055d436e1c199ad58bb6c93efd89b8d4c43ad5aa6ff21";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141864,6 +142982,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "protolude-lifted" = callPackage
+    ({ mkDerivation, base, lifted-async, lifted-base, protolude }:
+     mkDerivation {
+       pname = "protolude-lifted";
+       version = "0.1.0.1";
+       sha256 = "1cf719477b66ad04fca3c5322fc3e9b27d6208bf677cbab84b4577cdce83364f";
+       libraryHaskellDepends = [
+         base lifted-async lifted-base protolude
+       ];
+       homepage = "https://github.com/pbogdan/protolude-lifted";
+       description = "Protolude with lifted-base and lifted-async";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "proton-haskell" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, HUnit
      , test-framework, test-framework-hunit
@@ -142594,7 +143726,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "purescript_0_10_3" = callPackage
+  "purescript_0_10_5" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty
      , ansi-terminal, ansi-wl-pprint, base, base-compat, bower-json
      , boxes, bytestring, clock, containers, data-ordlist, directory
@@ -142603,18 +143735,16 @@ self: {
      , language-javascript, lens, lifted-base, monad-control
      , monad-logger, mtl, network, optparse-applicative, parallel
      , parsec, pattern-arrows, pipes, pipes-http, process, protolude
-     , regex-tdfa, safe, semigroups, silently, sourcemap, spdx, split
-     , stm, syb, system-filepath, text, time, transformers
+     , regex-tdfa, safe, scientific, semigroups, silently, sourcemap
+     , spdx, split, stm, syb, system-filepath, text, time, transformers
      , transformers-base, transformers-compat, turtle
      , unordered-containers, utf8-string, vector, wai, wai-websockets
      , warp, websockets
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.10.3";
-       sha256 = "261e2afde8bf1d58a9c9c23296b37b57dfcd47d4f25cc7798a36a6e73978c5c2";
-       revision = "2";
-       editedCabalFile = "cd4a6818028652cb5c630372f872072197ef5822edf1814eaf8cd672c75683b7";
+       version = "0.10.5";
+       sha256 = "0d36361819866efe703eb3ae37f597316098ec3ead6edc9236ea63d54bdc8916";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142623,23 +143753,24 @@ self: {
          edit-distance filepath fsnotify Glob haskeline http-client
          http-types language-javascript lens lifted-base monad-control
          monad-logger mtl parallel parsec pattern-arrows pipes pipes-http
-         process protolude regex-tdfa safe semigroups sourcemap spdx split
-         stm syb text time transformers transformers-base
+         process protolude regex-tdfa safe scientific semigroups sourcemap
+         spdx split stm syb text time transformers transformers-base
          transformers-compat unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
          aeson aeson-pretty ansi-terminal ansi-wl-pprint base base-compat
          boxes bytestring containers directory file-embed filepath foldl
          Glob haskeline http-types monad-logger mtl network
-         optparse-applicative parsec process protolude split stm
+         optparse-applicative parsec process protolude sourcemap split stm
          system-filepath text time transformers transformers-compat turtle
          utf8-string wai wai-websockets warp websockets
        ];
        testHaskellDepends = [
-         aeson aeson-better-errors base base-compat boxes bytestring
-         containers directory filepath Glob haskeline hspec hspec-discover
-         HUnit mtl optparse-applicative parsec process protolude silently
-         stm text time transformers transformers-compat utf8-string vector
+         aeson aeson-better-errors base base-compat bower-json boxes
+         bytestring containers directory filepath Glob haskeline hspec
+         hspec-discover HUnit mtl optparse-applicative parsec process
+         protolude silently stm text time transformers transformers-compat
+         utf8-string vector
        ];
        doCheck = false;
        homepage = "http://www.purescript.org/";
@@ -142669,6 +143800,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "purescript-bridge_0_8_0_1" = 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";
+       libraryHaskellDepends = [
+         base containers directory filepath generic-deriving lens mtl text
+         transformers
+       ];
+       testHaskellDepends = [
+         base containers hspec hspec-expectations-pretty-diff text
+       ];
+       description = "Generate PureScript data types from Haskell data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "purescript-bundle-fast" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , optparse-applicative, text, vector
@@ -142795,12 +143947,11 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "1.1.0.3";
-       sha256 = "7c70330d247624caaac8d2569735728a375d06a813ae1dc2a240707c4149caab";
+       version = "1.1.0.4";
+       sha256 = "7d52cf0d179e2585c82f1f223e9c6cedbc4c8d1489348d55ec89bc10f7087251";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptohash hashable
-         http-client http-types QuickCheck text time transformers
-         unordered-containers
+         http-client http-types text time transformers unordered-containers
        ];
        testHaskellDepends = [
          aeson base bytestring hspec http-client http-types QuickCheck text
@@ -143177,8 +144328,8 @@ self: {
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "0.1.2.1";
-       sha256 = "72e1c72a7e3da7769401b4d1125b3f527274bdc5f97d78be2e14cf619d705d30";
+       version = "0.2.1.1";
+       sha256 = "e7abcdff646835141b8ea2c53ef414467ddc07afef20d2cce48aadc0096001f4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144022,8 +145173,8 @@ self: {
      }:
      mkDerivation {
        pname = "quipper";
-       version = "0.8.1";
-       sha256 = "69dad741fde6f2fb2d3c9497a93f6c31a90f1150205c2cc11c02455d501a2c8c";
+       version = "0.8.2";
+       sha256 = "c030e997cb6960b6125402c03e46d48e582b6eea28ffe9712c27a66366bd8f99";
        libraryHaskellDepends = [
          base containers directory easyrender mtl primes process random
          template-haskell unix
@@ -144990,6 +146141,180 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rapid-term" = callPackage
+    ({ mkDerivation, ansi-terminal, base, clock, kan-extensions
+     , process, transformers, unix
+     }:
+     mkDerivation {
+       pname = "rapid-term";
+       version = "0.1.1";
+       sha256 = "49cb96ef27649b3caf9fbac4a293f03ac884dd1ed0e96a3f0b6749ad1e8ed1a0";
+       libraryHaskellDepends = [
+         ansi-terminal base clock kan-extensions process transformers unix
+       ];
+       homepage = "https://github.com/esoeylemez/rapid-term";
+       description = "External terminal support for rapid";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "rasa" = callPackage
+    ({ mkDerivation, async, base, containers, data-default, lens, mtl
+     , text, text-lens, transformers, yi-rope
+     }:
+     mkDerivation {
+       pname = "rasa";
+       version = "0.1.3";
+       sha256 = "2247542b18000d21309747e55b65ccb6207dace606ad7e84166c46b7966caed1";
+       revision = "1";
+       editedCabalFile = "3677de9868bb117c8aa7845db9cbe0c614a8ec41e0f24efc50ccaff3963422db";
+       libraryHaskellDepends = [
+         async base containers data-default lens mtl text text-lens
+         transformers yi-rope
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa#readme";
+       description = "A modular text editor";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-example-config" = callPackage
+    ({ 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-vim
+     }:
+     mkDerivation {
+       pname = "rasa-example-config";
+       version = "0.1.0.0";
+       sha256 = "5d3cbf04bb2b7a18bfc0ecc03d3c6ed72a23c45827291537d34938fdde21821a";
+       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
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Example user config for Rasa";
+       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";
+       libraryHaskellDepends = [
+         base containers data-default lens rasa text
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext for running commands";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-cursors" = callPackage
+    ({ mkDerivation, base, data-default, lens, mtl, rasa
+     , rasa-ext-style, text, text-lens, yi-rope
+     }:
+     mkDerivation {
+       pname = "rasa-ext-cursors";
+       version = "0.1.0.0";
+       sha256 = "3d53163dcf3b5d1f897f0c006f83a1ea71306dad3ed2fefc4f7af21a2ff7fda6";
+       libraryHaskellDepends = [
+         base data-default lens mtl rasa rasa-ext-style text text-lens
+         yi-rope
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext adding cursor(s)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-files" = callPackage
+    ({ mkDerivation, base, data-default, lens, rasa, rasa-ext-cmd
+     , rasa-ext-status-bar, text
+     }:
+     mkDerivation {
+       pname = "rasa-ext-files";
+       version = "0.1.0.0";
+       sha256 = "9bfc3d47df893b23e4259887f95078b81fc9bfb489d9ce96d232f4ecdb39c3a4";
+       libraryHaskellDepends = [
+         base data-default lens rasa rasa-ext-cmd rasa-ext-status-bar text
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext for filesystem actions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-logger" = callPackage
+    ({ mkDerivation, base, lens, mtl, rasa }:
+     mkDerivation {
+       pname = "rasa-ext-logger";
+       version = "0.1.0.0";
+       sha256 = "4d951f1c54328715c3e923c1f89c833f687bb291e4d7af1ac563c77d8606e3e0";
+       libraryHaskellDepends = [ base lens mtl rasa ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext for logging state/actions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-slate" = callPackage
+    ({ mkDerivation, base, lens, rasa, rasa-ext-logger
+     , rasa-ext-status-bar, rasa-ext-style, text, vty, yi-rope
+     }:
+     mkDerivation {
+       pname = "rasa-ext-slate";
+       version = "0.1.0.0";
+       sha256 = "75d5c973d41acc016e4f3aa87f0babfb2cfd0d979a848da6a6fb8c9d3c6e4eb9";
+       libraryHaskellDepends = [
+         base lens rasa rasa-ext-logger rasa-ext-status-bar rasa-ext-style
+         text vty yi-rope
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa extension for rendering to terminal with vty";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-status-bar" = callPackage
+    ({ mkDerivation, base, data-default, lens, rasa, text }:
+     mkDerivation {
+       pname = "rasa-ext-status-bar";
+       version = "0.1.0.0";
+       sha256 = "20791e8facaf3e452c1bdc60e8d519169f50a34213a8cdbd6503cb838c550c71";
+       libraryHaskellDepends = [ base data-default lens rasa text ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext for populating status-bar";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-style" = callPackage
+    ({ mkDerivation, base, data-default, lens, rasa }:
+     mkDerivation {
+       pname = "rasa-ext-style";
+       version = "0.1.0.0";
+       sha256 = "496afd72cdbfca75bf530c022e5ad7bbcfd7878e1373ec497ec864a3e7beaee0";
+       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-vim" = callPackage
+    ({ mkDerivation, base, data-default, lens, mtl, rasa
+     , rasa-ext-cursors, rasa-ext-files, rasa-ext-status-bar, text
+     , text-lens, yi-rope
+     }:
+     mkDerivation {
+       pname = "rasa-ext-vim";
+       version = "0.1.0.0";
+       sha256 = "3e936fe4fca11737f9983db671d2c94f240aa95d81d934b93e4d211575d8d045";
+       libraryHaskellDepends = [
+         base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files
+         rasa-ext-status-bar text text-lens yi-rope
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext for vim bindings";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "rascal" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, containers, curl
      , curl-aeson, directory, filepath, HUnit, mtl, process, QuickCheck
@@ -145104,6 +146429,26 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "0.3.2";
+       sha256 = "99b838c7d85208cd49fdf733d99ca29baafbb924f9db8a0d45ae88c15fc6ba73";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ratel-wai" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
@@ -145152,8 +146497,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "2.1.0";
-       sha256 = "d969cf852a2210f11a51f21b75f3c16a47a0dc92b695a6ae11c9287ddfe30588";
+       version = "2.1.3";
+       sha256 = "a349c7c6f45ab64c0ff85b877f99a7ec4d5a8946c0d2224b033b6014b518bea1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145856,8 +147201,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "read-bounded";
-       version = "0.1.1.0";
-       sha256 = "f310debaed6ede28440f1b177be6c5c6f281b7b3c0af9936bcb615d577d9d6a7";
+       version = "0.1.1.1";
+       sha256 = "fd9103522661982b366f89280e88c7ac8316eb6b892fa11a8645051da6859050";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/thomaseding/read-bounded";
        description = "Class for reading bounded values";
@@ -148501,12 +149846,13 @@ self: {
     ({ mkDerivation, base, containers, haskeline, mtl, process }:
      mkDerivation {
        pname = "repline";
-       version = "0.1.5.0";
-       sha256 = "9e807cf92d5f8a8e68787f6d93597bac41ace50997305105451bf852ce7ce3a4";
+       version = "0.1.6.0";
+       sha256 = "61f800cecd9f2d1545164384c827dc4d1e49ce870be8c4547b41f3ebc0902a5b";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers haskeline mtl ];
+       libraryHaskellDepends = [ base containers haskeline mtl process ];
        executableHaskellDepends = [ base containers mtl process ];
+       homepage = "https://github.com/sdiehl/repline";
        description = "Haskeline wrapper for GHCi-like REPL interfaces";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -148633,8 +149979,8 @@ self: {
        pname = "req";
        version = "0.1.0";
        sha256 = "c93bae94d0b640f0d459a3da79c6021f7d8403099e9f08c35a2cddf64eea2269";
-       revision = "1";
-       editedCabalFile = "03f0eb9f9ae76f17e56ff02d4e1f42769c323183497c81f0c0cb2c721e0eed2f";
+       revision = "2";
+       editedCabalFile = "c4d0fc2e312c85a8dc3e7aefb49341ad57662ac1dac6625304f9aa3cf2016160";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive connection
          data-default-class http-api-data http-client http-client-tls
@@ -150049,23 +151395,27 @@ self: {
      }) {};
 
   "rncryptor" = callPackage
-    ({ mkDerivation, base, bytestring, cipher-aes, io-streams, mtl
-     , pbkdf, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, base16-bytestring, bytestring
+     , bytestring-arbitrary, cryptonite, fastpbkdf2, io-streams, memory
+     , mtl, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck
+     , text
      }:
      mkDerivation {
        pname = "rncryptor";
-       version = "0.0.2.3";
-       sha256 = "465879f9e1209050820f939229ebea727d736071e46a19ea775aba8e0608e69f";
+       version = "0.3.0.0";
+       sha256 = "f7b14f165e0409f73d4ef257836199bcac7e4f7fca9ebfadf126f89a8c6de820";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring cipher-aes io-streams mtl pbkdf QuickCheck random
+         base bytestring cryptonite fastpbkdf2 io-streams memory mtl
+         QuickCheck random
        ];
        executableHaskellDepends = [
-         base bytestring cipher-aes io-streams
+         base bytestring cryptonite io-streams
        ];
        testHaskellDepends = [
-         base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+         base base16-bytestring bytestring bytestring-arbitrary cryptonite
+         io-streams QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Haskell implementation of the RNCryptor file format";
        license = stdenv.lib.licenses.mit;
@@ -152189,8 +153539,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.1.3";
-       sha256 = "1feff9aa39dc4bd34de1cb0da5fcf105429aafa1e28c97cfff19a44403c79951";
+       version = "2.1.5";
+       sha256 = "dd1ac555546ded3c178780c157d86d1075bd8a41f777bafffb9c94f9ef8a4f17";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -152799,6 +154149,8 @@ self: {
        pname = "scientific";
        version = "0.3.4.9";
        sha256 = "108330662b0af9a04d7da55864211ce12008efe36614d897ba635e80670918a8";
+       revision = "1";
+       editedCabalFile = "833f5960e622c7346c3c02547538da037bcc4eececc00ba2ab9412eabdb71d61";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq ghc-prim hashable
          integer-gmp text vector
@@ -152812,6 +154164,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scientific_0_3_4_10" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , ghc-prim, hashable, integer-gmp, integer-logarithms, QuickCheck
+     , smallcheck, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "scientific";
+       version = "0.3.4.10";
+       sha256 = "4d3b8ae5d741facfb0e84a2f1b6964a7ab3817269568c37de44f1be5cc0ff1a1";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq ghc-prim hashable
+         integer-gmp integer-logarithms text vector
+       ];
+       testHaskellDepends = [
+         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
+         tasty-hunit tasty-quickcheck tasty-smallcheck text
+       ];
+       homepage = "https://github.com/basvandijk/scientific";
+       description = "Numbers represented using scientific notation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scion" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset
@@ -152959,8 +154335,8 @@ self: {
        pname = "scotty";
        version = "0.11.0";
        sha256 = "892203c937ccf1279f5005ddb78ebea84629b80687a1e38fc118b38011a386ed";
-       revision = "3";
-       editedCabalFile = "03a2f153eb5cf597435251169e49c42066b4ee058fd20d31e2cecec52e6578bc";
+       revision = "4";
+       editedCabalFile = "0d6fc88c2396a69e0d0f23ccad17b7b47d548f67bc23e417aad2940fdd71c5a1";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class fail http-types monad-control mtl nats network
@@ -153957,18 +155333,19 @@ self: {
      }) {};
 
   "semdoc" = callPackage
-    ({ mkDerivation, base, containers, data-default-class, ghc
-     , ghc-paths, Glob, groom, mtl, pandoc, pandoc-types, regex-tdfa
+    ({ mkDerivation, base, containers, data-default-class
+     , data-default-instances-base, ghc, ghc-paths, Glob, groom, mtl
+     , pandoc, pandoc-types, regex-tdfa
      }:
      mkDerivation {
        pname = "semdoc";
-       version = "0.1.2";
-       sha256 = "b9a2c73fa5bd0346ae9b21e5ee158460689bf521f97996418b0d426c334b3dc8";
+       version = "0.1.3";
+       sha256 = "2bf204ebae0f1592ed192cd2ca288052d536e9da14102ebbafd74105f3515c58";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers data-default-class ghc ghc-paths Glob groom mtl
-         pandoc pandoc-types regex-tdfa
+         base containers data-default-class data-default-instances-base ghc
+         ghc-paths Glob groom mtl pandoc pandoc-types regex-tdfa
        ];
        executableHaskellDepends = [ base ];
        homepage = "https://toktok.github.io/semdoc";
@@ -155335,18 +156712,18 @@ self: {
   "servant-github-webhook" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Crypto
      , github, http-types, servant, servant-server, string-conversions
-     , text, wai, warp
+     , text, transformers, wai, warp
      }:
      mkDerivation {
        pname = "servant-github-webhook";
-       version = "0.3.0.0";
-       sha256 = "41c78c7c553e3c75fcca81e66bc4db8b5f7b3e2578d18b54715ecdc106b6c610";
+       version = "0.3.0.2";
+       sha256 = "06dceb189088b80e2b428572c6a7334dbf1557f7c208190ccd944273626079b9";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring Crypto github http-types
-         servant servant-server string-conversions text wai
+         servant servant-server string-conversions text transformers wai
        ];
        testHaskellDepends = [
-         aeson base bytestring servant-server wai warp
+         aeson base bytestring servant-server transformers wai warp
        ];
        homepage = "https://github.com/tsani/servant-github-webhook";
        description = "Servant combinators to facilitate writing GitHub webhooks";
@@ -155947,8 +157324,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204";
-       revision = "11";
-       editedCabalFile = "80507ee35eb6736752a80613e2a27fc89a50bbcdfc75c51785aeaf469af42902";
+       revision = "12";
+       editedCabalFile = "a8bcb29afce01078d5f6b71503ad0d7d03356a9ebeffb4ec09719a324c314519";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -156840,8 +158217,8 @@ self: {
     ({ mkDerivation, base, basic-prelude, directory, shake }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.4";
-       sha256 = "b2769d6b01eab98de11c3c072a2cbc2a5706e0dfdcaf916b67fc344d49f1e09f";
+       version = "0.0.7";
+       sha256 = "f7859e7adbccb740c176fc186ca332f576be65265b87641d5ac30d2d34adfbdb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base basic-prelude directory shake ];
@@ -158040,16 +159417,16 @@ self: {
      }) {};
 
   "simple-effects" = callPackage
-    ({ mkDerivation, base, ghc-prim, interlude-l, lens, list-t
+    ({ mkDerivation, array, base, interlude-l, lens, list-t
      , monad-control, mtl, transformers, transformers-base
      }:
      mkDerivation {
        pname = "simple-effects";
-       version = "0.6.0.1";
-       sha256 = "df8de9fae3ee9c2226565af8f8c4171d1b79678de37e3b280cda3ca013b52944";
+       version = "0.6.0.2";
+       sha256 = "f8f887e433a4f68a506966b2d41f614cb39602f8bb3b802535f91c2391711a36";
        libraryHaskellDepends = [
-         base ghc-prim interlude-l lens list-t monad-control mtl
-         transformers transformers-base
+         array base interlude-l lens list-t monad-control mtl transformers
+         transformers-base
        ];
        testHaskellDepends = [ base interlude-l ];
        homepage = "https://gitlab.com/LukaHorvat/simple-effects";
@@ -158941,8 +160318,8 @@ self: {
      }:
      mkDerivation {
        pname = "sized";
-       version = "0.2.0.0";
-       sha256 = "31f9233885bbe758a4c2f890e65695e11c64abdc12b6d4931427570cd7d4587c";
+       version = "0.2.1.0";
+       sha256 = "e5e936dab874a7766a8b3b50f15fc742cc57b956aef738ba98ef221b25d3731a";
        libraryHaskellDepends = [
          base constraints containers deepseq equational-reasoning hashable
          lens ListLike mono-traversable monomorphic singletons type-natural
@@ -159428,6 +160805,8 @@ self: {
        pname = "slug";
        version = "0.1.5";
        sha256 = "6bc271612759fd9a415ee382b620b0f5b1154c762eb3469a409dafd5f35282fc";
+       revision = "1";
+       editedCabalFile = "1cbade6e74ca1f38368323dc0e124d4b8f0abc661a53e8738f3700cbf553b218";
        libraryHaskellDepends = [
          aeson base exceptions path-pieces persistent text
        ];
@@ -159440,6 +160819,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "slug_0_1_6" = callPackage
+    ({ mkDerivation, aeson, base, exceptions, hspec, http-api-data
+     , path-pieces, persistent, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "slug";
+       version = "0.1.6";
+       sha256 = "c4d589b30d7d4788ed5dbf1a24652a5f880751a0250707bf8ac82a3714734692";
+       libraryHaskellDepends = [
+         aeson base exceptions http-api-data path-pieces persistent
+         QuickCheck text
+       ];
+       testHaskellDepends = [
+         base exceptions hspec http-api-data path-pieces QuickCheck text
+       ];
+       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
     ({ mkDerivation, base, bytestring, deepseq, hashable }:
      mkDerivation {
@@ -159695,6 +161095,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smoothie_0_4_2_4" = 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smsaero" = callPackage
     ({ mkDerivation, aeson, base, containers, http-api-data
      , http-client, servant, servant-client, servant-docs, text, time
@@ -159756,23 +161169,59 @@ self: {
      }) {};
 
   "smtlib2" = callPackage
-    ({ mkDerivation, array, atto-lisp, attoparsec, base, blaze-builder
-     , bytestring, constraints, containers, data-fix, mtl, process
-     , tagged, text, transformers
+    ({ mkDerivation, base, constraints, containers, dependent-map
+     , dependent-sum, mtl, template-haskell
      }:
      mkDerivation {
        pname = "smtlib2";
-       version = "0.3.1";
-       sha256 = "3a46057e9b901fc0c5ced29dee8a00c69d3d0f9ec663edae9b9809616402c048";
+       version = "1.0";
+       sha256 = "3ca10e4ecc493a9b824301887fe2ff8de4594126bd04fa6fb5490110b615edf1";
        libraryHaskellDepends = [
-         array atto-lisp attoparsec base blaze-builder bytestring
-         constraints containers data-fix mtl process tagged text
-         transformers
+         base constraints containers dependent-map dependent-sum mtl
+         template-haskell
        ];
        description = "A type-safe interface to communicate with an SMT solver";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "smtlib2-debug" = callPackage
+    ({ mkDerivation, ansi-terminal, atto-lisp, base, containers
+     , dependent-map, dependent-sum, mtl, smtlib2, smtlib2-pipe, text
+     }:
+     mkDerivation {
+       pname = "smtlib2-debug";
+       version = "1.0";
+       sha256 = "110e136813fbb257f2858e56ef58854fce04fcd2b972e701863e293aca87d761";
+       libraryHaskellDepends = [
+         ansi-terminal atto-lisp base containers dependent-map dependent-sum
+         mtl smtlib2 smtlib2-pipe text
+       ];
+       description = "Dump the communication with an SMT solver for debugging purposes";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "smtlib2-pipe" = callPackage
+    ({ mkDerivation, atto-lisp, attoparsec, base, blaze-builder
+     , bytestring, Cabal, cabal-test-quickcheck, containers
+     , dependent-sum, mtl, process, smtlib2, smtlib2-quickcheck, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "smtlib2-pipe";
+       version = "1.0";
+       sha256 = "6623f4a565cb09c797022716041dc8647d21b06a42f0fd05b988254551723c6d";
+       libraryHaskellDepends = [
+         atto-lisp attoparsec base blaze-builder bytestring containers
+         dependent-sum mtl process smtlib2 text transformers
+       ];
+       testHaskellDepends = [
+         base Cabal cabal-test-quickcheck smtlib2 smtlib2-quickcheck
+       ];
+       description = "A type-safe interface to communicate with an SMT solver";
+       license = stdenv.lib.licenses.gpl3;
+       broken = true;
+     }) {smtlib2-quickcheck = null;};
+
   "smtp-mail" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
      , bytestring, cryptohash, filepath, mime-mail, network, text
@@ -159887,8 +161336,8 @@ self: {
        pname = "snap";
        version = "1.0.0.1";
        sha256 = "293f16c1404793121d3d85abb6287bbb32f5dc1d82b12146d4bb650052322db8";
-       revision = "1";
-       editedCabalFile = "81129d186348ab67fda4278bb6c8575ee7a7caed3e6069e0045f464a4ed911ab";
+       revision = "2";
+       editedCabalFile = "162e742faa2af87763daf5c733ae2a0ff35c9b29d68de9659c948a24b1681e62";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession configurator
          containers directory directory-tree dlist filepath hashable heist
@@ -160455,10 +161904,8 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-fay";
-       version = "0.3.3.13";
-       sha256 = "39810748b7177b45a0fab785e48ac497d81587e48dde9dc8ad75e8d704bdda3f";
-       revision = "5";
-       editedCabalFile = "0331163a9d3af919f0b01408f7a2d3542452e030cf838ec92f9bb6bf6c0f4ccd";
+       version = "0.3.3.14";
+       sha256 = "97a9a3ec90e03be064df0a6e3dcf5834de063fb43a24d1014eb3d0ba8bac4207";
        libraryHaskellDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
@@ -161506,10 +162953,10 @@ self: {
     ({ mkDerivation, base, network, transformers, unix }:
      mkDerivation {
        pname = "socket-activation";
-       version = "0.1.0.1";
-       sha256 = "aafe00774b8403edacb04b8d4dc6f38028f5173f57a5c4de43e9d26f02eb3f81";
+       version = "0.1.0.2";
+       sha256 = "b99e7b4f296cd462aac84e5bb61fb02953e2080d1351e9e10a63d35dc34eb43b";
        libraryHaskellDepends = [ base network transformers unix ];
-       homepage = "https://github.com/sakana/haskell-socket-activation";
+       homepage = "https://github.com/ddfisher/haskell-socket-activation";
        description = "systemd socket activation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161546,6 +162993,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) lksctp-tools;};
 
+  "socket-unix" = callPackage
+    ({ mkDerivation, async, base, bytestring, socket, tasty
+     , tasty-hunit, unix
+     }:
+     mkDerivation {
+       pname = "socket-unix";
+       version = "0.1.0.0";
+       sha256 = "34c71e014e728a4c5f31fbb55ac0d46f049969a8860e2b8629369f4d83429f2d";
+       revision = "1";
+       editedCabalFile = "082468d0b01112a99fffa76d7ff1bbe1b0ebbf878b3364fecec64a73fed094a3";
+       libraryHaskellDepends = [ base bytestring socket ];
+       testHaskellDepends = [
+         async base bytestring socket tasty tasty-hunit unix
+       ];
+       homepage = "https://github.com/vyacheslavhashov/haskell-socket-unix#readme";
+       description = "Unix domain sockets";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "socketio" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , blaze-builder, bytestring, conduit, conduit-extra, http-types
@@ -163516,6 +164982,8 @@ self: {
        pname = "stache";
        version = "0.1.8";
        sha256 = "a8617924e087b02c3afb3308a8a1102828e352dba7545648703e5d0c2c3c35b2";
+       revision = "1";
+       editedCabalFile = "642777f5664ae40b2e5308ca771a505226b0015414203658432e002c846e5ad7";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory exceptions
          filepath megaparsec mtl template-haskell text unordered-containers
@@ -163540,6 +165008,8 @@ self: {
        pname = "stache";
        version = "0.2.0";
        sha256 = "0952d6849a297d3ef020feaeb128be4af7d25ab97fa948eb0339a7f75d0a1831";
+       revision = "1";
+       editedCabalFile = "5b22600a5b101c5c86d688d05773c7506e9cc373637ef7a2a1abe43a28db0703";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory exceptions
          filepath megaparsec mtl template-haskell text unordered-containers
@@ -164536,19 +166006,19 @@ self: {
   "staversion" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, hspec, http-client, http-client-tls, http-types
-     , optparse-applicative, QuickCheck, text, transformers
+     , megaparsec, optparse-applicative, QuickCheck, text, transformers
      , transformers-compat, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.1.2.0";
-       sha256 = "43db7f70ca360b0d858572afaf012ba10cda7f0ea19511c4e036bdfbb832e917";
+       version = "0.1.3.2";
+       sha256 = "d3281fe9b7aa3795251c7e45d6364bfb051ffa3bee44d691f40c0c928fe886e0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath http-client
-         http-client-tls http-types optparse-applicative text transformers
-         transformers-compat unordered-containers yaml
+         http-client-tls http-types megaparsec optparse-applicative text
+         transformers transformers-compat unordered-containers yaml
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -165783,6 +167253,7 @@ self: {
        homepage = "http://github.com/jb55/streaming-wai";
        description = "Streaming Wai utilities";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
   "streamproc" = callPackage
@@ -166047,14 +167518,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "string-conversions_0_4_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck
+     , quickcheck-instances, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "string-conversions";
+       version = "0.4.0.1";
+       sha256 = "46bcce6d9ce62c558b7658a75d9c6a62f7259d6b0473d011d8078234ad6a1994";
+       libraryHaskellDepends = [ base bytestring text utf8-string ];
+       testHaskellDepends = [
+         base bytestring deepseq hspec QuickCheck quickcheck-instances text
+         utf8-string
+       ];
+       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
     ({ mkDerivation, base, bytestring, tasty, tasty-hunit, text
      , utf8-string
      }:
      mkDerivation {
        pname = "string-convert";
-       version = "3.0.1";
-       sha256 = "2483d444a88f6557976bd69975bf6d363da734934f2582f6780edee348fc8a2c";
+       version = "4.0.0.1";
+       sha256 = "9675b98f7e798fbfe89c18cb6ac8f44237c6a92c0f0b2344a26fad4c3e53d1c8";
        libraryHaskellDepends = [ base bytestring text utf8-string ];
        testHaskellDepends = [
          base bytestring tasty tasty-hunit text utf8-string
@@ -166351,6 +167841,26 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "strive";
+       version = "3.0.2";
+       sha256 = "94f1dcef7ded8a27365d448e2db70baa5fafc91fa047dbb35164f82fd84f0b0f";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "strptime" = callPackage
     ({ mkDerivation, base, bytestring, text, time }:
      mkDerivation {
@@ -166619,8 +168129,8 @@ self: {
      }:
      mkDerivation {
        pname = "styx";
-       version = "1.0";
-       sha256 = "2fc5e840d35663ca10771758dec362017f32611675e44fe2e988dd12a05e293c";
+       version = "1.1";
+       sha256 = "b11402bde5b548b3f5cd2e1f501940e94c85628709aa0609e334bdf53e065144";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -171698,6 +173208,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-lens" = callPackage
+    ({ mkDerivation, base, extra, hspec, lens, text }:
+     mkDerivation {
+       pname = "text-lens";
+       version = "0.1.0.0";
+       sha256 = "e013ed9ba9385395e1eddc01c0da049f865ff020403e4af9671782b1b307cd2d";
+       libraryHaskellDepends = [ base extra lens text ];
+       testHaskellDepends = [ base hspec lens ];
+       homepage = "https://github.com/ChrisPenner/rasa";
+       description = "Lenses for operating over text";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "text-lips" = callPackage
     ({ mkDerivation, base, containers, parsers, text, text-loc
      , transformers
@@ -171844,6 +173367,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-postgresql_0_0_2_2" = callPackage
+    ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "text-postgresql";
+       version = "0.0.2.2";
+       sha256 = "91344e495a83ee7ca372977166523a28bf201a964cac1cc2d8260a448462200d";
+       libraryHaskellDepends = [
+         base dlist transformers transformers-compat
+       ];
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-printer" = callPackage
     ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups
      , test-framework, test-framework-quickcheck2, text, text-latin1
@@ -172846,6 +174387,8 @@ self: {
        pname = "these";
        version = "0.7.3";
        sha256 = "14339c111ec2caffcb2a9f64164a5dc307a0afb716925ddcb1774d9d442a3d9b";
+       revision = "1";
+       editedCabalFile = "d351c189525daded1e727f4a705f568d019238c9a4dd60e0277be462f49bede2";
        libraryHaskellDepends = [
          aeson base bifunctors binary containers data-default-class deepseq
          hashable keys mtl profunctors QuickCheck semigroupoids transformers
@@ -173567,28 +175110,24 @@ self: {
      }) {};
 
   "time-exts" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bindings-DSL, containers
-     , convertible, data-default, deepseq, fclabels, mtl, old-locale
-     , QuickCheck, random, text, time, timezone-olson
+    ({ mkDerivation, attoparsec, base, bindings-DSL, deepseq, HUnit
+     , ieee754, lens-simple, mtl, old-locale, QuickCheck, random, text
+     , time, tz
      }:
      mkDerivation {
        pname = "time-exts";
-       version = "2.1.0";
-       sha256 = "7519345408bd1f856af169e3185d69f7a3a0be045b91084a40909a4a7357e378";
-       isLibrary = true;
-       isExecutable = true;
+       version = "3.0.3";
+       sha256 = "1aca7fd7f52fc8dcd29c4b7cfbd4f24360a84b77e91e68b9d72318f98725786c";
        libraryHaskellDepends = [
-         aeson attoparsec base bindings-DSL containers convertible
-         data-default deepseq fclabels mtl old-locale QuickCheck random text
-         time timezone-olson
+         attoparsec base bindings-DSL deepseq lens-simple mtl old-locale
+         random text time tz
        ];
-       executableHaskellDepends = [
-         aeson attoparsec base bindings-DSL containers convertible
-         data-default deepseq fclabels mtl old-locale QuickCheck random text
-         time timezone-olson
+       testHaskellDepends = [
+         attoparsec base bindings-DSL deepseq HUnit ieee754 lens-simple mtl
+         old-locale QuickCheck random text time tz
        ];
        homepage = "https://github.com/enzoh/time-exts";
-       description = "Efficient Timestamps";
+       description = "Yet another time library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -173705,8 +175244,8 @@ self: {
     ({ mkDerivation, base, intervals, lens, thyme, vector-space }:
      mkDerivation {
        pname = "time-patterns";
-       version = "0.1.3.1";
-       sha256 = "56a0ac5f1a6a264f779d3de15ac09a204eda5a2fb04122e398fa9bb6848dee9d";
+       version = "0.1.3.2";
+       sha256 = "3c2beb5b4f69213699cdc9e2f88872d1d406eb04c93ad3678e09b6746aa40a61";
        libraryHaskellDepends = [ base intervals lens thyme vector-space ];
        homepage = "https://bitbucket.org/jfmueller/time-patterns";
        description = "Patterns for recurring events";
@@ -173819,8 +175358,8 @@ self: {
      }:
      mkDerivation {
        pname = "time-warp";
-       version = "1.1.1.0";
-       sha256 = "4e9fa28d8c67801fc302a7eec2457a2dda41b556129aebf0821bc250307ded4d";
+       version = "1.1.1.1";
+       sha256 = "df2721daeee24eac57f2ba1f1eff4b0f87260340537cd5e3cbe8d6c27b1094fd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -174059,8 +175598,8 @@ self: {
      }:
      mkDerivation {
        pname = "timeplot";
-       version = "1.0.31";
-       sha256 = "8dc8e4901b4b2f84c654d34f6721762bb662697b89dcfad969180a00820254b2";
+       version = "1.0.32";
+       sha256 = "3b560a5cf4d81daf5e4cf58d566893baf7daa9244b51c60cce71ac23bc6a5c46";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -174820,6 +176359,8 @@ self: {
        pname = "toml";
        version = "0.1.3";
        sha256 = "c29946c58656443d0dbf18aad0582707311c691ab624a63c8f9614a4950c7e71";
+       revision = "1";
+       editedCabalFile = "4eac5e516c0e461ceef73150d7a248bce199fc02183074a622c0dab17513ca20";
        libraryHaskellDepends = [
          attoparsec base bytestring containers old-locale time
        ];
@@ -176183,7 +177724,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tttool_1_6_1_3" = callPackage
+  "tttool_1_6_1_4" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , directory, executable-path, filepath, hashable, haskeline, HPDF
      , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
@@ -176192,8 +177733,8 @@ self: {
      }:
      mkDerivation {
        pname = "tttool";
-       version = "1.6.1.3";
-       sha256 = "7ca01c73dad41aab3b002db4c6f4e929be01c982c397dbca0e65315171339d45";
+       version = "1.6.1.4";
+       sha256 = "66f14d6abe28e2d2a1a61cbef0fe8ace0c376b2e2a8b918b17d422634faee8ee";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -176709,6 +178250,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "twfy-api-client" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
+     , either, exceptions, http-client, http-client-tls, http-media, mtl
+     , servant, servant-client, servant-server, text, transformers
+     }:
+     mkDerivation {
+       pname = "twfy-api-client";
+       version = "0.1.0.0";
+       sha256 = "c11fa34e03dbfba6fc208c6816c8f461daf78eeb835e67cd8a91a327d426e265";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-compat base base-compat bytestring either exceptions
+         http-client http-client-tls http-media mtl servant servant-client
+         servant-server text transformers
+       ];
+       executableHaskellDepends = [
+         aeson aeson-compat base base-compat either http-client
+         http-client-tls mtl servant servant-client text transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/wiggly/twfy-api-client#readme";
+       description = "They Work For You API Client Library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "twhs" = callPackage
     ({ mkDerivation, ansi-terminal, authenticate-oauth, base
      , bytestring, case-insensitive, conduit, containers, data-default
@@ -176978,6 +178545,8 @@ self: {
        pname = "twitter-feed";
        version = "0.2.0.11";
        sha256 = "8b98b4ddfb88f4c14f8eb43bd74a4c4e7941a92d44b90717e9b8dbe4c454c889";
+       revision = "1";
+       editedCabalFile = "3d0a5d8976c482b401003571812052a97cd0d77fb3d6f0619615c30c93a0b79e";
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
@@ -177464,8 +179033,8 @@ self: {
      }:
      mkDerivation {
        pname = "type-natural";
-       version = "0.7.1.1";
-       sha256 = "16867acdf4bfe3637a9c0730eca4156d3c830abca60182d8a561c4fabe6f7231";
+       version = "0.7.1.2";
+       sha256 = "c278c2660616179e61641d1d5356549946560ef2de66416b20d868f5fe1082e6";
        libraryHaskellDepends = [
          base constraints equational-reasoning ghc-typelits-natnormalise
          ghc-typelits-presburger monomorphic singletons template-haskell
@@ -179729,8 +181298,8 @@ self: {
      }:
      mkDerivation {
        pname = "up";
-       version = "1.0.0.3";
-       sha256 = "7e93219da62895cbea56ed91cefe3d0511bf57120b5ad6166f798b5e6d9567f0";
+       version = "1.0.0.4";
+       sha256 = "3412742f52d9ba598341fa74f89bc6e78acac81fe8409069af15912015fe340f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -180610,6 +182179,8 @@ self: {
        pname = "uuid-aeson";
        version = "0.1.0.0";
        sha256 = "cf8bdb82959d249ced20dff22935bd2ea79b1869267a95ebcacc7f0452eda259";
+       revision = "1";
+       editedCabalFile = "5fe65c563ef474292cf59cda8e36416dd75a60a05fc1fb8be43a0bd2eba1d814";
        libraryHaskellDepends = [ aeson base text uuid ];
        description = "Aeson types for UUID instances";
        license = stdenv.lib.licenses.bsd3;
@@ -181703,12 +183274,12 @@ self: {
      }) {};
 
   "vector-sized" = callPackage
-    ({ mkDerivation, base, deepseq, vector }:
+    ({ mkDerivation, base, deepseq, finite-typelits, vector }:
      mkDerivation {
        pname = "vector-sized";
-       version = "0.4.1.0";
-       sha256 = "19205fe36c63edfc52ea0f057bdf13ac22c71f5e40afc666bc9c6ff20846ca39";
-       libraryHaskellDepends = [ base deepseq vector ];
+       version = "0.5.0.0";
+       sha256 = "55bb88f7201571b19b55f7ac1d1b2a880ad77b9178593bac84cad58c2dbce22b";
+       libraryHaskellDepends = [ base deepseq finite-typelits vector ];
        homepage = "http://github.com/expipiplus1/vector-sized#readme";
        description = "Size tagged vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -181841,6 +183412,28 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "vectortiles_1_2_0_1" = 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "verbalexpressions" = callPackage
     ({ mkDerivation, base, regex-pcre }:
      mkDerivation {
@@ -183671,6 +185264,8 @@ self: {
        pname = "wai-middleware-static";
        version = "0.8.1";
        sha256 = "e0b5f13f410f81897759acf43198a08101d2af4c9d506164367c7d1a96d55375";
+       revision = "1";
+       editedCabalFile = "2884eb9d594bdc91a8ab7dd045e4252472c45361907c470f594a7f2a573d7752";
        libraryHaskellDepends = [
          base bytestring containers cryptonite directory expiring-cache-map
          filepath http-types memory mime-types mtl old-locale semigroups
@@ -183780,6 +185375,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-request-spec_0_10_2_4" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , http-types, text, wai
+     }:
+     mkDerivation {
+       pname = "wai-request-spec";
+       version = "0.10.2.4";
+       sha256 = "1ee1ed12ef41a7023e24629c46835ed9602643328e0cc3de0c9b934d31eed610";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers http-types text wai
+       ];
+       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
     ({ mkDerivation, base, bytestring, http-types, wai }:
      mkDerivation {
@@ -184387,8 +185999,8 @@ self: {
      }:
      mkDerivation {
        pname = "wave";
-       version = "0.1.2";
-       sha256 = "930d16bc03779c42bdf117ba2a2ac30b3ab08f9d214d9ca52526150d9eec07e3";
+       version = "0.1.4";
+       sha256 = "686687782dca7c522190bca70171682b24af8c89e4f3aa63da455c331daeb6bc";
        libraryHaskellDepends = [
          base bytestring cereal containers data-default-class transformers
        ];
@@ -184793,16 +186405,16 @@ self: {
 
   "web3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , bytestring, cryptonite, data-default-class, http-client, memory
-     , mtl, template-haskell, text, transformers, vector
+     , bytestring, cryptonite, http-client, http-client-tls, memory
+     , template-haskell, text, transformers, vector
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.4.1.0";
-       sha256 = "ead3b350b138946ec921c1e1c13ae6bf52f2ba89e7626ba79a562a5bef63faac";
+       version = "0.5.1.0";
+       sha256 = "57eb367f392f1c7ed230cb151b6a7ac8fda44e11075bbd39407e9c34125947ee";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring cryptonite
-         data-default-class http-client memory mtl template-haskell text
+         http-client http-client-tls memory template-haskell text
          transformers vector
        ];
        testHaskellDepends = [ base memory text ];
@@ -186141,20 +187753,21 @@ self: {
   "wolf" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
      , amazonka-swf, base, bytestring, conduit, conduit-combinators
-     , conduit-extra, directory, exceptions, filemanip, lifted-async
-     , monad-control, optparse-applicative, optparse-generic, preamble
-     , process, resourcet, shakers, text, time, uuid, yaml
+     , conduit-extra, directory, exceptions, filemanip, filepath
+     , lifted-async, monad-control, optparse-applicative
+     , optparse-generic, preamble, process, resourcet, shakers, text
+     , time, uuid, yaml
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.4";
-       sha256 = "8d22d044f67a1edf37cbb59cc3226585dcaa15f1c2b83696d7e191d50053aea2";
+       version = "0.3.6";
+       sha256 = "0be99a2ae98daaf9f2d499dd3f360a79e258c97874d81a3f32d97da17dce64fa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-swf base
          bytestring conduit conduit-combinators conduit-extra directory
-         exceptions filemanip lifted-async monad-control
+         exceptions filemanip filepath lifted-async monad-control
          optparse-applicative preamble process resourcet text time uuid yaml
        ];
        executableHaskellDepends = [ base optparse-generic shakers ];
@@ -187336,7 +188949,7 @@ self: {
 
   "xfconf" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath, glib
-     , gtk2hs-buildtools, libxfconf-0
+     , gtk2hs-buildtools, libxfconf
      }:
      mkDerivation {
        pname = "xfconf";
@@ -187346,13 +188959,13 @@ self: {
        editedCabalFile = "ce4bb3ab326d8e4c0a4fc2576045b589305b12f7ca28b79a69fcc367c429d33c";
        setupHaskellDepends = [ base Cabal containers directory filepath ];
        libraryHaskellDepends = [ base glib ];
-       libraryPkgconfigDepends = [ libxfconf-0 ];
+       libraryPkgconfigDepends = [ libxfconf ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://patch-tag.com/r/obbele/xfconf/home";
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {libxfconf-0 = null;};
+     }) {libxfconf = null;};
 
   "xformat" = callPackage
     ({ mkDerivation, base }:
@@ -187651,7 +189264,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "xlsx_0_4_0" = callPackage
+  "xlsx_0_4_1" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary-search, bytestring
      , conduit, containers, data-default, Diff, errors, extra, filepath
      , groom, lens, mtl, mtl-compat, network-uri, old-locale
@@ -187661,8 +189274,8 @@ self: {
      }:
      mkDerivation {
        pname = "xlsx";
-       version = "0.4.0";
-       sha256 = "1cb379b7cbc0783831f352d034c307a414bb2f1de158b5aec2a4c7cbebaee16a";
+       version = "0.4.1";
+       sha256 = "014d7ecc815f452e86b199ef0715548d7221f1f0a5cfb59ec92ffa86918ef5c6";
        libraryHaskellDepends = [
          base base64-bytestring binary-search bytestring conduit containers
          data-default errors extra filepath lens mtl mtl-compat network-uri
@@ -189579,15 +191192,17 @@ self: {
      }) {};
 
   "yeshql" = callPackage
-    ({ mkDerivation, base, containers, filepath, HDBC, parsec, stm
-     , tasty, tasty-hunit, tasty-quickcheck, template-haskell
+    ({ mkDerivation, base, containers, convertible, filepath, HDBC
+     , parsec, stm, syb-with-class, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell
      }:
      mkDerivation {
        pname = "yeshql";
-       version = "1.0.0.1";
-       sha256 = "c535ab7797d2ad062a351f688d147908d79770c1e0881e4340c9d8ab25307bfc";
+       version = "2.2.0.0";
+       sha256 = "3a17da3d051c19d44cd65bdccd3f47ca78c9df6b9190ca732dba16ad086c9e2d";
        libraryHaskellDepends = [
-         base containers filepath HDBC parsec template-haskell
+         base containers convertible filepath HDBC parsec syb-with-class
+         template-haskell
        ];
        testHaskellDepends = [
          base HDBC stm tasty tasty-hunit tasty-quickcheck
@@ -189623,6 +191238,31 @@ self: {
        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
+     , shakespeare, streaming-commons, template-haskell, text
+     , transformers, unix, unordered-containers, wai, wai-extra
+     , wai-logger, warp, yaml, yesod-core, yesod-form, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod";
+       version = "1.4.4";
+       sha256 = "5f2caade2435754ff35060c3ae58390ad87650b975e83a65f8013e80ea7bea2c";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring conduit conduit-extra
+         data-default-class directory fast-logger monad-control monad-logger
+         resourcet semigroups shakespeare streaming-commons template-haskell
+         text transformers unix unordered-containers wai wai-extra
+         wai-logger warp yaml yesod-core yesod-form yesod-persistent
+       ];
+       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
     ({ mkDerivation, aeson, base, containers, shakespeare
      , template-haskell, text, transformers, yesod
@@ -189942,8 +191582,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-nopassword";
-       version = "0.1.0.1";
-       sha256 = "a2ae8ba484ebd509eb8507b879eae29876ee9284facf1dfc4f94eea4f092106f";
+       version = "0.1.1.1";
+       sha256 = "0e1daf32cb9e57b85e89412e089a49308d5364ad98f3def64494e195fd0cf7b2";
        libraryHaskellDepends = [
          base blaze-markup http-types pwstore-fast text uuid yesod-auth
          yesod-core yesod-form
@@ -190769,6 +192409,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-paypal-rest" = callPackage
+    ({ mkDerivation, base, paypal-rest-client, time, yesod-core }:
+     mkDerivation {
+       pname = "yesod-paypal-rest";
+       version = "0.1.0";
+       sha256 = "b09605850782f9d1f6688f29a8e40597168e74e26ce239e638c1e840e17dcdf7";
+       libraryHaskellDepends = [
+         base paypal-rest-client time yesod-core
+       ];
+       description = "Yesod plugin to use PayPal with the paypal-rest-client library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-persistent" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
      , persistent-sqlite, persistent-template, resource-pool, resourcet

From f8a1e87e074c3d22a53fb7149dbab84a3b95ad41 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jan 2017 23:56:04 +0100
Subject: [PATCH 0653/1310] git-annex: update to latest 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 2d39e68c9a1..ff53f1ce2ca 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -54,7 +54,7 @@ self: super: {
     src = pkgs.fetchFromGitHub {
       owner = "joeyh";
       repo = "git-annex";
-      sha256 = "1a87kllzxmjwkz5arq4c3bp7qfkabn0arbli6s6i68fkgm19s4gr";
+      sha256 = "1vy6bj7f8zyj4n1r0gpi0r7mxapsrjvhwmsi5sbnradfng5j3jya";
       rev = drv.version;
     };
   })).overrideScope (self: super: {

From 25e34e0baec184668f9322b7050023f66146fcfc Mon Sep 17 00:00:00 2001
From: Maurizio Di Pietro <dc1mdp@gmail.com>
Date: Fri, 6 Jan 2017 11:02:05 +0100
Subject: [PATCH 0654/1310] sakura: fixed GLib-GIO-ERROR #21698 #21700

---
 pkgs/applications/misc/sakura/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 75866cbb971..66e40befe7c 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib }:
+{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "sakura-${version}";
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake perl pkgconfig ];
 
-  buildInputs = [ gtk3 vte pcre glib ];
+  buildInputs = [ makeWrapper gtk3 vte pcre glib ];
+
+  # Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ...
+  postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/";
 
   meta = with stdenv.lib; {
     description = "A terminal emulator based on GTK and VTE";

From 29e93555ec43618c8fee71a301a5485e1189ab9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Jan 2017 11:21:40 +0100
Subject: [PATCH 0655/1310] firefox*: fixup build after updating sed

I failed to simply patch the bad [:space:] usage; I don't know why.
---
 pkgs/applications/networking/browsers/firefox/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 3b0eb140516..6a688de02d0 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -44,7 +44,7 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
     ++ lib.optional enableGTK3 gtk3
     ++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst_plugins_base ];
 
-  nativeBuildInputs = [autoconf213 which];
+  nativeBuildInputs = [ autoconf213 which gnused ];
 
   configureFlags =
     [ "--enable-application=browser"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6827e1c164a..c2182870df9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13216,6 +13216,7 @@ in
     libpng = libpng_apng;
     enableGTK3 = false;
     python = python2;
+    gnused = gnused_422;
   }) firefox-unwrapped firefox-esr-unwrapped;
 
   firefox = wrapFirefox firefox-unwrapped { };

From 5ebee164fa9fa4f9ed0a52ba86faf845a6c3f172 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 6 Jan 2017 11:37:42 +0100
Subject: [PATCH 0656/1310] mpd: 0.9.19 -> 0.20

Add support for no-minor-version

@grahamc:
This includes 0.19.21 fix for some ffmpeg-related crash, do we expect
this to be a security issue worth updating in stable? Is it OK to just
put 0.20 there or do we want to have 0.9.21 bugfix release there?
---
 pkgs/servers/mpd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 4b26b92cdb2..5b2195b3d7e 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -29,14 +29,14 @@
 let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
-  major = "0.19";
-  minor = "19";
+  major = "0.20";
+  minor = "";
 
 in stdenv.mkDerivation rec {
-  name = "mpd-${major}.${minor}";
+  name = "mpd-${major}${if minor == "" then "" else "." + minor}";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
-    sha256 = "07af1m2lgblyiq0gcs26zv8n22wrhrpmf49xsm338h1n87d6r1dw";
+    sha256 = "068nxsfkp2ppcjh3fmcbapkiwnjpvkii73bfydpw4bf2yphdvsa8";
   };
 
   patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch;

From 98c9db00d8576f4ebe8e13ea857bd679118d4f06 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 6 Jan 2017 18:56:26 +0800
Subject: [PATCH 0657/1310] git-up: not a python package

1. git-up is a python package as such but an application, so move it out of python-packages.nix
2. get rid of the tests (we've already run the tests)
---
 .../version-management/git-up/default.nix     | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 pkgs/top-level/python-packages.nix            | 29 ---------------
 3 files changed, 38 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/applications/version-management/git-up/default.nix

diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
new file mode 100644
index 00000000000..c93ee924466
--- /dev/null
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, python2Packages, git }:
+
+python2Packages.buildPythonApplication rec {
+  version = "1.4.2";
+  name = "git-up-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/g/git-up/${name}.zip";
+    sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q";
+  };
+
+  buildInputs = [ git ] ++ (with python2Packages; [ nose ]);
+  propagatedBuildInputs = with python2Packages; [ click colorama docopt GitPython six termcolor ];
+
+  # 1. git fails to run as it cannot detect the email address, so we set it
+  # 2. $HOME is by default not a valid dir, so we have to set that too
+  # https://github.com/NixOS/nixpkgs/issues/12591
+  preCheck = ''
+      export HOME=$TMPDIR
+      git config --global user.email "nobody@example.com"
+      git config --global user.name "Nobody"
+    '';
+
+  postInstall = ''
+    rm -r $out/${python2Packages.python.sitePackages}/PyGitUp/tests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/msiemens/PyGitUp;
+    description = "A git pull replacement that rebases all local branches when pulling.";
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63cce742d7b..fa69f9c8aae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1863,6 +1863,8 @@ in
 
   git-lfs = callPackage ../applications/version-management/git-lfs { };
 
+  git-up = callPackage ../applications/version-management/git-up { };
+
   gitfs = callPackage ../tools/filesystems/gitfs { };
 
   gitinspector = callPackage ../applications/version-management/gitinspector { };
@@ -14516,7 +14518,7 @@ in
   qscreenshot = callPackage ../applications/graphics/qscreenshot {
     qt = qt4;
   };
-  
+
   qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 06fe9cbf1b2..3f3b30bca2f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7334,35 +7334,6 @@ in {
 
   };
 
-  git-up = buildPythonPackage rec {
-    version = "1.4.2";
-    name = "git-up-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/git-up/${name}.zip";
-      sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q";
-    };
-
-    buildInputs = with self; [ pkgs.git nose ];
-    propagatedBuildInputs = with self; [ click colorama docopt GitPython six termcolor ];
-
-    # git fails to run as it cannot detect the email address, so we set it
-    # $HOME is by default not a valid dir, so we have to set that too
-    # https://github.com/NixOS/nixpkgs/issues/12591
-    preCheck = ''
-      export HOME=$TMPDIR
-      git config --global user.email "nobody@example.com"
-      git config --global user.name "Nobody"
-    '';
-
-    meta = {
-      homepage = http://github.com/msiemens/PyGitUp;
-      description = "A git pull replacement that rebases all local branches when pulling.";
-      license = licenses.mit;
-      maintainers = with maintainers; [ peterhoeg ];
-    };
-  };
-
   GitPython = buildPythonPackage rec {
     version = "2.0.8";
     name = "GitPython-${version}";

From 74a97421ceaaa609ba94835d7d9a7f25bc592fe6 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 6 Jan 2017 11:57:40 +0100
Subject: [PATCH 0658/1310] lean: 2016-12-30 -> 2017-01-06

---
 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 af338338550..ece867de2a0 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 = "2016-12-30";
+  version = "2017-01-06";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
-    rev    = "fd4fffea27c442b12a45f664a8680ebb47482ca3";
-    sha256 = "1izbjxbr1nvv5kv2b7qklqjx2b1qmwrxhmvk0f2lrl9pxz9h0bmd";
+    rev    = "6f8ccb5873b6f72d735e700e25044e99c6ebb7b6";
+    sha256 = "1nxbqdc6faxivbrifb7b9j5zl5kml9w5pa63afh93z2ng7mn0jyg";
   };
 
   buildInputs = [ gmp mpfr cmake gperftools ];

From 4799971895a7594b8bef5db00c30f0b7e69498ff Mon Sep 17 00:00:00 2001
From: Richard Zetterberg <richard.zetterberg@googlemail.com>
Date: Thu, 5 Jan 2017 20:44:25 +0100
Subject: [PATCH 0659/1310] godot: init at 2.1.1-stable

Adds the [godot engine](https://godotengine.org/) at the latest stable
version.

Produced binary contains the tools and the engine itself.
---
 pkgs/development/tools/godot/default.nix      | 40 +++++++++++++++++++
 .../tools/godot/pkg_config_additions.patch    | 12 ++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/tools/godot/default.nix
 create mode 100644 pkgs/development/tools/godot/pkg_config_additions.patch

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
new file mode 100644
index 00000000000..7ebbc1b88e3
--- /dev/null
+++ b/pkgs/development/tools/godot/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, gcc, scons, pkgconfig, libX11, libXcursor
+, libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib
+, libpulseaudio, mesa, mesa_glu, zlib }:
+
+stdenv.mkDerivation rec {
+  name    = "godot-${version}";
+  version = "2.1.1-stable";
+
+  src = fetchFromGitHub {
+    owner  = "godotengine";
+    repo   = "godot";
+    rev    = version;
+    sha256 = "071qkm1l6yn2s9ha67y15w2phvy5m5wl3wqvrslhfmnsir3q3k01";
+  };
+
+  buildInputs = [
+    gcc scons pkgconfig libX11 libXcursor libXinerama libXrandr libXrender
+    freetype openssl alsaLib libpulseaudio mesa mesa_glu zlib
+  ];
+
+  patches = [ ./pkg_config_additions.patch ];
+
+  enableParallelBuilding = true;
+
+  buildPhase = ''
+    scons platform=x11 prefix=$out -j $NIX_BUILD_CORES
+  '';
+
+  installPhase = ''
+    mkdir $out/bin -p
+    cp bin/godot.* $out/bin/
+  '';
+
+  meta = {
+    homepage    = "http://godotengine.org";
+    description = "Free and Open Source 2D and 3D game engine";
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch
new file mode 100644
index 00000000000..f5e835a7374
--- /dev/null
+++ b/pkgs/development/tools/godot/pkg_config_additions.patch
@@ -0,0 +1,12 @@
++++ build/platform/x11/detect.py
+@@ -132,6 +132,10 @@
+     env.ParseConfig('pkg-config xinerama --cflags --libs')
+     env.ParseConfig('pkg-config xcursor --cflags --libs')
+     env.ParseConfig('pkg-config xrandr --cflags --libs')
++    env.ParseConfig('pkg-config xrender --cflags --libs')
++    env.ParseConfig('pkg-config osmesa --cflags')
++    env.ParseConfig('pkg-config glu --cflags --libs')
++    env.ParseConfig('pkg-config zlib --cflags --libs')
+
+     if (env['builtin_openssl'] == 'no'):
+         env.ParseConfig('pkg-config openssl --cflags --libs')
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e175e50d1f..76d36242ed0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1938,6 +1938,8 @@ in
 
   gocryptfs = callPackage ../tools/filesystems/gocrypfs { };
 
+  godot = callPackage ../development/tools/godot {};
+
   go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
 
   go-pup = callPackage ../development/tools/pup { };

From 9fc4536ac886c082790c48c47b3d90b250a879e4 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 12:46:05 +0100
Subject: [PATCH 0660/1310] mutagen: 1.34 -> 1.36

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 875837d1032..a278b2ecbfb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15016,16 +15016,16 @@ in {
   };
 
   mutagen = buildPythonPackage (rec {
-    name = "mutagen-1.34";
+    name = "mutagen-1.36";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/m/mutagen/${name}.tar.gz";
-      sha256 = "06anfzpjajwwh25n3afavwafrix3abahgwfr2zinrhqh2w98kw5s";
+      sha256 = "1kabb9b81hgvpd3wcznww549vss12b1xlvpnxg1r6n4c7gikgvnp";
     };
 
     # Needed for tests only
-    buildInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz
-      pkgs.glibcLocales
+    buildInputs = with self; [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz
+      pkgs.glibcLocales pytest
     ];
     LC_ALL = "en_US.UTF-8";
 

From 0b3e1e0486bd85fe8163cbc62d64fef3cc8a94c2 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 12:46:38 +0100
Subject: [PATCH 0661/1310] picard: remove unused buildInputs

---
 pkgs/applications/audio/picard/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 4b789e158bb..bbd59f56f70 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, python2Packages, fetchurl, gettext
-, pkgconfig, libofa, ffmpeg, chromaprint
-}:
+{ stdenv, python2Packages, fetchurl, gettext, chromaprint }:
 
 let
   version = "1.3.2";
@@ -14,12 +12,7 @@ in pythonPackages.buildPythonApplication {
     sha256 = "0821xb7gyg0rhch8s3qkzmak90wjpcxkv9a364yv6bmqc12j6a77";
   };
 
-  buildInputs = [
-    pkgconfig
-    ffmpeg
-    libofa
-    gettext
-  ];
+  buildInputs = [ gettext ];
 
   propagatedBuildInputs = with pythonPackages; [
     pyqt4

From 75fc704cfef3823b41b1dbca5c42ee0ca9b67645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Jan 2017 14:04:49 +0100
Subject: [PATCH 0662/1310] treewide: more fixes of phases after bash 4.3 ->
 4.4

---
 pkgs/applications/misc/pcmanx-gtk2/default.nix | 2 +-
 pkgs/misc/themes/orion/default.nix             | 1 -
 pkgs/tools/text/zimreader/default.nix          | 2 +-
 pkgs/tools/text/zimwriterfs/default.nix        | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix
index fb655ceba5d..87c4df3446e 100644
--- a/pkgs/applications/misc/pcmanx-gtk2/default.nix
+++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ];
 
-  preConfigurePhases = ''
+  preConfigure = ''
     ./autogen.sh
   '';
 
diff --git a/pkgs/misc/themes/orion/default.nix b/pkgs/misc/themes/orion/default.nix
index 4872d62ae51..9ba8cd368cf 100644
--- a/pkgs/misc/themes/orion/default.nix
+++ b/pkgs/misc/themes/orion/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation {
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
-  phases = "$prePhases unpackPhase installPhase fixupPhase $postPhases";
   installPhase = ''
     mkdir -p $out/share/themes/orion
     cp -r gtk-2.0 gtk-3.0 metacity-1 openbox-3 xfwm4 $out/share/themes/orion
diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix
index 449b1e9c339..1c508a9cf7e 100644
--- a/pkgs/tools/text/zimreader/default.nix
+++ b/pkgs/tools/text/zimreader/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ];
   setSourceRoot = "cd openzim-*/zimreader; export sourceRoot=`pwd`";
-  preConfigurePhases = [ "./autogen.sh" ];
+  preConfigure = "./autogen.sh";
 
   meta = {
     description = "A tool to serve ZIM files using HTTP";
diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix
index 62f0ff99123..db604d862b8 100644
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ automake autoconf libtool lzma pkgconfig zimlib file zlib ];
   setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`";
-  preConfigurePhases = [ "./autogen.sh" ];
+  preConfigure = "./autogen.sh";
 
   meta = {
     description = "A console tool to create ZIM files";

From 3c2cbd3259926a595a82fe502417b85e931002a1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 6 Jan 2017 08:39:12 -0500
Subject: [PATCH 0663/1310] ghc-head: bump

---
 pkgs/development/compilers/ghc/head.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 0581038d18d..081f554e06b 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -7,7 +7,7 @@ let
 
   commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
-  version = "8.1.20161224";
+  version = "8.1.20170106";
 
   commonPreConfigure =  ''
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
@@ -19,12 +19,12 @@ let
 in stdenv.mkDerivation (rec {
   inherit version;
   name = "ghc-${version}";
-  rev = "2689a1692636521777f007861a484e7064b2d696";
+  rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
 
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
     inherit rev;
-    sha256 = "0rk6xy7kgxx849nprq1ji459p88nyy93236g841m5p6mdh7mmrcr";
+    sha256 = "1h064nikx5srsd7qvz19f6dxvnpfjp0b3b94xs1f4nar18hzf4j0";
   };
 
   postPatch = "patchShebangs .";
@@ -86,9 +86,6 @@ in stdenv.mkDerivation (rec {
 } // stdenv.lib.optionalAttrs (cross != null) {
   name = "${cross.config}-ghc-${version}";
 
-  # Some fixes for cross-compilation to iOS. See https://phabricator.haskell.org/D2710 (D2711,D2712,D2713)
-  patches = [ ./D2710.patch ./D2711.patch ./D2712.patch ./D2713.patch ];
-
   preConfigure = commonPreConfigure + ''
     sed 's|#BuildFlavour  = quick-cross|BuildFlavour  = perf-cross|' mk/build.mk.sample > mk/build.mk
   '';

From cf1d3677d3470e3d5a00f2151aa0e09caefd3412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Jan 2017 16:11:47 +0100
Subject: [PATCH 0664/1310] flex: bring back 2.6.1 as an option

Some breakages after flex update aren't so easy to fix,
and I can't really afford to spend much time on it ATM.
---
 pkgs/development/tools/parsing/flex/2.6.1.nix | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/tools/parsing/flex/2.6.1.nix

diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix
new file mode 100644
index 00000000000..7ee2e27e60a
--- /dev/null
+++ b/pkgs/development/tools/parsing/flex/2.6.1.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, bison, m4 }:
+
+stdenv.mkDerivation rec {
+  name = "flex-2.6.1";
+
+  src = fetchurl {
+    url = "https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.gz";
+    sha256 = "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw";
+  };
+
+  buildInputs = [ bison ];
+
+  propagatedNativeBuildInputs = [ m4 ];
+
+  postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
+    sed -i Makefile -e 's/-no-undefined//;'
+  '';
+
+  crossAttrs = {
+
+    # disable tests which can't run on build machine
+    postPatch = ''
+      substituteInPlace Makefile.in --replace "tests" " ";
+    '';
+
+    preConfigure = ''
+      export ac_cv_func_malloc_0_nonnull=yes
+      export ac_cv_func_realloc_0_nonnull=yes
+    '';
+  };
+
+  meta = {
+    homepage = https://github.com/westes/flex;
+    description = "A fast lexical analyser generator";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2182870df9..50322082cd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6276,6 +6276,7 @@ in
   jdepend = callPackage ../development/tools/analysis/jdepend { };
 
   flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
+  flex_2_6_1 = callPackage ../development/tools/parsing/flex/2.6.1.nix { };
   flex = callPackage ../development/tools/parsing/flex/default.nix { };
 
   flexcpp = callPackage ../development/tools/parsing/flexc++ { };

From d442a0ffc0ad7e33fa0fddaf0365caf80193a224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Jan 2017 16:25:17 +0100
Subject: [PATCH 0665/1310] wine*: fixup build by using older flex

---
 pkgs/misc/emulators/wine/base.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 66ea152b274..d556f94b78c 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, pkgArches,
   name, version, src, monos, geckos, platforms,
-  pkgconfig, fontforge, makeWrapper, flex, bison,
+  # flex 2.6.3 causes: undefined reference to `yywrap'
+  pkgconfig, fontforge, makeWrapper, flex_2_6_1, bison,
   supportFlags,
   buildScript ? null, configureFlags ? ""
 }:
@@ -16,7 +17,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   inherit name src configureFlags;
 
   nativeBuildInputs = [
-    pkgconfig fontforge makeWrapper flex bison
+    pkgconfig fontforge makeWrapper flex_2_6_1 bison
   ];
 
   buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs:

From 321d5a01b62bfdd2ba68c7dc662ef02796a16d0b Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 16:31:30 +0100
Subject: [PATCH 0666/1310] r-modules: fix seewave package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 2ef3fbdd076..093bc2f7884 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -340,7 +340,7 @@ let
     rzmq = [ pkgs.zeromq3 ];
     SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
     sdcTable = [ pkgs.gmp pkgs.glpk ];
-    seewave = [ pkgs.fftw pkgs.libsndfile ];
+    seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ];
     seqinr = [ pkgs.zlib ];
     seqminer = [ pkgs.zlib pkgs.bzip2 ];
     showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ];

From 7ee897a3b3aa75dc53bd408ceea5f9e4e98822b2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 6 Jan 2017 10:37:04 -0500
Subject: [PATCH 0667/1310] libuv: Tests fail when cross-compiling

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

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index f9e7cf389bb..fd422a514ef 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  crossAttrs.doCheck = false;
+
   meta = with lib; {
     description = "A multi-platform support library with a focus on asynchronous I/O";
     homepage    = https://github.com/libuv/libuv;

From 7f99fd086b70dec7419d3402e076656850e9e68e Mon Sep 17 00:00:00 2001
From: 3noch <eacameron@gmail.com>
Date: Thu, 5 Jan 2017 16:33:11 -0500
Subject: [PATCH 0668/1310] nginx: add 'cache_purge' module for purging FastCGI
 cache

---
 pkgs/servers/http/nginx/modules.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index e5c53aec726..d19c147ce93 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -136,4 +136,14 @@
       sha256 = "0h98a8kiw2qkqfavysm1v16kf4cs4h39j583wapif4p0qx3bbm89";
     };
   };
+
+  # For an example usage, see https://easyengine.io/wordpress-nginx/tutorials/single-site/fastcgi-cache-with-purging/
+  fastcgi-cache-purge = {
+    src = fetchFromGitHub {
+      owner  = "FRiCKLE";
+      repo   = "ngx_cache_purge";
+      rev    = "2.3";
+      sha256 = "0ib2jrbjwrhvmihhnzkp4w87fxssbbmmmj6lfdwpm6ni8p9g60dw";
+    };
+  };
 }

From 3799f9322ae1d6a26748bdbf6932b0b4a5dba05b Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@aubble.com>
Date: Fri, 6 Jan 2017 08:48:58 -0500
Subject: [PATCH 0669/1310] neovim: removed unncessary man configuration

Latest neovim uses a rewritten man plugin that does not need
these changes.
---
 pkgs/applications/editors/neovim/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index a9a9b6952bd..cbaf14cee60 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
-, libtool, libuv, luajit, luaPackages, man, ncurses, perl, pkgconfig
+, libtool, libuv, luajit, luaPackages, ncurses, perl, pkgconfig
 , unibilium, makeWrapper, vimUtils, xsel, gperf
 
 , withPython ? true, pythonPackages, extraPythonPackages ? []
@@ -118,10 +118,7 @@ let
     # triggers on buffer overflow bug while running tests
     hardeningDisable = [ "fortify" ];
 
-    preConfigure = ''
-      substituteInPlace runtime/autoload/man.vim \
-        --replace /usr/bin/man ${man}/bin/man
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
       export DYLD_LIBRARY_PATH=${jemalloc}/lib
       substituteInPlace src/nvim/CMakeLists.txt --replace "    util" ""
     '';

From f3381f0be2949a44613ae8d0a17ff307200e2426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 6 Jan 2017 19:00:17 +0100
Subject: [PATCH 0670/1310] electron: 1.2.2 -> 1.4.13

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

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index e789370d585..1bd7ac76bb1 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
 
 let
-  version = "1.2.2";
+  version = "1.4.13";
   name = "electron-${version}";
 
   meta = with stdenv.lib; {
@@ -17,7 +17,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-      sha256 = "0jqzs1297f6w7s4j9pd7wyyqbidb0c61yjz47raafslg6nljgp1c";
+      sha256 = "1fd8axaln31c550dh7dnfwigrp44ahp142cklpdc57mz34xjawp3";
       name = "${name}.zip";
     };
 
@@ -45,7 +45,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
-      sha256 = "0rqlpj3400qjsfj8k4lwajrwv5l6f8mhrpvsma7p36fw5qjbwp1z";
+      sha256 = "0aa4wrba1y7pab5g6bzxagj5dfl9bqrbpj3bbi5v5gsd0h34k0yx";
       name = "${name}.zip";
     };
 

From 6d3183e7daa07d730d644803b842c0696e02f01e Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Tue, 13 Dec 2016 00:45:05 +0100
Subject: [PATCH 0671/1310] nghttp2: refactor (close #21029)

Turning the dependencies unrelated to the base libnghttp2 into proper
options.  vcunat modified the commit slightly.
---
 pkgs/development/libraries/nghttp2/default.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index f7a026c52d4..0697b05c0a5 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -2,9 +2,19 @@
 
 # Optional Dependencies
 , openssl ? null, libev ? null, zlib ? null
-#, jansson ? null, boost ? null, libxml2 ? null, jemalloc ? null
+, enableHpack ? false, jansson ? null
+, enableAsioLib ? false, boost ? null
+, enableGetAssets ? false, libxml2 ? null
+, enableJemalloc ? false, jemalloc ? null
 }:
 
+assert enableHpack -> jansson != null;
+assert enableAsioLib -> boost != null;
+assert enableGetAssets -> libxml2 != null;
+assert enableJemalloc -> jemalloc != null;
+
+with { inherit (stdenv.lib) optional; };
+
 stdenv.mkDerivation rec {
   name = "nghttp2-${version}";
   version = "1.17.0";
@@ -18,7 +28,11 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "lib" ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl libev zlib ];
+  buildInputs = [ openssl libev zlib ]
+    ++ optional enableHpack jansson
+    ++ optional enableAsioLib boost
+    ++ optional enableGetAssets libxml2
+    ++ optional enableJemalloc jemalloc;
 
   enableParallelBuilding = true;
 

From 1f7b090580e6dba8cb7fc7b828cb759bef4f89bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Jan 2017 21:05:08 +0100
Subject: [PATCH 0672/1310] mesa: maintenance 13.0.2 -> 13.0.3

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index c363cbcd371..2fc1bfea084 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -26,7 +26,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then
 else
 
 let
-  version = "13.0.2";
+  version = "13.0.3";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
     ];
-    sha256 = "a6ed622645f4ed61da418bf65adde5bcc4bb79023c36ba7d6b45b389da4416d5";
+    sha256 = "d9aa8be5c176d00d0cd503cb2f64a5a403ea471ec819c022581414860d7ba40e";
   };
 
   prePatch = "patchShebangs .";

From 6f9124e11860095d90515e7fb8f702f1779b3fe8 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 17:11:23 +0100
Subject: [PATCH 0673/1310] r-modules: fix Cairo package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 093bc2f7884..529c6db091d 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -247,7 +247,7 @@ let
     bnpmr = [ pkgs.gsl_1 ];
     BNSP = [ pkgs.gsl_1 ];
     cairoDevice = [ pkgs.gtk2 ];
-    Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ];
+    Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo.dev pkgs.x11 pkgs.fontconfig.lib ];
     Cardinal = [ pkgs.which ];
     chebpol = [ pkgs.fftw ];
     ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ];
@@ -1791,6 +1791,10 @@ let
         '';
     });
 
+    Cairo = old.Cairo.overrideDerivation (attrs: {
+      NIX_LDFLAGS = "-lfontconfig";
+    });
+
     curl = old.curl.overrideDerivation (attrs: {
       preConfigure = "patchShebangs configure";
     });

From 88fcfafafe33625edefc5b195ce5fd744ba72d95 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 17:30:04 +0100
Subject: [PATCH 0674/1310] r-modules: fix BayesXsrc package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 529c6db091d..6f1807b4138 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -240,7 +240,7 @@ let
     audio = [ pkgs.portaudio ];
     BayesSAE = [ pkgs.gsl_1 ];
     BayesVarSel = [ pkgs.gsl_1 ];
-    BayesXsrc = [ pkgs.readline pkgs.ncurses ];
+    BayesXsrc = [ pkgs.readline.dev pkgs.ncurses ];
     bigGP = [ pkgs.openmpi ];
     BiocCheck = [ pkgs.which ];
     Biostrings = [ pkgs.zlib ];

From f7175388663e600b792c1c22a5b0ba887a7c45aa Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 17:34:21 +0100
Subject: [PATCH 0675/1310] r-modules: fix git2r package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 6f1807b4138..64e889d7612 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -260,7 +260,7 @@ let
     fftwtools = [ pkgs.fftw ];
     Formula = [ pkgs.gmp ];
     geoCount = [ pkgs.gsl_1 ];
-    git2r = [ pkgs.zlib pkgs.openssl ];
+    git2r = [ pkgs.zlib.dev pkgs.openssl.dev ];
     GLAD = [ pkgs.gsl_1 ];
     glpkAPI = [ pkgs.gmp pkgs.glpk ];
     gmp = [ pkgs.gmp ];

From 6c6aab3e5b545d4d58c80b29c839f23e0f86fa73 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 17:41:42 +0100
Subject: [PATCH 0676/1310] r-modules: fix cairoDevice package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 64e889d7612..29859f37509 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -246,7 +246,7 @@ let
     Biostrings = [ pkgs.zlib ];
     bnpmr = [ pkgs.gsl_1 ];
     BNSP = [ pkgs.gsl_1 ];
-    cairoDevice = [ pkgs.gtk2 ];
+    cairoDevice = [ pkgs.gtk2.dev ];
     Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo.dev pkgs.x11 pkgs.fontconfig.lib ];
     Cardinal = [ pkgs.which ];
     chebpol = [ pkgs.fftw ];

From b88b8ea05b530170a355798ec44940490cb0352f Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 17:58:58 +0100
Subject: [PATCH 0677/1310] r-modules: fix devEMF package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 29859f37509..16c6d22eeeb 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -253,7 +253,7 @@ let
     ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ];
     cit = [ pkgs.gsl_1 ];
     curl = [ pkgs.curl.dev ];
-    devEMF = [ pkgs.xorg.libXft ];
+    devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ];
     diversitree = [ pkgs.gsl_1 pkgs.fftw ];
     EMCluster = [ pkgs.liblapack ];
     fftw = [ pkgs.fftw ];
@@ -1863,6 +1863,7 @@ let
 
     devEMF = old.devEMF.overrideDerivation (attrs: {
       NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft.out}/lib -lXft";
+      NIX_LDFLAGS = "-lX11";
     });
 
     slfm = old.slfm.overrideDerivation (attrs: {

From 427c4d954a0c1c4447fd6ee3973de6eafe71699d Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 18:15:14 +0100
Subject: [PATCH 0678/1310] r-modules: fix fftw package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 16c6d22eeeb..d4747910523 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -256,7 +256,7 @@ let
     devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ];
     diversitree = [ pkgs.gsl_1 pkgs.fftw ];
     EMCluster = [ pkgs.liblapack ];
-    fftw = [ pkgs.fftw ];
+    fftw = [ pkgs.fftw.dev ];
     fftwtools = [ pkgs.fftw ];
     Formula = [ pkgs.gmp ];
     geoCount = [ pkgs.gsl_1 ];

From 72eb6a8644ec073bf0a2fc9556388922a9e78c19 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 18:16:44 +0100
Subject: [PATCH 0679/1310] r-modules: fix fftwtools package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d4747910523..96d0d8af457 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -257,7 +257,7 @@ let
     diversitree = [ pkgs.gsl_1 pkgs.fftw ];
     EMCluster = [ pkgs.liblapack ];
     fftw = [ pkgs.fftw.dev ];
-    fftwtools = [ pkgs.fftw ];
+    fftwtools = [ pkgs.fftw.dev ];
     Formula = [ pkgs.gmp ];
     geoCount = [ pkgs.gsl_1 ];
     git2r = [ pkgs.zlib.dev pkgs.openssl.dev ];

From e3a2c97c7b8cdb783cd655cc6d093ff539d47b2b Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 18:20:41 +0100
Subject: [PATCH 0680/1310] r-modules: fix gmp package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 96d0d8af457..37c6b4e8134 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -263,7 +263,7 @@ let
     git2r = [ pkgs.zlib.dev pkgs.openssl.dev ];
     GLAD = [ pkgs.gsl_1 ];
     glpkAPI = [ pkgs.gmp pkgs.glpk ];
-    gmp = [ pkgs.gmp ];
+    gmp = [ pkgs.gmp.dev ];
     graphscan = [ pkgs.gsl_1 ];
     gsl = [ pkgs.gsl_1 ];
     h5 = [ pkgs.hdf5-cpp pkgs.which ];

From debb12ce1a5e06fb2348746ac34c1dbc8567a496 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:17:19 +0100
Subject: [PATCH 0681/1310] r-module: fix jpeg package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 37c6b4e8134..509dba07f98 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -272,7 +272,7 @@ let
     iBMQ = [ pkgs.gsl_1 ];
     igraph = [ pkgs.gmp ];
     JavaGD = [ pkgs.jdk ];
-    jpeg = [ pkgs.libjpeg ];
+    jpeg = [ pkgs.libjpeg.dev ];
     KFKSDS = [ pkgs.gsl_1 ];
     kza = [ pkgs.fftw ];
     libamtrack = [ pkgs.gsl_1 ];

From 4e7de52c26580f9bad962d2507bc1239df4abffd Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:18:27 +0100
Subject: [PATCH 0682/1310] r-module: fix kza package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 509dba07f98..a81fc649a46 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -274,7 +274,7 @@ let
     JavaGD = [ pkgs.jdk ];
     jpeg = [ pkgs.libjpeg.dev ];
     KFKSDS = [ pkgs.gsl_1 ];
-    kza = [ pkgs.fftw ];
+    kza = [ pkgs.fftw.dev ];
     libamtrack = [ pkgs.gsl_1 ];
     mixcat = [ pkgs.gsl_1 ];
     mvabund = [ pkgs.gsl_1 ];

From 1e9071948f646be2d459fbb2403619a8c6ddffbb Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:19:27 +0100
Subject: [PATCH 0683/1310] r-modules: fix mwaved package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index a81fc649a46..3e3bb65d1bb 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -278,7 +278,7 @@ let
     libamtrack = [ pkgs.gsl_1 ];
     mixcat = [ pkgs.gsl_1 ];
     mvabund = [ pkgs.gsl_1 ];
-    mwaved = [ pkgs.fftw ];
+    mwaved = [ pkgs.fftw.dev ];
     ncdf4 = [ pkgs.netcdf ];
     nloptr = [ pkgs.nlopt ];
     openssl = [ pkgs.openssl.dev ];

From c5ef08cc655bab0f06c0f81402e64b87269593e0 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:23:42 +0100
Subject: [PATCH 0684/1310] r-modules: fix PKI package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 3e3bb65d1bb..07070a6e775 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -287,7 +287,7 @@ let
     pbdMPI = [ pkgs.openmpi ];
     pbdNCDF4 = [ pkgs.netcdf ];
     pbdPROF = [ pkgs.openmpi ];
-    PKI = [ pkgs.openssl ];
+    PKI = [ pkgs.openssl.dev ];
     png = [ pkgs.libpng.dev ];
     PopGenome = [ pkgs.zlib ];
     proj4 = [ pkgs.proj ];

From 062c9037d144ae4b7c49f6d4212a994485d4aa6a Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:25:06 +0100
Subject: [PATCH 0685/1310] r-modules: fix PopGenome package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 07070a6e775..193b8b7baac 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -289,7 +289,7 @@ let
     pbdPROF = [ pkgs.openmpi ];
     PKI = [ pkgs.openssl.dev ];
     png = [ pkgs.libpng.dev ];
-    PopGenome = [ pkgs.zlib ];
+    PopGenome = [ pkgs.zlib.dev ];
     proj4 = [ pkgs.proj ];
     qtbase = [ pkgs.qt4 ];
     qtpaint = [ pkgs.qt4 ];

From 277efe9896d805ac1fa98d69cc0c4a480533b83b Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:27:45 +0100
Subject: [PATCH 0686/1310] r-modules: fix sysfonts package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 193b8b7baac..c861f29223f 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -352,7 +352,7 @@ let
     stsm = [ pkgs.gsl_1 ];
     stringi = [ pkgs.icu.dev ];
     survSNP = [ pkgs.gsl_1 ];
-    sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
+    sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ];
     TAQMNGR = [ pkgs.zlib ];
     tiff = [ pkgs.libtiff ];
     TKF = [ pkgs.gsl_1 ];

From 558f67e85f93268f172d3b30439a66fe221f87ac Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:30:56 +0100
Subject: [PATCH 0687/1310] r-modules: fix R2SWF package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index c861f29223f..f5b4009dd85 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -294,7 +294,7 @@ let
     qtbase = [ pkgs.qt4 ];
     qtpaint = [ pkgs.qt4 ];
     R2GUESS = [ pkgs.gsl_1 ];
-    R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
+    R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ];
     RAppArmor = [ pkgs.libapparmor ];
     rapportools = [ pkgs.which ];
     rapport = [ pkgs.which ];

From 8b229baf334cb0df5a691523206ea6df914bcabf Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:33:45 +0100
Subject: [PATCH 0688/1310] r-modules: fix rbamtools package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index f5b4009dd85..45645e87c27 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -298,7 +298,7 @@ let
     RAppArmor = [ pkgs.libapparmor ];
     rapportools = [ pkgs.which ];
     rapport = [ pkgs.which ];
-    rbamtools = [ pkgs.zlib ];
+    rbamtools = [ pkgs.zlib.dev ];
     rcdd = [ pkgs.gmp ];
     RcppCNPy = [ pkgs.zlib ];
     RcppGSL = [ pkgs.gsl_1 ];

From dd159d06b6c793fb6f06c3b4bb5267f314b8e614 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:34:30 +0100
Subject: [PATCH 0689/1310] r-modules: fix rcdd package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 45645e87c27..c7ac571ce4c 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -299,7 +299,7 @@ let
     rapportools = [ pkgs.which ];
     rapport = [ pkgs.which ];
     rbamtools = [ pkgs.zlib.dev ];
-    rcdd = [ pkgs.gmp ];
+    rcdd = [ pkgs.gmp.dev ];
     RcppCNPy = [ pkgs.zlib ];
     RcppGSL = [ pkgs.gsl_1 ];
     RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ];

From ba86a3964566cbefdd1badcad84c5054f84604ea Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:35:20 +0100
Subject: [PATCH 0690/1310] r-modules: fix RcppCNPy package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index c7ac571ce4c..1908c08d52c 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -300,7 +300,7 @@ let
     rapport = [ pkgs.which ];
     rbamtools = [ pkgs.zlib.dev ];
     rcdd = [ pkgs.gmp.dev ];
-    RcppCNPy = [ pkgs.zlib ];
+    RcppCNPy = [ pkgs.zlib.dev ];
     RcppGSL = [ pkgs.gsl_1 ];
     RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ];
     RcppZiggurat = [ pkgs.gsl_1 ];

From 3342f8bd59728902c915434d215492587100cd2e Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:38:00 +0100
Subject: [PATCH 0691/1310] r-modules: fix RcppOctave package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 1908c08d52c..b79d945d2a9 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -302,7 +302,7 @@ let
     rcdd = [ pkgs.gmp.dev ];
     RcppCNPy = [ pkgs.zlib.dev ];
     RcppGSL = [ pkgs.gsl_1 ];
-    RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ];
+    RcppOctave = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.octave ];
     RcppZiggurat = [ pkgs.gsl_1 ];
     rgdal = [ pkgs.proj pkgs.gdal ];
     rgeos = [ pkgs.geos ];

From 9f2b5e0425c1cde3594ffc274ea07c343554a749 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:51:28 +0100
Subject: [PATCH 0692/1310] r-modules: fix RGtk2 package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index b79d945d2a9..65d1dcd6bc2 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -309,7 +309,7 @@ let
     rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ];
     rgl = [ pkgs.mesa pkgs.xlibsWrapper ];
     Rglpk = [ pkgs.glpk ];
-    RGtk2 = [ pkgs.gtk2 ];
+    RGtk2 = [ pkgs.gtk2.dev ];
     rhdf5 = [ pkgs.zlib ];
     Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ];
     Rhtslib = [ pkgs.zlib ];

From e1bc505da9a5c2b292929937c5fea59c8b9ab064 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:54:01 +0100
Subject: [PATCH 0693/1310] r-modules: fix rggobi package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 65d1dcd6bc2..a5fe9b5cd90 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -306,7 +306,7 @@ let
     RcppZiggurat = [ pkgs.gsl_1 ];
     rgdal = [ pkgs.proj pkgs.gdal ];
     rgeos = [ pkgs.geos ];
-    rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ];
+    rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ];
     rgl = [ pkgs.mesa pkgs.xlibsWrapper ];
     Rglpk = [ pkgs.glpk ];
     RGtk2 = [ pkgs.gtk2.dev ];

From bb60f939aeb108ab4bdfbfa5fddfc403168e22e4 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:56:22 +0100
Subject: [PATCH 0694/1310] r-modules: fix Rhpc package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index a5fe9b5cd90..8ea725401eb 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -311,7 +311,7 @@ let
     Rglpk = [ pkgs.glpk ];
     RGtk2 = [ pkgs.gtk2.dev ];
     rhdf5 = [ pkgs.zlib ];
-    Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ];
+    Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.openmpi pkgs.pcre.dev ];
     Rhtslib = [ pkgs.zlib ];
     RJaCGH = [ pkgs.zlib ];
     rjags = [ pkgs.jags ];

From 9922867fa889ec8b5ebd8b8ac39bc6effcdaeb30 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:57:30 +0100
Subject: [PATCH 0695/1310] r-modules: fix Rhtslib package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 8ea725401eb..9e4952dc54a 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -312,7 +312,7 @@ let
     RGtk2 = [ pkgs.gtk2.dev ];
     rhdf5 = [ pkgs.zlib ];
     Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.openmpi pkgs.pcre.dev ];
-    Rhtslib = [ pkgs.zlib ];
+    Rhtslib = [ pkgs.zlib.dev ];
     RJaCGH = [ pkgs.zlib ];
     rjags = [ pkgs.jags ];
     rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ];

From 13a582688f3358381820d17bdceef5670ee97585 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 19:59:17 +0100
Subject: [PATCH 0696/1310] r-modules: fix RJaCGH package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 9e4952dc54a..d1ce64aad04 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -313,7 +313,7 @@ let
     rhdf5 = [ pkgs.zlib ];
     Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.openmpi pkgs.pcre.dev ];
     Rhtslib = [ pkgs.zlib.dev ];
-    RJaCGH = [ pkgs.zlib ];
+    RJaCGH = [ pkgs.zlib.dev ];
     rjags = [ pkgs.jags ];
     rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ];
     Rlibeemd = [ pkgs.gsl_1 ];

From 674a2077dd10600e2f56c0824a0d0a0f5456e0ec Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:00:33 +0100
Subject: [PATCH 0697/1310] r-modules: fix rJava package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d1ce64aad04..5d8ed3769a6 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -315,7 +315,7 @@ let
     Rhtslib = [ pkgs.zlib.dev ];
     RJaCGH = [ pkgs.zlib.dev ];
     rjags = [ pkgs.jags ];
-    rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ];
+    rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ];
     Rlibeemd = [ pkgs.gsl_1 ];
     rmatio = [ pkgs.zlib ];
     Rmpfr = [ pkgs.gmp pkgs.mpfr ];

From a58db75ccb51734a3e345c48017438a25b015645 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:01:17 +0100
Subject: [PATCH 0698/1310] r-modules: fix rmatio package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 5d8ed3769a6..3765c88119e 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -317,7 +317,7 @@ let
     rjags = [ pkgs.jags ];
     rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ];
     Rlibeemd = [ pkgs.gsl_1 ];
-    rmatio = [ pkgs.zlib ];
+    rmatio = [ pkgs.zlib.dev ];
     Rmpfr = [ pkgs.gmp pkgs.mpfr ];
     Rmpi = [ pkgs.openmpi ];
     RMySQL = [ pkgs.zlib pkgs.mysql.lib ];

From 780fb79e32671e18c9fcdbe6b6a06b87e69a9a62 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:02:17 +0100
Subject: [PATCH 0699/1310] r-modules: fix Rmpfr package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 3765c88119e..a669d08381b 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -318,7 +318,7 @@ let
     rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ];
     Rlibeemd = [ pkgs.gsl_1 ];
     rmatio = [ pkgs.zlib.dev ];
-    Rmpfr = [ pkgs.gmp pkgs.mpfr ];
+    Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ];
     Rmpi = [ pkgs.openmpi ];
     RMySQL = [ pkgs.zlib pkgs.mysql.lib ];
     RNetCDF = [ pkgs.netcdf pkgs.udunits ];

From 53235dbe1487264c9785e6357b6f40ab5a2fa5b8 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:06:44 +0100
Subject: [PATCH 0700/1310] r-modules: fix rphast package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index a669d08381b..2014192ce94 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -325,7 +325,7 @@ let
     RODBCext = [ pkgs.libiodbc ];
     RODBC = [ pkgs.libiodbc ];
     rpg = [ pkgs.postgresql ];
-    rphast = [ pkgs.pcre pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ];
+    rphast = [ pkgs.pcre.dev pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ];
     Rpoppler = [ pkgs.poppler ];
     RPostgreSQL = [ pkgs.postgresql ];
     RProtoBuf = [ pkgs.protobuf ];

From bd2aaada6eac1f68a2790737c5b85d037040ae00 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:09:43 +0100
Subject: [PATCH 0701/1310] r-modules: fix RSclient package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 2014192ce94..293cdbaa7d2 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -330,7 +330,7 @@ let
     RPostgreSQL = [ pkgs.postgresql ];
     RProtoBuf = [ pkgs.protobuf ];
     rPython = [ pkgs.python ];
-    RSclient = [ pkgs.openssl ];
+    RSclient = [ pkgs.openssl.dev ];
     Rserve = [ pkgs.openssl ];
     Rssa = [ pkgs.fftw ];
     rtfbs = [ pkgs.zlib pkgs.pcre pkgs.bzip2 pkgs.gzip pkgs.readline ];

From fd175e4084d961c7466be90d2723da646a6397f4 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:13:30 +0100
Subject: [PATCH 0702/1310] r-modules: fix Rssa package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 293cdbaa7d2..4ab142891c4 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -332,7 +332,7 @@ let
     rPython = [ pkgs.python ];
     RSclient = [ pkgs.openssl.dev ];
     Rserve = [ pkgs.openssl ];
-    Rssa = [ pkgs.fftw ];
+    Rssa = [ pkgs.fftw.dev ];
     rtfbs = [ pkgs.zlib pkgs.pcre pkgs.bzip2 pkgs.gzip pkgs.readline ];
     rtiff = [ pkgs.libtiff ];
     runjags = [ pkgs.jags ];

From d7ac90dd0c7a5169ff570fce1d672c43365b1571 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:16:49 +0100
Subject: [PATCH 0703/1310] r-modules: fix rtfbs package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 4ab142891c4..6802bd1d539 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -333,7 +333,7 @@ let
     RSclient = [ pkgs.openssl.dev ];
     Rserve = [ pkgs.openssl ];
     Rssa = [ pkgs.fftw.dev ];
-    rtfbs = [ pkgs.zlib pkgs.pcre pkgs.bzip2 pkgs.gzip pkgs.readline ];
+    rtfbs = [ pkgs.zlib pkgs.pcre.dev pkgs.bzip2 pkgs.gzip pkgs.readline ];
     rtiff = [ pkgs.libtiff ];
     runjags = [ pkgs.jags ];
     RVowpalWabbit = [ pkgs.zlib pkgs.boost ];

From ae2723a1442e698ec74d9eca09ced7e0ce9c5a77 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:17:42 +0100
Subject: [PATCH 0704/1310] r-modules: fix rtiff package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 6802bd1d539..ed1e276dbbb 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -334,7 +334,7 @@ let
     Rserve = [ pkgs.openssl ];
     Rssa = [ pkgs.fftw.dev ];
     rtfbs = [ pkgs.zlib pkgs.pcre.dev pkgs.bzip2 pkgs.gzip pkgs.readline ];
-    rtiff = [ pkgs.libtiff ];
+    rtiff = [ pkgs.libtiff.dev ];
     runjags = [ pkgs.jags ];
     RVowpalWabbit = [ pkgs.zlib pkgs.boost ];
     rzmq = [ pkgs.zeromq3 ];

From 1ef67b9e781efd72aebeb8db1507a10e4e6adbae Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:22:07 +0100
Subject: [PATCH 0705/1310] r-modules: fix RVowpalWabbit package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index ed1e276dbbb..f731e1498e8 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -336,7 +336,7 @@ let
     rtfbs = [ pkgs.zlib pkgs.pcre.dev pkgs.bzip2 pkgs.gzip pkgs.readline ];
     rtiff = [ pkgs.libtiff.dev ];
     runjags = [ pkgs.jags ];
-    RVowpalWabbit = [ pkgs.zlib pkgs.boost ];
+    RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ];
     rzmq = [ pkgs.zeromq3 ];
     SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
     sdcTable = [ pkgs.gmp pkgs.glpk ];

From e1a5eeef06e1b83066ca0645fb2e29e3dbca1f17 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:26:40 +0100
Subject: [PATCH 0706/1310] r-modules: fix seqinr package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index f731e1498e8..a2570c8384f 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -341,7 +341,7 @@ let
     SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
     sdcTable = [ pkgs.gmp pkgs.glpk ];
     seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ];
-    seqinr = [ pkgs.zlib ];
+    seqinr = [ pkgs.zlib.dev ];
     seqminer = [ pkgs.zlib pkgs.bzip2 ];
     showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ];
     simplexreg = [ pkgs.gsl_1 ];

From 8a6b58d51d767e043206b3d821e14b4c543ec1d4 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:28:22 +0100
Subject: [PATCH 0707/1310] r-modules: fix seqminer package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index a2570c8384f..6a36f9ca7b4 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -342,7 +342,7 @@ let
     sdcTable = [ pkgs.gmp pkgs.glpk ];
     seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ];
     seqinr = [ pkgs.zlib.dev ];
-    seqminer = [ pkgs.zlib pkgs.bzip2 ];
+    seqminer = [ pkgs.zlib.dev pkgs.bzip2 ];
     showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ];
     simplexreg = [ pkgs.gsl_1 ];
     SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h

From fcbed4b6549e30a5ac696acd9d068db58ce07451 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:29:12 +0100
Subject: [PATCH 0708/1310] r-modules: fix showtext package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 6a36f9ca7b4..5069d67ad72 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -343,7 +343,7 @@ let
     seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ];
     seqinr = [ pkgs.zlib.dev ];
     seqminer = [ pkgs.zlib.dev pkgs.bzip2 ];
-    showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ];
+    showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype.dev ];
     simplexreg = [ pkgs.gsl_1 ];
     SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h
     spate = [ pkgs.fftw ];

From 2303e631165727b94467bd5c1ec16cf8c5c2d3cc Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:30:01 +0100
Subject: [PATCH 0709/1310] r-modules: fix spate package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 5069d67ad72..be7b7a8143e 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -346,7 +346,7 @@ let
     showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype.dev ];
     simplexreg = [ pkgs.gsl_1 ];
     SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h
-    spate = [ pkgs.fftw ];
+    spate = [ pkgs.fftw.dev ];
     sprint = [ pkgs.openmpi ];
     ssanv = [ pkgs.proj ];
     stsm = [ pkgs.gsl_1 ];

From 9420fa23c65dd5276e7214cff01949e1818504d5 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:31:16 +0100
Subject: [PATCH 0710/1310] r-modules: fix TAQMNGR package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index be7b7a8143e..0fcf06b25f5 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -353,7 +353,7 @@ let
     stringi = [ pkgs.icu.dev ];
     survSNP = [ pkgs.gsl_1 ];
     sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ];
-    TAQMNGR = [ pkgs.zlib ];
+    TAQMNGR = [ pkgs.zlib.dev ];
     tiff = [ pkgs.libtiff ];
     TKF = [ pkgs.gsl_1 ];
     tkrplot = [ pkgs.xorg.libX11 ];

From 0b3e62bb125d6f57dc50b9c0c085e22075a2e1a3 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:32:48 +0100
Subject: [PATCH 0711/1310] r-modules: fix tiff package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 0fcf06b25f5..14006311607 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -354,7 +354,7 @@ let
     survSNP = [ pkgs.gsl_1 ];
     sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ];
     TAQMNGR = [ pkgs.zlib.dev ];
-    tiff = [ pkgs.libtiff ];
+    tiff = [ pkgs.libtiff.dev ];
     TKF = [ pkgs.gsl_1 ];
     tkrplot = [ pkgs.xorg.libX11 ];
     topicmodels = [ pkgs.gsl_1 ];

From f9d84f8b65be0aecd17802f13fc7de2845ef26d9 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:37:33 +0100
Subject: [PATCH 0712/1310] r-modules: fix tkrplot package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 14006311607..3b47fd9f3de 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -356,7 +356,7 @@ let
     TAQMNGR = [ pkgs.zlib.dev ];
     tiff = [ pkgs.libtiff.dev ];
     TKF = [ pkgs.gsl_1 ];
-    tkrplot = [ pkgs.xorg.libX11 ];
+    tkrplot = [ pkgs.xorg.libX11 pkgs.tk.dev ];
     topicmodels = [ pkgs.gsl_1 ];
     udunits2 = [ pkgs.udunits pkgs.expat ];
     V8 = [ pkgs.v8 ];

From 512be9e14ac2f2b37ff7b6ea181cd3854b21acbb Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:39:10 +0100
Subject: [PATCH 0713/1310] r-modules: fix WhopGenome package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 3b47fd9f3de..4d12d3ea8b1 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -362,7 +362,7 @@ let
     V8 = [ pkgs.v8 ];
     VBLPCM = [ pkgs.gsl_1 ];
     VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ];
-    WhopGenome = [ pkgs.zlib ];
+    WhopGenome = [ pkgs.zlib.dev ];
     XBRL = [ pkgs.zlib pkgs.libxml2 ];
     xml2 = [ pkgs.libxml2 ];
     XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ];

From 5b813c2ab0f8469ed76323d6551e67479173e407 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:39:44 +0100
Subject: [PATCH 0714/1310] r-modules: fix XBRL package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 4d12d3ea8b1..61b9dd8ba44 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -363,7 +363,7 @@ let
     VBLPCM = [ pkgs.gsl_1 ];
     VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ];
     WhopGenome = [ pkgs.zlib.dev ];
-    XBRL = [ pkgs.zlib pkgs.libxml2 ];
+    XBRL = [ pkgs.zlib pkgs.libxml2.dev ];
     xml2 = [ pkgs.libxml2 ];
     XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ];
     affyPLM = [ pkgs.zlib ];

From 1d7fd8f3c4c27e3cece2fb606639a29955b25162 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:40:43 +0100
Subject: [PATCH 0715/1310] r-modules: fix xml2 package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 61b9dd8ba44..f382a125501 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -364,7 +364,7 @@ let
     VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ];
     WhopGenome = [ pkgs.zlib.dev ];
     XBRL = [ pkgs.zlib pkgs.libxml2.dev ];
-    xml2 = [ pkgs.libxml2 ];
+    xml2 = [ pkgs.libxml2.dev ];
     XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ];
     affyPLM = [ pkgs.zlib ];
     bamsignals = [ pkgs.zlib ];

From c5e4754ca7c7db5b43d7eeb0ccc9cb024120e742 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:42:00 +0100
Subject: [PATCH 0716/1310] r-modules: fix affyPLM package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index f382a125501..77453c4e533 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -366,7 +366,7 @@ let
     XBRL = [ pkgs.zlib pkgs.libxml2.dev ];
     xml2 = [ pkgs.libxml2.dev ];
     XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ];
-    affyPLM = [ pkgs.zlib ];
+    affyPLM = [ pkgs.zlib.dev ];
     bamsignals = [ pkgs.zlib ];
     BitSeq = [ pkgs.zlib ];
     DiffBind = [ pkgs.zlib ];

From 272b447ea75677ec44843aafabd9c799ebd14ee8 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:43:55 +0100
Subject: [PATCH 0717/1310] r-modules: fix bamsignals package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 77453c4e533..a983db5245e 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -367,7 +367,7 @@ let
     xml2 = [ pkgs.libxml2.dev ];
     XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ];
     affyPLM = [ pkgs.zlib.dev ];
-    bamsignals = [ pkgs.zlib ];
+    bamsignals = [ pkgs.zlib.dev ];
     BitSeq = [ pkgs.zlib ];
     DiffBind = [ pkgs.zlib ];
     ShortRead = [ pkgs.zlib.dev ];

From 4c0c3c74938e2fb4440059e37f6ab3edae2b1634 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:45:14 +0100
Subject: [PATCH 0718/1310] r-modules: fix BitSeq package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index a983db5245e..9275736a377 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -368,7 +368,7 @@ let
     XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ];
     affyPLM = [ pkgs.zlib.dev ];
     bamsignals = [ pkgs.zlib.dev ];
-    BitSeq = [ pkgs.zlib ];
+    BitSeq = [ pkgs.zlib.dev ];
     DiffBind = [ pkgs.zlib ];
     ShortRead = [ pkgs.zlib.dev ];
     oligo = [ pkgs.zlib ];

From afd1a4c93366ea2de74f6536874f375ff544e3ee Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:47:08 +0100
Subject: [PATCH 0719/1310] r-modules: fix affyio package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 9275736a377..061c930ff83 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -377,7 +377,7 @@ let
     XVector = [ pkgs.zlib.dev ];
     Rsamtools = [ pkgs.zlib.dev ];
     rtracklayer = [ pkgs.zlib ];
-    affyio = [ pkgs.zlib ];
+    affyio = [ pkgs.zlib.dev ];
     VariantAnnotation = [ pkgs.zlib ];
     snpStats = [ pkgs.zlib ];
   };

From 286e86f3a5a9be1fb71e97924667f01e11372557 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:49:49 +0100
Subject: [PATCH 0720/1310] r-modules: fix oligo package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 061c930ff83..4fd1a1991b5 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -371,7 +371,7 @@ let
     BitSeq = [ pkgs.zlib.dev ];
     DiffBind = [ pkgs.zlib ];
     ShortRead = [ pkgs.zlib.dev ];
-    oligo = [ pkgs.zlib ];
+    oligo = [ pkgs.zlib.dev ];
     gmapR = [ pkgs.zlib ];
     Rsubread = [ pkgs.zlib ];
     XVector = [ pkgs.zlib.dev ];

From 9ebab25442a1f0bab96d1a39882b8b780e9acf60 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:51:14 +0100
Subject: [PATCH 0721/1310] r-modules: fix gmapR package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 4fd1a1991b5..5ce0c0f1344 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -372,7 +372,7 @@ let
     DiffBind = [ pkgs.zlib ];
     ShortRead = [ pkgs.zlib.dev ];
     oligo = [ pkgs.zlib.dev ];
-    gmapR = [ pkgs.zlib ];
+    gmapR = [ pkgs.zlib.dev ];
     Rsubread = [ pkgs.zlib ];
     XVector = [ pkgs.zlib.dev ];
     Rsamtools = [ pkgs.zlib.dev ];

From baf65d50006138e755f3c53cf1315bed0426533d Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:52:16 +0100
Subject: [PATCH 0722/1310] r-modules: fix Rsubread package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 5ce0c0f1344..b1f29791a50 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -373,7 +373,7 @@ let
     ShortRead = [ pkgs.zlib.dev ];
     oligo = [ pkgs.zlib.dev ];
     gmapR = [ pkgs.zlib.dev ];
-    Rsubread = [ pkgs.zlib ];
+    Rsubread = [ pkgs.zlib.dev ];
     XVector = [ pkgs.zlib.dev ];
     Rsamtools = [ pkgs.zlib.dev ];
     rtracklayer = [ pkgs.zlib ];

From 6540b6507dc4d790197240f34141bca82f9dba03 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:53:12 +0100
Subject: [PATCH 0723/1310] r-modules: fix rtracklayer package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index b1f29791a50..ca59771bd36 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -376,7 +376,7 @@ let
     Rsubread = [ pkgs.zlib.dev ];
     XVector = [ pkgs.zlib.dev ];
     Rsamtools = [ pkgs.zlib.dev ];
-    rtracklayer = [ pkgs.zlib ];
+    rtracklayer = [ pkgs.zlib.dev ];
     affyio = [ pkgs.zlib.dev ];
     VariantAnnotation = [ pkgs.zlib ];
     snpStats = [ pkgs.zlib ];

From b5a0925663fa90a7e8eaa7847e6cce5fc7e87d6f Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:53:49 +0100
Subject: [PATCH 0724/1310] r-modules: fix VariantAnnotation package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index ca59771bd36..c2c5e24b37f 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -378,7 +378,7 @@ let
     Rsamtools = [ pkgs.zlib.dev ];
     rtracklayer = [ pkgs.zlib.dev ];
     affyio = [ pkgs.zlib.dev ];
-    VariantAnnotation = [ pkgs.zlib ];
+    VariantAnnotation = [ pkgs.zlib.dev ];
     snpStats = [ pkgs.zlib ];
   };
 

From 8954412fccc04772ac9663fc9c53686f0524a785 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 20:54:40 +0100
Subject: [PATCH 0725/1310] r-modules: fix snpStats package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index c2c5e24b37f..49273e34c7e 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -379,7 +379,7 @@ let
     rtracklayer = [ pkgs.zlib.dev ];
     affyio = [ pkgs.zlib.dev ];
     VariantAnnotation = [ pkgs.zlib.dev ];
-    snpStats = [ pkgs.zlib ];
+    snpStats = [ pkgs.zlib.dev ];
   };
 
   packagesWithBuildInputs = {

From 7bdf2a44983bb834ca74dbb6c40aa1410182dc56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Jan 2017 21:08:33 +0100
Subject: [PATCH 0726/1310] gdk-pixbuf: maintenance 2.36.2 -> 2.36.3

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

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 736014d665c..1245381efcd 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,14 +3,14 @@
 
 let
   ver_maj = "2.36";
-  ver_min = "2";
+  ver_min = "3";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "3a082ad67d68b55970aed0b2034a06618167be98a42d5c70de736756b45d325d";
+    sha256 = "5223138f7d31afc6b356a049930304ec0abd6ac1113a5d3d1dba5cd4a4d639ec";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From 1e253d54f5aafd5200ad8c814242d88d3384c4ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Jan 2017 21:11:16 +0100
Subject: [PATCH 0727/1310] libpng12: security 1.2.56 -> 1.2.57

CVE-2016-10087
---
 pkgs/development/libraries/libpng/12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 8e17c44fa63..b3f7f96e936 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -3,11 +3,11 @@
 assert !(stdenv ? cross) -> zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.56";
+  name = "libpng-1.2.57";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "1ghd03p353x0vi4dk83n1nlldg11w7vqdk3f99rkgfb82ic59ki4";
+    sha256 = "1n2lrzjkm5jhfg2bs10q398lkwbbx742fi27zgdgx0x23zhj0ihg";
   };
 
   outputs = [ "out" "dev" "man" ];

From f935115ce0787166db3915ff96427478d61b61b5 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Fri, 6 Jan 2017 22:29:25 +0200
Subject: [PATCH 0728/1310] qtpass: 1.1.4 -> 1.1.6

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

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index eee2dffb0e1..4cdb6591465 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
-  version = "1.1.4";
+  version = "1.1.6";
 
   src = fetchFromGitHub {
     owner  = "IJHack";
     repo   = "QtPass";
     rev    = "v${version}";
-    sha256 = "0jxb15jn6vv54wb2z52wv9b2mq38xff8akyzwj5xx2332bc9xra2";
+    sha256 = "0jq5a1cvqvsjwld0nldl6kmcz9g59hiccmbg98xwji04n8174y7j";
   };
 
   buildInputs = [ git gnupg pass qtbase qtsvg qttools ];

From e2cde1524d4d18f384b34b0ab4d2a0b8e5869c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Jan 2017 21:35:13 +0100
Subject: [PATCH 0729/1310] flac: 1.3.1 -> 1.3.2

Version bump seems small, but it's after more than two years.
---
 pkgs/applications/audio/flac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index e571758fabb..52e29e3da4c 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libogg }:
 
 stdenv.mkDerivation rec {
-  name = "flac-1.3.1";
+  name = "flac-1.3.2";
 
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/flac/${name}.tar.xz";
-    sha256 = "4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c";
+    sha256 = "0gymm2j3276kr9nz6vmgfwsdfrq6c449n40a0mzz8h6wc7nw7kwi";
   };
 
   buildInputs = [ libogg ];

From 9a9912a3e4eb8971558791816f96e4a167150254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Jan 2017 21:35:56 +0100
Subject: [PATCH 0730/1310] harfbuzz: 1.3.4 -> 1.4.1

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

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index b2edd39764c..ec9b4510168 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.3.4";
+  version = "1.4.1";
   inherit (stdenv.lib) optional optionals optionalString;
 in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
-    sha256 = "0ava7y24797k5ps3ghq2ccjjds97ri1gx32v6546a6pgmpyad2ki";
+    sha256 = "85a27fab639a1d651737dcb6b69e4101e3fd09522fdfdcb793df810b5cb315bd";
   };
 
   outputs = [ "out" "dev" ];

From 5ab9e23561265d5262c86833b09ff9b06af36249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Jan 2017 21:36:21 +0100
Subject: [PATCH 0731/1310] gtk3: maintenance 3.22.5 -> 3.22.6

---
 pkgs/development/libraries/gtk+/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 1b938215d17..64f5a1e3bdd 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
 
 let
   ver_maj = "3.22";
-  ver_min = "5";
+  ver_min = "6";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "693fa0ac643c59ccd51db99cabe476b4e0a41fd4f0c3c8b3e3ef38f94b2e7334";
+    sha256 = "eba75a216a117f4391beb2971ba20ff8a1823f109893f0ab6c2eac2210ea172f";
   };
 
   outputs = [ "out" "dev" ];

From 948e9edce6902c6b9dfc67b0c53ccc96101ed299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Jan 2017 21:45:20 +0100
Subject: [PATCH 0732/1310] zlib: maintenance 1.2.8 -> 1.2.10

The removed CVEs should be fixed in the release.
---
 .../libraries/zlib/CVE-2016-9840.patch        |  71 ------
 .../libraries/zlib/CVE-2016-9841.patch        | 224 ------------------
 .../libraries/zlib/CVE-2016-9842.patch        |  29 ---
 .../libraries/zlib/CVE-2016-9843.patch        |  49 ----
 pkgs/development/libraries/zlib/default.nix   |  12 +-
 5 files changed, 2 insertions(+), 383 deletions(-)
 delete mode 100644 pkgs/development/libraries/zlib/CVE-2016-9840.patch
 delete mode 100644 pkgs/development/libraries/zlib/CVE-2016-9841.patch
 delete mode 100644 pkgs/development/libraries/zlib/CVE-2016-9842.patch
 delete mode 100644 pkgs/development/libraries/zlib/CVE-2016-9843.patch

diff --git a/pkgs/development/libraries/zlib/CVE-2016-9840.patch b/pkgs/development/libraries/zlib/CVE-2016-9840.patch
deleted file mode 100644
index a8b84ff8413..00000000000
--- a/pkgs/development/libraries/zlib/CVE-2016-9840.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 6a043145ca6e9c55184013841a67b2fef87e44c0 Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Wed, 21 Sep 2016 23:35:50 -0700
-Subject: [PATCH] Remove offset pointer optimization in inftrees.c.
-
-inftrees.c was subtracting an offset from a pointer to an array,
-in order to provide a pointer that allowed indexing starting at
-the offset. This is not compliant with the C standard, for which
-the behavior of a pointer decremented before its allocated memory
-is undefined. Per the recommendation of a security audit of the
-zlib code by Trail of Bits and TrustInSoft, in support of the
-Mozilla Foundation, this tiny optimization was removed, in order
-to avoid the possibility of undefined behavior.
----
- inftrees.c | 18 ++++++++----------
- 1 file changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/inftrees.c b/inftrees.c
-index 22fcd66..0d2670d 100644
---- a/inftrees.c
-+++ b/inftrees.c
-@@ -54,7 +54,7 @@ unsigned short FAR *work;
-     code FAR *next;             /* next available space in table */
-     const unsigned short FAR *base;     /* base value table to use */
-     const unsigned short FAR *extra;    /* extra bits table to use */
--    int end;                    /* use base and extra for symbol > end */
-+    unsigned match;             /* use base and extra for symbol >= match */
-     unsigned short count[MAXBITS+1];    /* number of codes of each length */
-     unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
-     static const unsigned short lbase[31] = { /* Length codes 257..285 base */
-@@ -181,19 +181,17 @@ unsigned short FAR *work;
-     switch (type) {
-     case CODES:
-         base = extra = work;    /* dummy value--not used */
--        end = 19;
-+        match = 20;
-         break;
-     case LENS:
-         base = lbase;
--        base -= 257;
-         extra = lext;
--        extra -= 257;
--        end = 256;
-+        match = 257;
-         break;
-     default:            /* DISTS */
-         base = dbase;
-         extra = dext;
--        end = -1;
-+        match = 0;
-     }
- 
-     /* initialize state for loop */
-@@ -216,13 +214,13 @@ unsigned short FAR *work;
-     for (;;) {
-         /* create table entry */
-         here.bits = (unsigned char)(len - drop);
--        if ((int)(work[sym]) < end) {
-+        if (work[sym] + 1 < match) {
-             here.op = (unsigned char)0;
-             here.val = work[sym];
-         }
--        else if ((int)(work[sym]) > end) {
--            here.op = (unsigned char)(extra[work[sym]]);
--            here.val = base[work[sym]];
-+        else if (work[sym] >= match) {
-+            here.op = (unsigned char)(extra[work[sym] - match]);
-+            here.val = base[work[sym] - match];
-         }
-         else {
-             here.op = (unsigned char)(32 + 64);         /* end of block */
diff --git a/pkgs/development/libraries/zlib/CVE-2016-9841.patch b/pkgs/development/libraries/zlib/CVE-2016-9841.patch
deleted file mode 100644
index e350b3d9642..00000000000
--- a/pkgs/development/libraries/zlib/CVE-2016-9841.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-From 9aaec95e82117c1cb0f9624264c3618fc380cecb Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Wed, 21 Sep 2016 22:25:21 -0700
-Subject: [PATCH] Use post-increment only in inffast.c.
-
-An old inffast.c optimization turns out to not be optimal anymore
-with modern compilers, and furthermore was not compliant with the
-C standard, for which decrementing a pointer before its allocated
-memory is undefined. Per the recommendation of a security audit of
-the zlib code by Trail of Bits and TrustInSoft, in support of the
-Mozilla Foundation, this "optimization" was removed, in order to
-avoid the possibility of undefined behavior.
----
- inffast.c | 81 ++++++++++++++++++++++++---------------------------------------
- 1 file changed, 31 insertions(+), 50 deletions(-)
-
-diff --git a/inffast.c b/inffast.c
-index bda59ce..f0d163d 100644
---- a/inffast.c
-+++ b/inffast.c
-@@ -10,25 +10,6 @@
- 
- #ifndef ASMINF
- 
--/* Allow machine dependent optimization for post-increment or pre-increment.
--   Based on testing to date,
--   Pre-increment preferred for:
--   - PowerPC G3 (Adler)
--   - MIPS R5000 (Randers-Pehrson)
--   Post-increment preferred for:
--   - none
--   No measurable difference:
--   - Pentium III (Anderson)
--   - M68060 (Nikl)
-- */
--#ifdef POSTINC
--#  define OFF 0
--#  define PUP(a) *(a)++
--#else
--#  define OFF 1
--#  define PUP(a) *++(a)
--#endif
--
- /*
-    Decode literal, length, and distance codes and write out the resulting
-    literal and match bytes until either not enough input or output is
-@@ -96,9 +77,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
- 
-     /* copy state to local variables */
-     state = (struct inflate_state FAR *)strm->state;
--    in = strm->next_in - OFF;
-+    in = strm->next_in;
-     last = in + (strm->avail_in - 5);
--    out = strm->next_out - OFF;
-+    out = strm->next_out;
-     beg = out - (start - strm->avail_out);
-     end = out + (strm->avail_out - 257);
- #ifdef INFLATE_STRICT
-@@ -119,9 +100,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
-        input data or output space */
-     do {
-         if (bits < 15) {
--            hold += (unsigned long)(PUP(in)) << bits;
-+            hold += (unsigned long)(*in++) << bits;
-             bits += 8;
--            hold += (unsigned long)(PUP(in)) << bits;
-+            hold += (unsigned long)(*in++) << bits;
-             bits += 8;
-         }
-         here = lcode[hold & lmask];
-@@ -134,14 +115,14 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
-             Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                     "inflate:         literal '%c'\n" :
-                     "inflate:         literal 0x%02x\n", here.val));
--            PUP(out) = (unsigned char)(here.val);
-+            *out++ = (unsigned char)(here.val);
-         }
-         else if (op & 16) {                     /* length base */
-             len = (unsigned)(here.val);
-             op &= 15;                           /* number of extra bits */
-             if (op) {
-                 if (bits < op) {
--                    hold += (unsigned long)(PUP(in)) << bits;
-+                    hold += (unsigned long)(*in++) << bits;
-                     bits += 8;
-                 }
-                 len += (unsigned)hold & ((1U << op) - 1);
-@@ -150,9 +131,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
-             }
-             Tracevv((stderr, "inflate:         length %u\n", len));
-             if (bits < 15) {
--                hold += (unsigned long)(PUP(in)) << bits;
-+                hold += (unsigned long)(*in++) << bits;
-                 bits += 8;
--                hold += (unsigned long)(PUP(in)) << bits;
-+                hold += (unsigned long)(*in++) << bits;
-                 bits += 8;
-             }
-             here = dcode[hold & dmask];
-@@ -165,10 +146,10 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
-                 dist = (unsigned)(here.val);
-                 op &= 15;                       /* number of extra bits */
-                 if (bits < op) {
--                    hold += (unsigned long)(PUP(in)) << bits;
-+                    hold += (unsigned long)(*in++) << bits;
-                     bits += 8;
-                     if (bits < op) {
--                        hold += (unsigned long)(PUP(in)) << bits;
-+                        hold += (unsigned long)(*in++) << bits;
-                         bits += 8;
-                     }
-                 }
-@@ -196,30 +177,30 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
- #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                         if (len <= op - whave) {
-                             do {
--                                PUP(out) = 0;
-+                                *out++ = 0;
-                             } while (--len);
-                             continue;
-                         }
-                         len -= op - whave;
-                         do {
--                            PUP(out) = 0;
-+                            *out++ = 0;
-                         } while (--op > whave);
-                         if (op == 0) {
-                             from = out - dist;
-                             do {
--                                PUP(out) = PUP(from);
-+                                *out++ = *from++;
-                             } while (--len);
-                             continue;
-                         }
- #endif
-                     }
--                    from = window - OFF;
-+                    from = window;
-                     if (wnext == 0) {           /* very common case */
-                         from += wsize - op;
-                         if (op < len) {         /* some from window */
-                             len -= op;
-                             do {
--                                PUP(out) = PUP(from);
-+                                *out++ = *from++;
-                             } while (--op);
-                             from = out - dist;  /* rest from output */
-                         }
-@@ -230,14 +211,14 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
-                         if (op < len) {         /* some from end of window */
-                             len -= op;
-                             do {
--                                PUP(out) = PUP(from);
-+                                *out++ = *from++;
-                             } while (--op);
--                            from = window - OFF;
-+                            from = window;
-                             if (wnext < len) {  /* some from start of window */
-                                 op = wnext;
-                                 len -= op;
-                                 do {
--                                    PUP(out) = PUP(from);
-+                                    *out++ = *from++;
-                                 } while (--op);
-                                 from = out - dist;      /* rest from output */
-                             }
-@@ -248,35 +229,35 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
-                         if (op < len) {         /* some from window */
-                             len -= op;
-                             do {
--                                PUP(out) = PUP(from);
-+                                *out++ = *from++;
-                             } while (--op);
-                             from = out - dist;  /* rest from output */
-                         }
-                     }
-                     while (len > 2) {
--                        PUP(out) = PUP(from);
--                        PUP(out) = PUP(from);
--                        PUP(out) = PUP(from);
-+                        *out++ = *from++;
-+                        *out++ = *from++;
-+                        *out++ = *from++;
-                         len -= 3;
-                     }
-                     if (len) {
--                        PUP(out) = PUP(from);
-+                        *out++ = *from++;
-                         if (len > 1)
--                            PUP(out) = PUP(from);
-+                            *out++ = *from++;
-                     }
-                 }
-                 else {
-                     from = out - dist;          /* copy direct from output */
-                     do {                        /* minimum length is three */
--                        PUP(out) = PUP(from);
--                        PUP(out) = PUP(from);
--                        PUP(out) = PUP(from);
-+                        *out++ = *from++;
-+                        *out++ = *from++;
-+                        *out++ = *from++;
-                         len -= 3;
-                     } while (len > 2);
-                     if (len) {
--                        PUP(out) = PUP(from);
-+                        *out++ = *from++;
-                         if (len > 1)
--                            PUP(out) = PUP(from);
-+                            *out++ = *from++;
-                     }
-                 }
-             }
-@@ -313,8 +294,8 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
-     hold &= (1U << bits) - 1;
- 
-     /* update state and return */
--    strm->next_in = in + OFF;
--    strm->next_out = out + OFF;
-+    strm->next_in = in;
-+    strm->next_out = out;
-     strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
-     strm->avail_out = (unsigned)(out < end ?
-                                  257 + (end - out) : 257 - (out - end));
diff --git a/pkgs/development/libraries/zlib/CVE-2016-9842.patch b/pkgs/development/libraries/zlib/CVE-2016-9842.patch
deleted file mode 100644
index e729f7e162c..00000000000
--- a/pkgs/development/libraries/zlib/CVE-2016-9842.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e54e1299404101a5a9d0cf5e45512b543967f958 Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Sat, 5 Sep 2015 17:45:55 -0700
-Subject: [PATCH] Avoid shifts of negative values inflateMark().
-
-The C standard says that bit shifts of negative integers is
-undefined.  This casts to unsigned values to assure a known
-result.
----
- inflate.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/inflate.c b/inflate.c
-index 2889e3a..a718416 100644
---- a/inflate.c
-+++ b/inflate.c
-@@ -1506,9 +1506,10 @@ z_streamp strm;
- {
-     struct inflate_state FAR *state;
- 
--    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
-+    if (strm == Z_NULL || strm->state == Z_NULL)
-+        return (long)(((unsigned long)0 - 1) << 16);
-     state = (struct inflate_state FAR *)strm->state;
--    return ((long)(state->back) << 16) +
-+    return (long)(((unsigned long)((long)state->back)) << 16) +
-         (state->mode == COPY ? state->length :
-             (state->mode == MATCH ? state->was - state->length : 0));
- }
diff --git a/pkgs/development/libraries/zlib/CVE-2016-9843.patch b/pkgs/development/libraries/zlib/CVE-2016-9843.patch
deleted file mode 100644
index 1fe4c4daa03..00000000000
--- a/pkgs/development/libraries/zlib/CVE-2016-9843.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d1d577490c15a0c6862473d7576352a9f18ef811 Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Wed, 28 Sep 2016 20:20:25 -0700
-Subject: [PATCH] Avoid pre-decrement of pointer in big-endian CRC calculation.
-
-There was a small optimization for PowerPCs to pre-increment a
-pointer when accessing a word, instead of post-incrementing. This
-required prefacing the loop with a decrement of the pointer,
-possibly pointing before the object passed. This is not compliant
-with the C standard, for which decrementing a pointer before its
-allocated memory is undefined. When tested on a modern PowerPC
-with a modern compiler, the optimization no longer has any effect.
-Due to all that, and per the recommendation of a security audit of
-the zlib code by Trail of Bits and TrustInSoft, in support of the
-Mozilla Foundation, this "optimization" was removed, in order to
-avoid the possibility of undefined behavior.
----
- crc32.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/crc32.c b/crc32.c
-index 979a719..05733f4 100644
---- a/crc32.c
-+++ b/crc32.c
-@@ -278,7 +278,7 @@ local unsigned long crc32_little(crc, buf, len)
- }
- 
- /* ========================================================================= */
--#define DOBIG4 c ^= *++buf4; \
-+#define DOBIG4 c ^= *buf4++; \
-         c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
-             crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
- #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
-@@ -300,7 +300,6 @@ local unsigned long crc32_big(crc, buf, len)
-     }
- 
-     buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
--    buf4--;
-     while (len >= 32) {
-         DOBIG32;
-         len -= 32;
-@@ -309,7 +308,6 @@ local unsigned long crc32_big(crc, buf, len)
-         DOBIG4;
-         len -= 4;
-     }
--    buf4++;
-     buf = (const unsigned char FAR *)buf4;
- 
-     if (len) do {
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 21a7e81ce3e..75f872ef35a 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, static ? false }:
 
-let version = "1.2.8"; in
+let version = "1.2.10"; in
 
 stdenv.mkDerivation rec {
   name = "zlib-${version}";
@@ -10,16 +10,9 @@ stdenv.mkDerivation rec {
       [ "http://www.zlib.net/${name}.tar.gz"  # old versions vanish from here
         "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz"
       ];
-    sha256 = "039agw5rqvqny92cpkrfn243x2gd4xn13hs3xi6isk55d2vqqr9n";
+    sha256 = "05w0jwsqib44jz5jazh7cqz311z4g7znnzn6w6v8g1z4iilryzld";
   };
 
-  patches = [
-    ./CVE-2016-9840.patch
-    ./CVE-2016-9841.patch
-    ./CVE-2016-9842.patch
-    ./CVE-2016-9843.patch
-  ];
-
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure \
       --replace '/usr/bin/libtool' 'ar' \
@@ -31,7 +24,6 @@ stdenv.mkDerivation rec {
   setOutputFlags = false;
   outputDoc = "dev"; # single tiny man3 page
 
-
   preConfigure = ''
     if test -n "$crossConfig"; then
       export CC=$crossConfig-gcc

From 8fda707027968c15704f75b00a0086644a03ed18 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 6 Jan 2017 16:14:30 -0500
Subject: [PATCH 0733/1310] kernel: 4.4.39 -> 4.4.40

---
 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 6eb6e4663e9..649cf013591 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.39";
+  version = "4.4.40";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "188ij72z05sbzrn438r9awpf2pvpv8p2iykfcxs2kxibn23c2jw6";
+    sha256 = "1qd431bk3q9xcvnlw4fvcsw4l8k44s14nwdkq4y3kmrywzb5xg64";
   };
 
   kernelPatches = args.kernelPatches;

From ecf87b11f2b9c44fe54f3188fdc665d3d9ad670c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 6 Jan 2017 16:15:02 -0500
Subject: [PATCH 0734/1310] kernel: 4.8.15 -> 4.8.16

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix
index 7a6ce4533e9..8a71a771c4f 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.8.15";
+  version = "4.8.16";
   extraMeta.branch = "4.8";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1vlgacsdcww333n9vm2pmdfkcpkjhavrh1aalrr7p6vj2c4jc18n";
+    sha256 = "1aml6vhsfpvm8rsadraff7qj0ivgd9aw75k2q65drz4iby1pqb9h";
   };
 
   kernelPatches = args.kernelPatches;

From c1d20ea50cf119c61ef446fde8491dd57f5dac07 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 6 Jan 2017 16:15:18 -0500
Subject: [PATCH 0735/1310] kernel: 4.9.0 -> 4.9.1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index f154e143e03..25e9eac0365 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9";
-  modDirVersion = "4.9.0";
+  version = "4.9.1";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a";
+    sha256 = "06jlfdmfgmhj80q1q9pglkjygjc1s1b5fslhf5bzkicsw4r2369j";
   };
 
   kernelPatches = args.kernelPatches;

From 030065f6bd2659a0d9482b3c6625a1a214bb1052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Jan 2017 22:46:25 +0100
Subject: [PATCH 0736/1310] libpng: 1.6.27 -> 1.6.28

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

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 8c6e1c4af15..545c58f976e 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,10 +3,10 @@
 assert zlib != null;
 
 let
-  version = "1.6.27";
+  version = "1.6.28";
   patchVersion = "1.6.26";
   # patchVersion = version;
-  sha256 = "0yxmajq2ri1smpz5spi0f055izbdkmmr7a5zp7d6qd9nfgczz8pw";
+  sha256 = "0ylgyx93hnk38haqrh8prd3ax5ngzwvjqw5cxw7p9nxmwsfyrlyq";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
     sha256 = "0b6p2k4afvhk1svargpllcvhxb4g3p857wkqk85cks0yv42ckph1";

From 0b2127e6d1c87f540897550504e6e7d2cbd098ba Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Fri, 6 Jan 2017 22:15:02 +0200
Subject: [PATCH 0737/1310] python-gyp: fix darwin build without xcode or CLT

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 60fff564add..9e3df6c4966 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12387,6 +12387,10 @@ in {
       sha256 = "1imgxsl4mr1662vsj2mlnpvvrbz71yk00w8p85vi5bkgmc6awgiz";
     };
 
+    prePatch = optionals pkgs.stdenv.isDarwin ''
+      sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' pylib/gyp/xcode_emulation.py
+    '';
+
     patches = optionals pkgs.stdenv.isDarwin [
       ../development/python-modules/gyp/no-darwin-cflags.patch
     ];

From e6708cea37b86b59cc5b35e434b4711bdbbe5064 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 5 Jan 2017 19:58:26 +0100
Subject: [PATCH 0738/1310] bind: fix collision of binaries in outputs

Using outputsToInstall the intended behaviour of including host and dnsutils
when bind is installed can be implemented instead of using symlinks to fix
installing all outputs individually with nix-env.

Fixes #19761.
---
 nixos/modules/services/networking/bind.nix | 2 +-
 pkgs/servers/dns/bind/default.nix          | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 72110e62576..0272b6ceff2 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -155,7 +155,7 @@ in
         chown ${bindUser} /var/run/named
       '';
 
-      script = "${pkgs.bind.bin}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
+      script = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
       unitConfig.Documentation = "man:named(8)";
     };
   };
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index e3f2364463b..d3daad1e0cb 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "11lxkb7d79c75scrs28q4xmr0ii2li69zj1c650al3qxir8yf754";
   };
 
-  outputs = [ "bin" "lib" "dev" "out" "man" "dnsutils" "host" ];
+  outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
 
   patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++
     stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
@@ -40,13 +40,10 @@ stdenv.mkDerivation rec {
     moveToOutput bin/isc-config.sh $dev
 
     moveToOutput bin/host $host
-    ln -sf $host/bin/host $bin/bin
 
     moveToOutput bin/dig $dnsutils
     moveToOutput bin/nslookup $dnsutils
     moveToOutput bin/nsupdate $dnsutils
-    ln -sf $dnsutils/bin/{dig,nslookup,nsupdate} $bin/bin
-    ln -sf $host/bin/host $dnsutils/bin
 
     for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do
       sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g'
@@ -60,5 +57,7 @@ stdenv.mkDerivation rec {
 
     maintainers = with stdenv.lib.maintainers; [viric peti];
     platforms = with stdenv.lib.platforms; unix;
+
+    outputsToInstall = [ "out" "dnsutils" "host" ];
   };
 }

From c5c7911ac22298a95a4128127b3e1427deb98fdc Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 6 Jan 2017 21:09:49 -0500
Subject: [PATCH 0739/1310] libuv: disable getaddrinfo tests.

Seem to require network access, at least on darwin
---
 pkgs/development/libraries/libuv/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index fd422a514ef..2b062f58b24 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
     toDisable = [
       "getnameinfo_basic" # probably network-dependent
       "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces
+      "getaddrinfo_fail" "getaddrinfo_fail_sync"
     ];
     tdRegexp = lib.concatStringsSep "\\|" toDisable;
     in lib.optionalString doCheck ''
@@ -33,8 +34,6 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  crossAttrs.doCheck = false;
-
   meta = with lib; {
     description = "A multi-platform support library with a focus on asynchronous I/O";
     homepage    = https://github.com/libuv/libuv;

From 845dd121f8922dd8171ded470ef302c3602de9ea Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 6 Jan 2017 22:10:29 -0500
Subject: [PATCH 0740/1310] ghc-head: Put ./boot into commonPreConfigure

---
 pkgs/development/compilers/ghc/head.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 081f554e06b..971365eda48 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -8,8 +8,12 @@ let
   commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
   version = "8.1.20170106";
+  rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
 
   commonPreConfigure =  ''
+    echo ${version} >VERSION
+    echo ${rev} >GIT_COMMIT_ID
+    ./boot
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
@@ -17,9 +21,8 @@ let
     export NIX_LDFLAGS+=" -no_dtrace_dof"
   '';
 in stdenv.mkDerivation (rec {
-  inherit version;
+  inherit version rev;
   name = "ghc-${version}";
-  rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
 
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
@@ -29,11 +32,7 @@ in stdenv.mkDerivation (rec {
 
   postPatch = "patchShebangs .";
 
-  preConfigure = ''
-    echo ${version} >VERSION
-    echo ${rev} >GIT_COMMIT_ID
-    ./boot
-  '' + commonPreConfigure ;
+  preConfigure = commonPreConfigure;
 
   buildInputs = commonBuildInputs;
 

From 3674be1e987265bfec626b41bd66d6686b46e9f6 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 30 Dec 2016 10:00:30 +0800
Subject: [PATCH 0741/1310] peruse: 1.1 -> 1.2

1.2 also ships Peruse Creator
---
 pkgs/tools/misc/peruse/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index b6727f4e63b..61e9fae906b 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -1,12 +1,12 @@
 {
   kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
   ecm, kdoctools,
-  baloo, kconfig, kfilemetadata, kinit, kirigami, plasma-framework
+  baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
 }:
 
 let
   pname = "peruse";
-  version = "1.1";
+  version = "1.2";
   unarr = fetchFromGitHub {
     owner  = "zeniko";
     repo   = "unarr";
@@ -18,15 +18,17 @@ let
 
     src = fetchurl {
       url = "mirror://kde/stable/${pname}/${name}.tar.xz";
-      sha256 = "1akk9hg12y6iis0rb5kdkznm3xk7hk04r9ccqyz8lr6y073n5f9j";
+      sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq";
     };
 
     nativeBuildInputs = [ ecm kdoctools ];
 
-    propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami plasma-framework ];
+    propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
+
+    pathsToLink = [ "/etc/xdg/peruse.knsrc"];
 
     preConfigure = ''
-      rmdir src/qtquick/karchive-rar/external/unarr
+      rm -rf src/qtquick/karchive-rar/external/unarr
       ln -s ${unarr} src/qtquick/karchive-rar/external/unarr
     '';
 
@@ -39,5 +41,5 @@ let
 
 in kdeWrapper {
   inherit unwrapped;
-  targets = [ "bin/peruse" ];
+  targets = [ "bin/peruse" "bin/perusecreator" ];
 }

From 7027bbfba3058773ee0e1418666851c36c4d6b18 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Fri, 6 Jan 2017 20:41:29 -0800
Subject: [PATCH 0742/1310] matrix-synapse: 0.18.6-rc3 -> 0.18.7-rc2

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

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index ddbf35be83c..fd74ffe54c3 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -24,13 +24,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.18.6-rc3";
+  version = "0.18.7-rc2";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "1a2yj22s84sd3nm9lx4rcdjbpbfclz6cp0ljpilw6n7spmj1nhcd";
+    sha256 = "13rx77xfcci7q8xpxxgnh84h6md53akjcy9glwn20vm9vpka3vvj";
   };
 
   patches = [ ./matrix-synapse.patch ];

From 0f71012fe6448f4e31e464659cc266fa8f980891 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 7 Jan 2017 01:36:51 -0500
Subject: [PATCH 0743/1310] sherpa: add useful dependencies

---
 .../science/physics/sherpa/default.nix             | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix
index c674c0cbb2f..e815ddfc1c2 100644
--- a/pkgs/applications/science/physics/sherpa/default.nix
+++ b/pkgs/applications/science/physics/sherpa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, sqlite }:
+{ stdenv, fetchurl, gfortran, hepmc, fastjet, lhapdf, rivet, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "sherpa-${version}";
@@ -9,11 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "13vkz6w8kqyv8sgy3mxnlps5ykml5rnlj50vjj0pp9rgbl5y8ali";
   };
 
-  buildInputs = [ gfortran sqlite ];
+  buildInputs = [ gfortran sqlite lhapdf rivet ];
 
   enableParallelBuilding = true;
 
-  configureFlags = "--with-sqlite3=${sqlite.dev}";
+  configureFlags = [
+    "--with-sqlite3=${sqlite.dev}"
+    "--enable-hepmc2=${hepmc}"
+    "--enable-fastjet=${fastjet}"
+    "--enable-lhapdf=${lhapdf}"
+    "--enable-rivet=${rivet}"
+  ];
+
+  CXXFLAGS = "-std=c++11"; # needed for rivet on OSX
 
   meta = {
     description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions";

From d6ff445f10a60e9565a895c91f4d220e2a6bbc2e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 7 Jan 2017 08:01:27 +0100
Subject: [PATCH 0744/1310] grsecurity: 4.8.15-201612301949 ->
 4.8.16-201701062021

---
 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 7a6ce4533e9..8a71a771c4f 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.15";
+  version = "4.8.16";
   extraMeta.branch = "4.8";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1vlgacsdcww333n9vm2pmdfkcpkjhavrh1aalrr7p6vj2c4jc18n";
+    sha256 = "1aml6vhsfpvm8rsadraff7qj0ivgd9aw75k2q65drz4iby1pqb9h";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index e54189b078a..42a6e0d037b 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.15";
-      grrev  = "201612301949";
-      sha256 = "1083r30ipvdi3kjixlsp3f1mmf7848f2p32ds956caarvr4vkm3b";
+    { kver   = "4.8.16";
+      grrev  = "201701062021";
+      sha256 = "0ivl9dpbyf0f7ywgh8kbzdf0za10yrh6s8plqk9vnns3dhgcnvnq";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 0f24e5672805bbda94e3a0c1dadeb28d941d472e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 7 Jan 2017 08:02:40 +0100
Subject: [PATCH 0745/1310] dnscrypt-proxy: 1.9.0 -> 1.9.1

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

diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index 73dfd3ab9ba..baa295c0b00 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.0";
+  version = "1.9.1";
 
   src = fetchurl {
     url = "https://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
-    sha256 = "0v5rsn9zdakzn6rcf2qhjqfd2y4h8q0hj4xr5hwhvaskg213rsyp";
+    sha256 = "0aa1qw59b72wl922lfhg24xq2gkv95v1s0daiiqv9b4zpap3ynag";
   };
 
   configureFlags = optional stdenv.isLinux "--with-systemd";

From 44a78fb0da4d9fb4c0c8f7bd4bcf8649a751693e Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 7 Jan 2017 03:00:04 -0500
Subject: [PATCH 0746/1310] rivet: fix runtime on darwin

---
 .../libraries/physics/rivet/darwin.patch      | 33 +++++++++++++++++++
 .../libraries/physics/rivet/default.nix       |  4 +++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/physics/rivet/darwin.patch

diff --git a/pkgs/development/libraries/physics/rivet/darwin.patch b/pkgs/development/libraries/physics/rivet/darwin.patch
new file mode 100644
index 00000000000..2d397f1da6c
--- /dev/null
+++ b/pkgs/development/libraries/physics/rivet/darwin.patch
@@ -0,0 +1,33 @@
+diff --git a/include/Rivet/Tools/osdir.hh b/include/Rivet/Tools/osdir.hh
+index 05f06ca..59af7de 100644
+--- a/include/Rivet/Tools/osdir.hh
++++ b/include/Rivet/Tools/osdir.hh
+@@ -21,7 +21,7 @@
+ 
+ /// @cond OSDIR
+ 
+-#if defined(unix) || defined(__unix) || defined(__unix__)
++#if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
+ #define OSLINK_OSDIR_POSIX
+ #elif defined(_WIN32)
+ #define OSLINK_OSDIR_WINDOWS
+@@ -32,18 +32,7 @@
+ #include <string>
+ 
+ #if defined(OSLINK_OSDIR_NOTSUPPORTED)
+-
+-namespace oslink
+-{
+-	class directory
+-	{
+-		public:
+-			directory(const std::string&)		{ }
+-			operator void*() const				{ return (void*)0; }
+-			std::string next()					{ return ""; }
+-	};
+-}
+-
++#error Platform misdetected or oslink is not implemented
+ #elif defined(OSLINK_OSDIR_POSIX)
+ 
+ #include <sys/types.h>
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index 91b5881d1a8..a82c14fee77 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
 
   pythonPath = []; # python wrapper support
 
+  patches = [
+    ./darwin.patch # configure relies on impure sw_vers to -Dunix
+  ];
+
   latex = texlive.combine { inherit (texlive)
     scheme-basic
     collection-pstricks

From 428927ffa6e5c255ef97f62435b0777f8f9481df Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 7 Jan 2017 06:50:02 -0500
Subject: [PATCH 0747/1310] openjpeg2: patch for multiple CVEs

 -  Floating Point Exception (aka FPE or divide by zero) in
    opj_pi_next_cprl function in openjp2/pi.c:523 in OpenJPEG
    2.1.2. (CVE-2016-9112)

 -  There is a NULL Pointer Access in function imagetopnm of
    convert.c:1943(jp2) of OpenJPEG 2.1.2. image->comps[compno].data is
    not assigned a value after initialization(NULL). Impact is Denial of
    Service. (CVE-2016-9114)

 -  NULL Pointer Access in function imagetopnm of convert.c:2226(jp2) in
    OpenJPEG 2.1.2. Impact is Denial of Service. Someone must open a
    crafted j2k file. (CVE-2016-9116)

 -  Heap Buffer Overflow (WRITE of size 4) in function pnmtoimage of
    convert.c:1719 in OpenJPEG 2.1.2. (CVE-2016-9118)
---
 pkgs/development/libraries/openjpeg/2.1.nix | 23 ++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix
index 9e3c4473b31..ae8710e58a2 100644
--- a/pkgs/development/libraries/openjpeg/2.1.nix
+++ b/pkgs/development/libraries/openjpeg/2.1.nix
@@ -1,4 +1,4 @@
-{ callPackage, ... } @ args:
+{ callPackage, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "2.1.2";
@@ -12,5 +12,26 @@ callPackage ./generic.nix (args // rec {
     # Put in our source code to make sure we don't lose it, since that
     # referenced commit is someone else's fork, and not actually up-stream.
     ./CVE-2016-9580-and-CVE-2016-9581.patch
+
+    (fetchpatch {
+      url = "https://bugzilla.suse.com/attachment.cgi?id=707359&action=diff&context=patch&collapsed=&headers=1&format=raw";
+      name = "CVE-2016-9112.patch";
+      sha256 = "18hqx73wdzfybr5n5k6pzhbhdlmawiqbjci8n82zykxiyfgp18pd";
+    })
+    (fetchpatch {
+      url = "https://bugzilla.suse.com/attachment.cgi?id=707354&action=diff&context=patch&collapsed=&headers=1&format=raw";
+      name = "CVE-2016-9114.patch";
+      sha256 = "0qam3arw9kdbh4501xim2pyldl708dnpyjwvjmwc9gc7hcq4gfi3";
+    })
+    (fetchpatch {
+      url = "https://bugzilla.suse.com/attachment.cgi?id=707356&action=diff&context=patch&collapsed=&headers=1&format=raw";
+      name = "CVE-2016-9116.patch";
+      sha256 = "0yyb3pxqi5sr44a48bacngzp206j4z49lzkg6hbkz1nra9na61a3";
+    })
+    (fetchpatch {
+      url = "https://bugzilla.suse.com/attachment.cgi?id=707358&action=diff&context=patch&collapsed=&headers=1&format=raw";
+      name = "CVE-2016-9118.patch";
+      sha256 = "125n8bmh07y7697s0y82ypb39rxgj0bdn8rcywbvamscagwg2wy9";
+    })
   ];
 })

From e138d3afdfbbc49fe0c21e0534806b11b700c598 Mon Sep 17 00:00:00 2001
From: Valentin Shirokov <regellosigkeitsaxiom@yandex.ru>
Date: Sat, 7 Jan 2017 20:19:32 +0800
Subject: [PATCH 0748/1310] Added option
 networking.wireless.networks.*.priority

It is literal 'priority' option of wpa_supplicant.conf
---
 .../services/networking/wpa_supplicant.nix        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 5657b91c1e7..c91ba91fcb4 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -12,11 +12,13 @@ let
       psk = if networkConfig.psk != null
         then ''"${networkConfig.psk}"''
         else networkConfig.pskRaw;
+      priority = networkConfig.priority;
     in ''
       network={
         ssid="${ssid}"
         ${optionalString (psk != null) ''psk=${psk}''}
         ${optionalString (psk == null) ''key_mgmt=NONE''}
+        ${optionalString (priority != null) ''priority=${toString priority}''}
       }
     '') cfg.networks)}
   '' else "/etc/wpa_supplicant.conf";
@@ -68,6 +70,19 @@ in {
                 Mutually exclusive with <varname>psk</varname>.
               '';
             };
+            priority = mkOption {
+              type = types.nullOr types.int;
+              default = null;
+              description = ''
+                By default, all networks will get same priority group (0). If some of the
+                networks are more desirable, this field can be used to change the order in
+                which wpa_supplicant goes through the networks when selecting a BSS. The
+                priority groups will be iterated in decreasing priority (i.e., the larger the
+                priority value, the sooner the network is matched against the scan results).
+                Within each priority group, networks will be selected based on security
+                policy, signal strength, etc.
+              '';
+            };
           };
         });
         description = ''

From 427de8539021697fa11775436a2593b9406655f8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 4 Jan 2017 16:37:31 +0800
Subject: [PATCH 0749/1310] loki: init at 0.1.7

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

diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix
new file mode 100644
index 00000000000..2ff927048ad
--- /dev/null
+++ b/pkgs/development/libraries/loki/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "loki-${version}";
+  version = "0.1.7";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/loki-lib/Loki/Loki%20${version}/loki-${version}.tar.gz";
+    sha256 = "1xhwna961fl4298ac5cc629x5030zlw31vx4h8zws290amw5860g";
+  };
+
+  buildPhase = ''
+    substituteInPlace Makefile.common --replace /usr $out
+    make build-shared
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A C++ library of designs, containing flexible implementations of common design patterns and idioms";
+    homepage = http://loki-lib.sourceforge.net;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52e4194fab1..ffd24741282 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2669,6 +2669,8 @@ in
 
   logstalgia = callPackage ../tools/graphics/logstalgia {};
 
+  loki = callPackage ../development/libraries/loki { };
+
   longview = callPackage ../servers/monitoring/longview { };
 
   lout = callPackage ../tools/typesetting/lout { };

From da9e9061f1e952ed57d191ddf0003a3dd37e8546 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 7 Jan 2017 15:16:36 +0100
Subject: [PATCH 0750/1310] haskellPackages.hledger-diff: 0.2.0.6 -> 0.2.0.7

Currently hledger-diff is broken because of the hledger-lib version
bump.
---
 pkgs/development/haskell-modules/hackage-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2528b8a8bef..107095b3d7c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -91117,8 +91117,8 @@ self: {
     ({ mkDerivation, base, hledger-lib, text, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.6";
-       sha256 = "0ef38d60055fb632f3a686b5ce8aee0af5637e51b17d4c5a27764dd485c52b75";
+       version = "0.2.0.7";
+       sha256 = "1x7ngm0h9hsbf4p8vx1h4z1w9hlqkqfa39v2dvmlxrcx6rs8dzsl";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];

From 24aae1effe0d7d65fb7117fc99e82890fb49d466 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 7 Jan 2017 22:58:45 +0800
Subject: [PATCH 0751/1310] qrcode: 2014-01-01 -> 2016-08-04

---
 pkgs/tools/graphics/qrcode/default.nix | 39 +++++++++-----------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix
index 606e546af29..44444e6148a 100644
--- a/pkgs/tools/graphics/qrcode/default.nix
+++ b/pkgs/tools/graphics/qrcode/default.nix
@@ -1,24 +1,14 @@
-{ stdenv, fetchgit }:
-let
-  s =
-  rec {
-    baseName = "qrcode";
-    date = "2014-01-01";
-    version = "git-${date}";
-    name = "${baseName}-${version}";
-    url = "https://github.com/qsantos/qrcode";
-    rev = "2843cbada3b768f60ee1ae13c65160083558cc03";
-    sha256 = "1qli0b62yngqj66v6vdqqgcysy3q3fr5vwpf7yf0d9a0dg862x8a";
-  };
-  buildInputs = [
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
+{ stdenv, fetchFromGitHub }:
 
-  src = fetchgit {
-    inherit (s) rev url sha256;
+stdenv.mkDerivation rec {
+  name = "qrcode-git-${version}";
+  version = "20160804";
+
+  src = fetchFromGitHub {
+    owner  = "qsantos";
+    repo   = "qrcode";
+    rev    = "ad0fdb4aafd0d56b903f110f697abaeb27deee73";
+    sha256 = "0v81745nx5gny2g05946k8j553j18a29ikmlyh6c3syq6c15k8cf";
   };
 
   NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";
@@ -29,11 +19,10 @@ stdenv.mkDerivation {
     cp DOCUMENTATION LICENCE "$out/share/doc/qrcode"
   '';
 
-  meta = {
-    inherit (s) version;
+  meta = with stdenv.lib; {
     description = ''A small QR-code tool'';
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ raskin ];
+    platforms = with platforms; linux;
   };
 }

From 133ba5f08a33b747706e55e11900f1ebeac104a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 7 Jan 2017 16:17:33 +0100
Subject: [PATCH 0752/1310] GHC: 8.0.2-rc2 -> 8.0.2

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

diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index b2ae92e02c6..5979eba3e10 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -13,12 +13,12 @@ let
   });
 in
 stdenv.mkDerivation rec {
-  version = "8.0.1.20161213";
+  version = "8.0.2";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/8.0.2-rc2/${name}-src.tar.xz";
-    sha256 = "0l1arhbh3rbs011f0y4pgc35yn07x3hz6lfqlvqbwn96f8ff5529";
+    url = "https://downloads.haskell.org/~ghc/8.0.2/${name}-src.tar.xz";
+    sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi";
   };
 
   patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;

From 71fc7f97482739ba742b9bc2101c20225cc5cb35 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 7 Jan 2017 10:28:48 -0500
Subject: [PATCH 0753/1310] ghc-head: Fixes for new base and Cabal

---
 .../configuration-ghc-head.nix                |  7 ++++
 .../haskell-modules/hackage-packages.nix      |  4 +-
 .../patches/atomic-primops-Cabal-1.25.patch   | 37 +++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch

diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index a2b6058b166..f093c0e427e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -86,4 +86,11 @@ self: super: {
   # Won't work with LLVM 3.5.
   llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
 
+  # A bunch of jailbreaks due to 'base' bump
+  old-locale = doJailbreak super.old-locale;
+  primitive = doJailbreak super.primitive;
+  test-framework = doJailbreak super.test-framework;
+  atomic-primops = doJailbreak (appendPatch super.atomic-primops ./patches/atomic-primops-Cabal-1.25.patch);
+  hashable = doJailbreak super.hashable;
+  stm = doJailbreak super.stm;
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 107095b3d7c..1922fb3efc3 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -106695,8 +106695,8 @@ self: {
     ({ mkDerivation, base, Cabal }:
      mkDerivation {
        pname = "jailbreak-cabal";
-       version = "1.3.1";
-       sha256 = "610d8dbd04281eee3d5da05c9eef45bfd1a1ddca20dfe54f283e15ddf6d5c235";
+       version = "1.3.2";
+       sha256 = "1x2h54sx4ycik34q8f9g698xc2b7fai18918cd08qx7w7ny8nai1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
diff --git a/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch b/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch
new file mode 100644
index 00000000000..712bd53092f
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch
@@ -0,0 +1,37 @@
+diff --git a/Setup.hs b/Setup.hs
+index ddf5a02..7ad1f26 100644
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -1,4 +1,4 @@
+-
++{-# LANGUAGE CPP #-}
+ import Control.Monad (when)
+ import Language.Haskell.TH
+ import Distribution.Simple                (defaultMainWithHooks, simpleUserHooks, UserHooks(postConf), Args)
+@@ -6,14 +6,25 @@ import Distribution.Simple.Utils          (cabalVersion)
+ import Distribution.Simple.LocalBuildInfo
+ import Distribution.Simple.Setup          (ConfigFlags)
+ import Distribution.Version               (Version(..))
++#if MIN_VERSION_Cabal(1,25,0)
++import Distribution.Version               (mkVersion)
++#endif
+ import Distribution.PackageDescription    (PackageDescription)
+ import Debug.Trace
+ 
++#if MIN_VERSION_Cabal(1,25,0)
++versionBranch :: Version -> Version
++versionBranch = id
++#else
++mkVersion :: [Int] -> Version
++mkVersion vs = Version vs []
++#endif
++
+ -- I couldn't figure out a way to do this check from the cabal file, so we drop down
+ -- here to do it instead:
+ checkGoodVersion :: IO ()
+ checkGoodVersion =
+-  if   cabalVersion >= Version [1,17,0] []
++  if   cabalVersion >= mkVersion [1,17,0]
+   then putStrLn (" [Setup.hs] This version of Cabal is ok for profiling: "++show cabalVersion)
+   else error (" [Setup.hs] This package should not be used in profiling mode with cabal version "++
+                         show (versionBranch cabalVersion)++" < 1.17.0\n"++

From 6a55b529445a4ca23ce8f7aafcb397a4777eb22a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 7 Jan 2017 18:47:55 +0300
Subject: [PATCH 0754/1310] warzone2100: 2.1.5 -> 2.2.2

---
 pkgs/games/warzone2100/default.nix | 31 +++++++++++++++---------------
 pkgs/top-level/all-packages.nix    |  2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
index 7c578f370d7..dd21d13a027 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@@ -1,7 +1,5 @@
-{ stdenv, fetchurl, bison, flex, gettext, pkgconfig, libpng
-, libtheora, openal, physfs, mesa, fribidi, fontconfig
-, freetype, qt4, glew, libogg, libvorbis, zlib, libX11
-, libXrandr, zip, unzip, which, perl
+{ stdenv, lib, fetchurl, perl, unzip, zip, which, pkgconfig
+, qtbase, qtscript, SDL2, libtheora, openal, glew, physfs, fribidi
 , withVideos ? false
 }:
 
@@ -14,28 +12,31 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "3.1.5";
+  version = "3.2.2";
   name = "${pname}-${version}";
+
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/releases/${version}/${name}.tar.xz";
-    sha256 = "0hm49i2knvvg3wlnryv7h4m84s3qa7jfyym5yy6365sx8wzcrai1";
+    sha256 = "064xfxwkqpvqyy7kz46cwi71mxmimxi4wgjly9g51wwxkvz8snmg";
   };
-  buildInputs = [ bison flex gettext pkgconfig libpng libtheora openal
-                  physfs mesa fribidi fontconfig freetype qt4
-                  glew libogg libvorbis zlib libX11 libXrandr zip
-                  unzip perl
-                ];
-  patchPhase = ''
+
+  buildInputs = [ qtbase qtscript SDL2 libtheora openal glew physfs fribidi ];
+  nativeBuildInputs = [ perl zip unzip pkgconfig ];
+
+  postPatch = ''
     substituteInPlace lib/exceptionhandler/dumpinfo.cpp \
                       --replace "which %s" "${which}/bin/which %s"
     substituteInPlace lib/exceptionhandler/exceptionhandler.cpp \
                       --replace "which %s" "${which}/bin/which %s"
   '';
-  configureFlags = "--with-backend=qt --with-distributor=NixOS";
 
-  NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
+  configureFlags = [ "--with-distributor=NixOS" ];
 
-  postInstall = stdenv.lib.optionalString withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
+  hardeningDisable = [ "format" ];
+
+  enableParallelBuilding = true;
+
+  postInstall = lib.optionalString withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
 
   meta = with stdenv.lib; {
     description = "A free RTS game, originally developed by Pumpkin Studios";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 070aad1d029..4d538e21d24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16338,7 +16338,7 @@ in
     libjpeg = libjpeg62;
   };
 
-  warzone2100 = callPackage ../games/warzone2100 { };
+  warzone2100 = qt5.callPackage ../games/warzone2100 { };
 
   wesnoth = callPackage ../games/wesnoth { };
 

From 969651aacaf79c96527931918dc3c6f6f6ba94ff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 7 Jan 2017 17:28:20 +0100
Subject: [PATCH 0755/1310] pythonPackages.pyjwt: use cryptography instead of
 pycrypto

---
 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 60fff564add..f1dc2bf86dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20601,7 +20601,7 @@ in {
     };
 
     buildInputs = with self; [ pytestrunner pytestcov pytest coverage ];
-    propagatedBuildInputs = with self; [ pycrypto ecdsa ];
+    propagatedBuildInputs = with self; [ cryptography ecdsa ];
 
     # We don't need this specific version
     postPatch = ''

From bbdca635cf0b2e1f7f0b33eebc07686cfcebf975 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Fri, 23 Dec 2016 22:10:06 +0100
Subject: [PATCH 0756/1310] cairo: Add CoreText for darwin

This helps so that fonts are properly rendered in gtk when used with the backend
"quartz".
---
 pkgs/development/libraries/cairo/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 5d201c52312..7df72bc0560 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
     libiconv
   ] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     CoreGraphics
+    CoreText
     ApplicationServices
     Carbon
   ]);

From 354c91df2e40e2f61719e33b7186fe089d2219e7 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Fri, 23 Dec 2016 22:14:03 +0100
Subject: [PATCH 0757/1310] pango: Add darwin frameworks for fond rendering

---
 pkgs/development/libraries/pango/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index f39fc2afe7d..22cf7be84d0 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
-, libintlOrEmpty, gobjectIntrospection
+, libintlOrEmpty, gobjectIntrospection, darwin
 }:
 
 with stdenv.lib;
@@ -19,7 +19,12 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "out" "devdoc" ];
 
   buildInputs = [ gobjectIntrospection ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ]
+    ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+       Carbon
+       CoreGraphics
+       CoreText
+    ]);
   propagatedBuildInputs = [ cairo harfbuzz libXft ] ++ libintlOrEmpty;
 
   enableParallelBuilding = true;
@@ -48,6 +53,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl2Plus;
 
     maintainers = with maintainers; [ raskin urkud ];
-    platforms = with platforms; linux ++ darwin;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 9f31633a5006c511c97df77dcc025138b4c38e48 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Fri, 23 Dec 2016 22:16:02 +0100
Subject: [PATCH 0758/1310] librsvg: Add framework ApplicationServices for
 darwin

---
 pkgs/development/libraries/librsvg/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 409307fb52b..ebd0f79cd47 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
-, bzip2, libcroco, libintlOrEmpty
+, bzip2, libcroco, libintlOrEmpty, darwin
 , withGTK ? false, gtk3 ? null
 , gobjectIntrospection ? null, enableIntrospection ? false }:
 
@@ -22,7 +22,10 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ]
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+      ApplicationServices
+    ]);
 
   configureFlags = [ "--enable-introspection=auto" ]
     ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";

From 5a572f80185b2ad2a06ca42ed61bbe08cd14198b Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Fri, 23 Dec 2016 22:18:25 +0100
Subject: [PATCH 0759/1310] gtk2: Use quartz backend on darwin

---
 pkgs/development/libraries/gtk+/2.x.nix | 17 ++++++++++++-----
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index ba12b4eea93..bcbbecd242d 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -2,11 +2,15 @@
 , gdk_pixbuf, libintlOrEmpty, xlibsWrapper
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? true, cups ? null
+, gdktarget ? "x11"
+, AppKit, Cocoa
 }:
 
 assert xineramaSupport -> xorg.libXinerama != null;
 assert cupsSupport -> cups != null;
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "gtk+-2.24.31";
 
@@ -20,7 +24,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (libintlOrEmpty != []) "-lintl";
+  NIX_CFLAGS_COMPILE = optionalString (libintlOrEmpty != []) "-lintl";
 
   setupHook = ./setup-hook.sh;
 
@@ -28,7 +32,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./2.0-immodules.cache.patch ];
 
-  propagatedBuildInputs = with xorg; with stdenv.lib;
+  propagatedBuildInputs = with xorg;
     [ glib cairo pango gdk_pixbuf atk ]
     ++ optionals (stdenv.isLinux || stdenv.isDarwin) [
          libXrandr libXrender libXcomposite libXi libXcursor
@@ -36,11 +40,13 @@ stdenv.mkDerivation rec {
     ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ]
     ++ libintlOrEmpty
     ++ optional xineramaSupport libXinerama
-    ++ optionals cupsSupport [ cups ];
+    ++ optionals cupsSupport [ cups ]
+    ++ optionals (gdktarget == "quartz") [ AppKit Cocoa ];
 
   configureFlags = [
+    "--with-gdktarget=${gdktarget}"
     "--with-xinput=yes"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ optionals stdenv.isDarwin [
     "--disable-glibtest"
     "--disable-introspection"
     "--disable-visibility"
@@ -57,9 +63,10 @@ stdenv.mkDerivation rec {
       rm $out/lib/gtk-2.0/2.10.0/immodules.cache
       $out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache
     ''; # workaround for bug of nix-mode for Emacs */ '';
+    inherit gdktarget;
   };
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "A multi-platform toolkit for creating graphical user interfaces";
     homepage    = http://www.gtk.org/;
     license     = licenses.lgpl2Plus;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d538e21d24..ba5358f1906 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7488,6 +7488,8 @@ in
 
   gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
     cupsSupport = config.gtk2.cups or stdenv.isLinux;
+    gdktarget = if stdenv.isDarwin then "quartz" else "x11";
+    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
   };
 
   gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { };

From 8f7adffe4deefafc40f170194718e7837bf9208a Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Fri, 23 Dec 2016 22:20:30 +0100
Subject: [PATCH 0760/1310] pygtk: Add flag -ObjC for darwin

Had to add this so that it was able to parse the headers from the frameworks.
---
 pkgs/development/python-modules/pygtk/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index 7d0896c1fb8..0940ef00ac9 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   name = "pygtk-2.24.0";
-  
+
   disabled = isPy3k;
 
   src = fetchurl {
@@ -20,6 +20,8 @@ buildPythonPackage rec {
 
   buildPhase = "buildPhase";
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-ObjC";
+
   installPhase = "installPhase";
 
   checkPhase = stdenv.lib.optionalString (libglade == null)

From ef8fd815cc794b1f535a353bf1ce4573870fcbed Mon Sep 17 00:00:00 2001
From: florianjacob <accounts+github@florianjacob.de>
Date: Sat, 7 Jan 2017 17:28:11 +0100
Subject: [PATCH 0761/1310] update os-release manpage link

the old manpage at 0pointer is still there, but does not seem to get updated
---
 nixos/modules/misc/version.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index ec423768296..70cd3fb9766 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -99,7 +99,7 @@ in
     };
 
     # Generate /etc/os-release.  See
-    # http://0pointer.de/public/systemd-man/os-release.html for the
+    # https://www.freedesktop.org/software/systemd/man/os-release.html for the
     # format.
     environment.etc."os-release".text =
       ''

From 2ef6af7afdbf0e1f8647f96f9c86082cca8b76d9 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@aubble.com>
Date: Fri, 6 Jan 2017 08:41:49 -0500
Subject: [PATCH 0762/1310] libtermkey: from 0.18 to 0.19

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

diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix
index 43c8292a200..97bc98b22d8 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/pkgs/development/libraries/libtermkey/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "libtermkey-${version}";
 
-  version = "0.18";
+  version = "0.19";
 
   src = fetchzip {
     url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz";
-    sha256 = "0a0ih1a114phzmyq6jzgbp03x97463fwvrp1cgnl26awqw3f8sbf";
+    sha256 = "0v85h0zacd5lqwkykl2ms4009x8mfidzb6jr4dsq4gh7kwm54w56";
   };
 
   makeFlags = [ "PREFIX=$(out)" ]

From 96504cd75cde6b733385dcb44bcb18da7bf8d18a Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Fri, 6 Jan 2017 16:13:53 +0100
Subject: [PATCH 0763/1310] pythonPackages.discordpy: 0.15.1 -> 0.16

---
 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 cf01ec835a7..6025956261e 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.15.1";
+  version = "0.16.0";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "01lgidvnwwva1i65853gaplamllym2nsk0jis2r6f1rzbamgk1yj";
+    sha256 = "0r3qqvx36vywjyjk1nh11ymmr8y81sb45nk63665kcjagx8qnmfx";
   };
 
   propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ];

From 0f67005c4a2651ab0d9a48468a4873cff3551b8b Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sat, 24 Dec 2016 01:11:19 +0100
Subject: [PATCH 0764/1310] cairo: Add ApplicationServices as
 propagatedBuildInput

Noticed that it caused depending packages to fail, like librsvg, imagemagiv, graphviz.
---
 pkgs/development/libraries/cairo/default.nix   | 4 +++-
 pkgs/development/libraries/librsvg/default.nix | 7 ++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 7df72bc0560..5b40f27674d 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
   ] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     CoreGraphics
     CoreText
-    ApplicationServices
     Carbon
   ]);
 
@@ -57,6 +56,9 @@ stdenv.mkDerivation rec {
     ++ optionals xcbSupport [ libxcb xcbutil ]
     ++ optional gobjectSupport glib
     ++ optional glSupport mesa_noglu
+    ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+      ApplicationServices
+    ])
     ; # TODO: maybe liblzo but what would it be for here?
 
   configureFlags = if stdenv.isDarwin then [
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index ebd0f79cd47..409307fb52b 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
-, bzip2, libcroco, libintlOrEmpty, darwin
+, bzip2, libcroco, libintlOrEmpty
 , withGTK ? false, gtk3 ? null
 , gobjectIntrospection ? null, enableIntrospection ? false }:
 
@@ -22,10 +22,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
 
-  nativeBuildInputs = [ pkgconfig ]
-    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-      ApplicationServices
-    ]);
+  nativeBuildInputs = [ pkgconfig ];
 
   configureFlags = [ "--enable-introspection=auto" ]
     ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";

From ea053cad7a3c54a8fcb29d697c5c07f1f31c0937 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 22 Nov 2016 23:09:17 -0600
Subject: [PATCH 0765/1310] gtk-mac-integration: init at 2.0.8

---
 .../libraries/gtk-mac-integration/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/gtk-mac-integration/default.nix

diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix
new file mode 100644
index 00000000000..30ac8f2fe28
--- /dev/null
+++ b/pkgs/development/libraries/gtk-mac-integration/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "gtk-mac-integration-2.0.8";
+
+  src = fetchFromGitHub {
+    owner = "GNOME";
+    repo = "gtk-mac-integration";
+    rev = "79e708870cdeea24ecdb036c77b4630104ae1776";
+    sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc ];
+  buildInputs = [ glib gtk ];
+
+  preAutoreconf = ''
+    gtkdocize
+  '';
+
+  meta = with lib; {
+    description = "Provides integration for Gtk+ applications into the Mac desktop";
+
+    license = licenses.lgpl21;
+
+    homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Integration;
+
+    maintainers = [ maintainers.matthewbauer ];
+    platforms = platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba5358f1906..0d79a295854 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7515,6 +7515,10 @@ in
 
   gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { };
 
+  gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration {
+    gtk = gtk2;
+  };
+
   gtkspell2 = callPackage ../development/libraries/gtkspell { };
 
   gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };

From f025d2c1898a5697ca109d51412850375883db44 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sun, 25 Dec 2016 00:56:49 +0100
Subject: [PATCH 0766/1310] gtksourceview: Add gtk-mac-integration for darwin

Had to pick two commits as patches from the repository which update the
dependency ige-mac-integration to gtk-mac-integration.
---
 .../gnome-2/desktop/gtksourceview/default.nix | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index c69ee82fa26..7c9cd42a0e9 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -1,5 +1,8 @@
-{stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk, pango, 
-  libxml2Python, perl, intltool, gettext}:
+{stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib
+, gnome_common, gtk, pango
+, libxml2Python, perl, intltool, gettext, gtk-mac-integration }:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gtksourceview-${version}";
@@ -9,6 +12,29 @@ stdenv.mkDerivation rec {
     url = "mirror://gnome/sources/gtksourceview/2.10/${name}.tar.bz2";
     sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e";
   };
-  buildInputs = [pkgconfig atk cairo glib gtk pango libxml2Python perl intltool
-    gettext];
+
+  patches = optionals stdenv.isDarwin [
+    (fetchpatch {
+      name = "change-igemacintegration-to-gtkosxapplication.patch";
+      url = "https://git.gnome.org/browse/gtksourceview/patch/?id=e88357c5f210a8796104505c090fb6a04c213902";
+      sha256 = "0h5q79q9dqbg46zcyay71xn1pm4aji925gjd5j93v4wqn41wj5m7";
+    })
+    (fetchpatch {
+      name = "update-to-gtk-mac-integration-2.0-api.patch";
+      url = "https://git.gnome.org/browse/gtksourceview/patch/?id=ab46e552e1d0dae73f72adac8d578e40bdadaf95";
+      sha256 = "0qzrbv4hpa0v8qbmpi2vp575n13lkrvp3cgllwrd2pslw1v9q3aj";
+    })
+  ];
+
+  buildInputs = [
+    pkgconfig atk cairo glib gtk
+    pango libxml2Python perl intltool
+    gettext
+  ] ++ optionals stdenv.isDarwin [
+    autoreconfHook gnome_common gtk-mac-integration
+  ];
+
+  preConfigure = optionalString stdenv.isDarwin ''
+    intltoolize --force
+  '';
 }

From fdb5832d097afdb295b92e96dd7df37dd81d71e0 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Sat, 7 Jan 2017 19:48:38 +0100
Subject: [PATCH 0767/1310] pythonPackages.docker_compose: Add myself as a
 maintainer

---
 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 f1dc2bf86dc..6070971874d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11125,6 +11125,9 @@ in {
       homepage = "https://docs.docker.com/compose/";
       description = "Multi-container orchestration for Docker";
       license = licenses.asl20;
+      maintainers = with maintainers; [
+        jgeerds
+      ];
     };
   };
 

From a5be4fe67abb315fb0d4cece735882214be7d4a2 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Sat, 7 Jan 2017 19:49:49 +0100
Subject: [PATCH 0768/1310] pythonPackages.docker_compose: Set meta.platforms
 to linux

---
 pkgs/top-level/python-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6070971874d..687889f0b14 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11125,6 +11125,7 @@ in {
       homepage = "https://docs.docker.com/compose/";
       description = "Multi-container orchestration for Docker";
       license = licenses.asl20;
+      platforms = platforms.linux;
       maintainers = with maintainers; [
         jgeerds
       ];

From 372e04f1894a86f2c1dfdd9e7b673f30a5f0dc39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 7 Jan 2017 20:15:59 +0100
Subject: [PATCH 0769/1310] libpqxx: use gnused_422

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

diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index e8a80497de3..51cb1c48e54 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, postgresql, python2 }:
+{ lib, stdenv, fetchurl, postgresql, python2, gnused }:
 
 stdenv.mkDerivation rec {
   name = "libpqxx-4.0.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0f6wxspp6rx12fkasanb0z2g2gc8dhcfwnxagx8wwqbpg6ifsz09";
   };
 
-  buildInputs = [ postgresql python2 ];
+  buildInputs = [ postgresql python2 gnused ];
 
   preConfigure = ''
     patchShebangs .
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d538e21d24..546ea865228 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8375,7 +8375,9 @@ in
 
   libpfm = callPackage ../development/libraries/libpfm { };
 
-  libpqxx = callPackage ../development/libraries/libpqxx { };
+  libpqxx = callPackage ../development/libraries/libpqxx { 
+    gnused = gnused_422;
+  };
 
   libproxy = callPackage ../development/libraries/libproxy {
     stdenv = if stdenv.isDarwin

From 760710efd1b05f02b6c1b92493994fa1b058dcef Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Sat, 7 Jan 2017 19:58:48 +0100
Subject: [PATCH 0770/1310] qualia: init at 1.0.0 tests disabled maintainer
 srhb

---
 lib/maintainers.nix                    |  1 +
 pkgs/tools/text/mir-qualia/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  4 ++++
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/text/mir-qualia/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 721e63cd6a7..47c79abc284 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -444,6 +444,7 @@
   spinus = "Tomasz Czyż <tomasz.czyz@gmail.com>";
   sprock = "Roger Mason <rmason@mun.ca>";
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
+  srhb = "Sarah Brofeldt <sbrofeldt@gmail.com>";
   SShrike = "Severen Redwood <severen@shrike.me>";
   stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
   sternenseemann = "Lukas Epple <post@lukasepple.de>";
diff --git a/pkgs/tools/text/mir-qualia/default.nix b/pkgs/tools/text/mir-qualia/default.nix
new file mode 100644
index 00000000000..b22d5893915
--- /dev/null
+++ b/pkgs/tools/text/mir-qualia/default.nix
@@ -0,0 +1,21 @@
+{ lib, pythonPackages, fetchurl }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "mir.qualia-${version}";
+  version = "1.0.0";
+  doCheck = false; # 1.0.0-released pytests are broken
+
+  buildInputs = with pythonPackages; [ pytest ];
+
+  src = fetchurl {
+    url = "mirror://pypi/m/mir.qualia/mir.qualia-${version}.tar.gz";
+    sha256 = "1g0nwncwk4nq7b7zszqi1q4d2bdga1q50g9nkxigdaq647wqdf7x";
+  };
+
+  meta = {
+    description = "Dynamically enable sections of config files";
+    homepage = https://github.com/darkfeline/mir.qualia;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.srhb ] ;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d538e21d24..69f7c70dd38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2818,6 +2818,10 @@ in
 
   minixml = callPackage ../development/libraries/minixml { };
 
+  mir-qualia = callPackage ../tools/text/mir-qualia {
+    pythonPackages = python3Packages;
+  };
+
   miredo = callPackage ../tools/networking/miredo { };
 
   mitmproxy = callPackage ../tools/networking/mitmproxy { };

From 9c2a222092eeaea15a0d601831381378c1902de3 Mon Sep 17 00:00:00 2001
From: tkatchev <tkatchev@gmail.com>
Date: Fri, 6 Jan 2017 23:37:12 +0300
Subject: [PATCH 0771/1310] gtest, gmock: fix broken package by updating to
 1.8.0.

---
 pkgs/development/libraries/gmock/default.nix  | 35 -------------------
 pkgs/development/libraries/gtest/default.nix  | 29 ++++++++-------
 pkgs/development/libraries/gtest/source.nix   | 22 ------------
 .../libraries/protobuf/generic-v3.nix         |  5 ++-
 .../libraries/protobuf/generic.nix            |  2 +-
 pkgs/top-level/all-packages.nix               |  2 +-
 6 files changed, 23 insertions(+), 72 deletions(-)
 delete mode 100644 pkgs/development/libraries/gmock/default.nix
 delete mode 100644 pkgs/development/libraries/gtest/source.nix

diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix
deleted file mode 100644
index 139cfab6e0c..00000000000
--- a/pkgs/development/libraries/gmock/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, cmake, fetchzip }:
-
-stdenv.mkDerivation rec {
-  name = "gmock-${version}";
-  version = "1.7.0";
-
-  src = fetchzip {
-    url = "https://googlemock.googlecode.com/files/gmock-${version}.zip";
-    sha256 = "04n9p6pf3mrqsabrsncv32d3fqvd86zmcdq3gyni7liszgfk0paz";
-  };
-
-  buildInputs = [ cmake ];
-
-  buildPhase = ''
-    # avoid building gtest
-    make gmock gmock_main
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib
-    cp -v libgmock.a libgmock_main.a $out/lib
-    cp -v -r ../include $out
-    cp -v -r ../src $out
-  '';
-
-  meta = {
-    description = "Google mock: Google's framework for writing C++ mock classes";
-    homepage = https://code.google.com/p/googlemock/;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.auntie ];
-    platforms = stdenv.lib.platforms.unix;
-  };
-
-  passthru = { source = src; };
-}
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index e516e4a475a..84b1fa9757c 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, cmake, callPackage }:
-let
-  source = callPackage ./source.nix { };
-in
+{ stdenv, cmake, fetchFromGitHub }:
 stdenv.mkDerivation rec {
-  name = "gtest-${source.version}";
+  name = "gtest-${version}";
+  version = "1.8.0";
 
-  src = source;
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "googletest";
+    rev = "release-${version}";
+    sha256 = "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399";
+  };
 
   buildInputs = [ cmake ];
 
@@ -17,9 +20,13 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/lib
-    cp -v libgtest.a libgtest_main.a $out/lib
-    cp -v -r ../include $out
-    cp -v -r ../src $out
+    cp -v googlemock/gtest/libgtest.a googlemock/gtest/libgtest_main.a googlemock/libgmock.a googlemock/libgmock_main.a $out/lib
+    ln -s $out/lib/libgmock.a $out/lib/libgoogletest.a
+    mkdir -p $out/include
+    cp -v -r ../googlemock/include/gmock $out/include
+    cp -v -r ../googletest/include/gtest $out/include
+    mkdir -p $out/src
+    cp -v -r ../googlemock/src/* ../googletest/src/* $out/src
   '';
 
   meta = with stdenv.lib; {
@@ -27,8 +34,6 @@ stdenv.mkDerivation rec {
     homepage = https://code.google.com/p/googletest/;
     license = licenses.bsd3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ zoomulator ];
+    maintainers = with maintainers; [ zoomulator ivan-tkatchev ];
   };
-
-  passthru = { inherit source; };
 }
diff --git a/pkgs/development/libraries/gtest/source.nix b/pkgs/development/libraries/gtest/source.nix
deleted file mode 100644
index d8787efdcf2..00000000000
--- a/pkgs/development/libraries/gtest/source.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ fetchurl, stdenv, unzip, ... }:
-
-stdenv.mkDerivation rec {
-  name = "gtest-src-${version}";
-  version = "1.7.0";
-
-  src = fetchurl {
-    url = "https://googletest.googlecode.com/files/gtest-${version}.zip";
-    sha256 = "03fnw3bizw9bcx7l5qy1vz7185g33d5pxqcb6aqxwlrzv26s2z14";
-  };
-
-  buildInputs = [ unzip ];
-
-  buildCommand = ''
-    unpackPhase
-    cd gtest-${version}
-    mkdir $out
-    cp -r * $out
-  '';
-
-  passthru = { inherit version; };
-}
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 5a3738564d7..f74aea9dbd5 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -18,8 +18,11 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     rm -rf gmock
-    cp -r ${gmock.source} gmock
+    cp -r ${gmock.src}/googlemock gmock
+    cp -r ${gmock.src}/googletest googletest
     chmod -R a+w gmock
+    chmod -R a+w googletest
+    ln -s ../googletest gmock/gtest
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/google/protobuf/testing/googletest.cc \
       --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 47f66c83ff5..498263458b5 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     rm -rf gtest
-    cp -r ${gtest.source} gtest
+    cp -r ${gtest.src}/googletest gtest
     chmod -R a+w gtest
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/google/protobuf/testing/googletest.cc \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9842aaede3..f789cfe26cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2055,7 +2055,7 @@ in
   gt5 = callPackage ../tools/system/gt5 { };
 
   gtest = callPackage ../development/libraries/gtest {};
-  gmock = callPackage ../development/libraries/gmock {};
+  gmock = gtest;
   gbenchmark = callPackage ../development/libraries/gbenchmark {};
 
   gtkdatabox = callPackage ../development/libraries/gtkdatabox {};

From cae067f17a8c592d716a6ad2c1a6be2ff79f7c55 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 5 Jan 2017 17:24:08 -0600
Subject: [PATCH 0772/1310] transmission: add enableSystemd flag

This flag can be used to enable systemd daemon support in transmission.
---
 .../applications/networking/p2p/transmission/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index b85970df4b4..fcf9225c3aa 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper
 , openssl, curl, libevent, inotify-tools, systemd, zlib
 , enableGTK3 ? false, gtk3
+, enableSystemd ? stdenv.isLinux
 }:
 
 let
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools zlib ]
     ++ optionals enableGTK3 [ gtk3 makeWrapper ]
-    ++ optional stdenv.isLinux systemd;
+    ++ optionals enableSystemd [ systemd ]
 
   postPatch = ''
     substituteInPlace ./configure \
@@ -27,8 +28,10 @@ stdenv.mkDerivation rec {
       --replace "/usr/bin/file"     "${file}/bin/file"
   '';
 
-  configureFlags = [ "--with-systemd-daemon" ]
-    ++ [ "--enable-cli" ]
+  configureFlags = [
+      "--enable-cli"
+    ]
+    ++ optional enableSystemd "--with-systemd-daemon"
     ++ optional enableGTK3 "--with-gtk";
 
   preFixup = optionalString enableGTK3 /* gsettings schemas for file dialogues */ ''

From 30eed5541039ed12d764016e52a4316a97d4c9cf Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 5 Jan 2017 17:26:51 -0600
Subject: [PATCH 0773/1310] transmission: add enableCli flag

---
 pkgs/applications/networking/p2p/transmission/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index fcf9225c3aa..102a12c84c1 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -2,6 +2,7 @@
 , openssl, curl, libevent, inotify-tools, systemd, zlib
 , enableGTK3 ? false, gtk3
 , enableSystemd ? stdenv.isLinux
+, enableCli ? true
 }:
 
 let
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-      "--enable-cli"
+      ("--enable-cli=" + (if enableCli then "yes" else "no"))
     ]
     ++ optional enableSystemd "--with-systemd-daemon"
     ++ optional enableGTK3 "--with-gtk";

From 976aed886b8f9280521a38dfa07419741263acfe Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 5 Jan 2017 17:27:16 -0600
Subject: [PATCH 0774/1310] transmission: add enableDaemon flag

---
 pkgs/applications/networking/p2p/transmission/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 102a12c84c1..dba0de118e1 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -2,6 +2,7 @@
 , openssl, curl, libevent, inotify-tools, systemd, zlib
 , enableGTK3 ? false, gtk3
 , enableSystemd ? stdenv.isLinux
+, enableDaemon ? true
 , enableCli ? true
 }:
 
@@ -31,6 +32,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
       ("--enable-cli=" + (if enableCli then "yes" else "no"))
+      ("--enable-daemon=" + (if enableDaemon then "yes" else "no"))
     ]
     ++ optional enableSystemd "--with-systemd-daemon"
     ++ optional enableGTK3 "--with-gtk";

From 6695954d48ac8ce21b35e396972c857dc0c3f8f0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 5 Jan 2017 17:28:13 -0600
Subject: [PATCH 0775/1310] transmission: fix building on Darwin

This sets "--disable-mac" so that we use GTK instead of the macOS
backend. The macOS backend should work but currently it breaks with xcbuild.
---
 .../networking/p2p/transmission/default.nix           | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index dba0de118e1..12692b9566f 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -20,19 +20,22 @@ stdenv.mkDerivation rec {
     sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s";
   };
 
-  buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools zlib ]
+  buildInputs = [ pkgconfig intltool file openssl curl libevent zlib ]
     ++ optionals enableGTK3 [ gtk3 makeWrapper ]
     ++ optionals enableSystemd [ systemd ]
+    ++ optionals stdenv.isLinux [ inotify-tools ];
 
   postPatch = ''
     substituteInPlace ./configure \
       --replace "libsystemd-daemon" "libsystemd" \
-      --replace "/usr/bin/file"     "${file}/bin/file"
+      --replace "/usr/bin/file"     "${file}/bin/file" \
+      --replace "test ! -d /Developer/SDKs/MacOSX10.5.sdk" "false"
   '';
 
   configureFlags = [
       ("--enable-cli=" + (if enableCli then "yes" else "no"))
       ("--enable-daemon=" + (if enableDaemon then "yes" else "no"))
+      "--disable-mac" # requires xcodebuild
     ]
     ++ optional enableSystemd "--with-systemd-daemon"
     ++ optional enableGTK3 "--with-gtk";
@@ -43,6 +46,8 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
+  NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation";
+
   meta = with stdenv.lib; {
     description = "A fast, easy and free BitTorrent client";
     longDescription = ''
@@ -59,7 +64,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.transmissionbt.com/;
     license = licenses.gpl2; # parts are under MIT
     maintainers = with maintainers; [ astsmtl vcunat wizeman ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
 

From e8c9a4b3baaeb2cf0da9eeda8a32e14d61712729 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Sun, 8 Jan 2017 13:39:16 +0800
Subject: [PATCH 0776/1310] crystal: 0.20.3 -> 0.20.4

---
 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 39a06a4b1dc..7162f85e05d 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.3";
+  version = "0.20.4";
   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" = "c656dc8092a6161262f527df441aaab4ea9dd9a836a013f7155c6378b26b8cd7";
-        "i686-linux" = "85edfa1dda5e712341869bab87f6de0f7c6860e2a04dec2f00e8dc6aa1418611";
-        "x86_64-darwin" = "0088972c5cad9543f262976ae6c8ee1dbcbefdee3a8bedae851998bfa7098637";
+        "x86_64-linux" = "cdc11c30235f8bd3b89e1fc13b56838f99d585715fb66563d6599026f5393e37";
+        "i686-linux" = "93e7df2bea3220728987a49a2f93d1c615e2ccae63843e0259a5d891c53a0b80";
+        "x86_64-darwin" = "3fd291a4a5c9eccdea933a9df25446c90d80660a17e89f83503fcb5b6deba03e";
       }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
   };
 
   src = fetchurl {
     url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
-    sha256 = "5372ba2a35d885345207047a51b9389f9190fd12389847e7f7298618bcf59ad6";
+    sha256 = "fd099f278b71bbb5cad1927c93933d1feba554fbf8f6f4ab9165f535765f5e31";
   };
 
   # crystal on Darwin needs libiconv to build

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 0777/1310] 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 3dc8b5d904803853946e5c6637ab703edf764c89 Mon Sep 17 00:00:00 2001
From: Jay Mundrawala <jdmundrawala@gmail.com>
Date: Sun, 8 Jan 2017 01:53:44 -0800
Subject: [PATCH 0778/1310] rustUnstableBin.rustc: Run patchelf on bin/rustdoc
 (#21746)

Cargo seems to run rustdoc and produces an annoying error when
it tries to run.
---
 pkgs/development/compilers/rust/nightlyBin.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix
index 6f7cca9aff2..bac35c790d0 100644
--- a/pkgs/development/compilers/rust/nightlyBin.nix
+++ b/pkgs/development/compilers/rust/nightlyBin.nix
@@ -49,6 +49,9 @@ rec {
         patchelf \
           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
           "$out/bin/rustc"
+        patchelf \
+          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+          "$out/bin/rustdoc"
       ''}
     '';
 

From 64e4b7ac423d4e660d350fd1e9423eb009c14e9d Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@aon.at>
Date: Thu, 15 Dec 2016 20:44:02 +0100
Subject: [PATCH 0779/1310] grib-api: 1.14.4 -> 1.19.0

- Remove downloading of testdata during buildPhase to
  - fix hydra build
  - remove impurity
  - reduce traffic
- Bump version
- Add myself as a maintainer
---
 lib/maintainers.nix                           |  1 +
 .../libraries/grib-api/default.nix            | 46 +++++++++++++++----
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 664c50dd579..b20d4e21196 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -231,6 +231,7 @@
   KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>";
   kierdavis = "Kier Davis <kierdavis@gmail.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
+  knedlsepp = "Josef Kemetmüller <josef.kemetmueller@gmail.com>";
   koral = "Koral <koral@mailoo.org>";
   kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
   kragniz = "Louis Taylor <louis@kragniz.eu>";
diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index ee505b54e7e..ca2fb728262 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -1,32 +1,60 @@
-{ fetchurl, stdenv, curl,
-  netcdf, jasper, openjpeg }:
+{ fetchurl, stdenv,
+  cmake, netcdf, gfortran, jasper, libpng,
+  enablePython ? false, pythonPackages }:
 
 stdenv.mkDerivation rec{
   name = "grib-api-${version}";
-  version = "1.14.4";
+  version = "1.19.0";
 
   src = fetchurl {
-    url = https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.14.4-Source.tar.gz;
-    sha256 = "1w8z9y79wakhwv1r4rb4dwlh9pbyw367klcm6laxz91hhvfrpfq8";
+    url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz";
+    sha256 = "07cj9mw5bb249lxx1m9nmfdqb8b2a8cm7s6x62cdwca3sp16dv6a";
   };
 
-  buildInputs = [ netcdf
+  preConfigure = ''
+    # Fix "no member named 'inmem_' in 'jas_image_t'"
+    substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_    = 1;" ""
+  '';
+
+  buildInputs = [ cmake
+                  netcdf
+                  gfortran
                   jasper
-                  openjpeg
-                  curl     # Used for downloading during make test
+                  libpng
+                ] ++ stdenv.lib.optionals enablePython [
+                  pythonPackages.python
                 ];
+
+  cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}"
+                 "-DENABLE_PNG=ON"
+                 "-DENABLE_FORTRAN=ON"
+               ];
+
+  enableParallelBuilding = true;
+
   doCheck = true;
 
+  # Only do tests that don't require downloading 120MB of testdata
+  # We fix the darwin checkPhase, which searches for libgrib_api.dylib
+  # in /nix/store by setting DYLD_LIBRARY_PATH
+  checkPhase = stdenv.lib.optionalString (stdenv.isDarwin) ''
+    substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib"
+  '' + ''
+    ctest -R "t_definitions|t_calendar|t_unit_tests" -VV
+  '';
+
+
   meta = with stdenv.lib; {
     homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home";
     license = licenses.asl20;
+    platforms = with platforms; linux ++ darwin;
     description = "ECMWF Library for the GRIB file format";
     longDescription = ''
       The ECMWF GRIB API is an application program interface accessible from C,
       FORTRAN and Python programs developed for encoding and decoding WMO FM-92
       GRIB edition 1 and edition 2 messages.
     '';
-
+    maintainers = with maintainers; [ knedlsepp ];
   };
 }
 

From 9653be493a961dd0fdef863385b00130eb57646f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 8 Jan 2017 13:58:07 +0100
Subject: [PATCH 0780/1310] firejail: 0.9.44.2 -> 0.9.44.4

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

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 6b3afc1d63c..74486843b92 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.44.2";
+    version="0.9.44.4";
     name="${baseName}-${version}";
-    hash="0lc8vq6lj0669q4vx08m3dzqjayhl0cmm7n3qi4k18ys8ccyzbf5";
-    url="https://kent.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.2.tar.xz";
-    sha256="0lc8vq6lj0669q4vx08m3dzqjayhl0cmm7n3qi4k18ys8ccyzbf5";
+    hash="03y1xc70w5xr6jynmj305fmgniz2cq21q85s5q7dnda8ap6s4w1d";
+    url="https://netcologne.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.4.tar.xz";
+    sha256="03y1xc70w5xr6jynmj305fmgniz2cq21q85s5q7dnda8ap6s4w1d";
   };
   buildInputs = [
     which

From 3a3b0263b0e9abbb50738c977e0a9118b1397073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 8 Jan 2017 14:13:40 +0100
Subject: [PATCH 0781/1310] subsurface: disable parallel make, as it fails on
 Hydra

http://hydra.nixos.org/build/46126151/nixlog/1/raw
---
 pkgs/applications/misc/subsurface/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index a1b03f48b22..a4aef9def60 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
                   qtconnectivity libgit2 libssh2 curl ];
   nativeBuildInputs = [ pkgconfig cmake ];
 
-  enableParallelBuilding = true;
+  #enableParallelBuilding = true; # fatal error: ui_mainwindow.h: No such file or directory
 
   # hack incoming...
   preConfigure = ''

From 81c51b18ee68f6561b1efaff00de844b3c57fca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 8 Jan 2017 14:18:28 +0100
Subject: [PATCH 0782/1310] clamav: fixup build after updating zlib

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

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 88df4d78d26..da469771c6e 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--sysconfdir=/etc/clamav"
     "--with-zlib=${zlib.dev}"
+    "--disable-zlib-vcheck" # it fails to recognize that 1.2.10 >= 1.2.2
     "--with-libbz2-prefix=${bzip2.dev}"
     "--with-iconv-dir=${libiconv}"
     "--with-xml=${libxml2.dev}"

From abcd344ccbe89856558cd5e183fa4d6606ae00cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 8 Jan 2017 14:30:31 +0100
Subject: [PATCH 0783/1310] perl-Compress-Raw-Zlib: try without testing for now

Tests got broken by zlib update.  Also 2.0.65 -> 2.0.71,
but the update didn't help with this unfortunately.
---
 .../perl-modules/Compress-Raw-Zlib/default.nix            | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
index 7f2f8e9e4e5..5cd197b9d3f 100644
--- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
+++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, buildPerlPackage, zlib, stdenv }:
 
 buildPerlPackage rec {
-  name = "Compress-Raw-Zlib-2.065";
+  name = "Compress-Raw-Zlib-2.071";
 
   src = fetchurl {
     url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-    sha256 = "1i09h3dvn8ipaj1l2nq2qd19wzhn7wcpbsipdkcniwi0sgy1kf1p";
+    sha256 = "0dk7pcmhnl7n811q3p4rrz5ijdhz6jx367h6rypgvg1y39z4arfs";
   };
 
   preConfigure = ''
@@ -18,7 +18,9 @@ buildPerlPackage rec {
     EOF
   '';
 
-  doCheck = !stdenv.isDarwin;
+  # Try untested for now.  Upstream bug:
+  # https://rt.cpan.org/Public/Bug/Display.html?id=119762
+  doCheck = false && !stdenv.isDarwin;
 
   meta = {
     license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From 8940c68c09df3c96aea3c66603488b4c667f67f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 8 Jan 2017 14:38:35 +0100
Subject: [PATCH 0784/1310] hydra: 2016-04-15 -> 2016-12-09

Fixes #19396 #21424
---
 pkgs/development/tools/misc/hydra/default.nix | 20 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index e3d2c4950bc..dbd53c65050 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -3,7 +3,7 @@
 , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
 , guile, perl, postgresql92, aws-sdk-cpp, nukeReferences, git, boehmgc
 , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
-, rpm, dpkg, cdrkit, fetchpatch }:
+, rpm, dpkg, cdrkit, fetchpatch, pixz }:
 
 with stdenv;
 
@@ -61,21 +61,17 @@ let
   };
 in releaseTools.nixBuild rec {
   name = "hydra-${version}";
-  version = "2016-04-15";
+  version = "2016-12-09";
+
+  inherit stdenv;
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "177bf25d648092826a75369191503a3f2bb763a4";
-    sha256 = "0ngipzm2i2vz5ygfd70hh82d027snpl85r8ncn1rxlkak0g8fxsl";
+    rev = "de55303197d997c4fc5503b52b1321ae9528583d";
+    sha256 = "0nimqsbpjxfwha6d5gp6a7jh50i83z1llmx30da4bscsic8z1xly";
   };
 
-  patches = [(fetchpatch {
-    name = "cmath.diff";
-    url = https://github.com/vcunat/hydra/commit/3c6fca1ba299.diff; # https://github.com/NixOS/hydra/pull/337
-    sha256 = "02m9q304ay45s7xfkm2y7lppakrkx3hrq39mm6348isnbqmbarc0";
-  })];
-
   buildInputs =
     [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
       gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
@@ -96,7 +92,7 @@ in releaseTools.nixBuild rec {
     ];
 
   hydraPath = lib.makeBinPath (
-    [ libxslt sqlite subversion openssh nixUnstable coreutils findutils
+    [ sqlite subversion openssh nixUnstable coreutils findutils pixz
       gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar
     ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
 
@@ -108,7 +104,7 @@ in releaseTools.nixBuild rec {
   configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
 
   preHook = ''
-    PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$PATH
+    PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH
     PERL5LIB=$(pwd)/src/lib:$PERL5LIB;
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e62fff9f127..5152734365c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7592,7 +7592,7 @@ in
 
   hwloc = callPackage ../development/libraries/hwloc {};
 
-  hydra = callPackage ../development/tools/misc/hydra {};
+  hydra = callPackage ../development/tools/misc/hydra { stdenv = overrideCC stdenv gcc6; };
 
   hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
 

From 547b203b9a28968bba9e9902dbff4600779ed75b Mon Sep 17 00:00:00 2001
From: Sebastian Hagen <sh_c_git@memespace.net>
Date: Sun, 8 Jan 2017 13:32:09 +0000
Subject: [PATCH 0785/1310] ed: Add fedoraproject mirror.

The existing URL has gone dark; this commit adds one from fedoraproject.org
that still works. We put the new mirror first since ed is in the bootstrap
path, and 16.09 bootstrap doesn't try later URLs.
---
 pkgs/applications/editors/ed/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 650a551cb60..680b7f8a030 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -2,6 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "ed-1.13";
+  file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror
 
   src = fetchurl {
     # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
@@ -9,7 +10,10 @@ 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
-    url = "http://fossies.org/linux/privat/${name}.tar.bz2";
+    urls = [
+      "http://pkgs.fedoraproject.org/repo/extras/ed/${name}.tar.bz2/${file_md5}/${name}.tar.bz2"
+      "http://fossies.org/linux/privat/${name}.tar.bz2"
+    ];
     sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j";
   };
 

From 50ec3fe1ac93d6059f67396fc7954c17084a1b20 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 5 Jan 2017 23:18:49 +0000
Subject: [PATCH 0786/1310] test-driver: support punctuation in sendChars

---
 nixos/lib/test-driver/Machine.pm | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 274b16164db..14c39e859bc 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -611,11 +611,37 @@ sub copyFileFromHost {
 }
 
 
+my %charToKey = (
+    '!' => "shift-0x02",
+    '@' => "shift-0x03",
+    '#' => "shift-0x04",
+    '$' => "shift-0x05",
+    '%' => "shift-0x06",
+    '^' => "shift-0x07",
+    '&' => "shift-0x08",
+    '*' => "shift-0x09",
+    '(' => "shift-0x0A",
+    ')' => "shift-0x0B",
+    '-' => "0x0C", '_' => "shift-0x0C",
+    '=' => "0x0D", '+' => "shift-0x0D",
+    '[' => "0x1A", '{' => "shift-0x1A",
+    ']' => "0x1B", '}' => "shift-0x1B",
+    ';' => "0x27", ':' => "shift-0x27",
+   '\'' => "0x28", '"' => "shift-0x28",
+    '`' => "0x29", '~' => "shift-0x29",
+   '\\' => "0x2B", '|' => "shift-0x2B",
+    ',' => "0x33", '<' => "shift-0x33",
+    '.' => "0x34", '>' => "shift-0x34",
+    '/' => "0x35", '?' => "shift-0x35",
+    ' ' => "spc",
+   "\n" => "ret",
+);
+
+
 sub sendKeys {
     my ($self, @keys) = @_;
     foreach my $key (@keys) {
-        $key = "spc" if $key eq " ";
-        $key = "ret" if $key eq "\n";
+        $key = $charToKey{$key} if exists $charToKey{$key};
         $self->sendMonitorCommand("sendkey $key");
     }
 }

From a66480d52b7cefe53b884f33b7f8132e5e8b68a1 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sun, 8 Jan 2017 16:28:49 +0100
Subject: [PATCH 0787/1310] sonarr: 2.0.0.4427 -> 2.0.0.4472

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

diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index a742249e794..6f553f70712 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sonarr-${version}";
-  version = "2.0.0.4427";
+  version = "2.0.0.4472";
 
   src = fetchurl {
     url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "066jhvz57hxrcgn902z25a21sj87wiqz224fjzpk1lpxrylv4ac2";
+    sha256 = "0sz03z057pyai151lxsdsgxlv6kvrnd1xxw7i1ss7b79l6xgmpw8";
   };
 
   buildInputs = [

From 2a2e8e906b7ceac2c5c76ab85b9b565665e81053 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 8 Jan 2017 10:25:28 +0100
Subject: [PATCH 0788/1310] rustRegistry: 2016-12-28 -> 2017-01-08

---
 pkgs/top-level/rust-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 14ef3cfef43..ea827651b2f 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2016-12-28";
-  rev = "3399254d4a021d07736944b339a8794eddcda517";
-  sha256 = "1vbixbgzv21anqayz8ya0x1qlzndb7fpdf9dyh4yyscl1kaibvg9";
+  version = "2017-01-08";
+  rev = "5ca2f329d51b9466d9bda79172e0135edaf15f30";
+  sha256 = "19h3zyx83va00ssagqsk9h0c83ir9wqhn192xvk5k44m9648jvsh";
 
   src = fetchFromGitHub {
       inherit rev;

From 7435fefd26f27b14e6b3c6820a51cb7c499bd8d6 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 8 Jan 2017 10:31:34 +0100
Subject: [PATCH 0789/1310] rustc: Disable fragile tcp tests on Darwin

This is an alternative implementation of
https://github.com/NixOS/nixpkgs/pull/21741/files
---
 pkgs/development/compilers/rust/default.nix   |  2 +-
 .../darwin-disable-fragile-tcp-tests.patch    | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 4d9668da2e3..7b8d5a3d1ef 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -4,7 +4,6 @@
 let
   rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
 in
-
 rec {
   rustc = callPackage ./rustc.nix {
     shortVersion = "1.14";
@@ -16,6 +15,7 @@ rec {
 
     patches = [
       ./patches/disable-lockfile-check-stable.patch
+      ./patches/darwin-disable-fragile-tcp-tests.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 
     inherit targets;
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
new file mode 100644
index 00000000000..5c51886b4d8
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/darwin-disable-fragile-tcp-tests.patch
@@ -0,0 +1,36 @@
+From 0becb0b7cff0176279fc9f94c91299d788a43941 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(-)
+
+diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
+index 0e7c5b0671..189c31b958 100644
+--- a/src/libstd/net/tcp.rs
++++ b/src/libstd/net/tcp.rs
+@@ -1022,7 +1022,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)]
+     #[test]
+     fn timeouts() {
+         let addr = next_test_ip4();
+@@ -1101,6 +1104,7 @@ mod tests {
+         assert_eq!(false, t!(stream.nodelay()));
+     }
+ 
++    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn ttl() {
+         let ttl = 100;
+-- 
+2.11.0
+

From d042abef267435a5b387198070dc9ff80a62efec Mon Sep 17 00:00:00 2001
From: Sebastian Hagen <sh_github@memespace.net>
Date: Sun, 8 Jan 2017 17:09:57 +0000
Subject: [PATCH 0790/1310] zlib: Fix zlib.net URL. (#21753)

Look for primary source file below
  http://zlib.net/fossils/ as opposed to
  http://zlib.net/
. zlib-1.2.8.tar.gz is still available at the former location, and will likely
remain there. In addition, it's important that the first URL work since zlib
is in the bootstrap path, and 16.09 (at least) bootstrap doesn't try to fetch
from later ones.
---
 pkgs/development/libraries/zlib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 21a7e81ce3e..dd73974b140 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls =
-      [ "http://www.zlib.net/${name}.tar.gz"  # old versions vanish from here
+      [ "http://www.zlib.net/fossils/${name}.tar.gz"  # stable archive path
         "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz"
       ];
     sha256 = "039agw5rqvqny92cpkrfn243x2gd4xn13hs3xi6isk55d2vqqr9n";

From 5c55d54db9f43aa075add5e7b9e6b757bf51891a Mon Sep 17 00:00:00 2001
From: FaustXVI <xavier.detant@gmail.com>
Date: Sun, 8 Jan 2017 18:30:11 +0100
Subject: [PATCH 0791/1310] discord: 0.0.11 -> 0.0.13

---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 8387d2f7c38..67dc65edbc3 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {
 
     pname = "discord";
-    version = "0.0.11";
+    version = "0.0.13";
     name = "${pname}-${version}";
 
     src = fetchurl {
         url = "https://cdn-canary.discordapp.com/apps/linux/${version}/${pname}-canary-${version}.tar.gz";
-        sha256 = "1lk53vm14vr5pb8xxcx6hinpc2mkdns2xxv0bfzxvlmhfr6d6y18";
+        sha256 = "1pwb8y80z1bmfln5wd1vrhras0xygd1j15sib0g9vaig4mc55cs6";
     };
 
     libPath = stdenv.lib.makeLibraryPath [

From efe05f9d4297baf10ce2aa8923e1bb432c7c4a4a Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 8 Jan 2017 20:14:00 +0100
Subject: [PATCH 0792/1310] notmuch: 0.23.2 -> 0.23.4.

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

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 83eace00b0a..c1a32341ffe 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -10,7 +10,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.23.2";
+  version = "0.23.4";
   name = "notmuch-${version}";
 
   passthru = {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "1g4p5hsrqqbqk6s2w756als60wppvjgpyq104smy3w9vshl7bzgd";
+    sha256 = "0fs5crf8v3jghc8jnm61cv7wxhclcg88hi5894d8fma9kkixcv8h";
   };
 
   buildInputs = [

From 9729a8d0155508a524834462b0a21f35385d0c20 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 7 Jan 2017 12:34:58 +0100
Subject: [PATCH 0793/1310] haskell-esqueleto: keep version 2.4.x around so
 that we can still build git-annex

---
 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 97d6bc5695e..d07a9be0c4e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2015,6 +2015,7 @@ extra-packages:
   - containers < 0.5                    # required to build alex with GHC 6.12.3
   - control-monad-free < 0.6            # newer versions don't compile with anything but GHC 7.8.x
   - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
+  - 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
   - haddock < 2.17                      # required on GHC 7.10.x

From 667c4e49252ad9aeb38f62af0e8143bc128af920 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jan 2017 11:34:44 +0100
Subject: [PATCH 0794/1310] 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/47c259fc33912fcb83f7881456bff6ef31965463.
---
 .../haskell-modules/hackage-packages.nix      | 996 +++++++++++++-----
 1 file changed, 754 insertions(+), 242 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1922fb3efc3..453ce86a060 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10122,6 +10122,8 @@ self: {
        pname = "JuicyPixels";
        version = "3.2.8";
        sha256 = "038c6547d543442a93b2028be4b84c225bb7a6fa913e1fc57325c58d043d5644";
+       revision = "1";
+       editedCabalFile = "5211841fbb8a9a7fe19ce715a749149ab03c28344531bc3163f8580b611a2e3e";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -17204,16 +17206,17 @@ self: {
      }) {};
 
   "Unique" = callPackage
-    ({ mkDerivation, base, containers, extra, hashable
-     , unordered-containers
+    ({ mkDerivation, base, containers, extra, hashable, hspec
+     , QuickCheck, unordered-containers
      }:
      mkDerivation {
        pname = "Unique";
-       version = "0.4.5";
-       sha256 = "207488edc9915f826c7ef72386fccbad265a32394364fa9bcba73209e150e58b";
+       version = "0.4.6";
+       sha256 = "4fd37ceafe74b95af73f01ccc64a5c1e3282e6b74ab2dd193507aac289ae2480";
        libraryHaskellDepends = [
          base containers extra hashable unordered-containers
        ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "It provides the functionality like unix \"uniq\" utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17778,24 +17781,26 @@ self: {
      }) {advapi32 = null; gdi32 = null; shell32 = null; 
          shfolder = null; user32 = null; winmm = null;};
 
-  "Win32_2_4_0_0" = callPackage
-    ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32
-     , shfolder, shlwapi, user32, winmm
+  "Win32_2_5_0_0" = callPackage
+    ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32
+     , msimg32, ntdll, shell32, shfolder, shlwapi, user32, winmm
      }:
      mkDerivation {
        pname = "Win32";
-       version = "2.4.0.0";
-       sha256 = "e99e020ddd510f3b7012e15346284288a4535c88b369fafa91584e0d9a86cecb";
-       libraryHaskellDepends = [ base bytestring ];
+       version = "2.5.0.0";
+       sha256 = "45d7fd5f251ba418d649100cfea9d924b7ef42a8c35df5bb373fd6dd687d2694";
+       libraryHaskellDepends = [ base bytestring filepath ];
        librarySystemDepends = [
-         advapi32 gdi32 shell32 shfolder shlwapi user32 winmm
+         advapi32 gdi32 imm32 msimg32 ntdll shell32 shfolder shlwapi user32
+         winmm
        ];
        homepage = "https://github.com/haskell/win32";
        description = "A binding to part of the Win32 library";
        license = stdenv.lib.licenses.bsd3;
        platforms = stdenv.lib.platforms.none;
-     }) {advapi32 = null; gdi32 = null; shell32 = null; 
-         shfolder = null; shlwapi = null; user32 = null; winmm = null;};
+     }) {advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null; 
+         ntdll = null; shell32 = null; shfolder = null; shlwapi = null; 
+         user32 = null; winmm = null;};
 
   "Win32-console" = callPackage
     ({ mkDerivation, base, Win32 }:
@@ -20720,8 +20725,8 @@ self: {
        pname = "aeson-utils";
        version = "0.3.0.2";
        sha256 = "71814b1be8849f945395eb81217a2ad464f2943134c50c09afd8a3126add4b1f";
-       revision = "3";
-       editedCabalFile = "38b41ff11ca87f3f1d64c141382f6fbb11f28447056f7e11b93516c4c09520f0";
+       revision = "4";
+       editedCabalFile = "48548049168c1e48d31414994dcea638dec56dba620c1752b41d4fa975b7020e";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific text
        ];
@@ -25174,6 +25179,28 @@ self: {
        license = "GPL";
      }) {};
 
+  "analyze" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, cassava
+     , exceptions, foldl, free, hashable, lucid, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "analyze";
+       version = "0.1.0.0";
+       sha256 = "af261961e6229173ff4e54c46b7bed8ba4b5ced5ad18888bc7c804fc316b4445";
+       libraryHaskellDepends = [
+         aeson base binary bytestring cassava exceptions foldl free hashable
+         lucid text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring exceptions foldl QuickCheck tasty tasty-hunit
+         tasty-quickcheck text unordered-containers vector
+       ];
+       homepage = "https://github.com/ejconlon/analyze#readme";
+       description = "making data science easy and safe with data frames";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "analyze-client" = callPackage
     ({ mkDerivation, base, bytestring, http-conduit
      , MonadCatchIO-transformers, mtl, snap, snap-core, time
@@ -28898,8 +28925,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5";
-       revision = "4";
-       editedCabalFile = "00eb4a4386d3ed82d29c7f33c3c813074d33e25ce0c60872ca0a0cb78c3bd76c";
+       revision = "5";
+       editedCabalFile = "319f1526093b829e5cbb6fe1591f77f3f5be25da83df7790e37741272e711b24";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -28925,6 +28952,8 @@ self: {
        pname = "avers-api";
        version = "0.0.17.0";
        sha256 = "affeffe0ac3c3eb15823fdb4c61654783ef8aff076bfb20b55c3df34be088182";
+       revision = "1";
+       editedCabalFile = "6ce2a1a63ecf6fcc5cd1d25ce3ee5b2756ebea0a78b7cc3a94fe73b3097668e3";
        libraryHaskellDepends = [
          aeson avers base bytestring cookie http-api-data servant text time
          vector
@@ -32955,32 +32984,32 @@ self: {
      }) {};
 
   "biohazard" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
-     , bytestring-mmap, containers, deepseq, directory, exceptions
-     , filepath, hashable, hmatrix, iteratee, ListLike
-     , nonlinear-optimization, primitive, random, scientific, stm
-     , strict, template-haskell, text, transformers, unix
-     , unordered-containers, Vec, vector, vector-algorithms
-     , vector-th-unbox, zlib
+    ({ mkDerivation, aeson, aeson-pretty, async, attoparsec, base
+     , base-prelude, binary, bytestring, bytestring-mmap, containers
+     , directory, exceptions, filepath, hashable, hybrid-vectors
+     , iteratee, ListLike, nonlinear-optimization, primitive, process
+     , random, scientific, shake, stm, template-haskell, text
+     , transformers, unix, unordered-containers, vector
+     , vector-algorithms, vector-binary-instances, vector-th-unbox, zlib
      }:
      mkDerivation {
        pname = "biohazard";
-       version = "0.6.6.1";
-       sha256 = "ad458331686a5a0ac2ace70d63ddccd3cbd76aba2da6c4a38b8b70540789e28f";
+       version = "0.6.9";
+       sha256 = "b69e935377daf170cea90cfb5d7cc765527d5b606d1dacf30b93cccfb2228628";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async attoparsec base binary bytestring bytestring-mmap
-         containers deepseq directory exceptions filepath iteratee ListLike
-         nonlinear-optimization primitive random scientific stm
-         template-haskell text transformers unix unordered-containers Vec
-         vector vector-algorithms vector-th-unbox zlib
+         aeson aeson-pretty async attoparsec base base-prelude binary
+         bytestring bytestring-mmap containers directory exceptions filepath
+         hashable hybrid-vectors iteratee ListLike nonlinear-optimization
+         primitive random scientific stm template-haskell text transformers
+         unix unordered-containers vector vector-algorithms
+         vector-binary-instances vector-th-unbox zlib
        ];
        executableHaskellDepends = [
-         aeson async base binary bytestring containers directory filepath
-         hashable hmatrix iteratee nonlinear-optimization primitive random
-         strict text transformers unix unordered-containers Vec vector
-         vector-algorithms vector-th-unbox
+         aeson aeson-pretty async base binary bytestring containers
+         directory filepath process random shake stm text transformers unix
+         unordered-containers vector vector-algorithms vector-th-unbox
        ];
        homepage = "http://github.com/udo-stenzel/biohazard";
        description = "bioinformatics support library";
@@ -33862,8 +33891,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6";
        sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3";
-       revision = "8";
-       editedCabalFile = "b39980789d8a226fb984088b3ab9e63c96bd81f2ee7806bf124d420c4479fedc";
+       revision = "9";
+       editedCabalFile = "14307379cfd353cceede81149b2cae2f357d27ee23816203fd1757804e6b5b48";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
          containers data-default-class http-types kansas-comet mime-types
@@ -34670,8 +34699,8 @@ self: {
        pname = "bogocopy";
        version = "0.1.0.2";
        sha256 = "4b2d4e376b8908805a09404fac4a7b73efd3f4549a515eb8e180fe46221de834";
-       revision = "1";
-       editedCabalFile = "9b68ad2f64094297c4631e652ab247e8d83c64b64b7f40528232b8c474a4dee4";
+       revision = "2";
+       editedCabalFile = "bf8d78b2879369efdce0953e4613ca0dd1712c4e051adc5e5f66feda39757a5a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -34679,7 +34708,7 @@ self: {
          transformers unix
        ];
        homepage = "https://github.com/phlummox/bogocopy";
-       description = "Simple project template from stack";
+       description = "Copy a directory tree, making zero-size sparse copies of big files";
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
@@ -35373,16 +35402,16 @@ self: {
 
   "brick" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-default
-     , deepseq, microlens, microlens-mtl, microlens-th, template-haskell
-     , text, text-zipper, transformers, vector, vty
+     , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
+     , template-haskell, text, text-zipper, transformers, vector, vty
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.15.2";
-       sha256 = "7407473d133588df46c43480a2b41a50a04a7f0e63a996c6422a07592b8ca85e";
+       version = "0.16";
+       sha256 = "ebc1dea2d4891e7a66d3b3ee965b6ed16c9ad74ab5143836fa7e1c81dc0c19ff";
        libraryHaskellDepends = [
-         base containers contravariant data-default deepseq microlens
-         microlens-mtl microlens-th template-haskell text text-zipper
+         base containers contravariant data-default deepseq dlist microlens
+         microlens-mtl microlens-th stm template-haskell text text-zipper
          transformers vector vty
        ];
        homepage = "https://github.com/jtdaugherty/brick/";
@@ -39052,8 +39081,8 @@ self: {
        pname = "cassava-megaparsec";
        version = "0.1.0";
        sha256 = "8d77229766aec5e9e31e145138be981cca791699a3d66010619604827c590702";
-       revision = "3";
-       editedCabalFile = "1be19f40219b8f6a9e91dc3bfe8905a3ccc920f56dbf82c14f74d05c4c7378c9";
+       revision = "4";
+       editedCabalFile = "ce616d726f30d6015744bc8087cadb575f16c1e51d20b507dcd75dbeca25119e";
        libraryHaskellDepends = [
          base bytestring cassava containers megaparsec unordered-containers
          vector
@@ -39308,6 +39337,8 @@ self: {
        pname = "cayley-client";
        version = "0.3.1";
        sha256 = "c2d8eeeebf3814a10abfadb032132c8f1deff393909312d17755a9547463ebf7";
+       revision = "1";
+       editedCabalFile = "2f59497bc4c4e60596223f1f64ccb621a5f7906c06fac51780875c9c8923bdde";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring exceptions http-client
          http-conduit lens lens-aeson mtl text transformers
@@ -40037,6 +40068,19 @@ self: {
        license = "LGPL";
      }) {};
 
+  "charsetdetect-ae_1_1_0_2" = callPackage
+    ({ mkDerivation, base, bytestring }:
+     mkDerivation {
+       pname = "charsetdetect-ae";
+       version = "1.1.0.2";
+       sha256 = "1393fae432a88fbc5fda643cf545a91469a341218e72464960bde48b27ba0fbe";
+       libraryHaskellDepends = [ base bytestring ];
+       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
     ({ mkDerivation, base, Chart }:
      mkDerivation {
@@ -42148,8 +42192,8 @@ self: {
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.2.0.1";
-       sha256 = "64e698fb189b3ab06c52d43aa0a5da99104b46e8024687d13664610d795fe504";
+       version = "0.2.0.2";
+       sha256 = "f8c363812b610c79d0fe7275404fca65e073c4bcd11c53afafcffd485c4e47db";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -43296,6 +43340,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "colorless" = callPackage
+    ({ mkDerivation, base, megaparsec, pregame }:
+     mkDerivation {
+       pname = "colorless";
+       version = "0.0.0";
+       sha256 = "1ae808ffc4522981fd50833e5384173b72dae3c6b9e609f9dbfa791b625ee22c";
+       libraryHaskellDepends = [ base megaparsec pregame ];
+       homepage = "http://github.com/jxv/colorless#readme";
+       description = "Yet another IDL for RPC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "colors" = callPackage
     ({ mkDerivation, base, lens, linear, profunctors }:
      mkDerivation {
@@ -43766,6 +43822,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "compactmap_0_1_4_2" = callPackage
+    ({ mkDerivation, base, containers, hspec, QuickCheck, vector }:
+     mkDerivation {
+       pname = "compactmap";
+       version = "0.1.4.2";
+       sha256 = "36fd80c2f29446bba183c3b7182de9d869a1718c456ae3463ea66b332e6cf6ec";
+       libraryHaskellDepends = [ base vector ];
+       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
     ({ mkDerivation, base }:
      mkDerivation {
@@ -44110,26 +44179,26 @@ self: {
   "computational-algebra" = callPackage
     ({ mkDerivation, algebra, algebraic-prelude, arithmoi, base
      , constraints, containers, control-monad-loop, convertible, deepseq
-     , dlist, entropy, equational-reasoning, hashable, heaps, hmatrix
-     , hspec, HUnit, hybrid-vectors, lens, matrix, monad-loops
-     , MonadRandom, mono-traversable, monomorphic, mtl, parallel, primes
-     , process, QuickCheck, quickcheck-instances, reflection, semigroups
-     , singletons, sized, smallcheck, tagged, template-haskell
-     , test-framework, test-framework-hunit, text, type-natural, unamb
-     , unordered-containers, vector
+     , dlist, entropy, equational-reasoning, ghc-typelits-knownnat
+     , hashable, heaps, hmatrix, hspec, HUnit, hybrid-vectors, lens
+     , matrix, monad-loops, MonadRandom, mono-traversable, monomorphic
+     , mtl, parallel, primes, process, QuickCheck, quickcheck-instances
+     , reflection, semigroups, singletons, sized, smallcheck, tagged
+     , template-haskell, test-framework, test-framework-hunit, text
+     , type-natural, unamb, unordered-containers, vector
      }:
      mkDerivation {
        pname = "computational-algebra";
-       version = "0.4.0.0";
-       sha256 = "cb9fd9a9115a911f43837fedfdc96f91c07a3240eccbd64b111b73844562e9f6";
+       version = "0.5.0.0";
+       sha256 = "fce631557cfcef120382e91744279f5e7a61c0afaae95cf2159195f7e57fda49";
        libraryHaskellDepends = [
          algebra algebraic-prelude arithmoi base constraints containers
          control-monad-loop convertible deepseq dlist entropy
-         equational-reasoning hashable heaps hmatrix hybrid-vectors lens
-         matrix monad-loops MonadRandom mono-traversable monomorphic mtl
-         parallel primes reflection semigroups singletons sized tagged
-         template-haskell text type-natural unamb unordered-containers
-         vector
+         equational-reasoning ghc-typelits-knownnat hashable heaps hmatrix
+         hybrid-vectors lens matrix monad-loops MonadRandom mono-traversable
+         monomorphic mtl parallel primes reflection semigroups singletons
+         sized tagged template-haskell text type-natural unamb
+         unordered-containers vector
        ];
        testHaskellDepends = [
          algebra base constraints containers convertible deepseq
@@ -49350,8 +49419,8 @@ self: {
      }:
      mkDerivation {
        pname = "damnpacket";
-       version = "1.0.2";
-       sha256 = "b00c792670558fc2849f932232361fe4b59c7ce62009e5efbab71a162438ea05";
+       version = "1.1.0";
+       sha256 = "68284ed9c5cd54c5697f8202bcb8001d22497a5b225489729a660c4ba8a3bd1f";
        libraryHaskellDepends = [
          attoparsec base bytestring fail html-entities template-haskell text
          th-lift-instances
@@ -51912,6 +51981,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dcpu16" = callPackage
+    ({ mkDerivation, base, bytestring, containers, filepath
+     , optparse-applicative, parsec, sdl2, spool, vector
+     }:
+     mkDerivation {
+       pname = "dcpu16";
+       version = "0.1.0.0";
+       sha256 = "d3838fcd4838a668319791c4996a2af7e11f6a0496485c61389f40e376f335bc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers parsec sdl2 spool vector
+       ];
+       executableHaskellDepends = [ base filepath optparse-applicative ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/githubuser/dcpu16#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ddate" = callPackage
     ({ mkDerivation, base, dates, time }:
      mkDerivation {
@@ -55471,6 +55560,20 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "distance" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "distance";
+       version = "0.1.0.0";
+       sha256 = "007cfb1c56ff8e8f905dad7c1630630162ffb8520925f028cf82e93ba7cd4a58";
+       revision = "1";
+       editedCabalFile = "b8629453e8a81834e23eb577c6b304891ff60f36b956d03e59da854ba8adda47";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/agrafix/distance#readme";
+       description = "Useful distance datatype and functions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "distributed-closure" = callPackage
     ({ mkDerivation, base, binary, bytestring, constraints, hspec
      , QuickCheck, syb, template-haskell
@@ -56711,17 +56814,17 @@ self: {
      }) {};
 
   "dom-parser" = callPackage
-    ({ mkDerivation, base, containers, data-default, hspec, lens, mtl
-     , open-union, semigroups, shakespeare, text, transformers, type-fun
-     , xml-conduit, xml-lens
+    ({ mkDerivation, base, case-insensitive, containers, data-default
+     , hspec, lens, mtl, open-union, scientific, semigroups, shakespeare
+     , text, transformers, type-fun, xml-conduit, xml-lens
      }:
      mkDerivation {
        pname = "dom-parser";
-       version = "1.0.0";
-       sha256 = "6d48ca6cd564919af8574cc91c97f050f50747f358e159797895fd0517dc9583";
+       version = "2.0.0";
+       sha256 = "9de203857330d7d3b27e18e458a7548dc4e449bff3b7b95de2d40a1556cccf38";
        libraryHaskellDepends = [
-         base containers lens mtl open-union semigroups text transformers
-         type-fun xml-conduit xml-lens
+         base case-insensitive containers lens mtl open-union scientific
+         semigroups text transformers type-fun xml-conduit xml-lens
        ];
        testHaskellDepends = [
          base data-default hspec lens semigroups shakespeare text
@@ -58437,8 +58540,8 @@ self: {
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "echo";
-       version = "0.1";
-       sha256 = "a7211a9da1fa10dc7d95e89d2c68dadf063b3826d81e42eb085df91c46353e4d";
+       version = "0.1.1";
+       sha256 = "e1fc1756f255e47db28c6c0520c43fe45ac0c1093009f378683273ebe02851c6";
        libraryHaskellDepends = [ base process ];
        homepage = "https://github.com/RyanGlScott/echo";
        description = "A cross-platform, cross-console way to handle echoing terminal input";
@@ -60249,6 +60352,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "entangle" = callPackage
+    ({ mkDerivation, base, containers, matrix, mtl, quipper-core }:
+     mkDerivation {
+       pname = "entangle";
+       version = "0.1.1";
+       sha256 = "2836f6645c71d68ad1fcc30b0f3186bc9cf85f0703f3c89da58564cd05eedabc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers matrix mtl quipper-core
+       ];
+       executableHaskellDepends = [ base matrix quipper-core ];
+       description = "An application (and library) to convert quipper circuits into Qpmc models";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "entropy" = callPackage
     ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
@@ -61114,7 +61233,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "esqueleto" = callPackage
+  "esqueleto_2_4_3" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
      , hspec, HUnit, monad-control, monad-logger, persistent
      , persistent-sqlite, persistent-template, QuickCheck, resourcet
@@ -61141,6 +61260,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "esqueleto" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
+     , hspec, HUnit, monad-control, monad-logger, persistent
+     , persistent-sqlite, persistent-template, QuickCheck, resourcet
+     , tagged, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "esqueleto";
+       version = "2.5.0";
+       sha256 = "2cba54c813bb506024889b29ceb75079e31e4172dc79cfa1e48c84337e064fa2";
+       libraryHaskellDepends = [
+         base blaze-html bytestring conduit monad-logger persistent
+         resourcet tagged text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base conduit containers hspec HUnit monad-control monad-logger
+         persistent persistent-sqlite persistent-template QuickCheck
+         resourcet text transformers
+       ];
+       homepage = "https://github.com/bitemyapp/esqueleto";
+       description = "Type-safe EDSL for SQL queries on persistent backends";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ess" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -63233,8 +63377,8 @@ self: {
        pname = "fay";
        version = "0.23.1.16";
        sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64";
-       revision = "2";
-       editedCabalFile = "c164132b3489ae1511bda64e9fb8fde6d05fdc4a1fcc0ff327efd9ce3b1d81ce";
+       revision = "3";
+       editedCabalFile = "636e2fbbe689dde982c327a7fc33871804ec66e47105d6cbffd6ce09716c241f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65085,20 +65229,20 @@ self: {
      }) {};
 
   "fixfile" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
+    ({ mkDerivation, array, base, bytestring, cereal, containers
      , directory, exceptions, filepath, hashable, hashtables, lens, mtl
      , QuickCheck, tasty, tasty-quickcheck, temporary, vector
      }:
      mkDerivation {
        pname = "fixfile";
-       version = "0.6.0.0";
-       sha256 = "37183ade31510ba1c3801adf5df112f7ef6291b478934d0c51839510e536888c";
+       version = "0.7.0.0";
+       sha256 = "b49027c747a7112256aec9b9ac33f4617c3ec0cfdd5943d7c81c6c9885f10b70";
        libraryHaskellDepends = [
-         array base binary bytestring containers directory filepath hashable
+         array base bytestring cereal containers directory filepath hashable
          hashtables lens mtl temporary vector
        ];
        testHaskellDepends = [
-         base binary bytestring directory exceptions lens mtl QuickCheck
+         base bytestring cereal directory exceptions lens mtl QuickCheck
          tasty tasty-quickcheck temporary
        ];
        homepage = "https://github.com/revnull/fixfile";
@@ -65226,6 +65370,8 @@ self: {
        pname = "flac";
        version = "0.1.1";
        sha256 = "58b7287cb39bdfc39cf7aab95b87d81111234fed502a8d1743ecfbcef001873e";
+       revision = "1";
+       editedCabalFile = "482d7352bb284c86021b513c37837746fe8a293146c3cf0d91b91dbc4a34ae34";
        libraryHaskellDepends = [
          base bytestring containers data-default-class directory exceptions
          filepath mtl text transformers vector wave
@@ -66039,15 +66185,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "foldl_1_2_2" = callPackage
+  "foldl_1_2_3" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, mwc-random, primitive, profunctors, text
      , transformers, vector
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.2.2";
-       sha256 = "c869deb0dc7d41d496539968968ff6045022d1286dfb2c1d53f61dc974f455eb";
+       version = "1.2.3";
+       sha256 = "fb081168f7736a04dc68db348d2e0bc58d535da5ed74c4394a022dbaa46d3f25";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant mwc-random
          primitive profunctors text transformers vector
@@ -66086,8 +66232,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-statistics";
-       version = "0.1.4.1";
-       sha256 = "7abd5ed3ee0295de589484b0973f2531ae1956bf4ec1f237956c046bca106b28";
+       version = "0.1.4.2";
+       sha256 = "1cfa6d6d36ff40529319a6f790bf130b6b4d650f1b8db5ee739cf4b44d5c8be0";
        libraryHaskellDepends = [
          base foldl math-functions profunctors semigroups
        ];
@@ -68995,8 +69141,8 @@ self: {
        pname = "generic-aeson";
        version = "0.2.0.8";
        sha256 = "de29fa648b9eb6c9e678b0715a530efaf70aac8f1ad8becc22d7ef1411ded5cb";
-       revision = "2";
-       editedCabalFile = "1796cd85bd71d6f83a9dfd2f56cbb90c0059591e4e3bbf6e38864435f726c971";
+       revision = "3";
+       editedCabalFile = "ed9572e401789a0bff470b31f6cb127e77a43a831ba07b5eb5705a3b770d2263";
        libraryHaskellDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -71990,7 +72136,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "gipeda_0_3_3_0" = callPackage
+  "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
@@ -71998,8 +72144,8 @@ self: {
      }:
      mkDerivation {
        pname = "gipeda";
-       version = "0.3.3.0";
-       sha256 = "9b3f111ed3b980a5b9a721948df16c6a05b28f3a805657d0cfa271e356169744";
+       version = "0.3.3.1";
+       sha256 = "be7aafd3390c5d498c39482ff862a302c3bf2d7cecdba4940141297728bbb143";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -76927,8 +77073,8 @@ self: {
      }:
      mkDerivation {
        pname = "gopher-proxy";
-       version = "0.1.0.2";
-       sha256 = "6f06b79fb6edf8df020e104feba3db960fc9e6ca4198d860de1702d752053fdd";
+       version = "0.1.1.1";
+       sha256 = "8d85cc17d211d6c7600ff8b1da3bd0b5fbbe0bcd2ffd6629719a94674b4acf4d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -80598,6 +80744,8 @@ self: {
        pname = "haddock-api";
        version = "2.17.3";
        sha256 = "8d35a256c2ee07083c1e1a8b08e536069ffdad27598bed69d88847fb51234dc7";
+       revision = "1";
+       editedCabalFile = "5d33603e8e6befb2c2ed2dd8c5029b78e1377a387b165671105cadb9cb7df4f8";
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-boot ghc-paths haddock-library transformers xhtml
@@ -81096,8 +81244,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.9.2.0";
-       sha256 = "20f1e5be71290445626ccf716e6b312bf3f5ebf780ce9481d574a83681ef2e3f";
+       version = "4.9.3.0";
+       sha256 = "f15c6cd2118501fa6be44e3cb3d9f37a22fced0fd1ebd64236277e2daf622e7a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81124,7 +81272,6 @@ self: {
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage
@@ -84664,8 +84811,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-ast";
-       version = "0.4.1.0";
-       sha256 = "00aed2236a37a582ff761b0a83946e3bdfa9027098c18d75ad7e34577a775ac5";
+       version = "0.4.1.1";
+       sha256 = "857c0f5b57d129aa49fd8b5375703638c4cd1e5cd4c85d5160d7ad13d308f88e";
        libraryHaskellDepends = [
          base ghc mtl references template-haskell uniplate
        ];
@@ -84736,8 +84883,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-backend-ghc";
-       version = "0.4.1.0";
-       sha256 = "5607c50d38a26db49abd936fee9aac96bf332496bc7cbb9fe20e10bf929e63f6";
+       version = "0.4.1.1";
+       sha256 = "d01fe6e236fb57e7d79b35ada30e8aa0ff56f626444f25bd907bb8e785de3006";
        libraryHaskellDepends = [
          base bytestring containers ghc haskell-tools-ast mtl references
          safe split template-haskell transformers uniplate
@@ -84756,8 +84903,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
-       version = "0.4.1.0";
-       sha256 = "43ec482527444bd15382c93a866d50cdde39ecd53968eabc041dcbbc3a55872a";
+       version = "0.4.1.1";
+       sha256 = "7c843bcd923987679d17359b2881173af72b5beea8b66db241058c69d2a1530f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84783,8 +84930,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-daemon";
-       version = "0.4.1.0";
-       sha256 = "b028a4c3e9a0701e563d1c12b45fe7bfdad1705232f4170cc23632967437de2c";
+       version = "0.4.1.1";
+       sha256 = "c1334b480b4c7ed5fb918ad887ee50a4eaa610b8c626ae00154eecdf2bb11dc1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84810,8 +84957,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-debug";
-       version = "0.4.1.0";
-       sha256 = "aae428cb78d3923eecdc2a183ed397578b3dc38c29af77bba44dadaf50dd66ef";
+       version = "0.4.1.1";
+       sha256 = "092da28a3924ec7855f910123cc6d3adaf02c8aea28c09d370ca40e4b66df02c";
        libraryHaskellDepends = [
          base ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc
          haskell-tools-prettyprint haskell-tools-refactor references
@@ -84831,8 +84978,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-demo";
-       version = "0.4.1.0";
-       sha256 = "9a65654bd6d95a6a5ea2ec2ed46a64d2d6aebd74fad864deeda0980b2a50f0e6";
+       version = "0.4.1.1";
+       sha256 = "97e23bce841240eb60f9d959922e5e262dd2d5351954ac1b183aa96910fe0b2b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84858,8 +85005,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-prettyprint";
-       version = "0.4.1.0";
-       sha256 = "9ca7aecc1e36ea004e2017cf5a7afcc9b6ad4300a9efdffcc68275498bb254a7";
+       version = "0.4.1.1";
+       sha256 = "2d0b5df63f5709359ad5bbc7c67475bf511cc732f1ad682c71506b196519eae8";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast mtl references split uniplate
        ];
@@ -84879,8 +85026,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "0.4.1.0";
-       sha256 = "743e02a1485686df0e6fe6fef2fee473b099cda89323a7b5e35bb9bf17481366";
+       version = "0.4.1.1";
+       sha256 = "a6f1cf8f908f10424919ded1077abe4f15c423548830c4c1a0c117f8a8d8e894";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -84907,8 +85054,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-rewrite";
-       version = "0.4.1.0";
-       sha256 = "bfa733c82af102a594c7c8ce3d044465f02874a685e0b39e8cc48d3659758282";
+       version = "0.4.1.1";
+       sha256 = "17b2523cbf0b13fc83a28e3b2a55dc7a9118c26ee87c180ec3db46f6571668c8";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
          references
@@ -90108,8 +90255,8 @@ self: {
      }:
      mkDerivation {
        pname = "hindent";
-       version = "5.2.1";
-       sha256 = "0c3118ccf087bea9dfaa9cbcb76bd6ed35919acd2fa511c741e97277b6b01c53";
+       version = "5.2.2";
+       sha256 = "1fc9a92a501552b17219a13fd691e380cc2e2bbf4d768788f13b47639ff4237d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90877,6 +91024,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hjsonpointer_1_1_0_0" = callPackage
+    ({ mkDerivation, aeson, base, hashable, hspec, http-types
+     , QuickCheck, semigroups, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hjsonpointer";
+       version = "1.1.0.0";
+       sha256 = "af2ea643f97d8ed1aca85651b8b65dbabc4967753f0024255baa36d410177dfa";
+       libraryHaskellDepends = [
+         aeson base hashable QuickCheck semigroups text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-types QuickCheck text unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/seagreen/hjsonpointer";
+       description = "JSON Pointer library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hjsonschema" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hjsonpointer, http-client
@@ -90904,26 +91073,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hjsonschema_1_2_0_2" = callPackage
+  "hjsonschema_1_3_0_0" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , directory, file-embed, filepath, hjsonpointer, hspec, http-client
-     , http-types, pcre-heavy, profunctors, QuickCheck, scientific
-     , semigroups, text, unordered-containers, vector, wai-app-static
-     , warp
+     , directory, file-embed, filepath, hashable, hjsonpointer, hspec
+     , http-client, http-types, pcre-heavy, profunctors, protolude
+     , QuickCheck, scientific, semigroups, text, unordered-containers
+     , vector, wai-app-static, warp
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "1.2.0.2";
-       sha256 = "dc6aa03f842609ed43910510a3d5bf58bab38e94d3117ec9f669ef50ce33dd00";
+       version = "1.3.0.0";
+       sha256 = "ad54c4ee176376ef2fb7a92b5d6f35e70900fbc032000438fc37d3bdd7df819b";
        libraryHaskellDepends = [
-         aeson base bytestring containers file-embed filepath hjsonpointer
-         http-client http-types pcre-heavy profunctors QuickCheck scientific
-         semigroups text unordered-containers vector
+         aeson base bytestring containers file-embed filepath hashable
+         hjsonpointer http-client http-types pcre-heavy profunctors
+         protolude QuickCheck scientific semigroups text
+         unordered-containers vector
        ];
        testHaskellDepends = [
          aeson async base bytestring directory filepath hjsonpointer hspec
-         profunctors QuickCheck semigroups text unordered-containers vector
-         wai-app-static warp
+         profunctors protolude QuickCheck semigroups text
+         unordered-containers vector wai-app-static warp
        ];
        homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema library";
@@ -91118,7 +91288,7 @@ self: {
      mkDerivation {
        pname = "hledger-diff";
        version = "0.2.0.7";
-       sha256 = "1x7ngm0h9hsbf4p8vx1h4z1w9hlqkqfa39v2dvmlxrcx6rs8dzsl";
+       sha256 = "54ff8674369de54eeb6e62a7a11c9e98c2c4c32730f48d2e714bc304417df6f4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
@@ -93880,6 +94050,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hpc-coveralls_1_0_7" = 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";
+       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-strobe" = callPackage
     ({ mkDerivation, base, filepath, hpc }:
      mkDerivation {
@@ -101298,6 +101495,8 @@ self: {
        pname = "hybrid-vectors";
        version = "0.2.1";
        sha256 = "2edcd8fcfedc76a944ac690bfc257f2974100df6484c6c20883d27773836cca2";
+       revision = "1";
+       editedCabalFile = "f07302db04c6d19bf5ab00c084e0ec4fb72955b7bd258e77b4881a21a263e3c4";
        libraryHaskellDepends = [ base deepseq primitive vector ];
        homepage = "http://github.com/ekmett/hybrid-vectors";
        description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
@@ -106695,8 +106894,10 @@ self: {
     ({ mkDerivation, base, Cabal }:
      mkDerivation {
        pname = "jailbreak-cabal";
-       version = "1.3.2";
-       sha256 = "1x2h54sx4ycik34q8f9g698xc2b7fai18918cd08qx7w7ny8nai1";
+       version = "1.3.1";
+       sha256 = "610d8dbd04281eee3d5da05c9eef45bfd1a1ddca20dfe54f283e15ddf6d5c235";
+       revision = "1";
+       editedCabalFile = "ad923093f40ae8a7b7faa64a4e65a8545057987e5efe8baafec455fbcc85a52c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
@@ -106706,6 +106907,22 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "jailbreak-cabal_1_3_2" = callPackage
+    ({ mkDerivation, base, Cabal }:
+     mkDerivation {
+       pname = "jailbreak-cabal";
+       version = "1.3.2";
+       sha256 = "212a8bbc3dfc748c4063282414a2726709d651322f3984c9989179d2352950f4";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base Cabal ];
+       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 ];
+     }) {};
+
   "jalaali" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -107542,10 +107759,10 @@ self: {
      }:
      mkDerivation {
        pname = "json-api";
-       version = "0.1.1.1";
-       sha256 = "d5af631049fe2096c29f79b956f3c3b419b11f097278f131beee31a5369e2516";
+       version = "0.1.1.2";
+       sha256 = "b5bab272ea259c5868d65ab1dbb2967c557219c95fe8aef7d6cd7cd6e8075d24";
        libraryHaskellDepends = [
-         aeson base containers data-default lens-aeson text
+         aeson base containers data-default lens lens-aeson text
          unordered-containers url
        ];
        testHaskellDepends = [
@@ -108014,8 +108231,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96";
-       revision = "5";
-       editedCabalFile = "ec1615227a46ff11cc6dca76df0564ace2a8ff8069e9c84cea0064cd908d0eb3";
+       revision = "6";
+       editedCabalFile = "b6211ab8989ce7d576cac285b7d17f2e50ee79139545e2e84b2dd319904360b2";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -109774,8 +109991,8 @@ self: {
      }:
      mkDerivation {
        pname = "kicad-data";
-       version = "0.3.0.0";
-       sha256 = "6270a5f62dad9920ca169c1c8867f6ba0d2d36e64299cada90d526b4c73d3ee7";
+       version = "0.4.0";
+       sha256 = "a55a3cc07dd96b4de4a2a9bbe8f1fc9e1a73da6bd999fe145a31f2e4f2731e25";
        libraryHaskellDepends = [
          base ieee754 lens-family parsec parsec-numbers pretty-compact
        ];
@@ -112604,6 +112821,24 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ldapply" = callPackage
+    ({ mkDerivation, base, bytestring, docopt, interpolatedstring-perl6
+     , LDAP, ldif, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ldapply";
+       version = "0.1.0";
+       sha256 = "5c99e6f200c58aeb897a3a8f2e283ad2caba73c6f7eba919102912715891d04b";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring docopt interpolatedstring-perl6 LDAP ldif
+         unordered-containers
+       ];
+       description = "LDIF idempotent apply tool";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ldif" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, containers, directory
      , filepath, HUnit, parsec, rosezipper
@@ -113056,8 +113291,8 @@ self: {
        pname = "lens";
        version = "4.15.1";
        sha256 = "5cfaa64cb1b9787193c2247a1ed1c248104ba5fadb91cec6432e648e41b1bea6";
-       revision = "3";
-       editedCabalFile = "d23792e0e14306446fe13c8de692b46cbf0aedd22ea22248d70c9dc71646716f";
+       revision = "4";
+       editedCabalFile = "e055de1a2d30bf9122947afbc5e342b06a0f4a512fece45f5b9132f7beb11539";
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
@@ -113108,8 +113343,8 @@ self: {
        pname = "lens-aeson";
        version = "1.0.0.5";
        sha256 = "65faad5b75852209b4c6df43ae1f7460c2b94bf3bbc10b5cd529f43c743a5d9f";
-       revision = "3";
-       editedCabalFile = "d511d27175ba60166923027642b159100332d57db118fb7055cf512fbd0bd7d1";
+       revision = "4";
+       editedCabalFile = "6fde3d7feb42ad58f74e89202ec01d0397bd1c8bf00b2042edaa293479d70385";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring lens scientific text
          unordered-containers vector
@@ -114775,6 +115010,8 @@ self: {
        pname = "linear";
        version = "1.20.5";
        sha256 = "61d8b7242f1e7c27925df7ffe1aa8b1fd732e61598f3af48b9999d8fb464cc0d";
+       revision = "1";
+       editedCabalFile = "59fb06c2c7326ffedc00c3b54a89fecf6bf664e9bea0845f5cd933249c0113d5";
        libraryHaskellDepends = [
          adjunctions base base-orphans binary bytes cereal containers
          deepseq distributive ghc-prim hashable lens reflection
@@ -116633,8 +116870,8 @@ self: {
        pname = "log-domain";
        version = "0.10.3.1";
        sha256 = "36f427506218358b20a2066d5fb38406816fabac18ca26c807a416a795643815";
-       revision = "1";
-       editedCabalFile = "ff544f4bf06996c1775f8c59c0cbf949a60ef50c6ec9404c851bc885612e2498";
+       revision = "2";
+       editedCabalFile = "d5c0d4af0c551eb4b014ce825c1ff6a92fa947225992a89ec9f4b67ece705c6f";
        libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq distributive hashable
          hashable-extras safecopy semigroupoids semigroups vector
@@ -117471,6 +117708,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lrucaching_0_3_1" = callPackage
+    ({ mkDerivation, base, base-compat, containers, deepseq, hashable
+     , hspec, psqueues, QuickCheck, transformers, vector
+     }:
+     mkDerivation {
+       pname = "lrucaching";
+       version = "0.3.1";
+       sha256 = "2f287ea60d721f58474dc105dec953f98ce9a41dd1897647ef68a48605b132d6";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ls-usb" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, base-unicode-symbols
      , cmdtheline, text, usb, usb-id-database, vector
@@ -118419,6 +118676,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "madlang" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-megaparsec
+     , lens, megaparsec, mtl, mwc-random, optparse-generic, text
+     }:
+     mkDerivation {
+       pname = "madlang";
+       version = "0.1.0.1";
+       sha256 = "b0df75127de969328701adb376673409c82b37c1f3c92b2b0d84b5de2be80ae6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base lens megaparsec mtl mwc-random optparse-generic
+         text
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base hspec hspec-megaparsec megaparsec mtl text
+       ];
+       homepage = "https://github.com/vmchale/madlang#readme";
+       description = "Randomized templating language DSL";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mage" = callPackage
     ({ mkDerivation, array, base, containers, mtl, ncurses, random }:
      mkDerivation {
@@ -119607,29 +119887,29 @@ self: {
 
   "marvin" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, configurator
-     , directory, filepath, hashable, hslogger, lens, mono-traversable
-     , mtl, mustache, network-uri, optparse-applicative
-     , optparse-generic, pcre-light, random, template-haskell, text
-     , text-format, unordered-containers, vector, websockets, wreq, wuss
+     , 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
      }:
      mkDerivation {
        pname = "marvin";
-       version = "0.0.4";
-       sha256 = "76c0af008fd2b2c691abe29541b392fe47f59f8a004b837bb8e398f916df1bae";
+       version = "0.0.5";
+       sha256 = "bb2de5f531e8f670476af97795f4e13dd06335fedf212e196787e635c97a217d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bytestring configurator hashable hslogger lens
-         mono-traversable mtl network-uri optparse-generic pcre-light random
-         template-haskell text text-format unordered-containers vector
-         websockets wreq wuss
+         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
        ];
        executableHaskellDepends = [
          aeson base bytestring configurator directory filepath
          mono-traversable mustache optparse-applicative text
        ];
-       homepage = "https://github.com/JustusAdam/marvin#readme";
-       description = "A modular bot for slack";
+       homepage = "https://marvin.readthedocs.io";
+       description = "A modular chat bot";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -119640,8 +119920,8 @@ self: {
      }:
      mkDerivation {
        pname = "marvin-interpolate";
-       version = "0.3.0";
-       sha256 = "053a9fa6ada9b29a18d8e6d7da51b9ee4bc440cd53c6882eb6dc05f425022d85";
+       version = "0.4.0";
+       sha256 = "cc7a97fe7e9d43065d59d21827e40e127b9adaf250715cd7dbfe0e8480bfa766";
        libraryHaskellDepends = [
          base haskell-src-meta mtl parsec template-haskell text
        ];
@@ -121277,15 +121557,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens-aeson_2_1_1_2" = callPackage
+  "microlens-aeson_2_2_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
      , scientific, tasty, tasty-hunit, text, unordered-containers
      , vector
      }:
      mkDerivation {
        pname = "microlens-aeson";
-       version = "2.1.1.2";
-       sha256 = "f1295f2b6b4db3118b445551ae585650e9ddb2d40bd50194514e478710840f79";
+       version = "2.2.0";
+       sha256 = "c25b8fefcd321f348c5948a0f65d30ecad4070e3f1f7720bacb022b57c6386d4";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring microlens scientific text
          unordered-containers vector
@@ -122592,8 +122872,8 @@ self: {
     ({ mkDerivation, base, doctest, Glob }:
      mkDerivation {
        pname = "modular-arithmetic";
-       version = "1.2.1.1";
-       sha256 = "5b1592ef852596e8c4e1ac5e8f213ee0272a8e0bf6c3d431a86bbeaff35cb700";
+       version = "1.2.1.2";
+       sha256 = "921f31f72589c07be9e64fcc68e90a41651817404ee796f56d0f299287b9a176";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/TikhonJelvis/modular-arithmetic";
@@ -124245,14 +124525,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "monoid-subclasses_0_4_3" = callPackage
+  "monoid-subclasses_0_4_3_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, text, vector
      }:
      mkDerivation {
        pname = "monoid-subclasses";
-       version = "0.4.3";
-       sha256 = "568fd54e1fe35557129bc8cd1a751343dfde61a63fab0baadc38683101aed0cd";
+       version = "0.4.3.1";
+       sha256 = "a170d07916b694601a7da2924656e5f8a5ad27afa0e548f4683b154e122783cd";
        libraryHaskellDepends = [
          base bytestring containers primes text vector
        ];
@@ -126911,6 +127191,8 @@ self: {
        pname = "nanovg";
        version = "0.5.2.0";
        sha256 = "22e31d227770e55123aadb2750c35895f4d635327c7be1ef1ea2655d86180f5d";
+       revision = "1";
+       editedCabalFile = "ab822c8c3baab11820f06e9c34ba59c97789625020fabf476338cc17b2e74853";
        libraryHaskellDepends = [ base bytestring containers text vector ];
        librarySystemDepends = [ freeglut GLEW mesa ];
        libraryToolDepends = [ c2hs ];
@@ -132914,12 +133196,16 @@ self: {
      }) {};
 
   "overload" = callPackage
-    ({ mkDerivation, base, simple-effects, template-haskell }:
+    ({ mkDerivation, base, containers, simple-effects, template-haskell
+     , th-expand-syns
+     }:
      mkDerivation {
        pname = "overload";
-       version = "0.1.0.0";
-       sha256 = "ed48aa71ec612bb280529f26e94f0babe5ca346be3bf0a2cbd34a22d25308322";
-       libraryHaskellDepends = [ base simple-effects template-haskell ];
+       version = "0.1.0.1";
+       sha256 = "6583c3c90021bc42bf93d8a287fd81970270f05f423b961a35ac06e11f35af6e";
+       libraryHaskellDepends = [
+         base containers simple-effects template-haskell th-expand-syns
+       ];
        homepage = "https://gitlab.com/LukaHorvat/overload";
        description = "Finite overloading";
        license = stdenv.lib.licenses.mit;
@@ -134338,6 +134624,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parsec-numeric" = callPackage
+    ({ mkDerivation, base, bytestring, parsec, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-th, text
+     }:
+     mkDerivation {
+       pname = "parsec-numeric";
+       version = "0.1.0.0";
+       sha256 = "7bdd9ae4aa63695e3072c73d99b85ef1572ffe9f5a07621edaa9515393a6e52f";
+       libraryHaskellDepends = [ base parsec ];
+       testHaskellDepends = [
+         base bytestring parsec tasty tasty-hunit tasty-quickcheck tasty-th
+         text
+       ];
+       homepage = "https://github.com/AndrewRademacher/parsec-numeric";
+       description = "Parsec combinators for parsing Haskell numeric types";
+       license = "unknown";
+     }) {};
+
   "parsec-parsers" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, parsec
      , parsers
@@ -134955,14 +135259,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "path-io_1_2_1" = callPackage
+  "path-io_1_2_2" = callPackage
     ({ mkDerivation, base, containers, directory, exceptions, filepath
      , hspec, path, temporary, time, transformers, unix-compat
      }:
      mkDerivation {
        pname = "path-io";
-       version = "1.2.1";
-       sha256 = "41582c65c6ceb05522bbacb0fc242f542d1e42e61bc5c9858b9153e8c334339f";
+       version = "1.2.2";
+       sha256 = "72255f9d014285c87dd4c537f445a5448b2b64e81c4ee4759464b4b0e401fe46";
        libraryHaskellDepends = [
          base containers directory exceptions filepath path temporary time
          transformers unix-compat
@@ -135395,20 +135699,20 @@ self: {
 
   "pdf-slave" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , containers, exceptions, haskintex, HaTeX, optparse-applicative
-     , pdf-slave-template, shelly, system-filepath, text, transformers
-     , unordered-containers, yaml
+     , containers, directory, exceptions, haskintex, HaTeX
+     , optparse-applicative, pdf-slave-template, shelly, system-filepath
+     , text, transformers, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "pdf-slave";
-       version = "1.2.3.0";
-       sha256 = "46700a44e9f6ee7fbfecfd23201211a9c99d3a74c9fa9d8a467980b7390a5ae4";
+       version = "1.3.0.0";
+       sha256 = "0020adc44e21938637c5fe7f69bf7ff714b5773654a74ff2c0ff544bf934f5b9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring containers exceptions
-         haskintex HaTeX pdf-slave-template shelly system-filepath
-         unordered-containers yaml
+         aeson base base64-bytestring bytestring containers directory
+         exceptions haskintex HaTeX pdf-slave-template shelly
+         system-filepath unordered-containers yaml
        ];
        executableHaskellDepends = [
          aeson base bytestring optparse-applicative pdf-slave-template
@@ -137349,7 +137653,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "pinboard_0_9_12_1" = callPackage
+  "pinboard_0_9_12_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , http-client, http-client-tls, http-types, monad-logger, mtl
      , network, profunctors, QuickCheck, random, safe-exceptions
@@ -137358,8 +137662,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinboard";
-       version = "0.9.12.1";
-       sha256 = "dd6303ec05b38e9b2af196d4efee5ee174fef62c960c2ad15943faef9d96d237";
+       version = "0.9.12.2";
+       sha256 = "f9c5dbf3206d0c0075704feb4582c58a5eb3ef4704ca7a2000c5c8d49dbeeec9";
        libraryHaskellDepends = [
          aeson base bytestring containers http-client http-client-tls
          http-types monad-logger mtl network profunctors random
@@ -138201,6 +138505,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-random_1_0_0_3" = callPackage
+    ({ mkDerivation, base, mwc-random, pipes, vector }:
+     mkDerivation {
+       pname = "pipes-random";
+       version = "1.0.0.3";
+       sha256 = "729c3359e4f76048b0a9c656e4739c369619b8abce546a741f8d55e2a7b31193";
+       libraryHaskellDepends = [ base mwc-random pipes vector ];
+       description = "Producers for handling randomness";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-rt" = callPackage
     ({ mkDerivation, base, mwc-random, pipes, time }:
      mkDerivation {
@@ -139748,8 +140064,8 @@ self: {
      }:
      mkDerivation {
        pname = "pontarius-xmpp";
-       version = "0.5.3";
-       sha256 = "70b34c6cc581183752e04c967bd6b383b0d4a813badd412ece35bcc5bff991fd";
+       version = "0.5.4";
+       sha256 = "cea2e6207811d718e8a9c3ef7abb71ec4aba6ee77e9f749d9902b62a4b48b13a";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
@@ -144328,8 +144644,8 @@ self: {
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "0.2.1.1";
-       sha256 = "e7abcdff646835141b8ea2c53ef414467ddc07afef20d2cce48aadc0096001f4";
+       version = "0.2.1.2";
+       sha256 = "0830675a25f49cdb3322304feb90e0779536fdbcea805e5ddca2328ae5a07c39";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144821,8 +145137,8 @@ self: {
        pname = "quickcheck-instances";
        version = "0.3.12";
        sha256 = "ddd5b988da50eff7f56737bff516fba52309f7461297698f04f1e8aaee9f9bf3";
-       revision = "1";
-       editedCabalFile = "ef9ca080de8bb79d892628abe3ccbd92a61f77fffa633942ee3e4da0d8819657";
+       revision = "2";
+       editedCabalFile = "4321c16dfe0d3c08bba1425d1058261b4b8b553ea5c5c01bd982c9d9e23b39ec";
        libraryHaskellDepends = [
          array base bytestring containers hashable old-time QuickCheck
          scientific text time unordered-containers vector
@@ -145185,6 +145501,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quipper-core" = callPackage
+    ({ mkDerivation, base, containers, mtl, primes, random
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "quipper-core";
+       version = "0.8.0.1";
+       sha256 = "17d0361ed260f16cce989175164d3b81ba0af1c5970bf91a4aebcca21ef0e163";
+       libraryHaskellDepends = [
+         base containers mtl primes random template-haskell
+       ];
+       homepage = "http://www.mathstat.dal.ca/~selinger/quipper/";
+       description = "An embedded, scalable functional programming language for quantum computing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "quipper-rendering" = callPackage
+    ({ mkDerivation, base, containers, directory, easyrender, mtl
+     , primes, process, quipper-core, random, template-haskell, unix
+     }:
+     mkDerivation {
+       pname = "quipper-rendering";
+       version = "0.8";
+       sha256 = "c73ecbaad5d95e78f4b86fb39d764512ac2d025876bed86564fe3bb3a890107c";
+       libraryHaskellDepends = [
+         base containers directory easyrender mtl primes process
+         quipper-core random template-haskell unix
+       ];
+       homepage = "http://www.mathstat.dal.ca/~selinger/quipper/";
+       description = "An embedded, scalable functional programming language for quantum computing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "quiver" = callPackage
     ({ mkDerivation, base, mmorph, transformers }:
      mkDerivation {
@@ -145533,16 +145882,17 @@ self: {
 
   "raft" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , containers, data-default, ghc-prim, mtl, parallel, scientific
-     , split, text, time, tostring, zlib
+     , cereal, containers, data-default, ghc-prim, mtl, parallel
+     , scientific, split, stm, text, time, tostring, zlib
      }:
      mkDerivation {
        pname = "raft";
-       version = "0.3.7.2";
-       sha256 = "40c46755aa43abd764d59610b7b8a7af75b5e5efe7c509c34ede6a157ee2a0e9";
+       version = "0.3.11.0";
+       sha256 = "e8aff884bcc2cdc6d8200f834a9d9f8b2d38646895af4e03589c6ae6e07e8465";
        libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring containers data-default
-         ghc-prim mtl parallel scientific split text time tostring zlib
+         aeson attoparsec base binary bytestring cereal containers
+         data-default ghc-prim mtl parallel scientific split stm text time
+         tostring zlib
        ];
        homepage = "https://bitbucket.org/functionally/raft";
        description = "Miscellaneous Haskell utilities for data structures and data manipulation";
@@ -146497,8 +146847,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "2.1.3";
-       sha256 = "a349c7c6f45ab64c0ff85b877f99a7ec4d5a8946c0d2224b033b6014b518bea1";
+       version = "2.1.4";
+       sha256 = "e5513105bba4917caa18a41499b38a0d98114761207170674a9c559fb85ff0dc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -147935,8 +148285,8 @@ self: {
      }:
      mkDerivation {
        pname = "references";
-       version = "0.3.2.0";
-       sha256 = "67a5434a1b6b6021e4ac3c9c8c42521cf5bf922d07d26e925821e3fd4e5121fd";
+       version = "0.3.2.1";
+       sha256 = "184020e17d1f3e86bb9e350f9c4076a838f580c23d943801245ded92edd27624";
        libraryHaskellDepends = [
          array base containers directory either filepath instance-control
          mtl template-haskell text transformers uniplate
@@ -147944,6 +148294,7 @@ self: {
        testHaskellDepends = [
          array base containers directory either filepath HUnit
          instance-control lens mtl template-haskell text transformers
+         uniplate
        ];
        homepage = "https://github.com/lazac/references";
        description = "Selectors for reading and updating data";
@@ -148326,6 +148677,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "refty" = callPackage
+    ({ mkDerivation, aeson, base, containers, text }:
+     mkDerivation {
+       pname = "refty";
+       version = "0.1.0.1";
+       sha256 = "621883d618e539b9938327e2faf09d36628a81db9ab051c7a4c07b644b7f5d28";
+       libraryHaskellDepends = [ aeson base containers text ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/oreshinya/refty";
+       description = "Formatted JSON generator for API server inspired by normalizr";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "regex-applicative" = callPackage
     ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit
      , tasty-smallcheck, transformers
@@ -149969,22 +150333,20 @@ self: {
      }) {};
 
   "req" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring
-     , case-insensitive, connection, data-default-class, hspec
-     , hspec-core, http-api-data, http-client, http-client-tls
+    ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
+     , bytestring, case-insensitive, connection, data-default-class
+     , hspec, hspec-core, http-api-data, http-client, http-client-tls
      , http-types, mtl, QuickCheck, text, time, transformers
      , unordered-containers
      }:
      mkDerivation {
        pname = "req";
-       version = "0.1.0";
-       sha256 = "c93bae94d0b640f0d459a3da79c6021f7d8403099e9f08c35a2cddf64eea2269";
-       revision = "2";
-       editedCabalFile = "c4d0fc2e312c85a8dc3e7aefb49341ad57662ac1dac6625304f9aa3cf2016160";
+       version = "0.2.0";
+       sha256 = "e64e56622f1ec06df83e2c8516effa49058b4d7196c28127ab98190cc320ebbc";
        libraryHaskellDepends = [
-         aeson base blaze-builder bytestring case-insensitive connection
-         data-default-class http-api-data http-client http-client-tls
-         http-types mtl text time transformers
+         aeson authenticate-oauth base blaze-builder bytestring
+         case-insensitive connection data-default-class http-api-data
+         http-client http-client-tls http-types mtl text time transformers
        ];
        testHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
@@ -150005,6 +150367,8 @@ self: {
        pname = "req-conduit";
        version = "0.1.0";
        sha256 = "689a8592555b39859ab0d2e50b111217112d51077553dc7103d84afc865ca447";
+       revision = "1";
+       editedCabalFile = "2f7008556081fcfb641b008c499f0c12958f7ccdfbc62b8aa2c1459c7efb3e81";
        libraryHaskellDepends = [
          base bytestring conduit http-client req resourcet transformers
        ];
@@ -150383,8 +150747,8 @@ self: {
        pname = "rest-core";
        version = "0.39";
        sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404";
-       revision = "3";
-       editedCabalFile = "3b6cf8a675a2bf1f3e22fcf1a39e1658ce112e21b918ad28ace73cdf5dc70aa2";
+       revision = "4";
+       editedCabalFile = "261e22e228e0d1f042f24a0a9e784a7ed3ea44342006cb79cb7e4021f0e46b9a";
        libraryHaskellDepends = [
          aeson aeson-utils base base-compat bytestring case-insensitive
          errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
@@ -150464,8 +150828,8 @@ self: {
        pname = "rest-gen";
        version = "0.20.0.0";
        sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542";
-       revision = "3";
-       editedCabalFile = "b1de24d30b40005298357ecadb54055f9842d8c1e3673feeb453a067a9f9a812";
+       revision = "4";
+       editedCabalFile = "df0abba48ce1b506060711b616a027680314c92960bdefca0f548eecc058e062";
        libraryHaskellDepends = [
          aeson base base-compat blaze-html Cabal code-builder directory
          fclabels filepath hashable haskell-src-exts HStringTemplate hxt
@@ -150525,8 +150889,8 @@ self: {
        pname = "rest-stringmap";
        version = "0.2.0.6";
        sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a";
-       revision = "4";
-       editedCabalFile = "5ba1b7bef91969bc4d1319ab72e78b4063e1bbc9620787e7306b95b1390f9897";
+       revision = "5";
+       editedCabalFile = "40fd386dc256a7a2b53e188b69b202f6623a5baa93c04ac2fe5c5389adb250f1";
        libraryHaskellDepends = [
          aeson base containers hashable hxt json-schema tostring
          unordered-containers
@@ -150544,8 +150908,8 @@ self: {
        pname = "rest-types";
        version = "1.14.1.1";
        sha256 = "b7e08e65bbae20bd891f0905c9c785184182172094673ab13e66499e4fe3969a";
-       revision = "1";
-       editedCabalFile = "8e9eca95758568488ae115f3a807ef05d309e193ecac3e740569eb43de37fc22";
+       revision = "2";
+       editedCabalFile = "6f8ff48a58cd55fc871ee536eccd895b0f29a18fd52429791bff578ff8497a20";
        libraryHaskellDepends = [
          aeson base base-compat case-insensitive generic-aeson
          generic-xmlpickler hxt json-schema rest-stringmap text uuid
@@ -155973,8 +156337,8 @@ self: {
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.1.3.0";
-       sha256 = "ddf321ba0126fde5757f186c5080f3a7ffb7539582040aab263165f83cafcc78";
+       version = "0.1.3.1";
+       sha256 = "5765de74022ed024a407a3869892294d50e3027f7cf79ef9b63fca0b61c8b306";
        libraryHaskellDepends = [
          acid-state aeson aeson-extra base base16-bytestring
          base64-bytestring binary binary-orphans bytestring cereal
@@ -158217,8 +158581,8 @@ self: {
     ({ mkDerivation, base, basic-prelude, directory, shake }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.7";
-       sha256 = "f7859e7adbccb740c176fc186ca332f576be65265b87641d5ac30d2d34adfbdb";
+       version = "0.0.8";
+       sha256 = "13495dad7f64f7f6fd79d86c138ceb517659e28fd138169d1df957892036ab51";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base basic-prelude directory shake ];
@@ -158620,8 +158984,8 @@ self: {
      }:
      mkDerivation {
        pname = "shellmate";
-       version = "0.3.4";
-       sha256 = "b2db36ff28c21d78bdac8142e35b4ab002d70193f55f7e603c8c3d0eb49c0ce8";
+       version = "0.3.4.1";
+       sha256 = "a66fb8d53eac5736dd7d69c7835af60ca2afff389c65e0972ab199b0983a6430";
        libraryHaskellDepends = [
          base bytestring directory filepath process temporary transformers
          unix
@@ -159038,8 +159402,8 @@ self: {
      }:
      mkDerivation {
        pname = "sibe";
-       version = "0.2.0.3";
-       sha256 = "324abe72b361aaef1286bbe8e76dda18e431010db60aa1ea018f95e045fe91ea";
+       version = "0.2.0.4";
+       sha256 = "104038b009602b8cd3a9a9211d2c67cf585c7c5e3d69a2a16df0348fa5958ddc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -161219,8 +161583,33 @@ self: {
        ];
        description = "A type-safe interface to communicate with an SMT solver";
        license = stdenv.lib.licenses.gpl3;
-       broken = true;
-     }) {smtlib2-quickcheck = null;};
+     }) {};
+
+  "smtlib2-quickcheck" = callPackage
+    ({ mkDerivation, base, containers, dependent-map, dependent-sum
+     , mtl, QuickCheck, smtlib2
+     }:
+     mkDerivation {
+       pname = "smtlib2-quickcheck";
+       version = "1.0";
+       sha256 = "267f701b359e81d0a053e7c04a294d98ecc8d795dfe540c812b0832df278ac4c";
+       libraryHaskellDepends = [
+         base containers dependent-map dependent-sum mtl QuickCheck smtlib2
+       ];
+       description = "Helper functions to create SMTLib expressions in QuickCheck";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "smtlib2-timing" = callPackage
+    ({ mkDerivation, base, dependent-sum, mtl, smtlib2, time }:
+     mkDerivation {
+       pname = "smtlib2-timing";
+       version = "1.0";
+       sha256 = "253ace562bd79b48a51d7b5272d70b27abf0e7ae1a3468b9e477901bdd430289";
+       libraryHaskellDepends = [ base dependent-sum mtl smtlib2 time ];
+       description = "Get timing informations for SMT queries";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
 
   "smtp-mail" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
@@ -164982,8 +165371,8 @@ self: {
        pname = "stache";
        version = "0.1.8";
        sha256 = "a8617924e087b02c3afb3308a8a1102828e352dba7545648703e5d0c2c3c35b2";
-       revision = "1";
-       editedCabalFile = "642777f5664ae40b2e5308ca771a505226b0015414203658432e002c846e5ad7";
+       revision = "2";
+       editedCabalFile = "293e587834fd528a8f1869027b1de5f3ea492597350688a86db36c18453757d9";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory exceptions
          filepath megaparsec mtl template-haskell text unordered-containers
@@ -165008,8 +165397,8 @@ self: {
        pname = "stache";
        version = "0.2.0";
        sha256 = "0952d6849a297d3ef020feaeb128be4af7d25ab97fa948eb0339a7f75d0a1831";
-       revision = "1";
-       editedCabalFile = "5b22600a5b101c5c86d688d05773c7506e9cc373637ef7a2a1abe43a28db0703";
+       revision = "2";
+       editedCabalFile = "4899a9a2a56b3e2524b0166f8875f7f823419c64ec1f2a74f2ff7b6010472d01";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory exceptions
          filepath megaparsec mtl template-haskell text unordered-containers
@@ -173562,6 +173951,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-show-instances_3_5" = callPackage
+    ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
+     , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
+     , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty
+     , QuickCheck, quickcheck-instances, random, semigroups, tagged
+     , template-haskell, terminfo, text, text-show, th-orphans, time
+     , transformers, transformers-compat, unix, unordered-containers
+     , vector, xhtml
+     }:
+     mkDerivation {
+       pname = "text-show-instances";
+       version = "3.5";
+       sha256 = "0c7dbf6e6742460be0d08777ab3759434c12c5b65f273be35afbe0c945690342";
+       libraryHaskellDepends = [
+         base base-compat bifunctors binary bytestring containers directory
+         ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random
+         semigroups tagged template-haskell terminfo text text-show time
+         transformers transformers-compat unix unordered-containers vector
+         xhtml
+       ];
+       testHaskellDepends = [
+         base base-compat bifunctors binary bytestring containers directory
+         generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc hspec
+         old-locale old-time pretty QuickCheck quickcheck-instances random
+         semigroups tagged template-haskell terminfo text text-show
+         th-orphans time transformers transformers-compat unix
+         unordered-containers vector xhtml
+       ];
+       homepage = "https://github.com/RyanGlScott/text-show-instances";
+       description = "Additional instances for text-show";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-stream-decode" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, hspec, text }:
      mkDerivation {
@@ -175241,13 +175664,13 @@ self: {
      }) {};
 
   "time-patterns" = callPackage
-    ({ mkDerivation, base, intervals, lens, thyme, vector-space }:
+    ({ mkDerivation, base, intervals, time }:
      mkDerivation {
        pname = "time-patterns";
-       version = "0.1.3.2";
-       sha256 = "3c2beb5b4f69213699cdc9e2f88872d1d406eb04c93ad3678e09b6746aa40a61";
-       libraryHaskellDepends = [ base intervals lens thyme vector-space ];
-       homepage = "https://bitbucket.org/jfmueller/time-patterns";
+       version = "0.1.4.1";
+       sha256 = "5114525b97e376303540feea7b7d780d6c13d558d130a8d95d8577db5e004f41";
+       libraryHaskellDepends = [ base intervals time ];
+       homepage = "https://github.com/j-mueller/time-patterns";
        description = "Patterns for recurring events";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176191,6 +176614,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "toboggan" = callPackage
+    ({ mkDerivation, base, clit, directory, madlang, optparse-generic
+     , text
+     }:
+     mkDerivation {
+       pname = "toboggan";
+       version = "0.1.0.0";
+       sha256 = "72281351961f1d55149379c273b72e4e4d7a5134c432351044a17317152f3a67";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base clit directory madlang optparse-generic text
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/vmchale/toboggan#readme";
+       description = "Twitter bot generator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "todos" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-unicode-symbols
      , containers, data-hash, dates, directory, dyre, filepath, Glob
@@ -177724,7 +178166,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tttool_1_6_1_4" = callPackage
+  "tttool_1_7_0_1" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , directory, executable-path, filepath, hashable, haskeline, HPDF
      , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
@@ -177733,8 +178175,8 @@ self: {
      }:
      mkDerivation {
        pname = "tttool";
-       version = "1.6.1.4";
-       sha256 = "66f14d6abe28e2d2a1a61cbef0fe8ace0c376b2e2a8b918b17d422634faee8ee";
+       version = "1.7.0.1";
+       sha256 = "b41fc9b2899a625a0a364dd8fc4ef8f7c070ec7cbcbf5ef2acfc256cfb434fe6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -183020,6 +183462,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector_0_12_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, ghc-prim, HUnit, primitive
+     , QuickCheck, random, template-haskell, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, transformers
+     }:
+     mkDerivation {
+       pname = "vector";
+       version = "0.12.0.0";
+       sha256 = "27bf375d0efbff61acaeb75a2047afcbdac930191069a59da4a474b9bf80ec95";
+       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
+       testHaskellDepends = [
+         base HUnit QuickCheck random template-haskell test-framework
+         test-framework-hunit test-framework-quickcheck2 transformers
+       ];
+       homepage = "https://github.com/haskell/vector";
+       description = "Efficient Arrays";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-algorithms" = callPackage
     ({ mkDerivation, base, bytestring, containers, primitive
      , QuickCheck, vector
@@ -183062,6 +183524,20 @@ self: {
        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";
+       version = "0.2.3.4";
+       sha256 = "f3cef04ff645bbf25198c2c0c33d0c13e44bfe63602e1e694c2be9abf0e57d00";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-buffer" = callPackage
     ({ mkDerivation, base, deepseq, vector }:
      mkDerivation {
@@ -183218,6 +183694,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-instances_3_4" = callPackage
+    ({ mkDerivation, base, comonad, hashable, keys, pointed
+     , semigroupoids, semigroups, vector
+     }:
+     mkDerivation {
+       pname = "vector-instances";
+       version = "3.4";
+       sha256 = "1b0246ef0cf8372d61d5c7840d857f49299af2304b5107510377255ed4dd5381";
+       libraryHaskellDepends = [
+         base comonad hashable keys pointed semigroupoids semigroups vector
+       ];
+       homepage = "http://github.com/ekmett/vector-instances";
+       description = "Orphan Instances for 'Data.Vector'";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-instances-collections" = callPackage
     ({ mkDerivation, base, collections-api, template-haskell, vector }:
      mkDerivation {
@@ -186245,6 +186738,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "web-push" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+     , cryptonite, exceptions, http-client, http-types, jose, memory
+     , random, text, time, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "web-push";
+       version = "0.1.0.0";
+       sha256 = "5772499993225207a60755f08e9e8774c17e6b06c7f933ba83789549d8beb871";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring binary bytestring cryptonite
+         exceptions http-client http-types jose memory random text time
+         transformers unordered-containers
+       ];
+       homepage = "https://github.com/sarthakbagaria/web-push#readme";
+       description = "Helper functions to send messages using Web Push protocol";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "web-routes" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, exceptions
      , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck

From dd0d71727a0b2a818b0b2b30d528b6b23024ba16 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 7 Jan 2017 12:52:27 +0100
Subject: [PATCH 0795/1310] git-annex: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ff53f1ce2ca..8f207a000df 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -58,6 +58,8 @@ self: super: {
       rev = drv.version;
     };
   })).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

From 6d58ab2edf8843e03f10af03a16e8137afe49df5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 7 Jan 2017 12:09:24 +0100
Subject: [PATCH 0796/1310] jailbreak-cabal: ghc-HEAD needs version 1.3.2 due
 to API changes in Cabal

https://github.com/peti/jailbreak-cabal/issues/12
---
 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 f093c0e427e..c6fcf0bff07 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.override { Cabal = null; };
+  jailbreak-cabal = super.jailbreak-cabal_1_3_2.override { Cabal = null; };
 
   # haddock: No input file(s).
   nats = dontHaddock super.nats;

From 936bc23b414e562da9fd8ce5e3e360929d25262c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 8 Jan 2017 22:16:00 +0100
Subject: [PATCH 0797/1310] ed: avoid the useless rebuild due to #21752

---
 pkgs/applications/editors/ed/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 680b7f8a030..9cb644cc931 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   name = "ed-1.13";
-  file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror
 
   src = fetchurl {
     # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
@@ -10,10 +9,12 @@ 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 = [
-      "http://pkgs.fedoraproject.org/repo/extras/ed/${name}.tar.bz2/${file_md5}/${name}.tar.bz2"
-      "http://fossies.org/linux/privat/${name}.tar.bz2"
-    ];
+    urls = let file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror
+      in [
+        ("http://pkgs.fedoraproject.org/repo/extras/ed"
+          + "/${name}.tar.bz2/${file_md5}/${name}.tar.bz2")
+        "http://fossies.org/linux/privat/${name}.tar.bz2"
+      ];
     sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j";
   };
 

From 157b2168527d3fd43578c615de1f3171b9b7ec08 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 8 Jan 2017 15:44:26 -0600
Subject: [PATCH 0798/1310] elfutils: 0.165 -> 0.168

---
 .../tools/misc/elfutils/default.nix           |   6 +-
 .../tools/misc/elfutils/glibc-2.21.patch      | 164 ------------------
 2 files changed, 2 insertions(+), 168 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/elfutils/glibc-2.21.patch

diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 6386d3176a9..c1180c0393a 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -3,15 +3,13 @@
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   name = "elfutils-${version}";
-  version = "0.165";
+  version = "0.168";
 
   src = fetchurl {
     url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2";
-    sha256 = "0wp91hlh9n0ismikljf63558rzdwim8w1s271grsbaic35vr5z57";
+    sha256 = "0xn2fbgda1i703csfs35frvm7l068ybmay4ssrykqdx17f4hg3dq";
   };
 
-  patches = [ ./glibc-2.21.patch ];
-
   hardeningDisable = [ "format" ];
 
   # We need bzip2 in NativeInputs because otherwise we can't unpack the src,
diff --git a/pkgs/development/tools/misc/elfutils/glibc-2.21.patch b/pkgs/development/tools/misc/elfutils/glibc-2.21.patch
deleted file mode 100644
index f67632741e5..00000000000
--- a/pkgs/development/tools/misc/elfutils/glibc-2.21.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From b9d70fb9fb0bd0bf84eb2302cba1691aea74c42e Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mjw@redhat.com>
-Date: Wed, 13 Jan 2016 17:16:48 +0100
-Subject: [PATCH] libelf: Add ELF compression types and defines to libelf.h for
- older glibc.
-
-Older glibc elf.h might not define the new ELF compression defines and
-types. If not just define them in libelf.h directly to make the libelf
-headers work on older glibc systems.
-
-Also include a testcase to check the libelf headers build against the
-system elf.h.
-
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810885
-
-Signed-off-by: Mark Wielaard <mjw@redhat.com>
----
- libelf/ChangeLog               |  5 +++++
- libelf/libelf.h                | 28 ++++++++++++++++++++++++++++
- tests/ChangeLog                |  8 ++++++++
- tests/Makefile.am              |  9 +++++++--
- tests/system-elf-libelf-test.c | 35 +++++++++++++++++++++++++++++++++++
- 5 files changed, 83 insertions(+), 2 deletions(-)
- create mode 100644 tests/system-elf-libelf-test.c
-
-diff --git a/libelf/ChangeLog b/libelf/ChangeLog
-index 3a1fe91..aabf6f6 100644
---- a/libelf/ChangeLog
-+++ b/libelf/ChangeLog
-@@ -1,3 +1,8 @@
-+2016-01-13  Mark Wielaard  <mjw@redhat.com>
-+
-+	* libelf.h: Check SHF_COMPRESSED is defined. If not define it and the
-+	associated ELF compression types/defines.
-+
- 2015-11-26  Mark Wielaard  <mjw@redhat.com>
- 
- 	* elf_compress.c (__libelf_decompress_elf): New function, extracted
-diff --git a/libelf/libelf.h b/libelf/libelf.h
-index 364e776..c0d6389 100644
---- a/libelf/libelf.h
-+++ b/libelf/libelf.h
-@@ -35,6 +35,34 @@
- /* Get the ELF types.  */
- #include <elf.h>
- 
-+#ifndef SHF_COMPRESSED
-+ /* Older glibc elf.h might not yet define the ELF compression types.  */
-+ #define SHF_COMPRESSED      (1 << 11)  /* Section with compressed data. */
-+
-+ /* Section compression header.  Used when SHF_COMPRESSED is set.  */
-+
-+ typedef struct
-+ {
-+   Elf32_Word   ch_type;        /* Compression format.  */
-+   Elf32_Word   ch_size;        /* Uncompressed data size.  */
-+   Elf32_Word   ch_addralign;   /* Uncompressed data alignment.  */
-+ } Elf32_Chdr;
-+
-+ typedef struct
-+ {
-+   Elf64_Word   ch_type;        /* Compression format.  */
-+   Elf64_Word   ch_reserved;
-+   Elf64_Xword  ch_size;        /* Uncompressed data size.  */
-+   Elf64_Xword  ch_addralign;   /* Uncompressed data alignment.  */
-+ } Elf64_Chdr;
-+
-+ /* Legal values for ch_type (compression algorithm).  */
-+ #define ELFCOMPRESS_ZLIB       1          /* ZLIB/DEFLATE algorithm.  */
-+ #define ELFCOMPRESS_LOOS       0x60000000 /* Start of OS-specific.  */
-+ #define ELFCOMPRESS_HIOS       0x6fffffff /* End of OS-specific.  */
-+ #define ELFCOMPRESS_LOPROC     0x70000000 /* Start of processor-specific.  */
-+ #define ELFCOMPRESS_HIPROC     0x7fffffff /* End of processor-specific.  */
-+#endif
- 
- /* Known translation types.  */
- typedef enum
-diff --git a/tests/ChangeLog b/tests/ChangeLog
-index 366aea9..234ae56 100644
---- a/tests/ChangeLog
-+++ b/tests/ChangeLog
-@@ -1,3 +1,11 @@
-+2016-01-13  Mark Wielaard  <mjw@redhat.com>
-+
-+	* system-elf-libelf-test.c: New test.
-+	* Makefile.am (TESTS): Add system-elf-libelf-test, if !STANDALONE.
-+	(check_PROGRAMS): Likewise.
-+	(system_elf_libelf_test_CPPFLAGS): New variable.
-+	(system_elf_libelf_test_LDADD): Likewise.
-+
- 2016-01-08  Mark Wielaard  <mjw@redhat.com>
- 
- 	* elfputzdata.c (main): Fix parentheses in strncmp test.
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index d09a6d7..7b9e108 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -136,8 +136,8 @@ export ELFUTILS_DISABLE_DEMANGLE = 1
- endif
- 
- if !STANDALONE
--check_PROGRAMS += msg_tst md5-sha1-test
--TESTS += msg_tst md5-sha1-test
-+check_PROGRAMS += msg_tst md5-sha1-test system-elf-libelf-test
-+TESTS += msg_tst md5-sha1-test system-elf-libelf-test
- endif
- 
- if LZMA
-@@ -473,6 +473,11 @@ elfgetzdata_LDADD = $(libelf)
- elfputzdata_LDADD = $(libelf)
- zstrptr_LDADD = $(libelf)
- 
-+# We want to test the libelf header against the system elf.h header.
-+# Don't include any -I CPPFLAGS.
-+system_elf_libelf_test_CPPFLAGS =
-+system_elf_libelf_test_LDADD = $(libelf)
-+
- if GCOV
- check: check-am coverage
- .PHONY: coverage
-diff --git a/tests/system-elf-libelf-test.c b/tests/system-elf-libelf-test.c
-new file mode 100644
-index 0000000..7dfe498
---- /dev/null
-+++ b/tests/system-elf-libelf-test.c
-@@ -0,0 +1,35 @@
-+/* Explicit test compiling with system elf.h header plus libelf header.
-+
-+   Copyright (C) 2016 Red Hat, Inc.
-+   This file is part of elfutils.
-+
-+   This file is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   elfutils is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+#include <elf.h>
-+#include <stddef.h>
-+#include "../libelf/libelf.h"
-+
-+int
-+main (void)
-+{
-+  /* Trivial test, this is really a compile test anyway.  */
-+  if (elf_version (EV_CURRENT) == EV_NONE)
-+    return -1;
-+
-+  /* This will obviously fail. It is just to check that Elf32_Chdr and
-+     elf32_getchdr are available (both at compile time and runtime).  */
-+  Elf32_Chdr *chdr = elf32_getchdr (NULL);
-+
-+  return chdr == NULL ? 0 : -1;
-+}
--- 
-1.8.3.1
-

From 2afcf342815e7437e88ce9f0591a3449a1e8c71d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 8 Jan 2017 16:30:05 -0600
Subject: [PATCH 0799/1310] elfutils: Update website and URL to new sourceware
 location.

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

diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index c1180c0393a..6e80f0907bc 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.168";
 
   src = fetchurl {
-    url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2";
+    url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
     sha256 = "0xn2fbgda1i703csfs35frvm7l068ybmay4ssrykqdx17f4hg3dq";
   };
 
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = https://fedorahosted.org/elfutils/;
+    homepage = https://sourceware.org/elfutils/;
     description = "A set of utilities to handle ELF objects";
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl3;

From 188fcc1eb5b9b49fccfbf6f529424f5db6258efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 8 Jan 2017 17:52:55 +0100
Subject: [PATCH 0800/1310] ferm: 2.3 -> 2.3.1

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

diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix
index f4cf387ecc5..45460589382 100644
--- a/pkgs/tools/networking/ferm/default.nix
+++ b/pkgs/tools/networking/ferm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables }:
 
 stdenv.mkDerivation rec {
-  version = "2.3";
+  version = "2.3.1";
   name = "ferm-${version}";
 
   src = fetchurl {
-    url = "http://ferm.foo-projects.org/download/${version}/ferm-${version}.tar.gz";
-    sha256 = "0jx63fhjw5y1ahgdbn4hgd7sq6clxl80dr8a2hkryibfbwz3vs4x";
+    url = "http://ferm.foo-projects.org/download/2.3/ferm-${version}.tar.gz";
+    sha256 = "1scdnd2jk4787jyr6fxav2598g0x7hjic5b8bj77j8s0hki48m4a";
   };
 
   buildInputs = [ perl ipset ebtables iptables makeWrapper ];

From adbcb37db58150771e144bd82a99d5a2d047b7e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 8 Jan 2017 18:51:55 +0100
Subject: [PATCH 0801/1310] android-udev-rules: 20161014 -> 20170106

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

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index a779b53d3a5..1ef637fb8c4 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "android-udev-rules-${version}";
-  version = "20161014";
+  version = "20170106";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
     rev = version;
-    sha256 = "0xc7wslxf7xsvfbd83wsw4nikmpq1zfd607y2p2r3j1vkw1yak08";
+    sha256 = "0icdvs7aivzw7xbvi31q10554g447pifjzswqiiyipi664bpcwv7";
   };
 
   installPhase = ''

From 90ea0c000cfa3fa76274592291c61aeddce49698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 8 Jan 2017 23:17:37 +0100
Subject: [PATCH 0802/1310] octave: 4.0.3 -> 4.2.0

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

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 226f819ded9..904ad97648e 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -18,11 +18,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "4.0.3";
+  version = "4.2.0";
   name = "octave-${version}";
   src = fetchurl {
-    url = "mirror://gnu/octave/${name}.tar.xz";
-    sha256 = "11day29k4yfvxh4101x5yf26ld992x5n6qvmhjjk6mzsd26fqayw";
+    url = "mirror://gnu/octave/${name}.tar.gz";
+    sha256 = "0rsmg5i3b5yfvkvrl9mqvn3f2n1a6vqg45phpja1qlzkh8vsffs4";
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull

From 510ac5221a26e3905aec453c00a45f89b4d112e6 Mon Sep 17 00:00:00 2001
From: FaustXVI <xavier.detant@gmail.com>
Date: Sun, 8 Jan 2017 23:54:07 +0100
Subject: [PATCH 0803/1310] slack: 2.2.1 -> 2.3.4

---
 .../networking/instant-messengers/slack/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 9f2fee47d8d..240aebe9175 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -4,7 +4,7 @@
 
 let
 
-  version = "2.2.1";
+  version = "2.3.4";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -43,7 +43,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/slack-desktop-${version}-amd64.deb";
-        sha256 = "1x08bmkanllv3lpi2s722xs7qia8igf6zxzkc3g7vs5jms3mdrad";
+        sha256 = "01kr7maj8f4yinyri7rs4pmzab9cvp48xfqw3ilirx4mvh8mr1fd";
       }
     else
       throw "Slack is not supported on ${stdenv.system}";

From b8a508364ce7ed9d22ccd47be3eb72cba44dab37 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Mon, 9 Jan 2017 02:39:20 +0200
Subject: [PATCH 0804/1310] rescuetime: 2.9.10.1255 -> 2.9.11.1285

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

diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 974c593d37c..03d058783b2 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -5,18 +5,18 @@ let
     if stdenv.system == "i686-linux" then fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb";
-      sha256 = "1wi9ikwmc9jfilj8adad3rcb7rmmxkpkfcp2gkfxvdyw6n0mzcnf";
+      sha256 = "0nkbi05pr5kznj4vjqhsrxcqdmjdf2zsbirslxgm4jbh87skl6fm";
     } else fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
-      sha256 = "074yivz7rz1ac1962dix0aahpyqvsrkizh32kk5hyw5az0vqpcjs";
+      sha256 = "161f71kvcrilv9qxldwn8xsqs2g9c2f2g9wb5brbfc0lqbbc8n89";
     };
 
 in
 
 stdenv.mkDerivation {
   # https://www.rescuetime.com/updates/linux_release_notes.html
-  name = "rescuetime-2.9.10.1255";
+  name = "rescuetime-2.9.11.1285";
   inherit src;
   buildInputs = [ dpkg makeWrapper ];
   unpackPhase = ''

From 2190a84812f33fbda2dc01edc6de1fb359a14dde Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 4 Jan 2017 16:37:45 +0800
Subject: [PATCH 0805/1310] tora: init at 3.1

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

diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
new file mode 100644
index 00000000000..9f8f2df358a
--- /dev/null
+++ b/pkgs/development/tools/tora/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, lib, fetchFromGitHub, cmake, ecm, makeQtWrapper
+, boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }:
+
+let
+  qscintillaLib = (qscintilla.override { withQt5 = true; });
+
+in stdenv.mkDerivation rec {
+  name = "tora-${version}";
+  version = "3.1";
+
+  src = fetchFromGitHub {
+    owner  = "tora-tool";
+    repo   = "tora";
+    rev    = "v${version}";
+    sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    cmake ecm makeQtWrapper
+    boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase
+  ];
+
+  preConfigure = ''
+    sed -i \
+      's|defaultGvHome = "/usr/bin"|defaultGvHome = "${lib.getBin graphviz}/bin"|' \
+      src/widgets/toglobalsetting.cpp
+
+    sed -i \
+      's|/usr/bin/dot|${lib.getBin graphviz}/bin/dot|' \
+      extlibs/libermodel/dotgraph.cpp
+  '';
+
+  cmakeFlags = [
+    "-DWANT_INTERNAL_LOKI=0"
+    "-DWANT_INTERNAL_QSCINTILLA=0"
+    # cmake/modules/FindQScintilla.cmake looks in qtbase and for the wrong library name
+    "-DQSCINTILLA_INCLUDE_DIR=${qscintillaLib}/include"
+    "-DQSCINTILLA_LIBRARY=${qscintillaLib}/lib/libqscintilla2.so"
+    "-DENABLE_DB2=0"
+    "-DENABLE_ORACLE=0"
+    "-DENABLE_TERADATA=0"
+    "-DQT5_BUILD=1"
+    "-Wno-dev"
+  ];
+
+  # these libraries are only searched for at runtime so we need to force-link them
+  NIX_LDFLAGS = [
+    "-lgvc"
+    "-lmysqlclient"
+    "-lecpg"
+    "-lssl"
+  ];
+
+  postFixup = ''
+    wrapQtProgram $out/bin/tora \
+      --prefix PATH : ${lib.getBin graphviz}/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tora SQL tool";
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.linux;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffd24741282..87dd399a980 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17932,6 +17932,8 @@ in
 
   zoom-us = qt55.callPackage ../applications/networking/instant-messengers/zoom-us {};
 
+  tora = qt5.callPackage ../development/tools/tora {};
+
   xulrunner = firefox-unwrapped;
 
   nitrokey-app = callPackage ../tools/security/nitrokey-app { };

From bbc3082ebd38245bede3505d248a75272e02b7bb Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 8 Jan 2017 21:16:52 -0500
Subject: [PATCH 0806/1310] mcgrid: pkgconfig is the only way to locate mcgrid

---
 pkgs/development/libraries/physics/mcgrid/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix
index 033bf2f214f..aabe132e73b 100644
--- a/pkgs/development/libraries/physics/mcgrid/default.nix
+++ b/pkgs/development/libraries/physics/mcgrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fastnlo, rivet, sherpa }:
+{ stdenv, fetchurl, fastnlo, rivet, pkgconfig, sherpa }:
 
 stdenv.mkDerivation rec {
   name = "mcgrid-${version}";
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ fastnlo rivet ];
+  propagatedNativeBuildInputs = [ pkgconfig ];
 
   preConfigure = ''
     substituteInPlace mcgrid.pc.in \

From 1603526000c2f5db86e018041677cfa80b4885a1 Mon Sep 17 00:00:00 2001
From: Joris Guyonvarch <joris@guyonvarch.me>
Date: Mon, 9 Jan 2017 06:07:25 +0100
Subject: [PATCH 0807/1310] xrectsel: init at 0.3.2 (#21153)

---
 pkgs/tools/X11/ffcast/default.nix   | 20 +++++++++-----------
 pkgs/tools/X11/xrectsel/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/tools/X11/xrectsel/default.nix

diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix
index 936805ed17c..1e1e3f888c9 100644
--- a/pkgs/tools/X11/ffcast/default.nix
+++ b/pkgs/tools/X11/ffcast/default.nix
@@ -1,22 +1,20 @@
-{ stdenv, fetchgit, autoconf, automake, perl, libX11 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, perl, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "ffcast-${version}";
   version = "2.5.0";
-  rev = "7c3bf681e7ca9b242e55dbf0c07856ed994d94e9";
 
-  src = fetchgit {
-    url = https://github.com/lolilolicon/FFcast;
-    sha256 = "1s1y6rqjq126jvdzc75wz20szisbz8h8fkphlwxcxzl9xll17akj";
+  src = fetchFromGitHub {
+    owner = "lolilolicon";
+    repo = "FFcast";
+    rev = "${version}";
+    sha256 = "047y32bixhc8ksr98vwpgd0k1xxgsv2vs0n3kc2xdac4krc9454h";
   };
 
-  buildInputs = [ autoconf automake perl libX11 ];
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ perl libX11 ];
 
-  preConfigure = ''
-    ./bootstrap
-  '';
-
-  configureFlags = [ "--enable-xrectsel" ];
+  configureFlags = [ "--disable-xrectsel" ];
 
   postBuild = ''
     make DESTDIR="$out" install
diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix
new file mode 100644
index 00000000000..f38ecab9f11
--- /dev/null
+++ b/pkgs/tools/X11/xrectsel/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, libX11 }:
+
+stdenv.mkDerivation rec {
+  name = "xrectsel-${version}";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "lolilolicon";
+    repo = "xrectsel";
+    rev = "${version}";
+    sha256 = "0prl4ky3xzch6xcb673mcixk998d40ngim5dqc5374b1ls2r6n7l";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ libX11 ];
+
+  postBuild = ''
+    make DESTDIR="$out" install
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Print the geometry of a rectangular screen region";
+    homepage = https://github.com/lolilolicon/xrectsel;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.guyonvarch ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e49e4260f5f..e261d1bcfb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15707,6 +15707,8 @@ in
   #TODO: 'pil' is not available for python3, yet
   xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; };
 
+  xrectsel = callPackage ../tools/X11/xrectsel { };
+
   xrestop = callPackage ../tools/X11/xrestop { };
 
   xsd = callPackage ../development/libraries/xsd { };

From a4fca568976b29447ad637dfb261ef57499b0764 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Sun, 25 Dec 2016 23:32:23 +0100
Subject: [PATCH 0808/1310] ddclient: Write /etc/ddclient.conf when requested

Fixes #20101

From PR #21417
---
 nixos/modules/services/networking/ddclient.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 5050ecbd749..d1900deceaf 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -120,7 +120,7 @@ in
     };
 
     environment.etc."ddclient.conf" = {
-      enable = config.services.ddclient.configFile == /etc/ddclient.conf;
+      enable = config.services.ddclient.configFile == "/etc/ddclient.conf";
       uid = config.ids.uids.ddclient;
       mode = "0600";
       text = ''

From 1753d8c87875de2f5ff0c83a3ead3ecd0c4a51f0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 9 Jan 2017 06:29:40 +0100
Subject: [PATCH 0809/1310] irssi: 0.8.21 -> 1.0.0

---
 .../networking/irc/irssi/default.nix          | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 0d2dcd3b45a..88e2ede631b 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,20 +1,23 @@
 { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-
-  version = "0.8.21";
+  version = "1.0.0";
   name = "irssi-${version}";
 
   src = fetchurl {
-    urls = [ "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz" ];
-    sha256 = "0fxacadhdzl3n0231mqjv2gcmj1fj85azhbbsk0fq7xmf1da7ha2";
+    url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
+    sha256 = "11x47ahkvzzx3xkvqak34235ghnpln65v13k77xx32c85nvb63kr";
   };
 
-  buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ncurses glib openssl perl libintlOrEmpty ];
 
-  NIX_LDFLAGS = ncurses.ldflags;
-
-  configureFlags = "--with-proxy --with-ncurses --enable-ssl --with-perl=yes";
+  configureFlags = [
+    "--with-proxy"
+    "--with-bot"
+    "--with-perl=yes"
+    "--enable-true-color"
+  ];
 
   meta = {
     homepage    = http://irssi.org;

From a878365b77e2bad4f11731072c3d2b79d1b40b04 Mon Sep 17 00:00:00 2001
From: teh <tehunger@gmail.com>
Date: Mon, 9 Jan 2017 05:39:10 +0000
Subject: [PATCH 0810/1310] nixos docs: update for Nginx + ACME (#21320)

Closes #20698.
---
 nixos/modules/security/acme.xml | 62 +++++++++++----------------------
 1 file changed, 20 insertions(+), 42 deletions(-)

diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml
index 6fddb27e6a3..823806f4641 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@@ -67,52 +67,30 @@ options for the <literal>security.acme</literal> module.</para>
 </section>
 
 <section><title>Using ACME certificates in Nginx</title>
-<para>In practice ACME is mostly used for retrieval and renewal of
-  certificates that will be used in a webserver like Nginx. A configuration for
-  Nginx that uses the certificates from ACME for
-  <literal>foo.example.com</literal> will look similar to:
+<para>NixOS supports fetching ACME certificates for you by setting
+<literal>enableACME = true;</literal> in a virtualHost config. We
+first create self-signed placeholder certificates in place of the
+real ACME certs. The placeholder certs are overwritten when the ACME
+certs arrive. For <literal>foo.example.com</literal> the config would
+look like.
 </para>
 
 <programlisting>
-security.acme.certs."foo.example.com" = {
-  webroot = config.security.acme.directory + "/acme-challenge";
-  email = "foo@example.com";
-  user = "nginx";
-  group = "nginx";
-  postRun = "systemctl restart nginx.service";
-};
-services.nginx.httpConfig = ''
-  server {
-    server_name foo.example.com;
-    listen 80;
-    listen [::]:80;
-
-    location /.well-known/acme-challenge {
-      root /var/www/challenges;
-    }
-
-    location / {
-      return 301 https://$host$request_uri;
-    }
-  }
-
-  server {
-    server_name foo.example.com;
-    listen 443 ssl;
-    ssl_certificate     ${config.security.acme.directory}/foo.example.com/fullchain.pem;
-    ssl_certificate_key ${config.security.acme.directory}/foo.example.com/key.pem;
-    root /var/www/foo.example.com/;
-  }
-'';
+services.nginx = {
+  enable = true;
+  virtualHosts = {
+    "foo.example.com" = {
+      forceSSL = true;
+      enableACME = true;
+      locations."/" = {
+        root = "/var/www";
+      };
+    };
+  };
+}
 </programlisting>
 
-<para>Now Nginx will try to use the certificates that will be retrieved by ACME.
-  ACME needs Nginx (or any other webserver) to function and Nginx needs
-  the certificates to actually start. For this reason the ACME module
-  automatically generates self-signed certificates that will be used by Nginx to
-  start. After that Nginx is used by ACME to retrieve the actual ACME
-  certificates. <literal>security.acme.preliminarySelfsigned</literal> can be
-  used to control whether to generate the self-signed certificates.
-</para>
+<para>At the moment you still have to restart Nginx after the ACME
+certs arrive.</para>
 </section>
 </chapter>

From 071481ca7dbfbca2c567e6f0b7d202bfcd42837e Mon Sep 17 00:00:00 2001
From: pngwjpgh <pngwjpgh@users.noreply.github.com>
Date: Mon, 9 Jan 2017 06:41:06 +0100
Subject: [PATCH 0811/1310] debianutils: init at 4.8.1 (#21739)

---
 lib/licenses.nix                        |  6 ++++++
 pkgs/tools/misc/debianutils/default.nix | 28 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/misc/debianutils/default.nix

diff --git a/lib/licenses.nix b/lib/licenses.nix
index b62f4f0a5bb..e5784ce2202 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -449,6 +449,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Sleepycat License";
   };
 
+  smail = {
+    shortName = "smail";
+    fullName = "SMAIL General Public License";
+    url = http://metadata.ftp-master.debian.org/changelogs/main/d/debianutils/debianutils_4.8.1_copyright;
+  };
+
   tcltk = spdx {
     spdxId = "TCL";
     fullName = "TCL/TK License";
diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix
new file mode 100644
index 00000000000..e2253982788
--- /dev/null
+++ b/pkgs/tools/misc/debianutils/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+let
+  checksums = {
+    "4.8.1" = "09phylg8ih1crgxjadkdb8idbpj9ap62a7cbh8qdx2gyvh5mqf9c";
+  };
+in stdenv.mkDerivation rec {
+  version = "4.8.1";
+  name = "debianutils-${version}";
+
+  src = fetchurl {
+    url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz";
+    sha256 = checksums."${version}";
+  };
+
+  meta = {
+    description = "Miscellaneous utilities specific to Debian";
+    longDescription = ''
+       This package provides a number of small utilities which are used primarily by the installation scripts of Debian packages, although you may use them directly.
+
+       The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which 
+    '';
+    downloadPage = https://packages.debian.org/sid/debianutils;
+    license = with stdenv.lib.licenses; [ gpl2Plus publicDomain smail ];
+    maintainers = [];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e261d1bcfb5..8a81bdffac0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1369,6 +1369,8 @@ in
 
   dcfldd = callPackage ../tools/system/dcfldd { };
 
+  debianutils = callPackage ../tools/misc/debianutils { };
+
   debian-devscripts = callPackage ../tools/misc/debian-devscripts {
     inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry;
   };

From 5324a5dac75de0e78087a8ca84a44fc1111032c3 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 9 Jan 2017 06:42:15 +0100
Subject: [PATCH 0812/1310] clipster: 2016-09-12 -> 2016-12-08 (#21761)

---
 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 27df38c566b..711e601234d 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-09-12";
+  version = "2016-12-08";
 
   src = fetchFromGitHub {
     owner = "mrichar1";
     repo = "clipster";
-    rev = "6526a849a0af4c392f4e8e5b18aacdda9c1a8e80";
-    sha256 = "0illdajp5z50h7lvglv0p72cpv4c592xmpamrg8kkjpg693bp873";
+    rev = "7a3511d89dbbb4157118eec15f1e9e6fd0ad1a6b";
+    sha256 = "005akgk1wn3z5vxfjii202zzwz85zydimfgm69ml68imj5vbhkg1";
   };
 
   pythonEnv = python.withPackages(ps: with ps; [ dbus-python pygtk pygobject3 ]);

From 2bbbea7e8b88b44ade68134bbc01c3424a2239eb Mon Sep 17 00:00:00 2001
From: edanaher <github@edanaher.net>
Date: Mon, 9 Jan 2017 00:47:59 -0500
Subject: [PATCH 0813/1310] pidgin-osd: 0.1.0 -> 0.2.0 (#21655)

---
 .../pidgin-plugins/pidgin-osd/default.nix        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix
index 9c0f64d6574..ff065e7e2ce 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchurl, pidgin, xosd
+{ stdenv, fetchFromGitHub, pidgin, xosd
 , autoreconfHook } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-osd-0.1.0";
-  src = fetchurl {
-    url = https://github.com/mbroemme/pidgin-osd/archive/pidgin-osd-0.1.0.tar.gz;
-    sha256 = "11hqfifhxa9gijbnp9kq85k37hvr36spdd79cj9bkkvw4kyrdp3j";
+  name = "pidgin-osd-0.2.0";
+  src = fetchFromGitHub {
+    owner = "edanaher";
+    repo = "pidgin-osd";
+    rev = name;
+    sha256 = "07wa9anz99hnv6kffpcph3fbq8mjbyq17ij977ggwgw37zb9fzb5";
   };
 
-  makeFlags = "PIDGIN_LIBDIR=$(out)";
-
   # autoreconf is run such that it *really* wants all the files, and there's no
   # default ChangeLog.  So make it happy.
   preAutoreconf = "touch ChangeLog";
 
   postInstall = ''
     mkdir -p $out/lib/pidgin
-    ln -s $out/pidgin $out/lib/pidgin
+    mv $out/lib/pidgin-osd.{la,so} $out/lib/pidgin
   '';
 
   nativeBuildInputs = [ autoreconfHook ];

From 0970931e749cd368a2109be34bb38eef046db648 Mon Sep 17 00:00:00 2001
From: andjscott <andjscott@users.noreply.github.com>
Date: Mon, 9 Jan 2017 06:26:06 +0000
Subject: [PATCH 0814/1310] mmex: v1.2.7 -> v1.3.1 (#21755)

---
 pkgs/applications/office/mmex/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix
index 9e02377eaa5..2981a0f7f89 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/pkgs/applications/office/mmex/default.nix
@@ -2,7 +2,7 @@
 
 
 let
-  version = "1.2.7";
+  version = "1.3.1";
 in
   stdenv.mkDerivation {
     name = "money-manager-ex-${version}";
@@ -10,14 +10,9 @@ in
     src = fetchgit {
       url = "https://github.com/moneymanagerex/moneymanagerex.git";
       rev = "refs/tags/v${version}";
-      sha256 = "0d6jcsj3m3b9mj68vfwr7dn67dws11p0pdys3spyyiv1464vmywi";
+      sha256 = "1cmwmvlzg7r85qq23lbbmq2y91vhf9f5pblpja5ph98bsd218pc0";
     };
 
-    preConfigure = ''
-      export CFLAGS="-I`pwd`/include"
-      export CXXFLAGS="$CFLAGS"
-    '';
-
     buildInputs = [ sqlite wxGTK30 gettext ];
 
     meta = {

From f7173a9187ceb907a63b5e9a458c746ec055a3b3 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 9 Jan 2017 02:24:27 -0500
Subject: [PATCH 0815/1310] fastnlo: fix yoda interface

---
 pkgs/development/libraries/physics/fastnlo/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix
index 70368133706..307bf1b27db 100644
--- a/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost lhapdf root yoda ];
 
+  CXXFLAGS="-std=c++11"; # for yoda
+
+  configureFlags = [
+    "--with-yoda=${yoda}"
+  ];
+
   enableParallelBuilding = true;
 
   meta = {

From 14a35a55c792ae4d773fe18a2c69b2789bf763f3 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 9 Jan 2017 09:57:39 +0100
Subject: [PATCH 0816/1310] remmina: fix missing gsettings schemas

---
 pkgs/applications/networking/remote/remmina/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                         | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index fe097af9c75..ec31beb0080 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -4,14 +4,14 @@
 , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
 , libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core
-, openssl
+, openssl, gsettings_desktop_schemas
 # The themes here are soft dependencies; only icons are missing without them.
 , hicolor_icon_theme, adwaita-icon-theme
 }:
 
 let
   version = "1.2.0-rcgit.15";
-  
+
   desktopItem = makeDesktopItem {
     name = "remmina";
     desktopName = "Remmina";
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
     sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0";
   };
 
-  buildInputs = [ cmake pkgconfig wrapGAppsHook
+  buildInputs = [ cmake pkgconfig wrapGAppsHook gsettings_desktop_schemas
                   glib gtk3 gettext libxkbfile libgnome_keyring libX11
                   freerdp_git libssh libgcrypt gnutls
                   pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a81bdffac0..8a235806622 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3579,7 +3579,10 @@ in
 
   remind = callPackage ../tools/misc/remind { };
 
-  remmina = callPackage ../applications/networking/remote/remmina { adwaita-icon-theme = gnome3.adwaita-icon-theme; };
+  remmina = callPackage ../applications/networking/remote/remmina {
+    adwaita-icon-theme = gnome3.adwaita-icon-theme;
+    gsettings_desktop_schemas = gnome3.gsettings_desktop_schemas;
+  };
 
   renameutils = callPackage ../tools/misc/renameutils { };
 

From 67573c942e7b516d8d09ccf4f9eab51ae1c9b495 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 9 Jan 2017 18:02:10 +0900
Subject: [PATCH 0817/1310] inkscape: 0.91 -> 0.92

---
 .../graphics/inkscape/default.nix             | 47 +++----------------
 .../inkscape/deprecated-scopedptr.patch       | 16 -------
 2 files changed, 7 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 06b2fa63c7f..2f72d00bd15 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -2,45 +2,24 @@
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
 , gsl, python2, poppler, imagemagick, libwpg, librevenge
-, libvisio, libcdr, libexif, unzip, automake114x, autoconf
-, boxMakerPlugin ? false # boxmaker plugin
+, libvisio, libcdr, libexif, automake114x, cmake
 }:
 
 let 
   python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]);
-
-boxmaker = fetchurl {
-  # http://www.inkscapeforum.com/viewtopic.php?f=11&t=10403
-  url = "http://www.keppel.demon.co.uk/111000/files/BoxMaker0.91.zip";
-  sha256 = "5c5697f43dc3a95468f61f479cb50b7e2b93379a1729abf19e4040ac9f43a1a8";
-};
-
-stdcxx-patch = fetchpatch {
-  url = http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/diff/14542?context=3;
-  sha256 = "15h831lsh61ichgdygkdkbdm1dlb9mhprldq27hkx2472lcnyx6y";
-};
-
 in
 
 stdenv.mkDerivation rec {
-  name = "inkscape-0.91";
+  name = "inkscape-0.92.0";
 
   src = fetchurl {
-    url = "https://inkscape.global.ssl.fastly.net/media/resources/file/"
-        + "${name}.tar.bz2";
-    sha256 = "06ql3x732x2rlnanv0a8aharsnj91j5kplksg574090rks51z42d";
+    url = "https://inkscape.org/gallery/item/10552/${name}.tar.bz2";
+    sha256 = "0mmssxnxsvb3bpm7ck5pqvwyacrz1nkyacs571jx8j04l1cw3d5q";
   };
 
-  patches = [ ./deprecated-scopedptr.patch ];
-
   postPatch = ''
-    patch -i ${stdcxx-patch} -p 0
     patchShebangs share/extensions
-  ''
-  # Clang gets misdetected, so hardcode the right answer
-  + stdenv.lib.optionalString stdenv.cc.isClang ''
-    substituteInPlace src/ui/tool/node.h \
-      --replace "#if __cplusplus >= 201103L" "#if true"
+    patchShebangs fix-roff-punct
   '';
 
   # Python is used at run-time to execute scripts, e.g., those from
@@ -51,24 +30,12 @@ stdenv.mkDerivation rec {
     pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
     makeWrapper intltool gsl poppler imagemagick libwpg librevenge
-    libvisio libcdr libexif automake114x autoconf
-  ] ++ stdenv.lib.optional boxMakerPlugin unzip;
+    libvisio libcdr libexif automake114x cmake
+  ];
 
   enableParallelBuilding = true;
-  doCheck = true;
 
   postInstall = ''
-    ${if boxMakerPlugin then "
-      mkdir -p $out/share/inkscape/extensions/
-      # boxmaker packaged version 0.91 in a directory called 0.85 ?!??
-      unzip ${boxmaker};
-      cp boxmake-upd-0.85/* $out/share/inkscape/extensions/
-      rm -Rf boxmake-upd-0.85
-      "
-    else 
-      ""
-    }
-
     # Make sure PyXML modules can be found at run-time.
     rm "$out/share/icons/hicolor/icon-theme.cache"
   '';
diff --git a/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch b/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch
deleted file mode 100644
index 94ae901394f..00000000000
--- a/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-glibmm deprecated ScopedPtr
----
-diff -u src/ui/clipboard.cpp src/ui/clipboard.cpp
---- a/src/ui/clipboard.cpp	2015-01-28 04:32:28.162676000 +0100
-+++ b/src/ui/clipboard.cpp	2016-04-03 09:13:12.360980533 +0200
-@@ -1402,7 +1402,7 @@
- 
-         Glib::ustring target;
-         if (atom_name) {
--            target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
-+            target = Glib::make_unique_ptr_gfree(atom_name).get(); //This frees the gchar*.
-         }
- 
-         listTargets.push_back(target);
-
-Diff finished.  Sun Apr  3 09:13:51 2016

From 712e62c2608908cfda471cb8fe409ac65c4844e4 Mon Sep 17 00:00:00 2001
From: Sebastian Hagen <sh_github@memespace.net>
Date: Mon, 9 Jan 2017 09:32:23 +0000
Subject: [PATCH 0818/1310] nixos/stage2: Check for each special mount
 individually and mount missing ones. (#21370)

---
 nixos/modules/system/boot/stage-2-init.sh | 28 +++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index f827e530f87..7a54bb03e29 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -34,20 +34,24 @@ if [ -z "$container" ]; then
 fi
 
 
-# Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a
+# Likewise, stage 1 mounts /proc, /dev, /sys and /run, so if we don't have a
 # stage 1, we need to do that here.
-if [ ! -e /proc/1 ]; then
-    specialMount() {
-        local device="$1"
-        local mountPoint="$2"
-        local options="$3"
-        local fsType="$4"
+# We check for each mountpoint separately to avoid esoteric failure modes
+# if only a subset was mounted by whatever called us.
+specialMount() {
+    local device="$1"
+    local mountPoint="$2"
+    local options="$3"
+    local fsType="$4"
 
-        mkdir -m 0755 -p "$mountPoint"
-        mount -n -t "$fsType" -o "$options" "$device" "$mountPoint"
-    }
-    source @earlyMountScript@
-fi
+    if mountpoint -q "$mountpoint"; then
+        return 0
+    fi
+
+    mkdir -m 0755 -p "$mountPoint"
+    mount -n -t "$fsType" -o "$options" "$device" "$mountPoint"
+}
+source @earlyMountScript@
 
 
 echo "booting system configuration $systemConfig" > /dev/kmsg

From 5bc7ceecef4a4ace0f8308d3094c718b2f096355 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 9 Jan 2017 10:18:16 +0000
Subject: [PATCH 0819/1310] xfce.mousepad: use keyfile instead of gconf
 (#21747)

---
 pkgs/desktops/xfce/applications/mousepad.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix
index 26f01e253c0..475b48343a5 100644
--- a/pkgs/desktops/xfce/applications/mousepad.nix
+++ b/pkgs/desktops/xfce/applications/mousepad.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
       dconf
     ];
 
+  configureFlags = [ "--enable-keyfile-settings" ];
+
   preFixup = ''
     wrapProgram "$out/bin/mousepad" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" \

From 5b4906ab496dfe05428f7c5067c5397a3a9b4233 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 9 Jan 2017 13:06:04 +0100
Subject: [PATCH 0820/1310] nim: 0.15.2 -> 0.16.0

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

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index c3eaf705986..eed702f8512 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nim-${version}";
-  version = "0.15.2";
+  version = "0.16.0";
 
   src = fetchurl {
     url = "http://nim-lang.org/download/${name}.tar.xz";
-    sha256 = "12pyzjx7x4hclzrf3zf6r1qjlp60bzsaqrz0rax2rak2c8qz4pch";
+    sha256 = "0rsibhkc5n548bn9yyb9ycrdgaph5kq84sfxc9gabjs7pqirh6cy";
   };
 
   buildInputs  = [ makeWrapper ];

From 87e1c492989f1d1a48e74935cd3c2637e67364ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Mon, 9 Jan 2017 13:39:37 +0100
Subject: [PATCH 0821/1310] android-udev-rules: 20170106 -> 20170109

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

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index 1ef637fb8c4..926675f0163 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "android-udev-rules-${version}";
-  version = "20170106";
+  version = "20170109";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
     rev = version;
-    sha256 = "0icdvs7aivzw7xbvi31q10554g447pifjzswqiiyipi664bpcwv7";
+    sha256 = "1fxr6iyb70swmmp46xvx8iz9h6xj7x6q9yfdsl958zd63j8sjzjr";
   };
 
   installPhase = ''

From f1b8c3b1190fdf213b8944e8963d1623b432b9ac Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Mon, 9 Jan 2017 20:47:33 +0800
Subject: [PATCH 0822/1310] pulseaudio nixos module: use the units provided by
 upstream (#21633)

I have left in 2 NixOS custom config directives, so the configuration
should be the same with the only change in behaviour being that the
service is not eagerly loaded but in fact only socket activated, which
it should be.
---
 nixos/modules/config/pulseaudio.nix | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 06ce5200420..742167fbf69 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -212,6 +212,7 @@ in {
       # Allow PulseAudio to get realtime priority using rtkit.
       security.rtkit.enable = true;
 
+      systemd.packages = [ cfg.package ];
     })
 
     (mkIf hasZeroconf {
@@ -227,31 +228,14 @@ in {
         target = "pulse/default.pa";
         source = myConfigFile;
       };
-
       systemd.user = {
         services.pulseaudio = {
-          description = "PulseAudio Server";
-          # NixOS doesn't support "Also" so we bring it in manually
-          wantedBy = [ "default.target" ];
           serviceConfig = {
-            Type = "notify";
-            ExecStart = binaryNoDaemon;
-            Restart = "on-failure";
             RestartSec = "500ms";
           };
           environment = { DISPLAY = ":${toString config.services.xserver.display}"; };
           restartIfChanged = true;
         };
-
-        sockets.pulseaudio = {
-          description = "PulseAudio Socket";
-          wantedBy = [ "sockets.target" ];
-          socketConfig = {
-            Priority = 6;
-            Backlog = 5;
-            ListenStream = "%t/pulse/native";
-          };
-        };
       };
     })
 

From 39e8eaf8b6f985fcae5931bda39679d657fea1ed Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 26 Jul 2016 14:43:45 +0000
Subject: [PATCH 0823/1310] prometheus module: add nginxExporter

---
 nixos/modules/module-list.nix                 |  1 +
 .../monitoring/prometheus/nginx-exporter.nix  | 58 +++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/nginx-exporter.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2171809e51b..df482fbfcaf 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -308,6 +308,7 @@
   ./services/monitoring/munin.nix
   ./services/monitoring/nagios.nix
   ./services/monitoring/prometheus/default.nix
+  ./services/monitoring/prometheus/nginx-exporter.nix
   ./services/monitoring/prometheus/node-exporter.nix
   ./services/monitoring/prometheus/alertmanager.nix
   ./services/monitoring/riemann.nix
diff --git a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix
new file mode 100644
index 00000000000..923b6db7410
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix
@@ -0,0 +1,58 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.nginxExporter;
+in {
+  options = {
+    services.prometheus.nginxExporter = {
+      enable = mkEnableOption "prometheus nginx exporter";
+
+      port = mkOption {
+        type = types.int;
+        default = 9113;
+        description = ''
+          Port to listen on.
+        '';
+      };
+
+      listenAddress = mkOption {
+        type = types.string;
+        default = "0.0.0.0";
+        description = ''
+          Address to listen on.
+        '';
+      };
+
+      scrapeUri = mkOption {
+        type = types.string;
+        default = "http://localhost/nginx_status";
+        description = ''
+          Address to access the nginx status page.
+          Can be enabled with services.nginx.statusPage = true.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = [ cfg.port ];
+
+    systemd.services.prometheus-nginx-exporter = {
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" "nginx.service" ];
+      script = ''
+        ${pkgs.prometheus-nginx-exporter.bin}/bin/nginx_exporter \
+          -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \
+          -nginx.scrape_uri ${cfg.scrapeUri}
+      '';
+      serviceConfig = {
+        User = "nobody";
+        Restart  = "always";
+        PrivateTmp = true;
+        WorkingDirectory = /tmp;
+      };
+    };
+  };
+}

From 363fa27448aa78d5dee429eaab44dbd50e024ee3 Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Sat, 26 Nov 2016 19:56:25 -0800
Subject: [PATCH 0824/1310] promeutheus.nginxExporter: add improvements

 - use ExecStart and ExecReload
 - add extraFlags
---
 .../monitoring/prometheus/nginx-exporter.nix  | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix
index 923b6db7410..8aa0184e53a 100644
--- a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix
@@ -33,6 +33,14 @@ in {
           Can be enabled with services.nginx.statusPage = true.
         '';
       };
+
+      extraFlags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Extra commandline options when launching the nginx exporter.
+        '';
+      };
     };
   };
 
@@ -40,18 +48,22 @@ in {
     networking.firewall.allowedTCPPorts = [ cfg.port ];
 
     systemd.services.prometheus-nginx-exporter = {
-      wantedBy = [ "multi-user.target" ];
       after = [ "network.target" "nginx.service" ];
-      script = ''
-        ${pkgs.prometheus-nginx-exporter.bin}/bin/nginx_exporter \
-          -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \
-          -nginx.scrape_uri ${cfg.scrapeUri}
-      '';
+      description = "Prometheus exporter for nginx metrics";
+      unitConfig.Documentation = "https://github.com/discordianfish/nginx_exporter";
+      wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         User = "nobody";
         Restart  = "always";
         PrivateTmp = true;
         WorkingDirectory = /tmp;
+        ExecStart = ''
+          ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \
+            -nginx.scrape_uri '${cfg.scrapeUri}' \
+            -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \
+            ${concatStringsSep " \\\n  " cfg.extraFlags}
+        '';
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       };
     };
   };

From 51b247bff8012d123dd78c8fa7f2fc965a733c93 Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Sun, 27 Nov 2016 00:10:48 -0800
Subject: [PATCH 0825/1310] prometheus-varnish-exporter: init at 20161127.

Yeah, I know, it's a git snapshot. Sorry.
---
 .../prometheus/varnish-exporter.nix           | 26 ++++++++
 .../prometheus/varnish-exporter_deps.nix      | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 93 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/varnish-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix

diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
new file mode 100644
index 00000000000..456e6904296
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
@@ -0,0 +1,26 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchFromGitHub, lib }:
+
+buildGoPackage rec {
+  name = "prometheus_varnish_exporter-${version}";
+  version = "1.2";
+  rev = "0f0e3e2";
+
+  goPackagePath = "github.com/jonnenauha/prometheus_varnish_exporter";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "jonnenauha";
+    repo = "prometheus_varnish_exporter";
+    sha256 = "15vw3jqzm2nad81j14spib5v7q2jpibclzrnkd688003vkizlwyn";
+  };
+
+  goDeps = ./varnish-exporter_deps.nix;
+
+  meta = {
+    homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter";
+    description = "Varnish exporter for Prometheus";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ MostAwesomeDude ];
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix
new file mode 100644
index 00000000000..09a09be36e3
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix
@@ -0,0 +1,66 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
+      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "8ee79997227bf9b34611aee7946ae64735e6fd93";
+      sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "575f371f7862609249a1be4c9145f429fe065e32";
+      sha256 = "0hyvszjv5m6i40k2fn21c3bjr8jhlfdqavk1r6g2v5dybyj47vps";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
+      sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "0d5de9d6d8629cb8bee6d4674da4127cd8b615a3";
+      sha256 = "1zlvvgw67p66fz9nswkydq15j4a5z5kkiskl0jxps8i27ya1baq0";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5";
+      sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b040369896f..616a1f13466 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10530,6 +10530,7 @@ in
   prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { };
   prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
   prometheus-statsd-bridge = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { };
+  prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };
 
   psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
 

From 1b839a586bef5d9dbb30b85388c2977b86df4fe5 Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Sun, 27 Nov 2016 00:15:19 -0800
Subject: [PATCH 0826/1310] prometheus module: add varnishExporter

---
 nixos/modules/module-list.nix                 |  4 +-
 .../prometheus/varnish-exporter.nix           | 51 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/monitoring/prometheus/varnish-exporter.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index df482fbfcaf..db8c5219925 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -308,9 +308,11 @@
   ./services/monitoring/munin.nix
   ./services/monitoring/nagios.nix
   ./services/monitoring/prometheus/default.nix
+  ./services/monitoring/prometheus/alertmanager.nix
   ./services/monitoring/prometheus/nginx-exporter.nix
   ./services/monitoring/prometheus/node-exporter.nix
-  ./services/monitoring/prometheus/alertmanager.nix
+  ./services/monitoring/prometheus/snmp-exporter.nix
+  ./services/monitoring/prometheus/varnish-exporter.nix
   ./services/monitoring/riemann.nix
   ./services/monitoring/riemann-dash.nix
   ./services/monitoring/riemann-tools.nix
diff --git a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix
new file mode 100644
index 00000000000..0f608760e91
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix
@@ -0,0 +1,51 @@
+{ config, pkgs, lib, ... }:
+
+# Shamelessly cribbed from nginx-exporter.nix. ~ C.
+with lib;
+
+let
+  cfg = config.services.prometheus.varnishExporter;
+in {
+  options = {
+    services.prometheus.varnishExporter = {
+      enable = mkEnableOption "prometheus Varnish exporter";
+
+      port = mkOption {
+        type = types.int;
+        default = 9131;
+        description = ''
+          Port to listen on.
+        '';
+      };
+
+      extraFlags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Extra commandline options when launching the Varnish exporter.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.prometheus-varnish-exporter = {
+      description = "Prometheus exporter for Varnish metrics";
+      unitConfig.Documentation = "https://github.com/jonnenauha/prometheus_varnish_exporter";
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.varnish ];
+      script = ''
+        exec ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \
+          -web.listen-address :${toString cfg.port} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+      serviceConfig = {
+        User = "nobody";
+        Restart = "always";
+        PrivateTmp = true;
+        WorkingDirectory = /tmp;
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+      };
+    };
+  };
+}

From 1e5de5fc3c8a9e560c7d63d7752cb4d96f26093b Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Sun, 27 Nov 2016 11:26:33 -0800
Subject: [PATCH 0827/1310] prometheus-json-exporter: init at 20160913

---
 .../monitoring/prometheus/json-exporter.nix   |  25 ++++
 .../prometheus/json-exporter_deps.nix         | 111 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 3 files changed, 137 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/json-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/json-exporter_deps.nix

diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix
new file mode 100644
index 00000000000..465a85259f4
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix
@@ -0,0 +1,25 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchFromGitHub, lib }:
+
+buildGoPackage rec {
+  name = "prometheus-json-exporter-${version}";
+  version = "unstable-2016-09-13";
+  rev = "d45e5ebdb08cb734ad7a8683966032af1d91a76c";
+
+  goPackagePath = "github.com/kawamuray/prometheus-json-exporter";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "kawamuray";
+    repo = "prometheus-json-exporter";
+    sha256 = "0v3as7gakdqpsir97byknsrqxxxkq66hp23j4cscs45hsdb24pi9";
+  };
+
+  goDeps = ./json-exporter_deps.nix;
+
+  meta = {
+    description = "A prometheus exporter which scrapes remote JSON by JSONPath";
+    homepage = "https://github.com/kawamuray/prometheus-json-exporter";
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix
new file mode 100644
index 00000000000..9416125bc0c
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix
@@ -0,0 +1,111 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "github.com/Sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Sirupsen/logrus";
+      rev = "a437dfd2463eaedbec3dfe443e477d3b0a810b3f";
+      sha256 = "1904s2bbc7p88anzjp6fyj3jrbm5p6wbb8j4490674dq10kkcfbj";
+    };
+  }
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
+      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "8ee79997227bf9b34611aee7946ae64735e6fd93";
+      sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8";
+    };
+  }
+  {
+    goPackagePath = "github.com/kawamuray/jsonpath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kawamuray/jsonpath";
+      rev = "5c448ebf973557834ef870e788b0b2d95ac68d12";
+      sha256 = "1i1id1i85rf09rldp03h0ibyi6zg0fz9p9l5qj7i8dfs6h6y8f0a";
+    };
+  }
+  {
+    goPackagePath = "github.com/kawamuray/prometheus-exporter-harness";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kawamuray/prometheus-exporter-harness";
+      rev = "97eeea7b8b0619ea2a065d75c0f0f5909327afa6";
+      sha256 = "12al8irf8jb6p2xmm4wbh0wjqsyrdywynr4w122wxxnsx2n56xyv";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "575f371f7862609249a1be4c9145f429fe065e32";
+      sha256 = "0hyvszjv5m6i40k2fn21c3bjr8jhlfdqavk1r6g2v5dybyj47vps";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
+      sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "0d5de9d6d8629cb8bee6d4674da4127cd8b615a3";
+      sha256 = "1zlvvgw67p66fz9nswkydq15j4a5z5kkiskl0jxps8i27ya1baq0";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5";
+      sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws";
+    };
+  }
+  {
+    goPackagePath = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6";
+      sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
+    };
+  }
+  {
+    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 616a1f13466..46ab2193ac4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10523,6 +10523,7 @@ in
   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 { };
   prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };
   prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { };
   prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { };

From bd45d5fe8d2efbd81648122f890b9ee1e454f699 Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Sun, 25 Dec 2016 21:36:16 -0800
Subject: [PATCH 0828/1310] prometheus module: add jsonExporter

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

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index db8c5219925..dcba8a2a21d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -309,6 +309,7 @@
   ./services/monitoring/nagios.nix
   ./services/monitoring/prometheus/default.nix
   ./services/monitoring/prometheus/alertmanager.nix
+  ./services/monitoring/prometheus/json-exporter.nix
   ./services/monitoring/prometheus/nginx-exporter.nix
   ./services/monitoring/prometheus/node-exporter.nix
   ./services/monitoring/prometheus/snmp-exporter.nix
diff --git a/nixos/modules/services/monitoring/prometheus/json-exporter.nix b/nixos/modules/services/monitoring/prometheus/json-exporter.nix
new file mode 100644
index 00000000000..ff3a137a0cf
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/json-exporter.nix
@@ -0,0 +1,64 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.jsonExporter;
+in {
+  options = {
+    services.prometheus.jsonExporter = {
+      enable = mkEnableOption "prometheus JSON exporter";
+
+      url = mkOption {
+        type = types.str;
+        description = ''
+          URL to scrape JSON from.
+        '';
+      };
+
+      configFile = mkOption {
+        type = types.path;
+        description = ''
+          Path to configuration file.
+        '';
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 7979;
+        description = ''
+          Port to listen on.
+        '';
+      };
+
+      extraFlags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Extra commandline options when launching the JSON exporter.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.prometheus-json-exporter = {
+      description = "Prometheus exporter for JSON over HTTP";
+      unitConfig.Documentation = "https://github.com/kawamuray/prometheus-json-exporter";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        User = "nobody";
+        Restart = "always";
+        PrivateTmp = true;
+        WorkingDirectory = /tmp;
+        ExecStart = ''
+          ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \
+            --port ${toString cfg.port} \
+            ${cfg.url} ${cfg.configFile} \
+            ${concatStringsSep " \\\n  " cfg.extraFlags}
+        '';
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+      };
+    };
+  };
+}

From 618b249fc5b8b86423cc52da5a263bfeb5030e40 Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Sun, 8 Jan 2017 19:25:17 -0800
Subject: [PATCH 0829/1310] prometheus module: add blackboxExporter

---
 nixos/modules/module-list.nix                 |  1 +
 .../prometheus/blackbox-exporter.nix          | 57 +++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index dcba8a2a21d..576244e7601 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -309,6 +309,7 @@
   ./services/monitoring/nagios.nix
   ./services/monitoring/prometheus/default.nix
   ./services/monitoring/prometheus/alertmanager.nix
+  ./services/monitoring/prometheus/blackbox-exporter.nix
   ./services/monitoring/prometheus/json-exporter.nix
   ./services/monitoring/prometheus/nginx-exporter.nix
   ./services/monitoring/prometheus/node-exporter.nix
diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
new file mode 100644
index 00000000000..a1ecd6ef58c
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
@@ -0,0 +1,57 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.blackboxExporter;
+in {
+  options = {
+    services.prometheus.blackboxExporter = {
+      enable = mkEnableOption "prometheus blackbox exporter";
+
+      configFile = mkOption {
+        type = types.path;
+        description = ''
+          Path to configuration file.
+        '';
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 9115;
+        description = ''
+          Port to listen on.
+        '';
+      };
+
+      extraFlags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Extra commandline options when launching the blackbox exporter.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.prometheus-blackbox-exporter = {
+      description = "Prometheus exporter for blackbox probes";
+      unitConfig.Documentation = "https://github.com/prometheus/blackbox_exporter";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        User = "nobody";
+        Restart = "always";
+        PrivateTmp = true;
+        WorkingDirectory = /tmp;
+        ExecStart = ''
+          ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
+            -web.listen-address :${toString cfg.port} \
+            -config.file ${cfg.configFile} \
+            ${concatStringsSep " \\\n  " cfg.extraFlags}
+        '';
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+      };
+    };
+  };
+}

From 575afe3fa7b65e92afa4beab026af52d2d35e83b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 9 Jan 2017 15:29:35 +0100
Subject: [PATCH 0830/1310] prometheus exporter modules: unify firewall
 handling

---
 .../monitoring/prometheus/blackbox-exporter.nix        | 10 ++++++++++
 .../services/monitoring/prometheus/json-exporter.nix   | 10 ++++++++++
 .../services/monitoring/prometheus/nginx-exporter.nix  | 10 +++++++++-
 .../services/monitoring/prometheus/node-exporter.nix   | 10 ++++++++++
 .../monitoring/prometheus/varnish-exporter.nix         | 10 ++++++++++
 5 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
index a1ecd6ef58c..7a343299c31 100644
--- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
@@ -31,10 +31,20 @@ in {
           Extra commandline options when launching the blackbox exporter.
         '';
       };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open port in firewall for incoming connections.
+        '';
+      };
     };
   };
 
   config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
+
     systemd.services.prometheus-blackbox-exporter = {
       description = "Prometheus exporter for blackbox probes";
       unitConfig.Documentation = "https://github.com/prometheus/blackbox_exporter";
diff --git a/nixos/modules/services/monitoring/prometheus/json-exporter.nix b/nixos/modules/services/monitoring/prometheus/json-exporter.nix
index ff3a137a0cf..6bc56df9834 100644
--- a/nixos/modules/services/monitoring/prometheus/json-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/json-exporter.nix
@@ -38,10 +38,20 @@ in {
           Extra commandline options when launching the JSON exporter.
         '';
       };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open port in firewall for incoming connections.
+        '';
+      };
     };
   };
 
   config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
+
     systemd.services.prometheus-json-exporter = {
       description = "Prometheus exporter for JSON over HTTP";
       unitConfig.Documentation = "https://github.com/kawamuray/prometheus-json-exporter";
diff --git a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix
index 8aa0184e53a..1ccafee3b18 100644
--- a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix
@@ -41,11 +41,19 @@ in {
           Extra commandline options when launching the nginx exporter.
         '';
       };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open port in firewall for incoming connections.
+        '';
+      };
     };
   };
 
   config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = [ cfg.port ];
+    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
 
     systemd.services.prometheus-nginx-exporter = {
       after = [ "network.target" "nginx.service" ];
diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix
index 52dc14effc4..0cf0b85afb5 100644
--- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix
@@ -44,10 +44,20 @@ in {
           Extra commandline options when launching the node exporter.
         '';
       };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open port in firewall for incoming connections.
+        '';
+      };
     };
   };
 
   config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
+
     systemd.services.prometheus-node-exporter = {
       description = "Prometheus exporter for machine metrics";
       unitConfig.Documentation = "https://github.com/prometheus/node_exporter";
diff --git a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix
index 0f608760e91..143ebb62aea 100644
--- a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix
@@ -25,10 +25,20 @@ in {
           Extra commandline options when launching the Varnish exporter.
         '';
       };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open port in firewall for incoming connections.
+        '';
+      };
     };
   };
 
   config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
+
     systemd.services.prometheus-varnish-exporter = {
       description = "Prometheus exporter for Varnish metrics";
       unitConfig.Documentation = "https://github.com/jonnenauha/prometheus_varnish_exporter";

From d423567a9506f6ccfc09b137e6184280b92e37b6 Mon Sep 17 00:00:00 2001
From: oida <oida@users.noreply.github.com>
Date: Wed, 5 Oct 2016 16:37:31 +0200
Subject: [PATCH 0831/1310] prometheus-snmp-exporter: added nixos module

---
 .../monitoring/prometheus/snmp-exporter.nix   | 127 ++++++++++++++++++
 1 file changed, 127 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/snmp-exporter.nix

diff --git a/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix b/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix
new file mode 100644
index 00000000000..fe33f8c1f04
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix
@@ -0,0 +1,127 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.snmpExporter;
+  mkConfigFile = pkgs.writeText "snmp.yml" (if cfg.configurationPath == null then builtins.toJSON cfg.configuration else builtins.readFile cfg.configurationPath);
+in {
+  options = {
+    services.prometheus.snmpExporter = {
+      enable = mkEnableOption "Prometheus snmp exporter";
+
+      user = mkOption {
+        type = types.str;
+        default = "nobody";
+        description = ''
+          User name under which snmp exporter shall be run.
+        '';
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "nogroup";
+        description = ''
+          Group under which snmp exporter shall be run.
+        '';
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 9116;
+        description = ''
+          Port to listen on.
+        '';
+      };
+
+      listenAddress = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Address to listen on for web interface and telemetry.
+        '';
+      };
+
+      configurationPath = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = ''
+          Path to a snmp exporter configuration file. Mutually exclusive with 'configuration' option.
+        '';
+        example = "./snmp.yml";
+      };
+
+      configuration = mkOption {
+        type = types.nullOr types.attrs;
+        default = {};
+        description = ''
+          Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option.
+        '';
+        example = ''
+          {
+            "default" = {
+              "version" = 2;
+              "auth" = {
+                "community" = "public";
+              };
+            };
+          };
+        '';
+      };
+
+      logFormat = mkOption {
+        type = types.str;
+        default = "logger:stderr";
+        description = ''
+          Set the log target and format.
+        '';
+      };
+
+      logLevel = mkOption {
+        type = types.enum ["debug" "info" "warn" "error" "fatal"];
+        default = "info";
+        description = ''
+          Only log messages with the given severity or above.
+        '';
+      };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open port in firewall for incoming connections.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
+
+    assertions = singleton
+      {
+        assertion = (cfg.configurationPath == null) != (cfg.configuration == null);
+        message = "Please ensure you have either 'configuration' or 'configurationPath' set!";
+      };
+
+    systemd.services.prometheus-snmp-exporter = {
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      script = ''
+        ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \
+          -config.file ${mkConfigFile} \
+          -log.format ${cfg.logFormat} \
+          -log.level ${cfg.logLevel} \
+          -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port}
+      '';
+
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        Restart  = "always";
+        PrivateTmp = true;
+        WorkingDirectory = "/tmp";
+      };
+    };
+  };
+}

From 464c79ea9f929d1237dbc2df878eedad91767a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 9 Jan 2017 18:19:25 +0100
Subject: [PATCH 0832/1310] turtle_1_3_0: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8f207a000df..3c48be53141 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1142,4 +1142,8 @@ 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: {
+    optparse-applicative = self.optparse-applicative_0_13_0_0;
+  });
 }

From 605ec663428f351c04995e54b19026e556d9f6ea Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 9 Jan 2017 10:13:38 -0800
Subject: [PATCH 0833/1310] bundler: 1.13.6 -> 1.13.7

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

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 8f128001235..1b4fa285142 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "1.13.6";
-  sha256 = "1xyhy9cn8w9passp64p6hb3df2fpiqbds6rj7xha1335xpgj5zgs";
+  version = "1.13.7";
+  sha256 = "1avvvdzw0k5k2m5n79b96nkmdfd0sjamc676fz7asz4prz2wiw59";
   dontPatchShebangs = true;
 
   postFixup = ''

From 88908145ead927ecc8ae811f7d31bdef30b5dc0b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 9 Jan 2017 10:59:37 +0100
Subject: [PATCH 0834/1310] nixos installer: don't log refused packets to
 console

Fixes #19764.
---
 nixos/modules/installer/cd-dvd/iso-image.nix                | 2 --
 .../installer/cd-dvd/sd-image-armv7l-multiplatform.nix      | 1 -
 nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix     | 1 -
 nixos/modules/installer/netboot/netboot.nix                 | 2 --
 nixos/modules/profiles/installation-device.nix              | 6 ++++++
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index fea1c884953..93dba0d882b 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -232,8 +232,6 @@ in
     system.boot.loader.kernelFile = "bzImage";
     environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
 
-    boot.consoleLogLevel = mkDefault 7;
-
     # In stage 1 of the boot, mount the CD as the root FS by label so
     # that we don't need to know its device.  We pass the label of the
     # root filesystem on the kernel command line, rather than in
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index 80fb4707228..456ef7c9f54 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -27,7 +27,6 @@ in
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=tty0"];
-  boot.consoleLogLevel = 7;
 
   # FIXME: this probably should be in installation-device.nix
   users.extraUsers.root.initialHashedPassword = "";
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index dc196468139..e7163f10a3c 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -26,7 +26,6 @@ in
   boot.loader.generic-extlinux-compatible.enable = true;
 
   boot.kernelPackages = pkgs.linuxPackages_rpi;
-  boot.consoleLogLevel = 7;
 
   # FIXME: this probably should be in installation-device.nix
   users.extraUsers.root.initialHashedPassword = "";
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix
index 5908ff6cb94..0f6046339b3 100644
--- a/nixos/modules/installer/netboot/netboot.nix
+++ b/nixos/modules/installer/netboot/netboot.nix
@@ -30,8 +30,6 @@ with lib;
     system.boot.loader.kernelFile = "bzImage";
     environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
 
-    boot.consoleLogLevel = mkDefault 7;
-
     fileSystems."/" =
       { fsType = "tmpfs";
         options = [ "mode=0755" ];
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 93736ba256b..7949e600f86 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -70,5 +70,11 @@ with lib;
     # the initrd builder.
     system.extraDependencies = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ];
 
+    # Show all debug messages from the kernel but don't log refused packets
+    # because we have the firewall enabled. This makes installs from the
+    # console less cumbersome if the machine has a public IP.
+    boot.consoleLogLevel = mkDefault 7;
+    networking.firewall.logRefusedConnections = mkDefault false;
+
   };
 }

From de36c3b560f6c131c892f6de5c8e78c4920f4947 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 9 Jan 2017 19:51:09 +0100
Subject: [PATCH 0835/1310] xlockmore: 5.49 -> 5.50

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

diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index eb0209e3502..ceb0d0a6c44 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
 
-  name = "xlockmore-5.49";
+  name = "xlockmore-5.50";
   src = fetchurl {
     url = "http://sillycycle.com/xlock/${name}.tar.xz";
-    sha256 = "0n2pxm1qxg39h3qkqhbck312cmq7gbpj7hpv210y40kx9fj6biq3";
+    sha256 = "0a9sargn36b5lxil777p35z8m5jr744h9xmc021057aq8kgp4pv3";
     curlOpts = "--user-agent 'Mozilla/5.0'";
   };
 

From c82baee8aca9c7ca71392da195c1d90f9dea42f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 9 Jan 2017 20:23:27 +0100
Subject: [PATCH 0836/1310] sssd: fixup build after bind output changes #21685

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

diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index d50848af3dc..312ac0c281a 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgs, lib, glibc, augeas, bind, c-ares,
+{ stdenv, fetchurl, pkgs, lib, glibc, augeas, dnsutils, c-ares,
   cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, libnfsidmap, doxygen,
   python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap,
   pcre, kerberos, cifs_utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
   '';
 
   enableParallelBuilding = true;
-  buildInputs = [ augeas bind c-ares cyrus_sasl ding-libs libnl libunistring nss
+  buildInputs = [ augeas dnsutils c-ares cyrus_sasl ding-libs libnl libunistring nss
                   samba libnfsidmap doxygen python python3 popt
                   talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos
                   cifs_utils glib keyutils dbus fakeroot libxslt libxml2

From fc56c8c5cd61f04fea41c309f41eff88f4cc9ac3 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 9 Jan 2017 20:01:02 +0100
Subject: [PATCH 0837/1310] global: 6.5.5 -> 6.5.6

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

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index d609b3b664c..664b83b7e7c 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "global-${version}";
-  version = "6.5.5";
+  version = "6.5.6";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "0yyg91qw8399lnxfai4bxkh9yq71qdwp9kvadgzp05cdqni44nxw";
+    sha256 = "018m536k5y6lks1a6gqn3bsp7r8zk017znqj9kva1nm8d7x9lbqj";
   };
 
   nativeBuildInputs = [ libtool makeWrapper ];

From 15fe70d1a34bc3701b74a8488e22a82e61f7cb4b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 9 Jan 2017 20:02:28 +0100
Subject: [PATCH 0838/1310] entr: 3.5 -> 3.6

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

diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index 0cc30fe45e3..8ba92990b53 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "entr-${version}";
-  version = "3.5";
+  version = "3.6";
 
   src = fetchurl {
     url = "http://entrproject.org/code/${name}.tar.gz";
-    sha256 = "05k4jyjna0pr2dalwc1l1dhrcyk6pw7hbss7jl4ykwfadcs5br73";
+    sha256 = "1sy81np6kgmq04kfn2ckf4fp7jcf5d1963shgmapx3al3kc4c9x4";
   };
 
   postPatch = ''

From b35af136ef48cc9c091fea6c50f7f89c9a990ed9 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 9 Jan 2017 20:16:10 +0100
Subject: [PATCH 0839/1310] disorderfs: 0.4.2 -> 0.5.1

---
 pkgs/tools/filesystems/disorderfs/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix
index d36187aef29..ce44d7d6d4e 100644
--- a/pkgs/tools/filesystems/disorderfs/default.nix
+++ b/pkgs/tools/filesystems/disorderfs/default.nix
@@ -2,13 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "disorderfs-${version}";
-  version = "0.4.2";
+  version = "0.5.1";
 
   src = fetchurl {
     url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz";
-    sha256 = "1qr52lzynd5b5ancrn0g1ah95w7iikxgqsmixlacn2vlh8n9jym5";
+    sha256 = "0nnxk0qqww16ra52mi5giw50zpssvan62nkig5dcxvgcvv51akik";
   };
 
+  sourceRoot = ".";
+
   nativeBuildInputs = [ pkgconfig asciidoc ];
 
   buildInputs = [ fuse attr ];

From 7a8656407df674e9d840a74e0136aaba3b0e6eb1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 9 Jan 2017 20:48:09 +0100
Subject: [PATCH 0840/1310] pdf2djvu: 0.9.4 -> 0.9.5

and fix build that broke due to multiple outputs of djvulibre
---
 pkgs/tools/typesetting/pdf2djvu/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index 5f344628e37..2318a146f62 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -1,15 +1,21 @@
 { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.4";
+  version = "0.9.5";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
-    url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz";
-    sha256 = "1a1gwr6yzbiximbpgg4rc69dq8g3jmxwcbcwqk0fhfbgzj1j4w65";
+    url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz";
+    sha256 = "0fr8b44rsqll2m6qnh9id1lfc980k7rj3aq975mwba4y57rwnlnc";
   };
 
-  buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ djvulibre poppler fontconfig libjpeg ];
+
+  preConfigure = ''
+    sed -i 's#\$djvulibre_bin_path#${djvulibre.bin}/bin#g' configure
+  '';
 
   meta = with stdenv.lib; {
     description = "Creates djvu files from PDF files";

From 755c2929dd5742681c1db710c28168fa1755d63d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 9 Jan 2017 20:54:48 +0100
Subject: [PATCH 0841/1310] pdfpc: 4.0.4 -> 4.0.5

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

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 848b39eeb07..2f023412faf 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,17 +4,17 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "pdfpc";
-  version = "4.0.4";
+  version = "4.0.5";
 
   src = fetchFromGitHub {
     repo = "pdfpc";
     owner = "pdfpc";
     rev = "v${version}";
-    sha256 = "07wpf3gkgiq7dpgsrv7whk0pzm18cni4s53hd7zz40319jmlaf4q";
+    sha256 = "13spngkp0lq2qlw4mxsngx4ckr201axzn5ppjax0bhlckirvzr2s";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ gstreamer gst-plugins-base vala gtk3 libgee poppler
+  nativeBuildInputs = [ cmake pkgconfig vala ];
+  buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
     libpthreadstubs makeWrapper librsvg ];
 
   postInstall = ''

From ab0bb24973269a51aa0a58a1de4199d8b2eb04d8 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 9 Jan 2017 20:58:16 +0100
Subject: [PATCH 0842/1310] Revert "cairo: Add ApplicationServices as
 propagatedBuildInput"

This reverts commit 0f67005c4a2651ab0d9a48468a4873cff3551b8b.
---
 pkgs/development/libraries/cairo/default.nix   | 4 +---
 pkgs/development/libraries/librsvg/default.nix | 7 +++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 5b40f27674d..7df72bc0560 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
   ] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     CoreGraphics
     CoreText
+    ApplicationServices
     Carbon
   ]);
 
@@ -56,9 +57,6 @@ stdenv.mkDerivation rec {
     ++ optionals xcbSupport [ libxcb xcbutil ]
     ++ optional gobjectSupport glib
     ++ optional glSupport mesa_noglu
-    ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-      ApplicationServices
-    ])
     ; # TODO: maybe liblzo but what would it be for here?
 
   configureFlags = if stdenv.isDarwin then [
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 409307fb52b..ebd0f79cd47 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
-, bzip2, libcroco, libintlOrEmpty
+, bzip2, libcroco, libintlOrEmpty, darwin
 , withGTK ? false, gtk3 ? null
 , gobjectIntrospection ? null, enableIntrospection ? false }:
 
@@ -22,7 +22,10 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ]
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+      ApplicationServices
+    ]);
 
   configureFlags = [ "--enable-introspection=auto" ]
     ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";

From 4720ea4f35114059c6956627be8c9c714f30c8d6 Mon Sep 17 00:00:00 2001
From: Stefan Goetz <goetzst@hotmail.de>
Date: Mon, 9 Jan 2017 21:02:03 +0100
Subject: [PATCH 0843/1310] youtube-dl: 2017.01.02 -> 2017.01.08 (#21768)

---
 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 2bca4b165fe..8e1519ec189 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.02";
+  version = "2017.01.08";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "140de01ea879cdc50bc34240802d5c10231baf448d7a664e6efeb9d5efb74d5b";
+    sha256 = "ac2942d001003575858ff044dd1c1c264ab08527efa1af7036f773ea82b25fd6";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From a724f66b988c0ad4fb62e2ab586a03c723d76b1d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 9 Jan 2017 21:28:32 +0100
Subject: [PATCH 0844/1310] lirc: 0.9.3 -> 0.9.4

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

diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index a2e5d153060..960c8cc2494 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "lirc-0.9.3";
+  name = "lirc-0.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/lirc/${name}.tar.bz2";
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
 
   preBuild = "patchShebangs .";
 
-  buildInputs = [ alsaLib help2man pkgconfig xlibsWrapper python3 libxslt ];
+  nativeBuildInputs = [ pkgconfig help2man ];
+
+  buildInputs = [ alsaLib xlibsWrapper python3 libxslt ];
 
   configureFlags = [
     "--with-driver=devinput"

From 1738be8cd24e3554487cb1b97d934a2bf2829a12 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 9 Jan 2017 21:32:30 +0100
Subject: [PATCH 0845/1310] axel: 2.11 -> 2.12

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

diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix
index af5d8309507..8c23e11017c 100644
--- a/pkgs/tools/networking/axel/default.nix
+++ b/pkgs/tools/networking/axel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "axel-${version}";
-  version = "2.11";
+  version = "2.12";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz";
-    sha256 = "05askz9pi8kvjyn66rszjfg9arwdzl72jwd38q9h9n5s37vqslky";
+    sha256 = "12sa5whd5mjn1idd83hbhm0rmsh5bvhhgvv03fk5cgxynwkbprr8";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 655db9b266c5b520f48f6288d2d01900568210c8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 9 Jan 2017 21:36:36 +0100
Subject: [PATCH 0846/1310] ceptre: 2016-01-01 -> 2016-11-27

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

diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix
index 1f25a2031f2..29d63f1d004 100644
--- a/pkgs/development/interpreters/ceptre/default.nix
+++ b/pkgs/development/interpreters/ceptre/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, mlton }:
 
 stdenv.mkDerivation rec {
-  name = "ceptre-2016-01-01";
+  name = "ceptre-2016-11-27";
 
   src = fetchgit {
     url = https://github.com/chrisamaphone/interactive-lp;
-    rev = "b3d21489d4994f03d2982de273eea90bc7fba5d0";
-    sha256 = "1qpyasr3jg4i2x547yq1dzksvjagvnrmkdd00s108wvw9npc2jj1";
+    rev = "e436fda2ccd44e9c9d226feced9d204311deacf5";
+    sha256 = "174pxfnw3qyn2w8qxmx45fa68iddf106mkfi0kcmyqxzsc9jprh8";
   };
 
   nativeBuildInputs = [ mlton ];

From 18c0b54981947b62bafaa4ab0921bc137ea1d4a0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 9 Jan 2017 22:08:30 +0100
Subject: [PATCH 0847/1310] linuxConsoleTools: 1.4.9 -> 1.6.0

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

diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix
index b9f1ee90fe9..1064f628c10 100644
--- a/pkgs/os-specific/linux/consoletools/default.nix
+++ b/pkgs/os-specific/linux/consoletools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "linuxconsoletools-${version}";
-  version = "1.4.9";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2";
-    sha256 = "0rwv2fxn12bblp096m9jy1lhngz26lv6g6zs4cgfg4frikwn977s";
+    sha256 = "0il1m8pgw8f6b8qid035ixamv0w5fgh9pinx5vw4ayxn03nyzlnf";
   };
 
   buildInputs = [ SDL ];

From 8422cef099b61ea952b84edb4500481a70db0661 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 10 Jan 2017 01:06:37 +0300
Subject: [PATCH 0848/1310] kdeWrapper: postpone /share linking till final
 buildEnv

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

diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
index 9ab6f7a1089..a1f289f5f2b 100644
--- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
+++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
@@ -61,13 +61,9 @@ stdenv.mkDerivation {
         fi
     done
 
-    ln -s "$env/share" "$out"
-
+    mkdir -p "$out/nix-support"
     for drv in $unwrapped; do
-        if [ -a "$drv/nix-support/propagated-user-env-packages" ]; then
-            mkdir -p "$out/nix-support"
-            cat "$drv/nix-support/propagated-user-env-packages" >> "$out/nix-support/propagated-user-env-packages"
-        fi
+        echo "$drv" >> "$out/nix-support/propagated-user-env-packages"
     done
   '';
 }

From 5d2723945e35d4cb5128aa4c4256c788a732c5a6 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 9 Jan 2017 21:07:39 +0100
Subject: [PATCH 0849/1310] perl-mod_perl2: use cpan mirror

Also add license field.
---
 pkgs/top-level/perl-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b8c5e637870..d9d4234bb1f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8443,7 +8443,7 @@ let self = _self // overrides; _self = with self; {
   mod_perl2 = buildPerlPackage {
     name = "mod_perl-2.0.9";
     src = fetchurl {
-      url = http://apache.mirror.iphh.net/perl/mod_perl-2.0.9.tar.gz;
+      url = mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.9.tar.gz;
       sha256 = "0azmir4hbb825mfmcxwa1frhnhhf82rl8xf6mmgwkhbinxmg4q02";
     };
     makeMakerFlags = "MP_AP_DESTDIR=$out";
@@ -8451,6 +8451,7 @@ let self = _self // overrides; _self = with self; {
     doCheck = false; # would try to start Apache HTTP server
     meta = {
       description = "Embed a Perl interpreter in the Apache HTTP server";
+      license = stdenv.lib.licenses.asl20;
     };
   };
   Mojolicious = buildPerlPackage rec {

From 5bf06ac7109f58fe7d66149b3fb0b8fc79e4236c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 9 Jan 2017 22:58:31 +0100
Subject: [PATCH 0850/1310] eclipse-plugin-checkstyle: 7.2.0 -> 7.3.0

---
 pkgs/applications/editors/eclipse/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 1ad97a0f764..68859a7ac41 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -171,12 +171,12 @@ rec {
 
   checkstyle = buildEclipseUpdateSite rec {
     name = "checkstyle-${version}";
-    version = "7.2.0.201611082205";
+    version = "7.3.0.201612142232";
 
     src = fetchzip {
       stripRoot = false;
-      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.2.0/net.sf.eclipsecs-updatesite_${version}.zip";
-      sha256 = "1zngyrh5ckgli0xxm52vm6mzbbvrjslwqcymggfqjhzplpcgwqk1";
+      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.3.0/net.sf.eclipsecs-updatesite_${version}.zip";
+      sha256 = "1mbiszwnakfmjx5mnh9h2rrp9jzizkmz89p8z4spq2m9kwy1lkqj";
     };
 
     meta = with stdenv.lib; {

From b0106b66fd1d898b4322d1851c3dbe090d74ae2a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 9 Jan 2017 22:58:57 +0100
Subject: [PATCH 0851/1310] perl-Net-HTTP: 6.09 -> 6.12

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d9d4234bb1f..112665811c6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9556,17 +9556,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  NetHTTP = buildPerlPackage {
-    name = "Net-HTTP-6.09";
+  NetHTTP = buildPerlPackage rec {
+    name = "Net-HTTP-6.12";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/Net-HTTP-6.09.tar.gz;
-      sha256 = "52762b939d84806908ba544581c5708375f7938c3c0e496c128ca3fbc425e58d";
+      url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz";
+      sha256 = "8565aff76b3d09084642f3a83c654fb4ced8220e8e19d35c78b661519b4c1be6";
     };
     propagatedBuildInputs = [ URI ];
     meta = {
+      homepage = https://github.com/libwww-perl/Net-HTTP;
       description = "Low-level HTTP connection (client)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 

From 41b69a09b68af24c9d554c6eb6cdad491baf962c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 10 Jan 2017 01:28:11 +0300
Subject: [PATCH 0852/1310] spidermonkey_{31,38}: fix sed problem with build

---
 pkgs/development/interpreters/spidermonkey/31.nix | 5 +++--
 pkgs/development/interpreters/spidermonkey/38.nix | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/31.nix b/pkgs/development/interpreters/spidermonkey/31.nix
index 585ebc120d8..ae3e742e2ef 100644
--- a/pkgs/development/interpreters/spidermonkey/31.nix
+++ b/pkgs/development/interpreters/spidermonkey/31.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, nspr, icu, readline }:
+{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, nspr, icu, readline }:
 
 stdenv.mkDerivation rec {
   version = "31.5.0";
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd";
   };
 
-  buildInputs = [ pkgconfig perl python2 zip libffi readline nspr icu ];
+  buildInputs = [ libffi readline nspr icu ];
+  nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix
index 89c02f26200..b4823817d4b 100644
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, python2, zip, libffi, readline, icu, zlib, nspr }:
+{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, nspr }:
 
 stdenv.mkDerivation rec {
   version = "38.2.1.rc0";
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681";
   };
 
-  buildInputs = [ pkgconfig perl python2 zip libffi readline icu zlib nspr ];
+  buildInputs = [ libffi readline icu zlib nspr ];
+  nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 

From 9112410f650a37caeeb8ad666db0c8db18c3cb67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@klandest.in>
Date: Wed, 4 Jan 2017 12:44:58 +0100
Subject: [PATCH 0853/1310] subsurface: rev update for 4.5.97
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Güntner <code@klandest.in>
---
 pkgs/applications/misc/subsurface/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index a1b03f48b22..a18a06f1b87 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
   name = "subsurface-${version}";
 
   src = fetchgit {
-    sha256 = "0mbf8m5sbimbyvlh65sjlydrycr4ssfyfzdlqyl0wcpzw7h0qfp8";
+    sha256 = "035ywhicadmr9sh7zhfxsvpchwa9sywccacbspfam39n2hpyqnmm";
     url = "git://git.subsurface-divelog.org/subsurface";
-    rev = "5f15ad5a86ada3c5e574041a5f9d85235322dabb";
+    rev = "72bcb6481f3b935444d7868a74599dda133f9b43";
     branchName = "master";
   };
 

From a93416bffa4b949c8bd71999602963b9debd4f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@klandest.in>
Date: Mon, 9 Jan 2017 03:17:03 +0100
Subject: [PATCH 0854/1310] pythonPackages.ipfsapi: init at 0.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Güntner <code@klandest.in>
---
 pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 687889f0b14..382b83d9ee7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7719,6 +7719,27 @@ in {
     };
   };
 
+  ipfsapi = buildPythonPackage rec {
+    name = "ipfsapi-${version}";
+    version = "0.4.0";
+    disabled = isPy26 || isPy27;
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/i/ipfsapi/${name}.tar.gz";
+      sha256 = "0mqqsihannxzaqi8zcj9nca7fxwg1c85bp7xxic3xqa5zslcdcc3";
+    };
+
+    buildInputs = with self; [ pkgs.pandoc ];
+    propagatedBuildInputs = with self; [ six requests2 ];
+
+    meta = {
+      description = "A python client library for the IPFS API";
+      license = licenses.mit;
+      maintainers = with maintainers; [ mguentner ];
+      homepage = "https://pypi.python.org/pypi/ipfsapi";
+    };
+  };
+
   itsdangerous = buildPythonPackage rec {
     name = "itsdangerous-0.24";
 

From ae7511013bd4c9a3d1c958d5d4b42918c92f8fe5 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Mon, 9 Jan 2017 18:41:53 -0600
Subject: [PATCH 0855/1310] jid: 0.6.1 -> 0.7.1

---
 pkgs/development/tools/jid/default.nix |  6 ++--
 pkgs/development/tools/jid/deps.nix    | 40 ++++++++++++++++++++++++--
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix
index e77921c5437..9c52ac61551 100644
--- a/pkgs/development/tools/jid/default.nix
+++ b/pkgs/development/tools/jid/default.nix
@@ -3,8 +3,8 @@
 
 buildGoPackage rec {
   name = "jid-${version}";
-  version = "0.6.1";
-  rev = "0.6.1";
+  version = "0.7.1";
+  rev = "${version}";
 
   goPackagePath = "github.com/simeji/jid";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "simeji";
     repo = "jid";
     inherit rev;
-    sha256 = "0hnda2nqgirwbqbzq38kbl83cr0kn7hxsh4wim4fwwla0hs2nwjg";
+    sha256 = "08snlqqch91w88zysfcavmqsafq93zzpkdjqkq1y7hx516fdaz1w";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/jid/deps.nix b/pkgs/development/tools/jid/deps.nix
index 4bc32247c08..c3ec502b2a9 100644
--- a/pkgs/development/tools/jid/deps.nix
+++ b/pkgs/development/tools/jid/deps.nix
@@ -9,6 +9,33 @@
       sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj";
     };
   }
+  {
+    goPackagePath = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev = "e8e01ee22a7d4a91b49646e39245fe08e69c7878";
+      sha256 = "1660g29qhshk6zxhpnc0f52m69jdqqdw2ccbkqw9y4kilnripfvl";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev = "d228849504861217f796da67fae4f6e347643f15";
+      sha256 = "0ch5sfcpmqczsh8kjbwpzdw31lacbkfyzvpzh4disnhhydbxjq0d";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "30a891c33c7cde7b02a981314b4228ec99380cca";
+      sha256 = "03gsxn89pgkj4jkxm9avnj4f0ckvcskc6fj2lcd98l3akrz50ndg";
+    };
+  }
   {
     goPackagePath = "github.com/mattn/go-runewidth";
     fetch = {
@@ -23,8 +50,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/nsf/termbox-go";
-      rev = "0b413bfa31e8c6843db20dce4454566b1951709e";
-      sha256 = "1n45cq3p7z5533bmsqj3a0xvp7c8ncb52k3l8zqvd37f34zpsyxb";
+      rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8";
+      sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv";
+    };
+  }
+  {
+    goPackagePath = "github.com/nwidger/jsoncolor";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nwidger/jsoncolor";
+      rev = "0192e84d44af834c3a90c8a17bf670483b91ad5a";
+      sha256 = "17mndgd1d233c22bd19xv4v2l2i5k8kz7y6n4n54a9i7fi9d10al";
     };
   }
   {

From a0e5cbbd6a1292c3d23a2188465ce05314b99642 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Mon, 9 Jan 2017 19:10:18 -0600
Subject: [PATCH 0856/1310] hub: 2.2.8 -> 2.2.9

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

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 98999e93db7..5c70b2cb205 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "hub-${version}";
-  version = "2.2.8";
+  version = "2.2.9";
 
   src = fetchgit {
     url = https://github.com/github/hub.git;
     rev = "refs/tags/v${version}";
-    sha256 = "1fv4jb9vsbkscnb79gss2mwnd1yf9jhgzw1mhimhx25xizbx1fck";
+    sha256 = "195ckp1idz2azv0mm1q258yjz2n51sia9xdcjnqlprmq9aig5ldh";
   };
 
 

From eae2a12ebb36d934660f97eaf5b75caf58cae3a4 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 9 Jan 2017 20:58:04 -0500
Subject: [PATCH 0857/1310] insync: add a note about trial and costing money

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

diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
index a0b727a97f8..86cc9bded10 100644
--- a/pkgs/applications/networking/insync/default.nix
+++ b/pkgs/applications/networking/insync/default.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
      computer.  It has more advanced features than Google's official client
      such as multiple account support, Google Doc conversion, symlink support,
      and built in sharing.
+
+     There is a 15-day free trial, and it is a paid application after that.
     '';
   };
 }

From 4e513cbc9fbc0fc0ead6f8f897fcc73d544a62be Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Wed, 28 Dec 2016 20:28:35 +0800
Subject: [PATCH 0858/1310] android-studio: no need for jdk anymore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Android Studio now bundles its own JDK ¯\_(ツ)_/¯
---
 pkgs/applications/editors/android-studio/default.nix |  2 --
 pkgs/top-level/all-packages.nix                      | 11 -----------
 2 files changed, 13 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 2e14ae339cf..eb2d27c6139 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -9,7 +9,6 @@
 , gnugrep
 , gnutar
 , gzip
-, jdk
 , fontconfig
 , freetype
 , libpulseaudio
@@ -50,7 +49,6 @@ let
         coreutils
         findutils
         gnugrep
-        jdk
         which
 
         # For Android emulator
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52e4194fab1..0f2f9186562 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12322,17 +12322,6 @@ in
 
   amsn = callPackage ../applications/networking/instant-messengers/amsn { };
 
-  # Oracle JDK is recommended upstream, but unfree and requires a manual
-  # download. OpenJDK is straightforward, but may suffer from compatibility
-  # problems e.g. https://code.google.com/p/android/issues/detail?id=174496.
-  # To use Oracle JDK add an override to ~/.nixpkgs/config.nix:
-  # {
-  #   packageOverrides = pkgs: {
-  #     android-studio = pkgs.android-studio.override {
-  #       jdk = pkgs.oraclejdk8;
-  #     };
-  #   };
-  # }
   android-studio = callPackage ../applications/editors/android-studio {
       inherit (xorg) libX11 libXext libXi libXrandr libXrender libXtst;
   };

From 1f67c179acb8b2d9b711d38b4ddd2103f386589f Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Wed, 28 Dec 2016 20:31:19 +0800
Subject: [PATCH 0859/1310] android-studio: rearrange dependencies

---
 .../editors/android-studio/default.nix            | 15 +++++++++------
 pkgs/top-level/all-packages.nix                   |  1 -
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index eb2d27c6139..ac8140a845c 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -65,6 +65,15 @@ let
         git
 
       ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
+
+        # Crash at startup without these
+        fontconfig
+        freetype
+        libXext
+        libXi
+        libXrender
+        libXtst
+
         # Gradle wants libstdc++.so.6
         stdenv.cc.cc.lib
         # mksdcard wants 32 bit libstdc++.so.6
@@ -79,12 +88,6 @@ let
         # For Android emulator
         libpulseaudio
         libX11
-        libXext
-        libXrender
-        libXtst
-        libXi
-        freetype
-        fontconfig
       ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
     '';
     src = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f2f9186562..7c4039c374f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12323,7 +12323,6 @@ in
   amsn = callPackage ../applications/networking/instant-messengers/amsn { };
 
   android-studio = callPackage ../applications/editors/android-studio {
-      inherit (xorg) libX11 libXext libXi libXrandr libXrender libXtst;
   };
 
   antimony = qt5.callPackage ../applications/graphics/antimony {};

From d849f00af52c0cebe8d09e026d9871b9a2a175ca Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Wed, 28 Dec 2016 20:34:50 +0800
Subject: [PATCH 0860/1310] android-studio: reindent wrapProgram parameters

---
 .../editors/android-studio/default.nix        | 78 ++++++++++---------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index ac8140a845c..abb93d745a6 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -43,52 +43,56 @@ let
     ];
     installPhase = ''
       cp -r . $out
-      wrapProgram $out/bin/studio.sh --set PATH "${stdenv.lib.makeBinPath [
+      wrapProgram $out/bin/studio.sh \
+        --set PATH "${stdenv.lib.makeBinPath [
 
-        # Checked in studio.sh
-        coreutils
-        findutils
-        gnugrep
-        which
+          # Checked in studio.sh
+          coreutils
+          findutils
+          gnugrep
+          which
 
-        # For Android emulator
-        file
-        glxinfo
-        pciutils
-        setxkbmap
+          # For Android emulator
+          file
+          glxinfo
+          pciutils
+          setxkbmap
 
-        # Used during setup wizard
-        gnutar
-        gzip
+          # Used during setup wizard
+          gnutar
+          gzip
 
-        # Runtime stuff
-        git
+          # Runtime stuff
+          git
 
-      ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
+        ]}" \
+        --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
 
-        # Crash at startup without these
-        fontconfig
-        freetype
-        libXext
-        libXi
-        libXrender
-        libXtst
+          # Crash at startup without these
+          fontconfig
+          freetype
+          libXext
+          libXi
+          libXrender
+          libXtst
 
-        # Gradle wants libstdc++.so.6
-        stdenv.cc.cc.lib
-        # mksdcard wants 32 bit libstdc++.so.6
-        pkgsi686Linux.stdenv.cc.cc.lib
+          # Gradle wants libstdc++.so.6
+          stdenv.cc.cc.lib
+          # mksdcard wants 32 bit libstdc++.so.6
+          pkgsi686Linux.stdenv.cc.cc.lib
 
-        # aapt wants libz.so.1
-        zlib
-        pkgsi686Linux.zlib
-        # Support multiple monitors
-        libXrandr
+          # aapt wants libz.so.1
+          zlib
+          pkgsi686Linux.zlib
+          # Support multiple monitors
+          libXrandr
 
-        # For Android emulator
-        libpulseaudio
-        libX11
-      ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
+          # For Android emulator
+          libpulseaudio
+          libX11
+
+        ]}" \
+        --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
     '';
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";

From 4b3f79b3ca0f1aa771c5838c030f72bdd159d343 Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Wed, 28 Dec 2016 20:37:03 +0800
Subject: [PATCH 0861/1310] android-studio: use a dedicated fontconfig file

---
 pkgs/applications/editors/android-studio/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                      | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index abb93d745a6..28b6b2b85ad 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -28,6 +28,7 @@
 , writeTextFile
 , xkeyboard_config
 , zlib
+, fontsConf
 }:
 
 let
@@ -92,7 +93,8 @@ let
           libX11
 
         ]}" \
-        --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
+        --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
+        --set FONTCONFIG_FILE ${fontsConf}
     '';
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c4039c374f..a63f419b3e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12323,6 +12323,9 @@ in
   amsn = callPackage ../applications/networking/instant-messengers/amsn { };
 
   android-studio = callPackage ../applications/editors/android-studio {
+    fontsConf = makeFontsConf {
+      fontDirectories = [];
+    };
   };
 
   antimony = qt5.callPackage ../applications/graphics/antimony {};

From 4c43937af0e05e969ed5c8c63338432158c85058 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 10 Jan 2017 07:34:07 +0100
Subject: [PATCH 0862/1310] linux: 4.4.40 -> 4.4.41

---
 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 649cf013591..f3eceb5fe26 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.40";
+  version = "4.4.41";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1qd431bk3q9xcvnlw4fvcsw4l8k44s14nwdkq4y3kmrywzb5xg64";
+    sha256 = "1z26frg7sx5n9bvkpg9pfspwhxxvlnnfnrnjr7aqhcgsbxzq8vca";
   };
 
   kernelPatches = args.kernelPatches;

From 3b1782318785835da442a570fc43aa8b5ebed599 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 10 Jan 2017 07:34:22 +0100
Subject: [PATCH 0863/1310] linux: 4.8.16 -> 4.8.17

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix
index 8a71a771c4f..a5ce23ee3e4 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.8.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;

From 6b01b229c2181ef268081a7fb5d66b44162e008c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 10 Jan 2017 07:34:39 +0100
Subject: [PATCH 0864/1310] linux: 4.9.1 -> 4.9.2

---
 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 25e9eac0365..29f0eba7175 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.1";
+  version = "4.9.2";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "06jlfdmfgmhj80q1q9pglkjygjc1s1b5fslhf5bzkicsw4r2369j";
+    sha256 = "0f2p12pkzgrh9k5c7g2wwjnv6gzqha8bgd7b0qgbzq3ss7nrmnld";
   };
 
   kernelPatches = args.kernelPatches;

From 883f44936da0d9e87b2c02db06cb14da334f3ce5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 10 Jan 2017 07:34:55 +0100
Subject: [PATCH 0865/1310] beets: 1.4.1 -> 1.4.3

---
 pkgs/tools/audio/beets/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 60cfe4a2814..48d42e6533a 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -56,12 +56,12 @@ let
   };
 
   pluginsWithoutDeps = [
-    "beatport" "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart"
-    "export" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "hook" "ihate"
-    "importadded" "importfeeds" "info" "inline" "ipfs" "lyrics"
-    "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "permissions" "play"
-    "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the"
-    "types" "zero"
+    "absubmit" "beatport" "bench" "bpd" "bpm" "bucket" "cue" "duplicates"
+    "edit" "embedart" "export" "filefilter" "freedesktop" "fromfilename"
+    "ftintitle" "fuzzy" "hook" "ihate" "importadded" "importfeeds" "info"
+    "inline" "ipfs" "lyrics" "mbcollection" "mbsubmit" "mbsync" "metasync"
+    "missing" "permissions" "play" "plexupdate" "random" "rewrite" "scrub"
+    "smartplaylist" "spotify" "the" "types" "zero"
   ];
 
   enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
@@ -74,13 +74,13 @@ let
 
 in pythonPackages.buildPythonApplication rec {
   name = "beets-${version}";
-  version = "1.4.1";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "beetbox";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "1yj2m7l157lldhxanwifp3yv1c6k649iwhn061mcf26q4n8qmspk";
+    sha256 = "0sh2ap7jbqh7p8h63kgrx1ja9lyqlxjpfnh6axxw9p1mh78cgc1v";
   };
 
   propagatedBuildInputs = [

From 16f4b10bba22418ec433bd79a705d66c5ac062d2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 10 Jan 2017 15:27:30 +0800
Subject: [PATCH 0866/1310] terragrunt: init at 0.8.0

---
 .../networking/cluster/terragrunt/default.nix | 32 +++++++++
 .../networking/cluster/terragrunt/deps.nix    | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 100 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/terragrunt/default.nix
 create mode 100644 pkgs/applications/networking/cluster/terragrunt/deps.nix

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
new file mode 100644
index 00000000000..e4a267ec1b5
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
+
+buildGoPackage rec {
+  name = "terragrunt-${version}";
+  version = "0.8.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/gruntwork-io/terragrunt";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "gruntwork-io";
+    repo   = "terragrunt";
+    sha256 = "1d035p2r6d8c1crxvpi5ayb9jx6f2pdgzw2197zhllavyi8n8dw1";
+  };
+
+  goDeps = ./deps.nix;
+
+  buildInputs = [ makeWrapper terraform ];
+
+  postInstall = ''
+    wrapProgram $bin/bin/terragrunt \
+      --suffix PATH : ${lib.makeBinPath [ terraform ]}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices.";
+    homepage = https://github.com/gruntwork-io/terragrunt/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
new file mode 100644
index 00000000000..ba1ac2b6a1e
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -0,0 +1,66 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev = "8649d278323ebf6bd20c9cd56ecb152b1c617375";
+      sha256 = "0m2nxdlvi90vw68ds9qby291skc5d0dgqi3pkalr8ma3kd9r9khv";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-errors/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-errors/errors";
+      rev = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105";
+      sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "eb6f65b2d77ed5078887f960ff570fbddbbeb49d";
+      sha256 = "1wx6hpxmq5sby54025j9hliz10gv5v0bq6q1z2cd0asznj154ij1";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-zglob";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-zglob";
+      rev = "0b24567ec079616e9897f635f542e3bf56abb3d0";
+      sha256 = "0380dqsy0qdjranl5qfmmcr6a4g7sw4z26g1bld9y1s66madl03l";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "bfdb1a85537d60bc7e954e600c250219ea497417";
+      sha256 = "141kkh801jyp1r6hba14krydqg1iivp13j12is70j0g05z9fbji8";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "2402e8e7a02fc811447d11f881aa9746cdc57983";
+      sha256 = "01qaz781cvrv3h1428xqq8knf5ahdcj93m5k9dnivg2hcrlnqibj";
+    };
+  }
+  {
+    goPackagePath = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev = "8ef3805c9de2519805c3f060524b695bba2cd715";
+      sha256 = "0680rd87skmz8p8s3cwy55siz4bgjls314agfi03d7640gz7mp24";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52e4194fab1..659eeade5bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17674,6 +17674,8 @@ in
 
   terraform = callPackage ../applications/networking/cluster/terraform {};
 
+  terragrunt = callPackage ../applications/networking/cluster/terragrunt {};
+
   tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
 
   tewi-font = callPackage ../data/fonts/tewi  {};

From 3aca77a7f24f8c4e11dc4ef2a9a596e4d84b774d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 10 Jan 2017 11:37:20 +0100
Subject: [PATCH 0867/1310] universal-ctags: 2016-12-17 -> 2017-01-08

---
 .../tools/misc/universal-ctags/default.nix           |  9 ++++++---
 .../tools/misc/universal-ctags/sed-test.patch        | 12 ++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/tools/misc/universal-ctags/sed-test.patch

diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index b4710cc8406..903359f5c76 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -2,17 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "universal-ctags-${version}";
-  version = "2016-12-17";
+  version = "2017-01-08";
 
   src = fetchFromGitHub {
     owner = "universal-ctags";
     repo = "ctags";
-    rev = "3093f73e81cddbea5d122dccd4fd9a6323ebbbd3";
-    sha256 = "091359v3p865d39gchpc1x5qplf1s1y4nsph344ng5x1nkx44qsi";
+    rev = "9668032d8715265ca5b4ff16eb2efa8f1c450883";
+    sha256 = "0nwcf5mh3ba0g23zw7ym73pgpfdass412k2fy67ryr9vnc709jkj";
   };
 
   buildInputs = [ autoreconfHook pkgconfig ];
 
+  # remove when https://github.com/universal-ctags/ctags/pull/1267 is merged
+  patches = [ ./sed-test.patch ];
+
   autoreconfPhase = ''
     ./autogen.sh --tmpdir
   '';
diff --git a/pkgs/development/tools/misc/universal-ctags/sed-test.patch b/pkgs/development/tools/misc/universal-ctags/sed-test.patch
new file mode 100644
index 00000000000..7c44d699d79
--- /dev/null
+++ b/pkgs/development/tools/misc/universal-ctags/sed-test.patch
@@ -0,0 +1,12 @@
+--- a/Tmain/sorted-help-message.d/run.sh	2017-01-10 11:20:51.515093465 +0100
++++ b/Tmain/sorted-help-message.d/run.sh	2017-01-10 11:17:56.639213720 +0100
+@@ -27,7 +27,7 @@
+ extract_long_options()
+ {
+     sed -n '/Usage:/,$p'  | \
+-    sed -n 's/\(^  --[:alnum:][<>[:alnum:]_-]*\).*/\1/p'
++    sed -n 's/\(^  --[[:alnum:]][<>[:alnum:]_-]*\).*/\1/p'
+ }
+
+ extract_debug_options()
+

From 93197aabea48d19ae3504bd8d082648fb48056e4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 9 Jan 2017 19:15:58 +0000
Subject: [PATCH 0868/1310] mpd: fix on darwin

by removing a patch that is no longer needed after the update to 0.20
---
 .../mpd/darwin-enable-cxx-exceptions.patch    | 142 ------------------
 pkgs/servers/mpd/default.nix                  |   2 -
 2 files changed, 144 deletions(-)
 delete mode 100644 pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch

diff --git a/pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch b/pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch
deleted file mode 100644
index db330a913cb..00000000000
--- a/pkgs/servers/mpd/darwin-enable-cxx-exceptions.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -Naur mpd-0.19.9.orig/configure mpd-0.19.9/configure
---- mpd-0.19.9.orig/configure	2015-01-26 19:47:27.000000000 +0000
-+++ mpd-0.19.9/configure	2015-01-26 19:47:27.000000000 +0000
-@@ -17113,138 +17113,6 @@
- done
- 
- 
--if test x$no_exceptions = xyes; then
--
--
--
--
--for flag in -fno-exceptions; do
--  as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__$flag" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
--$as_echo_n "checking whether C++ compiler accepts $flag... " >&6; }
--if eval \${$as_CACHEVAR+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--
--  ax_check_save_flags=$CXXFLAGS
--  CXXFLAGS="$CXXFLAGS  $flag"
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_cxx_try_compile "$LINENO"; then :
--  eval "$as_CACHEVAR=yes"
--else
--  eval "$as_CACHEVAR=no"
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  CXXFLAGS=$ax_check_save_flags
--fi
--eval ac_res=\$$as_CACHEVAR
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
--  if ${CXXFLAGS+:} false; then :
--  case " $CXXFLAGS " in
--    *" $flag "*)
--      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5
--  (: CXXFLAGS already contains $flag) 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }
--      ;;
--    *)
--      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$flag\""; } >&5
--  (: CXXFLAGS="$CXXFLAGS $flag") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }
--      CXXFLAGS="$CXXFLAGS $flag"
--      ;;
--   esac
--else
--  CXXFLAGS="$flag"
--fi
--
--else
--  :
--fi
--
--done
--
--
--
--
--
--for flag in -fno-rtti; do
--  as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__$flag" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
--$as_echo_n "checking whether C++ compiler accepts $flag... " >&6; }
--if eval \${$as_CACHEVAR+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--
--  ax_check_save_flags=$CXXFLAGS
--  CXXFLAGS="$CXXFLAGS  $flag"
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_cxx_try_compile "$LINENO"; then :
--  eval "$as_CACHEVAR=yes"
--else
--  eval "$as_CACHEVAR=no"
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  CXXFLAGS=$ax_check_save_flags
--fi
--eval ac_res=\$$as_CACHEVAR
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
--  if ${CXXFLAGS+:} false; then :
--  case " $CXXFLAGS " in
--    *" $flag "*)
--      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5
--  (: CXXFLAGS already contains $flag) 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }
--      ;;
--    *)
--      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$flag\""; } >&5
--  (: CXXFLAGS="$CXXFLAGS $flag") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }
--      CXXFLAGS="$CXXFLAGS $flag"
--      ;;
--   esac
--else
--  CXXFLAGS="$flag"
--fi
--
--else
--  :
--fi
--
--done
--
--fi
- 
- 
- 
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 5b2195b3d7e..c07ca6a8342 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -39,8 +39,6 @@ in stdenv.mkDerivation rec {
     sha256 = "068nxsfkp2ppcjh3fmcbapkiwnjpvkii73bfydpw4bf2yphdvsa8";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch;
-
   buildInputs = [ pkgconfig glib boost ]
     ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit
     ++ opt stdenv.isLinux systemd

From ce11097b712c9415952a5bd6fce6184c7b923c20 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 10 Jan 2017 21:12:12 +0900
Subject: [PATCH 0869/1310] flashplayer: 24.0.0.186 -> 24.0.0.194

---
 .../browsers/mozilla-plugins/flashplayer/default.nix   | 10 +++++-----
 .../mozilla-plugins/flashplayer/standalone.nix         |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index d199ea3ece3..8ae86eed02c 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,7 +73,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "24.0.0.186";
+  version = "24.0.0.194";
 
   src = fetchurl {
     url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "0i7c861n42vb2zd9hnp26lxjakkv0fxp53smcwzc9xhdbjr14ail"
+          "197s3ksx6h3dkfx8q7v9c8mf8ai9s1jpqnaczjdkmzcyp5jd29w9"
         else
-          "0gj59iinh8gbjm5bn24qi3niyvi8x6byyc1sa6qvqkvjwh1ckdi3"
+          "0ll0ddss3gkzngmm96pyvnf4a6mf8axraxlqpjdl63ghrndd1gkc"
       else
         if arch == "x86_64" then
-          "0qs6hx31p1q2zqsr8jcf7niwsp6nncpqs3igb6l9f9fi0a8va8f7"
+          "0bri8kjqy9g929ix4qx4whmxz5rzbgjff253kvs6dlr8vyglz0gx"
         else
-          "1zcinq7629bgbashx25krby8r91sag2v8382q620951iiww06n1v";
+          "1lrfwwhl18411bk9qsizhch8n3ilcvhmj4i7sak5zjv5r6mwnqgl";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index c9de87f1b25..be33cf139d2 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -57,7 +57,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "24.0.0.186";
+  version = "24.0.0.194";
 
   src = fetchurl {
     url =
@@ -67,9 +67,9 @@ stdenv.mkDerivation rec {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "09653jphzijk3w3dcd05f4pya1ciaymna31qqrmcwhxa0ginxhz2"
+        "0yiln97l8b27s5c6nv9m09cdgwa4c47idnf2p6y6i0slfcqj1cxv"
       else
-        "0q0wc2lgjzi1v4lpcr5x5nszigli3vsryfq2zk4qq4pqy3i6aq7q";
+        "1f34qm8grj3141p6kym6y2pqisrmn9l6nkhbfmfhsd472g5q85v1";
   };
 
   nativeBuildInputs = [ unzip ];

From 5b9d80646bc4878c467b9de96677b269145ee794 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 10 Jan 2017 14:06:52 +0100
Subject: [PATCH 0870/1310] mdadm4: init at 4.0

Would be just mdadm: 3.3.4 -> 4.0, but it doesn't look like there are
urgent bugfixes, and it is a major release, and wrong RAID handling
kills data, so let's let the early adopters test it a bit.
---
 pkgs/os-specific/linux/mdadm/4.nix | 42 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/os-specific/linux/mdadm/4.nix

diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix
new file mode 100644
index 00000000000..d929668a26a
--- /dev/null
+++ b/pkgs/os-specific/linux/mdadm/4.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, groff }:
+
+assert stdenv.isLinux;
+
+stdenv.mkDerivation rec {
+  name = "mdadm-4.0";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz";
+    sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx";
+  };
+
+  # This is to avoid self-references, which causes the initrd to explode
+  # in size and in turn prevents mdraid systems from booting.
+  allowedReferences = [ stdenv.glibc.out ];
+
+  patches = [ ./no-self-references.patch ];
+
+  makeFlags = [
+    "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin"
+    "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
+  ] ++ stdenv.lib.optionals (stdenv ? cross) [
+    "CROSS_COMPILE=${stdenv.cross.config}-"
+  ];
+
+  nativeBuildInputs = [ groff ];
+
+  # Attempt removing if building with gcc5 when updating
+  NIX_CFLAGS_COMPILE = "-std=gnu89";
+
+  preConfigure = ''
+    sed -e 's@/lib/udev@''${out}/lib/udev@' \
+        -e 's@ -Werror @ @' \
+        -e 's@/usr/sbin/sendmail@/var/setuid-wrappers/sendmail@' -i Makefile
+  '';
+
+  meta = {
+    description = "Programs for managing RAID arrays under Linux";
+    homepage = http://neil.brown.name/blog/mdadm;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46ab2193ac4..0d976ebd839 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11496,6 +11496,7 @@ in
   mbpfan = callPackage ../os-specific/linux/mbpfan { };
 
   mdadm = callPackage ../os-specific/linux/mdadm { };
+  mdadm4 = callPackage ../os-specific/linux/mdadm/4.nix { };
 
   mingetty = callPackage ../os-specific/linux/mingetty { };
 

From 11696e290dc8f14027cbd6000bed9a519100cafd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 10 Jan 2017 15:13:14 +0100
Subject: [PATCH 0871/1310] nixos networking.dnsExtensionMechanism = true; by
 default

https://github.com/NixOS/nixpkgs/issues/12470#issuecomment-266785641
I've been using it for weeks without encountering any problems.
---
 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 adc05f60231..9e7cfbd686c 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -57,7 +57,7 @@ in
 
     networking.dnsExtensionMechanism = lib.mkOption {
       type = types.bool;
-      default = false;
+      default = true;
       description = ''
         Enable the <code>edns0</code> option in <filename>resolv.conf</filename>. With
         that option set, <code>glibc</code> supports use of the extension mechanisms for

From b2da3d3050be079b57f9f5677c772efcf82b61f2 Mon Sep 17 00:00:00 2001
From: David McFarland <mcfarland@hotmail.com>
Date: Tue, 10 Jan 2017 10:24:21 -0400
Subject: [PATCH 0872/1310] amdgpu-pro: 16.40 -> 16.50 (#21502)

---
 pkgs/os-specific/linux/amdgpu-pro/default.nix |  33 ++-
 .../0001-Find-correct-System.map.patch        |  25 ---
 ...-Fix-kernel-module-install-location.patch} |  14 +-
 ... => 0002-Add-Gentoo-as-build-option.patch} |  16 +-
 ...meter-from-ttm_bo_reserve-for-4.7.0.patch} |  10 +-
 ...seq_printf-format-for-64-bit-context.patch |  25 +++
 ...alls.patch => 0005-Fix-vblank-calls.patch} |  69 +++---
 ...rst-param-from-drm_gem_object_lookup.patch | 196 ------------------
 ...-Fix-crtc_gamma-functions-for-4.8.0.patch} |  32 +--
 ...ve-vblank_disable_allowed-assignment.patch |  26 ---
 ..._helper_connector_destroy_state-call.patch |  28 ---
 ..._atomic_helper_swap_state-for-4.8.0.patch} |  10 +-
 ...ag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch} |  12 +-
 ...seq_printf-format-for-64-bit-context.patch |  30 ---
 ...009-Remove-dependency-on-System.map.patch} |  34 +--
 ...atch => 0010-disable-dal-by-default.patch} |  12 +-
 .../0011-kcl-fixes-for-16.50-linux-4.8.patch  | 114 ++++++++++
 .../0012-use-kernel-fence_array-in-4.8.patch  |  55 +++++
 18 files changed, 314 insertions(+), 427 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0001-Find-correct-System.map.patch
 rename pkgs/os-specific/linux/amdgpu-pro/patches/{0002-Fix-kernel-module-install-location.patch => 0001-Fix-kernel-module-install-location.patch} (65%)
 rename pkgs/os-specific/linux/amdgpu-pro/patches/{0003-Add-Gentoo-as-build-option.patch => 0002-Add-Gentoo-as-build-option.patch} (62%)
 rename pkgs/os-specific/linux/amdgpu-pro/patches/{0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch => 0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch} (75%)
 create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0004-Change-seq_printf-format-for-64-bit-context.patch
 rename pkgs/os-specific/linux/amdgpu-pro/patches/{0009-Fix-vblank-calls.patch => 0005-Fix-vblank-calls.patch} (68%)
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch
 rename pkgs/os-specific/linux/amdgpu-pro/patches/{0010-Fix-crtc_gamma-functions-for-4.8.0.patch => 0006-Fix-crtc_gamma-functions-for-4.8.0.patch} (83%)
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch
 rename pkgs/os-specific/linux/amdgpu-pro/patches/{0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch => 0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch} (73%)
 rename pkgs/os-specific/linux/amdgpu-pro/patches/{0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch => 0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch} (75%)
 delete mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch
 rename pkgs/os-specific/linux/amdgpu-pro/patches/{0013-Remove-dependency-on-System.map.patch => 0009-Remove-dependency-on-System.map.patch} (61%)
 rename pkgs/os-specific/linux/amdgpu-pro/patches/{0014-disable-dal-by-default.patch => 0010-disable-dal-by-default.patch} (68%)
 create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0011-kcl-fixes-for-16.50-linux-4.8.patch
 create mode 100644 pkgs/os-specific/linux/amdgpu-pro/patches/0012-use-kernel-fence_array-in-4.8.patch

diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix
index 4a0527242c7..cbfa2e1b030 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/default.nix
+++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix
@@ -30,9 +30,9 @@ let
 
 in stdenv.mkDerivation rec {
 
-  version = "16.40";
+  version = "16.50";
   pname = "amdgpu-pro";
-  build = "16.40-348864";
+  build = "${version}-362463";
 
   libCompatDir = "/run/lib/${libArch}";
 
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url =
     "https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-${build}.tar.xz";
-    sha256 = "1c06lx07irmlpmbmgb3qcgpzj6q6rimszrbbdrgz8kqnfpcv3mjr";
+    sha256 = "1wl8mabk9g7s43bdarzl2i5crp8rl1advnb5mw3p3821sqzh2nd9";
     curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMD-Radeon-GPU-PRO-Linux-Beta-Driver%e2%80%93Release-Notes.aspx";
   };
 
@@ -58,20 +58,18 @@ in stdenv.mkDerivation rec {
   '';
 
   modulePatches = [
-    ./patches/0001-Find-correct-System.map.patch
-    ./patches/0002-Fix-kernel-module-install-location.patch
-    ./patches/0003-Add-Gentoo-as-build-option.patch
-    ./patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch
-    ./patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch
-    ./patches/0006-Remove-vblank_disable_allowed-assignment.patch
-    ./patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch
-    ./patches/0008-Change-seq_printf-format-for-64-bit-context.patch
-    ./patches/0009-Fix-vblank-calls.patch
-    ./patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch
-    ./patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch
-    ./patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch
-    ./patches/0013-Remove-dependency-on-System.map.patch
-    ./patches/0014-disable-dal-by-default.patch
+    ./patches/0001-Fix-kernel-module-install-location.patch
+    ./patches/0002-Add-Gentoo-as-build-option.patch
+    ./patches/0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch
+    ./patches/0004-Change-seq_printf-format-for-64-bit-context.patch
+    ./patches/0005-Fix-vblank-calls.patch
+    ./patches/0006-Fix-crtc_gamma-functions-for-4.8.0.patch
+    ./patches/0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch
+    ./patches/0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch
+    ./patches/0009-Remove-dependency-on-System.map.patch
+    ./patches/0010-disable-dal-by-default.patch
+    ./patches/0011-kcl-fixes-for-16.50-linux-4.8.patch
+    ./patches/0012-use-kernel-fence_array-in-4.8.patch
   ];
 
   patchPhase = optionalString (!libsOnly) ''
@@ -137,7 +135,6 @@ in stdenv.mkDerivation rec {
       patchelf --interpreter "$interpreter" --set-rpath "$libPath" "$out/bin/$prog"
     done
   '' + ''
-    ln -s libgbm.so.1.0.0 $out/lib/libgbm.so.1
     ln -s ${makeLibraryPath [ncurses5]}/libncursesw.so.5 $out/lib/libtinfo.so.5
   '';
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Find-correct-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Find-correct-System.map.patch
deleted file mode 100644
index 2a086cf37bc..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Find-correct-System.map.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4243cf67bcdf8c3865efbfe19dc8841c88ab2daa Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Sun, 25 Sep 2016 15:30:26 +0100
-Subject: [PATCH 01/14] Find correct System.map
-
----
- pre-build.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pre-build.sh b/pre-build.sh
-index 95457bd..169ccf0 100755
---- a/pre-build.sh
-+++ b/pre-build.sh
-@@ -27,7 +27,7 @@ source amd/backport/symbols
- 
- echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c
- for sym in $SYMS; do
--    addr=$(grep $sym /boot/System.map-$KERNELVER | awk -F' ' '{print $1}')
-+    addr=$(grep $sym /boot/System.map*-$KERNELVER | awk -F' ' '{print $1}')
-     echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c
- done
- 
--- 
-2.10.1
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Fix-kernel-module-install-location.patch
similarity index 65%
rename from pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch
rename to pkgs/os-specific/linux/amdgpu-pro/patches/0001-Fix-kernel-module-install-location.patch
index be886883556..5af823a9394 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Fix-kernel-module-install-location.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-Fix-kernel-module-install-location.patch
@@ -1,25 +1,25 @@
-From c1860b4e8c2ebb784a07d6ba067c510950e67d24 Mon Sep 17 00:00:00 2001
+From e787277fd4f43399de2da355b08e478c2a58d589 Mon Sep 17 00:00:00 2001
 From: "Luke A. Guest" <laguest@archeia.com>
 Date: Sun, 25 Sep 2016 15:31:13 +0100
-Subject: [PATCH 02/14] Fix kernel module install location
+Subject: [PATCH 01/11] Fix kernel module install location
 
 ---
  dkms.conf | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/dkms.conf b/dkms.conf
-index d1a5e1d..0e03f08 100644
+index 7f11158..2f080e2 100644
 --- a/dkms.conf
 +++ b/dkms.conf
 @@ -2,7 +2,7 @@ PACKAGE_NAME="amdgpu-pro"
- PACKAGE_VERSION="16.40-348864"
+ PACKAGE_VERSION="16.50-362463"
  BUILT_MODULE_NAME[0]="amdgpu"
  BUILT_MODULE_LOCATION[0]="amd/amdgpu"
--DEST_MODULE_LOCATION[0]="/extra"
+-DEST_MODULE_LOCATION[0]="/updates"
 +DEST_MODULE_LOCATION[0]="/kernel/drivers/gpu/drm/amd/amdgpu"
  AUTOINSTALL="yes"
  PRE_BUILD="pre-build.sh $kernelver"
- REMAKE_INITRD="yes"
+ 
 -- 
-2.10.1
+2.11.0
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Add-Gentoo-as-build-option.patch
similarity index 62%
rename from pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch
rename to pkgs/os-specific/linux/amdgpu-pro/patches/0002-Add-Gentoo-as-build-option.patch
index d8b0f289d84..be627992c06 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Add-Gentoo-as-build-option.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-Add-Gentoo-as-build-option.patch
@@ -1,20 +1,20 @@
-From c26c7670869e02c39c0d0f6dee9094a621f42252 Mon Sep 17 00:00:00 2001
+From da51551f671be3282b6f69ef76e495b169a5dc3f Mon Sep 17 00:00:00 2001
 From: "Luke A. Guest" <laguest@archeia.com>
 Date: Sun, 25 Sep 2016 15:31:49 +0100
-Subject: [PATCH 03/14] Add Gentoo as build option
+Subject: [PATCH 02/11] Add Gentoo as build option
 
 ---
  amd/backport/Makefile | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/amd/backport/Makefile b/amd/backport/Makefile
-index 0c285ef..dcc94d5 100644
+index a6ab7fe..ff9339d 100644
 --- a/amd/backport/Makefile
 +++ b/amd/backport/Makefile
-@@ -17,8 +17,13 @@ else ifeq ("ubuntu",$(OS_NAME))
- ccflags-y += -DOS_NAME_UBUNTU
- else ifeq ("steamos",$(OS_NAME))
- ccflags-y += -DOS_NAME_STEAMOS
+@@ -22,8 +22,13 @@ else ifeq ("sled",$(OS_NAME))
+ ccflags-y += -DOS_NAME_SLE
+ else ifeq ("sles",$(OS_NAME))
+ ccflags-y += -DOS_NAME_SLE
 +else ifeq ("gentoo",$(OS_NAME))
 +ccflags-y += -DOS_NAME_GENTOO
 +# We don't have a version inside /etc/os-release.
@@ -26,5 +26,5 @@ index 0c285ef..dcc94d5 100644
  
  ccflags-y += \
 -- 
-2.10.1
+2.11.0
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch
similarity index 75%
rename from pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch
rename to pkgs/os-specific/linux/amdgpu-pro/patches/0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch
index 794da9b5fb7..ae5b62b1d23 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Remove-extra-parameter-from-ttm_bo_reserve-for-4.7.0.patch
@@ -1,17 +1,17 @@
-From d21e811c6f26674a0e1c2398dce6d247a1dd4918 Mon Sep 17 00:00:00 2001
+From 999a30883f34c4603c3b747a58a89d4924583769 Mon Sep 17 00:00:00 2001
 From: "Luke A. Guest" <laguest@archeia.com>
 Date: Sun, 25 Sep 2016 15:46:58 +0100
-Subject: [PATCH 04/14] Remove extra parameter from ttm_bo_reserve for 4.7.0
+Subject: [PATCH 03/11] Remove extra parameter from ttm_bo_reserve for 4.7.0
 
 ---
  amd/backport/include/kcl/kcl_ttm.h | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h
-index 05c444b..c5a602c 100644
+index 6e5a170..52cdbc8 100644
 --- a/amd/backport/include/kcl/kcl_ttm.h
 +++ b/amd/backport/include/kcl/kcl_ttm.h
-@@ -106,7 +106,11 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo,
+@@ -113,7 +113,11 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo,
  				 struct ww_acquire_ctx *ticket)
  {
  #if defined(BUILD_AS_DKMS)
@@ -24,5 +24,5 @@ index 05c444b..c5a602c 100644
  	return ttm_bo_reserve(bo, interruptible, no_wait, ticket);
  #endif
 -- 
-2.10.1
+2.11.0
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Change-seq_printf-format-for-64-bit-context.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Change-seq_printf-format-for-64-bit-context.patch
new file mode 100644
index 00000000000..925a92e2a7e
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-Change-seq_printf-format-for-64-bit-context.patch
@@ -0,0 +1,25 @@
+From 084b2915e6876d8fdb913938569c0ce7ffef65bc Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest" <laguest@archeia.com>
+Date: Sun, 25 Sep 2016 16:46:39 +0100
+Subject: [PATCH 04/11] Change seq_printf format for 64 bit context
+
+---
+ amd/amdgpu/amdgpu_sa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
+index 052f745..5886b9a 100644
+--- a/amd/amdgpu/amdgpu_sa.c
++++ b/amd/amdgpu/amdgpu_sa.c
+@@ -428,7 +428,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
+ 			   soffset, eoffset, eoffset - soffset);
+ 
+ 		if (i->fence)
+-#if defined(BUILD_AS_DKMS)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
+ 			seq_printf(m, " protected by 0x%08x on context %d",
+ 				   i->fence->seqno, i->fence->context);
+ #else
+-- 
+2.11.0
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Fix-vblank-calls.patch
similarity index 68%
rename from pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch
rename to pkgs/os-specific/linux/amdgpu-pro/patches/0005-Fix-vblank-calls.patch
index 82db5905a45..99b54aca2ab 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Fix-vblank-calls.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Fix-vblank-calls.patch
@@ -1,18 +1,19 @@
-From 9da98ec93816277a2d4e93d3205da044bace08bc Mon Sep 17 00:00:00 2001
+From 1884ef3a813f3dac0029c7539654ba978635d5d3 Mon Sep 17 00:00:00 2001
 From: "Luke A. Guest" <laguest@archeia.com>
 Date: Sun, 25 Sep 2016 16:49:09 +0100
-Subject: [PATCH 09/14] Fix vblank calls
+Subject: [PATCH 05/11] Fix vblank calls
 
 ---
  amd/amdgpu/amdgpu_display.c   | 8 ++++++++
- amd/amdgpu/dce_v10_0.c        | 8 ++++++++
- amd/amdgpu/dce_v11_0.c        | 8 ++++++++
- amd/amdgpu/dce_v8_0.c         | 8 ++++++++
+ amd/amdgpu/dce_v10_0.c        | 4 ++++
+ amd/amdgpu/dce_v11_0.c        | 4 ++++
+ amd/amdgpu/dce_v8_0.c         | 4 ++++
+ amd/amdgpu/dce_virtual.c      | 8 ++++++++
  amd/dal/amdgpu_dm/amdgpu_dm.c | 4 ++++
- 5 files changed, 36 insertions(+)
+ 6 files changed, 32 insertions(+)
 
 diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c
-index 862611c..267c65f 100644
+index 8425b1d..d6cd383 100644
 --- a/amd/amdgpu/amdgpu_display.c
 +++ b/amd/amdgpu/amdgpu_display.c
 @@ -268,7 +268,11 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc,
@@ -38,20 +39,12 @@ index 862611c..267c65f 100644
 +#endif
  
  pflip_cleanup:
- 	if (unlikely(amdgpu_bo_reserve(new_rbo, false) != 0)) {
+ 	if (unlikely(amdgpu_bo_reserve(new_abo, false) != 0)) {
 diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c
-index 0fd1e4f..5f0044c 100644
+index 650d193..b1880ac 100644
 --- a/amd/amdgpu/dce_v10_0.c
 +++ b/amd/amdgpu/dce_v10_0.c
-@@ -3372,11 +3372,19 @@ static int dce_v10_0_pageflip_irq(struct amdgpu_device *adev,
- 
- 	/* wakeup usersapce */
- 	if (works->event)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+		drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event);
-+#else
- 		drm_send_vblank_event(adev->ddev, crtc_id, works->event);
-+#endif
+@@ -3342,7 +3342,11 @@ static int dce_v10_0_pageflip_irq(struct amdgpu_device *adev,
  
  	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
  
@@ -64,18 +57,10 @@ index 0fd1e4f..5f0044c 100644
  
  	return 0;
 diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c
-index a85eb5f..8edc670 100644
+index ca03d8e..b654b64 100644
 --- a/amd/amdgpu/dce_v11_0.c
 +++ b/amd/amdgpu/dce_v11_0.c
-@@ -3432,11 +3432,19 @@ static int dce_v11_0_pageflip_irq(struct amdgpu_device *adev,
- 
- 	/* wakeup usersapce */
- 	if(works->event)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+		drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event);
-+#else
- 		drm_send_vblank_event(adev->ddev, crtc_id, works->event);
-+#endif
+@@ -3391,7 +3391,11 @@ static int dce_v11_0_pageflip_irq(struct amdgpu_device *adev,
  
  	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
  
@@ -88,15 +73,31 @@ index a85eb5f..8edc670 100644
  
  	return 0;
 diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c
-index 308f5e4..57e8014 100644
+index 8e4dff7..b598caa 100644
 --- a/amd/amdgpu/dce_v8_0.c
 +++ b/amd/amdgpu/dce_v8_0.c
-@@ -3323,11 +3323,19 @@ static int dce_v8_0_pageflip_irq(struct amdgpu_device *adev,
+@@ -3252,7 +3252,11 @@ static int dce_v8_0_pageflip_irq(struct amdgpu_device *adev,
+ 
+ 	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++	drm_crtc_vblank_put(&amdgpu_crtc->base);
++#else
+ 	drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);
++#endif
+ 	schedule_work(&works->unpin_work);
+ 
+ 	return 0;
+diff --git a/amd/amdgpu/dce_virtual.c b/amd/amdgpu/dce_virtual.c
+index 0c6e873..36e2094 100644
+--- a/amd/amdgpu/dce_virtual.c
++++ b/amd/amdgpu/dce_virtual.c
+@@ -746,11 +746,19 @@ static int dce_virtual_pageflip_irq(struct amdgpu_device *adev,
  
  	/* wakeup usersapce */
  	if (works->event)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+		drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event);
++    drm_crtc_send_vblank_event(&amdgpu_crtc->base, works->event);
 +#else
  		drm_send_vblank_event(adev->ddev, crtc_id, works->event);
 +#endif
@@ -112,10 +113,10 @@ index 308f5e4..57e8014 100644
  
  	return 0;
 diff --git a/amd/dal/amdgpu_dm/amdgpu_dm.c b/amd/dal/amdgpu_dm/amdgpu_dm.c
-index 30865ec..f49999b 100644
+index c5fcf5a..e9892d8 100644
 --- a/amd/dal/amdgpu_dm/amdgpu_dm.c
 +++ b/amd/dal/amdgpu_dm/amdgpu_dm.c
-@@ -196,10 +196,14 @@ static void dm_pflip_high_irq(void *interrupt_params)
+@@ -213,10 +213,14 @@ static void dm_pflip_high_irq(void *interrupt_params)
  
  	/* wakeup usersapce */
  	if(works->event)
@@ -131,5 +132,5 @@ index 30865ec..f49999b 100644
  	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
  
 -- 
-2.10.1
+2.11.0
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch
deleted file mode 100644
index 94cb3e72ed5..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-Remove-first-param-from-drm_gem_object_lookup.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 4ac701dce0a4139e89c80237fc4eaa65f48c6f07 Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Sun, 25 Sep 2016 15:53:50 +0100
-Subject: [PATCH 05/14] Remove first param from drm_gem_object_lookup
-
----
- amd/amdgpu/amdgpu_bo_list.c         |  4 ++++
- amd/amdgpu/amdgpu_cs.c              |  4 ++++
- amd/amdgpu/amdgpu_display.c         |  4 ++++
- amd/amdgpu/amdgpu_gem.c             | 20 ++++++++++++++++++++
- amd/amdgpu/dce_v10_0.c              |  4 ++++
- amd/amdgpu/dce_v11_0.c              |  4 ++++
- amd/amdgpu/dce_v8_0.c               |  4 ++++
- amd/dal/amdgpu_dm/amdgpu_dm_types.c |  4 ++++
- 8 files changed, 48 insertions(+)
-
-diff --git a/amd/amdgpu/amdgpu_bo_list.c b/amd/amdgpu/amdgpu_bo_list.c
-index 844214d..7ae09cf 100644
---- a/amd/amdgpu/amdgpu_bo_list.c
-+++ b/amd/amdgpu/amdgpu_bo_list.c
-@@ -107,7 +107,11 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev,
- 		struct amdgpu_bo *bo;
- 		struct mm_struct *usermm;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+		gobj = drm_gem_object_lookup(filp, info[i].bo_handle);
-+#else
- 		gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle);
-+#endif
- 		if (!gobj) {
- 			r = -ENOENT;
- 			goto error_free;
-diff --git a/amd/amdgpu/amdgpu_cs.c b/amd/amdgpu/amdgpu_cs.c
-index 20f6ab2..22363ab 100644
---- a/amd/amdgpu/amdgpu_cs.c
-+++ b/amd/amdgpu/amdgpu_cs.c
-@@ -92,8 +92,12 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
- {
- 	struct drm_gem_object *gobj;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	gobj = drm_gem_object_lookup(p->filp, data->handle);
-+#else
- 	gobj = drm_gem_object_lookup(p->adev->ddev, p->filp,
- 				     data->handle);
-+#endif
- 	if (gobj == NULL)
- 		return -EINVAL;
- 
-diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c
-index 96c4fa5..862611c 100644
---- a/amd/amdgpu/amdgpu_display.c
-+++ b/amd/amdgpu/amdgpu_display.c
-@@ -601,7 +601,11 @@ amdgpu_user_framebuffer_create(struct drm_device *dev,
- 	struct amdgpu_framebuffer *amdgpu_fb;
- 	int ret;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);
-+#else
- 	obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
-+#endif
- 	if (obj ==  NULL) {
- 		dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
- 			"can't create framebuffer\n", mode_cmd->handles[0]);
-diff --git a/amd/amdgpu/amdgpu_gem.c b/amd/amdgpu/amdgpu_gem.c
-index 0069aec..6da025b 100644
---- a/amd/amdgpu/amdgpu_gem.c
-+++ b/amd/amdgpu/amdgpu_gem.c
-@@ -397,7 +397,11 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp,
- 	struct drm_gem_object *gobj;
- 	struct amdgpu_bo *robj;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	gobj = drm_gem_object_lookup(filp, handle);
-+#else
- 	gobj = drm_gem_object_lookup(dev, filp, handle);
-+#endif
- 	if (gobj == NULL) {
- 		return -ENOENT;
- 	}
-@@ -461,7 +465,11 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
- 	int r = 0;
- 	long ret;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	gobj = drm_gem_object_lookup(filp, handle);
-+#else
- 	gobj = drm_gem_object_lookup(dev, filp, handle);
-+#endif
- 	if (gobj == NULL) {
- 		return -ENOENT;
- 	}
-@@ -495,7 +503,11 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data,
- 	int r = -1;
- 
- 	DRM_DEBUG("%d \n", args->handle);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	gobj = drm_gem_object_lookup(filp, args->handle);
-+#else
- 	gobj = drm_gem_object_lookup(dev, filp, args->handle);
-+#endif
- 	if (gobj == NULL)
- 		return -ENOENT;
- 	robj = gem_to_amdgpu_bo(gobj);
-@@ -643,7 +655,11 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
- 		return -EINVAL;
- 	}
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	gobj = drm_gem_object_lookup(filp, args->handle);
-+#else
- 	gobj = drm_gem_object_lookup(dev, filp, args->handle);
-+#endif
- 	if (gobj == NULL)
- 		return -ENOENT;
- 	rbo = gem_to_amdgpu_bo(gobj);
-@@ -705,7 +721,11 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
- 	struct amdgpu_bo *robj;
- 	int r;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	gobj = drm_gem_object_lookup(filp, args->handle);
-+#else
- 	gobj = drm_gem_object_lookup(dev, filp, args->handle);
-+#endif
- 	if (gobj == NULL) {
- 		return -ENOENT;
- 	}
-diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c
-index 3fae88d..0fd1e4f 100644
---- a/amd/amdgpu/dce_v10_0.c
-+++ b/amd/amdgpu/dce_v10_0.c
-@@ -2594,7 +2594,11 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,
- 		return -EINVAL;
- 	}
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	obj = drm_gem_object_lookup(file_priv, handle);
-+#else
- 	obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-+#endif
- 	if (!obj) {
- 		DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
- 		return -ENOENT;
-diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c
-index fe87795..a85eb5f 100644
---- a/amd/amdgpu/dce_v11_0.c
-+++ b/amd/amdgpu/dce_v11_0.c
-@@ -2604,7 +2604,11 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,
- 		return -EINVAL;
- 	}
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	obj = drm_gem_object_lookup(file_priv, handle);
-+#else
- 	obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-+#endif
- 	if (!obj) {
- 		DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
- 		return -ENOENT;
-diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c
-index 1f5959b..308f5e4 100644
---- a/amd/amdgpu/dce_v8_0.c
-+++ b/amd/amdgpu/dce_v8_0.c
-@@ -2448,7 +2448,11 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,
- 		return -EINVAL;
- 	}
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	obj = drm_gem_object_lookup(file_priv, handle);
-+#else
- 	obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-+#endif
- 	if (!obj) {
- 		DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
- 		return -ENOENT;
-diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-index d14c96f..a9de2e5 100644
---- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-@@ -156,7 +156,11 @@ static int dm_crtc_pin_cursor_bo_new(
- 
- 		amdgpu_crtc = to_amdgpu_crtc(crtc);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+		obj = drm_gem_object_lookup(file_priv, handle);
-+#else
- 		obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-+#endif
- 
- 		if (!obj) {
- 			DRM_ERROR(
--- 
-2.10.1
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Fix-crtc_gamma-functions-for-4.8.0.patch
similarity index 83%
rename from pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch
rename to pkgs/os-specific/linux/amdgpu-pro/patches/0006-Fix-crtc_gamma-functions-for-4.8.0.patch
index b11ab3e557e..566b7039bb3 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-Fix-crtc_gamma-functions-for-4.8.0.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Fix-crtc_gamma-functions-for-4.8.0.patch
@@ -1,7 +1,7 @@
-From b41eafa282a003cde9729e2ff486f55dc54f12c6 Mon Sep 17 00:00:00 2001
+From 12660ae02838f99c0784194908f7a189bc2ab0ae Mon Sep 17 00:00:00 2001
 From: "Luke A. Guest" <laguest@archeia.com>
 Date: Sun, 25 Sep 2016 16:56:47 +0100
-Subject: [PATCH 10/14] Fix crtc_gamma functions for 4.8.0
+Subject: [PATCH 06/11] Fix crtc_gamma functions for 4.8.0
 
 ---
  amd/amdgpu/dce_v10_0.c              | 19 +++++++++++++++++++
@@ -11,10 +11,10 @@ Subject: [PATCH 10/14] Fix crtc_gamma functions for 4.8.0
  4 files changed, 69 insertions(+)
 
 diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c
-index 5f0044c..85378aa 100644
+index b1880ac..53746fa 100644
 --- a/amd/amdgpu/dce_v10_0.c
 +++ b/amd/amdgpu/dce_v10_0.c
-@@ -2671,6 +2671,24 @@ static void dce_v10_0_cursor_reset(struct drm_crtc *crtc)
+@@ -2627,6 +2627,24 @@ static void dce_v10_0_cursor_reset(struct drm_crtc *crtc)
  	}
  }
  
@@ -39,7 +39,7 @@ index 5f0044c..85378aa 100644
  static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
  				    u16 *blue, uint32_t start, uint32_t size)
  {
-@@ -2685,6 +2703,7 @@ static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green
+@@ -2641,6 +2659,7 @@ static void dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green
  	}
  	dce_v10_0_crtc_load_lut(crtc);
  }
@@ -48,10 +48,10 @@ index 5f0044c..85378aa 100644
  static void dce_v10_0_crtc_destroy(struct drm_crtc *crtc)
  {
 diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c
-index 8edc670..0129543 100644
+index b654b64..3edd66d 100644
 --- a/amd/amdgpu/dce_v11_0.c
 +++ b/amd/amdgpu/dce_v11_0.c
-@@ -2681,6 +2681,24 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc)
+@@ -2643,6 +2643,24 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc)
  	}
  }
  
@@ -76,7 +76,7 @@ index 8edc670..0129543 100644
  static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
  				    u16 *blue, uint32_t start, uint32_t size)
  {
-@@ -2695,6 +2713,7 @@ static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green
+@@ -2657,6 +2675,7 @@ static void dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green
  	}
  	dce_v11_0_crtc_load_lut(crtc);
  }
@@ -85,10 +85,10 @@ index 8edc670..0129543 100644
  static void dce_v11_0_crtc_destroy(struct drm_crtc *crtc)
  {
 diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c
-index 57e8014..d0d9267 100644
+index b598caa..d203894 100644
 --- a/amd/amdgpu/dce_v8_0.c
 +++ b/amd/amdgpu/dce_v8_0.c
-@@ -2525,6 +2525,24 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc)
+@@ -2478,6 +2478,24 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc)
  	}
  }
  
@@ -113,7 +113,7 @@ index 57e8014..d0d9267 100644
  static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
  				    u16 *blue, uint32_t start, uint32_t size)
  {
-@@ -2539,6 +2557,7 @@ static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+@@ -2492,6 +2510,7 @@ static void dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
  	}
  	dce_v8_0_crtc_load_lut(crtc);
  }
@@ -122,10 +122,10 @@ index 57e8014..d0d9267 100644
  static void dce_v8_0_crtc_destroy(struct drm_crtc *crtc)
  {
 diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-index fedf490..c1f3c27 100644
+index edc8e86..32755a9 100644
 --- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
 +++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-@@ -995,6 +995,13 @@ void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc)
+@@ -998,6 +998,13 @@ void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc)
  	kfree(crtc);
  }
  
@@ -139,7 +139,7 @@ index fedf490..c1f3c27 100644
  static void amdgpu_dm_atomic_crtc_gamma_set(
  		struct drm_crtc *crtc,
  		u16 *red,
-@@ -1002,6 +1009,7 @@ static void amdgpu_dm_atomic_crtc_gamma_set(
+@@ -1005,6 +1012,7 @@ static void amdgpu_dm_atomic_crtc_gamma_set(
  		u16 *blue,
  		uint32_t start,
  		uint32_t size)
@@ -147,7 +147,7 @@ index fedf490..c1f3c27 100644
  {
  	struct drm_device *dev = crtc->dev;
  	struct drm_property *prop = dev->mode_config.prop_crtc_id;
-@@ -1009,6 +1017,10 @@ static void amdgpu_dm_atomic_crtc_gamma_set(
+@@ -1012,6 +1020,10 @@ static void amdgpu_dm_atomic_crtc_gamma_set(
  	crtc->state->mode.private_flags |= AMDGPU_CRTC_MODE_PRIVATE_FLAGS_GAMMASET;
  
  	drm_atomic_helper_crtc_set_property(crtc, prop, 0);
@@ -159,5 +159,5 @@ index fedf490..c1f3c27 100644
  
  static int dm_crtc_funcs_atomic_set_property(
 -- 
-2.10.1
+2.11.0
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch
deleted file mode 100644
index dc35fe4c96a..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Remove-vblank_disable_allowed-assignment.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d4a070e6d68ff7ce8ac49c6135acc759c9a1cf6e Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Sun, 25 Sep 2016 16:01:43 +0100
-Subject: [PATCH 06/14] Remove vblank_disable_allowed assignment
-
----
- amd/amdgpu/amdgpu_irq.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/amd/amdgpu/amdgpu_irq.c b/amd/amdgpu/amdgpu_irq.c
-index 6e85e69..71358c9 100644
---- a/amd/amdgpu/amdgpu_irq.c
-+++ b/amd/amdgpu/amdgpu_irq.c
-@@ -240,7 +240,9 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
- 		INIT_WORK(&adev->hotplug_work,
- 				amdgpu_hotplug_work_func);
- 	}
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
- 	adev->ddev->vblank_disable_allowed = true;
-+#endif
- 
- 	INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func);
- 
--- 
-2.10.1
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch
deleted file mode 100644
index 9e8749a31ca..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-__drm_atomic_helper_connector_destroy_state-call.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 406bb3a83b51b2bcf61a972721aa116e69c0a771 Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Sun, 25 Sep 2016 16:10:27 +0100
-Subject: [PATCH 07/14] Fix __drm_atomic_helper_connector_destroy_state call
-
----
- amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-index a9de2e5..fedf490 100644
---- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-@@ -1224,7 +1224,11 @@ void amdgpu_dm_connector_atomic_destroy_state(
- 	struct dm_connector_state *dm_state =
- 		to_dm_connector_state(state);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	__drm_atomic_helper_connector_destroy_state(connector->state);
-+#else
- 	__drm_atomic_helper_connector_destroy_state(connector, state);
-+#endif
- 
- 	kfree(dm_state);
- }
--- 
-2.10.1
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch
similarity index 73%
rename from pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch
rename to pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch
index d205fc3189c..197fdd32b10 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0011-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Fix-drm_atomic_helper_swap_state-for-4.8.0.patch
@@ -1,17 +1,17 @@
-From 32422de1ddaf539d284b32de5fe43d07b7553499 Mon Sep 17 00:00:00 2001
+From 7a5d45874b1e2bbbff2d2410f38203b5b0ae67c4 Mon Sep 17 00:00:00 2001
 From: "Luke A. Guest" <laguest@archeia.com>
 Date: Sun, 25 Sep 2016 17:00:32 +0100
-Subject: [PATCH 11/14] Fix drm_atomic_helper_swap_state for 4.8.0
+Subject: [PATCH 07/11] Fix drm_atomic_helper_swap_state for 4.8.0
 
 ---
  amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-index c1f3c27..60cba1a 100644
+index 32755a9..60ca073 100644
 --- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
 +++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
-@@ -2331,7 +2331,11 @@ int amdgpu_dm_atomic_commit(
+@@ -2528,7 +2528,11 @@ int amdgpu_dm_atomic_commit(
  	 * the software side now.
  	 */
  
@@ -24,5 +24,5 @@ index c1f3c27..60cba1a 100644
  	/*
  	 * From this point state become old state really. New state is
 -- 
-2.10.1
+2.11.0
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch
similarity index 75%
rename from pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch
rename to pkgs/os-specific/linux/amdgpu-pro/patches/0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch
index 77b0cf79640..8674c3537e8 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0012-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Add-extra-flag-to-ttm_bo_move_ttm-for-4.8.0-rc2.patch
@@ -1,17 +1,17 @@
-From 69207f061e13e6f02418d5706d230135abcc1a72 Mon Sep 17 00:00:00 2001
+From 7c536e8b9f73926014c0622eb101f2cf174b507b Mon Sep 17 00:00:00 2001
 From: "Luke A. Guest" <laguest@archeia.com>
 Date: Sun, 25 Sep 2016 19:19:45 +0100
-Subject: [PATCH 12/14] Add extra flag to ttm_bo_move_ttm for >=4.8.0-rc2
+Subject: [PATCH 08/11] Add extra flag to ttm_bo_move_ttm for >=4.8.0-rc2
 
 ---
  amd/amdgpu/amdgpu_ttm.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-index 145732a..dd691fa 100644
+index 89760f8..d102224 100644
 --- a/amd/amdgpu/amdgpu_ttm.c
 +++ b/amd/amdgpu/amdgpu_ttm.c
-@@ -344,7 +344,11 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo,
+@@ -428,7 +428,11 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo,
  	if (unlikely(r)) {
  		goto out_cleanup;
  	}
@@ -23,7 +23,7 @@ index 145732a..dd691fa 100644
  out_cleanup:
  	ttm_bo_mem_put(bo, &tmp_mem);
  	return r;
-@@ -377,7 +381,11 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo,
+@@ -461,7 +465,11 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo,
  	if (unlikely(r)) {
  		return r;
  	}
@@ -36,5 +36,5 @@ index 145732a..dd691fa 100644
  		goto out_cleanup;
  	}
 -- 
-2.10.1
+2.11.0
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch
deleted file mode 100644
index 827237a5f9a..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-Change-seq_printf-format-for-64-bit-context.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f268e7fa537fd8e12f4023803df795b2e29747e7 Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" <laguest@archeia.com>
-Date: Sun, 25 Sep 2016 16:46:39 +0100
-Subject: [PATCH 08/14] Change seq_printf format for 64 bit context
-
----
- amd/amdgpu/amdgpu_sa.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
-index 768a265..51d118e 100644
---- a/amd/amdgpu/amdgpu_sa.c
-+++ b/amd/amdgpu/amdgpu_sa.c
-@@ -428,8 +428,13 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
- 			   soffset, eoffset, eoffset - soffset);
- 
- 		if (i->fence)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
-+			seq_printf(m, " protected by 0x%08x on context %llu",
-+				   i->fence->seqno, i->fence->context);
-+#else
- 			seq_printf(m, " protected by 0x%08x on context %d",
- 				   i->fence->seqno, i->fence->context);
-+#endif
- 
- 		seq_printf(m, "\n");
- 	}
--- 
-2.10.1
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Remove-dependency-on-System.map.patch
similarity index 61%
rename from pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch
rename to pkgs/os-specific/linux/amdgpu-pro/patches/0009-Remove-dependency-on-System.map.patch
index 23a648e0d52..52c5f7f4593 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0013-Remove-dependency-on-System.map.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-Remove-dependency-on-System.map.patch
@@ -1,36 +1,32 @@
-From 115cdb5a06b112674d9652ef44d7f19583ff0136 Mon Sep 17 00:00:00 2001
+From 4d645984264e449d6a4507af033b26daed952eac Mon Sep 17 00:00:00 2001
 From: David McFarland <corngood@gmail.com>
 Date: Wed, 26 Oct 2016 22:26:39 -0300
-Subject: [PATCH 13/14] Remove dependency on System.map
+Subject: [PATCH 09/11] Remove dependency on System.map
 
 ---
- amd/backport/Makefile    |  3 +--
+ amd/backport/Makefile    |  1 -
  amd/backport/kcl_fence.c | 10 ++++++++--
- amd/backport/symbols     |  3 ---
- 3 files changed, 9 insertions(+), 7 deletions(-)
+ amd/backport/symbols     |  7 -------
+ 3 files changed, 8 insertions(+), 10 deletions(-)
  delete mode 100644 amd/backport/symbols
 
 diff --git a/amd/backport/Makefile b/amd/backport/Makefile
-index dcc94d5..ef27e94 100644
+index ff9339d..3f2d9ea 100644
 --- a/amd/backport/Makefile
 +++ b/amd/backport/Makefile
-@@ -55,10 +55,9 @@ ccflags-y += -DOS_NAME_RHEL_7
+@@ -64,7 +64,6 @@ ccflags-y += -DOS_NAME_RHEL_7_3
  endif
  endif
  
 -BACKPORT_OBJS = symbols.o
  endif
  
--BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
-+BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
- 
- amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS))
- 
+ BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o amdgpu_kcl.o kcl_fence_array.o kcl_kthread.o
 diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c
-index 8c697aa..85d96d3 100644
+index 54ad819..39f6d61 100644
 --- a/amd/backport/kcl_fence.c
 +++ b/amd/backport/kcl_fence.c
-@@ -25,8 +25,14 @@ struct default_wait_cb {
+@@ -52,8 +52,14 @@ struct default_wait_cb {
  	struct task_struct *task;
  };
  
@@ -49,13 +45,17 @@ index 8c697aa..85d96d3 100644
  _kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count,
 diff --git a/amd/backport/symbols b/amd/backport/symbols
 deleted file mode 100644
-index 2d3f2ee..0000000
+index 68cae63..0000000
 --- a/amd/backport/symbols
 +++ /dev/null
-@@ -1,3 +0,0 @@
+@@ -1,7 +0,0 @@
 -SYMS=""
 -
 -SYMS+="fence_default_wait_cb"
+-
+-if version_lt 2.6.33; then
+-    SYMS+=" kallsyms_lookup_name"
+-fi
 -- 
-2.10.1
+2.11.0
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0014-disable-dal-by-default.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-disable-dal-by-default.patch
similarity index 68%
rename from pkgs/os-specific/linux/amdgpu-pro/patches/0014-disable-dal-by-default.patch
rename to pkgs/os-specific/linux/amdgpu-pro/patches/0010-disable-dal-by-default.patch
index 693985ec2a2..e69e5c58319 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0014-disable-dal-by-default.patch
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-disable-dal-by-default.patch
@@ -1,19 +1,19 @@
-From 942064886eae63ed7aa0a63c07e9f175898dddf7 Mon Sep 17 00:00:00 2001
+From 5ab8e5e36634391a5c440bf78463226b2074485e Mon Sep 17 00:00:00 2001
 From: David McFarland <corngood@gmail.com>
 Date: Thu, 25 Aug 2016 22:17:06 -0300
-Subject: [PATCH 14/14] disable dal by default
+Subject: [PATCH 10/11] disable dal by default
 
 ---
  amd/amdgpu/amdgpu_drv.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/amd/amdgpu/amdgpu_drv.c b/amd/amdgpu/amdgpu_drv.c
-index 66f3242..df62815 100644
+index d6b3f35..4477865 100755
 --- a/amd/amdgpu/amdgpu_drv.c
 +++ b/amd/amdgpu/amdgpu_drv.c
-@@ -79,7 +79,7 @@ int amdgpu_vm_block_size = -1;
- int amdgpu_vm_fault_stop = 0;
+@@ -88,7 +88,7 @@ int amdgpu_vm_fault_stop = 0;
  int amdgpu_vm_debug = 0;
+ int amdgpu_vram_page_split = -1;
  int amdgpu_exp_hw_support = 0;
 -int amdgpu_dal = -1;
 +int amdgpu_dal = 0;
@@ -21,5 +21,5 @@ index 66f3242..df62815 100644
  int amdgpu_sched_hw_submission = 2;
  int amdgpu_powerplay = -1;
 -- 
-2.10.1
+2.11.0
 
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0011-kcl-fixes-for-16.50-linux-4.8.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0011-kcl-fixes-for-16.50-linux-4.8.patch
new file mode 100644
index 00000000000..0cf3ad262f6
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0011-kcl-fixes-for-16.50-linux-4.8.patch
@@ -0,0 +1,114 @@
+From 156445f6eda047ee5a5d6e4bde36c3e9ccbbd7d9 Mon Sep 17 00:00:00 2001
+From: David McFarland <corngood@gmail.com>
+Date: Thu, 29 Dec 2016 14:20:06 -0400
+Subject: [PATCH 11/11] kcl fixes for 16.50 + linux-4.8
+
+---
+ amd/amdgpu/dce_v6_0.c              |  5 +++--
+ amd/amdgpu/dce_virtual.c           |  5 +++--
+ amd/backport/include/kcl/kcl_drm.h | 12 ++++++++++++
+ amd/backport/include/kcl/kcl_ttm.h |  2 +-
+ amd/backport/kcl_drm.c             |  4 ++++
+ 5 files changed, 23 insertions(+), 5 deletions(-)
+
+diff --git a/amd/amdgpu/dce_v6_0.c b/amd/amdgpu/dce_v6_0.c
+index fd3eeb0..1f1874c 100644
+--- a/amd/amdgpu/dce_v6_0.c
++++ b/amd/amdgpu/dce_v6_0.c
+@@ -1946,9 +1946,9 @@ static void dce_v6_0_cursor_reset(struct drm_crtc *crtc)
+ 	}
+ }
+ 
+-static void dce_v6_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+-				    u16 *blue, uint32_t start, uint32_t size)
++static kcl_crtc_gamma_set_callback(dce_v6_0_crtc_gamma_set)
+ {
++  kcl_crtc_gamma_set_pre
+ 	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
+ 	int end = (start + size > 256) ? 256 : start + size, i;
+ 
+@@ -1959,6 +1959,7 @@ static void dce_v6_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+ 		amdgpu_crtc->lut_b[i] = blue[i] >> 6;
+ 	}
+ 	dce_v6_0_crtc_load_lut(crtc);
++  kcl_crtc_gamma_set_suf
+ }
+ 
+ static void dce_v6_0_crtc_destroy(struct drm_crtc *crtc)
+diff --git a/amd/amdgpu/dce_virtual.c b/amd/amdgpu/dce_virtual.c
+index 36e2094..11b98e2 100644
+--- a/amd/amdgpu/dce_virtual.c
++++ b/amd/amdgpu/dce_virtual.c
+@@ -152,9 +152,9 @@ static void dce_virtual_bandwidth_update(struct amdgpu_device *adev)
+ 	return;
+ }
+ 
+-static void dce_virtual_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+-				    u16 *blue, uint32_t start, uint32_t size)
++static kcl_crtc_gamma_set_callback(dce_virtual_crtc_gamma_set)
+ {
++  kcl_crtc_gamma_set_pre
+ 	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
+ 	int end = (start + size > 256) ? 256 : start + size, i;
+ 
+@@ -164,6 +164,7 @@ static void dce_virtual_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *gre
+ 		amdgpu_crtc->lut_g[i] = green[i] >> 6;
+ 		amdgpu_crtc->lut_b[i] = blue[i] >> 6;
+ 	}
++  kcl_crtc_gamma_set_suf
+ }
+ 
+ static void dce_virtual_crtc_destroy(struct drm_crtc *crtc)
+diff --git a/amd/backport/include/kcl/kcl_drm.h b/amd/backport/include/kcl/kcl_drm.h
+index 95bf640..61c38b1 100644
+--- a/amd/backport/include/kcl/kcl_drm.h
++++ b/amd/backport/include/kcl/kcl_drm.h
+@@ -206,4 +206,16 @@ int drm_atomic_helper_resume(struct drm_device *dev,
+ 
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++#define kcl_crtc_gamma_set_callback(n) int n(struct drm_crtc *crtc, \
++    u16 *red, u16 *green, u16 *blue, uint32_t size)
++#define kcl_crtc_gamma_set_pre uint32_t start = 0;
++#define kcl_crtc_gamma_set_suf return 0;
++#else
++#define kcl_crtc_gamma_set_callback(n) void n(struct drm_crtc *crtc, \
++    u16 *red, u16 *green, u16 *blue, uint32_t start, uint32_t size)
++#define kcl_crtc_gamma_set_pre
++#define kcl_crtc_gamma_set_suf
++#endif
++
+ #endif /* AMDGPU_BACKPORT_KCL_DRM_H */
+diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h
+index 52cdbc8..cdda0b5 100644
+--- a/amd/backport/include/kcl/kcl_ttm.h
++++ b/amd/backport/include/kcl/kcl_ttm.h
+@@ -152,7 +152,7 @@ static inline int kcl_ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
+ 		bool evict, bool no_wait_gpu,
+ 		struct ttm_mem_reg *new_mem)
+ {
+-#if defined(BUILD_AS_DKMS)
++#if defined(BUILD_AS_DKMS) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0))
+ 	return ttm_bo_move_accel_cleanup(bo, fence,
+ 			evict, no_wait_gpu, new_mem);
+ #else
+diff --git a/amd/backport/kcl_drm.c b/amd/backport/kcl_drm.c
+index 27d4aaa..a083c87 100644
+--- a/amd/backport/kcl_drm.c
++++ b/amd/backport/kcl_drm.c
+@@ -178,7 +178,11 @@ static inline struct drm_plane_state *
+ _kcl_drm_atomic_get_existing_plane_state(struct drm_atomic_state *state,
+                     struct drm_plane *plane)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++    return drm_atomic_get_existing_plane_state(state, plane);
++#else
+     return state->plane_states[drm_plane_index(plane)];
++#endif
+ }
+ 
+ void
+-- 
+2.11.0
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0012-use-kernel-fence_array-in-4.8.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0012-use-kernel-fence_array-in-4.8.patch
new file mode 100644
index 00000000000..07ce868c29d
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0012-use-kernel-fence_array-in-4.8.patch
@@ -0,0 +1,55 @@
+From 73e77e056427e2042b8d84933c02db92e17cf233 Mon Sep 17 00:00:00 2001
+From: David McFarland <corngood@gmail.com>
+Date: Thu, 29 Dec 2016 14:49:18 -0400
+Subject: [PATCH] use kernel fence_array in 4.8+
+
+---
+ amd/backport/include/kcl/kcl_fence_array.h | 10 ++++++++--
+ amd/backport/kcl_fence_array.c             |  2 +-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/amd/backport/include/kcl/kcl_fence_array.h b/amd/backport/include/kcl/kcl_fence_array.h
+index bb4401e..0d9f344 100644
+--- a/amd/backport/include/kcl/kcl_fence_array.h
++++ b/amd/backport/include/kcl/kcl_fence_array.h
+@@ -19,11 +19,15 @@
+  * more details.
+  */
+ 
+-#ifndef __LINUX_FENCE_ARRAY_H
+-#define __LINUX_FENCE_ARRAY_H
++#ifndef __KCL_FENCE_ARRAY_H
++#define __KCL_FENCE_ARRAY_H
+ 
+ #include <linux/fence.h>
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
++#include <linux/fence-array.h>
++#else
++
+ /**
+  * struct fence_array_cb - callback helper for fence array
+  * @cb: fence callback structure for signaling
+@@ -72,4 +76,6 @@ struct fence_array *fence_array_create(int num_fences, struct fence **fences,
+ 				       u64 context, unsigned seqno,
+ 				       bool signal_on_any);
+ 
++#endif
++
+ #endif /* __LINUX_FENCE_ARRAY_H */
+diff --git a/amd/backport/kcl_fence_array.c b/amd/backport/kcl_fence_array.c
+index d7ee15c..1865444 100644
+--- a/amd/backport/kcl_fence_array.c
++++ b/amd/backport/kcl_fence_array.c
+@@ -21,7 +21,7 @@
+ #include <linux/export.h>
+ #include <linux/slab.h>
+ 
+-#if defined(BUILD_AS_DKMS)
++#if defined(BUILD_AS_DKMS) && LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
+ static void fence_array_cb_func(struct fence *f, struct fence_cb *cb);
+ 
+ static const char *fence_array_get_driver_name(struct fence *fence)
+-- 
+2.11.0
+

From 337336a3f8e9a35f7e1e333a3740aa96451979a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 10 Jan 2017 15:26:36 +0100
Subject: [PATCH 0873/1310] perl-IO-Compress: try without testing for now

Tests got broken by zlib update.  Also 2.0.63 -> 2.0.70,
but the update didn't help with this unfortunately.

LibreOffice now starts fine for me, and Hydra package builds.
---
 pkgs/top-level/perl-packages.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 112665811c6..1587cee7430 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6568,11 +6568,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  IOCompress = buildPerlPackage {
-    name = "IO-Compress-2.063";
+  IOCompress = buildPerlPackage rec {
+    name = "IO-Compress-2.070";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.063.tar.gz;
-      sha256 = "1198jqsfyshc8pc74dvn04gmqa0x6nwngkbf731zgd4chrjlylhd";
+      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+      sha256 = "3e761b833c8e55eb811a5eeab07831bb380dcdce256cc45cfe8816602a3574ff";
     };
     propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ];
     meta = {
@@ -6581,7 +6581,8 @@ let self = _self // overrides; _self = with self; {
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
     };
-    doCheck = !stdenv.isDarwin;
+    # Same as CompressRawZlib
+    doCheck = false && !stdenv.isDarwin;
   };
 
   IODigest = buildPerlPackage {

From 98bcca88134be2934b4d4947d880954b46d3f06c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 10 Jan 2017 15:35:27 +0100
Subject: [PATCH 0874/1310] gajim: enable omemo dependencies by default

---
 .../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 11e2b13653d..3041d6e045e 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -7,7 +7,7 @@
 , enableRST ? true
 , enableSpelling ? true, gtkspell2 ? null
 , enableNotifications ? false
-, enableOmemoPluginDependencies ? false
+, enableOmemoPluginDependencies ? true
 , extraPythonPackages ? pkgs: []
 }:
 

From 4fc0c15af53e569ba3f63479d02f3cdb63eb2efe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 10 Jan 2017 15:44:06 +0100
Subject: [PATCH 0875/1310] pythonPackages.sounddevice: 0.3.4 -> 0.36

---
 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 1b93cc43d75..5d083494e3c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23842,11 +23842,11 @@ in {
 
   sounddevice = buildPythonPackage rec {
     name = "sounddevice-${version}";
-    version = "0.3.4";
+    version = "0.3.6";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/sounddevice/${name}.tar.gz";
-      sha256 = "f6c4120357c1458b23bd0d466c66808efdefad397bf97b1162600d079d4665ae";
+      sha256 = "4ef39be2d13069fbad8c69ac259e018d96ce55c23b529a7e0be9bd9a76e2e8da";
     };
 
     propagatedBuildInputs = with self; [ cffi numpy pkgs.portaudio ];

From 9d35918f1a0a5a9e1805f960f65216d25644ce11 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 10 Jan 2017 10:05:51 -0600
Subject: [PATCH 0876/1310] kdeWrapper: reformat propagated-user-env-packages

---
 pkgs/development/libraries/kde-frameworks/kde-wrapper.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
index a1f289f5f2b..f0fa991a38a 100644
--- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
+++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
@@ -62,8 +62,6 @@ stdenv.mkDerivation {
     done
 
     mkdir -p "$out/nix-support"
-    for drv in $unwrapped; do
-        echo "$drv" >> "$out/nix-support/propagated-user-env-packages"
-    done
+    echo "$unwrapped" > "$out/nix-support/propagated-user-env-packages"
   '';
 }

From e4fb2bb0c51f6e7fadef6f46b2fe50a6f02e0a38 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 10 Jan 2017 17:29:19 +0100
Subject: [PATCH 0877/1310] Revert "nixos/stage2: Check for each special mount
 individually and mount missing ones. (#21370)"

This reverts commit 712e62c2608908cfda471cb8fe409ac65c4844e4.

This commit broke NixOS containers. Systemd wouldn't detect if a container
started successfully and would kill it again after a grace period.

Additionally this prints mount errors due to already mounted filesystems
at boot.
---
 nixos/modules/system/boot/stage-2-init.sh | 28 ++++++++++-------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 7a54bb03e29..f827e530f87 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -34,24 +34,20 @@ if [ -z "$container" ]; then
 fi
 
 
-# Likewise, stage 1 mounts /proc, /dev, /sys and /run, so if we don't have a
+# Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a
 # stage 1, we need to do that here.
-# We check for each mountpoint separately to avoid esoteric failure modes
-# if only a subset was mounted by whatever called us.
-specialMount() {
-    local device="$1"
-    local mountPoint="$2"
-    local options="$3"
-    local fsType="$4"
+if [ ! -e /proc/1 ]; then
+    specialMount() {
+        local device="$1"
+        local mountPoint="$2"
+        local options="$3"
+        local fsType="$4"
 
-    if mountpoint -q "$mountpoint"; then
-        return 0
-    fi
-
-    mkdir -m 0755 -p "$mountPoint"
-    mount -n -t "$fsType" -o "$options" "$device" "$mountPoint"
-}
-source @earlyMountScript@
+        mkdir -m 0755 -p "$mountPoint"
+        mount -n -t "$fsType" -o "$options" "$device" "$mountPoint"
+    }
+    source @earlyMountScript@
+fi
 
 
 echo "booting system configuration $systemConfig" > /dev/kmsg

From db90ac6fff17ca83dccbb45d7f7818f07e3fa731 Mon Sep 17 00:00:00 2001
From: Alexander Kahl <e-user@fsfe.org>
Date: Tue, 10 Jan 2017 17:41:09 +0100
Subject: [PATCH 0878/1310] openldap: load configuration files from global
 sysconfdir /etc (#21648)

---
 pkgs/development/libraries/openldap/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index cdef4d9a49f..05c03dcd842 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -19,10 +19,13 @@ stdenv.mkDerivation rec {
     [ "--enable-overlays"
       "--disable-dependency-tracking"   # speeds up one-time build
       "--enable-modules"
+      "--sysconfdir=/etc"
     ] ++ stdenv.lib.optional (openssl == null) "--without-tls"
       ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
       ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
 
+  installFlags = [ "sysconfdir=$(out)/etc" ];
+
   # 1. Fixup broken libtool
   # 2. Libraries left in the build location confuse `patchelf --shrink-rpath`
   #    Delete these to let patchelf discover the right path instead.

From 15ef9bc87d2e74366f3d6bfe4818cee6d33a1aa6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 10 Jan 2017 20:08:22 +0100
Subject: [PATCH 0879/1310] xsok: init at 1.02

---
 pkgs/games/xsok/default.nix     | 47 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/games/xsok/default.nix

diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix
new file mode 100644
index 00000000000..57c2ca2dfd8
--- /dev/null
+++ b/pkgs/games/xsok/default.nix
@@ -0,0 +1,47 @@
+{stdenv, fetchurl, libX11, imake, libXt, libXaw, libXpm, libXext
+, withNethackLevels ? true
+}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "xsok";
+  version = "1.02";
+
+  src = fetchurl {
+    url = "http://http.debian.net/debian/pool/main/x/xsok/xsok_1.02.orig.tar.gz";
+    sha256 = "0f4z53xsy4w8x8zp5jya689xp3rcfpi5wri2ip0qa8nk3sw7zj73";
+  };
+
+  nethackLevels = fetchurl {
+    url = "https://www.electricmonk.nl/data/nethack/nethack.def";
+    sha256 = "057ircp13hfpy513c7wpyp986hsvhqs7km98w4k39f5wkvp3dj02";
+  };
+
+  buildInputs = [libX11 libXt libXaw libXpm libXext];
+  nativeBuildInputs = [imake];
+
+  NIX_CFLAGS_COMPILE=" -isystem ${libXpm.dev}/include/X11 ";
+
+  preConfigure = ''
+    sed -e "s@/usr/@$out/share/@g" -i src/Imakefile
+    sed -e "s@/var/games/xsok@./.xsok/@g" -i src/Imakefile
+    sed -e '/chown /d' -i src/Imakefile
+    sed -e '/chmod /d' -i src/Imakefile
+    sed -e '/InstallAppDefaults/d' -i src/Imakefile
+  '';
+
+  makeFlags = ["BINDIR=$(out)/bin"];
+
+  postInstall = stdenv.lib.optionalString withNethackLevels ''
+    gzip < ${nethackLevels} > "$out/share/games/lib/xsok/Nethack.def.gz"
+    echo Nethack > "$out/share/games/lib/xsok/gametypes"
+  '';
+
+  meta = {
+    inherit version;
+    description = "A generic Sokoban game for X11";
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://tracker.debian.org/pkg/xsok";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3a321c9065..ed648b568c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16408,6 +16408,8 @@ in
 
   xsnow = callPackage ../games/xsnow { };
 
+  xsok = callPackage ../games/xsok { };
+
   xsokoban = callPackage ../games/xsokoban { };
 
   zandronum = callPackage ../games/zandronum {

From a493b89907cde49b0791bc6090c16910d55df824 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 10 Jan 2017 11:50:13 -0800
Subject: [PATCH 0880/1310] vimPlugins: add delimitMate

---
 pkgs/misc/vim-plugins/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 2f792767ccb..6a4105c7323 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -329,6 +329,17 @@ rec {
 
   };
 
+  delimitMate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "delimitMate-2016-07-19";
+    src = fetchgit {
+      url = "git://github.com/Raimondi/delimitMate";
+      rev = "b5719054beebe0135c94f4711a06dc7588041f09";
+      sha256 = "03nmkiq138w6kq4s3mh4yyr6bjvqwj8hg6qlji1ng4vnzb0638q3";
+    };
+    dependencies = [];
+
+  };
+
   extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "extradite-2015-09-22";
     src = fetchgit {

From f2713ce805bbd2e8f369748e046acc4701b96391 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 10 Jan 2017 11:50:22 -0800
Subject: [PATCH 0881/1310] update reattach-to-user-namespace

---
 .../os-specific/darwin/reattach-to-user-namespace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
index 0d5e21485b9..5b3ee9c88f8 100644
--- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
+++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git";
-    sha256 = "0hrh95di5dvpynq2yfcrgn93l077h28i6msham00byw68cx0dd3z";
-    rev = "2765aeab8f337c29e260a912bf4267a2732d8640";
+    sha256 = "0kv11vi54g6waf9941hy1pwmwyab0y7hbmbkcgwhzb5ja21ysc2a";
+    rev = "3689998acce9990726c8a68a85298ab693a62458";
   };
 
   buildFlags = "ARCHES=x86_64";

From 6462eb6bdde8ebeaf7439455a52758ddc82be4f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 10 Jan 2017 21:17:12 +0100
Subject: [PATCH 0882/1310] nodejs: set hiPrio for 6.x

---
 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 ed648b568c2..1337a74d11a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2529,7 +2529,7 @@ in
 
   ninka = callPackage ../development/tools/misc/ninka { };
 
-  nodejs = nodejs-6_x;
+  nodejs = hiPrio nodejs-6_x;
 
   nodejs-slim = nodejs-slim-6_x;
 

From 71160a430defa103a9684c7d64a7c429164f4a80 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 10 Jan 2017 21:10:44 +0100
Subject: [PATCH 0883/1310] clipster: use python3:

to work around https://github.com/mrichar1/clipster/issues/32
---
 pkgs/tools/misc/clipster/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index 711e601234d..1425c725206 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -1,4 +1,4 @@
-{fetchFromGitHub , stdenv, makeWrapper, python, gtk3,  libwnck3 }:
+{fetchFromGitHub , stdenv, makeWrapper, python3, gtk3, libwnck3 }:
 
 stdenv.mkDerivation  rec {
   name = "clipster-unstable-${version}";
@@ -11,11 +11,12 @@ stdenv.mkDerivation  rec {
     sha256 = "005akgk1wn3z5vxfjii202zzwz85zydimfgm69ml68imj5vbhkg1";
   };
 
-  pythonEnv = python.withPackages(ps: with ps; [ dbus-python pygtk pygobject3 ]);
+  pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);
 
   buildInputs =  [ pythonEnv gtk3 libwnck3 makeWrapper ];
 
   installPhase = ''
+    sed -i 's/python/python3/g' clipster
     mkdir -p $out/bin/
     cp clipster $out/bin/
     wrapProgram "$out/bin/clipster" \

From 3f49c4f3ce8762036f82195dcd6a75f17f37fc2b Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 10 Jan 2017 12:21:43 -0800
Subject: [PATCH 0884/1310] reattach-to-user-namespace: fix version

---
 pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
index 5b3ee9c88f8..e2776475432 100644
--- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
+++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "reattach-to-user-namespace-2.4";
+  name = "reattach-to-user-namespace-2.5";
 
   src = fetchgit {
     url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git";

From 22496f5a700bfd41b93be9c2ac570b9ef2a9aaf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20G=C3=B6tz?= <stefan.goetz@uni-ulm.de>
Date: Tue, 10 Jan 2017 21:34:54 +0100
Subject: [PATCH 0885/1310] youtube-dl: 2017.01.08 -> 2017.01.10

---
 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 8e1519ec189..6822f79baf1 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.08";
+  version = "2017.01.10";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "ac2942d001003575858ff044dd1c1c264ab08527efa1af7036f773ea82b25fd6";
+    sha256 = "6493d1400c5735221d65688548ada4d45875f25562f7c49c73263d9ae4369932";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From 5143998a3e2fb51e7da3aecccfbf1bab95b8434d Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 10 Jan 2017 21:42:37 +0100
Subject: [PATCH 0886/1310] rofi: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index c7da77a3a03..3c4cf27308b 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.0";
+  version = "1.3.1";
   name = "rofi-${version}";
 
   src = fetchurl {
-    url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1a65ai93ygras5bi7wc0s5i3zqslzqlnw3klq3sdnp2p0d6hjjqn";
+    url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz";
+    sha256 = "09i3vd8k6zqphrm382fglsmxc4q6dg00xddzl96kakszgvdd4qfs";
   };
 
   preConfigure = ''

From 6bdecbf1ba4121c09ab120999e9f8cd3ca32f482 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 9 Jan 2017 23:24:17 +0100
Subject: [PATCH 0887/1310] graphviz: add darwin frameworks

---
 pkgs/tools/graphics/graphviz/2.32.nix    |  3 ++-
 pkgs/tools/graphics/graphviz/default.nix |  5 +++--
 pkgs/top-level/all-packages.nix          | 10 +++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
index a09d60f788c..c4a0981dbb3 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
 , yacc, libtool, fontconfig, pango, gd, xorg, gts, gettext, cairo
+, ApplicationServices
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
     [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
       pango gd gts
     ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ]
-    ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
+    ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices gettext ];
 
   CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo";
 
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index e815cded09a..b0ccc5428bb 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat
 , yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo
 , flex
+, ApplicationServices
 }:
 
 stdenv.mkDerivation rec {
@@ -20,9 +21,9 @@ stdenv.mkDerivation rec {
     [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango
     ] ++ stdenv.lib.optionals (xorg != null)
       (with xorg; [ xlibsWrapper libXrender libXaw libXpm ])
-    ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
+    ++ stdenv.lib.optionals (stdenv.isDarwin) [ ApplicationServices gettext ];
 
-  CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin")
+  CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin)
     "-I${cairo.dev}/include/cairo";
 
   configureFlags = stdenv.lib.optional (xorg == null) "--without-x";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed648b568c2..ae8ea57eb01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1988,9 +1988,11 @@ in
     pythonPackages = pypyPackages;
   };
 
-  graphviz = callPackage ../tools/graphics/graphviz { };
+  graphviz = callPackage ../tools/graphics/graphviz {
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+  };
 
-  graphviz-nox = callPackage ../tools/graphics/graphviz {
+  graphviz-nox = graphviz.override {
     xorg = null;
     libdevil = libdevil-nox;
   };
@@ -2005,7 +2007,9 @@ in
    * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
    * objections before removal. The feature is libgraph.
    */
-  graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { };
+  graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix {
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+  };
 
   grin = callPackage ../tools/text/grin { };
   ripgrep = callPackage ../tools/text/ripgrep { };

From 9280174493a8f9ef72e6c3345629e8ef2a0b990c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20G=C3=B6tz?= <stefan.goetz@uni-ulm.de>
Date: Tue, 10 Jan 2017 22:42:29 +0100
Subject: [PATCH 0888/1310] mpv: 0.22.0 ->  0.23.0

---
 pkgs/applications/video/mpv/default.nix   |  8 ++++----
 pkgs/development/libraries/ffmpeg/3.2.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix           |  3 +++
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/ffmpeg/3.2.nix

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index dd9c67b952f..960dabd7569 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromGitHub, makeWrapper
-, docutils, perl, pkgconfig, python3, which, ffmpeg
+, docutils, perl, pkgconfig, python3, which, ffmpeg_3_2
 , freefont_ttf, freetype, libass, libpthreadstubs
 , lua, lua5_sockets, libuchardet, libiconv ? null, darwin
 
@@ -79,13 +79,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "mpv-player";
     repo  = "mpv";
     rev    = "v${version}";
-    sha256 = "0mv8fs2zxp6pvpi5xdrpvvqcaa5f0c83jdfi0pfqnwbpkz1kb9s6";
+    sha256 = "02k8p4z1mwxxlg9spwwrlcciia80kyrpp09hpl60g22h85jj1ng9";
   };
 
   patchPhase = ''
@@ -112,7 +112,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ];
 
   buildInputs = [
-    ffmpeg freetype libass libpthreadstubs
+    ffmpeg_3_2 freetype libass libpthreadstubs
     lua lua5_sockets libuchardet
   ] ++ optional alsaSupport        alsaLib
     ++ optional xvSupport          libXv
diff --git a/pkgs/development/libraries/ffmpeg/3.2.nix b/pkgs/development/libraries/ffmpeg/3.2.nix
new file mode 100644
index 00000000000..7587ca7c3ca
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/3.2.nix
@@ -0,0 +1,13 @@
+{ stdenv, callPackage
+# Darwin frameworks
+, Cocoa, CoreMedia
+, ...
+}@args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}.2";
+  branch = "3.2";
+  sha256 = "0srn788i4k5827sl8vmds6133vjy9ygsmgzwn40n3l5qs5b9l4hb";
+  darwinFrameworks = [ Cocoa CoreMedia ];
+  patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1337a74d11a..adc434f97d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7091,6 +7091,9 @@ in
   ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
   };
+  ffmpeg_3_2 = callPackage ../development/libraries/ffmpeg/3.2.nix {
+    inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
+  };
   # Aliases
   ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;

From 30a554acfbb8421300dc835761e0e3a51bd7d718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 10 Jan 2017 22:47:23 +0100
Subject: [PATCH 0889/1310] apparmor: support for lxc profiles

---
 nixos/modules/security/apparmor.nix  | 18 +++++++++++++-----
 nixos/modules/virtualisation/lxc.nix |  6 ++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index 202639f9870..d323a158a4d 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -18,22 +18,30 @@ in
          default = [];
          description = "List of files containing AppArmor profiles.";
        };
+       packages = mkOption {
+         type = types.listOf types.package;
+         default = [];
+         description = "List of packages to be added to apparmor's include path";
+       };
      };
    };
 
    config = mkIf cfg.enable {
      environment.systemPackages = [ pkgs.apparmor-utils ];
 
-     systemd.services.apparmor = {
+     systemd.services.apparmor = let
+       paths = concatMapStrings (s: " -I ${s}/etc/apparmor.d")
+         ([ pkgs.apparmor-profiles ] ++ cfg.packages);
+     in {
        wantedBy = [ "local-fs.target" ];
        serviceConfig = {
          Type = "oneshot";
          RemainAfterExit = "yes";
-         ExecStart = concatMapStrings (p:
-           ''${pkgs.apparmor-parser}/bin/apparmor_parser -rKv -I ${pkgs.apparmor-profiles}/etc/apparmor.d "${p}" ; ''
+         ExecStart = map (p:
+           ''${pkgs.apparmor-parser}/bin/apparmor_parser -rKv ${paths} "${p}"''
          ) cfg.profiles;
-         ExecStop = concatMapStrings (p:
-           ''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}" ; ''
+         ExecStop = map (p:
+           ''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}"''
          ) cfg.profiles;
        };
      };
diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix
index 22da012e414..6759ff0f2fe 100644
--- a/nixos/modules/virtualisation/lxc.nix
+++ b/nixos/modules/virtualisation/lxc.nix
@@ -62,19 +62,17 @@ in
             </citerefentry>.
           '';
       };
-
   };
 
   ###### implementation
 
   config = mkIf cfg.enable {
-
     environment.systemPackages = [ pkgs.lxc ];
-
     environment.etc."lxc/lxc.conf".text = cfg.systemConfig;
     environment.etc."lxc/lxc-usernet".text = cfg.usernetConfig;
     environment.etc."lxc/default.conf".text = cfg.defaultConfig;
 
+    security.apparmor.packages = [ pkgs.lxc ];
+    security.apparmor.profiles = [ "${pkgs.lxc}/etc/apparmor.d/lxc-containers" ];
   };
-
 }

From 581a5aec887fc399a44fad4f2dae322395ab13ff Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 10 Jan 2017 23:03:49 +0100
Subject: [PATCH 0890/1310] imagemagick: add darwin frameworks

---
 pkgs/applications/graphics/ImageMagick/7.0.nix     | 3 ++-
 pkgs/applications/graphics/ImageMagick/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix                    | 8 ++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 3a0771a73ef..f5c475ef93a 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
 , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
+, ApplicationServices
 }:
 
 let
@@ -58,7 +59,7 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
       [ openexr librsvg openjpeg ]
-    ;
+    ++ lib.optional stdenv.isDarwin ApplicationServices;
 
   propagatedBuildInputs =
     [ bzip2 freetype libjpeg lcms2 ]
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index e7f0a6b11d9..3364a661e0c 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
 , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
+, ApplicationServices
 }:
 
 let
@@ -70,7 +71,7 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
       [ openexr librsvg openjpeg ]
-    ;
+    ++ lib.optional stdenv.isDarwin ApplicationServices;
 
   propagatedBuildInputs =
     [ bzip2 freetype libjpeg lcms2 ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae8ea57eb01..7fb528c6465 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13697,7 +13697,9 @@ in
     ghostscript = null;
   };
 
-  imagemagickBig = callPackage ../applications/graphics/ImageMagick { };
+  imagemagickBig = callPackage ../applications/graphics/ImageMagick {
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+  };
 
   imagemagick7_light = lowPrio (imagemagick7.override {
     bzip2 = null;
@@ -13723,7 +13725,9 @@ in
     ghostscript = null;
   });
 
-  imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { });
+  imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix {
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+  });
 
   # Impressive, formerly known as "KeyJNote".
   impressive = callPackage ../applications/office/impressive { };

From 0d4d401b7f67766f52052b123d61988e8deadfb2 Mon Sep 17 00:00:00 2001
From: 3noch <eacameron@gmail.com>
Date: Fri, 6 Jan 2017 02:09:54 -0500
Subject: [PATCH 0891/1310] nginx: add PageSpeed module (Linux only)

---
 pkgs/development/libraries/psol/default.nix |  5 ++++
 pkgs/development/libraries/psol/generic.nix | 16 ++++++++++++
 pkgs/servers/http/nginx/modules.nix         | 29 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 ++-
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/psol/default.nix
 create mode 100644 pkgs/development/libraries/psol/generic.nix

diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/development/libraries/psol/default.nix
new file mode 100644
index 00000000000..5c78c1a288f
--- /dev/null
+++ b/pkgs/development/libraries/psol/default.nix
@@ -0,0 +1,5 @@
+{ callPackage }:
+callPackage ./generic.nix {} {
+  version = "1.11.33.4";
+  sha256  = "1jq2llp0i4666rwqnx1hs4pjlpblxivvs1jkkjzlmdbsv28jzjq8";
+}
diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix
new file mode 100644
index 00000000000..3e82bb4975d
--- /dev/null
+++ b/pkgs/development/libraries/psol/generic.nix
@@ -0,0 +1,16 @@
+{ fetchzip, stdenv }:
+{ version, sha256 }:
+{ inherit version; } // fetchzip {
+  inherit sha256;
+  name   = "psol-${version}";
+  url    = "https://dl.google.com/dl/page-speed/psol/${version}.tar.gz";
+
+  meta = {
+    description = "PageSpeed Optimization Libraries";
+    homepage    = "https://developers.google.com/speed/pagespeed/psol";
+    license     = stdenv.lib.licenses.asl20;
+    # WARNING: This only works with Linux because the pre-built PSOL binary is only supplied for Linux.
+    # TODO: Build PSOL from source to support more platforms.
+    platforms   = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index d19c147ce93..20ea55f82a1 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -146,4 +146,33 @@
       sha256 = "0ib2jrbjwrhvmihhnzkp4w87fxssbbmmmj6lfdwpm6ni8p9g60dw";
     };
   };
+
+  pagespeed =
+    let
+      version = pkgs.psol.version;
+
+      moduleSrc = fetchFromGitHub {
+        owner  = "pagespeed";
+        repo   = "ngx_pagespeed";
+        rev    = "v${version}-beta";
+        sha256 = "03dvzf1lgsjxcs1jjxq95n2rhgq0wy0f9ahvgascy0fak7qx4xj9";
+      };
+
+      ngx_pagespeed = pkgs.runCommand
+        "ngx_pagespeed"
+        {
+          meta = {
+            description = "PageSpeed module for Nginx";
+            homepage    = "https://developers.google.com/speed/pagespeed/module/";
+            license     = pkgs.stdenv.lib.licenses.asl20;
+          };
+        }
+        ''
+          cp -r "${moduleSrc}" "$out"
+          chmod -R +w "$out"
+          ln -s "${pkgs.psol}" "$out/psol"
+        '';
+    in {
+      src = ngx_pagespeed;
+    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index adc434f97d7..f05b3dab363 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8395,7 +8395,7 @@ in
 
   libpfm = callPackage ../development/libraries/libpfm { };
 
-  libpqxx = callPackage ../development/libraries/libpqxx { 
+  libpqxx = callPackage ../development/libraries/libpqxx {
     gnused = gnused_422;
   };
 
@@ -14589,6 +14589,8 @@ in
     autoAwaySupport = config.profanity.autoAwaySupport or true;
   };
 
+  psol = callPackage ../development/libraries/psol/default.nix { };
+
   pstree = callPackage ../applications/misc/pstree { };
 
   pulseview = callPackage ../applications/science/electronics/pulseview { };

From cb061ef4f2faf05e226e72da323c5d3c310c25bb Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 10 Jan 2017 23:15:05 +0100
Subject: [PATCH 0892/1310] gst_plugins_base: add darwin frameworks

---
 .../libraries/gstreamer/legacy/gst-plugins-base/default.nix   | 4 +++-
 pkgs/top-level/all-packages.nix                               | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
index 0e1e3c4897e..5b2ba728f3a 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
@@ -1,6 +1,7 @@
 { fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia
 , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc
 , libintlOrEmpty
+, ApplicationServices
 , # Whether to build no plugins that have external dependencies
   # (except the ALSA plugin).
   minimalDeps ? false
@@ -36,7 +37,8 @@ stdenv.mkDerivation rec {
         liboil ]
     # can't build cdparanoia on darwin
     ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia
-    ++ libintlOrEmpty;
+    ++ libintlOrEmpty
+    ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fb528c6465..15796fd0356 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7386,7 +7386,9 @@ in
     bison = bison2;
   };
 
-  gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {};
+  gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+  };
 
   gst_plugins_good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {};
 

From 3c36c85b1c9cdc2542aa9d963245e6b3d0159cec Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 1 Nov 2016 01:14:13 +0100
Subject: [PATCH 0893/1310] lv2-git: init at 2016-10-23

---
 .../libraries/audio/lv2/lv2-git.nix           | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/audio/lv2/lv2-git.nix

diff --git a/pkgs/development/libraries/audio/lv2/lv2-git.nix b/pkgs/development/libraries/audio/lv2/lv2-git.nix
new file mode 100644
index 00000000000..e3230a86e57
--- /dev/null
+++ b/pkgs/development/libraries/audio/lv2/lv2-git.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python }:
+
+stdenv.mkDerivation rec {
+  name = "lv2-git-${version}";
+  version = "2016-10-23";
+
+  src = fetchgit {
+    url = "http://lv2plug.in/git/cgit.cgi/lv2.git";
+    rev = "b36868f3b96a436961c0c51b5b2dd71d05da9b12";
+    sha256 = "1sx39j0gary2nayzv7xgqcra7z1rcw9hrafkji05aksdwf7q0pdm";
+  };
+
+  buildInputs = [ gtk2 libsndfile pkgconfig python ];
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    homepage = http://lv2plug.in;
+    description = "A plugin standard for audio systems";
+    license = licenses.mit;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}

From 60e06fb39fc0aa232c962dbc41c45ac3e10b0e13 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 1 Nov 2016 01:15:12 +0100
Subject: [PATCH 0894/1310] lv2: 1.12.0 -> 1.14.0

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

diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index fad8dc86bd1..34301412f56 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lv2-${version}";
-  version = "1.12.0";
+  version = "1.14.0";
 
   src = fetchurl {
     url = "http://lv2plug.in/spec/${name}.tar.bz2";
-    sha256 = "1saq0vwqy5zjdkgc5ahs8kcabxfmff2mmg68fiqrkv8hiw9m6jks";
+    sha256 = "0chxwys3vnn3nxc9x2vchm74s9sx0vfra6y893byy12ci61jc1dq";
   };
 
   buildInputs = [ gtk2 libsndfile pkgconfig python ];

From deb6b8f2a2a1476186c6528899d8bb92a45d3ae2 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 1 Nov 2016 01:15:57 +0100
Subject: [PATCH 0895/1310] lilv: 0.20.0 -> 0.24.0

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

diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 9f3307742ec..c8601377ad1 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lilv-${version}";
-  version = "0.20.0";
+  version = "0.24.0";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "0aj2plkx56iar8vzjbq2l7hi7sp0ml99m0h44rgwai2x4vqkk2j2";
+    sha256 = "17pv4wdaj7m5ghpfs7h7d8jd105xfzyn2lj438xslj1ndm9xwq7s";
   };
 
   buildInputs = [ lv2 pkgconfig python serd sord sratom ];

From 87ffcedd31c98185f49ba041e205a2ce44dfc0ea Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 1 Nov 2016 01:16:31 +0100
Subject: [PATCH 0896/1310] sratom: 0.4.6 -> 0.6.0

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

diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index a4ba4c16c87..71d7de79fe5 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sratom-${version}";
-  version = "0.4.6";
+  version = "0.6.0";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "080jjiyxjnj7hf25844hd9rb01grvzz1rk8mxcdnakywmspbxfd4";
+    sha256 = "0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4";
   };
 
   buildInputs = [ lv2 pkgconfig python serd sord ];

From 9e82d353e39d53d9bd40a2ccde7b0701741c5f54 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 1 Nov 2016 01:17:18 +0100
Subject: [PATCH 0897/1310] raul: svn 5675 -> git 2016-09-20

---
 .../development/libraries/audio/raul/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index 97d7dd83155..444b3ea4e86 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchsvn, boost, gtk2, pkgconfig, python }:
+{ stdenv, fetchgit, boost, gtk, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name = "raul-svn-${rev}";
-  rev = "5675";
+  name = "raul-git-${rev}";
+  rev = "2016-09-20";
 
-  src = fetchsvn {
-    url = "http://svn.drobilla.net/lad/trunk/raul";
-    rev = rev;
-    sha256 = "0yvm3j57lch89dixx7zsip7pxsws0xxy1y6ck7a3l0534qc5kny4";
+  src = fetchgit {
+    url = "http://git.drobilla.net/cgit.cgi/raul.git";
+    rev = "f8bf77d3c3b77830aedafb9ebb5cdadfea7ed07a";
+    sha256 = "1lby508fb0n8ks6iz959sh18fc37br39d6pbapwvbcw5nckdrxwj";
   };
 
-  buildInputs = [ boost gtk2 pkgconfig python ];
+  buildInputs = [ boost gtk pkgconfig python ];
 
   configurePhase = "python waf configure --prefix=$out";
 

From 0b3795c64288353ac2af911c9d05490f2c3bb9b0 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 1 Nov 2016 01:29:04 +0100
Subject: [PATCH 0898/1310] sord: 0.12.2 -> 0.16.0

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

diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 96a19bf37cc..021a7fe1741 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sord-${version}";
-  version = "0.12.2";
+  version = "0.16.0";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "0rq7vafdv4vsxi6xk9zf5shr59w3kppdhqbj78185rz5gp9kh1dx";
+    sha256 = "0nh3i867g9z4kdlnk82cg2kcw8r02qgifxvkycvzb4vfjv4v4g4x";
   };
 
   buildInputs = [ pkgconfig python serd ];

From 1b8ad9685884e4f8a02b7f76a2d595dbaf7ece0c Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 1 Nov 2016 01:29:42 +0100
Subject: [PATCH 0899/1310] serd: 0.20.0 -> 0.24.0

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

diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index c0935bd33fd..3fcfb7afa86 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "serd-${version}";
-  version = "0.20.0";
+  version = "0.24.0";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "1gxbzqsm212wmn8qkdd3lbl6wbv7fwmaf9qh2nxa4yxjbr7mylb4";
+    sha256 = "0v3a9xss5ailrnb3flfjyl6l9pmp51dc02p0lr6phvwsipg8mywc";
   };
 
   buildInputs = [ pcre pkgconfig python ];

From 5abcc7d22ad33d820b882a6888dbec06cc7a378f Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 1 Nov 2016 02:00:07 +0100
Subject: [PATCH 0900/1310] lilv and sord: remove svn versions and deploy
 release version

---
 pkgs/applications/audio/ardour/ardour3.nix    | 10 +++----
 pkgs/applications/audio/ardour/ardour4.nix    |  8 +++---
 pkgs/applications/audio/ardour/default.nix    |  8 +++---
 pkgs/applications/audio/ingen/default.nix     | 12 ++++----
 .../libraries/audio/lilv/default.nix          |  6 ++--
 .../libraries/audio/lilv/lilv-svn.nix         | 28 -------------------
 .../libraries/audio/lv2/default.nix           |  6 ++--
 .../libraries/audio/lv2/lv2-git.nix           | 28 -------------------
 .../libraries/audio/raul/default.nix          | 12 ++++----
 .../libraries/audio/sratom/default.nix        |  6 ++--
 pkgs/development/libraries/serd/default.nix   |  6 ++--
 pkgs/development/libraries/sord/default.nix   |  6 ++--
 pkgs/development/libraries/sord/sord-svn.nix  | 28 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 14 files changed, 40 insertions(+), 126 deletions(-)
 delete mode 100644 pkgs/development/libraries/audio/lilv/lilv-svn.nix
 delete mode 100644 pkgs/development/libraries/audio/lv2/lv2-git.nix
 delete mode 100644 pkgs/development/libraries/sord/sord-svn.nix

diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
index 13fea9a99af..0db95104970 100644
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@@ -2,8 +2,8 @@
 , 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-svn, lv2, makeWrapper, pango
-, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }:
+, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
+, perl, pkgconfig, python2, rubberband, serd, sord, sratom, suil, taglib, vampSDK }:
 
 let
 
@@ -38,12 +38,12 @@ stdenv.mkDerivation rec {
     sha256 = "0pnnx22asizin5rvf352nfv6003zarw3jd64magp10310wrfiwbq";
   };
 
-  buildInputs = 
+  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-svn lv2
-      makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn sratom suil taglib vampSDK
+      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
+      makeWrapper pango perl pkgconfig python2 rubberband serd sord sratom suil taglib vampSDK
     ];
 
   patchPhase = ''
diff --git a/pkgs/applications/audio/ardour/ardour4.nix b/pkgs/applications/audio/ardour/ardour4.nix
index b6123f40ee1..e6a0ff66b3c 100644
--- a/pkgs/applications/audio/ardour/ardour4.nix
+++ b/pkgs/applications/audio/ardour/ardour4.nix
@@ -2,8 +2,8 @@
 , 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-svn, lv2, makeWrapper, pango
-, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }:
+, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
+, perl, pkgconfig, python2, rubberband, serd, sord, sratom, suil, taglib, vampSDK }:
 
 let
 
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
     [ 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-svn lv2
-      makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn sratom suil taglib vampSDK
+      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
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index ab228766e13..5e9e71f42cb 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -2,8 +2,8 @@
 , 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-svn, lv2, makeWrapper
-, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom
+, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper
+, perl, pkgconfig, python2, rubberband, serd, sord, sratom
 , taglib, vampSDK, dbus, fftw, pango, suil, libarchive }:
 
 let
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
     [ 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-svn lv2
-      makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn
+      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
+      makeWrapper pango perl pkgconfig python2 rubberband serd sord
       sratom suil taglib vampSDK libarchive
     ];
 
diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index 68990b11ef0..439d75f8848 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchgit, boost, ganv, glibmm, gtk2, gtkmm2, libjack2, lilv
-, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
+{ stdenv, fetchsvn, boost, ganv, glibmm, gtkmm2, libjack2, lilv
+, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
 , suil
 }:
 
@@ -14,21 +14,21 @@ stdenv.mkDerivation  rec {
   };
 
   buildInputs = [
-    boost ganv glibmm gtk2 gtkmm2 libjack2 lilv lv2Unstable makeWrapper pkgconfig
+    boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper pkgconfig
     python raul serd sord sratom suil
   ];
 
   configurePhase = ''
     sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript
-    python waf configure --prefix=$out
+    ${python.interpreter} waf configure --prefix=$out
   '';
 
   propagatedBuildInputs = [ rdflib ];
 
-  buildPhase = "python waf";
+  buildPhase = "${python.interpreter} waf";
 
   installPhase = ''
-    python waf install
+    ${python.interpreter} waf install
     for program in ingenams ingenish
     do
       wrapProgram $out/bin/$program \
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index c8601377ad1..101322f3f53 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ lv2 pkgconfig python serd sord sratom ];
 
-  configurePhase = "python waf configure --prefix=$out";
+  configurePhase = "${python.interpreter} waf configure --prefix=$out";
 
-  buildPhase = "python waf";
+  buildPhase = "${python.interpreter} waf";
 
-  installPhase = "python waf install";
+  installPhase = "${python.interpreter} waf install";
 
   meta = with stdenv.lib; {
     homepage = http://drobilla.net/software/lilv;
diff --git a/pkgs/development/libraries/audio/lilv/lilv-svn.nix b/pkgs/development/libraries/audio/lilv/lilv-svn.nix
deleted file mode 100644
index 0b02774bc17..00000000000
--- a/pkgs/development/libraries/audio/lilv/lilv-svn.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchsvn, lv2, pkgconfig, python, serd, sord-svn, sratom }:
-
-stdenv.mkDerivation rec {
-  name = "lilv-svn-${rev}";
-  rev = "5675";
-
-  src = fetchsvn {
-    url = "http://svn.drobilla.net/lad/trunk/lilv";
-    rev = rev;
-    sha256 = "1wr61sivgbh0j271ix058sncsrgh9p2rh7af081s2z9ml8szgraq";
-  };
-
-  buildInputs = [ lv2 pkgconfig python serd sord-svn sratom ];
-
-  configurePhase = "python waf configure --prefix=$out";
-
-  buildPhase = "python waf";
-
-  installPhase = "python waf install";
-
-  meta = with stdenv.lib; {
-    homepage = http://drobilla.net/software/lilv;
-    description = "A C library to make the use of LV2 plugins";
-    license = licenses.mit;
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index 34301412f56..dafd39efee9 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gtk2 libsndfile pkgconfig python ];
 
-  configurePhase = "python waf configure --prefix=$out";
+  configurePhase = "${python.interpreter} waf configure --prefix=$out";
 
-  buildPhase = "python waf";
+  buildPhase = "${python.interpreter} waf";
 
-  installPhase = "python waf install";
+  installPhase = "${python.interpreter} waf install";
 
   meta = with stdenv.lib; {
     homepage = http://lv2plug.in;
diff --git a/pkgs/development/libraries/audio/lv2/lv2-git.nix b/pkgs/development/libraries/audio/lv2/lv2-git.nix
deleted file mode 100644
index e3230a86e57..00000000000
--- a/pkgs/development/libraries/audio/lv2/lv2-git.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python }:
-
-stdenv.mkDerivation rec {
-  name = "lv2-git-${version}";
-  version = "2016-10-23";
-
-  src = fetchgit {
-    url = "http://lv2plug.in/git/cgit.cgi/lv2.git";
-    rev = "b36868f3b96a436961c0c51b5b2dd71d05da9b12";
-    sha256 = "1sx39j0gary2nayzv7xgqcra7z1rcw9hrafkji05aksdwf7q0pdm";
-  };
-
-  buildInputs = [ gtk2 libsndfile pkgconfig python ];
-
-  configurePhase = "python waf configure --prefix=$out";
-
-  buildPhase = "python waf";
-
-  installPhase = "python waf install";
-
-  meta = with stdenv.lib; {
-    homepage = http://lv2plug.in;
-    description = "A plugin standard for audio systems";
-    license = licenses.mit;
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index 444b3ea4e86..94102c38549 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchgit, boost, gtk, pkgconfig, python }:
+{ stdenv, fetchgit, boost, gtk2, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name = "raul-git-${rev}";
+  name = "raul-unstable-${rev}";
   rev = "2016-09-20";
 
   src = fetchgit {
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
     sha256 = "1lby508fb0n8ks6iz959sh18fc37br39d6pbapwvbcw5nckdrxwj";
   };
 
-  buildInputs = [ boost gtk pkgconfig python ];
+  buildInputs = [ boost gtk2 pkgconfig python ];
 
-  configurePhase = "python waf configure --prefix=$out";
+  configurePhase = "${python.interpreter} waf configure --prefix=$out";
 
-  buildPhase = "python waf";
+  buildPhase = "${python.interpreter} waf";
 
-  installPhase = "python waf install";
+  installPhase = "${python.interpreter} waf install";
 
   meta = with stdenv.lib; {
     description = "A C++ utility library primarily aimed at audio/musical applications";
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index 71d7de79fe5..816baa5221e 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ lv2 pkgconfig python serd sord ];
 
-  configurePhase = "python waf configure --prefix=$out";
+  configurePhase = "${python.interpreter} waf configure --prefix=$out";
 
-  buildPhase = "python waf";
+  buildPhase = "${python.interpreter} waf";
 
-  installPhase = "python waf install";
+  installPhase = "${python.interpreter} waf install";
 
   meta = with stdenv.lib; {
     homepage = http://drobilla.net/software/sratom;
diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index 3fcfb7afa86..d68503298fc 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pcre pkgconfig python ];
 
-  configurePhase = "python waf configure --prefix=$out";
+  configurePhase = "${python.interpreter} waf configure --prefix=$out";
 
-  buildPhase = "python waf";
+  buildPhase = "${python.interpreter} waf";
 
-  installPhase = "python waf install";
+  installPhase = "${python.interpreter} waf install";
 
   meta = with stdenv.lib; {
     homepage = http://drobilla.net/software/serd;
diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 021a7fe1741..01ea4c4a162 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig python serd ];
 
-  configurePhase = "python waf configure --prefix=$out";
+  configurePhase = "${python.interpreter} waf configure --prefix=$out";
 
-  buildPhase = "python waf";
+  buildPhase = "${python.interpreter} waf";
 
-  installPhase = "python waf install";
+  installPhase = "${python.interpreter} waf install";
 
   meta = with stdenv.lib; {
     homepage = http://drobilla.net/software/sord;
diff --git a/pkgs/development/libraries/sord/sord-svn.nix b/pkgs/development/libraries/sord/sord-svn.nix
deleted file mode 100644
index 290e85d81c7..00000000000
--- a/pkgs/development/libraries/sord/sord-svn.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchsvn, pkgconfig, python, serd }:
-
-stdenv.mkDerivation rec {
-  name = "sord-svn-${rev}";
-  rev = "327";
-
-  src = fetchsvn {
-    url = "http://svn.drobilla.net/sord/trunk";
-    rev = rev;
-    sha256 = "09lf6xmwfg8kbmz1b7d3hrpz0qqr8prdjqrp91aw70cgclx2pwc4";
-  };
-
-  buildInputs = [ pkgconfig python serd ];
-
-  configurePhase = "python waf configure --prefix=$out";
-
-  buildPhase = "python waf";
-
-  installPhase = "python waf install";
-
-  meta = with stdenv.lib; {
-    homepage = http://drobilla.net/software/sord;
-    description = "A lightweight C library for storing RDF data in memory";
-    license = licenses.mit;
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69192cd6d3a..004dd547be2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9303,7 +9303,6 @@ in
   libsmf = callPackage ../development/libraries/audio/libsmf { };
 
   lilv = callPackage ../development/libraries/audio/lilv { };
-  lilv-svn = callPackage ../development/libraries/audio/lilv/lilv-svn.nix { };
 
   lv2 = callPackage ../development/libraries/audio/lv2 { };
   lv2Unstable = callPackage ../development/libraries/audio/lv2/unstable.nix { };
@@ -9433,7 +9432,6 @@ in
   soqt = callPackage ../development/libraries/soqt { };
 
   sord = callPackage ../development/libraries/sord {};
-  sord-svn = callPackage ../development/libraries/sord/sord-svn.nix {};
 
   soundtouch = callPackage ../development/libraries/soundtouch {};
 

From 084a76ef6feb4430f6f5cacd2f58755073f9fb2e Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Tue, 10 Jan 2017 21:02:04 -0500
Subject: [PATCH 0901/1310] atlas: change platforms to unix

The build succeeds on darwin and linux.
---
 pkgs/development/libraries/science/math/atlas/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 6ff7e387ec1..e5870ce9c9b 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
     homepage = "http://math-atlas.sourceforge.net/";
     description = "Automatically Tuned Linear Algebra Software (ATLAS)";
     license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
 
     longDescription = ''
       The ATLAS (Automatically Tuned Linear Algebra Software) project is an

From 8635a7457e90ce729ae9bc9c20d224a0ef5f4f94 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Tue, 10 Jan 2017 21:45:21 -0500
Subject: [PATCH 0902/1310] geary: 0.11.2 -> 0.11.3

---
 pkgs/desktops/gnome-3/3.22/misc/geary/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix
index 9eb7e78d8d4..e0622b17621 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix
@@ -8,11 +8,11 @@ let
   majorVersion = "0.11";
 in
 stdenv.mkDerivation rec {
-  name = "geary-${majorVersion}.2";
+  name = "geary-${majorVersion}.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
-    sha256 = "0ca6kdprhm8w990n6wgpvn0vzsdrnv9vjdm448pa8winspn217jw";
+    sha256 = "1r42ijxafach5lv8ibs6y0l5k4nacjg427dnma8fj00xr1sri7j1";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

From f159279da57f1cffcd6f8a133372d6cc0a040a4f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 11 Jan 2017 06:17:03 +0100
Subject: [PATCH 0903/1310] mopidy: 2.0.1 -> 2.1.0

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

diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index d7454741ed5..856da9f742e 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -5,13 +5,13 @@
 pythonPackages.buildPythonApplication rec {
   name = "mopidy-${version}";
 
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "mopidy";
     repo = "mopidy";
     rev = "v${version}";
-    sha256 = "15i17rj2bh2kda6d6rwcjhs2m3nfsrcyq3lj9vbgmacg0cdb22pp";
+    sha256 = "0krq5fbscqxayyc4vxai7iwxm2kdbgs5jicrdb013v04phw2za06";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

From cc40fadf62e8843dabb330659941d0d4d522f863 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 11 Jan 2017 06:18:29 +0100
Subject: [PATCH 0904/1310] gnutls: 3.4.16 -> 3.4.17

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

diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
index fc3ac0ec421..0cb2c67c501 100644
--- a/pkgs/development/libraries/gnutls/3.4.nix
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -1,10 +1,10 @@
-{ callPackage, fetchurl, autoreconfHook, ... } @ args:
+{ callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.4.16";
+  version = "3.4.17";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz";
-    sha256 = "09rrjaflgp5p0hi5gqljklz1xpalnvj8bawvjj6baw8768dvp6nr";
+    sha256 = "0bhp8cqrmw15yins65cn0zwbcpj1vmymr4wnbm151sfmf2kfhl4v";
   };
 })

From 0e963d2563de6311a829de63762bb8a9c4378050 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 11 Jan 2017 06:18:41 +0100
Subject: [PATCH 0905/1310] gnutls33: 3.3.25 -> 3.3.26

Fixes the following security issues:

  * CVE-2017-5334
  * CVE-2017-5335
  * CVE-2017-5336
  * CVE-2017-5337

See https://www.gnutls.org/news.html#2017-01-09 for more information.
---
 pkgs/development/libraries/gnutls/3.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix
index 87b46dc26a0..56829193060 100644
--- a/pkgs/development/libraries/gnutls/3.3.nix
+++ b/pkgs/development/libraries/gnutls/3.3.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.3.25";
+  version = "3.3.26";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.xz";
-    sha256 = "0bhzkzpzwg3lhbhpas7m4rcj4mrnyq76zmic9z42wpa68d76r78q";
+    sha256 = "1n90qyz54hhnmf4fmap6zdyv7nihz6mrbqgxhd46h7aqdcmqhzba";
   };
 })

From 7165b389084966b7a5c96e9b512b7312ae9c676d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 11 Jan 2017 06:18:14 +0100
Subject: [PATCH 0906/1310] libtasn1: 4.8 -> 4.9

---
 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 1e45f07a22f..5ecbcc63a95 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.8";
+  name = "libtasn1-4.9";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "04y5m29pqmvkfdbppmsdifyx89v8xclxzklpfc7a1fkr9p4jz07s";
+    sha256 = "0869cp6jx7cajgv6cnddsh3vc7bimmdkdjn80y1jpb4iss7plvsg";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From 85ac7906661e42fb89e186f77fcf01a5c96586bd Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 11 Jan 2017 06:19:04 +0100
Subject: [PATCH 0907/1310] gnutls35: 3.5.5 -> 3.5.8

Fixes the following security issues:

  * CVE-2017-5334
  * CVE-2017-5335
  * CVE-2017-5336
  * CVE-2017-5337

See https://www.gnutls.org/news.html#2017-01-09 for more information.
---
 pkgs/development/libraries/gnutls/3.5.nix     | 8 +++++---
 pkgs/development/libraries/gnutls/generic.nix | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index 602df9f44a3..7d58bfcd67f 100644
--- a/pkgs/development/libraries/gnutls/3.5.nix
+++ b/pkgs/development/libraries/gnutls/3.5.nix
@@ -1,10 +1,12 @@
-{ callPackage, fetchurl, autoreconfHook, ... } @ args:
+{ callPackage, fetchurl, libunistring, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.5.5";
+  version = "3.5.8";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
-    sha256 = "0ag5q3dfxzv0dmqy7q0a8y74yc3m5yzvjrp324l6vqafh3klz6c6";
+    sha256 = "1zyl2z63s68hx1dpxqx0lykmlf3rwrzlrf44sq3h7dvjmr1z55qf";
   };
+
+  buildInputs = [ libunistring ];
 })
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 9425bd7c6a6..67a969b1178 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -4,6 +4,7 @@
 
 # Version dependent args
 , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
+, buildInputs ? []
 , ...}:
 
 assert guileBindings -> guile != null;
@@ -41,7 +42,8 @@ stdenv.mkDerivation {
     ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
     ++ [ unbound ]
-    ++ lib.optional guileBindings guile;
+    ++ lib.optional guileBindings guile
+    ++ buildInputs;
 
   nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
 
@@ -75,7 +77,7 @@ stdenv.mkDerivation {
 
     homepage = http://www.gnu.org/software/gnutls/;
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ eelco wkennington ];
+    maintainers = with maintainers; [ eelco wkennington fpletz ];
     platforms = platforms.all;
   };
 }

From 3ecfab881946370a1c27fd17b9e55e27bca35d96 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 11 Jan 2017 06:50:37 +0100
Subject: [PATCH 0908/1310] libgit2_0_21: remove, unused and probably
 vulnerable

---
 pkgs/development/libraries/git2/0.21.nix | 24 ------------------------
 pkgs/top-level/all-packages.nix          |  2 --
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/git2/0.21.nix

diff --git a/pkgs/development/libraries/git2/0.21.nix b/pkgs/development/libraries/git2/0.21.nix
deleted file mode 100644
index 4ea43086548..00000000000
--- a/pkgs/development/libraries/git2/0.21.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, cmake, zlib, python, libssh2, openssl, http-parser}:
-
-stdenv.mkDerivation rec {
-  version = "0.21.2";
-  name = "libgit2-${version}";
-
-  src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://github.com/libgit2/libgit2/tarball/v${version}";
-    sha256 = "0icf119lhha96rk8m6s38sczjr0idr7yczw6knby61m81a25a96y";
-  };
-
-  cmakeFlags = "-DTHREADSAFE=ON";
-
-  nativeBuildInputs = [ cmake python ];
-  buildInputs = [ zlib libssh2 openssl http-parser ];
-
-  meta = {
-    description = "The Git linkable library";
-    homepage = http://libgit2.github.com/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69192cd6d3a..c038430eaed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7269,8 +7269,6 @@ in
     }
   );
 
-  libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { };
-
   gle = callPackage ../development/libraries/gle { };
 
   glew = callPackage ../development/libraries/glew { };

From c03bc5721203d4952bc7c4b90efedeee4383780c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 11 Jan 2017 06:50:54 +0100
Subject: [PATCH 0909/1310] libgit2: 0.24.3 -> 0.24.6

Fixes the following vulnerabilities:

  * CVE-2016-10128
  * CVE-2016-10129
  * CVE-2016-10130
  * CVE-2017-5338
  * CVE-2017-5339
---
 pkgs/development/libraries/git2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 2bd500b9efb..51e366ba29c 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }:
 
 stdenv.mkDerivation (rec {
-  version = "0.24.3";
+  version = "0.24.6";
   name = "libgit2-${version}";
 
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/libgit2/libgit2/tarball/v${version}";
-    sha256 = "01jdp0i0nxhx8w2gjd75mwfy1d4z2c5xzz7q5jfypa6pkdi86dmh";
+    sha256 = "070jrv690bd5dq991lc32qfnai9ywvrjzsfgi3rcw6kw4l2ynxjr";
   };
 
   # TODO: `cargo` (rust's package manager) surfaced a serious bug in

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 0910/1310] 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 0911/1310] 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 f88e2fb5f170591e7e5c6f63470a5a187935a553 Mon Sep 17 00:00:00 2001
From: Yacine Hmito <gpyh@users.noreply.github.com>
Date: Wed, 11 Jan 2017 07:00:48 +0100
Subject: [PATCH 0912/1310] zsh-autosuggestions: init at 0.3.3 (#21792)

Added a related `programs.zsh.enableAutosuggestions` option
---
 nixos/modules/programs/zsh/zsh.nix          | 11 +++++++
 pkgs/shells/zsh-autosuggestions/default.nix | 32 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 45 insertions(+)
 create mode 100644 pkgs/shells/zsh-autosuggestions/default.nix

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 5b7d9415745..b4d941a7770 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -91,6 +91,13 @@ in
         '';
         type = types.bool;
       };
+      
+      enableAutosuggestions = mkOption {
+        default = false;
+        description = ''
+          Enable zsh-autosuggestions
+        '';
+      };
 
     };
 
@@ -132,6 +139,10 @@ in
           "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
         }
 
+        ${optionalString (cfg.enableAutosuggestions)
+          "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
+        }
+
         HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
       '';
 
diff --git a/pkgs/shells/zsh-autosuggestions/default.nix b/pkgs/shells/zsh-autosuggestions/default.nix
new file mode 100644
index 00000000000..4071d7bd0f2
--- /dev/null
+++ b/pkgs/shells/zsh-autosuggestions/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, zsh }:
+
+# To make use of this derivation, use the `programs.zsh.enableAutoSuggestions` option
+
+stdenv.mkDerivation rec {
+  name = "zsh-autosuggestions-${version}";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    repo = "zsh-autosuggestions";
+    owner = "zsh-users";
+    rev = "v${version}";
+    sha256 = "0mnwyz4byvckrslzqfng5c0cx8ka0y12zcy52kb7amg3l07jrls4";
+  };
+
+  buildInputs = [ zsh ];
+
+  buildPhases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    install -D zsh-autosuggestions.zsh \
+      $out/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Fish shell autosuggestions for Zsh";
+    homepage = "https://github.com/zsh-users/zsh-autosuggestions";
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.loskutov ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c038430eaed..7b7acc0e638 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4553,6 +4553,8 @@ in
 
   zsh-syntax-highlighting = callPackage ../shells/zsh-syntax-highlighting { };
 
+  zsh-autosuggestions = callPackage ../shells/zsh-autosuggestions { };
+
   zstd = callPackage ../tools/compression/zstd { };
 
   zsync = callPackage ../tools/compression/zsync { };

From 6c9e41333d24a6962f9f904614eab664d2a0a5ab Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 10 Jan 2017 15:23:16 +0100
Subject: [PATCH 0913/1310] libsecret: add dev output

This reduces the closure size of the secret-tool binary from 178 MiB to
38 MiB.
---
 pkgs/development/libraries/libsecret/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index 5aedc0df2b9..0f8207e83c8 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww";
   };
 
+  outputs = [ "out" "dev" ];
+
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
   propagatedBuildInputs = [ glib ];

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 0914/1310] 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 aa2ce20c593970397e8586289ab320fa9ed32a3f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 11 Jan 2017 09:17:55 +0100
Subject: [PATCH 0915/1310] ingen: fix evaluation

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

diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index 439d75f8848..7f4bc0b3e9e 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, boost, ganv, glibmm, gtkmm2, libjack2, lilv
+{ stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv
 , lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
 , suil
 }:

From abb28a409c8e90b519d87b2bec67c3ea416319bc Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 11 Jan 2017 10:46:21 +0100
Subject: [PATCH 0916/1310] auctex: 11.89 -> 11.90

See http://lists.gnu.org/archive/html/info-gnu/2017-01/msg00003.html
for release announcement
---
 pkgs/tools/typesetting/tex/auctex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix
index b910be76b85..a0c6a66634b 100644
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/pkgs/tools/typesetting/tex/auctex/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, emacs, texlive, ghostscript }:
  
 let auctex = stdenv.mkDerivation ( rec {
-  version = "11.89";
+  version = "11.90";
   name = "${pname}-${version}";
 
   # Make this a valid tex(live-new) package;
@@ -14,7 +14,7 @@ let auctex = stdenv.mkDerivation ( rec {
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${name}.tar.gz";
-    sha256 = "1cf9fkkmzjxa4jvk6c01zgxdikr4zzb5pcx8i4r0hwdk0xljkbwq";
+    sha256 = "13zimbyar3159arrcklmnmjxjvibrjpkac6d53mfv03pwpc2y8rw";
   };
 
   buildInputs = [ emacs texlive.combined.scheme-basic ghostscript ];

From cb07316773acc4f274c4bb3c3f03a67b11dfaa70 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 11 Jan 2017 09:27:38 +0100
Subject: [PATCH 0917/1310] docker: 1.12.5 -> 1.12.6

Fixes CVE-2016-9962.
---
 pkgs/applications/virtualization/docker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 088dddb3de7..ba21a23f8ad 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -11,13 +11,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.12.5";
+  version = "1.12.6";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker";
     rev = "v${version}";
-    sha256 = "1hnxmh2j1vm8714f7jwjrslkqkd1ry25g5wq76aqlpsz5fh2kqb0";
+    sha256 = "10jhjas07xxlxjsxby8865rr0d0zsc5azy16rsz1idmy7f7lk6jh";
   };
 
   buildInputs = [

From 4df30fc74f8ec2663b84041111d2d086406779dc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 11 Jan 2017 09:32:06 +0100
Subject: [PATCH 0918/1310] containerd: 0.2.3 -> 0.2.5

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

diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 6de68ee32f3..c428c56b313 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -5,13 +5,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "containerd-${version}";
-  version = "0.2.3";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "0hlvbd5n4v337ywkc8mnbhp9m8lg8612krv45262n87c2ijyx09s";
+    sha256 = "16p8kixhzdx8afpciyf3fjx43xa3qrqpx06r5aqxdrqviw851zh8";
   };
 
   buildInputs = [ go ];

From 0aa4931671560611afb2e2efd7ff95438a5853b1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 11 Jan 2017 09:32:26 +0100
Subject: [PATCH 0919/1310] runc: 2016-06-15 -> 1.0.0-rc2

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

diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index d6686557364..432c1fdb964 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -5,13 +5,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "runc-${version}";
-  version = "2016-06-15";
+  version = "1.0.0-rc2";
 
   src = fetchFromGitHub {
     owner = "opencontainers";
     repo = "runc";
-    rev = "cc29e3dded8e27ba8f65738f40d251c885030a28";
-    sha256 = "18fwb3kq10zhhx184yn3j396gpbppy3y4ypb8m2b2pdms39s6pyx";
+    rev = "v${version}";
+    sha256 = "06bxc4g3frh4i1lkzvwdcwmzmr0i52rz4a4pij39s15zaigm79wk";
   };
 
   outputs = [ "out" "man" ];

From 2b17620d59af1cd85ef352e7b1ab5d7df5e36796 Mon Sep 17 00:00:00 2001
From: Reno Reckling <e-github@wthack.de>
Date: Wed, 11 Jan 2017 11:50:42 +0100
Subject: [PATCH 0920/1310] update rustBeta and rustNightly (#21800)

looks good
---
 pkgs/development/compilers/rust/beta.nix    | 53 ++++++++++++++++-----
 pkgs/development/compilers/rust/nightly.nix | 51 +++++++++++++++-----
 2 files changed, 81 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix
index a4e55f970eb..5205c8fc93f 100644
--- a/pkgs/development/compilers/rust/beta.nix
+++ b/pkgs/development/compilers/rust/beta.nix
@@ -1,27 +1,56 @@
-{ stdenv, callPackage, rustPlatform,
+{ stdenv, callPackage, rustPlatform, cacert, gdb,
   targets ? [], targetToolchains ? [], targetPatches ? [] }:
 
 rec {
-  rustc = callPackage ./rustc.nix {
-    shortVersion = "beta-2016-11-16";
-    forceBundledLLVM = false;
+  rustc = stdenv.lib.overrideDerivation (callPackage ./rustc.nix {
+    shortVersion = "beta-2017-01-07";
+    forceBundledLLVM = true; # TODO: figure out why linking fails without this
     configureFlags = [ "--release-channel=beta" ];
-    srcRev = "e627a2e6edbc7b7fd205de8ca7c86cff76655f4d";
-    srcSha = "14sbhn6dp6rri1rpkspjlmy359zicwmyppdak52xj1kqhcjn71wa";
+    srcRev = "a035041ba450ce3061d78a2bdb9c446eb5321d0d";
+    srcSha = "12xsm0yp1y39fvf9j218gxv73j8hhahc53jyv3q58kiriyqvfc1s";
     patches = [
-      ./patches/disable-lockfile-check-beta.patch
+     ./patches/disable-lockfile-check-nightly.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
     inherit targets;
     inherit targetPatches;
     inherit targetToolchains;
     inherit rustPlatform;
-  };
+  }) (oldAttrs: {
+    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ gdb rustPlatform.rust.cargo ];
+    postUnpack = ''
+      export CARGO_HOME="$(realpath deps)"
+      export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
+    '';
+    postPatch = ''
+      ${oldAttrs.postPatch}
+
+      # Remove failing debuginfo tests because of old gdb version: https://github.com/rust-lang/rust/issues/38948#issuecomment-271443596
+      rm -vr src/test/debuginfo/borrowed-enum.rs || true
+      rm -vr src/test/debuginfo/generic-struct-style-enum.rs || true
+      rm -vr src/test/debuginfo/generic-tuple-style-enum.rs || true
+      rm -vr src/test/debuginfo/packed-struct.rs || true
+      rm -vr src/test/debuginfo/recursive-struct.rs || true
+      rm -vr src/test/debuginfo/struct-in-enum.rs || true
+      rm -vr src/test/debuginfo/struct-style-enum.rs || true
+      rm -vr src/test/debuginfo/tuple-style-enum.rs || true
+      rm -vr src/test/debuginfo/union-smoke.rs || true
+      rm -vr src/test/debuginfo/unique-enum.rs || true
+
+      # make external cargo work until https://github.com/rust-lang/rust/issues/38950 is fixed
+      sed -i "s#    def cargo(self):#    def cargo(self):\n        return \"${rustPlatform.rust.cargo}/bin/cargo\"#g" src/bootstrap/bootstrap.py
+      substituteInPlace \
+        src/bootstrap/config.rs \
+        --replace \
+        'self.cargo = Some(push_exe_path(path, &["bin", "cargo"]));' \
+        ''$'self.cargo = Some(\n                        "${rustPlatform.rust.cargo}\\\n                        /bin/cargo".into());'
+    '';
+  });
 
   cargo = callPackage ./cargo.nix rec {
-    version = "0.14.0";
-    srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55";
-    srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s";
-    depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr";
+    version = "beta-2017-01-10";
+    srcRev = "6dd4ff0f5b59fff524762c4a7b65882adda713c0";
+    srcSha = "1x6d42qq2zhr1iaw0m0nslhv6c1w6x6schmd96max0p9xb47l9zj";
+    depsSha256 = "1sywnhzgambmqsjs2xlnzracfv7vjljha55hgf8wca2marafr5dp";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
diff --git a/pkgs/development/compilers/rust/nightly.nix b/pkgs/development/compilers/rust/nightly.nix
index 81741105e26..d9ae8c140ab 100644
--- a/pkgs/development/compilers/rust/nightly.nix
+++ b/pkgs/development/compilers/rust/nightly.nix
@@ -1,13 +1,13 @@
-{ stdenv, callPackage, rustPlatform,
+{ stdenv, callPackage, rustPlatform, cacert, gdb,
   targets ? [], targetToolchains ? [], targetPatches ? [] }:
 
 rec {
-  rustc = callPackage ./rustc.nix {
-    shortVersion = "nightly-2016-11-23";
-    forceBundledLLVM = false;
+  rustc = stdenv.lib.overrideDerivation (callPackage ./rustc.nix {
+    shortVersion = "nightly-2017-01-10";
+    forceBundledLLVM = true; # TODO: figure out why linking fails without this
     configureFlags = [ "--release-channel=nightly" ];
-    srcRev = "d5814b03e652043be607f96e24709e06c2b55429";
-    srcSha = "0x2vr1mda0mr8q28h96zfpv0f26dyrg8jwxznlh6gk0y0mprgcbr";
+    srcRev = "7bffede97cf58f7159e261eac592f9cf88ce209d";
+    srcSha = "1784jvsf9g03cglwask1zhjmba4ghycbin3rw0hmhb41cz2y4q8v";
     patches = [
      ./patches/disable-lockfile-check-nightly.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
@@ -15,13 +15,42 @@ rec {
     inherit targetPatches;
     inherit targetToolchains;
     inherit rustPlatform;
-  };
+  }) (oldAttrs: {
+    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ gdb rustPlatform.rust.cargo ];
+    postUnpack = ''
+      export CARGO_HOME="$(realpath deps)"
+      export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
+    '';
+    postPatch = ''
+      ${oldAttrs.postPatch}
+
+      # Remove failing debuginfo tests because of old gdb version: https://github.com/rust-lang/rust/issues/38948#issuecomment-271443596
+      rm -vr src/test/debuginfo/borrowed-enum.rs || true
+      rm -vr src/test/debuginfo/generic-struct-style-enum.rs || true
+      rm -vr src/test/debuginfo/generic-tuple-style-enum.rs || true
+      rm -vr src/test/debuginfo/packed-struct.rs || true
+      rm -vr src/test/debuginfo/recursive-struct.rs || true
+      rm -vr src/test/debuginfo/struct-in-enum.rs || true
+      rm -vr src/test/debuginfo/struct-style-enum.rs || true
+      rm -vr src/test/debuginfo/tuple-style-enum.rs || true
+      rm -vr src/test/debuginfo/union-smoke.rs || true
+      rm -vr src/test/debuginfo/unique-enum.rs || true
+
+      # make external cargo work until https://github.com/rust-lang/rust/issues/38950 is fixed
+      sed -i "s#    def cargo(self):#    def cargo(self):\n        return \"${rustPlatform.rust.cargo}/bin/cargo\"#g" src/bootstrap/bootstrap.py
+      substituteInPlace \
+        src/bootstrap/config.rs \
+        --replace \
+        'self.cargo = Some(push_exe_path(path, &["bin", "cargo"]));' \
+        ''$'self.cargo = Some(\n                        "${rustPlatform.rust.cargo}\\\n                        /bin/cargo".into());'
+    '';
+  });
 
   cargo = callPackage ./cargo.nix rec {
-    version = "nightly-2016-07-25";
-    srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0";
-    srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155";
-    depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc";
+    version = "nightly-2017-01-10";
+    srcRev = "6dd4ff0f5b59fff524762c4a7b65882adda713c0";
+    srcSha = "1x6d42qq2zhr1iaw0m0nslhv6c1w6x6schmd96max0p9xb47l9zj";
+    depsSha256 = "1sywnhzgambmqsjs2xlnzracfv7vjljha55hgf8wca2marafr5dp";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo

From 260d97ca25819690ce87bc5af48ab6a4ae0e2e68 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 11 Jan 2017 12:10:44 +0100
Subject: [PATCH 0921/1310] runc: add patches to fix CVE-2016-9962

---
 .../virtualization/runc/default.nix             | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 432c1fdb964..7f19121b7f5 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, go-md2man
+{ stdenv, lib, fetchFromGitHub, fetchpatch, go-md2man
 , go, pkgconfig, libapparmor, apparmor-parser, libseccomp }:
 
 with lib;
@@ -14,6 +14,21 @@ stdenv.mkDerivation rec {
     sha256 = "06bxc4g3frh4i1lkzvwdcwmzmr0i52rz4a4pij39s15zaigm79wk";
   };
 
+  patches = [
+    # Two patches to fix CVE-2016-9962
+    # From https://bugzilla.suse.com/show_bug.cgi?id=1012568
+    (fetchpatch {
+      name = "0001-libcontainer-nsenter-set-init-processes-as-non-dumpa.patch";
+      url = "https://bugzilla.suse.com/attachment.cgi?id=709048&action=diff&context=patch&collapsed=&headers=1&format=raw";
+      sha256 = "1cfsmsyhc45a2929825mdaql0mrhhbrgdm54ly0957j2f46072ck";
+    })
+    (fetchpatch {
+      name = "0002-libcontainer-init-only-pass-stateDirFd-when-creating.patch";
+      url = "https://bugzilla.suse.com/attachment.cgi?id=709049&action=diff&context=patch&collapsed=&headers=1&format=raw";
+      sha256 = "1ykwg1mbvsxsnsrk9a8i4iadma1g0rgdmaj19dvif457hsnn31wl";
+    })
+  ];
+
   outputs = [ "out" "man" ];
 
   hardeningDisable = ["fortify"];

From 8e2a4e09486965001f938f3a37f6a9aaeb875ec6 Mon Sep 17 00:00:00 2001
From: Reno Reckling <e-github@wthack.de>
Date: Wed, 11 Jan 2017 12:33:53 +0100
Subject: [PATCH 0922/1310] cargo: do not make install in cargo (#21799)

cargo is already a cargo package, so why not build it with cargo
and safe us the special cases
---
 pkgs/development/compilers/rust/cargo.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 2b544d754d7..f0d7e0dabc2 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -23,17 +23,6 @@ rustPlatform.buildRustPackage rec {
 
   LIBGIT2_SYS_USE_PKG_CONFIG=1;
 
-  configurePhase = ''
-    ./configure --enable-optimize --prefix=$out
-  '';
-
-  buildPhase = "make";
-
-  installPhase = ''
-    make install
-    ${postInstall}
-  '';
-
   postInstall = ''
     rm "$out/lib/rustlib/components" \
        "$out/lib/rustlib/install.log" \

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 0923/1310] 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 760edeb2b67a220d521f145a8baa15d240ba91b2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 11 Jan 2017 14:13:46 +0100
Subject: [PATCH 0924/1310] xfractint: init at 20.04p14

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

diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix
new file mode 100644
index 00000000000..4b1040ce765
--- /dev/null
+++ b/pkgs/applications/graphics/xfractint/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, libX11, libXft}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "xfractint";
+  version = "20.04p14";
+  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+  src = fetchurl {
+    url = "https://www.fractint.net/ftp/current/linux/xfractint-${version}.tar.gz";
+    sha256 = "0jdqr639z862qrswwk5srmv4fj5d7rl8kcscpn6mlkx4jvjmca0f";
+  };
+
+  buildInputs = [libX11 libXft];
+
+  configurePhase = ''
+    sed -e 's@/usr/bin/@@' -i Makefile
+  '';
+
+  makeFlags = ["PREFIX=$(out)"];
+
+  meta = {
+    inherit version;
+    description = "";
+    # Code cannot be used in commercial programs
+    # Looks like the definition hinges on the price, not license
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://www.fractint.net/";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa92470cf76..ab772f2a168 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15651,6 +15651,8 @@ in
 
   xfig = callPackage ../applications/graphics/xfig { };
 
+  xfractint = callPackage ../applications/graphics/xfractint {};
+
   xineUI = callPackage ../applications/video/xine-ui { };
 
   xmind = callPackage ../applications/misc/xmind { };

From 905349b8a594e099ffc9403d37b61aec032b0145 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 11 Jan 2017 14:25:47 +0100
Subject: [PATCH 0925/1310] libvncserver: 0.9.9 -> 0.9.11

---
 pkgs/development/libraries/libvncserver/default.nix | 13 +++++++------
 .../libraries/libvncserver/default.upstream         |  4 ----
 2 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 pkgs/development/libraries/libvncserver/default.upstream

diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix
index 93f62376ac6..a5595b1c842 100644
--- a/pkgs/development/libraries/libvncserver/default.nix
+++ b/pkgs/development/libraries/libvncserver/default.nix
@@ -1,7 +1,8 @@
 {stdenv, fetchurl,
   libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto, 
   xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama, 
-  libXrandr, randrproto, libXtst, zlib, libgcrypt
+  libXrandr, randrproto, libXtst, zlib, libgcrypt, autoreconfHook
+  , systemd, pkgconfig
 }:
 
 assert stdenv.isLinux;
@@ -10,16 +11,16 @@ let
   s = # Generated upstream information
   rec {
     baseName="libvncserver";
-    version="0.9.9";
+    version="0.9.11";
     name="${baseName}-${version}";
-    hash="1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng";
-    url="mirror://sourceforge/project/libvncserver/libvncserver/0.9.9/LibVNCServer-0.9.9.tar.gz";
-    sha256="1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng";
+    url="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz";
+    sha256="15189n09r1pg2nqrpgxqrcvad89cdcrca9gx6qhm6akjf81n6g8r";
   };
   buildInputs = [
     libtool libjpeg openssl libX11 libXdamage xproto damageproto
     xextproto libXext fixesproto libXfixes xineramaproto libXinerama
-    libXrandr randrproto libXtst zlib libgcrypt
+    libXrandr randrproto libXtst zlib libgcrypt autoreconfHook systemd
+    pkgconfig
   ];
 in
 stdenv.mkDerivation {
diff --git a/pkgs/development/libraries/libvncserver/default.upstream b/pkgs/development/libraries/libvncserver/default.upstream
deleted file mode 100644
index eae48197439..00000000000
--- a/pkgs/development/libraries/libvncserver/default.upstream
+++ /dev/null
@@ -1,4 +0,0 @@
-url http://sourceforge.net/projects/libvncserver/files/libvncserver/
-SF_version_dir
-version_link '[.]tar[.][bgx]z[0-9]*/download$'
-SF_redirect

From 09f3481be42f081ba5cd5f2bf1a96ff835ea03bf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 11 Jan 2017 14:32:02 +0100
Subject: [PATCH 0926/1310] libvncserver: build with libpng

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

diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix
index a5595b1c842..f7e477ff34a 100644
--- a/pkgs/development/libraries/libvncserver/default.nix
+++ b/pkgs/development/libraries/libvncserver/default.nix
@@ -2,7 +2,7 @@
   libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto, 
   xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama, 
   libXrandr, randrproto, libXtst, zlib, libgcrypt, autoreconfHook
-  , systemd, pkgconfig
+  , systemd, pkgconfig, libpng
 }:
 
 assert stdenv.isLinux;
@@ -20,7 +20,7 @@ let
     libtool libjpeg openssl libX11 libXdamage xproto damageproto
     xextproto libXext fixesproto libXfixes xineramaproto libXinerama
     libXrandr randrproto libXtst zlib libgcrypt autoreconfHook systemd
-    pkgconfig
+    pkgconfig libpng
   ];
 in
 stdenv.mkDerivation {

From a00f1c99b8f1522acee6923a3e5b5055101b6b3c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 11 Jan 2017 15:17:22 +0100
Subject: [PATCH 0927/1310] icoutils: 0.31.0 -> 0.31.1

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

diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix
index 300e05023b1..70f9e29d0f5 100644
--- a/pkgs/tools/graphics/icoutils/default.nix
+++ b/pkgs/tools/graphics/icoutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "icoutils-0.31.0";
+  name = "icoutils-0.31.1";
 
   src = fetchurl {
     url = "mirror://savannah/icoutils/${name}.tar.bz2";
-    sha256 = "0wdgyfb1clrn3maq84vi4vkwjydy72p5hzk6kb9nb3a19bbxk5d8";
+    sha256 = "14rhd7p7v0rvxsfnrgxf5l4rl6n52h2aq09583glqpgjg0y9vqi6";
   };
 
   buildInputs = [ makeWrapper libpng perl ];

From 4823b85a2ba29c1d435f50a03d7f4de402a77024 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Wed, 11 Jan 2017 15:16:31 +0100
Subject: [PATCH 0928/1310] ding: 1.8 -> 1.8.1

The actual tar did not change for some reason, but the version did
change.
Also make the install a bit more verbose.
---
 pkgs/applications/misc/ding/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix
index 38cd9dbcc37..e76f95b6a50 100644
--- a/pkgs/applications/misc/ding/default.nix
+++ b/pkgs/applications/misc/ding/default.nix
@@ -10,11 +10,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "ding-1.8";
+  name = "ding-1.8.1";
 
   src = fetchurl {
     url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/${name}.tar.gz";
-    sha256 = "00z97ndwmzsgig9q6y98y8nbxy76pyi9qyj5qfpbbck24gakpz5l";
+    sha256 = "0chjqs3z9zs1w3l7b5lsaj682rgnkf9kibcbzhggqqcn1pbvl5sq";
   };
 
   buildInputs = [ aspellEnv fortune gnugrep makeWrapper tk tre ];
@@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
 
     sed -i "s@/usr/bin/ding@$out/bin/ding@g" ding.desktop
 
-    cp ding $out/bin/
-    cp de-en.txt $out/share/dict/
-    cp ding.1 $out/share/man/man1/
-    cp ding.png $out/share/pixmaps/
-    cp ding.desktop $out/share/applications/
+    cp -v ding $out/bin/
+    cp -v de-en.txt $out/share/dict/
+    cp -v ding.1 $out/share/man/man1/
+    cp -v ding.png $out/share/pixmaps/
+    cp -v ding.desktop $out/share/applications/
 
     wrapProgram $out/bin/ding --prefix PATH : ${stdenv.lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\""
   '';

From 0f83aa51676c42e13cb0fc2216834444b4fa06ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Dan=C4=9Bk?= <jdanek@redhat.com>
Date: Wed, 11 Jan 2017 16:36:25 +0100
Subject: [PATCH 0929/1310] idea-community: 2016.3 -> 2016.3.2 (#21807)

---
 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 e9f887fe621..cef1ab8e19b 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -172,12 +172,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2016.3";
+    version = "2016.3.2";
     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 = "1bp2a1x8nl5flklf160n7ka5clnb0xx9gwv5zd9li2bsf04zlzf3";
+      sha256 = "0ngign34gq7i121ss2s9wfziy3vkv1jb79pw8nf1qp7rb15xn4vc";
     };
     wmClass = "jetbrains-idea-ce";
   };

From 87e67cb4e51c237fe9963dc277f5b66da86e90d0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 11 Jan 2017 18:11:51 +0100
Subject: [PATCH 0930/1310] pythonPackages.yenc: init at 0.4.0

---
 .../python-modules/yenc/default.nix           | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  3 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/yenc/default.nix

diff --git a/pkgs/development/python-modules/yenc/default.nix b/pkgs/development/python-modules/yenc/default.nix
new file mode 100644
index 00000000000..7f9f3b6467a
--- /dev/null
+++ b/pkgs/development/python-modules/yenc/default.nix
@@ -0,0 +1,32 @@
+{ fetchurl
+, lib
+, buildPythonPackage
+, python
+, isPyPy
+, isPy3k
+}:
+
+let
+  pname = "yenc";
+  version = "0.4.0";
+in buildPythonPackage {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/dual75/yenc/get/${version}.tar.gz";
+    sha256 = "0zkyzxgq30mbrzpnqam4md0cb09d5falh06m0npc81nnlhcghkp7";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover -s test
+  '';
+
+  disabled = isPy3k || isPyPy;
+
+  meta = {
+    description = "Encoding and decoding yEnc";
+    license = lib.licenses.lgpl21;
+    homepage = https://bitbucket.org/dual75/yenc;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2eaea361b1b..e58cc0f63fe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31902,6 +31902,9 @@ EOF
     };
   };
 
+  yenc = callPackage ../development/python-modules/yenc {
+  };
+
   zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else
     (pkgs.zeitgeist.override{python2Packages=self;}).py;
 

From 66bdcb4dfd755028fadbb16d5a31e02b8ba8ea04 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 11 Jan 2017 18:12:05 +0100
Subject: [PATCH 0931/1310] sabnzbd: add yenc package

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

diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index d41e1bce7f5..616d898b33f 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}:
 
 let
-  pythonEnv = python2.withPackages(ps: with ps; [ pyopenssl cheetah]);
+  pythonEnv = python2.withPackages(ps: with ps; [ pyopenssl cheetah yenc ]);
   path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
 in stdenv.mkDerivation rec {
   version = "1.1.0";

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 0932/1310] 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 0933/1310] 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 0934/1310] 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 0935/1310] 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 0936/1310] 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 0937/1310] 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 0938/1310] 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 0939/1310] 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 0940/1310] 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 0941/1310] 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 0942/1310] 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 0943/1310] 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 0944/1310] 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 0945/1310] 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 0946/1310] 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 0947/1310] 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 0948/1310] 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 0949/1310] 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 0950/1310] 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 0951/1310] 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 0952/1310] 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 0953/1310] 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 0954/1310] 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 0955/1310] 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 0956/1310] 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 0957/1310] 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 0958/1310] 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 0959/1310] 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 0960/1310] 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 0961/1310] 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 0962/1310] 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 0963/1310] 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 0964/1310] 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 0965/1310] 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 0966/1310] 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 0967/1310] 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 0968/1310] 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 0969/1310] 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 0970/1310] 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 0971/1310] 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 0972/1310] 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 0973/1310] 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 0974/1310] 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 0975/1310] 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 0976/1310] 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 0977/1310] 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 0978/1310] 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 0979/1310] 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 0980/1310] 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 0981/1310] 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 0982/1310] 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 0983/1310] 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 0984/1310] 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 0985/1310] 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 0986/1310] 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 0987/1310] 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 0988/1310] 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 0989/1310] 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 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 0990/1310] 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 0991/1310] 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 0992/1310] 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 0993/1310] 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 0994/1310] 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 0995/1310] 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 0996/1310] 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 0997/1310] 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 0998/1310] 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 0999/1310] 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 1000/1310] 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 1001/1310] 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 1002/1310] 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 1003/1310] 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 1004/1310] 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 1005/1310] 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 1006/1310] 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 1007/1310] 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 1008/1310] 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 1009/1310] 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 1010/1310] 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 1011/1310] 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 1012/1310] 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 1013/1310] 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 1014/1310] 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 1015/1310] 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 1016/1310] 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 1017/1310] 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 1018/1310] 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 1019/1310] 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 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 1020/1310] 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 1021/1310] 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 1022/1310] 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 1023/1310] 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 1024/1310] 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 1025/1310] 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 1026/1310] 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 1027/1310] 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 1028/1310] 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 1029/1310] 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 1030/1310] 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 1031/1310] 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 1032/1310] 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 1033/1310] 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 1034/1310] 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 1035/1310] 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 1036/1310] 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 1037/1310] 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 1038/1310] 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 1039/1310] 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 1040/1310] 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 1041/1310] 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 1042/1310] 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 1043/1310] 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 1044/1310] 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 1045/1310] 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 1046/1310] 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 1047/1310] 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 1048/1310] 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 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 1049/1310] 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 1050/1310] 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 1051/1310] 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 1052/1310] 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 1053/1310] 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 1054/1310] 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 1055/1310] 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 1056/1310] 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 1057/1310] 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 1058/1310] 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 1059/1310] 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 1060/1310] 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 1061/1310] 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 1062/1310] 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 1063/1310] 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 1064/1310] 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 1065/1310] 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 1066/1310] 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 1067/1310] 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 1068/1310] 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 1069/1310] 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 1070/1310] 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 1071/1310] 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 1072/1310] 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 1073/1310] 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 1074/1310] 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 1075/1310] 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 1076/1310] 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 1077/1310] 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 1078/1310] 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 1079/1310] 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 1080/1310] 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 1081/1310] 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 1082/1310] 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 1083/1310] 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 1084/1310] 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 1085/1310] 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 1086/1310] 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 1087/1310] 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 1088/1310] 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 1089/1310] 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 1090/1310] 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 1091/1310] 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 1092/1310] 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 1093/1310] 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 1094/1310] 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 1095/1310] 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 1096/1310] 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 1097/1310] 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 1098/1310] 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 1099/1310] 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 1100/1310] 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 1101/1310] 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 1102/1310] 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 1103/1310] 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 1104/1310] 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 1105/1310] 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 1106/1310] 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 1107/1310] 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 1108/1310] 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 1109/1310] 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 1110/1310] 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 1111/1310] 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 1112/1310] 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 1113/1310] 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 1114/1310] 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 1115/1310] 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 1116/1310] 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 1117/1310] 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 1118/1310] 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 1119/1310] 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 1120/1310] 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 1121/1310] 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 1122/1310] 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 1123/1310] 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 1124/1310] 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 1125/1310] 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 1126/1310] 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 1127/1310] 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 1128/1310] 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 1129/1310] 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 1130/1310] 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 1131/1310] 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 1132/1310] 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 1133/1310] 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 1134/1310] 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 1135/1310] 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 1136/1310] 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 1137/1310] 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 1138/1310] 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 1139/1310] 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 1140/1310] 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 1141/1310] 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 1142/1310] 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 1143/1310] 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 1144/1310] 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 1145/1310] 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 1146/1310] 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 1147/1310] 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 1148/1310] 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 1149/1310] 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 1150/1310] 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 1151/1310] 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 1152/1310] 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 1153/1310] 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 1154/1310] 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 1155/1310] 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 1156/1310] 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 1157/1310] 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 1158/1310] 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 1159/1310] 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 1160/1310] 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 1161/1310] 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 1162/1310] 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 1163/1310] 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 1164/1310] 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 1165/1310] 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 1166/1310] 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 1167/1310] 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 1168/1310] 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 1169/1310] 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 1170/1310] 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 1171/1310] 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 1172/1310] 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 1173/1310] 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 1174/1310] 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 1175/1310] 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 1176/1310] 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 1177/1310] 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 1178/1310] 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 1179/1310] 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 1180/1310] 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 1181/1310] 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 1182/1310] 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 1183/1310] 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 1184/1310] 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 1185/1310] 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 1186/1310] 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 1187/1310] 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 1188/1310] 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 1189/1310] 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 1190/1310] 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 1191/1310] 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 1192/1310] 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 1193/1310] 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 1194/1310] 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 1195/1310] 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 1196/1310] 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 1197/1310] 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 1198/1310] 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 1199/1310] 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 1200/1310] 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 1201/1310] 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 1202/1310] 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 1203/1310] 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 1204/1310] 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 1205/1310] 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 1206/1310] 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 1207/1310] 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 1208/1310] 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 1209/1310] 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 1210/1310] 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 1211/1310] 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 1212/1310] 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 1213/1310] 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 1214/1310] 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 1215/1310] 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 1216/1310] 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 1217/1310] 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 1218/1310] 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 1219/1310] 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 1220/1310] 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 1221/1310] 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 1222/1310] 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 1223/1310] 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 1224/1310] 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 1225/1310] 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 1226/1310] 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 1227/1310] 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 1228/1310] 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 1229/1310] 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 1230/1310] 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 1231/1310] 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 1232/1310] 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 1233/1310] 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 1234/1310] 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 1235/1310] 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 1236/1310] 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 1237/1310] 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 1238/1310] 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 1239/1310] 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 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 1240/1310] 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 1241/1310] 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 1242/1310] 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 1243/1310] 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 1244/1310] 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 1245/1310] 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 1246/1310] 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 1247/1310] 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 1248/1310] 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 1249/1310] 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 1250/1310] 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 1251/1310] 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 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 1252/1310] 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 1253/1310] 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 1254/1310] 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 1255/1310] 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 1256/1310] 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 1257/1310] 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 1258/1310] 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 1259/1310] 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 1260/1310] 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 1261/1310] 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 1262/1310] 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 1263/1310] 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 1264/1310] 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 1265/1310] 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 1266/1310] 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 1267/1310] 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 1268/1310] 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 1269/1310] 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 1270/1310] 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 1271/1310] 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 1272/1310] 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 1273/1310] 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 1274/1310] 
 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 1275/1310] 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 1276/1310] 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 1277/1310] 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 1278/1310] 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 1279/1310] 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 1280/1310] 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 1281/1310] 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 1282/1310] 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 1283/1310] 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 1284/1310] 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 1285/1310] 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 1286/1310] 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 1287/1310] 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 1288/1310] 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 1289/1310] 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 1290/1310] 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 1291/1310] 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 1292/1310] 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 1293/1310] 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 1294/1310] 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 1295/1310] 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 1296/1310] 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 1297/1310] 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 1298/1310] 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 1299/1310] 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 1300/1310] 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 1301/1310] 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 1302/1310] 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 1303/1310] 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 1304/1310] 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 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 1305/1310] 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 1306/1310] 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 1307/1310] 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 1308/1310] 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 1309/1310] 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 1310/1310] 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";